Merge branch 'dev' into atsMaster

# Conflicts:
#	pages/index/index.vue
#	pages/index/rescue.vue
#	pages/integral/integralgoodsDetail.vue
#	pages/user/addCar/cailist.vue
#	pages/user/reportUni.vue
#	utils/common.js
#	utils/request.js

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,9 +22,11 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
-				<button class="authorizContbutton" type="default" open-type="getPhoneNumber"
-					@getphonenumber="decryptPhoneNumber">授权</button>
+				<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
+				<view class="sqLine">
+					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+				</view>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
 				<image src="../../static/timg/icon_guanbi@2x.png" mode="" class="authorizCloseImg"></image>
@@ -48,7 +50,7 @@
 				wxOpenData: '',
 				page: 1,
 				itemData: [],
-				noMoreShow: false,
+				noMoreShow: false,
 				ext:'',
 				themeColor:'',
 			}
@@ -56,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();
@@ -103,7 +105,7 @@
 				this.$http('openHome/queryActivityList', {
 
 					// page: this.page,
-					// limit: 10,
+					// limit: 10,
 					 unionId:this.ext.unionId
 				}, 'GET').then(res => {
 					uni.hideLoading();
@@ -213,18 +215,33 @@
 		text-align: center;
 		margin-left: 56rpx;
 	}
-
-	.authorizContbutton {
-		width: 422rpx;
-		height: 88rpx;
+.authorizContbutton{
+		width: 210rpx;
+		height: 66rpx;
 		background: #D53533;
 		border-radius: 44rpx;
-		line-height: 88rpx;
+		line-height: 66rpx;
 		text-align: center;
-		font-size: 30rpx;
+		font-size:30rpx;
 		color: #FFFFFF;
-		margin-top: 62rpx;
-		margin-left: 71rpx;
+		
+		margin-left:40rpx;
+	}
+	.sqRefuse{
+		width: 210rpx;
+		height: 66rpx;
+		border: 1px solid #eaeaea;
+		line-height: 66rpx;
+		border-radius: 36rpx;
+		text-align: center;
+		font-size:30rpx;
+		margin-right:40rpx;
+		color: #999999;
+	}
+	.sqLine{
+			margin-top: 62rpx;
+		display: flex;
+		justify-content: space-between;
 	}
 
 	.itemHistory {
@@ -243,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 {
@@ -272,7 +289,7 @@ display: block;
 		padding: 24rpx 20rpx;
 		color: #333333;
 		font-size: 28rpx;
-		background: #FFFFFF;
+		background: #FFFFFF;
 		border-radius: 0 0 10rpx 10rpx;
 	}
 
@@ -283,4 +300,4 @@ display: block;
 		color: #999999;
 		font-size: 28rpx;
 	}
-</style>
+</style>

pages/activity/jkDetail.vue

@@ -93,7 +93,8 @@
 						<view class="signupLineLName" v-if="item.nickName!='null'">{{item.nickName?item.nickName:'微信用户'}}</view>
 						<view class="signupLineLName" v-else>微信用户</view>
 					</view>
-					<view class="signupLineM">{{item.plateNumber?item.plateNumber:''}}</view>
+					<view class="signupLineM" v-if="item.plateNumber">{{item.plateNumber | maskLicensePlate}}</view>
+					<view class="signupLineM" v-else></view>
 					<view class="signupLineR">{{item.signTime}}</view>
 				</view>
 			</view>
@@ -293,8 +294,11 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
-				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+				<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
+				<view class="sqLine">
+					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+				</view>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
 				<image src="../../static/timg/icon_guanbi@2x.png"  @click="authorizShowno" mode="" class="authorizCloseImg"></image>
@@ -473,7 +477,7 @@
 			this.bgmMusic.stop()
 		},
 		
-		
+	
 		methods: {
 			ptMore(){
 				this.djsMoreShow=true;
@@ -1095,7 +1099,11 @@
 			            const twtxt = `0 : 0 : 0 `
 			            return twtxt;
 			         }
-			    }
+			    },
+				maskLicensePlate(value) {
+							
+				 // return value.replace(/(\w{1})(\w{3})(\w{1})/, '$1***$3');
+				}
 			    
 		   },
 		beforeCreate: function () {
@@ -1847,16 +1855,32 @@ color: #FFFFFF;font-size: 26rpx;
 			margin-left: 56rpx;
 		}
 		.authorizContbutton{
-			width: 422rpx;
-			height: 88rpx;
+			width: 210rpx;
+			height: 66rpx;
 			background: #D53533;
 			border-radius: 44rpx;
-			line-height: 88rpx;
+			line-height: 66rpx;
 			text-align: center;
 			font-size:30rpx;
 			color: #FFFFFF;
-			margin-top: 62rpx;
-			margin-left:71rpx;
+			
+			margin-left:40rpx;
+		}
+		.sqRefuse{
+			width: 210rpx;
+			height: 66rpx;
+			border: 1px solid #eaeaea;
+			line-height: 66rpx;
+			border-radius: 36rpx;
+			text-align: center;
+			font-size:30rpx;
+			margin-right:40rpx;
+			color: #999999;
+		}
+		.sqLine{
+				margin-top: 62rpx;
+			display: flex;
+			justify-content: space-between;
 		}
 		.applicationTk{
 			height: 60vh;

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/onlineBooking.vue

@@ -149,8 +149,11 @@
         <view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
         	<view class="authorizCont" @click.stop="">
         		<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-        		<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
-        		<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+        		<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
+        		<view class="sqLine">
+        			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+        		    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+        		</view>
         	</view>
         	<view style="text-align: center;padding-top: 56rpx;">
         		<image src="../../static/timg/icon_guanbi@2x.png"  @click="authorizShowno" mode="" class="authorizCloseImg"></image>
@@ -975,15 +978,31 @@
 		margin-left: 56rpx;
 	}
 	.authorizContbutton{
-		width: 422rpx;
-		height: 88rpx;
+		width: 210rpx;
+		height: 66rpx;
 		background: #D53533;
 		border-radius: 44rpx;
-		line-height: 88rpx;
+		line-height: 66rpx;
 		text-align: center;
 		font-size:30rpx;
 		color: #FFFFFF;
-		margin-top: 62rpx;
-		margin-left:71rpx;
+		
+		margin-left:40rpx;
+	}
+	.sqRefuse{
+		width: 210rpx;
+		height: 66rpx;
+		border: 1px solid #eaeaea;
+		line-height: 66rpx;
+		border-radius: 36rpx;
+		text-align: center;
+		font-size:30rpx;
+		margin-right:40rpx;
+		color: #999999;
+	}
+	.sqLine{
+			margin-top: 62rpx;
+		display: flex;
+		justify-content: space-between;
 	}
 </style>

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/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;">

pages/index/vipCard.vue

@@ -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;">

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/integral/integralgoodsDetail.vue

@@ -109,7 +109,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;">
@@ -499,8 +499,7 @@
 		font-size: 24rpx;
 		padding-left: 30rpx;
 		padding-top: 18rpx;
-	}
-    .ktyong1{
+	}    .ktyong1{
 		color: #FF0000;
 		font-size: 32rpx;
 	}

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

@@ -5,7 +5,8 @@
 			<swiper-item v-for="(item,index) in info.ImgList">
 				<view class="swiper-item">
 					<img mode="aspectFit" :src="item.url" alt="" class="swiper-itemImg" v-if="item.bizType==1">
-					<video :src="item.url" v-if="item.bizType==2" show-fullscreen-btn controls style="width: 100%;height: 100%;"></video>
+					<!-- <video :loop="false" src="http://dmsphoto.66km.com.cn/marketing/47B0933C-1542-4E77-8A72-FC7F30A877B4.mp4" v-if="item.bizType==2" show-fullscreen-btn controls style="width: 100%;height: 100%;"></video> -->
+					 <video :loop="false" :src="item.url" v-if="item.bizType==2" show-fullscreen-btn controls style="width: 100%;height: 100%;"></video>
 				</view>
 			</swiper-item>
 			
@@ -195,7 +196,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,8 +94,11 @@
 	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 		<view class="authorizCont" @click.stop="">
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
-			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+			<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
+			<view class="sqLine">
+				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+			    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+			</view>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">
 			<image src="../../static/timg/icon_guanbi@2x.png" mode="" class="authorizCloseImg"></image>
@@ -785,15 +788,31 @@ z-index: 11;
 		margin-left: 56rpx;
 	}
 	.authorizContbutton{
-		width: 422rpx;
-		height: 88rpx;
+		width: 210rpx;
+		height: 66rpx;
 		background: #D53533;
 		border-radius: 44rpx;
-		line-height: 88rpx;
+		line-height: 66rpx;
 		text-align: center;
 		font-size:30rpx;
 		color: #FFFFFF;
-		margin-top: 62rpx;
-		margin-left:71rpx;
+		
+		margin-left:40rpx;
+	}
+	.sqRefuse{
+		width: 210rpx;
+		height: 66rpx;
+		border: 1px solid #eaeaea;
+		line-height: 66rpx;
+		border-radius: 36rpx;
+		text-align: center;
+		font-size:30rpx;
+		margin-right:40rpx;
+		color: #999999;
+	}
+	.sqLine{
+			margin-top: 62rpx;
+		display: flex;
+		justify-content: space-between;
 	}
 </style>

pages/shop/wp.vue

@@ -61,11 +61,11 @@
 			this.avatar=opt.img;
 			//this.avatar='http://dmsphoto.66km.com.cn/marketing/B7511CA2-CC50-4F2C-867D-DB15783CE3C5.jpg';
 			console.log(this.avatar.slice(0,5))
-			/* if(this.avatar.slice(0,5)=='https'){
+			 if(this.avatar.slice(0,5)=='https'){
 				
 			}else{
-			this.avatar=this.avatar.replace('http','https');
-			} */
+			   this.avatar=this.avatar.replace('http','https');
+			} 
 			this.time=opt.time
 			
 			console.log(this.avatar)

pages/subPack/jkDetail.vue

@@ -287,8 +287,11 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
-				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+				<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
+				<view class="sqLine">
+					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+				</view>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
 				<image src="../../static/timg/icon_guanbi@2x.png"  @click="authorizShowno" mode="" class="authorizCloseImg"></image>
@@ -1871,16 +1874,32 @@ color: #FFFFFF;font-size: 26rpx;
 			margin-left: 56rpx;
 		}
 		.authorizContbutton{
-			width: 422rpx;
-			height: 88rpx;
+			width: 210rpx;
+			height: 66rpx;
 			background: #D53533;
 			border-radius: 44rpx;
-			line-height: 88rpx;
+			line-height: 66rpx;
 			text-align: center;
 			font-size:30rpx;
 			color: #FFFFFF;
-			margin-top: 62rpx;
-			margin-left:71rpx;
+			
+			margin-left:40rpx;
+		}
+		.sqRefuse{
+			width: 210rpx;
+			height: 66rpx;
+			border: 1px solid #eaeaea;
+			line-height: 66rpx;
+			border-radius: 36rpx;
+			text-align: center;
+			font-size:30rpx;
+			margin-right:40rpx;
+			color: #999999;
+		}
+		.sqLine{
+				margin-top: 62rpx;
+			display: flex;
+			justify-content: space-between;
 		}
 		.applicationTk{
 			height: 60vh;

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

@@ -199,7 +199,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/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/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

@@ -284,7 +284,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;">
@@ -453,7 +453,7 @@
 					}
             	})
             }
-			this.sx=opt.sx
+			this.sx=opt.sx
 			
 
 		},

pages/user/myOrder/mallOrderDetail.vue

@@ -266,7 +266,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/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

@@ -248,7 +248,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/user.vue

@@ -372,13 +372,15 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShowHide">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
-				<button class="authorizContbutton" type="default" open-type="getPhoneNumber"
-					@getphonenumber="decryptPhoneNumber">授权</button>
+				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
+				<view class="sqLine">
+					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+				</view>
 			</view>
-			<view style="text-align: center;padding-top: 56rpx;">
+			<!-- <view style="text-align: center;padding-top: 56rpx;">
 				<image src="../../static/timg/icon_guanbi@2x.png" mode="" class="authorizCloseImg"></image>
-			</view>
+			</view> -->
 		</view>
 		<!-- <image :src="qrimg" mode=""></image> -->
         <view class="qrBox" v-if="qrSHow">
@@ -492,7 +494,7 @@
 							this.queryMyDetail();
 						}
 						if(!this.userInfo){
-							this.authorizShow=true
+							//this.authorizShow=true
 						}
 					})
 				}
@@ -1474,16 +1476,32 @@ padding-right: 10rpx;
 		margin-left: 56rpx;
 	}
 
-	.authorizContbutton {
-		width: 422rpx;
-		height: 88rpx;
+	.authorizContbutton{
+		width: 210rpx;
+		height: 66rpx;
 		background: #D53533;
 		border-radius: 44rpx;
-		line-height: 88rpx;
+		line-height: 66rpx;
 		text-align: center;
-		font-size: 30rpx;
+		font-size:30rpx;
 		color: #FFFFFF;
-		margin-top: 62rpx;
-		margin-left: 71rpx;
+		
+		margin-left:40rpx;
+	}
+	.sqRefuse{
+		width: 210rpx;
+		height: 66rpx;
+		border: 1px solid #eaeaea;
+		line-height: 66rpx;
+		border-radius: 36rpx;
+		text-align: center;
+		font-size:30rpx;
+		margin-right:40rpx;
+		color: #999999;
+	}
+	.sqLine{
+			margin-top: 62rpx;
+		display: flex;
+		justify-content: space-between;
 	}
 </style>

utils/request.js

@@ -9,14 +9,17 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
-
-//const baseUrl='http://192.168.0.176:20187/'
+/* const baseUrl='http://192.168.1.18:20187/' */
+//const baseUrl='http://dms.66km.com.cn/'
+//const baseUrl='http://apidms.dqcarlink.com/' 
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'
-
-//wxc023ff04deb28f2d正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
+//京猫虎
+//const baseUrl='https://apidms.jcatt.cn/'
+//	wx2c6f04c0dcd15984正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
 //测试地址
 //const webUrl = 'http://dms.32che.cn/'
+
 //正式
 const webUrl = 'https://webwx.66km.com/'
 console.log(baseUrl)
@@ -28,12 +31,8 @@ const http = (url = '', date = {}, type = 'POST', header = {
 		console.log($store.state.wxOpenData.loginInfo)
 		//const wxOpenData = uni.getStorageSync("wxOpenData");
 		var wxOpenData=$store.state.wxOpenData
-		if(wxOpenData.token){
-			header['token']=wxOpenData.token ;
-		}else if(wxOpenData.loginInfo?.token){
-			header['token']=wxOpenData.loginInfo.token;
-		}
 		if(wxOpenData.loginInfo){
+			header['token']=wxOpenData.loginInfo.token;
 			header['uid']=wxOpenData.loginInfo.uid; 
 		}
 		//console.log($store.state.carInfo)