From 957b6c31537d41f5824af2465d80301de415380f Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 16 Jul 2024 16:10:35 +0800
Subject: [PATCH 1/3] =?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 | 63 ++++++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 12a0bd1..7cee4d4 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -17,7 +17,7 @@
 						</view>
 						<view class="u-flex-1  margin-left-sm">
 							<view class="flex head-title-right">
-								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
+								<view class="head-title">
 									{{order.entryName}}
 								</view>
 								<view class="zhuangtai">
@@ -111,9 +111,9 @@
 						<view class="jusitify-line">
 							<view class="line-word">订单编号</view>
 							<view class="flex align-center" @tap="copy(order.ordersNo)"
-								style="color: #333;font-size: 26rpx;">
+								style="color: #333;font-size: 30rpx;">
 								<view class="">{{order.ordersNo}}</view>
-								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
+								<u-icon name="file-text" style="color: #1db18f;margin-left: 10rpx;"></u-icon>
 							</view>
 						</view>
 						
@@ -474,7 +474,11 @@
 			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
 				<view class="showBtn-mian" v-if="order.status=='6'">
 					<view class="showBtn">
-						<view class="gengduo" @click.stop="gengBtn">更多</view>
+						 <view class="gengduo" @click.stop="gengBtn">
+							 <image style="width: 40rpx; height: 40rpx; margin-left: 3rpx;" src="../../static/mores.png" mode=""></image>
+							 更多
+						</view>
+						<view class="showbtn-line">
 						<u-button
 							shape="circle" :plain="true"
 							@click="toggle('center',order)"
@@ -502,16 +506,17 @@
 							充值
 						</u-button>
 					</view>
+					</view>
 					<view v-if="btnShow==true" class="showBtnClass">
 						<u-button :custom-style="customStyle2"
 							shape="circle" :plain="true"
 							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
-							class="dingshi">
+							class="btns">
 							去投诉
 						</u-button>
 						<u-button :custom-style="customStyle2" shape="circle" :plain="true"
 							@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
-							class="dingshi">
+							class="btns">
 							去评价
 						</u-button>
 						<u-button shape="circle" :plain="true" @click="goChat"
@@ -640,7 +645,7 @@
 				<view class="popup-content">
 					<view class="popup-head">
 						<span>请输入提前结束的原因</span>
-						<span @click="closePopup(type)">x</span>
+						<span @click="closePopup(type)"><image style="width: 30rxp; height: 50rpx;"  src="../../static/close.png" mode=""></image></span>
 					</view>
 					<view class="popup-mian">
 						<textarea placeholder="请输入提前结束服务原因" @input="textareaInp" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
@@ -1775,13 +1780,16 @@
 	}
 	.showBtnClass{
 		position: absolute;
-		background: #f7f7f7;
+		background: #fff;
 		display: flex;
 		flex-direction: column;
 		width: 100px;
 		left: 0;
-		margin-bottom: 50px;
-		margin-left: 20px;
+		margin-bottom: 43px;
+		margin-left: 10px;
+		border-radius: 20rpx 20rpx 20rpx 0;
+		box-shadow: 0px 0px 3px 0px #b5b5b5;
+		padding: 15rpx 5rpx;
 	}
 	.dingshi,.btns{
 		width: 0px !important;
@@ -1887,10 +1895,10 @@
 		border-radius: 14rpx;
 	}
 	.xiangmu{
-		width: 95%;
+		width: 94%;
 		height: 263rpx;
 		background: #FFFFFF;
-		border-radius: 21rpx;
+		border-radius:50rpx;
 		margin: 0px auto 10px auto;
 		display: flex;
 		flex-direction: row;
@@ -1921,7 +1929,7 @@
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
-		margin-top: 10px;
+		margin-top: 20px;
 	}
 	.popup-mian-textarea{
 		width: 525.69rpx;
@@ -1936,12 +1944,6 @@
 	.popup-head span:nth-child(2){
 		width: 50rpx;
 		height: 50rpx;
-		line-height: 19px;
-		text-align: center;
-		font-size: 24px;
-		color: #15AB8D;
-		border-radius: 50%;
-		border: 3px solid #15AB8D;
 	}
 	.popup-head span:nth-child(1){
 		font-weight: bold;
@@ -1962,17 +1964,23 @@
 		width: 613rpx;
 		height: 479rpx;
 		background: #FFFFFF;
-		border-radius: 56rpx;
+		border-radius: 40rpx;
 		display: flex;
 		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;
 	}
+	.showbtn-line{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
 	.showBtn-mian{
 		width: 100%;
 		display: flex;
@@ -1982,9 +1990,13 @@
 		justify-content: flex-end;
 	}
 	.gengduo{
+		display: flex;
+		flex-direction:column;
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #7D7D7D;
+		margin-left: 20rpx;
+		
 	}
 	.showBtn-view{
 		width: 100%;
@@ -2016,6 +2028,7 @@
 	}
 	.zhuangtai{
 		color: #029D88;
+		font-size: 30rpx;
 	}
 	.head-title-right{
 		display: flex;
@@ -2030,6 +2043,7 @@
 		overflow: hidden;
 		white-space: nowrap;
 		text-overflow: ellipsis;
+		font-size: 30rpx;
 	}
 	.fei-view-list span,.fei-view-list-z span{
 		font-weight: bold;
@@ -2097,7 +2111,7 @@
 	}
 	.list-pay{
 		width: 100%;
-		padding: 0px 29rpx;
+		padding: 0 29rpx 20rpx 29rpx ;
 	}
 	.pay-ding-top{
 		width: 100%;
@@ -2142,7 +2156,7 @@
 		font-size: 25rpx;
 	}
 	.money-pay-zhen span:nth-child(2){
-		font-size: 31.25rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 	}
 	.money-pay-zhen{
@@ -2328,6 +2342,7 @@
 		justify-content: center;
 		height: 127rpx;
 		padding: 0 30rpx;
+		border-top: 1px solid #f5f5f5;
 	}
 
 	.box {

From d5e544e4333003a9355a32e2cacb03e1d6d9986c Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 16 Jul 2024 16:30:45 +0800
Subject: [PATCH 2/3] =?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/indextaociliaoList.vue                 |   3 ++-
 static/mores.png                                | Bin 0 -> 2250 bytes
 uni_modules/z-tabs/components/z-tabs/z-tabs.vue |  10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 static/mores.png

diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 8395cf1..1323cf1 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -18,7 +18,7 @@
 				
 			</view>
 			<view class="fenlei">
-				<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
+				<z-tabs class="z-tabs-fenlei":list="tabList" @change="tabChange" @changeClick="changeClick"/>
 			</view>
 		</view>
 		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
@@ -207,6 +207,7 @@
 	.shop_label{
 		display: flex;
 		flex-wrap: wrap;
+		margin-top: 8rpx;
 	}
 	.shop_label span{
 		background: #e5e5e5;
diff --git a/static/mores.png b/static/mores.png
new file mode 100644
index 0000000000000000000000000000000000000000..fad05b5adece3219ede85f62dd1c528f56b848f1
GIT binary patch
literal 2250
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-ahlfuqIK#WAEJ
z?(N*hLS<J0*Y8S<sBqS$Agie<@3(#{@2|5Djh(ytobmJjRdMIvoQkWzQQ^qI#LrpN
zz{{fWVFp9f1}lXRY>X_4l@1J!5zGQ71QXa#7A9X2VB#=Za^c7sL5B%4=5D--4GPX&
zzGq|@Sw<yC0|9qR_`uavvoH6y`ShwI$3OlmzP)Y#w%p%uKYi4mu5DDiHTQOUxa9Ym
zkL4*fPp^AFj}D#C@aymX?*F%$wUxy#p1-~AZ^eV+@Sjs+f64RJIPO-NsBc%-dVQY$
ztL^4n-Q&N{dp})t_Q9+smNWD9WWNTBAJXplq?vT*Sv_muyp!AK^X!ZEoHCWAQ}(fk
zd#(SR2#<LE8@Z1qzP_%G|I=6>zg5uY@}0co<5m%mTsCwmY%EA(oclE@S8%TCf7AJ?
zVi%W|rJtyutG{mVqKjMig$X>#u`FAlc#`Y(R;NDO$6S-<Y&E_oyfAiBp5v76bo<L?
za@&D)e85GPM{2IewfjQrJN`eurglNo<LINCsz04#j#OU`*O~W@JNoLo`qP`&a+Yuj
z&3(Q%x*>h-YrX@8=I>7AzA`pC#wR4H9Y0amC~VK89d|B1*{0{H^|0)XQs{2?=U>B8
zo4e=8`mXbxkhO!+Vx8-%dsEllu`Tn|Dxdg@?fS(h{~q7k+WaSWqyGIr@>9!QtfU;C
z8ZKGP7-GKD%+YF>e=7SbySUizjjLieEoO8%_sKd+*4iWdJLiGIh0FidEnCMHQ0n(S
zhhggR6We5$yt?*aZ*Yujd+7e{pRc{#vgmNw-Ff?`Z~ipnj+)2yZ!x89Z|^8-v%CZn
z>o?y5(vDhrqGj(CMBOKxlVx!{Qoh|H$(Dad@B~5kHRqH$#9yB0KIHoAGtd1w3qSKj
z7hYdi%ou9Yppkd{cSLCUOS`B&qTJ7}O<TtrQfPO7b6IS9=+({I@uAE=>d%HT?wz`X
zx!@@4uX&pvOGMseuv+JQO8<iO{;NxV%?Rb)o;-ccn|0~`D&Afcu1#&uzVEn-vHZZ=
zJFZ&g{k0!M%yt4pM$e;$F|=X#gRpl>Q+FTVSD`gK=IGm>yR9Ryo1XZ0G-S`pYa1)H
zcIVuFwDZq_=oo*k`VVU#?Pivf`@D-auzcaUqrn$hqQuXuF8I{6_fPM^=-^$fo$H_9
zZ11(*RL^QTWzrgj<MaF#J$K8@E#LS~_toaU=+!pwo|`?M*`1;KbNzbHb5?n}%Ky2n
zPkeQ%dUj&#t;3JrnKq`EpN_Ej$P@kb{1%zLU#s5xKB%}*@r`rlY18djS$4j26PAms
z{qpc!p>%nwp<JiX?q}8hXLvLp`P*b|c{P)<UHZVPrkHM_So42J*0Xo)|Nc&L|Gx#V
z8#CJ(<$oM`9nW7d`~1u6)+}B6`ZnLB{_R^Na@{mKb^`P3ZvV!HK8B_jH;gtjGO`$I
zC<&IZ2)G=dHj|e_p~F$IbAfV$g4MP&Il!`?r^|yymXYP+#?&-sCXS>47o`_KHGR6q
z(gF?w%}PR!?hKA4IWuoIFf>VsOysa);#ib?`V1S3z>x(VE*AtH1Z1Pr%oG|F*j!bb
gMy(w70sDv9@b$x!^L9(h0~;p{p00i_>zopr06oBi+yDRo

literal 0
HcmV?d00001

diff --git a/uni_modules/z-tabs/components/z-tabs/z-tabs.vue b/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
index 487d142..783f3bb 100644
--- a/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
+++ b/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
@@ -629,7 +629,7 @@
 		width: 750rpx;
 		/* #endif */
 		flex-direction: row;
-		height: 80rpx;
+		height: 70rpx;
 	}
 	
 	.z-tabs-scroll-view-conatiner{
@@ -701,8 +701,8 @@
 	
 	.z-tabs-item-title{
 		/* font-weight: bold; */
-		font-size: 34rpx;
-		color: #019C88;
+		font-size: 30rpx;
+		color: #019c88;
 	}
 	
 	.z-tabs-item-title-disabled{
@@ -725,12 +725,12 @@
 		bottom: 0;
 		left: 0;
 		right: 0;
-		margin-bottom: 9px;
+		margin-bottom: 5px;
 	}
 	
 	.z-tabs-bottom-dot{
 		border-radius: 100px;
-		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7)) !important;
+		background: linear-gradient(90deg,rgba(234, 248, 245,0.9),rgba(1, 156, 136,0.7)) !important;
 	}
 	
 	.z-tabs-left,.z-tabs-right{

From 0e2a825b9d49688de726c104f542012f9e7027da Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 16 Jul 2024 16:54:54 +0800
Subject: [PATCH 3/3] =?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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/my/hongbao/xinrenhongbao.vue b/my/hongbao/xinrenhongbao.vue
index 62ce118..451bff1 100644
--- a/my/hongbao/xinrenhongbao.vue
+++ b/my/hongbao/xinrenhongbao.vue
@@ -9,7 +9,7 @@
 		</view> -->
 		<t-refresh ref="refresh" v-if="hongbao.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
 			<template slot="content">
-				<checkbox-group @change="checkboxChange">
+				<checkbox-group @change="checkboxChange" >
 					<view>
 						<view class="youhui-weiyong youhui-list" v-for="(item,index) in hongbao" :key="index">
 							<view class="youhui-view-left">
@@ -148,6 +148,7 @@
 <style scoped>
 	/deep/.refresh-body{
 		height: 870px !important;
+		margin-bottom: 60rpx;
 	}
 	.que-btn{
 		display: inline-block;