1

@@ -22,9 +22,9 @@ Vue.prototype.$request=function(url,data='',type = 1){
 	// var that=this
 	return new Promise((reslove,reject)=>{
 		if(type == 1){
-			uni.showLoading({
-				title:'加载中...'
-			})
+			// uni.showLoading({
+			// 	title:'加载中...'
+			// })
 		}
 		if(type == 3){
 			uni.showLoading({

@@ -103,7 +103,15 @@
                     }
                 },
                 "payment" : {
-                    "appleiap" : {}
+                    "appleiap" : {},
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    },
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx71e7bfe66057f7fb",
+                        "UniversalLinks" : "https://yuebang.brofirst.cn/ulink/"
+                    }
                 },
                 "geolocation" : {
                     "amap" : {

@@ -8,6 +8,12 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
 		    "path" : "pages/findWonderful/findWonderful",
 		    "style" :                                                                                    
 		    {
@@ -22,12 +28,7 @@
 				"navigationBarBackgroundColor": "#000000"
 			}
 		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
+
 		{
 			"path":"pages/index/login",
 			"style":{
@@ -364,12 +365,12 @@
 		    "pagePath": "pages/findWonderful/findWonderful",
 		    "iconPath": "static/image/Group_672.png",
 		    "selectedIconPath": "static/image/Group_671.png",
-		    "text": "家乡故事"
+		    "text": "问野文化"
 		},{
 	        "pagePath": "pages/index/index",
 	        "iconPath": "static/image/Frame-1.png",
 	        "selectedIconPath": "static/image/Group_670.png",
-	        "text": "访乡贤"
+	        "text": "问野地图"
 	    },{
 	        "pagePath": "pages/my/my",
 	        "iconPath": "static/image/Frame.png",

@@ -941,7 +941,7 @@
 					title: '加载中'
 				})
 				var myAmapFun = new amapFile.AMapWX({
-					key: 'a8c52aaa1ccef354745fb14886b7d633'
+					key: '2218a612f5e195271d33273837237dee'
 				});
 				myAmapFun.getInputtips({
 					keywords: this.keywords,

@@ -35,10 +35,15 @@
 				第三方登录
 				<view class="line"></view>
 			</view>
+			<!-- <view>
+				
+			</view> -->
 			<view class="otherLoginIcon" @click="weixinlogin" v-if="switchTab == '1'">
 				<image src="../../static/image/weixin-4_1@2x.png" mode=""></image>
 			</view>
-			
+			<!-- <view class="otherLoginIcon" @click="weixinlogin" v-if="switchTab == '1'">
+				<image src="../../static/image/ios.png" mode=""></image>
+			</view> -->
 			<view class="userProt">
 				<image style="width: 31rpx;height: 31rpx;" src="../../static/image/kefudianhua_1@2x.png" mode=""></image>
 				客服电话：400-900-3305

@@ -126,9 +126,9 @@
 					})
 					return
 				}
-				if(this.param.price < 0.1){
+				if(this.param.price < 1){
 					uni.showToast({
-						title:'提现金额最少0.1',
+						title:'提现金额最少1',
 						icon:'none'
 					})
 					return
@@ -181,14 +181,15 @@
 			//绑定提现账户
 			bindAcount(){
 				uni.showActionSheet({
-					itemList: ['支付宝'],
+					itemList: ['微信','支付宝'],
 					success: (res) => {
-						this.param.platform = 'alipay'
-						/* if (res.tapIndex == 1) {
+						// this.param.platform = 'alipay'
+						if (res.tapIndex == 1) {
 							this.param.platform = 'alipay'
+							console.log(1111)
 						} else if (res.tapIndex == 0) {
 							this.param.platform = 'wechat'
-						} */
+						}
 					},
 					fail: (res) => {
 						console.log(res.errMsg);