From 6849affb957dd26e1370981f056096a018828520 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 2 Sep 2024 09:13:10 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/fuwuGengduo.vue | 4 ++--
 pages/my/hangyedana.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index b3829aa..9cf2203 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -333,12 +333,12 @@
 		}
 	
 		.rightGoods {
-			width:80%;
+			width:76%;
 			height: 100%;
 			// padding: 0 16rpx 27rpx;
 			box-sizing: border-box;
 			position: absolute;
-			right: 0;
+			right:20rpx;
 			.whiteBox {
 				height: 100%;
 				background: #ffffff;
diff --git a/pages/my/hangyedana.vue b/pages/my/hangyedana.vue
index 8b909fe..0e864bf 100644
--- a/pages/my/hangyedana.vue
+++ b/pages/my/hangyedana.vue
@@ -434,12 +434,12 @@
 		}
 	
 		.rightGoods {
-			width:80%;
+			width:76%;
 			height: 100%;
 			// padding: 0 16rpx 27rpx;
 			box-sizing: border-box;
 			position: absolute;
-			right: 0;
+			right:20rpx;
 			.whiteBox {
 				height: 100%;
 				background: #ffffff;

From 0751823dcf68f2cced74ff2cfba5fc36c559bf4b Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 2 Sep 2024 09:15:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/fuwuxiangm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index 9c7b433..7dae879 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -332,12 +332,12 @@
 		}
 	
 		.rightGoods {
-			width:80%;
+			width:76%;
 			height: 100%;
 			// padding: 0 16rpx 27rpx;
 			box-sizing: border-box;
 			position: absolute;
-			right: 0;
+			right: 20rpx;
 			.whiteBox {
 				height: 100%;
 				background: #ffffff;

From 6bccff2a70728592de6a0e6b8f76207a804c2402 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 2 Sep 2024 11:48:15 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/index.vue | 52 +++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index be9429b..ca8af44 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -1150,7 +1150,11 @@
 	}
 	.status-button-b{
 		font-weight: bold;
-		color: #7446fc;
+		color: #ff9d01;
+	}
+	.status-button-c{
+		font-weight: bold;
+		color: #599abd;
 	}
 	.status-button-d{
 		font-weight: bold;
@@ -1170,7 +1174,7 @@
 	}
 	.status-button-h{
 		font-weight: bold;
-		color: #965fb9;
+		color: #75452a;
 	}
 	.status-button-i{
 		font-weight: bold;
@@ -1180,10 +1184,6 @@
 		font-weight: bold;
 		color: #43b943;
 	}
-	.status-button-h{
-		font-weight: bold;
-		color: #1bcada;
-	}
 	.status-num{
 		margin-right: 15rpx;
 	}
@@ -1200,31 +1200,39 @@
 		height:50rpx;
 	}
 	.ticket{
-		border: 1px solid #4dbaab;
-		color: #4dbaab;
-		padding:1px 5px;
-		border-radius:3px;
+		background: #34ace7;
+		color: #fff;
+		height: 40rpx;
+		line-height: 40rpx;
+		padding: 0 20rpx;
+		border-radius:20rpx 20rpx 20rpx 3px;
 		font-size: 22rpx;
 	}
 	.ticket1{
-		border: 1px solid #529ccc;
-		color: #1374b1;
-		padding:1px 5px;
-		border-radius:3px;
+		background: #feb449;
+		color: #fff;
+		height: 40rpx;
+		line-height: 40rpx;
+		padding: 0 20rpx;
+		border-radius:20rpx 20rpx 20rpx 3px;
 		font-size: 22rpx;
 	}
 	.ticket2{
-		border: 1px solid #c8b1e8;
-		color: #725b97;
-		padding:1px 5px;
-		border-radius:3px;
+		background: #497da5;
+		color: #fff;
+		height: 40rpx;
+		line-height: 40rpx;
+		padding: 0 20rpx;
+		border-radius:20rpx 20rpx 20rpx 3px;
 		font-size: 22rpx;
 	}
 	.ticket3{
-		border: 1px solid #d77e25;
-		color: #d5c3b3;
-		padding:1px 5px;
-		border-radius:3px;
+		background: #2bbd93;
+		color: #fff;
+		height: 40rpx;
+		line-height: 40rpx;
+		padding: 0 20rpx;
+		border-radius:20rpx 20rpx 20rpx 3px;
 		font-size: 22rpx;
 	}
 </style>

From b609b94519c1088f6940d37e33f0ef443a323c37 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 2 Sep 2024 14:57:10 +0800
Subject: [PATCH 4/5] =?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/payModifyDzhifu.vue | 131 ++++++++++++++++++++++++++++-------
 1 file changed, 105 insertions(+), 26 deletions(-)

diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue
index 95da0ad..d62b9d0 100644
--- a/my/order/payModifyDzhifu.vue
+++ b/my/order/payModifyDzhifu.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="padding-bottom u-skeleton">
-			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
+			<view class="bgImg u-skeleton-fillet" style="padding: 0 20rpx;">
 				<view class="head-top">
 					<view class="pay-title">服务项目</view>
 					<view class="flex justify-around">
@@ -37,6 +37,7 @@
 
 									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
+											<text class="title-font">价格：</text>
 											<span>￥</span>
 											<span>
 												{{technicianRate}}
@@ -55,8 +56,40 @@
 						</view>
 					</view>
 				</view>
-				<view class="ske-padding margin-top-sm header-view" >
+				
+				<view class="add-content"  @click="getAddressList()" >
 					<view v-if="!detailaddress">请选择地址</view>
+					<view  class="Service-Address">
+						{{province}}/{{city}}/{{district}}/{{detailaddress}}
+					</view>
+					<view class="Service-name">
+						<span>{{name}}</span>
+						<span>{{mobile}}</span>
+					</view>
+					<!-- <view class="margin-right-xs">
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">联系人</view>
+							<view class="header-view-data">
+								<text>{{name}}</text>
+								<text class="xuanzhe" @click="getAddressList()">修改</text>
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">手机号码</view>
+							<view class="header-view-data">
+								{{mobile}}
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg" v-if="order.remark">
+							<view style="width: 170rpx;">备注内容</view>
+							<view class="flex">
+								<view class="">
+									{{order.remark}}
+								</view>
+							</view>
+						</view>
+					</view> -->
+					<!-- <view v-if="!detailaddress">请选择地址</view>
 					<view class="margin-right-xs">
 						<view class="flex justify-between margin-top-lg">
 							<view class="header-view-text">联系人</view>
@@ -88,10 +121,9 @@
 								</view>
 							</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="padding margin-top-sm header-view">
-
 					<view class="fuwu-time" @click="liliaoshi">
 					 	<view  class="fuwu-title" >
 							<span>技师</span>
@@ -184,8 +216,9 @@
 			</view>
 
 
-
-			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
+			<view class="push-button">
+				<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
+			</view>
 
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@@ -1501,14 +1534,14 @@
 	}
 	.money-pay-zhen span{
 		color: #FF6000;
-	}
-	.money-pay-zhen span:nth-child(1){
-		font-size: 25rpx;
-	}
-	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
+	.money-pay-zhen{
+	  display: flex;
+	  flex-direction: row;
+	  align-items: center;
+	}
 	.money-pay-zhen{
 		display: flex;
 		flex-direction: row;
@@ -1980,9 +2013,9 @@
 	}
 
 	.content{
-		 padding-top: 1px;
-		 width: 100%;
-		 background-color: #f7f7f7;
+	  padding-top: 12px;
+	  width: 100%;
+	  background-color: #f7f7f7;
 	}
 	page {
 		background: #f7f7f7;
@@ -2146,15 +2179,15 @@
 	}
 
 	.pay_btn {
-		width: 90%;
-		margin: 0 auto;
-		text-align: center;
-		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-		height:80rpx;
-		border-radius: 80rpx;
-		color: #ffffff;
-		line-height: 80rpx;
-		font-size: 32rpx;
+	  width: 90%;
+	  margin: 0 auto;
+	  text-align: center;
+	  background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	  height: 80rpx;
+	  border-radius: 60rpx;
+	  color: #ffffff;
+	  line-height: 80rpx;
+	  font-size: 36rpx;
 	}
 
 	.serverAddress {
@@ -2163,7 +2196,53 @@
 		align-items: center;
 	}
 	.head-title{
-		font-size: 30rpx;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.zhuangtai{
+	  color: #029D88;
+	  font-weight: bold;
+	  font-size: 32rpx;
+	}
+	.add-content{
+		  background: #FFFFFF url(../../static/address/map.png)no-repeat top right;
+		  background-size:40%;
+		  padding: 30rpx;
+		  border-radius: 24rpx;
+		  margin-top: 24rpx;
+		}
+	.Service-Address{
+		font-size:34rpx;
+		color: #333;
+		font-weight: bold;
+		padding: 6rpx 0;
+		flex-direction: column;
+		}
+	.Service-name{
+		font-size: 30rpx;
+		color: #333;
+		display: flex;
+		align-items: flex-end;
+		padding:4rpx 0;
+		}
+	.Service-name span:nth-child(1){
+		font-size:30rpx;
+		color:#333;
+		margin-right: 15rpx;
+		}
+	.Service-name span:nth-child(2){
+		font-size:30rpx;
+		color:#666;
+		}
+	.push-button{
+		width: 100%;
+		// height: 48px;
+		position: fixed;
+		bottom:10px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin: 0 auto;
 	}
-	.zhuangtai{}
 </style>

From 49c3687142aecc2259020fa8efed049c5585871e Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 3 Sep 2024 09:03:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/videoCircle/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue
index c85ba86..efc7ec9 100644
--- a/pages/videoCircle/index.vue
+++ b/pages/videoCircle/index.vue
@@ -60,7 +60,7 @@
 						</view>
 						<!-- 3.评论 -->
 						<view class="comment list-view" @click="toComment(index)" style="opacity: 0.9; margin-top: 17px;">
-							<image src="@/static/img/index/liaotian-2.png" style="width: 35px; height: 35px; position: absolute; right: 7px;"></image>
+							<image src="@/static/img/index/liaotian-2.png" style="width:38px; height:36px; position: absolute; right: 7px;"></image>
 							<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">{{list.pls}}</text>
 						</view>
 						<!-- 4.分享 -->