From 415b323fe8923a931771f6c77b539ee1b68933f7 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 2 Jul 2024 13:38:10 +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

---
 pages/index/game/myOrder.vue  |  42 +++++++++++++++++++++++++++-------
 static/images/index/renz1.png | Bin 902 -> 680 bytes
 static/images/index/renz2.png | Bin 1157 -> 804 bytes
 static/images/index/renz3.png | Bin 1719 -> 1151 bytes
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/pages/index/game/myOrder.vue b/pages/index/game/myOrder.vue
index 142f79a..ee48fa8 100644
--- a/pages/index/game/myOrder.vue
+++ b/pages/index/game/myOrder.vue
@@ -7,12 +7,12 @@
 
 			<view class="padding-lr">
 				<view class="margin-right-xs text-df"
-					style="width: 400rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+					style="width: 400rpx; overflow: hidden;font-size:30rpx;font-weight: bold; nowrap;text-overflow: ellipsis;">
 					{{order.title}}
 				</view>
-				<view class="text-xs margin-top-sm" style="color: #26C278;">
+				<view class="text-xs margin-top-sm" style="color: #333; font-size: 26rpx;">
 					<!-- ￥<text class="text-df">{{isVip? order.memberMoney :order.money}}/</text>60分钟 -->
-					￥<text class="text-df">{{order.price}}/</text>{{order.duration}}分钟
+					￥<text class="order-text">{{order.price}}/</text>{{order.duration}}分钟
 				</view>
 			
 				<!-- <view class="margin-top-xs ">
@@ -25,16 +25,16 @@
 					</view>
 				</view>
 				
-				<view class="flex align-center padding-tb-sm " style="border-top: 2rpx solid #F5F5F2;">
-					<view class="flex align-center" style="margin-right: 39upx;">
+				<view class="qualification">
+					<view class="qual-center">
 						<image src="../../../static/images/index/renz1.png" style="width: 32upx;height: 28upx;"></image>
 						<text class="margin-left-xs">实名认证</text>
 					</view>
-					<view class="flex align-center" style="margin-right: 39upx;">
+					<view class="qual-center">
 						<image src="../../../static/images/index/renz2.png" style="width:28upx;height: 33upx;"></image>
 						<text class="margin-left-xs">资质认证</text>
 					</view>
-					<view class="flex align-center">
+					<view class="qual-center">
 						<image src="../../../static/images/index/renz3.png" style="width: 28upx;height: 32upx;"></image>
 						<text class="margin-left-xs">平台担保</text>
 					</view>
@@ -257,10 +257,32 @@
 </script>
 
 <style>
+	
 	page {
 		background-color: #F7F7F7;
 	}
-
+	.qualification{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.qual-center{
+		display: flex;
+	    flex-direction: row;
+	    align-items: center;
+	    justify-content: center;
+	    width: 210rpx;
+	    height: 22px;
+	    line-height: 22px;
+	    background-color: rgba(8, 162, 138, 0.1);
+	    border-radius: 8px;
+	    font-weight: 400;
+	    font-size: 11px;
+	    color: #029D88;
+		margin: 15rpx 0;
+		}
 	.bgs {
 		background-color: #FFFFFF;
 	}
@@ -286,4 +308,8 @@
 		border-radius: 50%;
 		margin-right: 10rpx;
 	}
+	.order-text{
+		font-size: 36rpx;
+		color: #fb672b;
+	}
 </style>
diff --git a/static/images/index/renz1.png b/static/images/index/renz1.png
index ef9e9da63ee609b88db5102ff69162e00a7e211a..870f4a904a0ad3b905b9261ee7d86cf2cdf61f70 100644
GIT binary patch
delta 657
zcmV;C0&e|=2dD**BYy&KNkl<ZNQu4HOQ=mz7zgm*IgV!@2?-&uB9A<ZP~7qu$iRRy
zkxU3NQ3hh9P*N0SfDDnOND`vFx<p<fLS#UmDWU6JgSC#coqP5@=UmSH*KV)1zO~o?
zzrOEV-(H!_fgLaf`{FyNzR2SqHsE3o({Kr0>P%cf787v+3x9IhnILb%w>k^xijJ|p
zH-{Ms@@cqTX92@-7d<dMiw@E7wjIdf1>O`o*@Pj}4&*Jks?GQ;rVH--ge&;+Ka^A>
zU^tEmN3?+VSdHWL7SIFdFrs9<FOHx=@CFRQn3Q#%<7rz2tV@vRaSBs0KuF$gn1%6Z
zlwM1I38$^G)PIm|IrlFl-M$fvFefoKDGC|Y3b{CEY&k<E59AZ=0ztRLSaW<%V|x_b
zT(U+6kA#rbEZ`az$M#mt#^i*(F^c?&O%>KEi%KEbk0-I6!94Vd{qMpL<)2W=1Iy4a
z#g-AgbGM9bCI$-O$OzT%R;>coV^1sg&e)7zac%)CaDS-G{03Yu9ZU<sXzWV#Utx_<
z4VU76!nRH^Phe=unuE&?rg>m<!uC)&>mOtP22KiDy(o@tQLKu)1@{kC48a2&tyVw>
zEJ*a%Cddo;fmLx{Crl7(!Bc$3%9M?@K)Dd~LGRf9it8!gz7wui1q`Z|w32|Iip8X(
zu){PYtAAh9{}S*;G09#F=RFP2<NJdU=bBM22bwV-3vov4J6kR!;#DE`|0Ez;!{6dy
z72kix;WqI8;mRuhaQb0n8y2e-{o{k+ft$i@xD)Q+rTX0u^Fn>-8T)T?LeV)Zod50^
rS10mvSf9mt%*Eq&Bz}e^IPn`~LUXDrG+ku?015yANkvXXu0mjfq4hbq

delta 880
zcmV-$1CRWu1%?NZBYyw^b5ch_0Itp)=>Px&KuJVFR7gv$mtBaAVHC%IX9oEQxlqbR
z_R@tYBwWZxDU^t^<{h(3;?765gsjgJOPdnK;(g!oQ6v$2VMFp=v=_MAs}1FnT_wA7
z^t|)T?5v%gd1iOd)jRJw=YRg^Jm)><86hVL-HuQPOa~Om<bQR;_YebmfG@y#0(l@2
zc2b*BYKJe5Ba(1L$Yy@2z~#4P>4;LX**L&dA`-#Vr@)fvmvV;;+Zj!F#jvgpf0#&&
zo4{h=x2eEKgxQwPT70?hiZy7vq&A=&27Z|eyaVQ00x5jCK4@T9M^DcJyK@BI0`u(=
z)Dg<nqBt8g&VN{DqhzS2jRqO~SK{e8V3#`qPd5N(fN7Ro2TCKMG`S|-$F3p*p4J1W
z1_;zlAX^J&$r6-!5!)`(@+SY@nLtXX(8Kovz*oSC{E-<&2P1hV-FW)KcJ@F;xkw;8
zBc(F|PuBr=E#gB0Sz`fS0t@Z?nFR6$PtEi!C4UKIRDWdz61oxLwr$Ysgp#rVkAaoZ
zbB5)lrIn=aLD_;Z293sTPE5sqqMRg@Y%<OjsL^WTv=@L~1WXoYXJq9sQ@JJI%4FYH
z?Mxuc_84%mXaJ?RDwQyBCSaN{!)26J1K>X)kQM!On{@(lmH}}TLHR`}EqOa90<}7s
zZax8%%YP*Iia-|SZA|c3<X6?lPq>LMHSRr-)Ym8r3P94peUvc>W-zVJ>x3qJF_R58
zYZWm%ijeLkknyDn2wU-`8Bdo2tpy+l3FJf{&}`Q?7LcgIm#;R!e$zd6?V7>#6F5X5
zk4h7OS^~L-r=iKkf<Gsa?7IG6JbjR_giwz!r+=M#u|y9f2qlfD?}51%Y#V`GDGHp>
z^$2$&op2RjdOy!nOdJTb0ka|uWgnrKMO3T;W-#TpXPQ6~L#sgV5tx8`ZD#B6<z7+X
zq^?FW$6$!o5Q@3!l$WxfVS~nKryk)))RY5?3Lg6qI`QQ~`N-DdKLQ_sIc2kTMt3kw
z=xI@eL%9n{Z^H>k@TI{4VrV8wy@9d`=rni2<G=xnXjbYCpv&(4p#|#i-HkA{aI_04
z9Ze6Pff>Uc%>l0^`_HIGClSZohKmmz2c!y3dQff?%8q}c+Ifmye-9}D0000<MNUMn
GLSTYitdk}H

diff --git a/static/images/index/renz2.png b/static/images/index/renz2.png
index 9e3fab20108161a11551ce7c2546cf7548412f49..c0eeee21f12c7d73d1c14506f0e877c5e8abaec0 100644
GIT binary patch
delta 782
zcmV+p1M&QY38V&)BYy(xNkl<ZNQv#&OQ=;<7{Kx0-QI4f3HFdsi3rL_3z7&7OmPrJ
zFN2C2)S$ML%0WcBAq345Iwd#=!-0n=dO$=Zl%`#Y1`$T~Qgjey^Z*rt9%SCD?i#Fh
zIP0E!&fe!<%~2n0SnFHg`u^+rt#1zuY<<oI<wmT>``B3KMStHN2l|A~#2r|HC5e6y
zp2f~GFHTGbHiS923fE&P7GYY2pQG4~UHBS@%Dnik8|-I{#`?K&7FCYF#1^c?H9c%j
z;`jKCU<zgqVs3@wmK?%PyoOJrZmY1gIhNtP#C{ML#&3+WC8IckUvU`U;d5bM4t5zp
ziEU+GY|EOB>3_HZi!l$EVm78?I%agjhH+aTvm8&&i@#$3;m)?K*|;BXLYC;KOa|14
zWaA2FL;i=I5gDvE=})p|V=-RFH@L6Ni<AEeENeEFV!IG|F2~jQYMfmkzV5|MHJ}~Z
zA#OMJb+xSlt-xDCfL-0CeTgumsR`)zGA~X|26ikdH-GSC2PmD<a0DIi<*aVc-oUk3
z73(kHxbTdmpk27L%!`pKXDRHT9yY5npgpS>g`hnY>pO5)nHQs7`i}9N32zUaUoogv
zcs{AOK-;mr0yM^NhF@ZNzUpNy@CXjz2W*I-x^!S+3Tr)vGjMB7$1PZZ%dkd!Rk}*n
zY@CDTv446j!>dXAx*FI-<#Ei4<##gSx&I<67UHQhLCKnpd3ZWeHCp#<Wun|5<QAs`
znuYhYFZ<>)FZQ=!pJHud|2FQPB<K=+ge#(IpLkEx2(lip#PU!CK4SvUP>hp%ghK>B
z2~p*5#vk>Ea0(B{`WoDV$M9JN<RW2Z((U*jH-DFT@ncKTEB!8nv^pKkyF&E%I1Y%A
zwmpbPaY17HAs#66;%Mr$D%ZbGxEAv}^hfZmaHOy7X!{du%e>gs&0*Dk>=lCW6WUP*
zE*6r}6f`2d(hGWlsE_(5un8{-(d8cDXJan@z<zvy*UP*(T;t2XDH^`pA^#xo00000
MNe4wvM6N<$g0)9|^Z)<=

delta 1137
zcmV-%1djWp289WbBYyw^b5ch_0Itp)=>Px(KS@MER7gwhmu+lQWfaGM=eFwxjHrYV
zLQGVA!v)%o7a;^i<pXdF;z%Gw48|BWF;V$|V(&({5!xb}Xre~rHw>BxF-mMpSX6>y
z2I#PNWV~gDg!sX?5Mge-biK#i(r(>s*DmTepKt9s=l{FsJb%w~?zzGkS1@VK6wx+B
zx*apVZ7ktZi}RX2YkWP8cPz?bJRz!&m&6=&5&J|W_H`{fWnoPR?Z*1cSLfuQ$#CT%
z6&3(Dk0N*uXh%8h!|0T$zxH&_eLp+WUqVUi8-#km1qq-!5n(cLV+HZkz?Z<iz`XK4
z@-yfKpbxmBf`8xhlTgai8cOgxa0rpTjv4#7=pRg4>kxfXko$o^H60Ij37B|2GkO&+
z8t{h;=S1m1wA=62f7Q9t?yn@)yzixHuHUx=m<!SjOaUeV4TXpBD%U#%6OL!c1s0!t
z!0tn+CEHOGx%HskP=BevuD;ISBFZkHzcjONok)C9wSQ8K)gIh$EfJS5M#7Fck@)<v
zidFLuC8Mhm`Q(3CwMva@|4+&o+~0P$xb6qQZw(T7^r&fjSBiffHZ$FJyU%qq2#xtP
z#a-%{JKDz#3#X%xpoV55v3=$06-q_#0y$dJ-p=^lz@pBTw%2uP&n&z@YN{)#{KJZF
z&X|dvrGLO#$(N@aVq^*(2$Y^Hxq;bdR_*L9`qf-UFDq5~bO@kZoJeB3_j}go(HVvz
z$A&=Kt##S?T}xm0n(yGM8RkWVQ`VabFAPSzvf5v#M+OEsJGe)1dVJsI*&S=&xID7d
zBVm666IAHvGUE%&?@Q}8(6$oWl|qvR^h9=i{eQxf589s2-&Q!)x=PW{iXFsz@7x69
zIFVSm(xnNetepZcmf96g^-FJakNMWsN^#+2>lzi^Q-u8pO!r=N*}lM}lWXm36$8`J
zr&PrPX+SmIXY@Wh8pzWLrmU?3_H|e?x*L)8`4b20Gm-d5)mp}!@1L$K_u4PN1=d;M
zPJbXL!F1~aQSI;?70!1>;<r?T)oL%jI>3?qz!OSY-Vwe&PpEEnRwQ1jRj}e7AJ{ZO
z1_D0~UUoz7%fs^RM%|ubpolz{F=HS86JRLSngI>vHG~6>8DBOy%7xO_7L>t^M6@Mi
zCcGm%wq@H!Xx=q1Ze=0x;(#wOy?dE`VSm`%7)n|10nZGn%MK?Ji`Ggjbbb#sqZs2;
zqv`mH?WYO{aJW=BW$jYfPy%enV4Jf%cDNGMJDs^-CT~<o0KS4>uNt&;EsuLMW}%v8
z6oSd<CJ}jUm`T`cpzr)(CJq(<4<4|mFpym*=tkhS690@pms{2O@T=!bH7d^f&1&iB
z;+)F60{0Aqs&-?@2~-+Ey;*VG2>aX4io|o}s!;XAB9yc?WAHr6v?_a-QjzUlX6#5M
zzp5}V&>J{!=*w<EbUDxjOa<u&^~&^}itHW@QiT5n+I`&mw7Udb00000NkvXXu0mjf
DF5fX=

diff --git a/static/images/index/renz3.png b/static/images/index/renz3.png
index cb34fa7ced9b2c201e87c8f5f0c9d72c39dce32a..07d1f4136b3318839ad9d03dae8aeaf91ef12294 100644
GIT binary patch
delta 1131
zcmV-x1eE)?4gUy`BYy-&Nkl<ZNQs@-Ylu}<6bJC%y>qRxqCm9hr78BZmpu%uAj?vO
zp5O-yq7Mfv&A`AqR91=;c|U{^B|_f7%CHv&855LLQfZi4BtaUbWD%5=Ry103rVo3c
zxyLj2I%5kqXYaMwUjMcCdhC5Fm6b~!1|5UBn29qZ?`yn<<$qa{{y9`dmBRoYgLiRy
zoB17>mL=)Vp(v{k5%eg$T>||fwwz8!cePRP9E!r?jxWST_zRz77lvaJmSSR*+m2hY
zIgT&JYR#kHiU+U>e+wry5l3T7mZV#A;9+<kvr0xCKu2sj?Tv=)$QfCZsy6E5@fnUQ
z$o9r|L`m-(n15BpV=X|%1x3*BaAgs+0RBy!`>w$5XaNd0V@aj5a_Rmkus<3xLOAwO
z=!rmUg~;t`0ovb>{+)^I1fO@}XW{sN#e<R8Q!7}t97|eQnA1dT!@unWvLx-ni?I!$
zYNI{^^U+x=@V`6+=qPN#ZrqP+3d#oPM^~1l-?q@xkAG1FZo89cWd*Mb(VHAXmT-El
zfDaU{%jwuQN>0GNLWDjg_z31<EXKt)M(`!{wb9j&QQYxKZG@i|^7$19N9`}zSqiTG
zZFJ;xax35yTL|7EL@Dem&E10=3O??`_(6dCF=}x^1;>|!t`~fjQ>A3=<*~J*jyC)p
zqpylRaer`XNvJa__^QNzT=3~w&BF7Z;N#riU$g<vG4|AiLO&9xl!RWz8mzzvLV>vq
zXBA}5DC}ga=BZ@WM*W2>Nqb8=bBrHq*og~-iZ#x`X>bds$Npa2hPztq<a|6=;;j)f
z0aP3H(;^1!s$nB;jEqTI=O5t$SS?%zaH$Y{Ie+cO!-9J<{8L&#snGwlh7ASARJ_~<
z_(*&d+XOsOnm+|+WJ&s9oAp;0`X5&#@E?&eeV}|l<^H<}9||Y1IP%tFJszkw>h0?N
zjQITn8>&JXTNjz5OO_QW!+pYzN8%BD66ZQF8^2>=wNZbm+Nk&EY_(CJB1Ao`%aZg!
zUVk!I6#(Y70sc1{H5^?IzR9Xtl5WQ|q0n3*JPdQ1Tj;N%S*za?f`f2TpHmPV7Qdas
zlV^qyL^Q9|8e~bj2~%)WmZUr4ZYO9~zugh5zY6unU95=XXN8<4<nVd;Ew*<GMy<ys
z3gt9^Qx#~XW_)zzxm_y>%)_~uEF9&-_<vJ)0JNfgS(0vUGbaYx<T%_GF~VFyu2%?<
zERGjqPCKQ8QMFN@6Lp9>XBR73`CYvc3ku`qc<6tCKIGsFW<i#u8;deE18JF%R`cVy
zOL*$sZQzAb2AqIrgaFIw$t+2im1Ph03-c%z6~=w&7SiE;;q^#(k6ne^g@~^d)?_To
zl60{aG}yn>3?b4-m-rdJkNr~(blH!%GfUF7?Gz98@6;_s`9jSd=Ih49R@CuRls)@U
xpd8-c;?cNPC@>dlmcU)YBkxUg$G7#M^dI^k9&#!|#7h7G002ovPDHLkV1fXhBk2GD

delta 1704
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


From 91afb430ca591f48d46bb6da67d782a272551800 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 2 Jul 2024 14:57:33 +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/index/index.vue |  5 +--
 pages/order/index.vue | 82 ++++++++++++++++++++++++-------------------
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4a795ad..303c045 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1553,17 +1553,18 @@ page {
 	border-radius: 15px 15px 0 0;
 	padding: 0 30rpx;
 	height: 60rpx;
-	margin-top: 8rpx;
+	margin-top: 12rpx;
 	justify-content: space-between;
 }
 
 .wztext {
-	width: 80px;
+	width: 200rpx;
 	overflow: hidden;
 	//text-overflow: ellipsis;
 	white-space: nowrap;
 }
 
+
 .dengjibox {
 	position: relative;
 	width: 100%;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 84a6e5d..5acc3ee 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -5,16 +5,16 @@
 		<!-- 对于mescroll-uni: 则无需设置:sticky="true", 无其他限制和要求 -->
 
 		<!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll -->
-		<view class="sticky-tabs">
-			<view class="ding-view">
+		<view class="jishi-index">
+			<view class="ding-view" style="padding-top: 35px;" >
 				<view class="u-m-r-10">
 					<image :src="avatar" class="head-port"
 						@click="goNav('/pages/my/userinfo')"></image>
 				</view>
-				<view class="u-flex-1 u-m-l-10 " v-if="isLogin && userName">
-					<view class="u-font-18 text-bold">
-						<view class="flex align-center" style="justify-content: space-between;">
-							<view class="margin-left-sm " style="color: #ffffff;">{{ userName }}</view>
+				<view class="u-flex-1" v-if="isLogin && userName">
+					<view class="u-font-18">
+						<view class="flex align-center" style="margin-top: 8rpx;">
+							<view class="margin-left-sm u-font-18" style="color: #ffffff;">{{ userName }}</view>
 							<view class="labe zhuangtai" @tap="stateSave">
 								<view v-if="isTrue">已上线</view>
 								<view v-if="!isTrue">已离线</view>
@@ -52,23 +52,23 @@
 				</view>
 			</view> -->
 			<!-- <me-tabs v-model="tabIndex" nameKey='title' :tabs="tabs" @change="tabChange"></me-tabs> -->
+			
+		</view>
 			<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
 				inactive-color="#999999" :customStyle="{ 'background-color': '#050505' }" isShowImg textClass="">
 			</u-tabs>
-		</view>
-
 		<mescroll-body :sticky="true" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			style="padding: 0 16px;width: 100%;min-height: 100vh;">
+			style="padding: 0 16px;width: 100%;min-height: 100vh; background: #f5f5f5;">
 			<!-- 数据列表 -->
 			<!-- <view v-if="goods.length > 0" class="margin-sm padding-sm bg radius" v-for="(item,index) in goods"
 				:key='index' @click="clickItem(item)"> -->
-			<view class="bgwhite radius margin-bottom-sm padding-bottom-sm" v-for="(item, index) in goods" :key='index'
+			<view class="bgwhite radius margin-bottom-sm padding-order " v-for="(item, index) in goods" :key='index'
 				@click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
 				<view class="flex justify-between padding-sm">
 					<view v-if="item.overTimeOrders == 1" style="color: red;font-size: 26rpx">(订单已超时)</view>
 					<!-- <view class="text-green" v-if="item.status == 1">待支付</view> -->
 					<view class="progress-status" v-if="item.status == 2">待服务</view>
-					<view class="text-green" v-if="item.status == 3">已完成待评价</view>
+					<view class="progress-status" v-if="item.status == 3">已完成待评价</view>
 					<!-- <view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view> -->
 					<view class="progress-status" v-if="item.status == 5">已完成</view>
 					<view class="progress-status" v-if="item.status == 6">服务中</view>
@@ -85,7 +85,7 @@
 					</view>
 				</view>
 				<view class="xian"></view>
-				<view class=" u-flex padding-sm">
+				<view class=" u-flex padding-sm mescroll-downwarp">
 					<view class="u-m-r-10">
 						<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
 							size="100">
@@ -96,15 +96,16 @@
 							<view class="margin-right-xs order-details ">
 								{{ item.title }}
 							</view>
-							<view class="flex-sub">
-								<text class="text-df">实收:￥</text><text class="text-xl text-bold">{{ item.artificerMoneyTotal
-									}}</text>
-							</view>
 						</view>
-						<view class="text-cut" style="width:550upx; color: #999;">{{ item.address }}</view>
-
+						<view class="flex-sub">
+							<!--<text class="text-df">实收:￥</text>--><text class="text-xl text-bold">￥{{ item.artificerMoneyTotal
+								}}</text>
+						</view>
+						<view class="text-cut" style="color: #999;">{{ item.address }}</view>
 					</view>
+					
 				</view>
+				
 				<view class="flex u-p-t-20 justify-between align-center padding-sm">
 					
 					<view class="flex text-right" style="width: 100%;flex-direction: column;">
@@ -873,7 +874,6 @@
 		align-items: center;
 	}
 	.order-status{
-		width: 90%;
 		display: flex;
 		flex-direction: row;
 	}
@@ -894,8 +894,10 @@
 		color: #fe9130;
 	}
 	.flex-sub{
-		text-align: right;
+		width: 95%;
+		text-align: left;
 		font-size: 28rpx;
+		margin-top: 8rpx;
 	}
 	.top-title{
 		width: 95%;
@@ -1007,33 +1009,18 @@
    .ding-view{
 	   width: 95%;
 	   height: 290rpx;
-	   background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
-	   border-radius: 24rpx;
-	   margin: 10px auto 0px auto;
 	   display: flex;
 	   flex-direction: row;
 	   justify-content: space-between;
 	   padding:30rpx;
    }
-	.content{
-		width: 100%;
-		min-height: 100vh;
-		background-image: url('../../static/index/swim.jpg');
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 10px 0px;
-	}
-
 	.u-tabs {
 		padding: 16px;
 		width: 90%;
 		height: 199rpx;
 		// background: #F7F7F7 !important;
 		border-radius: 21rpx;
-		margin: -70px auto 10px auto;
+		margin: -126px auto 8px auto;
 	}
 
 	/deep/.u-scroll-view {
@@ -1050,7 +1037,6 @@
 	/deep/.u-tab-bar {
 		display: none !important;
 	}
-
 	.sticky-tabs {
 		width: 100%;
 		z-index: 990;
@@ -1150,4 +1136,26 @@
 		font-weight: bold;
 		
 	}
+	.jishi-index-title{
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #FFFFFF;
+		padding-top: 20px;
+	}
+	.jishi-index{
+		width: 100%;
+		height: 230px;
+		padding: 0 20px;
+		background:url('../../static/index/technician15.png');
+		background-repeat: no-repeat;
+		background-size: 100%;
+	}
+	.padding-order{
+		padding: 10rpx 20rpx;
+	}
+	.text-cut{
+		width: 95%;
+	}
 </style>
\ No newline at end of file

From 125721247822d97b2a61e4962887db7a63d80604 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 2 Jul 2024 14:58:48 +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

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

diff --git a/pages/my/index.vue b/pages/my/index.vue
index a6d3591..9ce609f 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -7,7 +7,7 @@
 						<image :src="avatar" class="head-port""
 							@click="goNav('/pages/my/userinfo')"></image>
 					</view>
-					<view class="u-flex-1" v-if="isLogin && userName">
+					<view class="u-flex-1" v-if="isLogin && userName" style="color: #ffffff;">
 						<view class="u-font-18 ">
 							<view class="flex align-center" style="margin-bottom: 5px;">
 								<view class="margin-left-sm">{{ userName }}</view>