1

pages/huitong/huitongbao/index.vue

@@ -259,7 +259,8 @@
 					{key:2,value:'退款'},
 					{key:3,value:'支付'},
 					
-				]
+				],
+				mobilePhoneNum:''
 			};
 		},
 		computed: mapGetters(['isLogin','viewColor']),
@@ -309,7 +310,7 @@
 					});
 					return;
 				}
-				huitongToConsume({count:this.huitongToConsumeNum.toFixed(2)}).then(res=>{
+				huitongToConsume({count:Number(this.huitongToConsumeNum).toFixed(2)}).then(res=>{
 					
 					if(res.status==200){
 						this.getUserInfo()
@@ -360,7 +361,8 @@
 					});
 					return;
 				}
-				this.zhuanrang.count = this.zhuanrang.count.toFixed(2)
+				this.zhuanrang.count = Number(this.zhuanrang.count).toFixed(2)
+				
 				changeHuitong(this.zhuanrang).then(res=>{
 					
 					if(res.status==200){
@@ -404,7 +406,7 @@
 				let that = this;
 				// if (that.formItem == 2) that.type = "register";
 				await registerVerify({
-						phone: this.zhuanrang.phoneTo,
+						phone: this.mobilePhoneNum,
 						type: 'huitong',
 						key: "",
 						// code: that.codeVal,
@@ -441,6 +443,7 @@
 				getUserInfo().then((res)=>{
 					this.huitong = res.data.assets.huitong
 					this.huitong_frozen = res.data.assets.huitong_frozen;
+					this.mobilePhoneNum = res.data.phone
 					this.getIntegralList()
 					// getIntegralInfo().then(function(res) {
 					// 	that.$set(that,'userInfo',res.data);

pages/shop/shop.vue

@@ -10,7 +10,8 @@
 				
 				<view style="text-align: right;" v-if="tabIndex==1" class='iconfont' :class='is_switch==true?"icon-pailie":"icon-tupianpailie"'
 				 @click='Changswitch'></view>
-				<view v-else-if="mer_location == 1" style="text-align: right;" class='iconfont icon-dingwei' @click="showMaoLocation(latitude,longitude)"></view>
+				  <!-- @click="showMaoLocation(latitude,longitude)" -->
+				<view v-else-if="mer_location == 1" style="text-align: right;" class='iconfont icon-dingwei'></view>
 				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
 					<input placeholder='搜索' placeholder-class='placeholder' confirm-type='search' name="search" v-model='where.keyword'
 					 @confirm="searchSubmit"></input>
@@ -27,7 +28,7 @@
 					<view class="store-item" v-for="(item,index) in storeList" :key="index" @click="goStore(item.mer_id)">
 						<view class="newStoreItem">
 							<view class="storeInfo">
-								<image :c="item.mer_avatar" mode=""></image>
+								<image :src="item.mer_avatar" mode=""></image>
 								<view class="storeDesc">
 									<view class="storeTitle">
 										{{item.mer_name}}
@@ -41,7 +42,7 @@
 									</view>
 								</view>
 							</view>
-							<view class="storeAddr">
+							<view class="storeAddr"  @click.stop="showMaoLocation(item.lat,item.long)">
 								<text class='iconfont icon-dingwei'></text>
 								<text>{{item.mer_address}}</text>
 							</view>

pages/shop/shop1.vue

@@ -10,7 +10,8 @@
 				
 				<view style="text-align: right;" v-if="tabIndex==1" class='iconfont' :class='is_switch==true?"icon-pailie":"icon-tupianpailie"'
 				 @click='Changswitch'></view>
-				<view v-else-if="mer_location == 1" style="text-align: right;" class='iconfont icon-dingwei' @click="showMaoLocation(latitude,longitude)"></view>
+				  <!-- @click="showMaoLocation(latitude,longitude)" -->
+				<view v-else-if="mer_location == 1" style="text-align: right;" class='iconfont icon-dingwei'></view>
 				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
 					<input placeholder='搜索' placeholder-class='placeholder' confirm-type='search' name="search" v-model='where.keyword'
 					 @confirm="searchSubmit"></input>
@@ -27,7 +28,7 @@
 					<view class="store-item" v-for="(item,index) in storeList" :key="index"  @click="goStore(item.mer_id)">
 						<view class="newStoreItem">
 							<view class="storeInfo">
-								<image :c="item.mer_avatar" mode=""></image>
+								<image :src="item.mer_avatar" mode=""></image>
 								<view class="storeDesc">
 									<view class="storeTitle">
 										{{item.mer_name}}
@@ -41,7 +42,7 @@
 									</view>
 								</view>
 							</view>
-							<view class="storeAddr">
+							<view class="storeAddr"  @click.stop="showMaoLocation(item.lat,item.long)">
 								<text class='iconfont icon-dingwei'></text>
 								<text>{{item.mer_address}}</text>
 							</view>