From 36f761e103e471a1dd568e1459b27313480a72fa Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Thu, 30 Nov 2023 17:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E5=8A=A8=E5=8B=BE?=
=?UTF-8?q?=E9=80=89=E5=8D=8F=E8=AE=AE,=E5=B9=B6=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/CardDetail/components/index.scss | 5 +++--
pages/CardDetail/index.vue | 10 +++++-----
pages/Login/index.vue | 25 ++++++++++++++++++++++---
pages/OrderPage/components/index.scss | 5 +++--
pages/OrderPage/index.vue | 10 +++++-----
5 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/pages/CardDetail/components/index.scss b/pages/CardDetail/components/index.scss
index 1576808..e64c765 100644
--- a/pages/CardDetail/components/index.scss
+++ b/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;
}
diff --git a/pages/CardDetail/index.vue b/pages/CardDetail/index.vue
index 268bcb6..74e1a07 100644
--- a/pages/CardDetail/index.vue
+++ b/pages/CardDetail/index.vue
@@ -95,9 +95,9 @@
- 是否同意 《上门喂养须知》
- 是否同意 《上门洗护须知》
+ 请阅读并同意 《上门喂养须知》
+ 请阅读并同意 《上门洗护须知》
@@ -374,7 +374,7 @@ export default {
this.$refs.agreement.open();
},
agreeHandle(){
- this.readInfo = true;
+ // this.readInfo = true;
this.$refs.agreementPop.close();
},
cardPay() {
diff --git a/pages/Login/index.vue b/pages/Login/index.vue
index d0e4e5b..527eb8a 100644
--- a/pages/Login/index.vue
+++ b/pages/Login/index.vue
@@ -21,7 +21,19 @@
+
+
+
+
-
+
+
+
+
-
+
@@ -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
diff --git a/pages/OrderPage/components/index.scss b/pages/OrderPage/components/index.scss
index 8dccbac..16ba398 100644
--- a/pages/OrderPage/components/index.scss
+++ b/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;
diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue
index b3bb10c..a2e2ae7 100644
--- a/pages/OrderPage/index.vue
+++ b/pages/OrderPage/index.vue
@@ -209,9 +209,9 @@
- 是否同意 《上门喂养次卡须知》
- 是否同意 《上门洗护次卡须知》
+ 请阅读并同意 《上门喂养次卡须知》
+ 请阅读并同意 《上门洗护次卡须知》
@@ -551,7 +551,7 @@
// })
},
agreeHandle(){
- this.readInfo = true;
+ // this.readInfo = true;
this.$refs.agreementPop.close();
},
getTimeLine(){