修改手动勾选协议,并优化提示文字

pages/CardDetail/components/index.scss

@@ -533,14 +533,15 @@
 	}
 	.foot-menu-checkbox{
 		margin-right:8rpx;
-		width: 28rpx;
-		height: 28rpx;
+		width: 40rpx;
+		height: 40rpx;
 		background: #FFFFFF;
 		border: 2px solid #131313;
 		border-radius: 50%;
 	}
 	.foot-menu-title{
 		font-size: 26rpx;
+		line-height:40rpx;
 		.foot-menu-url{
 			color:#4DC3B8;
 		}

pages/CardDetail/index.vue

@@ -95,9 +95,9 @@
         <view class="foot-menu-checkbox">
           <u-checkbox
               shape="circle"
-              size="28"
+              size="40"
               custom-style="margin-top:0;margin-bottom:0;"
-              icon-size="24"
+              icon-size="30"
               active-color="#4DC3B8"
               :checked="readInfo"
               @change="readInfo = !readInfo"
@@ -256,8 +256,8 @@
       </view>
     </view>
     <view style="padding:30rpx;max-height:700rpx;overflow: auto;">
-      <view v-if="cardDetail.order_type == 1" style="height:200rpx;display: flex;align-items: center;justify-content: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门喂养须知》</text></view>
-      <view v-else style="height:200rpx;display: flex;align-items: center;justify-content: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门洗护须知》</text></view>
+      <view v-if="cardDetail.order_type == 1" style="height:200rpx;display: flex;align-items: center;justify-content: center;">请阅读并同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门喂养须知》</text></view>
+      <view v-else style="height:200rpx;display: flex;align-items: center;justify-content: center;">请阅读并同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门洗护须知》</text></view>
       <MzButton title="确认" @click="agreeHandle" button-color="#4DC3B8" font-color="#fff"></MzButton>
     </view>
   </uv-popup>
@@ -374,7 +374,7 @@ export default {
       this.$refs.agreement.open();
     },
     agreeHandle(){
-      this.readInfo = true;
+      // this.readInfo = true;
       this.$refs.agreementPop.close();
     },
     cardPay() {

pages/Login/index.vue

@@ -21,7 +21,19 @@
      </view>
       <view class="login-button-container">
         <u-button
-            v-if="privateStatus"
+            v-if="!isRead"
+            type="success"
+            size="normal"
+            shape="circle"
+            color="#45C55E"
+            height="88"
+            @click="readTip()"
+        >
+<!--          <u-icon name="weixin-fill" size="50" color="#fff" class="weixin-icon"></u-icon>-->
+          <u-text text="手机号快捷登录" color="#fff" size="32" align="center" custom-style="display:inline;"></u-text>
+        </u-button>
+        <u-button
+            v-else-if="privateStatus"
             type="success"
             size="normal"
             @getphonenumber="wxLogin"
@@ -46,9 +58,12 @@
           <u-text text="手机号快捷登录" color="#fff" size="32" align="center" custom-style="display:inline;"></u-text>
         </u-button>
       </view>
-      <view class="privacy-container row">
+      <view class="privacy-container row" style="justify-content:center;align-items: center;">
+        <view class="checkbox">
+          <u-checkbox :checked="isRead" @change="isRead = !isRead" shape="circle" active-color="#4DC3B8" icon-size="30rpx" size="40rpx"></u-checkbox>
+        </view>
         <view class="text">
-          <u-text text="登录/注册即视为你同意" color="#999999" size="24"></u-text>
+          <u-text text="已阅读并同意" color="#999999" size="24"></u-text>
         </view>
         <view class="text">
           <u-text text="《小程序隐私保护指引》" color="#178AF2" size="24" @click="openPrivacyContract"></u-text>
@@ -115,6 +130,7 @@ import {extend} from "dayjs";
 export default {
   data() {
     return {
+      isRead:false,
       title: '  登录',
       loading: true,
       staticImage: {
@@ -137,6 +153,9 @@ export default {
     },
   },
   methods: {
+    readTip(){
+      uni.showToast({title:'请同意隐私协议',icon:'error'})
+    },
     login(){
       testLogin({
         user_id:1

pages/OrderPage/components/index.scss

@@ -239,14 +239,15 @@
 	}
 	.foot-menu-checkbox{
 		margin-right:8rpx;
-		width: 26rpx;
-		height: 26rpx;
+		width: 40rpx;
+		height: 40rpx;
 		background: #FFFFFF;
 		border: 2rpx solid #131313;
 		border-radius: 50%;
 	}
 	.foot-menu-title{
 		font-size: 26rpx;
+		line-height:40rpx;
 		color:#8F8F8F;
 		.foot-menu-url{
 			color:#4DC3B8;

pages/OrderPage/index.vue

@@ -209,9 +209,9 @@
         <view class="foot-menu-checkbox">
           <u-checkbox
               shape="circle"
-              size="26"
+              size="40"
               custom-style="margin-top:0;margin-bottom:0;"
-              icon-size="24"
+              icon-size="30"
               active-color="#4DC3B8"
               :checked="readInfo"
               @change="readInfo = !readInfo"
@@ -278,8 +278,8 @@
       </view>
     </view>
     <view style="padding:30rpx;max-height:700rpx;overflow: auto;">
-      <view v-if="type == 1" style="height:200rpx;display: flex;align-items: center;justify-content: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门喂养次卡须知》</text></view>
-      <view v-else style="height:200rpx;display: flex;align-items: center;justify-content: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门洗护次卡须知》</text></view>
+      <view v-if="type == 1" style="height:200rpx;display: flex;align-items: center;justify-content: center;">请阅读并同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门喂养次卡须知》</text></view>
+      <view v-else style="height:200rpx;display: flex;align-items: center;justify-content: center;">请阅读并同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门洗护次卡须知》</text></view>
       <MzButton title="确认" @click="agreeHandle" button-color="#4DC3B8" font-color="#fff"></MzButton>
     </view>
   </uv-popup>
@@ -551,7 +551,7 @@
         // })
       },
       agreeHandle(){
-        this.readInfo = true;
+        // this.readInfo = true;
         this.$refs.agreementPop.close();
       },
       getTimeLine(){