Merge branch 'dev'

pages/activity/activity.vue

@@ -4,7 +4,7 @@
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="goDetail(item.id)">
 			<image :src="item.img" mode="" class="itemImg"></image>
 			<view class="timeBox">
-				<image v-if="item.state==2" src="http://dmsphoto.66km.com.cn/thFiles/85EAAA7F-01A6-41A6-B25B-72FAD3E451AC.png" mode="" class="state"></image>
+				<image v-if="item.state==2" src="http://dmsphoto.66km.com.cn/thFiles/85EAAA7F-01A6-41A6-B25B-72FAD3E451AC.png" mode="" class="state"></image>
 				<image v-if="item.state==1" src="http://dmsphoto.66km.com.cn/thFiles/EB46639B-85C9-4246-A3E3-EA87944DFC36.png" mode="" class="state"></image>
 				<view class="time" v-if="item.startTime">{{item.startTime.slice(0,10)}}-{{item.endTime.slice(0,10)}}</view>
 			</view>
@@ -22,7 +22,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
@@ -50,7 +50,7 @@
 				wxOpenData: '',
 				page: 1,
 				itemData: [],
-				noMoreShow: false,
+				noMoreShow: false,
 				ext:'',
 				themeColor:'',
 			}
@@ -58,7 +58,7 @@
 		onLoad() {
 			this.userInfo = this.$store.state.userInfo;
 			this.wxOpenData = this.$store.state.wxOpenData
-			
+			
 			this.ext=this.$common.getExtStoreId();
 			this.page = 1
 			this.myOrderCoupon();
@@ -105,7 +105,7 @@
 				this.$http('openHome/queryActivityList', {
 
 					// page: this.page,
-					// limit: 10,
+					// limit: 10,
 					 unionId:this.ext.unionId
 				}, 'GET').then(res => {
 					uni.hideLoading();
@@ -260,20 +260,20 @@
 	}
 	.itemImg {
 		height: 280rpx;
-		width: 702rpx;
-border-radius: 10rpx 10rpx 0px 0px;
+		width: 702rpx;
+border-radius: 10rpx 10rpx 0px 0px;
 display: block;
 	}
 
 	.timeBox {
 		display: flex;
-		margin-top: -61rpx;
+		margin-top: -61rpx;
 		align-items: flex-end;
-	}
-	.state{
-		width: 102rpx;
+	}
+	.state{
+		width: 102rpx;
 		height: 53rpx;
-		position: relative;
+		position: relative;
 	}
 
 	.time {
@@ -289,7 +289,7 @@ display: block;
 		padding: 24rpx 20rpx;
 		color: #333333;
 		font-size: 28rpx;
-		background: #FFFFFF;
+		background: #FFFFFF;
 		border-radius: 0 0 10rpx 10rpx;
 	}
 
@@ -300,4 +300,4 @@ display: block;
 		color: #999999;
 		font-size: 28rpx;
 	}
-</style>
+</style>

pages/activity/jkDetail.vue

@@ -293,7 +293,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>

pages/index/couponShare.vue

@@ -70,7 +70,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">

pages/index/discountCardDetail.vue

@@ -54,7 +54,7 @@
 					<image src="../../static/img/icon_youhui_red.png" mode="" class="redPoint"></image>
 					<view class="title">使用说明</view>
 					</view>
-					<view style="font-size: 20rpx;" v-if="detail.couContent" v-html="detail.couContent"></view>
+					<view style="font-size: 20rpx;" v-if="detail.couContent" v-html="detail.couContent"></view>
 					<view v-else class="content">暂无</view>
 				</view>
 
@@ -126,7 +126,7 @@
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">

pages/index/index.vue

@@ -244,7 +244,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShowHide">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				    <view class="sqRefuse"  @click="authorizShowHide">拒绝</view>
@@ -546,7 +546,10 @@
 				}
 			},
 			goGoods(item){
-				if(!this.userInfo){
+				uni.navigateTo({
+					url:'../shop/goodsDetail?id='+item.id
+				})
+				/* if(!this.userInfo){
 					if(this.exitNum!=1){
 						this.authorizShow=true;
 					}else{
@@ -564,7 +567,7 @@
 					uni.navigateTo({
 						url:'../shop/goodsDetail?id='+item.id
 					})
-				}
+				} */
 				/* if(!this.userInfo){
 					this.authorizShow=true;
 				}else{
@@ -574,6 +577,9 @@
 				} */
 			},
 			goJk(item){
+				uni.navigateTo({
+					url:'../activity/jkDetail?id='+item.id
+				})
 				/* if(!this.userInfo){
 					this.authorizShow=true;
 				}else{
@@ -581,7 +587,7 @@
 						url:'../activity/jkDetail?id='+item.id
 					})
 				} */
-				if(!this.userInfo){
+				/* if(!this.userInfo){
 					if(this.exitNum!=1){
 						this.authorizShow=true;
 					}else{
@@ -599,11 +605,11 @@
 					uni.navigateTo({
 						url:'../activity/jkDetail?id='+item.id
 					})
-				}
+				} */
 				
 			},
 			goRoter(item){
-				if(!this.userInfo){
+				/* if(!this.userInfo){
 					if(this.exitNum!=1){
 						this.authorizShow=true;
 					}else{
@@ -617,7 +623,14 @@
 					}
 				}else{
 					this.goRoter2(item)
-				}
+				} */
+				this.$common.automaticlogin().then(val => {
+					this.userInfo=this.$store.state.userInfo;
+					this.wxOpenData=this.$store.state.wxOpenData;
+					this.exitNum=''
+					this.$store.commit('mutationsexitNum', '')
+					this.goRoter2(item)
+				})
 				
 			},
 			goRoter2(item){

pages/index/onlineBooking.vue

@@ -149,7 +149,7 @@
         <view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
         	<view class="authorizCont" @click.stop="">
         		<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-        		<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+        		<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
         		<view class="sqLine">
         			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
         		    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>

pages/index/receiveCoupon.vue

@@ -42,7 +42,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">

pages/index/rescue.vue

@@ -47,27 +47,27 @@
 				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
 
 			</view> -->
-
-			<view class="shopBox" @click="startBtn">
-				<view class="left">
-					<view class="graypoint"></view>
-					<view class="leftTitle">位置</view>
-					<view class="content">{{currentAddress}}</view>
-				</view>
-				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
-			
-			</view>
-			
-			<view class="shopBox" @click="endBtn" v-if="typeIndex==2">
-				<view class="left">
-					<view class="graypoint"></view>
-					<view class="leftTitle">终点</view>
+
+			<view class="shopBox" @click="startBtn">
+				<view class="left">
+					<view class="graypoint"></view>
+					<view class="leftTitle">位置</view>
+					<view class="content">{{currentAddress}}</view>
+				</view>
+				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
+			
+			</view>
+			
+			<view class="shopBox" @click="endBtn" v-if="typeIndex==2">
+				<view class="left">
+					<view class="graypoint"></view>
+					<view class="leftTitle">终点</view>
 					<view class="content" v-if="endAddress">{{endAddress}}</view>
-					<view class="Nocontent" v-else>请选择</view>
-				</view>
-				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
-			
-			</view>
+					<view class="Nocontent" v-else>请选择</view>
+				</view>
+				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
+			
+			</view>
 			
 		</view>
 
@@ -93,7 +93,7 @@
 		  	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		  		<view class="authorizCont" @click.stop="">
 		  			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-		  			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+		  			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 		  			<view class="sqLine">
 		  				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 		  			    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
@@ -129,8 +129,8 @@
 				 //  	iconPath: '../../static/img/icon_zhongdian.png'
 				 //   },
 				],
-				tabIndex: 0,
-				tMap:'',
+				tabIndex: 0,
+				tMap:'',
 				mapHeight:200,
 				currentAddress:'',
 				endAddress:'',
@@ -154,7 +154,7 @@
 				helptime:'',
 				setting:'',
 			}
-		},
+		},
 		onLoad() {
 			var that = this;
 			this.userInfo=this.$store.state.userInfo;
@@ -175,13 +175,13 @@
 			const tMap = new QQMapWX({
 				key: 'L2GBZ-CIS6J-HRFFV-K5LO6-QROT7-BQFXZ' //开发者密钥 //这里要换成自己的key
 			});
-			this.tMap=tMap
-			// uni.getSystemInfo({
-			// 	success: (res) => {
-			// 		this.mapHeight = res.windowHeight  *2 - 664 - 120
-			// 	}
+			this.tMap=tMap
+			// uni.getSystemInfo({
+			// 	success: (res) => {
+			// 		this.mapHeight = res.windowHeight  *2 - 664 - 120
+			// 	}
 			// })
-			
+			
 			 uni.getLocation({
 				type: 'gcj02',
 				success: function (res) {
@@ -218,9 +218,9 @@
 						},
 					})
 				}
-			}); 
-			
-		},
+			}); 
+			
+		},
 		
 		methods: {
 			getsetting(){
@@ -639,7 +639,7 @@
 	}
 
 	.contBox {
-		width: 100%;
+		width: 100%;
 		height: 664rpx;
 	}
 
@@ -734,15 +734,15 @@
 	.left {
 		display: flex;
 		align-items: center;
-	}
-	.leftTitle{
-		width: 56rpx;
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #666666;
-		line-height: 40rpx;
-		margin-left: 16rpx;
-		margin-right: 30rpx;
+	}
+	.leftTitle{
+		width: 56rpx;
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #666666;
+		line-height: 40rpx;
+		margin-left: 16rpx;
+		margin-right: 30rpx;
 	}
 
 	.graypoint {
@@ -775,7 +775,7 @@
 	    color: #FFFFFF !important;
   }
 
-	.bottomView {
+	.bottomView {
 		border-top: 1rpx solid #EEEEEE;
 		background-color: #FFFFFF;
 		width: 100%;
@@ -886,4 +886,4 @@
 				display: flex;
 				justify-content: space-between;
 			}
-</style>
+</style>

pages/index/shopList.vue

@@ -94,7 +94,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
@@ -457,7 +457,7 @@
 				this.loading=false;
 				this.$http('opencarOwnerHome/queryShopInfoList', {
 
-					lat: this.location.lat ? this.location.lat : '',
+					lat: this.location.lat ? this.location.lat : '',
 					lng: this.location.lng ? this.location.lng : '',
                     city:this.cityCode,
                     area:this.area,
@@ -507,16 +507,16 @@
 				}
 				
 			}
-		},
-		
-		// 下拉刷新
-		onPullDownRefresh() {
-			
-			this.getqueryShopList()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			
+			this.getqueryShopList()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		
 	}
 </script>
@@ -570,7 +570,7 @@
 }
 	.box {
 		min-height: 100vh;
-		background-color: #F4F5F7;
+		background-color: #F4F5F7;
 		padding-bottom: 60rpx;
 	}
 	.shopdhBox{
@@ -674,14 +674,14 @@
 	.brandsBg {
 		display: flex;
 		align-items: center;
-		padding: 5rpx 0rpx;
+		padding: 5rpx 0rpx;
 		flex-wrap: wrap;
-		    height: 36rpx;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		    height: 36rpx;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
-	}
+	}
 	
 
 	.brands {
@@ -737,12 +737,12 @@
 	}
 
 	.shopright {
-		padding-left: 20rpx;
+		padding-left: 20rpx;
 		width: 510rpx;
 	}
 
 	.shopName {
-		font-size: 28rpx;
+		font-size: 28rpx;
 		font-weight: bold;
 		color: #333333;
 		line-height: 40rpx;
@@ -805,11 +805,11 @@
 		line-height: 30rpx;
 		padding-top: 10rpx;
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-between;
 		padding-right: 10rpx;
 	}
 
-	.shopaddress {
+	.shopaddress {
 		width: 400rpx;
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
@@ -916,4 +916,4 @@
 	top: 40rpx;
 	z-index: 11;
 	}
-</style>
+</style>

pages/index/vipCard.vue

@@ -25,13 +25,13 @@
 			</view> 
 
 			<view class="tab">
-				<view>
-					<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">计次</view>
-					<view :class="{line:tabIndex==1}"></view>
+				<view>
+					<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">计次</view>
+					<view :class="{line:tabIndex==1}"></view>
 				</view>
-				<viw>
-					<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">储值</view>
-					<view :class="{line:tabIndex==2}"></view>
+				<viw>
+					<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">储值</view>
+					<view :class="{line:tabIndex==2}"></view>
 				</viw>
 			</view>
 		</view> -->
@@ -183,21 +183,21 @@
 			</view>
 
 			<!-- 无数据空白页 -->
-			<!-- nodata v-if="vipData.cardTimeList.length==0"></nodata> -->
-			
-			<!-- 使用条款-->
-			<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
-				<view class="shiyongCont" @click.stop="">
-					<view class="shiyongContTop">
-						<view class="shiyongContTopTitle">使用条款</view>
-						<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
-							@click="shiyongShowHlde"></image>
-					</view>
-					<view class="shiyonghtml">
-						<view v-html="useComment" v-if="useComment"></view>
-						<view v-else class="shiyongno">使用条款暂无内容</view>
-					</view>
-				</view>
+			<!-- nodata v-if="vipData.cardTimeList.length==0"></nodata> -->
+			
+			<!-- 使用条款-->
+			<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
+				<view class="shiyongCont" @click.stop="">
+					<view class="shiyongContTop">
+						<view class="shiyongContTopTitle">使用条款</view>
+						<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
+							@click="shiyongShowHlde"></image>
+					</view>
+					<view class="shiyonghtml">
+						<view v-html="useComment" v-if="useComment"></view>
+						<view v-else class="shiyongno">使用条款暂无内容</view>
+					</view>
+				</view>
 			</view>
 			
 			<!-- 储值 -->
@@ -273,7 +273,7 @@
 			
 			</view>
 			
-			
+			
 			
 		</view>
 		
@@ -292,22 +292,22 @@
 
 
 			<!-- 无数据空白页 -->
-			<!-- <nodata v-if="vipData.carMoneyList.length==0"></nodata> -->
-			
-			<!-- 使用条款-->
-			<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
-				<view class="shiyongCont" @click.stop="">
-					<view class="shiyongContTop">
-						<view class="shiyongContTopTitle">使用条款</view>
-						<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
-							@click="shiyongShowHlde"></image>
-					</view>
-					<view class="shiyonghtml">
-						<view v-html="useComment" v-if="useComment"></view>
-						<view v-else class="shiyongno">使用条款暂无内容</view>
-					</view>
-				</view>
-			</view>
+			<!-- <nodata v-if="vipData.carMoneyList.length==0"></nodata> -->
+			
+			<!-- 使用条款-->
+			<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
+				<view class="shiyongCont" @click.stop="">
+					<view class="shiyongContTop">
+						<view class="shiyongContTopTitle">使用条款</view>
+						<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
+							@click="shiyongShowHlde"></image>
+					</view>
+					<view class="shiyonghtml">
+						<view v-html="useComment" v-if="useComment"></view>
+						<view v-else class="shiyongno">使用条款暂无内容</view>
+					</view>
+				</view>
+			</view>
 			
 		</view>
 
@@ -315,7 +315,7 @@
  	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
  		<view class="authorizCont" @click.stop="">
  			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
- 			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+ 			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
  			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
  		</view>
  		<view style="text-align: center;padding-top: 56rpx;">
@@ -487,16 +487,16 @@
 						}	
 					  })
 			},
-		},
-		
-		// 下拉刷新
-		onPullDownRefresh() {
-			// this.page = 1
-			this.myOrderCoupon()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			// this.page = 1
+			this.myOrderCoupon()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		
 	}
 </script>
@@ -509,13 +509,13 @@
 	padding-bottom: 20rpx;
 }
 .titleType2{
-	width: 32rpx;height: 32rpx;	color: #FFFFFF;font-size: 24rpx;background: #FF8113;
+	width: 32rpx;height: 32rpx;	color: #FFFFFF;font-size: 24rpx;background: #FF8113;
 border-radius: 4rpx;margin-right: 8rpx;text-align: center;line-height: 32rpx;
 display: inline-block;font-weight: 400;
 }
 .titleType{
 	color: #FFFFFF;font-size: 24rpx;font-weight: 400;height: 32rpx;
-	padding:0px 4rpx;background: #FF8113;line-height: 32rpx;
+	padding:0px 4rpx;background: #FF8113;line-height: 32rpx;
 border-radius: 4rpx;margin-right: 8rpx;
 }
 .discountTypeBox{
@@ -652,17 +652,17 @@ border-radius: 4rpx;margin-right: 8rpx;
 		line-height: 42rpx;
 		color: #3C3C3C;
 		text-align: center;
-	}
-	.line{
-		width: 40rpx;
-		margin: 0rpx 10rpx;
-		height: 4rpx;
-		background: #FF0000;
-		margin-top: 8rpx;
+	}
+	.line{
+		width: 40rpx;
+		margin: 0rpx 10rpx;
+		height: 4rpx;
+		background: #FF0000;
+		margin-top: 8rpx;
 	}
 
 	.tabActive {
-		color: #3C3C3C;
+		color: #3C3C3C;
 		font-weight: bold;
 	
 	}
@@ -791,12 +791,12 @@ border-radius: 4rpx;margin-right: 8rpx;
 		color: #FF0000;
 		line-height: 50rpx;
 	}
-	.moneyBox{
-		flex-grow: 1;
-		display: flex;
-		/* justify-content: flex-end; */
-		margin-right: 10rpx;
-		align-items: center; 
+	.moneyBox{
+		flex-grow: 1;
+		display: flex;
+		/* justify-content: flex-end; */
+		margin-right: 10rpx;
+		align-items: center; 
 	}
 	.count {
 		color: #FF0000;
@@ -834,13 +834,13 @@ border-radius: 4rpx;margin-right: 8rpx;
 		padding: 24rpx;
 		color: #3C3C3C;
 		font-size: 30rpx;
-		border-bottom: 1rpx solid #EEEEEE;
+		border-bottom: 1rpx solid #EEEEEE;
 		align-items: center;
 	}
 
 	.shiyongContTopTitle {
-		font-size: 30rpx;
-		color: #3C3C3C;
+		font-size: 30rpx;
+		color: #3C3C3C;
 		font-weight: bold;
 	}
 
@@ -851,7 +851,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 	}
 
 	.shiyongno {
-		color: #666666;
+		color: #666666;
 		font-size: 26rpx;
 	}
 	.authorizBox{

pages/integral/integral.vue

@@ -75,7 +75,7 @@
 			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 				<view class="authorizCont" @click.stop="">
 					<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-					<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+					<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				</view>
 				<view style="text-align: center;padding-top: 56rpx;">

pages/partner/bonus.vue

@@ -27,7 +27,7 @@
  	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
  		<view class="authorizCont" @click.stop="">
  			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
- 			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+ 			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
  			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
  		</view>
  		<view style="text-align: center;padding-top: 56rpx;">

pages/partner/people.vue

@@ -25,7 +25,7 @@
  	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
  		<view class="authorizCont" @click.stop="">
  			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
- 			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+ 			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
  			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
  		</view>
  		<view style="text-align: center;padding-top: 56rpx;">

pages/report/complete.vue

@@ -95,7 +95,7 @@
     	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
     		<view class="authorizCont" @click.stop="">
     			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-    			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+    			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
     			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
     		</view>
     		<view style="text-align: center;padding-top: 56rpx;">

pages/report/working.vue

@@ -77,7 +77,7 @@
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">

pages/shop/goodsDetail.vue

@@ -195,7 +195,7 @@
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">

pages/shop/shop.vue

@@ -94,7 +94,7 @@
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<view class="sqLine">
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 			    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>

pages/subPack/jkDetail.vue

@@ -287,7 +287,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>

pages/subPack/oldhistoryDetail.vue

@@ -141,7 +141,7 @@
 			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 				<view class="authorizCont" @click.stop="">
 					<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-					<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+					<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber"
 						@getphonenumber="decryptPhoneNumber">授权</button>
 				</view>

pages/subPack/rescueOrder.vue

@@ -51,7 +51,7 @@
 			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 				<view class="authorizCont" @click.stop="">
 					<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-					<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+					<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				</view>
 				<view style="text-align: center;padding-top: 56rpx;">

pages/subPack/rescueOrderOrderDetail.vue

@@ -193,7 +193,7 @@
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">

pages/user/addCar/cailist.vue

@@ -78,7 +78,7 @@
 			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 				<view class="authorizCont" @click.stop="">
 					<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-					<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+					<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				</view>
 				<view style="text-align: center;padding-top: 56rpx;">
@@ -101,7 +101,7 @@
 				loding: false,
 				type: '',
 				carId: '',
-				fromMe: false,
+				fromMe: false,
 				themeColor:'',
 				iStatusBarHeight:'',
 				openMCar:'',
@@ -117,8 +117,8 @@
 			this.$common.isUserId()
 			this.type = opt.type;
 			// console.log(this.type)
-			this.fromMe = opt.fromMe
-			 this.themeColor = uni.getStorageSync("themeColor");
+			this.fromMe = opt.fromMe
+			 this.themeColor = uni.getStorageSync("themeColor");
             this.openMCar=uni.getStorageSync("openMCar");
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();
@@ -167,9 +167,9 @@
 			},
 			
 			maintain(item){
-				uni.navigateTo({
-					
-					url:'../../index/handbook?mileage='+item.milage+'&liyangId='+item.nLevelID
+				uni.navigateTo({
+					
+					url:'../../index/handbook?mileage='+item.milage+'&liyangId='+item.nLevelID
 				})
 			},
 			getqueryMyBMemberCar() {
@@ -185,11 +185,11 @@
 					this.loding = true;
 				})
 			},
-			addBtn() {
-				uni.navigateTo({
-					url: 'addCar'
-				})
-				
+			addBtn() {
+				uni.navigateTo({
+					url: 'addCar'
+				})
+				
 				
 	
 
@@ -211,16 +211,16 @@
 			},
 			
 			
-		},
-		
-		// 下拉刷新
-		onPullDownRefresh() {
-			// this.page = 1
-			this.getqueryMyBMemberCar()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			// this.page = 1
+			this.getqueryMyBMemberCar()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		
 	}
 </script>
@@ -267,7 +267,7 @@
 	}
 	.box {
 		min-height: 100vh;
-		background: #F4F5F7;
+		background: #F4F5F7;
 		padding-bottom: 120rpx;
 	}
 
@@ -517,4 +517,4 @@
 			
 			height: 100%;
 			}
-</style>
+</style>

pages/user/historyDetail.vue

@@ -295,7 +295,7 @@
 			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 				<view class="authorizCont" @click.stop="">
 					<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-					<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+					<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber"
 						@getphonenumber="decryptPhoneNumber">授权</button>
 				</view>

pages/user/historySpend.vue

@@ -12,17 +12,17 @@
 		</view>
 		<view style="height: 90rpx;"></view>
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="goDetail(item)">
-			<view class="topBox">
-				<view class="dan">{{item.code}}</view>
-				
-				<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
-				<view class="stateBox" v-if="item.SheetType == 1">
-					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
-					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 0">待施工</view>
-					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 1">施工中</view>
-					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 2">已完工</view>
-					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 3">已质检</view>
-					<view class="danState"   v-if="item.SheetState == 4">已作废</view>
+			<view class="topBox">
+				<view class="dan">{{item.code}}</view>
+				
+				<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
+				<view class="stateBox" v-if="item.SheetType == 1">
+					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
+					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 0">待施工</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 1">施工中</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 2">已完工</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 3">已质检</view>
+					<view class="danState"   v-if="item.SheetState == 4">已作废</view>
 					<!-- 结算状态 -->
 					<view v-if="item.SheetState == 4">
 						<view class="danState" v-if="item.PayState == 0">/未结算</view>
@@ -31,15 +31,15 @@
 					<view v-else>
 						<view class="danState3" v-if="item.PayState == 0">/未结算</view>
 						<view class="danState2" v-if="item.PayState == 2">/已结算</view>
-					</view>
-					
-					
-				</view>
-				<view class="stateBox"  v-if="item.SheetType == 2">
-					<!-- 0待施工（已保存）1施工中（已派工）2已审核 3已质检 4 已作废 -->
-					<view class="danState"  :class="{danState3:item.PayState == 2}" v-if="item.SheetState < 2 ">未审核</view>
-					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 2">已审核</view>
-					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
+					</view>
+					
+					
+				</view>
+				<view class="stateBox"  v-if="item.SheetType == 2">
+					<!-- 0待施工（已保存）1施工中（已派工）2已审核 3已质检 4 已作废 -->
+					<view class="danState"  :class="{danState3:item.PayState == 2}" v-if="item.SheetState < 2 ">未审核</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 2">已审核</view>
+					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
 					<!-- 结算状态 -->
 					<view v-if="item.SheetState == 4">
 						<view class="danState" v-if="item.PayState == 0">/未结算</view>
@@ -48,15 +48,15 @@
 					<view v-else>
 						<view class="danState3" v-if="item.PayState == 0">/未结算</view>
 						<view class="danState2" v-if="item.PayState == 2">/已结算</view>
-					</view>
-					
-					
-					
-				</view>
-				<view class="stateBox"  v-if="item.SheetType == 3">
-					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
-					<view class="danState" :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 0">已保存</view>
-					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
+					</view>
+					
+					
+					
+				</view>
+				<view class="stateBox"  v-if="item.SheetType == 3">
+					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
+					<view class="danState" :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 0">已保存</view>
+					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
 					<!-- 结算状态 -->
 					<view v-if="item.SheetState == 4">
 						<view class="danState" v-if="item.PayState == 0">/未结算</view>
@@ -65,41 +65,41 @@
 					<view v-else>
 						<view class="danState" v-if="item.PayState == 0">/未结算</view>
 						<view class="danState2" v-if="item.PayState == 2">/已结算</view>
-					</view>
-					
-				</view>
-				
-			</view>
-			
+					</view>
+					
+				</view>
+				
+			</view>
+			
 			
 			<view class="carPlate">
-				<view class="plateBox">
-					<view class="plate">{{item.PlateNumber}}</view>
-					
-					<view class="mileage" v-if="item.CurrentMileage>0">{{item.CurrentMileage}}km</view>
-				</view>
+				<view class="plateBox">
+					<view class="plate">{{item.PlateNumber}}</view>
+					
+					<view class="mileage" v-if="item.CurrentMileage>0">{{item.CurrentMileage}}km</view>
+				</view>
 				<view v-if="ReceiptsMoney" class="price"><span style="font-size: 22rpx;">￥</span>{{item.money?item.money:0}}</view>
-			</view>
+			</view>
 			<view class="time">{{item.time}}</view>
 
-			<view class="shopName">{{item.ShopName}}</view>
+			<view class="shopName">{{item.ShopName}}</view>
 			
-			<!-- <view class="itemN" v-if="item.listItems.length != 0">
-				<view class="itemContent" v-if="item.listItems.length != 0" v-for="(v,i) in item.listItems">{{v.ItemName}},</view>
-			</view>
-			<view class="itemN" v-if="item.listParts.length != 0">
-				<view class="itemContent" v-if="item.listParts.length != 0" v-for="(v,i) in item.listParts">{{v.GoodsName}},</view>
+			<!-- <view class="itemN" v-if="item.listItems.length != 0">
+				<view class="itemContent" v-if="item.listItems.length != 0" v-for="(v,i) in item.listItems">{{v.ItemName}},</view>
+			</view>
+			<view class="itemN" v-if="item.listParts.length != 0">
+				<view class="itemContent" v-if="item.listParts.length != 0" v-for="(v,i) in item.listParts">{{v.GoodsName}},</view>
 			</view> -->
 			<view class="itemN" v-if="item.ItemName">
 				<view class="itemContent" >{{item.ItemName}}</view>
 			</view>
 			<view class="itemN" v-if="item.GoodsName">
 				<view class="itemContent" >{{item.GoodsName}}</view>
-			</view>
-			
-			<view v-if="((item.PayState == 2) && (appraise == true) && ((item.lastDay <= 30 && item.EvaluateState == 0) || item.EvaluateState == 1))" class="bottom">
-				<view v-if="(item.EvaluateState == 0) && (item.lastDay <= 30) && appraise == true && item.PayState == 2" @click.stop="goAppraise(item)" class="ping">评价</view>
-				<view v-if="item.EvaluateState == 1" @click.stop="goAppraiseDetail(item)" class="kan">查看评价</view>
+			</view>
+			
+			<view v-if="((item.PayState == 2) && (appraise == true) && ((item.lastDay <= 30 && item.EvaluateState == 0) || item.EvaluateState == 1))" class="bottom">
+				<view v-if="(item.EvaluateState == 0) && (item.lastDay <= 30) && appraise == true && item.PayState == 2" @click.stop="goAppraise(item)" class="ping">评价</view>
+				<view v-if="item.EvaluateState == 1" @click.stop="goAppraiseDetail(item)" class="kan">查看评价</view>
 			</view>
 		</view>
 		<view class="itemHistory" v-for="(item,index) in oldlist" :key="index" @click="goDetail2(item)">
@@ -145,7 +145,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
@@ -168,8 +168,8 @@
 				page: 1,
 				itemData: [],
 				oldlist:[],
-				noMoreShow: false,
-				appraise:false,
+				noMoreShow: false,
+				appraise:false,
 				ReceiptsMoney:false,//支付金额
 				iStatusBarHeight:'',
 				array: [],
@@ -255,45 +255,45 @@
 					this.array=res.data.split(',')
 					this.array.unshift('全部')
 				})
-			},
-			//显示权限
-			showPower() {
-				this.$http('openweiXinCardInfoController/getShowSetting', {
-			
-				}, 'GET').then(res => {
-					var list = res.data
-					list.forEach((item, index) => {
-						
-						if (item.fieldValue == 'ReceiptsMoney') {
-							this.ReceiptsMoney = item.isChecked
-						}
-						
-						
-						
-					})
-					
-				})
-			},
-			//评价权限
-			myPower() {
-				this.$http('openMiniEvaluate/getEvaluateSetting', {
-			
-				}, 'GET').then(res => {
-					// var list = res.data.Items
-					this.appraise = res.data
-					
-					
-				})
-			},
-			goAppraiseDetail(item) {
-				uni.navigateTo({
-					url: 'myAppraiseDetail?sheetId=' + item.id
-				})
-			},
-			goAppraise(item){
-				uni.navigateTo({
-					url: 'appraise?sheetID=' + item.id + '&shopID=' + item.shopID
-				})
+			},
+			//显示权限
+			showPower() {
+				this.$http('openweiXinCardInfoController/getShowSetting', {
+			
+				}, 'GET').then(res => {
+					var list = res.data
+					list.forEach((item, index) => {
+						
+						if (item.fieldValue == 'ReceiptsMoney') {
+							this.ReceiptsMoney = item.isChecked
+						}
+						
+						
+						
+					})
+					
+				})
+			},
+			//评价权限
+			myPower() {
+				this.$http('openMiniEvaluate/getEvaluateSetting', {
+			
+				}, 'GET').then(res => {
+					// var list = res.data.Items
+					this.appraise = res.data
+					
+					
+				})
+			},
+			goAppraiseDetail(item) {
+				uni.navigateTo({
+					url: 'myAppraiseDetail?sheetId=' + item.id
+				})
+			},
+			goAppraise(item){
+				uni.navigateTo({
+					url: 'appraise?sheetID=' + item.id + '&shopID=' + item.shopID
+				})
 			},
 			goDetail(item) {
 				 uni.navigateTo({
@@ -306,7 +306,7 @@
 					url: '../subPack/oldhistoryDetail?id=' + item.id + '&lastDay=' + item.lastDay
 				})
 			},
-			myOrderCoupon() {
+			myOrderCoupon() {
 				let that = this
 				uni.showLoading({
 					title: '加载中'
@@ -317,9 +317,9 @@
 					// limit: 10,
 				}, 'POST').then(res => {
 					uni.hideLoading();
-					// var list = res.data.Items
+					// var list = res.data.Items
 					var list = res.data
-					
+					
 					
 
 					if (this.page == 1) {
@@ -355,62 +355,62 @@
 					}
 				})
 			},
-			//时间对比
-			getDateBeforeNow(stringTime) {
-							console.log("传参未格式化", stringTime);
-							stringTime = new Date(stringTime.replace(/-/g, '/'))
-			
-							// 统一单位换算
-							var minute = 1000 * 60;
-							var hour = minute * 60;
-							var day = hour * 24;
-							var week = day * 7;
-							var month = day * 30;
-							var year = month * 12;
-			
-							var time1 = new Date().getTime(); //当前的时间戳
-							console.log("当前时间", time1);
-			
-							// 对时间进行毫秒单位转换
-							var time2 = new Date(stringTime).getTime(); //指定时间的时间戳
-			
-							console.log("传过来的时间", time2);
-			
-							var time = time1 - time2;
-							console.log("计算后的时间", time);
-			
-							var result = null;
-							// if (time < 0) {
-							// 	// alert("传过来的时间的时间不能晚于当前时间！");
-							// 	result = stringTime;
-							// } else if (time / year >= 1) {
-							// 	result = parseInt(time / year) + "年前";
-							// } else if (time / month >= 1) {
-							// 	result = parseInt(time / month) + "月前";
-							// } else if (time / week >= 1) {
-							// 	result = parseInt(time / week) + "周前";
-							// } else if (time / day >= 1) {
-							// 	result = parseInt(time / day) + "天前";
-							// } else if (time / hour >= 1) {
-							// 	result = parseInt(time / hour) + "小时前";
-							// } else if (time / minute >= 1) {
-							// 	result = parseInt(time / minute) + "分钟前";
-							// } else {
-							// 	result = "刚刚";
-							// }
-							
-							if (time < 0) {
-								// alert("传过来的时间的时间不能晚于当前时间！");
-								result = -1;
-							} else if (time / day >= 0) {
-								result = parseInt(time / day);//多少天前
-							}
-							console.log("多少天前", result);
-							return result;
+			//时间对比
+			getDateBeforeNow(stringTime) {
+							console.log("传参未格式化", stringTime);
+							stringTime = new Date(stringTime.replace(/-/g, '/'))
+			
+							// 统一单位换算
+							var minute = 1000 * 60;
+							var hour = minute * 60;
+							var day = hour * 24;
+							var week = day * 7;
+							var month = day * 30;
+							var year = month * 12;
+			
+							var time1 = new Date().getTime(); //当前的时间戳
+							console.log("当前时间", time1);
+			
+							// 对时间进行毫秒单位转换
+							var time2 = new Date(stringTime).getTime(); //指定时间的时间戳
+			
+							console.log("传过来的时间", time2);
+			
+							var time = time1 - time2;
+							console.log("计算后的时间", time);
+			
+							var result = null;
+							// if (time < 0) {
+							// 	// alert("传过来的时间的时间不能晚于当前时间！");
+							// 	result = stringTime;
+							// } else if (time / year >= 1) {
+							// 	result = parseInt(time / year) + "年前";
+							// } else if (time / month >= 1) {
+							// 	result = parseInt(time / month) + "月前";
+							// } else if (time / week >= 1) {
+							// 	result = parseInt(time / week) + "周前";
+							// } else if (time / day >= 1) {
+							// 	result = parseInt(time / day) + "天前";
+							// } else if (time / hour >= 1) {
+							// 	result = parseInt(time / hour) + "小时前";
+							// } else if (time / minute >= 1) {
+							// 	result = parseInt(time / minute) + "分钟前";
+							// } else {
+							// 	result = "刚刚";
+							// }
+							
+							if (time < 0) {
+								// alert("传过来的时间的时间不能晚于当前时间！");
+								result = -1;
+							} else if (time / day >= 0) {
+								result = parseInt(time / day);//多少天前
+							}
+							console.log("多少天前", result);
+							return result;
 						},
 			
 
-		},
+		},
 		
 
 		// 下拉刷新 
@@ -420,8 +420,8 @@
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
-		},
-		
+		},
+		
 		// 上拉加载更多
 		onReachBottom() {
 			// this.page++;
@@ -434,7 +434,7 @@
 	.box {
 		min-height: 100vh;
 		background-color: #F4F5F7;
-		padding-top: 20rpx;
+		padding-top: 20rpx;
 		
 	}
 .jtImg{
@@ -458,28 +458,28 @@
 		padding: 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-	}
-	.topBox{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
 	}
-	.dan {
-		font-size: 24rpx;
-		
-		color: #999999;
-	}
-	.stateBox{
-		display: flex;
-	}
-	.danState{
-		font-size: 24rpx;
-		color: #999999;
-		
-	}
-	.danState2{
+	.topBox{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.dan {
+		font-size: 24rpx;
+		
+		color: #999999;
+	}
+	.stateBox{
+		display: flex;
+	}
+	.danState{
+		font-size: 24rpx;
+		color: #999999;
+		
+	}
+	.danState2{
 		font-size: 24rpx;
-		    color: #00A040;
+		    color: #00A040;
 	}
 	.danState3{
 		font-size: 24rpx;
@@ -496,9 +496,9 @@
 		align-items: center;
 		justify-content: space-between;
 	}
-	
-	.plateBox {
-		display: flex;
+	
+	.plateBox {
+		display: flex;
 	}
 	.plate {
 		font-size: 30rpx;
@@ -515,19 +515,19 @@
 		border-radius: 4rpx;
 		height: 33rpx;
 	}
-	.price{
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #FF0000;
-	}
-	.itemN {
-		margin-top: 15rpx;
-		display: flex;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
+	.price{
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #FF0000;
+	}
+	.itemN {
+		margin-top: 15rpx;
+		display: flex;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 	
 	.shopName{
 		color: #666666;
@@ -542,43 +542,43 @@
 		color: #666666;
 		font-size: 24rpx;
 		
-	}
-	.bottom{
-		padding-top: 20rpx;
-		border-top: 1rpx solid #EEEEEE;
-		margin-top: 20rpx;
-		display: flex;
-		justify-content: flex-end;
-		font-size: 28rpx;
-		margin-left: -24rpx;
-		margin-right: -24rpx;
-	}
-	
-	.ping{
-		text-align: center;
-		color: #666666;
-		width: 150rpx;
-		height: 56rpx;
-		line-height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #DDDDDD;
-		margin-right: 24rpx;
-	}
-	.kan{
-		text-align: center;
-		color: #666666;
-		width: 150rpx;
-		height: 56rpx;
-		line-height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #DDDDDD;
-		margin-right: 24rpx;
-	}
-	.noMore {
-		text-align: center;
-		line-height: 50rpx;
-		color: #999999;
-		font-size: 28rpx;
+	}
+	.bottom{
+		padding-top: 20rpx;
+		border-top: 1rpx solid #EEEEEE;
+		margin-top: 20rpx;
+		display: flex;
+		justify-content: flex-end;
+		font-size: 28rpx;
+		margin-left: -24rpx;
+		margin-right: -24rpx;
+	}
+	
+	.ping{
+		text-align: center;
+		color: #666666;
+		width: 150rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #DDDDDD;
+		margin-right: 24rpx;
+	}
+	.kan{
+		text-align: center;
+		color: #666666;
+		width: 150rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #DDDDDD;
+		margin-right: 24rpx;
+	}
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
 	}
 	.authorizBox{
 			width: 100vw;
@@ -639,4 +639,4 @@
 			margin-top: 62rpx;
 			margin-left:71rpx;
 		}
-</style>
+</style>

pages/user/myBespeak.vue

@@ -30,7 +30,7 @@
         	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
         		<view class="authorizCont" @click.stop="">
         			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-        			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+        			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
         			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
         		</view>
         		<view style="text-align: center;padding-top: 56rpx;">

pages/user/myOrder/activityOrderDetail.vue

@@ -1,21 +1,21 @@
 <template>
 	<view class="box">
-	
-		<!-- 自定义导航 -->
-	<!-- 	<view class="zdyNavBox">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="zdyNav">
-				<view class="zdyNavLeft">
-					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
-					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
-				</view>
-				<view class="zdyNavTitle">订单详情</view>
-				<view style="width: 100px;"></view>
-			</view>
-		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view> -->
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
+	
+		<!-- 自定义导航 -->
+	<!-- 	<view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">订单详情</view>
+				<view style="width: 100px;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
 			如果支付状态未及时更新，请点击 <span style="color: #3F90F7;">刷新</span> 
 		</view>
@@ -102,16 +102,16 @@
 			 </view> -->
 			</view>
 			
-			
-			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
-				<view class="informationLine2">
-					<view class="goodsName">{{item.itemName}}</view>
-					<view class="huodong" @click="goDetail(item.itemId)">
-						<view class="goodsName3">活动详情</view>
-						<image src="../../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
-					</view>
-				</view>
-				<view class="salePrice"><span class="informationNum">￥</span>{{orderData.data.payType==1? item.salePrice:0}}</view>
+			
+			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
+				<view class="informationLine2">
+					<view class="goodsName">{{item.itemName}}</view>
+					<view class="huodong" @click="goDetail(item.itemId)">
+						<view class="goodsName3">活动详情</view>
+						<image src="../../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
+					</view>
+				</view>
+				<view class="salePrice"><span class="informationNum">￥</span>{{orderData.data.payType==1? item.salePrice:0}}</view>
 			</view>
 			
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4&& orderData.data.sheetState != 5" class="line"></view>
@@ -160,28 +160,28 @@
 
 		<!-- 订单信息 -->
 		<view class="information">
-			<view class="detailedTitle">订单信息</view>
-			<view class="informationLine" v-if="orderData.data.plateNumber">
-				<view class="informationTxt">车牌号：</view>
-				<view class="informationNum">{{orderData.data.plateNumber}}</view>
-			</view>
-			
-			<view class="informationLine" v-if="orderData.data.customerName">
-				<view class="informationTxt">联系人：</view>
-				<view class="informationNum">{{orderData.data.customerName}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.data.mobilePhone">
-				<view class="informationTxt">手机号：</view>
-				<view class="informationNum">{{orderData.data.mobilePhone}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.data.unit">
-				<view class="informationTxt">单位：</view>
-				<view class="informationNum">{{orderData.data.unit}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">报名时间：</view>
-				<view class="informationNum">{{orderData.data.createTime}}</view>
-			</view>
+			<view class="detailedTitle">订单信息</view>
+			<view class="informationLine" v-if="orderData.data.plateNumber">
+				<view class="informationTxt">车牌号：</view>
+				<view class="informationNum">{{orderData.data.plateNumber}}</view>
+			</view>
+			
+			<view class="informationLine" v-if="orderData.data.customerName">
+				<view class="informationTxt">联系人：</view>
+				<view class="informationNum">{{orderData.data.customerName}}</view>
+			</view>
+			<view class="informationLine" v-if="orderData.data.mobilePhone">
+				<view class="informationTxt">手机号：</view>
+				<view class="informationNum">{{orderData.data.mobilePhone}}</view>
+			</view>
+			<view class="informationLine" v-if="orderData.data.unit">
+				<view class="informationTxt">单位：</view>
+				<view class="informationNum">{{orderData.data.unit}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">报名时间：</view>
+				<view class="informationNum">{{orderData.data.createTime}}</view>
+			</view>
 			
 			<view class="informationLine">
 				<view class="informationTxt">订单单号：</view>
@@ -254,23 +254,23 @@
 					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
-				</view>
-				<swiper class="swiper" circular :current='swiperIndex'  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
-					<swiper-item v-for="(item,index) in quanMaList">
-						<view class="swiper-item">
-							<view class="maCode">{{item}}</view>
-							<view class="maBoximg">
-								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
-									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
-									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
-							</view>
-						</view>
-					</swiper-item>
-					
-					
+				</view>
+				<swiper class="swiper" circular :current='swiperIndex'  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+					<swiper-item v-for="(item,index) in quanMaList">
+						<view class="swiper-item">
+							<view class="maCode">{{item}}</view>
+							<view class="maBoximg">
+								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
+									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
+									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
+							</view>
+						</view>
+					</swiper-item>
+					
+					
 				</swiper>
-				
-			
+				
+			
 			</view>
 		</view>
 
@@ -278,7 +278,7 @@
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">
@@ -380,7 +380,7 @@
 		data() {
 			return {
 
-				id: '',
+				id: '',
 				iStatusBarHeight:'',
 				
 				orderData: '',
@@ -401,9 +401,9 @@
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
 				src: '', // 二维码生成后的图片地址或base64
-				isShowMa: false,
+				isShowMa: false,
 				quanMaList:[],
-				 themeColor:'',
+				 themeColor:'',
                 authorizShow:false,
                 userInfo:'',
                 ext:'',
@@ -447,10 +447,10 @@
 					}
             	})
             }
-			this.sx=opt.sx
+			this.sx=opt.sx
 			
 
-		},
+		},
 		
 
 		methods: {
@@ -510,7 +510,7 @@
 			},
 			seeTyshowBtn(){
 				this.seeTyshow=true;
-			},
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code
@@ -541,13 +541,13 @@
 			},
 			isShowMaHide(){
 				this.isShowMa=false
-			},
-			goDetail(id) {
-				console.log('id--',id);
-				uni.navigateTo({
-					
-					url: '../../activity/jkDetail?id=' + id
-				})
+			},
+			goDetail(id) {
+				console.log('id--',id);
+				uni.navigateTo({
+					
+					url: '../../activity/jkDetail?id=' + id
+				})
 			},
 			pay(){
 				this.$http('openMallOrder/unifiedPay', {
@@ -640,45 +640,45 @@
 
 				})
 			},
-			
-			cancelBespeak(){
-				var that = this
-				uni.showModal({
-				    title: '提示',
-				    content: '是否取消该订单',
-					cancelText:'否',
-					confirmText:'是',
-				    success: function (res) {
-				        if (res.confirm) {
-							
-								uni.showLoading({
-									title: '加载中'
-								})
-								
-								that.$http('openOrderManagement/updateSheetState', {
-							
-									id: that.id,
-							
-								}, 'POST').then(res => {
-									uni.hideLoading();
-									// var list = res.data.Items
-									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
-								})
-							
-				          
-				        } else if (res.cancel) {
-				           
-				        }
-				    }
-				});
+			
+			cancelBespeak(){
+				var that = this
+				uni.showModal({
+				    title: '提示',
+				    content: '是否取消该订单',
+					cancelText:'否',
+					confirmText:'是',
+				    success: function (res) {
+				        if (res.confirm) {
+							
+								uni.showLoading({
+									title: '加载中'
+								})
+								
+								that.$http('openOrderManagement/updateSheetState', {
+							
+									id: that.id,
+							
+								}, 'POST').then(res => {
+									uni.hideLoading();
+									// var list = res.data.Items
+									
+									uni.showToast({
+										title: '取消成功',
+										icon: 'none',
+										duration: 2000
+									});
+									setTimeout(function() {
+										that.getData();
+									}, 1000);
+								})
+							
+				          
+				        } else if (res.cancel) {
+				           
+				        }
+				    }
+				});
 			},
 			
 			map() {
@@ -726,16 +726,16 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
-					if (this.quanMaList) {
-						this.quanMaList = [];
-					}
-					let maList = this.orderData.OpenSheetQRCode;
-					if (maList) {
-						maList.forEach(item =>{
-							if (item.writeoffState==1) {
-								this.quanMaList.push(item.qrCode);
-							}
-						})
+					if (this.quanMaList) {
+						this.quanMaList = [];
+					}
+					let maList = this.orderData.OpenSheetQRCode;
+					if (maList) {
+						maList.forEach(item =>{
+							if (item.writeoffState==1) {
+								this.quanMaList.push(item.qrCode);
+							}
+						})
 					}
 					if(this.sx&&this.sxNum){
 						uni.showToast({
@@ -743,9 +743,9 @@
 							icon: 'none',
 							duration: 3000
 						});
-					}
-					this.clock()
-					console.log('可用券码--',this.quanMaList);
+					}
+					this.clock()
+					console.log('可用券码--',this.quanMaList);
 					
 				})
 			},
@@ -823,14 +823,14 @@
 			  setTimeout(_this.clock, 1000)
 			},
 			goback() {
-				uni.navigateBack({
-				 	delta: 1
+				uni.navigateBack({
+				 	delta: 1
+				})
+			},
+			gohome(){
+				uni.switchTab({
+					url:'../../index/index'
 				})
-			},
-			gohome(){
-				uni.switchTab({
-					url:'../../index/index'
-				})
 			},
 
 		},
@@ -905,12 +905,12 @@
 }
 .grouptkLIne{
 	display: flex;padding: 15rpx 24rpx;
-	justify-content: space-between;font-weight: 400;
-color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
+	justify-content: space-between;font-weight: 400;
+color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
 }
 .grouptk .maTitle{
 	 padding-left: 4rpx; 
-	 color: #333333;font-weight: 500;
+	 color: #333333;font-weight: 500;
 }
 .ptCont{
 	width: 702rpx;
@@ -942,10 +942,10 @@ color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
 	color: #FFFFFF;
 }
 .DiffBNumber{
-	color: #764D49;font-size: 24rpx;text-align: center;padding-top:16rpx;padding-bottom: 30rpx;
+	color: #764D49;font-size: 24rpx;text-align: center;padding-top:16rpx;padding-bottom: 30rpx;
 }
 .ptmobilePhoneLine{
-	display: flex;font-weight: 400;justify-content: center;
+	display: flex;font-weight: 400;justify-content: center;
 color: #764D49;font-size: 26rpx;padding-top:20rpx;
 }
 .vipIcon{
@@ -973,46 +973,46 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		min-height: 100vh;
 		background: #F4F5F7;
 		padding-bottom: 135rpx;
-	}
-	.zdyNavBox{
-		width: 100vw;
-		background: #FFFFFF;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 9999999;
-	}
-	.zdyNav{
-		height: 44px;
-		display: flex;
-		justify-content: space-between;
-		
-		align-items: center;
-	}
-	
-	.backImg{
-		width: 44rpx;
-		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
-	}
-	.homeImg{
-		width: 44rpx;
-		height: 44rpx;
-		
-	}
-	.zdyNavLeft{
-		display: flex;
-		align-items: center;
-	}
-	.zdyNavTitle{
-		width: 100vw;
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
-	}
+	}
+	.zdyNavBox{
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	}
+	.zdyNav{
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+		
+		align-items: center;
+	}
+	
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+	.homeImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.zdyNavLeft{
+		display: flex;
+		align-items: center;
+	}
+	.zdyNavTitle{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 	
 
 	.top {
@@ -1149,8 +1149,8 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.code {
 		font-size: 26rpx;
 		color: #333333;
-		font-weight: bold;
-		width: 180rpx
+		font-weight: bold;
+		width: 180rpx
 	}
 
 	.old {
@@ -1178,15 +1178,15 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		border-radius: 4rpx;
 		margin-left: 20rpx;
 	}
-	.quanState2{
-		font-size: 22rpx;
-		color: #999999;
-		padding: 0 10rpx;
-		
-		border: 1rpx solid #DDDDDD;
-		
-		border-radius: 4rpx;
-		margin-left: 20rpx;
+	.quanState2{
+		font-size: 22rpx;
+		color: #999999;
+		padding: 0 10rpx;
+		
+		border: 1rpx solid #DDDDDD;
+		
+		border-radius: 4rpx;
+		margin-left: 20rpx;
 	}
 
 
@@ -1210,13 +1210,13 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		display: flex;
 		justify-content: space-between;
 		font-size: 26rpx;
-		padding: 20rpx;
-		align-items: center;
+		padding: 20rpx;
+		align-items: center;
 		padding-bottom: 0;
 	}
 
 	.salePrice {
-		    padding-left: 20rpx;
+		    padding-left: 20rpx;
 		    padding-top: 15rpx;
 		font-size: 26rpx;
 		font-weight: 500;
@@ -1251,23 +1251,23 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.goodsName {
 		width: 70%;
 		color: #333333;
-		font-size: 26rpx;
+		font-size: 26rpx;
 		
-	}
-	.huodong{
-		display: flex;
-		align-items: center;
-	}
-	.goodsName3{
-		color: #333333;
-		font-size: 26rpx;
-		
-	}
-	.goodsName2{
-		padding: 20rpx 20rpx 15rpx;
-		
-		color: #333333;
-		font-size: 26rpx;
+	}
+	.huodong{
+		display: flex;
+		align-items: center;
+	}
+	.goodsName3{
+		color: #333333;
+		font-size: 26rpx;
+		
+	}
+	.goodsName2{
+		padding: 20rpx 20rpx 15rpx;
+		
+		color: #333333;
+		font-size: 26rpx;
 	}
 
 	.informationNum {
@@ -1284,7 +1284,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		color: #333333;
 		text-align: center;
 		line-height: 33rpx;
-		padding: 0 15rpx;
+		padding: 0 15rpx;
 		margin-left: 20rpx;
 	}
 
@@ -1349,7 +1349,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	}
 
 	.itemTop {
-		padding: 18rpx 20rpx;
+		padding: 18rpx 20rpx;
 		padding-right: 0;
 		background-color: #FFEFD5;
 
@@ -1362,24 +1362,24 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		width: 104rpx;
 		font-size: 26rpx;
 		color: #333333;
-		margin-right: 20rpx;
+		margin-right: 20rpx;
 		text-align: right;
-	}
+	}
 	
 
-	.leftItem {
-		font-size: 26rpx;
-		color: #333333;
+	.leftItem {
+		font-size: 26rpx;
+		color: #333333;
 		margin-right: 20rpx;
-		flex-grow: 1;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		flex-grow: 1;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
 	.itemContent {
-		padding: 20rpx;
+		padding: 20rpx;
 		padding-right: 0;
 		background-color: #FFFFFF;
 
@@ -1420,17 +1420,17 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		font-size: 26rpx;
 		text-align: center;
 		padding-left: 100rpx;
-	}
-	.swiper{
-		width: 100%;
-		height: 85%;
-		background: #FFFFFF;
-		
-	}
-	.swiper-item{
-		width: 100%;
-		height: 100%;
-	}
+	}
+	.swiper{
+		width: 100%;
+		height: 85%;
+		background: #FFFFFF;
+		
+	}
+	.swiper-item{
+		width: 100%;
+		height: 100%;
+	}
 	
 	
 	.maCode {
@@ -1439,7 +1439,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		font-weight: 500;
 		color: #333333;
 		line-height: 42rpx;
-		margin-bottom: 40rpx;
+		margin-bottom: 40rpx;
 		text-align: center;
 	}
 
@@ -1535,103 +1535,103 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 			height: 100%;
 			}
 			
-.tuikuanBox {
-		width: 100%;
-		height: 100vh;
-		background: rgba(0, 0, 0, 0.4);
-		position: fixed;
-		left: 0;
-		top: 0;
-		z-index: 999;
-	}
-	
-	.tuikuan {
-		width: 638rpx;
-		height: 664rpx;
-		background: #ffffff;
-		margin: 0 36rpx;
-		margin-top: 50%;
-		border-radius: 24rpx;
-		padding: 30rpx 20rpx;
-	}
-	
-	.tuiTop {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 36rpx;
-	}
-	
-	.tuiTitle {
-		width: 56rpx;
-		height: 40rpx;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #3C3C3C;
-		line-height: 40rpx;
-	
-	}
-	
-	.contLine {
-		display: flex;
-		justify-content: space-between;
-		font-size: 28rpx;
-		padding: 30rpx 0;
-		border-bottom: 1px solid #EEEEEE;
-	}
-	
-	.contlineLeft {
-		color: #666666;
-		line-height: 40rpx;
-		align-items: center;
-	}
-	
-	.star {
-		width: 14rpx;
-		height: 14rpx;
-		padding-bottom: 5rpx;
-	}
-	
-	.carModel {
-		width: 350rpx;
-		text-align: left;
-	}
-	
-	.noColor {
-		color: #CCCCCC;
-	}
-	
-	.carModelRight {
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-	}
-	
-	.contlineRight {
-		color: #333333;
-		line-height: 40rpx;
-	
-		width: 400rpx;
-		text-align: right;
-	}
-	
-	.contlineRightInput {
-		color: #333333;
-		text-align: left;
-		font-size: 28rpx;
-		min-height: 182rpx;
-		width: 400rpx;
-	}
-	
-	.contlineRightJt {
-		width: 30rpx;
-		height: 30rpx;
-	
-	}
-	
-	.tuiBtns {
-		display: flex;justify-content: space-around;
-		padding: 40rpx 20rpx 10rpx;
-	
+.tuikuanBox {
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, 0.4);
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 999;
+	}
+	
+	.tuikuan {
+		width: 638rpx;
+		height: 664rpx;
+		background: #ffffff;
+		margin: 0 36rpx;
+		margin-top: 50%;
+		border-radius: 24rpx;
+		padding: 30rpx 20rpx;
+	}
+	
+	.tuiTop {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 36rpx;
+	}
+	
+	.tuiTitle {
+		width: 56rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #3C3C3C;
+		line-height: 40rpx;
+	
+	}
+	
+	.contLine {
+		display: flex;
+		justify-content: space-between;
+		font-size: 28rpx;
+		padding: 30rpx 0;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	
+	.contlineLeft {
+		color: #666666;
+		line-height: 40rpx;
+		align-items: center;
+	}
+	
+	.star {
+		width: 14rpx;
+		height: 14rpx;
+		padding-bottom: 5rpx;
+	}
+	
+	.carModel {
+		width: 350rpx;
+		text-align: left;
+	}
+	
+	.noColor {
+		color: #CCCCCC;
+	}
+	
+	.carModelRight {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
+	
+	.contlineRight {
+		color: #333333;
+		line-height: 40rpx;
+	
+		width: 400rpx;
+		text-align: right;
+	}
+	
+	.contlineRightInput {
+		color: #333333;
+		text-align: left;
+		font-size: 28rpx;
+		min-height: 182rpx;
+		width: 400rpx;
+	}
+	
+	.contlineRightJt {
+		width: 30rpx;
+		height: 30rpx;
+	
+	}
+	
+	.tuiBtns {
+		display: flex;justify-content: space-around;
+		padding: 40rpx 20rpx 10rpx;
+	
 	}
 	.btn {
 		width: 250rpx;
@@ -1682,4 +1682,4 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		padding-left: 24rpx;
 		font-size: 26rpx;
 	}
-</style>
+</style>

pages/user/myOrder/mallOrderDetail.vue

@@ -1,21 +1,21 @@
 <template>
 	<view class="box">
-	
-		<!-- 自定义导航 -->
-		<!-- <view class="zdyNavBox">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="zdyNav">
-				<view class="zdyNavLeft">
-					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
-					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
-				</view>
-				<view class="zdyNavTitle">订单详情</view>
-				<view style="width: 100px;"></view>
-			</view>
-		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view> -->
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
+	
+		<!-- 自定义导航 -->
+		<!-- <view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">订单详情</view>
+				<view style="width: 100px;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
 			如果支付状态未及时更新，请点击 <span style="color: #3F90F7;">刷新</span> 
 		</view>
@@ -62,17 +62,17 @@
 		<!-- 订单内容 -->
 		<view class="information">
 			<view class="detailedTitle">订单内容</view>
-			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
-				
-					<view class="goodsName">{{item.itemName}}</view>
-					<view class="informationLine2">
-						<view class="salePrice"><span
-								class="informationNum">￥</span>{{item.salePrice}}</view>
-						<view class="informationNum" style="color: #999999;">
-							x{{item.itemQty}}</view>
-					</view>
-				
-			</view>
+			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
+				
+					<view class="goodsName">{{item.itemName}}</view>
+					<view class="informationLine2">
+						<view class="salePrice"><span
+								class="informationNum">￥</span>{{item.salePrice}}</view>
+						<view class="informationNum" style="color: #999999;">
+							x{{item.itemQty}}</view>
+					</view>
+				
+			</view>
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4" class="line"></view>
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4">
 				<view class="goodsName">
@@ -243,30 +243,30 @@
 					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
-				</view>
-				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
-					<swiper-item v-for="(item,index) in quanMaList">
-						<view class="swiper-item">
-							<view class="maCode">{{item}}</view>
-							<view class="maBoximg">
-								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
-									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
-									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
-							</view>
-						</view>
-					</swiper-item>
-					
-					
+				</view>
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+					<swiper-item v-for="(item,index) in quanMaList">
+						<view class="swiper-item">
+							<view class="maCode">{{item}}</view>
+							<view class="maBoximg">
+								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
+									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
+									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
+							</view>
+						</view>
+					</swiper-item>
+					
+					
 				</swiper>
-				
-			
+				
+			
 			</view>
 		</view>
 <!-- 手机号授权 -->
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">
@@ -345,7 +345,7 @@
 		data() {
 			return {
 
-				id: '',
+				id: '',
 				iStatusBarHeight:'',
 				SheetType: '', //SheetType 1 商品2项目3套餐4救援5钣喷6集客
 				orderData: '',
@@ -366,7 +366,7 @@
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
 				src: '', // 二维码生成后的图片地址或base64
-				isShowMa: false,
+				isShowMa: false,
 				quanMaList:[],
 				themeColor:'',
 				authorizShow:false,
@@ -407,10 +407,10 @@
 					}
 				})
 			}
-			this.sx=opt.sx
+			this.sx=opt.sx
 			
 
-		},
+		},
 		
 
 		methods: {
@@ -471,7 +471,7 @@
 			},
 			isShowMaHide(){
 				this.isShowMa=false
-			},
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code
@@ -586,45 +586,45 @@
 
 
 				})
-			},
-			cancelBespeak(){
-				var that = this
-				uni.showModal({
-				    title: '提示',
-				    content: '是否取消该订单',
-					cancelText:'否',
-					confirmText:'是',
-				    success: function (res) {
-				        if (res.confirm) {
-							
-								uni.showLoading({
-									title: '加载中'
-								})
-								
-								that.$http('openOrderManagement/updateSheetState', {
-							
-									id: that.id,
-							
-								}, 'POST').then(res => {
-									uni.hideLoading();
-									// var list = res.data.Items
-									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
-								})
-							
-				          
-				        } else if (res.cancel) {
-				           
-				        }
-				    }
-				});
+			},
+			cancelBespeak(){
+				var that = this
+				uni.showModal({
+				    title: '提示',
+				    content: '是否取消该订单',
+					cancelText:'否',
+					confirmText:'是',
+				    success: function (res) {
+				        if (res.confirm) {
+							
+								uni.showLoading({
+									title: '加载中'
+								})
+								
+								that.$http('openOrderManagement/updateSheetState', {
+							
+									id: that.id,
+							
+								}, 'POST').then(res => {
+									uni.hideLoading();
+									// var list = res.data.Items
+									
+									uni.showToast({
+										title: '取消成功',
+										icon: 'none',
+										duration: 2000
+									});
+									setTimeout(function() {
+										that.getData();
+									}, 1000);
+								})
+							
+				          
+				        } else if (res.cancel) {
+				           
+				        }
+				    }
+				});
 			},
 			
 			map() {
@@ -672,38 +672,38 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
-					if (this.quanMaList) {
-						this.quanMaList = [];
-					}
-					let maList = this.orderData.OpenSheetQRCode;
-					if (maList) {
-						maList.forEach(item =>{
-							if (item.writeoffState==1) {
-								this.quanMaList.push(item.qrCode);
-							}
-						})
-					}
+					if (this.quanMaList) {
+						this.quanMaList = [];
+					}
+					let maList = this.orderData.OpenSheetQRCode;
+					if (maList) {
+						maList.forEach(item =>{
+							if (item.writeoffState==1) {
+								this.quanMaList.push(item.qrCode);
+							}
+						})
+					}
 					if(this.sx&&this.sxNum){
 						uni.showToast({
 							title: '刷新成功',
 							icon: 'none',
 							duration: 3000
 						});
-					}
-					console.log('可用券码--',this.quanMaList);
+					}
+					console.log('可用券码--',this.quanMaList);
 					
 				})
 			},
 			
 			goback() {
-				uni.navigateBack({
-				 	delta: 1
+				uni.navigateBack({
+				 	delta: 1
+				})
+			},
+			gohome(){
+				uni.switchTab({
+					url:'../../index/index'
 				})
-			},
-			gohome(){
-				uni.switchTab({
-					url:'../../index/index'
-				})
 			},
 
 		},
@@ -723,46 +723,46 @@
 		min-height: 100vh;
 		background: #F4F5F7;
 		padding-bottom: 135rpx;
-	}
-	.zdyNavBox{
-		width: 100vw;
-		background: #FFFFFF;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 9999999;
-	}
-	.zdyNav{
-		height: 44px;
-		display: flex;
-		justify-content: space-between;
-		
-		align-items: center;
-	}
-	
-	.backImg{
-		width: 44rpx;
-		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
-	}
-	.homeImg{
-		width: 44rpx;
-		height: 44rpx;
-		
-	}
-	.zdyNavLeft{
-		display: flex;
-		align-items: center;
-	}
-	.zdyNavTitle{
-		width: 100vw;
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
-	}
+	}
+	.zdyNavBox{
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	}
+	.zdyNav{
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+		
+		align-items: center;
+	}
+	
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+	.homeImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.zdyNavLeft{
+		display: flex;
+		align-items: center;
+	}
+	.zdyNavTitle{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 	
 
 	.top {
@@ -899,8 +899,8 @@
 	.code {
 		font-size: 26rpx;
 		color: #333333;
-		font-weight: bold;
-		width: 180rpx
+		font-weight: bold;
+		width: 180rpx
 	}
 
 	.old {
@@ -928,15 +928,15 @@
 		border-radius: 4rpx;
 		margin-left: 20rpx;
 	}
-	.quanState2{
-		font-size: 22rpx;
-		color: #999999;
-		padding: 0 10rpx;
-		
-		border: 1rpx solid #DDDDDD;
-		
-		border-radius: 4rpx;
-		margin-left: 20rpx;
+	.quanState2{
+		font-size: 22rpx;
+		color: #999999;
+		padding: 0 10rpx;
+		
+		border: 1rpx solid #DDDDDD;
+		
+		border-radius: 4rpx;
+		margin-left: 20rpx;
 	}
 
 
@@ -1016,7 +1016,7 @@
 		color: #333333;
 		text-align: center;
 		line-height: 33rpx;
-		padding: 0 15rpx;
+		padding: 0 15rpx;
 		margin-left: 20rpx;
 	}
 
@@ -1081,7 +1081,7 @@
 	}
 
 	.itemTop {
-		padding: 18rpx 20rpx;
+		padding: 18rpx 20rpx;
 		padding-right: 0;
 		background-color: #FFEFD5;
 
@@ -1094,24 +1094,24 @@
 		width: 104rpx;
 		font-size: 26rpx;
 		color: #333333;
-		margin-right: 20rpx;
+		margin-right: 20rpx;
 		text-align: right;
-	}
+	}
 	
 
-	.leftItem {
-		font-size: 26rpx;
-		color: #333333;
+	.leftItem {
+		font-size: 26rpx;
+		color: #333333;
 		margin-right: 20rpx;
-		flex-grow: 1;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		flex-grow: 1;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
 	.itemContent {
-		padding: 20rpx;
+		padding: 20rpx;
 		padding-right: 0;
 		background-color: #FFFFFF;
 
@@ -1152,17 +1152,17 @@
 		font-size: 26rpx;
 		text-align: center;
 		padding-left: 100rpx;
-	}
-	.swiper{
-		width: 100%;
-		height: 85%;
-		background: #FFFFFF;
-		
-	}
-	.swiper-item{
-		width: 100%;
-		height: 100%;
-	}
+	}
+	.swiper{
+		width: 100%;
+		height: 85%;
+		background: #FFFFFF;
+		
+	}
+	.swiper-item{
+		width: 100%;
+		height: 100%;
+	}
 	
 	
 	.maCode {
@@ -1171,7 +1171,7 @@
 		font-weight: 500;
 		color: #333333;
 		line-height: 42rpx;
-		margin-bottom: 40rpx;
+		margin-bottom: 40rpx;
 		text-align: center;
 	}
 
@@ -1386,4 +1386,4 @@
 				padding-left: 24rpx;
 				font-size: 26rpx;
 			}
-</style>
+</style>

pages/user/myOrder/myOrder.vue

@@ -45,7 +45,7 @@
 			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 				<view class="authorizCont" @click.stop="">
 					<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-					<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+					<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				</view>
 				<view style="text-align: center;padding-top: 56rpx;">
@@ -139,22 +139,22 @@
 				this.page = 1;
 				this.getData()
 			},
-			goDetail(item) {
-				//SheetType 1 商品2项目3套餐4救援5钣喷6集客
-				if((item.SheetType==1)||(item.SheetType==2)||(item.SheetType==3)){
-					uni.navigateTo({
-						url: "mallOrderDetail?id=" + item.ID +"&SheetType=" + item.SheetType
-					})
-				}
-				else if (item.SheetType==5){
-					uni.navigateTo({
-						url: "paintOrderDetail?id=" + item.ID
-					})
+			goDetail(item) {
+				//SheetType 1 商品2项目3套餐4救援5钣喷6集客
+				if((item.SheetType==1)||(item.SheetType==2)||(item.SheetType==3)){
+					uni.navigateTo({
+						url: "mallOrderDetail?id=" + item.ID +"&SheetType=" + item.SheetType
+					})
 				}
-				else if (item.SheetType==6){
-					uni.navigateTo({
-						url: "activityOrderDetail?id=" + item.ID//+'&sx=1'
-					})
+				else if (item.SheetType==5){
+					uni.navigateTo({
+						url: "paintOrderDetail?id=" + item.ID
+					})
+				}
+				else if (item.SheetType==6){
+					uni.navigateTo({
+						url: "activityOrderDetail?id=" + item.ID//+'&sx=1'
+					})
 				}
 			},
 			getData() {
@@ -237,13 +237,13 @@
 
 	.tabLine {
 
-		font-size: 28rpx;
+		font-size: 28rpx;
 		color: #333333;
 		text-align: center;
 	}
 
 	.tabActive {
-		color: #FF0000;
+		color: #FF0000;
 		font-weight: bold;
 		border-bottom: 4rpx solid #FF0000;
 
@@ -275,16 +275,16 @@
 	.itemSheetState {
 		font-size: 24rpx;
 		color: #999999
-	}
-	.redColor {
-		color: #FF0000;
-	}
-	.orangeColor {
-		color: #F19D01;
-	}
-	.greenColor {
-		color: #00A040;
-	}
+	}
+	.redColor {
+		color: #FF0000;
+	}
+	.orangeColor {
+		color: #F19D01;
+	}
+	.greenColor {
+		color: #00A040;
+	}
 	
 
 	.itemShopBg {
@@ -296,7 +296,7 @@
 
 	.shopName {
 		color: #333333;
-		font-size: 30rpx;
+		font-size: 30rpx;
 		font-weight: bold;
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
@@ -305,7 +305,7 @@
 	}
 
 	.price {
-		color: #333333;
+		color: #333333;
 		font-weight: bold;
 		font-size: 32rpx;
 	}
@@ -455,4 +455,4 @@
 			
 			height: 100%;
 			}
-</style>
+</style>

pages/user/myOrder/paintOrderDetail.vue

@@ -1,21 +1,21 @@
 <template>
 	<view class="box">
-	
-		<!-- 自定义导航 -->
-		<!-- <view class="zdyNavBox">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="zdyNav">
-				<view class="zdyNavLeft">
-					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
-					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
-				</view>
-				<view class="zdyNavTitle">订单详情</view>
-				<view style="width: 100px;"></view>
-			</view>
-		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view> -->
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
+	
+		<!-- 自定义导航 -->
+		<!-- <view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">订单详情</view>
+				<view style="width: 100px;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
 			如果支付状态未及时更新，请点击 <span style="color: #3F90F7;">刷新</span> 
 		</view>
@@ -62,12 +62,12 @@
 		<!-- 订单内容 -->
 		<view class="information">
 			<view class="detailedTitle">订单内容</view>
-			
-			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
-				<view class="informationLine2">
-					<view class="goodsName">{{item.itemName}}</view>
-					<view class="salePrice"><span class="informationNum">￥</span>{{item.salePrice}}</view>
-				</view>
+			
+			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
+				<view class="informationLine2">
+					<view class="goodsName">{{item.itemName}}</view>
+					<view class="salePrice"><span class="informationNum">￥</span>{{item.salePrice}}</view>
+				</view>
 			</view>
 			
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4" class="line"></view>
@@ -117,28 +117,28 @@
 
 		<!-- 订单信息 -->
 		<view class="information">
-			<view class="detailedTitle">订单信息</view>
-			<view class="informationLine">
-				<view class="informationTxt">车牌号：</view>
-				<view class="informationNum">{{orderData.data.plateNumber}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">车型：</view>
-				<view class="informationNum"  style="width: 480rpx;">{{orderData.data.carModel}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">联系人：</view>
-				<view class="informationNum">{{orderData.data.customerName}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">手机号：</view>
-				<view class="informationNum">{{orderData.data.mobilePhone}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">预约时间：</view>
-				<view class="informationNum">{{orderData.data.hTime}}</view>
-			</view>
-			
+			<view class="detailedTitle">订单信息</view>
+			<view class="informationLine">
+				<view class="informationTxt">车牌号：</view>
+				<view class="informationNum">{{orderData.data.plateNumber}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">车型：</view>
+				<view class="informationNum"  style="width: 480rpx;">{{orderData.data.carModel}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">联系人：</view>
+				<view class="informationNum">{{orderData.data.customerName}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">手机号：</view>
+				<view class="informationNum">{{orderData.data.mobilePhone}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">预约时间：</view>
+				<view class="informationNum">{{orderData.data.hTime}}</view>
+			</view>
+			
 			
 			<view class="informationLine">
 				<view class="informationTxt">订单单号：</view>
@@ -222,30 +222,30 @@
 					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
-				</view>
-				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
-					<swiper-item v-for="(item,index) in quanMaList">
-						<view class="swiper-item">
-							<view class="maCode">{{item}}</view>
-							<view class="maBoximg">
-								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
-									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
-									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
-							</view>
-						</view>
-					</swiper-item>
-					
-					
+				</view>
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+					<swiper-item v-for="(item,index) in quanMaList">
+						<view class="swiper-item">
+							<view class="maCode">{{item}}</view>
+							<view class="maBoximg">
+								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
+									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
+									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
+							</view>
+						</view>
+					</swiper-item>
+					
+					
 				</swiper>
-				
-			
+				
+			
 			</view>
 		</view>
 <!-- 手机号授权 -->
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">
@@ -324,7 +324,7 @@
 		data() {
 			return {
 
-				id: '',
+				id: '',
 				iStatusBarHeight:'',
 				
 				orderData: '',
@@ -345,9 +345,9 @@
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
 				src: '', // 二维码生成后的图片地址或base64
-				isShowMa: false,
+				isShowMa: false,
 				quanMaList:[],
-				 themeColor:'',
+				 themeColor:'',
                 authorizShow:false,
                 userInfo:'',
                 ext:'',
@@ -364,7 +364,7 @@
 			 this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
 			
-			 this.themeColor = uni.getStorageSync("themeColor");
+			 this.themeColor = uni.getStorageSync("themeColor");
              this.userInfo=this.$store.state.userInfo;
             this.ext=this.$common.getExtStoreId();
             if(this.userInfo){
@@ -385,10 +385,10 @@
 						this.authorizShow=true
 					}
             	})
-            }
+            }
 			
           this.sx=opt.sx
-		},
+		},
 		
 
 		methods: {
@@ -449,7 +449,7 @@
 			},
 			isShowMaHide(){
 				this.isShowMa=false
-			},
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code
@@ -564,45 +564,45 @@
 
 
 				})
-			},
-			cancelBespeak(){
-				var that = this
-				uni.showModal({
-				    title: '提示',
-				    content: '是否取消该订单',
-					cancelText:'否',
-					confirmText:'是',
-				    success: function (res) {
-				        if (res.confirm) {
-							
-								uni.showLoading({
-									title: '加载中'
-								})
-								
-								that.$http('openOrderManagement/updateSheetState', {
-							
-									id: that.id,
-							
-								}, 'POST').then(res => {
-									uni.hideLoading();
-									// var list = res.data.Items
-									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
-								})
-							
-				          
-				        } else if (res.cancel) {
-				           
-				        }
-				    }
-				});
+			},
+			cancelBespeak(){
+				var that = this
+				uni.showModal({
+				    title: '提示',
+				    content: '是否取消该订单',
+					cancelText:'否',
+					confirmText:'是',
+				    success: function (res) {
+				        if (res.confirm) {
+							
+								uni.showLoading({
+									title: '加载中'
+								})
+								
+								that.$http('openOrderManagement/updateSheetState', {
+							
+									id: that.id,
+							
+								}, 'POST').then(res => {
+									uni.hideLoading();
+									// var list = res.data.Items
+									
+									uni.showToast({
+										title: '取消成功',
+										icon: 'none',
+										duration: 2000
+									});
+									setTimeout(function() {
+										that.getData();
+									}, 1000);
+								})
+							
+				          
+				        } else if (res.cancel) {
+				           
+				        }
+				    }
+				});
 			},
 			
 			map() {
@@ -650,38 +650,38 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
-					if (this.quanMaList) {
-						this.quanMaList = [];
-					}
-					let maList = this.orderData.OpenSheetQRCode;
-					if (maList) {
-						maList.forEach(item =>{
-							if (item.writeoffState==1) {
-								this.quanMaList.push(item.qrCode);
-							}
-						})
-					}
+					if (this.quanMaList) {
+						this.quanMaList = [];
+					}
+					let maList = this.orderData.OpenSheetQRCode;
+					if (maList) {
+						maList.forEach(item =>{
+							if (item.writeoffState==1) {
+								this.quanMaList.push(item.qrCode);
+							}
+						})
+					}
 					if(this.sx&&this.sxNum){
 						uni.showToast({
 							title: '刷新成功',
 							icon: 'none',
 							duration: 3000
 						});
-					}
-					console.log('可用券码--',this.quanMaList);
+					}
+					console.log('可用券码--',this.quanMaList);
 					
 				})
 			},
 			
 			goback() {
-				uni.navigateBack({
-				 	delta: 1
+				uni.navigateBack({
+				 	delta: 1
+				})
+			},
+			gohome(){
+				uni.switchTab({
+					url:'../../index/index'
 				})
-			},
-			gohome(){
-				uni.switchTab({
-					url:'../../index/index'
-				})
 			},
 
 		},
@@ -701,46 +701,46 @@
 		min-height: 100vh;
 		background: #F4F5F7;
 		padding-bottom: 135rpx;
-	}
-	.zdyNavBox{
-		width: 100vw;
-		background: #FFFFFF;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 9999999;
-	}
-	.zdyNav{
-		height: 44px;
-		display: flex;
-		justify-content: space-between;
-		
-		align-items: center;
-	}
-	
-	.backImg{
-		width: 44rpx;
-		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
-	}
-	.homeImg{
-		width: 44rpx;
-		height: 44rpx;
-		
-	}
-	.zdyNavLeft{
-		display: flex;
-		align-items: center;
-	}
-	.zdyNavTitle{
-		width: 100vw;
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
-	}
+	}
+	.zdyNavBox{
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	}
+	.zdyNav{
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+		
+		align-items: center;
+	}
+	
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+	.homeImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.zdyNavLeft{
+		display: flex;
+		align-items: center;
+	}
+	.zdyNavTitle{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 	
 
 	.top {
@@ -877,8 +877,8 @@
 	.code {
 		font-size: 26rpx;
 		color: #333333;
-		font-weight: bold;
-		width: 180rpx
+		font-weight: bold;
+		width: 180rpx
 	}
 
 	.old {
@@ -906,15 +906,15 @@
 		border-radius: 4rpx;
 		margin-left: 20rpx;
 	}
-	.quanState2{
-		font-size: 22rpx;
-		color: #999999;
-		padding: 0 10rpx;
-		
-		border: 1rpx solid #DDDDDD;
-		
-		border-radius: 4rpx;
-		margin-left: 20rpx;
+	.quanState2{
+		font-size: 22rpx;
+		color: #999999;
+		padding: 0 10rpx;
+		
+		border: 1rpx solid #DDDDDD;
+		
+		border-radius: 4rpx;
+		margin-left: 20rpx;
 	}
 
 
@@ -938,8 +938,8 @@
 		display: flex;
 		justify-content: space-between;
 		font-size: 26rpx;
-		padding: 20rpx;
-		align-items: center;
+		padding: 20rpx;
+		align-items: center;
 		padding-bottom: 0;
 	}
 
@@ -979,12 +979,12 @@
 		width: 80%;
 		color: #333333;
 		font-size: 26rpx;
-	}
-	.goodsName2{
-		padding: 20rpx 20rpx 15rpx;
-		
-		color: #333333;
-		font-size: 26rpx;
+	}
+	.goodsName2{
+		padding: 20rpx 20rpx 15rpx;
+		
+		color: #333333;
+		font-size: 26rpx;
 	}
 
 	.informationNum {
@@ -1001,7 +1001,7 @@
 		color: #333333;
 		text-align: center;
 		line-height: 33rpx;
-		padding: 0 15rpx;
+		padding: 0 15rpx;
 		margin-left: 20rpx;
 	}
 
@@ -1066,7 +1066,7 @@
 	}
 
 	.itemTop {
-		padding: 18rpx 20rpx;
+		padding: 18rpx 20rpx;
 		padding-right: 0;
 		background-color: #FFEFD5;
 
@@ -1079,24 +1079,24 @@
 		width: 104rpx;
 		font-size: 26rpx;
 		color: #333333;
-		margin-right: 20rpx;
+		margin-right: 20rpx;
 		text-align: right;
-	}
+	}
 	
 
-	.leftItem {
-		font-size: 26rpx;
-		color: #333333;
+	.leftItem {
+		font-size: 26rpx;
+		color: #333333;
 		margin-right: 20rpx;
-		flex-grow: 1;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		flex-grow: 1;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
 	.itemContent {
-		padding: 20rpx;
+		padding: 20rpx;
 		padding-right: 0;
 		background-color: #FFFFFF;
 
@@ -1137,17 +1137,17 @@
 		font-size: 26rpx;
 		text-align: center;
 		padding-left: 100rpx;
-	}
-	.swiper{
-		width: 100%;
-		height: 85%;
-		background: #FFFFFF;
-		
-	}
-	.swiper-item{
-		width: 100%;
-		height: 100%;
-	}
+	}
+	.swiper{
+		width: 100%;
+		height: 85%;
+		background: #FFFFFF;
+		
+	}
+	.swiper-item{
+		width: 100%;
+		height: 100%;
+	}
 	
 	
 	.maCode {
@@ -1156,7 +1156,7 @@
 		font-weight: 500;
 		color: #333333;
 		line-height: 42rpx;
-		margin-bottom: 40rpx;
+		margin-bottom: 40rpx;
 		text-align: center;
 	}
 
@@ -1371,4 +1371,4 @@
 				padding-left: 24rpx;
 				font-size: 26rpx;
 			}
-</style>
+</style>

pages/user/reportUni.vue

@@ -201,7 +201,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber"
 					@getphonenumber="decryptPhoneNumber">授权</button>
 			</view>
@@ -1178,7 +1178,7 @@
 
 	.nameBox {
 		display: flex;
-		align-items: baseline;
+		align-items: baseline;
 		
 	}
 
@@ -1218,8 +1218,8 @@
 		border: 2rpx solid rgba(221, 221, 221, 1);
 		text-align: center;
 		width: 122rpx;
-		line-height: 33rpx;
+		line-height: 33rpx;
 		font-size: 24rpx;
 		color: #999999;
 	}
-</style>
+</style>

pages/user/user.vue

@@ -372,7 +372,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShowHide">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>