bug修改

pages/activity/jkDetail.vue

@@ -237,7 +237,7 @@
 							<image src="../../static/timg/icon_arrow_right.png" mode="" class="buyShopRightJt"></image>
 						</view>
 					</view>
-					<view class="buyShopBox"v-if="shopName">
+					<view class="buyShopBox"v-if="shopInfo"><!-- shopName -->
 						<view class="buyShop">
 								<view class="buyShopTop">
 									<view class="buyShopTleft">

pages/index/discountCardDetail.vue

@@ -44,21 +44,21 @@
 						    </view>
 					</view> 
 				    
-					 <view v-if="detail.shopList.length" class="symendinaBox">
+					 <view v-if="shopInfo" class="symendinaBox">
 						<view class="shopline" >
-							<view class="newdistance" v-if="detail.shopList[0].distance&&detail.shopList[0].distance!= '0.00'">
+							<view class="newdistance" v-if="shopInfo.distance&&shopInfo.distance!= '0.00'">
 								 <image src="../../static/img2/dh.png" mode="" class="dhImg"></image>
-								<view style="padding-top: 6rpx;"><span >{{detail.shopList[0].distance}}km</span></view>
+								<view style="padding-top: 6rpx;"><span >{{shopInfo.distance}}km</span></view>
 							</view>
 							<view class="shoplineLeft">
-								<image :src="detail.shopList[0].doorImg1" mode="" class="shopImg" v-if="detail.shopList[0].doorImg1"></image>
-								<image :src="detail.shopList[0].doorImg2" mode="" class="shopImg" v-else-if="detail.shopList[0].doorImg2"></image>
+								<image :src="shopInfo.doorImg1" mode="" class="shopImg" v-if="shopInfo.doorImg1"></image>
+								<image :src="shopInfo.doorImg2" mode="" class="shopImg" v-else-if="shopInfo.doorImg2"></image>
 								<image src="../../static/timg/noimg.png" mode="" class="shopImg" v-else></image>
 							</view>
 							<view class="shopright">
 								<view style="width: 475rpx;">
 									<view class="shopTop">
-										<view class="shopName">{{detail.shopList[0].shopName}}</view>
+										<view class="shopName">{{shopInfo.shopName}}</view>
 									</view>
 									
 								</view>
@@ -257,6 +257,7 @@
 					lng: '',
 					lat: '',
 				},
+				shopInfo:'',
 			}
 		},
 		onLoad(opt) {
@@ -357,8 +358,33 @@
 					}
 					
 					this.detail = res.data;
+				   this.getInfo()
 				
+				})
+			},
+			getInfo(){
+				this.$http('openreservation/getInfo', {
+					lat: this.location.lat ? this.location.lat : '',
+					lng: this.location.lng ? this.location.lng : '',
 				
+				}, 'GET').then(res => {
+					var shopinfo=res.data.shopInfo;
+					if(this.location.lng){
+						this.shopInfo=this.detail.shopList[0]
+					}else{
+						this.detail.shopList.forEach(item=>{
+							
+							if(item.id==shopinfo.id){
+						        this.ckshopdata=shopinfo
+								this.shopInfo=shopinfo
+								this.shopName=this.shopInfo.shopName
+							}
+						})
+						if(this.shopInfo==''){
+							this.shopInfo=this.detail.shopList[0]
+							//this.shopName=this.shopInfo.shopName
+						}
+					}
 				})
 			},
 			makePhoneCall(num){
@@ -845,7 +871,7 @@ display: flex;
 		font-size: 22rpx;
 	}
 	.shopaddress {
-		width: 400rpx;
+		width: 500rpx;
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
 		text-overflow: ellipsis;