From 3b2f8bea54568e0a8a8d84a17897f4bb0aa91f04 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 16 Jul 2024 18:06:38 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/payShengji.vue | 49 ++++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 89a4d6a..5366285 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -165,7 +165,7 @@
-
+
出行费用
@@ -277,9 +277,9 @@
订单费用:
¥{{order.massageMoney}}
+ style="font-weight: bold;">{{order.massageMoney}}
¥{{order.oldMassageMoney}}
+ style="font-weight: bold;">{{order.oldMassageMoney}}
@@ -290,7 +290,7 @@
优惠券:
- -¥
+ -¥
{{order.couponMoney}}
@@ -299,17 +299,17 @@
加钟费用:
-
+
¥{{order.addMoney}}
- -
+ -
升级费用:
- ¥{{order.payMoney}}
- -
+ ¥{{order.payMoney}}
+ -
@@ -502,10 +502,8 @@
订单费用:
- ¥{{order.massageMoney}}
- ¥{{order.oldMassageMoney}}
+ ¥{{order.massageMoney}}
+ ¥{{order.oldMassageMoney}}
@@ -516,7 +514,7 @@
优惠券:
- -¥
+ -¥
{{order.couponMoney}}
@@ -524,18 +522,18 @@
加钟费用:
-
-
+
+
¥{{order.addMoney}}
- -
+ -
升级费用:
-
- ¥{{order.payMoney}}
- -
+
+ ¥{{order.payMoney}}
+ -
@@ -554,7 +552,7 @@
-
+
更多
@@ -2317,8 +2315,9 @@
flex-direction: column;
}
/deep/.btns{
- background: #019C88 !important;
- color: #fff !important;
+ border: 1rpx solid #e5e5e5 ;
+ color: #333333 !important;
+ margin-left: 10rpx !important;
}
/deep/.u-size-default{
margin: 5px 0px 0px 0px;
@@ -2355,7 +2354,9 @@
.dingshi{
- background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+ border: 0.5px solid #e5e5e5;
+ color: #333333 !important;
+ margin-left: 5px !important;
}
.zhuangtai{
color: #029D88;
@@ -2441,6 +2442,7 @@
.list-pay{
width: 100%;
padding: 10rpx 29rpx;
+ margin-bottom: 40rpx;
}
.pay-ding-top{
width: 100%;
@@ -2653,6 +2655,7 @@
justify-content: center;
height: 127rpx;
padding: 0 30rpx;
+ border-top: 1px solid #f5f5f5;
}
.box {
From 8ece548b05c92085d9c824ede65ef611b33ad952 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Wed, 17 Jul 2024 09:37:30 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/payJaZ.vue | 58 +++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 31 deletions(-)
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index ce6ef93..4df6a9d 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -150,11 +150,11 @@
{{order.vipRate}}%
- 技师加成
+ 技师加成
{{order.technicianRate}}%
-
+
小计:
@@ -225,11 +225,11 @@
{{order.vipRate}}%
- 技师加成
+ 技师加成
{{order.technicianRate}}%
- 小计:
+ 小计:
¥{{order.addMoney}}
@@ -243,10 +243,8 @@
订单费用:
- ¥{{order.massageMoney}}
- ¥{{order.oldMassageMoney}}
+ ¥{{order.massageMoney}}
+ ¥{{order.oldMassageMoney}}
出行费用:
@@ -256,7 +254,7 @@
优惠券:
- -¥
+ -¥
{{order.couponMoney}}
@@ -264,16 +262,16 @@
加钟费用:
-
-
+
+
¥{{order.addMoney}}
- -
+ -
- 合计:
+ 合计:
¥
{{order.payMoneyTotal}}
@@ -292,7 +290,7 @@
订单编号
+ style="color: #333;font-size: 30rpx;">
{{order.ordersNo}}
@@ -339,7 +337,7 @@
{{order.technicianRate}}%
-->
-
+
小计:
@@ -410,11 +408,11 @@
{{order.vipRate}}%
- 技师加成
+ 技师加成
{{order.technicianRate}}%
- 小计:
+ 小计:
¥{{order.addMoney}}
@@ -428,20 +426,18 @@
订单费用:
- ¥{{order.massageMoney}}
- ¥{{order.oldMassageMoney}}
+ ¥{{order.massageMoney}}
+ ¥{{order.oldMassageMoney}}
出行费用:
- ¥{{order.taxiMoney}}
- -
+ ¥{{order.taxiMoney}}
+ -
优惠券:
- -¥
+ -¥
{{order.couponMoney}}
@@ -449,16 +445,16 @@
加钟费用:
-
-
+
+
¥{{order.addMoney}}
- -
+ -
- 合计:
+ 合计:
¥
{{order.payMoneyTotal}}
@@ -528,12 +524,12 @@
+ class="btns">
去投诉
+ class="btns">
去评价
Date: Wed, 17 Jul 2024 10:43:18 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/hongbao/xinrenhongbao.vue | 25 ++++++++--------
pages/cooperate/hehuo.vue | 47 +++++++++++++++---------------
pages/cooperate/index.vue | 3 +-
pages/my/cooperation.vue | 2 +-
pages/my/hehuo.vue | 56 +++++++++++++++++++-----------------
5 files changed, 68 insertions(+), 65 deletions(-)
diff --git a/my/hongbao/xinrenhongbao.vue b/my/hongbao/xinrenhongbao.vue
index 451bff1..f9f798b 100644
--- a/my/hongbao/xinrenhongbao.vue
+++ b/my/hongbao/xinrenhongbao.vue
@@ -33,7 +33,7 @@
-
+
立即使用
@@ -150,6 +150,16 @@
height: 870px !important;
margin-bottom: 60rpx;
}
+ .push-button{
+ width: 100%;
+ height: 48px;
+ position: fixed;
+ bottom: 0px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin: 0 auto;
+ }
.que-btn{
display: inline-block;
width: 90%;
@@ -160,6 +170,7 @@
color: #ffffff;
line-height: 38px;
margin-top: 4px;
+ font-size: 34rpx;
}
/deep/.page-box{
width: 100%;
@@ -168,17 +179,7 @@
width: 111.81rpx;
height: 111.81rpx;
}
- .queding{
- width: 100%;
- height: 48px;
- background-color: #fff;
- position: fixed;
- bottom: 0px;
- display: flex;
- flex-direction: column;
- align-items: center;
- margin: 0 auto;
- }
+
.youhui-view-right-time{
font-weight: 400;
font-size: 22rpx;
diff --git a/pages/cooperate/hehuo.vue b/pages/cooperate/hehuo.vue
index 4f46ff0..30d9a68 100644
--- a/pages/cooperate/hehuo.vue
+++ b/pages/cooperate/hehuo.vue
@@ -49,7 +49,6 @@
-
姓名
@@ -66,7 +65,9 @@
- 提交申请
+
+ 提交申请
+
@@ -249,28 +250,27 @@
/deep/uni-radio::before{
margin-right: -1px;
}
- .save_btn {
- width: 600upx;
- height: 92rpx;
- background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
- border-radius: 46rpx;
- line-height: 92upx;
- margin: 0 auto;
- color: #fff;
- font-size: 28upx;
- position: absolute;
- bottom: 0px;
- margin-bottom: 10px;
+ .push-button{
+ width: 100%;
+ height: 48px;
+ position: fixed;
+ bottom: 0px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin: 0 auto;
+ }
+ .que-btn{
+ display: inline-block;
+ width: 90%;
text-align: center;
- /* #ifdef MP-WEIXIN */
- margin-top: 150rpx;
- /* #endif */
- /* #ifdef H5 */
- margin-top: 100rpx;
- /* #endif */
- /* #ifdef APP-PLUS */
- margin-top: 180rpx;
- /* #endif */
+ background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+ height: 38px;
+ border-radius: 28px;
+ color: #ffffff;
+ line-height: 38px;
+ margin-top: 4px;
+ font-size: 34rpx;
}
.uni-textarea-compute{
@@ -345,7 +345,6 @@
border-radius: 10px;
padding: 20px;
margin-top: 20rpx;
- margin-bottom: 50px;
}
.send-msg{
padding: 0 30rpx;
diff --git a/pages/cooperate/index.vue b/pages/cooperate/index.vue
index 8ed7d26..fe29d30 100644
--- a/pages/cooperate/index.vue
+++ b/pages/cooperate/index.vue
@@ -59,7 +59,8 @@
}
.cooperate-img{
width: 100%;
- height:240rpx;
+ height:222rpx;
+ object-fit: contain;
}
.shezhi-list-img-text{
font-weight: 400;
diff --git a/pages/my/cooperation.vue b/pages/my/cooperation.vue
index 1e79c1e..784e1fc 100644
--- a/pages/my/cooperation.vue
+++ b/pages/my/cooperation.vue
@@ -239,7 +239,7 @@
justify-content: center;
position: fixed;
bottom: 0px;
- margin-bottom: 20px;
+ margin-bottom: 8px;
.sub-box {
width: 613rpx;
height: 100%;
diff --git a/pages/my/hehuo.vue b/pages/my/hehuo.vue
index 6061886..efbf3ea 100644
--- a/pages/my/hehuo.vue
+++ b/pages/my/hehuo.vue
@@ -1,7 +1,8 @@
- 应聘技师
-
+
+ 应聘技师
+
服务城市
@@ -33,7 +34,7 @@
-
+
@@ -54,7 +55,10 @@
- 提交申请
+
+ 提交申请
+
+
@@ -229,29 +233,27 @@