Merge branch 'dev'

pages/activity/activity.vue

@@ -23,8 +23,10 @@
 			<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="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>
@@ -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 {

pages/activity/jkDetail.vue

@@ -294,7 +294,10 @@
 			<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="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>
@@ -1832,16 +1835,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/index.vue

@@ -245,7 +245,11 @@
 			<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="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>
@@ -1424,16 +1428,32 @@
 		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;
 	}
 	.content{
 		min-height: 100vh;

pages/index/onlineBooking.vue

@@ -150,7 +150,10 @@
         	<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="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>
@@ -958,15 +961,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/rescue.vue

@@ -94,7 +94,10 @@
 		  		<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="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>
@@ -856,15 +859,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/shop/shop.vue

@@ -95,7 +95,10 @@
 		<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="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>
@@ -770,15 +773,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/subPack/jkDetail.vue

@@ -288,7 +288,10 @@
 			<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="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/user/user.vue

@@ -373,12 +373,14 @@
 			<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="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
 						}
 					})
 				}
@@ -1460,17 +1462,33 @@ 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;
 	}
 	.test{