bug修改

pages/index/index.vue

@@ -309,7 +309,10 @@
 			
 		},
 		onShow() {
-		    var indexaddcar = uni.getStorageSync("indexaddcar")
+			this.userInfo=this.$store.state.userInfo;
+			this.wxOpenData=this.$store.state.wxOpenData;
+			var indexaddcar = uni.getStorageSync("indexaddcar");
+			this.getwxLoing=true;
 			if(indexaddcar==1){
 				uni.removeStorageSync('indexaddcar');
 				this.getCarList();
@@ -317,6 +320,7 @@
 				this.carInfo=this.$store.state.carInfo;
 				this.jsTime()
 			}
+		    
 			
 			
 		},

pages/index/onlineBooking.vue

@@ -31,7 +31,14 @@
 			        <span class="shopDdistance" v-else-if="Number(shopInfo.distance)">距离{{shopInfo.distance*1000}}m</span>
 			        <span class="shopDdistance" v-else>距离--km</span> -->
 			      </view>
-			      <view class="newshopDadressName">{{shopInfo.address?shopInfo.address:'--'}}</view>
+				  <view class="" style="display: flex;">
+					   <img src="../../static/timg/icon_coordinate@2x.png" style="margin-top: 24rpx;margin-right: 10rpx;" class="shopaddressIcon">
+					   <view class="newshopDadressName">
+					   					 
+					   {{shopInfo.address?shopInfo.address:'--'}}
+					   </view>
+				  </view>
+			     
 			    </view>
 			    <view class="newshopDaright">
 			      <view class="newshopDrline" @click="goLocation()">
@@ -382,7 +389,7 @@
 }
 .newshopDadressName{
 	color: #999999;padding-top: 16rpx;
-	font-size: 24rpx;line-height: 24rpx;
+	font-size: 24rpx;line-height: 36rpx;
 	width: 480rpx;font-weight: 400;
 }
 .newshopDrlineimg{

pages/index/shopList.vue

@@ -101,8 +101,11 @@
 			},
 
 			goDetail(item) {
+				// uni.navigateTo({
+				// 	url: '../shop/shopDetail?id=' + item.shopId
+				// })
 				uni.navigateTo({
-					url: '../shop/shopDetail?id=' + item.shopId
+					url:'onlineBooking?naShopId='+item.shopId
 				})
 			}
 		},
@@ -204,12 +207,10 @@
 
 	.brandsBg {
 		display: flex;
-
 		align-items: center;
-		
 		padding: 5rpx 0rpx;
-		
-		
+		flex-wrap: wrap;
+		    height: 36rpx;
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
 		text-overflow: ellipsis;

pages/partner/myQr.vue

@@ -1,27 +1,45 @@
 <template>
 <view class="box">
-	<view style="height: 20vh;"></view>
-	<view class="cont">
-		<view class="contTop">
-			<image src="../../static/timg/hl1.png" mode="" class="contTopImg"></image>
-			<view class="contTopTitle">专属二维码</view>
-			<image src="../../static/timg/hl2.png" mode="" class="contTopImg"></image>
+	<view style="height: 15vh;"></view>
+	<view class="cont1" v-if="type==1">
+		<view class="contTOp">
+			<view class="headImgBox">
+				<image :src="userInfo.headImg" mode="" class="headImg" v-if="userInfo.headImg"></image>
+				<image src="../../static/img/icon_me.png" mode="" class="headImg" v-else></image>
+			</view>
+			<view class="nickName">{{userInfo.nickName?userInfo.nickName:'微信昵称'}}</view>
 		</view>
-		<view class="headImgBox">
-			<image :src="userInfo.headImg" mode="" class="headImg" v-if="userInfo.headImg"></image>
-			<image src="../../static/img/icon_me.png" mode="" class="headImg" v-else></image>
+		
+		<view class="wqmBox">
+			<view class="ewmLeft">
+				<image :src="img" mode="" class="ewmImg"></image>
+			</view>
+			<view class="ewmRight">
+				<view class="ewmRight1">{{wxOpenData.unionName}}</view>
+			</view>
+			<view class="contMs1">扫码关注公众号，登记个人信息 即可享受新</view>
 		</view>
-		<view class="nickName">{{userInfo.nickName?userInfo.nickName:'微信昵称'}}</view>
-		<view class="ms">很不错的店铺 值得推荐！</view>
+		<view class="btnBox">我的专属二维码</view>
+	</view>
+	<view class="cont2" v-if="type==2">
+		<view class="contTOp">
+			<view class="headImgBox">
+				<image :src="userInfo.headImg" mode="" class="headImg" v-if="userInfo.headImg"></image>
+				<image src="../../static/img/icon_me.png" mode="" class="headImg" v-else></image>
+			</view>
+			<view class="nickName">{{userInfo.nickName?userInfo.nickName:'微信昵称'}}</view>
+		</view>
+		
 		<view class="wqmBox">
 			<view class="ewmLeft">
 				<image :src="img" mode="" class="ewmImg"></image>
 			</view>
 			<view class="ewmRight">
-				<view class="ewmRight1">长按二维码立即关注</view>
+				<view class="ewmRight1">{{wxOpenData.unionName}}</view>
 				
 			</view>
 		</view>
+		<view class="btnBox">我的专属二维码</view>
 	</view>
 </view>
 </template>
@@ -46,7 +64,7 @@
 		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.userInfo = uni.getStorageSync("userInfo");
-			this.wxOpenData=this.$store.state.wxOpenData;
+			this.wxOpenData=uni.getStorageSync('wxOpenData');
 			this.ext=this.$common.getExtStoreId();
 			this.type=opt.type;
 			//if(this.type==1){
@@ -83,7 +101,7 @@
 .box {
 	width: 100vw;
 	min-height: 100vh;
-	background: url('http://dmsphoto.66km.com.cn/thFiles/D3702233-AB0E-415A-95C6-C7835283E8BC.png') no-repeat;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/344AA01C-5DEB-471E-BF8A-5CB185F71684.png') no-repeat;
 	background-size:100% 100% ;
 }
 .cont{
@@ -95,8 +113,57 @@
 	margin-left: 50rpx;
 	
 }
-.contTopImg{
-	height: 28rpx;width: 155rpx;margin-top: 11rpx;
+.cont1{
+	width: 620rpx;
+	height: 858rpx;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/02A79FCC-DB9C-41F2-B092-7EFAC54AD631.png') no-repeat;
+	background-size:100% 100% ;
+	margin-left: 65rpx;
+	position: relative;
+}
+.contMs1{
+	font-size: 24rpx;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+	line-height: 40rpx;
+	text-align: center;
+	width: 336rpx;
+	margin: 0 auto;
+	padding-top: 30rpx;
+}
+.cont2{
+	width: 620rpx;
+	height: 762rpx;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/EF6764C2-E253-40D8-9027-6F1E86B22666.png') no-repeat;
+	background-size:100% 100% ;
+	margin-left: 65rpx;
+	position: relative;
+}
+
+.btnBox{
+	width: 329rpx;height: 91rpx;
+	text-align: center;
+	line-height: 91rpx;
+	font-size: 28rpx;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #DC490A;
+	position: absolute;
+	bottom: -45rpx;
+	left: 146rpx;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/587A56A8-BD06-4396-8EDD-221C4CAC3F5E.png') no-repeat;
+	background-size:100% 100% ;
+}
+.contTOp{
+	display: flex;
+}
+
+.headImg{
+	width: 103rpx;height: 103rpx;border-radius: 50%;
+}
+.headImgBox{
+	text-align: center;padding-top: 24rpx;padding-left: 38rpx;
 }
 .contTopTitle{
 	font-size: 36rpx;
@@ -110,29 +177,27 @@
 	justify-content: space-around;
 	padding-top: 60rpx;
 }
-.headImg{
-	width: 103rpx;height: 103rpx;border-radius: 50%;
-}
-.headImgBox{
-	text-align: center;padding-top: 32rpx;
-}
+
 .nickName{
-	color: #999999;font-size: 26rpx;text-align: center;padding-top: 16rpx;
+	color: #333333;font-size: 26rpx;text-align: center;line-height: 146rpx;padding-left: 24rpx;
+	font-weight: 500;
 }
 .ms{
 	color: #FFAF18;font-size: 30rpx;padding-top: 16rpx;text-align: center;
 }
 .wqmBox{
-	border-top:1px solid #EEEEEE;margin-top: 20rpx;
+	border-top:1px solid #EEEEEE;
 	text-align: center;
 	padding: 23rpx 0 0 0;
+	margin-left: 18rpx;
+	margin-right: 18rpx;
 }
 .ewmImg{
-	width: 220rpx;
-	height: 220rpx;
+	width: 404rpx;
+	height: 404rpx;
 }
 .ewmRight1{
-	color: #999999;font-size: 24rpx;padding-top: 10rpx;
+	color: #666666;font-size: 28rpx;padding-top: 40rpx;
 }
 .ewmRight2{
 	color: #999999;font-size: 24rpx;padding-top: 16rpx;padding-left: 24rpx;