From 17e921fcdbb5f72422b7a7a744456431a8449bfb Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 1 Jul 2024 13:46:59 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/currentIncome.vue | 6 +++---
 pages/index/currentPoints.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index 72b5a0c..bad39ea 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -20,7 +20,7 @@
 			<template slot="content" >
 				<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
 					<view class="mian-head">
-						<view class="mian-head-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
+						<view class="mian-head-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
 						<view class="mian-head-time">
 							<span class="shouyi-text">预约时间: </span>
 							<span>{{item.serveTime}}</span>
@@ -28,14 +28,14 @@
 					</view>
 					<view class="mian-foot">
 						<view class="mian-foot-img">
-							<image src="../../my/static/bg6.png" mode=""></image>
+							<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
 						</view>
 						<view class="mian-foot-list">
 							<view class="mian-foot-view">
 								<view class="mian-title">{{item.entryName}}</view>
 								<view class="mian-dingwei">
 									<image src="../../static/index/dangqian2.png" mode=""></image>
-									<span class="shouyi-text">0.8km</span>
+									<span class="shouyi-text">{{item.km}}km</span>
 								</view>
 							</view>
 							<view class="mian-foot-dan shouyi-text">
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index 171d7df..19e681b 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -34,7 +34,7 @@
 				</view>
 				<view class="mian-list" @click="goOder(item)" v-for="(item,index) in yjjfList" :key="index">
 					<view class="mian-list-top">
-						<view class="mian-list-top-biao">已完成</view>
+						<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
 						<view class="mian-list-top-time">
 							<span>预约时间: </span>
 							<span>{{item.serveTime}}</span>
@@ -42,7 +42,7 @@
 					</view>
 					<view class="mian-foot">
 						<view class="mian-foot-img">
-							<image src="../../my/static/bg6.png" mode=""></image>
+							<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
 						</view>
 						<view class="mian-foot-list">
 							<view class="mian-foot-view">

From e9a0863dd1d9ad9008eabf93cdb093dd7789de19 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 1 Jul 2024 14:24:54 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/previousEarnings.vue | 4 ++--
 pages/index/previousPoints.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/index/previousEarnings.vue b/pages/index/previousEarnings.vue
index 19f2970..4741110 100644
--- a/pages/index/previousEarnings.vue
+++ b/pages/index/previousEarnings.vue
@@ -20,7 +20,7 @@
 			<template slot="content">
 				<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
 					<view class="mian-head">
-						<view class="mian-head-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
+						<view class="mian-head-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
 						<view class="mian-head-time">
 							<span class="shouyi-text">预约时间: </span>
 							<span>{{item.serveTime}}</span>
@@ -28,7 +28,7 @@
 					</view>
 					<view class="mian-foot">
 						<view class="mian-foot-img">
-							<image src="../../my/static/bg6.png" mode=""></image>
+							<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
 						</view>
 						<view class="mian-foot-list">
 							<view class="mian-foot-view">
diff --git a/pages/index/previousPoints.vue b/pages/index/previousPoints.vue
index f64dcbb..114fcb2 100644
--- a/pages/index/previousPoints.vue
+++ b/pages/index/previousPoints.vue
@@ -36,7 +36,7 @@
 				</view>
 				<view class="mian-list" @click="goOder(item)" v-for="(item,index) in yjjfList" :key="index">
 					<view class="mian-list-top">
-						<view class="mian-list-top-biao">已完成</view>
+						<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
 						<view class="mian-list-top-time">
 							<span>预约时间: </span>
 							<span>{{item.serveTime}}</span>
@@ -44,7 +44,7 @@
 					</view>
 					<view class="mian-foot">
 						<view class="mian-foot-img">
-							<image src="../../my/static/bg6.png" mode=""></image>
+							<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
 						</view>
 						<view class="mian-foot-list">
 							<view class="mian-foot-view">

From 9a1d8e1b254bc19f364d874c07ed8e2c25f01dc0 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 1 Jul 2024 15:39:39 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/my/fund/index.vue b/my/fund/index.vue
index 0470ba0..3d40311 100644
--- a/my/fund/index.vue
+++ b/my/fund/index.vue
@@ -53,7 +53,7 @@
 						<view class="storedIntegralTop">
 							<view class="storedIntegralTopOfRight">
 								<view class="">{{item.type == 1 ?"收入":"支出"}}</view>
-								<view class="">{{item.money}}元</view>
+								<view class=""><span v-if="item.type != 1">-</span>{{item.money}}元</view>
 							</view>
 						</view>
 

From 671ab39c085bd2ec7ada8900dd5015d1b9de4cdc Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 1 Jul 2024 18:47:17 +0800
Subject: [PATCH 4/9] =?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/revenueDetails.vue |  60 +++++++-------
 pages/index/index.vue       | 157 +++++++++++++++++++++++-------------
 pages/my/index.vue          |  14 +++-
 static/clock.png            | Bin 0 -> 1065 bytes
 4 files changed, 139 insertions(+), 92 deletions(-)
 create mode 100644 static/clock.png

diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index c769c4e..d331fb0 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -1778,7 +1778,7 @@
 		color: #029D88;
 	}
 	.footers-bor{
-		border: 3px solid #029D88;
+		border: 1px solid #029D88;
 		background-color: #fff;
 		color: #029D88;
 	}
@@ -1788,14 +1788,15 @@
 	}
 	.footers-btn{
 		width: 204rpx;
-		height: 69rpx;
+		height: 82rpx;
 		text-align: center;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		border-radius: 35rpx;
+		border-radius: 80rpx;
 		font-weight: 400;
 		font-size: 29rpx;
+		margin-right: 8rpx;
 	}
 	.footers{
 		width: 100%;
@@ -1854,14 +1855,14 @@
 	}
 	.yiji{
 		width: 100%;
-		height: 72rpx;
+		height: 88rpx;
 		background: linear-gradient(-90deg, #2EC5AC, #08A28A);
 		border-radius: 21rpx;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		padding: 0 5px;
+		padding: 0 10px;
 		height: 72rpx;
 		margin-top: 10px;
 	}
@@ -1879,7 +1880,7 @@
 		align-items: center;
 	}
 	.yingde-title{
-		font-size: 25rpx;
+		font-size: 32rpx;
 		color: #333333;
 	}
 	.yingde{
@@ -1889,10 +1890,10 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: 0 5px;
-		height: 73rpx;
+		height: 80rpx;
 		background: #DCF4EF;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
+		border-bottom-left-radius: 16rpx;
+		border-bottom-right-radius: 16rpx;
 	}
 	.mian-content-textarea{
 		width: 100%;
@@ -1926,7 +1927,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		height: 40px;
+		height: 50px;
 		border-bottom: 1px solid #e5e5e5;
 		padding: 0px 5px;
 	}
@@ -1938,16 +1939,16 @@
 		padding: 5px;
 	}
 	.mian-view-list-text{
-		font-size: 22rpx;
+		font-size: 30rpx;
 		color: #333333;
 	}
 	.mian-content-list-title{
-		font-size: 22rpx;
-		color: #555555;
+		font-size: 30rpx;
+		color: #999;
 	}
 	.mian-view-list-title{
-		font-size: 22rpx;
-		color: #555555;
+		font-size: 30rpx;
+		color: #999;
 	}
 	.mian-view-list:last-child{
 		border: 0px !important;
@@ -1959,9 +1960,9 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		height: 40px;
+		height: 50px;
 		border-bottom: 1px solid #e5e5e5;
-		padding: 0px 5px;
+		padding: 0px 10px;
 	}
 	
 	.mian-view{
@@ -1971,8 +1972,7 @@
 		background: #fff;
 		border-radius: 24rpx;
 		padding: 10px;
-		margin-top: 20px;
-	}
+		}
 	.mina-title-bor{
 		width: 111rpx;
 		height: 16rpx;
@@ -1984,7 +1984,7 @@
 	}
 	.mina-title-text{
 		font-weight: bold;
-		font-size: 28rpx;
+		font-size: 32rpx;
 		color: #333333;
 	}
 	.mina-title{
@@ -1995,7 +1995,7 @@
 		position: relative;
 		align-items: center;
 		justify-content: center;
-		margin-top: 10px;
+		margin:40rpx 0;
 	}
 	.mian-view{
 		width: 100%;
@@ -2015,8 +2015,8 @@
 		margin: 15px 0px 20px 0px;
 	}
 	.mian-top-foot-view-img span,.mian-top-foot-view-text{
-		font-size: 25rpx;
-		color: #666666;
+		font-size: 29rpx;
+		color: #333;
 	}
 	.mian-top-foot-view-img image{
 		width: 26.39rpx;
@@ -2029,8 +2029,8 @@
 		align-items: center;
 	}
 	.mian-top-foot-view-title{
-		font-size: 25rpx;
-		color: #666666;
+		font-size: 29rpx;
+		color: #999;
 	}
 	.mian-top-foot-view{
 		width: 100%;
@@ -2075,7 +2075,7 @@
 	}
 	.mian-title-view{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 32rpx;
 		color: #333333;
 	}
 	.mian-title{
@@ -2108,12 +2108,12 @@
 	.mian-top{
 		width: 100%;
 		/* height: 331rpx; */
-		padding: 10px;
+		padding: 30rpx;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 	}
 	.mian{
-		width: 95%;
+		width: 92%;
 		display: flex;
 		flex-direction: column;
 		position: absolute;
@@ -2126,13 +2126,13 @@
 	}
 	.header{
 		width: 100%;
-		height: 228rpx;
+		height: 300rpx;
 		background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
 		margin-top: 45px;
 	}
 	.nav-btn{
 		font-size: 25rpx;
-		color: #019C88;
+		color: #019c88;
 		line-height: 63rpx;
 	}
 	.nav-title{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ff90c9a..09a56ff 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,12 +1,12 @@
 <template>
-	<view style="padding-bottom: 80upx;">
+	<view style="padding-bottom: 30px;">
 		<view class="jishi-index">
-			<view class=" u-flex padding-lr" style="padding: 30px 30rpx 120px;align-items: center;">
+			<view class=" u-flex padding-lr" style="padding-top: 35px;">
 				<view class="u-m-r-10">
-					<image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx; border: 2px solid #fffff;"
+					<image :src="avatar" class="head-port"
 						@click="goNav('/pages/my/userinfo')"></image>
 				</view>
-				<view class="u-flex-1 u-m-l-10 text-white" v-if="isLogin && userName">
+				<view class="u-flex-1 margin-left-sm text-white" v-if="isLogin && userName">
 					<view class="flex align-center justify-between">
 						<view class="">
 							<view class="u-font-18 text-white" @click="goNav('/pages/my/user')">
@@ -19,21 +19,7 @@
 									color="#029d88" disabled />
 							</view>
 						</view>
-						<view class="gxbox" @click="goNavs('/my/qiandao/index')">
-							<template v-if="loglataddress">
-								<view class="flex align-center gengxin">
-									更新位置：<text class="wztext">{{ loglataddress }}</text>
-								</view>
-								<view class="flex align-center gengxin" style="margin-top: 5px;">
-									更新时间：<text class="wztext">{{ loglattime }}</text>
-								</view>
-							</template>
-							<template v-else>
-								<view class="flex align-center gengxin" style="justify-content: center;">
-									点击更新位置
-								</view>
-							</template>
-						</view>
+						
 						<!-- <view class="flex margin-left-sm " style="font-size: 22rpx;font-weight: 500;"
 							v-if="XCXIsSelect != '否'">
 							<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/rzType')">
@@ -56,6 +42,21 @@
 					登录
 				</view>
 			</view>
+			<view class="gxbox" @click="goNavs('/my/qiandao/index')">
+				<template v-if="loglataddress">
+					<view class="flex align-center gengxin">
+						位置：<text class="wztext">{{ loglataddress }}</text>
+					</view>
+					<view class="flex align-center gengxin">
+						时间：<text class="wztext">{{ loglattime }}</text>
+					</view>
+				</template>
+				<template v-else>
+					<view class="flex align-center gengxin" style="justify-content: center;">
+						点击更新位置
+					</view>
+				</template>
+			</view>
 			<!-- <view class="box" v-if="XCXIsSelect != '否'">
 				<view class="">
 					￥<text class="text-bold text-xl">{{sumMoney}}</text>
@@ -84,10 +85,6 @@
 					<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
 				</view>
 				
-				<view class="" style="margin-top: 20px;">
-					<text style="font-size: 24px;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
-					<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
-				</view>
 				<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
 					:percent="lineProgressData" :striped-active="true"></u-line-progress>
 
@@ -121,6 +118,12 @@
 				</view> -->
 				<view class="flex align-center"
 					style="justify-content: space-evenly;text-align: center;">
+					<view class="">
+						<view  style="font-size: 24px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
+						<text style="font-size: 14px; margin-top: 5px;">当前业绩</text>
+						<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
+					</view>
+					<view class="shuxian"></view>
 					<view class="" @click="dangqian">
 						<view class="" style="font-size: 24px;font-weight: bold;">
 							{{ currentRealIncome ? currentRealIncome : 0 }}
@@ -426,25 +429,37 @@
 					:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
 					v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
 					<view class="flex justify-between padding-sm ">
-						<view class="text-green">预约时间：{{ item.serveTime }}</view>
-						<view class="text-green" v-if="item.status == 1">待付款...</view>
-						<view class="text-green" v-if="item.status == 2">待服务</view>
-						<view class="text-green" v-if="item.status == 5">已完成</view>
-						<view class="text-green" v-if="item.status == 6">进行中</view>
-						<view class="text-green" v-if="item.status == 7">已出发</view>
-						<view class="text-green" v-if="item.status == 8">已到达</view>
-						<view class="text-green" v-if="item.status == 3">待评价</view>
-						<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view>
+						<view class="progress-text">预约时间：{{ item.serveTime }}</view>
+						<view class="progress-status" v-if="item.status == 1">待付款...</view>
+						<view class="progress-status" v-if="item.status == 2">待服务</view>
+						<view class="progress-status" v-if="item.status == 5">已完成</view>
+						<view class="progress-status" v-if="item.status == 6">进行中</view>
+						<view class="progress-status" v-if="item.status == 7">已出发</view>
+						<view class="progress-status" v-if="item.status == 8">已到达</view>
+						<view class="progress-status" v-if="item.status == 3">待评价</view>
+						<view class="progress-status" v-if="item.status == 4" style="color: #999999;">已取消</view>
 						<view v-if="item.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view>
 						<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
 						<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
 
 					</view>
-					<view class="xian"></view>
+					<view class="xian" v-if="item.status == 6"></view>
+					<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
+						<view class="pintuan-title" >
+							<image src="../../static/clock.png" class="pintuan-img"></image>
+							<span class="pintuan-text">服务倒计时</span>
+						</view>
+						<!-- 						<uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
+							:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
+							color="#20C675">
+						</uni-countdown> -->
+						<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+							font-size="30" separator-size="30"></u-count-down>
+					</view>
 					<view class=" u-flex u-p-t-30 padding-sm">
 						<view class="u-m-r-10">
 							<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
-								size="100">
+								size="80">
 							</u-avatar>
 						</view>
 						<view class="u-flex-1  margin-left-xs">
@@ -475,18 +490,6 @@
 								@click="cancel(item)">订单完成</u-button> -->
 						</view>
 					</view>
-					<view class="xian" v-if="item.status == 6"></view>
-					<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
-						<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #2FB57A;">
-							服务倒计时
-						</view>
-						<!-- 						<uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
-							:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
-							color="#20C675">
-						</uni-countdown> -->
-						<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
-							font-size="30" separator-size="30"></u-count-down>
-					</view>
 				</view>
 			</view>
 			<uni-popup ref="popup" type="center">
@@ -1465,6 +1468,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@300&display=swap');
+body {
+  font-family: Helvetica Neue, Helvetica, sans-serif;
+}
 	.butween-list{
 	width: 96%;
 	margin: 0 auto;
@@ -1501,14 +1508,27 @@ export default {
 	.jishi-index{
 		width: 100%;
 		height: 215px;
+		padding: 0 20px;
 		background-image: url('../../static/index/technician15.png');
 		background-repeat: no-repeat;
 		background-size: 100%;
 	}
 page {
-	background-color: #ffffff;
+	background-color: #f7f7f7;
+}
+.progress-text{
+	font-size: 30rpx;
+	color: #666;
+	padding-top: 8rpx;
+}
+.progress-status{
+	color: #fff;
+	border-radius:20rpx 8rpx 20rpx 8rpx ;
+	padding: 4rpx 10rpx;
+	background-image: linear-gradient(to bottom, #fe9130, #ff9868);
+	font-size: 28rpx;
+	
 }
-
 // .bg {
 // 	background-color: #05C25C;
 // }
@@ -1518,25 +1538,29 @@ page {
 }
 
 .gxbox {
+	display: flex;
 	font-size: 20rpx;
-	width: 160px;
+	width: 100%;
 	background-color: #008e7c;
 	color: #fff;
-	border-radius: 15px;
-	padding: 10px;
+	border-radius: 15px 15px 0 0;
+	padding: 0 30rpx;
+	height: 60rpx;
+	margin-top: 8rpx;
+	justify-content: space-between;
 }
 
 .wztext {
 	width: 80px;
 	overflow: hidden;
-	text-overflow: ellipsis;
+	//text-overflow: ellipsis;
 	white-space: nowrap;
 }
 
 .dengjibox {
 	position: relative;
 	width: 100%;
-	height: 360rpx;
+	height: 300rpx;
 	background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
 	box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(26,25,26,0.3);
 	border-radius: 20rpx;
@@ -1615,6 +1639,7 @@ page {
 	border: 2px #ededed solid;
 	border-radius: 10px;
 	padding: 30rpx;
+	background: #fff;
 }
 
 .tapDsalk {
@@ -1662,17 +1687,27 @@ page {
 	width: 100%;
 	height: 1rpx;
 	border: 1rpx solid #f8f8f8;
-	margin-top: 20rpx;
+	margin-bottom: 10rpx;
 }
 
 .pintuan_syrs {
-	color: #999999;
+	color: #fff;
 	font-size: 20upx;
-	margin: 20rpx 20rpx 0rpx;
 	display: flex;
 	padding-right: 18upx;
+	background: #5abfb2 ;
+	padding: 10rpx;
+	border-radius: 10rpx;
+}
+.pintuan-title{
+	font-size: 30rpx;
+	font-family: Helvetica Neue, Helvetica, sans-serif;
+	color: #fff;
+	}
+.pintuan-img{
+	width: 40rpx;
+	height: 40rpx;
 }
-
 .box {
 	color: #FFFFFF;
 	padding: 40upx 40upx 60upx 40upx;
@@ -1759,7 +1794,7 @@ uni-switch::before {
 // 	border-radius: 50px !important;
 // }
 .radius {
-	border-radius: 15rpx;
+	border-radius: 20rpx;
 }
 
 ::v-deep .u-mode-center-box {
@@ -1873,6 +1908,12 @@ uni-switch::before {
 .importMaterialPackageInner view:nth-child(1) {
 	width: 75%;
 }
+.head-port{
+	width: 110rpx;
+	height: 110rpx;
+	border-radius: 50%;
+	border: 1px #d6f2ee solid;
+}
 
 // ::v-deep .uni-scroll-view-content {
 // 	margin: 20px;
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 6ea9abb..113e00d 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -2,12 +2,12 @@
 	<view class="" style="padding-bottom: 30px;">
 		<view class="headtop">
 			<view class="headbox">
-				<view class="u-flex text-white" style="padding-top: 35px;">
+				<view class=" u-flex padding-lr" style="padding-top: 35px;">
 					<view class="u-m-r-10">
-						<image :src="avatar" style="width: 60px;height: 60px;border-radius: 100rpx; border: 1px solid #d7f2ee; margin-left: 5px;"
+						<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 text-white" v-if="isLogin && userName">
 						<view class="u-font-18 ">
 							<view class="flex align-center" style="margin-bottom: 5px;">
 								<view class="margin-left-sm">{{ userName }}</view>
@@ -36,7 +36,7 @@
 							</view>
 						</view>
 					</view>
-					<view v-else class="text-xl u-p-l-20 text-bold" @click="goLogin('/pages/public/login')">
+					<view v-else class="text-xl text-white u-p-l-20 text-bold" @click="goLogin('/pages/public/login')">
 						登录
 					</view>
 				</view>
@@ -923,4 +923,10 @@
 		font-weight: bold;
 		margin-left: 10rpx;
 	}
+	.head-port{
+		width: 110rpx;
+		height: 110rpx;
+		border-radius: 50%;
+		border: 1px #d6f2ee solid;
+	}
 </style>
\ No newline at end of file
diff --git a/static/clock.png b/static/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..57ab0aab30d141470d8b6b3748c20f23c49dfae7
GIT binary patch
literal 1065
zcmV+^1lIeBP)<h;3K|Lk000e1NJLTq001!n001!v1^@s6bDTjO000B<Nkl<ZXo2mS
zO^8-i7{`AjT9zS=8^59`D;a2NMzma51Z5x4he1J$5c_a3v}l#M2x7`|B?M9nVX}-|
z7(}@+3S1bZRF<U$q6jmFp*h1ukR_x3Tb%pad7t;*bI-l!4sPBbyo-B2{?GHj_rB-j
z9_Z4gi%*X&kd&f#2e2Jj089Z^Y!>i0uo>7<H%L!Ud)iH#I0`I{Y<nkgq)rfPVrHQ2
zAn*#X1UL`;3~U8P1AXRH$mOa)-F3hQU;vm0oB>9FJyFV%kTfW1N}XJgG@P}``}IrO
zE9rowW2Wz^tbD(up@7DVl1}HumZX=W-jvM1zXc*K1_Mc~%!2JSefCLuS<<5=eal!A
zW8z4J&<Yd$R!Q$jIv&wilEx%`An6{XvpT2kd2{`HjEM=a!=$9UB;6+I)6C#jFKAzO
zox&bTt31sua<AgvtbD$tLw<)C6XRa{2^By3Es4onc1xOD5bH~?-BgT;?~M3cMzBZj
z&p92OlysAc_k?NlYmABeO{asN;DDqP(`2B<l%(gpm<LV$t1%{!^o7@HXI3^t(m&H|
zz~`1M?yy((r=;07=b{;V7BG|*eFRJbUjz4+-i78E2bKe4z*?Xe_#7CmyX@EotZzEY
z2#%4njHzQ{065fOVpUm#djglSCT2v4Y)VMr6W~GM^#qNP%01LRye&!iWBy{awk2q-
z^R+BxPvW)8cj15bo9pirw1z{KArmu!XA%NmYp&-eXx#`bE2<2cc$jMY1B)FrItG!7
ztSG7onYcSKXwxhzstB2wKMjebaC=cj$b@~TQweQ_V^~~NQTE49;bOyj9c!i*ArncT
zJ%CH*dI#`ZgL;<<nK+ja5a2%A@BT^LFj>AI$Y-*sB4pyPn!#G!4E$(fjN{f~V>R@S
z7FC2y9Ip|`(hq!Q$}ZrB@3R%P3XO+M*x+?}9QX#f#w+^+I8ae%G`gi(wArm;3i~|W
zrE34G62rWr1z?$pryDdONk2&1CFxwnej^I3Vq-Q%W4Hy_m1F_#dn{0IQ}jl|3037?
zJOg>e?y<iDRyUJVB~Af1*upwb0$`$ngz6AASH+mv4LqBcOKtjq!<6i6%1rFSjq_KM
ze%#jf>Y@fA6CcyLJ$(UqAU&@j&jSycvOeHj+zC=S*;w40Ggg1-jn$7xI#YA52(jLa
zu`#E9s9@m9H8ET5$5oruJ_#b}dP#4p^AMyC@5!BY*cfX~yH!<8AZd}Lw=<!lGYTXv
zmb6*Y*@}r@lC)jY@)G^0B)u=`$yS-A$s^!7z+=ElU?FZ}--}!LUBs<gPva)8pKx<e
joh5n4Jkg~~mv;UGE`g^jGD%mQ00000NkvXXu0mjf8S(QA

literal 0
HcmV?d00001


From 3c0a67d16ed3b832608df6d1d5058171a9780a1a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 1 Jul 2024 19:06:00 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=9F=E6=B4=BB?=
 =?UTF-8?q?=E7=85=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/commission/index.vue           | 20 +++++++++++++++-----
 my/fund/index.vue                 |  3 ++-
 pages.json                        | 15 +++++++++++++++
 pages/index/addClock.vue          | 15 ++++++++-------
 pages/index/game/workphoto.vue    | 22 +++++++++++++++++++++-
 pages/index/index.vue             | 12 +++++-------
 pages/index/previousAdditions.vue | 21 +++++++++++----------
 pages/index/previousPoints.vue    |  4 ++--
 pages/my/index.vue                |  8 +++++++-
 9 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/my/commission/index.vue b/my/commission/index.vue
index 5e9a8e5..ffdf94b 100644
--- a/my/commission/index.vue
+++ b/my/commission/index.vue
@@ -14,20 +14,30 @@
 						</view>
 					</view>
 				</view>
-				<view class="innerBottom">
+				<view class="innerBottom" style="height: 140px;">
 					<view class="innerBottomOfTop">
 						<view class="innerTimer">
 							{{this.homePageDataNum.fundRange}}
 						</view>
 					</view>
 					<view class="middleTop">
-						<view class="IntegralImport">
+						<!-- <view class="IntegralImport">
 							<view class="totalIntegralNumber">
 								{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
 							</view>
 							<view class="totalIntegral">
 								本期收益(元)
 							</view>
+						</view> -->
+						<view class="IntegralImport">
+							<view class="IntegralClassify">
+								<view class="" style="margin-top: -12px;font-weight: 700;">
+									{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
+								</view>
+								<view class="IntegralClassifyInnerBottom">
+									本期收益(元)
+								</view>
+							</view>
 						</view>
 						<view class="line"></view>
 						<view class="innerBottomOfBottom">
@@ -47,7 +57,7 @@
 									车费收益
 								</view>
 							</view>
-							<view class="IntegralClassify">
+							<!-- <view class="IntegralClassify">
 								<view class="">
 									{{this.homePageDataNum.valueStorageDeduction ? this.homePageDataNum.valueStorageDeduction : 0 }}
 								</view>
@@ -62,14 +72,14 @@
 								<view class="IntegralClassifyInnerBottom">
 									渠道扣款
 								</view>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</view>
 				<uni-datetime-picker type="date" ref="dataPicker" :clear-icon="true" return-type="string"
 					@change="confirmSelectedDate" v-model="selectedDate" @maskClick="maskClick" />
 			</view>
-			<view id="IntegralStatisticsBottom" :style="{height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px'}">
+			<view id="IntegralStatisticsBottom" :style="{height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px',top:0}">
 				<view class="optionsDetail">
 					<!-- 父元素列表 -->
 					<cc-nodata title="暂无数据" v-if="noDataScrollStatus"
diff --git a/my/fund/index.vue b/my/fund/index.vue
index 3d40311..e12afa3 100644
--- a/my/fund/index.vue
+++ b/my/fund/index.vue
@@ -250,7 +250,7 @@
 					}
 					if (res && res.data && res.data.userMoneyDetailsList.records.length > 0) {
 						//有数据时
-						this.currentIncome = res.data?.income + "元";
+						this.currentIncome = res.data.income + "元";
 						for (let i = 0; i < res.data?.userMoneyDetailsList.records.length; i++) {
 							this.fundDetail.push(res.data?.userMoneyDetailsList.records[i]);
 						}
@@ -262,6 +262,7 @@
 							this.loadingStatus = "loadmore";
 						}
 					} else {
+						this.currentIncome = "0元";
 						//无数据时
 						if (!isScroll) {
 							//如果isScroll为null时说明不在滚动
diff --git a/pages.json b/pages.json
index 14ffd1f..b167bf1 100644
--- a/pages.json
+++ b/pages.json
@@ -163,6 +163,21 @@
 				"navigationBarTitleText": "网页"
 			}
 		},
+		{
+			"path": "pages/hetong/index",
+			"style": {
+				"navigationBarTitleText": "我的合同"
+				// "app-plus": {
+				// 	"titleNView": false
+				// }
+			}
+		},
+		{
+			"path": "pages/xingxiangzhao/index",
+			"style": {
+				"navigationBarTitleText": "生活照"
+			}
+		},
 	
 		{
 			"path": "pages/order/index",
diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index c43f6f3..da6ba9a 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -29,9 +29,10 @@
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
-						<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
+						<span class="view-title-left-text" v-if="orderType == 2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
+						<span class="view-title-left-text" v-if="orderType == 3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
 					</view>
-					<view class="view-title-right">加钟{{isSfwc}}订单数量: {{listData.length}}</view>
+					<view class="view-title-right">订单数量: {{listData.length}}</view>
 				</view>
 				<!--本期加钟 充值 订单-->
 				<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
@@ -46,15 +47,15 @@
 						</view>
 						<view class="mian-foot">
 							<view class="mian-foot-img">
-								<image src="../../my/static/bg6.png" mode=""></image>
+							<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
 							</view>
 							<view class="mian-foot-list">
 								<view class="mian-foot-view">
 									<view class="mian-title">{{item.entryName}}</view>
-									<view class="mian-dingwei">
+									<!-- <view class="mian-dingwei">
 										<image src="../../static/index/dangqian2.png" mode=""></image>
 										<span class="shouyi-text">0.8km</span>
-									</view>
+									</view> -->
 								</view>
 								<view class="mian-foot-dan shouyi-text">
 									订单编号 : {{item.ordersNo}}
@@ -85,7 +86,7 @@
 						</view>
 						<view class="mian-foot">
 							<view class="mian-foot-img">
-								<image src="../../my/static/bg6.png" mode=""></image>
+								<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
 							</view>
 							<view class="mian-foot-list">
 								<view class="mian-foot-view">
@@ -250,7 +251,7 @@
 			},
 			wangqi(){//往期 跳页
 				uni.navigateTo({
-					url:'/pages/index/previousAdditions?type=2'
+					url:'/pages/index/previousAdditions?type='+this.orderType
 				})
 			},
 		}
diff --git a/pages/index/game/workphoto.vue b/pages/index/game/workphoto.vue
index 8e521a3..794ce97 100644
--- a/pages/index/game/workphoto.vue
+++ b/pages/index/game/workphoto.vue
@@ -5,8 +5,11 @@
 				:key="index">
 				<image :src="item" style="width: 100%;" mode="widthFix" @click="saveImg(item)"></image>
 			</view>
+			
+			<view class="tabbar" style="background: linear-gradient(to right, #019c88, #2dbe93); border-radius: 50rpx;"
+				@click="goNav()" >重新上传</view>
 		</view>
-		<u-empty v-show="!photoList[0]" icon-size="180" text="暂无生活照片" mode="list"></u-empty>
+		<u-empty v-show="photoList.length==0" icon-size="180" text="暂无生活照片" mode="list"></u-empty>
 	</view>
 </template>
 
@@ -25,6 +28,11 @@
 			this.getDet()
 		},
 		methods: {
+			goNav(){
+				uni.navigateTo({
+					url:'/pages/xingxiangzhao/index'
+				})
+			},
 			// 详情
 			getDet() {
 				uni.showLoading({
@@ -58,4 +66,16 @@
 </script>
 
 <style>
+	
+	.tabbar {
+		width: 690upx;
+		height: 86upx;
+		background: #019c88;
+		border-radius: 8upx;
+		margin: 0 auto;
+		text-align: center;
+		line-height: 86upx;
+		color: #FFFFFF;
+		margin-top: 20rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ff90c9a..b775909 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -692,13 +692,6 @@ export default {
 		});
 		// this.getcity()
 		
-		// 理疗师端首页是否弹框 380
-		this.$Request.get('/app/common/type/448').then(res => {
-			console.log('res448--->',res);
-			this.isJsjdsfxywl = res.data.value;
-		});
-		
-		
 	},
 	onShow() {
 		console.log(this.isLogin);
@@ -715,6 +708,10 @@ export default {
 			}
 		});
 
+		// 理疗师端首页是否弹框 380
+		this.$Request.get('/app/common/type/448').then(res => {
+			this.isJsjdsfxywl = res.data.value;
+		});
 		this.$Request.get('/app/common/type/238').then(res => {
 			if (res.code == 0) {
 				// #ifdef MP-WEIXIN
@@ -997,6 +994,7 @@ export default {
 		},
 		stateSave() {
 			let materialPackageCountFlag = this.homeMaterialPackageList.some((item) => item.residue <= item.materialMinimum);
+			console.log(this.isTrue,materialPackageCountFlag,this.isJsjdsfxywl);
 			if (!this.isTrue && materialPackageCountFlag && this.isJsjdsfxywl == '是') {
 				this.$queue.showToast("当前剩余物料包数量不足，请检查");
 				return;
diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue
index 6f83780..713c3c5 100644
--- a/pages/index/previousAdditions.vue
+++ b/pages/index/previousAdditions.vue
@@ -33,15 +33,16 @@
 					<view class="view-title">
 						<view class="view-title-left">
 							<span class="view-title-left-shuxian"></span>
-							<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
+							<span class="view-title-left-text" v-if="orderType==2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
+							<span class="view-title-left-text" v-if="orderType==3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
 						</view>
-						<view class="view-title-right">加钟订单数量: {{listData.length}}</view>
+						<view class="view-title-right">订单数量: {{listData.length}}</view>
 					</view>
 				<!--本期加钟 充值 订单-->
 				<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
 					<view class="mian-list">
 						<view class="mian-list-top">
-							<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
+							<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
 							<view class="mian-list-top-time">
 								<span>预约时间: </span>
 								<span>{{item.serveTime}}</span>
@@ -49,15 +50,15 @@
 						</view>
 						<view class="mian-foot">
 							<view class="mian-foot-img">
-								<image src="../../my/static/bg6.png" mode=""></image>
+							<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
 							</view>
 							<view class="mian-foot-list">
 								<view class="mian-foot-view">
 									<view class="mian-title">{{item.entryName}}</view>
-									<view class="mian-dingwei">
+									<!-- <view class="mian-dingwei">
 										<image src="../../static/index/dangqian2.png" mode=""></image>
 										<span class="shouyi-text">0.8km</span>
-									</view>
+									</view> -->
 								</view>
 								<view class="mian-foot-dan shouyi-text">
 									订单编号 : {{item.ordersNo}}
@@ -80,7 +81,7 @@
 				<view class="mina-view" v-if="isSfwc=='0'" v-for="item in listData" :key="item.id" @click="goOder(item)">
 					<view class="mian-list">
 						<view class="mian-list-top">
-							<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
+							<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
 							<view class="mian-list-top-time">
 								<span>预约时间: </span>
 								<span>{{item.serveTime}}</span>
@@ -88,15 +89,15 @@
 						</view>
 						<view class="mian-foot">
 							<view class="mian-foot-img">
-								<image src="../../my/static/bg6.png" mode=""></image>
+							<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
 							</view>
 							<view class="mian-foot-list">
 								<view class="mian-foot-view">
 									<view class="mian-title">{{item.entryName}}</view>
-									<view class="mian-dingwei">
+									<!-- <view class="mian-dingwei">
 										<image src="../../static/index/dangqian2.png" mode=""></image>
 										<span class="shouyi-text">0.8km</span>
-									</view>
+									</view> -->
 								</view>
 								<view class="mian-foot-dan shouyi-text">
 									订单编号 : {{item.ordersNo}}
diff --git a/pages/index/previousPoints.vue b/pages/index/previousPoints.vue
index 114fcb2..df75801 100644
--- a/pages/index/previousPoints.vue
+++ b/pages/index/previousPoints.vue
@@ -49,10 +49,10 @@
 						<view class="mian-foot-list">
 							<view class="mian-foot-view">
 								<view class="mian-title">{{item.entryName}}</view>
-								<view class="mian-dingwei">
+								<!-- <view class="mian-dingwei">
 									<image src="../../static/index/dangqian2.png" mode=""></image>
 									<span class="shouyi-text">{{item.km}}km</span>
-								</view>
+								</view> -->
 							</view>
 							<view class="mian-foot-dan shouyi-text">
 								订单编号 : {{item.ordersNo}}
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 6ea9abb..97deb5e 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -168,7 +168,7 @@
 							证件资质
 						</view>
 					</view>
-					<view class="sdza" @click="goNfeedback()"
+					<view class="sdza" @click="goHetong()"
 						style="background: url(../../static/images/my/gyw06.png);background-size: cover;">
 						<image src="../../static/images/my/hetong.png"
 							style="width: 54rpx;height: 60rpx;margin-bottom: 4px;margin-top: 20px;"></image>
@@ -415,6 +415,12 @@
 					url:'/my/feedback/index'
 				})
 			},
+			// 跳转合同页面
+			goHetong(){
+				uni.navigateTo({
+					url:'/pages/hetong/index'
+				})
+			},
 			getMyPageNum() {
 				let artificerId = uni.getStorageSync("artificerId");
 				console.log("artificerId--->",artificerId);

From 4e7a24d5bd835d3dcb7209994d696efcee17c34d Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 1 Jul 2024 19:11:43 +0800
Subject: [PATCH 6/9] =?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/revenueDetails.vue |  3 ++-
 pages/index/index.vue       | 31 ++++++++++++++++---------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index d331fb0..3002d58 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -2103,7 +2103,8 @@
 		justify-content: space-between;
 		border-bottom: 1px solid #E5E5E5;
 		padding-bottom: 15px;
-		margin-bottom: 7px;
+		margin-bottom: 15px;
+		margin-top: 5px;
 	}
 	.mian-top{
 		width: 100%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 09a56ff..cc85f60 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -120,7 +120,7 @@
 					style="justify-content: space-evenly;text-align: center;">
 					<view class="">
 						<view  style="font-size: 24px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
-						<text style="font-size: 14px; margin-top: 5px;">当前业绩</text>
+						<text style="font-size: 14px; margin-top: 15px;">当前业绩</text>
 						<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
 					</view>
 					<view class="shuxian"></view>
@@ -425,6 +425,18 @@
 					<text
 						style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">今日服务</text>
 				</view>
+				<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
+					<view class="pintuan-title" >
+						<image src="../../static/clock.png" class="pintuan-img"></image>
+						<span class="pintuan-text">服务倒计时</span>
+					</view>
+					<!-- 						<uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
+						:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
+						color="#20C675">
+					</uni-countdown> -->
+					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+						font-size="30" separator-size="30"></u-count-down>
+				</view>
 				<view class="bgwhite radius margin-top-sm padding-bottom-sm"
 					:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
 					v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
@@ -444,18 +456,7 @@
 
 					</view>
 					<view class="xian" v-if="item.status == 6"></view>
-					<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
-						<view class="pintuan-title" >
-							<image src="../../static/clock.png" class="pintuan-img"></image>
-							<span class="pintuan-text">服务倒计时</span>
-						</view>
-						<!-- 						<uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
-							:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
-							color="#20C675">
-						</uni-countdown> -->
-						<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
-							font-size="30" separator-size="30"></u-count-down>
-					</view>
+					
 					<view class=" u-flex u-p-t-30 padding-sm">
 						<view class="u-m-r-10">
 							<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
@@ -1587,7 +1588,7 @@ page {
 
 .djimg {
 	position: absolute;
-	right: 40px;
+	right: 45px;
 	top: 0;
 	background: url(../../static/images/index/vip.png) no-repeat center;
 	background-size: cover;
@@ -1595,7 +1596,7 @@ page {
 	height: 77px;
 	font-size: 22px;
 	text-align: center;
-	line-height: 84px;
+	line-height: 90px;
 }
 
 .xianb {

From d81c03878c2f658e8182738a03d6ff76c7388f41 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 1 Jul 2024 20:16:14 +0800
Subject: [PATCH 7/9] =?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       |  84 +++++++++++++++++++++++-------------
 static/images/order_01.png  | Bin 1348 -> 4454 bytes
 static/images/order_011.png | Bin 1347 -> 1759 bytes
 static/images/order_02.png  | Bin 1636 -> 4274 bytes
 static/images/order_022.png | Bin 1610 -> 2349 bytes
 static/images/order_03.png  | Bin 1841 -> 4217 bytes
 static/images/order_033.png | Bin 1781 -> 2286 bytes
 static/images/order_04.png  | Bin 1373 -> 4021 bytes
 static/images/order_044.png | Bin 1345 -> 2016 bytes
 9 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index 801c380..2818ee4 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -6,9 +6,9 @@
 
 		<!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll -->
 		<view class="sticky-tabs">
-			<view class=" u-flex padding ding-view">
+			<view class="ding-view">
 				<view class="u-m-r-10">
-					<image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 100rpx;"
+					<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">
@@ -67,41 +67,41 @@
 				<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="text-green" v-if="item.status == 2">待服务</view>
+					<view class="progress-status" v-if="item.status == 2">待服务</view>
 					<view class="text-green" v-if="item.status == 3">已完成待评价</view>
 					<!-- <view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view> -->
-					<view class="text-green" v-if="item.status == 5">已完成</view>
-					<view class="text-green" v-if="item.status == 6">服务中</view>
-					<view class="text-green" v-if="item.status == 7">技师出发</view>
-					<view class="text-green" v-if="item.status == 8">技师到达</view>
-					<view class="text-green" v-if="item.status ==9">确认接单</view>
+					<view class="progress-status" v-if="item.status == 5">已完成</view>
+					<view class="progress-status" v-if="item.status == 6">服务中</view>
+					<view class="progress-status" v-if="item.status == 7">技师出发</view>
+					<view class="progress-status" v-if="item.status == 8">技师到达</view>
+					<view class="progress-status" v-if="item.status ==9">确认接单</view>
 					<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
 			
 					<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
 
-					<view class="text-green">预约时间：{{ item.serveTime }}</view>
+					<view style="color: #333;">预约时间：{{ item.serveTime }}</view>
 					<view v-if="item.status == 9&& item.refusalContent" class="judan">
 						拒单审核中...
 					</view>
 				</view>
 				<view class="xian"></view>
-				<view class=" u-flex u-p-t-30 padding-sm">
+				<view class=" u-flex padding-sm">
 					<view class="u-m-r-10">
 						<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
 							size="100">
 						</u-avatar>
 					</view>
 					<view class="u-flex-1  margin-left-xs">
-						<view class="u-font-18  text-bold u-line-1 top-title">
-							<view class="margin-right-xs text-df margin-left-xs" style="margin-top: 0rpx;display: inline-block;width: 105px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+						<view class="u-font-18  u-line-1 top-title">
+							<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
+							<view class="flex-sub">
+								<text class="text-df">实收:￥</text><text class="text-xl text-bold">{{ item.artificerMoneyTotal
 									}}</text>
 							</view>
 						</view>
-						<view class="margin-left-xs text-cut" style="width:550upx">{{ item.address }}</view>
+						<view class="text-cut" style="width:550upx; color: #999;">{{ item.address }}</view>
 
 					</view>
 				</view>
@@ -114,7 +114,7 @@
 							@click="goNav('/my/order/pay?id=' + item.ordersId + '&isTrue=1')">查看详情</u-button> -->		
 						<view class="showBtn">
 							<view class="gengduo" @click.stop="gengBtn(index)">更多</view>
-							<view class="showBtn-view">
+							<view class="order-status showBtn-view">
 								<u-button :custom-style="customStyle" shape="circle" :plain="true"
 									@click="goChat">联系客服</u-button>
 								<u-button :custom-style="customStyle" v-if="item.status == 1||item.status == 7||item.status == 8||item.status == 9" shape="circle" :plain="true"
@@ -144,7 +144,7 @@
 				</view>
 				<view class="xian" v-if="item.status == 6"></view>
 				<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
-					<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #096f4b;">服务倒计时
+					<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #fe9130;">服务倒计时
 					</view>
 					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
 						font-size="30" separator-size="30"></u-count-down>
@@ -242,11 +242,11 @@
 				}, {
 					activityImageProps: {
 						src: '../../static/images/order_02.png',
-						style: 'width: 26px;height: 26px;',
+						style: 'width: 30px;height: 30px;',
 					},
 					noactivityImageProps: {
 						src: '../../static/images/order_022.png',
-						style: 'width: 26px;height: 26px;',
+						style: 'width: 30px;height: 30px;',
 					},
 					activityTitleTextProps: {
 						class: 'activityTitleTextProps',
@@ -259,11 +259,11 @@
 				}, {
 					activityImageProps: {
 						src: '../../static/images/order_03.png',
-						style: 'width: 26px;height: 26px;',
+						style: 'width: 30px;height: 30px;',
 					},
 					noactivityImageProps: {
 						src: '../../static/images/order_033.png',
-						style: 'width: 26px;height: 26px;',
+						style: 'width: 30px;height: 30px;',
 					},
 					activityTitleTextProps: {
 						class: 'activityTitleTextProps',
@@ -276,11 +276,11 @@
 				}, {
 					activityImageProps: {
 						src: '../../static/images/order_04.png',
-						style: 'width: 26px;height: 26px;',
+						style: 'width: 30px;height: 30px;',
 					},
 					noactivityImageProps: {
 						src: '../../static/images/order_044.png',
-						style: 'width: 26px;height: 26px;',
+						style: 'width: 28px;height: 30px;',
 					},
 					activityTitleTextProps: {
 						class: 'activityTitleTextProps',
@@ -872,6 +872,11 @@
 		flex-direction: row;
 		align-items: center;
 	}
+	.order-status{
+		width: 90%;
+		display: flex;
+		flex-direction: row;
+	}
 	.showBtn{
 		justify-content: space-between;
 	}
@@ -885,11 +890,12 @@
 		
 	}
 	/deep/.text-xl{
-		font-size: 15px;
+		font-size: 34rpx;
+		color: #fe9130;
 	}
 	.flex-sub{
 		text-align: right;
-		font-size: 13px;
+		font-size: 28rpx;
 	}
 	.top-title{
 		width: 95%;
@@ -1004,10 +1010,10 @@
 	   background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
 	   border-radius: 24rpx;
 	   margin: 10px auto 0px auto;
-	   align-items: end;
 	   display: flex;
 	   flex-direction: row;
 	   justify-content: space-between;
+	   padding:30rpx;
    }
 	.content{
 		width: 100%;
@@ -1018,7 +1024,7 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		padding: 30px 0px;
+		padding: 10px 0px;
 	}
 
 	.u-tabs {
@@ -1031,7 +1037,7 @@
 	}
 
 	/deep/.u-scroll-view {
-		padding: 10px 16px !important;
+		padding: 10px 0px !important;
 	}
 
 	/deep/.u-tab-item {
@@ -1054,7 +1060,7 @@
 	}
 
 	/deep/.activityTitleTextProps {
-		color: #096f4b;
+		color: #019c88;
 		font-size: 14px;
 	}
 
@@ -1094,7 +1100,7 @@
 		width: 100%;
 		height: 1rpx;
 		border: 1rpx solid #f8f8f8;
-		margin-top: 20rpx;
+		margin-bottom: 20rpx;
 	}
 
 	.pintuan_syrs {
@@ -1125,4 +1131,22 @@
 			margin-right: 8rpx;
 		}
 	}
+	.head-port{
+		width: 110rpx;
+		height: 110rpx;
+		border-radius: 50%;
+		border: 1px #d6f2ee solid;
+	}
+	/deep/.radius {
+		border-radius: 20rpx;
+	}
+	.progress-status{
+		color: #019c88;
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+	.order-details{
+		font-size: 34rpx;
+		
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/order_01.png b/static/images/order_01.png
index 2dec70ecaeada0fba8a72cb6cd2683737382461f..b52b6eb4ed499f51b0c48d14ea08fe97a9aaca0a 100644
GIT binary patch
literal 4454
zcmV-s5t;6ZP)<h;3K|Lk000e1NJLTq002<{002!01^@s6-kXTl000p!Nkl<Zc%03h
zd#q(ueaAoFwf8yq$-H2uz>M<n0cb{}CPhhX!AF{^O=uHnOqJHeNE2FY8%Y~X!=+8D
zEq|z3YG^HEDbi##pa~(NV8;GYiy;V2s#R3L@|q6J3^RA;&V8J{fBj>hv(H*<uYJzB
z!`y*iGWVR{dj8gT{~l}o_TFd2>7al7n_YP)`)#azFVbct8&t_}r;2mUnyS<RlnCuF
z(fzAyb|0Vk<Ciy7_6aDK^wiTGf4x0d=LW>bfUOcaR3K^~LL`L-1@cP5Ha(>0CHvBe
zUhfXBx#9Q*u3#+X$<kZ@aEkogSvqBxuH~#v=d7)z0iVKQZkY>D9N>zDUQoApp_?t`
zzYhG4;2a+bMPG(|IE~btR#FGJ(9Hcop6jt5{0Cq`qg!vCn%Ty7Q_;myHU*!CY^8KX
z)^nMy9b09EpB*~J!a}0$XbM5R{Zk!y-RsG-%N@MaaJyVj+sqZSbcLi~0z=M;++>dw
zKc2f0I1r3?czzR8_CcZT0SM8zRsb0ZsDz!9TmCD(J8yX`*2eBx<wbJY=N;KDU=?I;
zQ0atO;Y6pvam>(xO<n!0cgb1b)7@Wu^!P_VeZY4)<7f!to`q?Oso#*e4)j*goJ6;p
zvT09#kxa*#UFkH3U+GBQ9sWEqU<utEj2;v<HBtZ_;B{nkT_6B4SJsu;Zb`cuF2g+8
zoeby+Tj?nKUCXk4GvB!FD<}3XJkqeN7OF1J?VsvY0P3$~yjO4*Vn&cPR@VnWzFdwD
z%X!vlH?38n7b+oJ0F)REHfSSnaG?f(8q6<NmFY=}<E!!1mYGAY7z{l0zy4gc1RY==
z*ackO&9X0VI(+sA*t@s6rdAL+{|%BpBX}c{lVU>(R?w(3*g?l#Kn(a(t4GSh?iD;+
znTI?8TTC~ukDTWaP?bne^;UR@Yi?Ky2HU&Pb*0`aF&6?Dj1*ib59}#S?@-CYtULHN
z%*F;^$L$NV<nH}~H&-%_=o16jR|lbOIr<>CEzAY&7Z!TOvE%zpy4B2nVzR@)F{DKk
zizY1si=aiL;%&f-MZ9|YyqPV64k8}6(mua7bLfXeL1pgv_HA-}1lU|(l7aROWcIaD
z{k8P9UcyOwTUYwTmT!G+^EeQ5%BdZKD}ebVfDPXjRaYOgIJ=VBnfrk62aCFX;pp0J
z3t#Qbp7AibT?*QP$`Y#_ch#`p+`u^(bg!a8pD#0kA$YcD<$taobU)$xh0v7uE#w^F
z3e3Gn(21^kQ+lPe9weqg@9!0>e-Dh@i;6ow_W@`6lB7!-vy1{T(n=FOjE5w5<JytV
zkGTH&l}4XE3)7S{i2$@tIzF@7Hvat7j!SX&1!QlR<c9Lc=1a)?0QPx9FG}U74<FDs
zx%S$%HgWRI*k#f-CIv86F5w_I@jkFyJDXSkd2P?%{yVV9)SAIuJW4A~)N-br<?b(f
ztLUi5+U8E#xg6Q=BX$e9q=t<GGqOY{rZIOhXJ^wuJBTJtQ3sgxU|vNmQ=pN8E^wJi
z7j?7j8Kf5|vO<)>G6F&CKNXd@u!)O9kPCRp%u35UWIGW%5oZp=7lb%X4q%_p&FRd|
z$5!$qv{R0e`=PRBKi1qP23v<fS|`{pv>me&$tpLN7-PWOa6!WQF0em-X?T@XXJ>yf
znFAr`)(KDxKioqaID;wcbgL3uaGM_3wPi-#ygahF^y1am9RqO4bq5l)0hqAqHUPus
zl~2m5Xoo{`i29!-uS_1VR=!aNS$~XZ?pFq2zs?+1N4cH%Ua)nJ=|9PEpX+Sidd;@`
z@7e_@AIz7I%n1xrCyhR!R+lU4n|9nmiztc?6|L^kn9t{fR&4;%4p_(!Wh#qdi<Mc|
zoiZ*$dcDbZPGxM~@zC9Oq!SR629=0cqihs-H9o=k4ej>F3WkjMIJpt<qc378hk`le
zq9e2@%_x9*p-Z#1^2bdO+s?F2Q*E}3014-g7Lq!P``=qNHE|*Qo+IaN0+!ZBztF*^
zU|j}glIvl%$)sNmL2Ml95&$OCS?yQ7bs^Cxjd0q+HZ?iY{FZsg<tP>U52PyIIRlQ8
zA~URucyk3}V;eyNtR%b%6OV^!(~^WQOaPL;Q2oDZ<42qCaJYmF-lSDO3pFun>5Ojf
z^=T}oQ8&({CrGHaOfwKUYS5J8)B)HshvyF`BFXa1MW^?1z%)!eA#@~M3|26#BKQ(6
zCGb<N0Qr1M!^Zg8T9#-o6LHc!riM=p<eUsZGguOwkjbjkhxt+jBY=gb1YR5OipraD
zxOb}SYb`hWCm!{ic^PRjg=rpeCj+1mHU>a|99(7h<9tv9P(YNJy@2!$u*VDNIdGJv
zaKn72S(V)_FtQqm5WcFSr0x|~Q15vMY~3JZa0jJ2Ldr@NC6XNOd?)*ep?3nEB!Gc3
z$2_>;K%A!BgXCm<-64ZpR$TFQo;Y@tbDlSN*Z5gClxo$4t!q<T^ZdJrzeCzhb*rPI
zmi=sCZGv*VA~HO&GzJSNtIL9Y0Z(g9-{#|=d1<l*o_1P0{Oy1GuWeR5D0m|<m-Nw1
zH{SnHAJl?T<c7V5svM{4>v5ZVf#v1tym5cywM5%GQ^K69SC#;9xaI_)6HwmlkpeKS
z?gr;|OMCa~owq!|lgCd0aML<w-zd5nc*_q3m(Q@e^d6)Sfo3KNF4f0+AdI53zmxE$
zYF?J%Was9Tf05;#H|XN6PxK1N|8<Z%OdQKInCSLd+$!id!3eumlAW75v$qR(74W7i
zZyX38FQ)(D^W(QS0C^pJlF`@G#>B>1A_Kie=tddKoql+%Cy%!cUY;<Rsg^rlXQ1_s
zEmkA{H4GL;m2RH}%{K#Zs3|e;e;t3XuQun=0H(+TRe~*H?@?Qa$nPZ2;(mQBSE|wQ
zON-HXVx$3!`Pzj|6rEl44A!`0LTeIpxF{d2a1qVC;IL=f?>6W0W$-PfMTTIy7QWS2
zP8MLovvaI{BLPg18uIv^lMRyqrZl1<R107&&6B6CSolE9fzJ@*wm4pNj;>uIH8c@F
zGCA7+o74gyFi)1GHjV?Zov-If@exTAS##pVGA3P>yo(U2f8r3?(73321b{6X5&<+(
zGGQ>!2tKvuapXO%74~YFZVMm4<ja#dR;Al&9SchEfeV?y3WAT8`GQ^(B_M+SeOa29
zK?%+mJ_e}C_XVoK9j_rq<R*-U+lT>7X}rAt>%CwVwP$4ka+if^ij%m-XuvUG$>d5f
ziNW8Yz!sUR)fp@GvjXO|uK23hAy-$?(D)SZ`j0akQwEzE?9f%q9ImMa&<PbWolo?K
zZ?6|f1!li6>FXGemz2x7oGe1#dva;W4<B0%o(0YuavK&sp9|i(CHHIkOi>s>sq8!_
zu0mV}bW;GvCf+pW@y@Z1&cVYVjPXO%*70KL%D+6$(!J=>V_dbjTJFs^ufr{G0Nr#`
zh4gp7Hg)DAkK~Tq%y`%E=m$X*7`aws6K(gZD$47etVbgiGW0c17sc9l_~@S<i7F?4
z-g!f4VPWuXIe*~JAC+sxgF=^3Jq^p`08U0;U`adXR>ut>Gnk%uvR8vv-HAM>JL@~X
zhE;{E|Ah$>+u_+c72q3_1yN2H<hee;o-f?X+|KZk-&dRF_iM|_88e*~-iP#InPw_C
z9yashonJEiI)Oswjto54-kxI%nSS8fA>*@~=BF<(9ef&-IV;@goLAPkyknDF8Dyh$
z!g&o#AhW_1XLPK~#X?tt&Xb~N@<^RiJhkb6UB`)qp@#W``P;3;Mpo5r{|ga+By1Ij
zVXnXHi3b=6KDb~m8aAo--Zmq?sLguS!^$eF)wE!i0I|^~yq=TFfI@Tjbz9zaik8?^
z(lbEFLeS!fpAs^q;UfVH#vSyDOfZ&t-NC~zAFqqUoNP2k9AKh~L;y+v7z37EOhW5}
z;*?wQ#fbrozOF;l0(sU!{Z!a6qwH(k`ky@T`=tbL(S%3?$KLyB;oE^qm8YzuX(p4r
zoHq2<EhZa}oqR;@WB~MBNXmrkhU*2evBZ-Ha8k;LN;rXE8fCh1TVIg2WP#_u(*0W8
z!g>LX%(V6Bm#DW1c8V^GglP3kvA`{INaGfyur%GgF>g>7%honPik%q1$yITfPi)hg
z{zB3YyfR-iD?x?iy$!AqZcFg~P*%?~7}|x;Hub;QVBUJ1P^e1j%&2ldSu{dK?HV|&
zpZI~Mwu!t|4aQSYSD5siO#h8IBD1_U(s(%Yo{{lntDCuCa0aOxCHnY}GYw@Q7@iDM
zftWMgZeW+Nyv--Z%UqW;>{CBF`{o>*M_krVuZjZnXsPn%q9}f#q9|Y<@|CLbdf#6!
z25(bM{`OVe)Buiyrh8VD%Cg+O!&&*~hJKkgt$c+50_63nPu@lK292*^&6^I%m0v#k
ze|nH>uWNl}Ydv)AR1D(NzI_k=(&}@YoY}3Q9gX@ph@K=xn{EG^ME80FUP!E!X3vj$
zaqv~AE3W9N<Vm66Wl9NeYxT;hI%!6uHa5=@4<N^8r|io4d%n`V!mkn9^}W3_Cc6w9
z<Ppb5=aZqvQ%CKm51$tpvx2KT<j-ur_x5{w-R|+3<<$u!nyo(8;riA~Dtcy}X}5Z0
z_0mlGq+y$5OFEV0-FLRh0jvwyA?Z(Z<yUoj#X-w5SHI06Xr?rU=vBq>PgHngHv?%k
zj%#)pa)Zj!uq-bqiz$gWQT>!m<C*PKNx8$(e@)X9FN`uH&bk856m}+1O2XvFa3ajZ
zHH<uIq!yhhYiwPHw+^e_>Zq;FDI(9D``XyJMH&jwmK^YOp>4+*@go3C^&h+bV55@Q
zt8NT{5I;uJyr)c9@9}}<$2%=W7>9t3*T87J7BD7H9&8+d&_A*G;eO)e!QgLfo~=No
z%aaLJ8u-!#y3xQFueE+7C=b1L1WJ6fKKRz6ZP9Q()AR%_8rcHGMkEhT1qD8_U5G|N
z8E>v93t&UU^#XYMsX99=ip{aP1emm&Z0otZ4X9B**Oy?FhQ+d-eu`hZiuZy|0JUBK
zBO2-J;sJQg1BhY0+#%JkEXF3-qA8OkMiueN@q;!EW^D9r^~I--1d=VC7*1l<PS}hL
zv<&tGS3311|4F#CX|3nx(Zm48^7`Be4OFspBgjm$VsUoOe{<D=x?pR_9xKh=l{;7z
z>UoVC!J;*Iczn8SjJ73!nml=$s6W+Ylt@eNL{<V!EtRV_pZ^@A06o4|mfw8w;U}KV
zRoKgx>BL~M<8F+P+}Di+v|l<R%8t~&QND45$fUxs<GHJT*yXw3eCqJd?_6-pYBtj;
zW>%LDz5C;ffaPVbp9^~ybbeFmV(s%N324-6q)CTu$KO<MNU-rFRw(tvODoS*`A994
z&%wdCnJZTGEVzedS{`Uh<#STzTUWMdWZh~6fb#xPCrIP+dY)Gcz{;3kDtpCaT)i;z
zO<H&Ks!tv+vHQsEc@*6~nj{*hOnO{U8gLUu-$ecCAhQz&_phuK&yH*A5av45k5lR{
z;P5MY@*q&bHWMZ)f9(Ni&@<^_LwCG<<?oI9!8)Ly=REYGj~!ite=zA^fc-#GWr7uG
zR@-()4IB2#>kdOxAElXrBA;de`@ffW*x=s^XP@2wYft<S6Z}+kAm#i$ckY<!^gayy
zmZaTabC`0fUx#yXw`2xUEg-BrsBAERW=8c4L20HQ;sj<-n{(f?V&$Iw-~Yw`PWr>;
zO-c9cnclKx`Rq=2`eHLK7Hmh%38wpR=a_5sO#N>GF8Q@>+DV>`J|$E=L@6t+r%cPG
s*$JToCHB+8?57+(x_|Jyh?CO)1A;03I?5f2RsaA107*qoM6N<$g5sdE0RR91

literal 1348
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdU~+TR2)c8CW=)x;h&gy1F`9S~^=;x|*39
zI~tf8nj6COy5uL9=BDPA!1Sgd^jhN73rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G`hf
z=0WwQ;C72SPQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|n_a+@JW?*34?&;zf
zQgQ3ejJ@8>h7#??OZm8(__`h(fAL^Jv-97mn3A1=FR~m3#0v{P^b2TOiL^HD*ePCG
zGGUuulM+W>S2IV_QiT=l&)*-FR=MH5=X9*nlh*cv>(=iwo$5FXYwoAll&;xnn_+f<
zNh0awRQ5av$tm}`rt<$|Y!`32BQZ<(!tqOMwF(q}e)^o&Hu<$v@I?i8Q&zqovnAhE
ziSiiKK4nwB5oB=w%k`WY4>mA1H77PjGP7(>Y&tgeW0R5dEtcX3GLldK3%v^5cbknX
zA-wg0<dIih*3X3BG%98EYg;tO&ElD+GIgr>$&*}VY^Nv8RSCPm_3!zDdHsUMe;>@a
z&$2>f$%1uTe+4F~X0ptFFm*}WjHW6k3&HAw7PCd3e1@#0y2o~9r*9P9(zJ_JbH#GU
z?G14o)+ehjT(HiIt&~$|+1+N5E0&!LmhFiNdvK*k=*m}-=3nQ&cot=DdSJZ6AaVkq
z;a&qr|HXHNZ-|_I6zyA7k`(Ches32GzbWTB=XV}z?As4IcO{i%>|@!fyK=#?=H7(w
zzh^Yv(UdrDe!4!&^8?e<3mOaROV<aykd0}SosfLreed-})AzARFx1KA_C94<84W7e
NJYD@<);T3K0RVu}<lO)O

diff --git a/static/images/order_011.png b/static/images/order_011.png
index 7fdc04bf75aa164b521d19f27ec63eef18dfbc2c..1915fd9479ab37968e9bf6b9c4728f7ad6bbc753 100644
GIT binary patch
literal 1759
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
BbL;>B

literal 1347
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdXM~nmN0fIXXF-x;h&gy1H7px|q0HI=h$|
z8ar7Un3%%!y5uL9=BDPA!1Sgd^g83z3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G{U%
z=0WwQ;C726PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|n?*ruw85kJ1dAc};
zRNQ(qW3TsN2Z?t5rF?u%d|eNYzj&~q+4*l&Ovy`)lC27Y;_B@GIRq~*l+fsyy?e#t
z<}IayB8~;YGA;tzbFVo3*;~;pV`e$o`&~=*!-pBOCa9O+dEZyuq>zwQIq!OR8naGQ
z;<UJ*55z(okCxu$|H$Sp(sIXQR`7-Mo7PHcIDPv1{OBBo>%GrBnq{t<SP1ApYq_7D
zFyZBDCHaHfnpBtVe|Ct)oku{1OZbem!VG?4lXX4fQzS2m&0rTlvEsq>fd0?-_yX9f
zwOGz8UJJNmIR8s-f^><R=p0vl-;b)EsZ$p{Nnzdn!ze|)Q*=wyf6Eo(LPyRpSO}Uk
zYO!jrc>VU@lnBpRHNtylT@wfn@Mls_<L|rVW^z_>*@AWI5#?`nwl#$XY*%3Y%JZUg
z0souV5uO?=vL`vlGI~dTS70r5R9c~_A1-3C^$|;{^5F&h%xfpb%+&e8q~|NP#M#H*
z=fZW3?>uIU(>~5sv$Wc%vH1JFMJ)WLoa>z5MX0ftA4qOXD#_T#vr~8Ff@8hD`+nD+
za(Kt%^I+~(`?V?+4MiC|7s72dM5@@YCy0yO_#XJ)_lk2o6A#04@4Tr3@?uV)V$IXl
K&t;ucLK6TZ+SlCx

diff --git a/static/images/order_02.png b/static/images/order_02.png
index eb606b6b1809f9e78bdc12989699b3be4b4a1054..77790a97e366a4fc9eb5fd3b981b298bc4d2d250 100644
GIT binary patch
literal 4274
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
Ux~G-4QUCw|07*qoM6N<$f;c=Q&Hw-a

literal 1636
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdS!98JW2{8oD@|0!c$xS4RUUM^_UQXD3S|
zV{>yybC_P2{N&Qy)Vvay-V}shSDbo5X(6`&XtPUdQD#|cid#{Bt^(N4R++fn;)K&Y
zsNNLZZgIw`S0CsYeNfCI#WYL^n0!D?c)A60;3+>f518DGfa!XT)U{Lw2BzztE{-7;
zx8BV3^au@<Xt*DIdV|BF%808@ix!-0GU>=r*d%sSO^Rcp0F$nHuG9iwVU=sgG6WY%
zi0Va2xF(pXUtOefO5;=<tL~PGY#Xa;+5fRmKVAF%&hLAc?{~du?_d0WUiBY~$My3*
zrWi>UyI*`)>aD@&XxY;-vtQA}f!*X!#v6|%t0l_0mBQT$?@pQ#&U1)QC3>&iv&xz>
zmG&Ynu7$0AHw8jA=!p56C|as@B-FVyO<rKskuYUr$qsJ6lKKFFM^E>Ei1S)6!TZ=(
zx?NBwUHiqi8^&|@&ufXA+?3e1!`xwRdf>MQp;fQfEn9mwkV{XfNa}E|=zsAZS4;N&
zhmz;l28b_C;d_2lNGDakX5mft(!lkf?4zA+G7^r|-IRHhSM@q^n)9AJ%N~eC%wKrN
zy@D^?rNn9qi|1P|9lZnk1yZ*bu-}<3KXuN!MyZIIuXCUAoN2J#^eO$2+r*oEr&CsK
z+590aa9zW`7>-r9qeMeaZwpc8Y>E2&wt#Ea)1YN-dwVNwxld;Q*~9RTb>~&p%>s9r
z(wBbMJ8+2M{hzkI9&(%SHuowmZ~I*4u=9$Qh1c;p8#I3~emg1pY0;V=8v@%?rs_JD
zTGh128mM=d^(jZ@IBy93wxw#m)!c%(%jY5@pSrQmKOwN%C821R)%yg~oF?yC-?V(W
z?WSJJ59G1vJ5lFb{n>|`&%;tN;V-j6d<6IW*z?`K@};ePzPI!PJzSjvK61QsXnkCH
zY0Co>&G?^JG$+n`U07=u+Gm;mWu{n&vuOM5Syk-J+saRWkqNoKe9EcoN^{w6WpCTa
z|87cA{j|3wg=*z5S>n?!d@!4#d-KFYo~OT5xi86;@=BV_(_ij6@sy8BAg^|~<NLkW
zxPn%Cs(lGy>wYTJGsR}Zt&Q%#j;4OqtN*_5`r#ed_baOC%eZg6vGM%UN78>hi}S;l
zAC>;`#N+k$rd_koO+EWZeNU_Og{B+K_P^_yco;YyZdjjxzpe#T?t8lWxvX<aXaWHK
CL~tnp

diff --git a/static/images/order_022.png b/static/images/order_022.png
index 9b7bffbb560041822c3f99c183abe9c8b88321a0..67e21458d5eceb52c7fe29a0215ed9f5ea79622d 100644
GIT binary patch
literal 2349
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
TBl2i(00000NkvXXu0mjfLvWE3

literal 1610
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdS!fI+;0}xEMN`x;h#fy1F{LxmZ}Z85y})
znwq#dIa<Q>y5uL9=BDPA!1Sgd^cvyR3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ=@w@<
zoaRCGrr>sq0ZzU8K*#8VViqZ;VM4&<17gC{Esz6G`Kfup<X!|!*K)Jvvl$qe_IkQF
zhE&{oGt)Ce#8ITpy4x*;!>Q-BXDbI+A^T!>bC(#tXDW_?oIMINW;Dme1PDxTKKN8X
zGQi0tFz~|yji#>ME8109%1vCD<$AOiDbDy-|HD6L*2{OV-mQ8mQ}ZFvx%}$m<*V+k
z4!5n`mK*Koz5Mc}Gi=odWeg5n%C}v>9K-bW&)xKuA*<e(*G)Sp`ao<(y2l*X{f`}W
zD>$!Jl%7#5*zcHla}9?{<J475+G|qQF!F>7MogG+KyX2jYr-V6?fbcPO6@gx40ni^
zY&x6f?9iEaG?B&2uSVj+bB-HJf)i$_)~&nnJaUq81@9gH51~_+9GI!H{M!9RKlVFl
zpS1nKyXD7|g9_3|Z0F>AJ>dDE^{nN}#(&0}j@*?Bdo%r{>a^e|o@Z3&<p({`*r2p%
zhyMfC9bOBQ9cOxFhG!Ts>^~*SK8I=TfwH~RAC++4U=Vv6^?-9jtFgKn<CM*}Cf45I
zlWYE*!e}v%yRj&GvUa3$?ddl;Y{Irp@0e~d=QU)?WSa!8U%aD`XH~M?Bctg{we<dn
zeUOwf(EK1^arX6-SOZ&^1zj5stM%{VPq0pZs-$eU=4!*&Wh|#&erOi|c+&8X49ih9
zmU$_Dt3SUimYu`<!I)>wRoxA}-a4%ZJo@e4A57Z76~p%-d}Z{5;B9q|7oS=v*|Yta
zy(l_C{Px4HzvWFUQ#5}(s)}D@9Vl)&X-oXV2^;xd-+#U>t$<&rc+d7yZkfa1dj01c
zor_uh`e(+53t!j7Zg+@WWm90i;C`NKeR;|IgF#`p=lZA?uD$3YcjrWzyN|tj=lTQJ
z1!YdF-|>9FctbpJ&XW0AQx~tZYx>MIPp$c&nb@ktqn;}JLj`Xf;JquX7;&zlaSiio
zS<6f3*A={3Y{2?juR!EX(UYA$we0(C-<{n%=V)Ho)#nGYHp~&-s`7dMgSlV7&u>u+
fyEgBedjlhb`>W=2@AZ#2fl7BzS3j3^P6<r_U1n$B

diff --git a/static/images/order_03.png b/static/images/order_03.png
index 672fc0411de75bb27c5e55ed58293250fb9f8e0f..0eb1fbd2658683cf043576c2a334571d3ef534c1 100644
GIT binary patch
literal 4217
zcmV-<5QguGP)<h;3K|Lk000e1NJLTq002n<002%11^@s6Y<4?j000m`Nkl<Zc%0Q-
zYjj-Ib^g9{@61S+EZMSzY=J{D#tnu#uvQX>WEGm#5+^c=!GKo%#-><>x(3pOMN1*`
zBW*%?E>qJ8u#I1siU6UC<yXKYG+98QO<R&Kpf*s;4_UTky{viNyZd8a_uPADG<PhS
zc>l2OK64)5`Oe;FpR@0biL)V3KX^eXq#hCAYLM00Vgi5&srZR4+>q)It;gE6@w0*{
zfSBVxLfa2(%@8{Q`~e-sxo0W>n5~FMBDE<a4m>pOm;wq%uM$9_QKjkMi;D5=!#60(
zivV+@<p<Tv1bjbX4P1dwkZ|=Y0Ax(D29Pr&DH>I{aKcv%;1-Hp0j0uvrvd@%Nlx_)
zNR280gb*nR-X}!><?P5J*=vjJPFS)XE53dBjBp2(@=4n8;6#IX0^}kB;dF1=={iR!
zq0EOcX9Mc`2~gIKEWUe3+1LY0c_g*14jG}DFOXP}>xS;min^CD?LNvw5M90a=mLyb
zuoov5-~E%a@COt%dKIr2;ft0L_$Gk#q}&A2haeI{^a1z>h<&3)&bNsb5ZMPHm9`e0
zFr6UgbOMzo)nnNFk5kIQA5^@S6pboeQ-r(^rqK)!ybj2hgSnS<iH+-%w|wVat-t+I
zGu%~sABp=380oei)?EfhkPwSl7HjPN=Ym*!W(!(cY@Fey&)naQe|M##v5GclgQ#?V
zs^JqFLe3!(3F2M?`?lor?{4r#(f(*<B*9-1xWdo9Tm`xQg*>bvhn!>OYbywmBG4m>
zuTt614=!ADvLF*hgos8>HNEma5cd$6-~^*jxJbEY<Mossi(7-2VrBGHAs`jo9$Q7y
zL87nqXu3{{Q+F>IA;fPj!Sd5Bcj%T}f++Qw%0DOYfSVv97(rTn7ij`?A#r55C=$Uz
zN2kRJA|2Zvef0d;4)SK3<c_NL^-~d06d?D4jy=d>&Q6eC;^;#fy`+&KSdVa%Q5=by
zp04gsh#N;<_qV28AaLj;W*W*^T@;5OGzz9=!T1ssAbNRMFk2uOm`3fF3!;cd6)89Q
zMYB=}fs2qr)|5fHz;iPgMHEOi*6!sdj8LYb@Cdd(Hq8eEC(N338^C5qk*~W2aj#4(
z7Zw7PNtjVp=}(8hn1$WTO`4DO_>~nn91^&q0(jNl{`mJ2vG^}BQHH~*@CAk#w+rMp
zW-r?%TaQ~WOjcUU)>Y=@iW;-8C@s2}L99nB4|bJEKPp~o0PU3(k&{T_G{6QD6}er*
zWj*B(;%`j_W?!P{sgi(quUvUR!T?SoFh#53<6gNQeaP|~%eyc>x&mM!keL2J{J<0_
z8}07p23q8BI3Dhm)10ISJb;`2hsF}f@N=i4gpKXtuyprwj}u(X{6N`0$Hl!yC1~8-
zi<$-?_(jev3?}^~#1MdC1$bS_vqYnjfirL~r4v9*gyWV_*u4ti2q4;?lz9RG2zeZ~
z{WnSCHB>}~5R22Z1Y?j;t@bGsSE;xw4gqRHqE;ldP$_jcfyVrYqg&~i>`6kzY};OC
z-SXX?fqE-LhRSbx9KeIMFaGF&fZGWP`?{Bhpx~mke!z@N@jdIp;XUPbd3L4Ws(V=h
zACf-q=F<H_R4Jmg=#_Ojk&p4!XsT@FXH!~QETQz|3*6z}&)tGa`l9EFUTPNBt&0Tj
z?o*J?brFKo((dIGB@0H)(nUG<q+EC>E(_JBZaqWz<1Zqt9f{lt@RH*0<%*I4#c@v3
zBAh{mM<UxEodMh4Ckls<Qu-o<QA{l&CDbfZB@6(jDXFA=p?dkLg(O!nmk-O#L~}Q<
zH3b#3$l<U8z+XX`cacaTlyBshhqfI(6g^41qp7C5jv|G|u>r#{O#+5HdX;_#D_u<Q
ze&hm{euH7;b=NRK4~Os)lIz#4JGG*RL-%Iw>|WQ)Iojp20KOLWJ9+o=5;B_Zha-rX
zrL1b;l`NBxlI~ss-OF#>pkjL6YZSu9Ahj|2IAiBtE~cQspy{N-?v_@IyW2V8UfQ4X
zOvwxm)Cc(QxO@2#7DUW**u8{cOhi7Wq23eNA3@k9qJ|A6!xlKz5PK?UG>XVH5?>Hv
zl9J#wnHunO!@Y(`ydgGrB&_6{14k17hqY@HC>GtLQ8jVSMUy9ltt*A<bA7SOK=)Es
zZhu?~0Tmzxu$PqM6y~SxUJK<QL#yJftDGqZ0Z>h%5nyF*Oh*^)MG^1>fM-)g+rWQx
z9Yi#mKfjK%c-$@PUIHG3$X%yXvDZ*BoCIc<-m4UNc1quG&D!&(O(W1o;U5>WCIOQ|
z?qJHkulL5=x=IHzc49hL&H*eYwk#T1vi9w996Qku9H`y?<jt%!e+A&PZub&l7ij-k
zUwq%s(DFjz$lbXvQjO}Gilkg9hB*nestiFaWwYOu)JMldBd5?@{#T!K>09SYl6d=c
z=#9W%Q7K3Im)y}e`NgMR2Km=6_j=W~W4E5Vam^>b4cpgO*G0ltDWz_vrLF;_iG~Ub
zY=fc{M8q^`0incs5;}~Xo8Ka2*D&p$4K=Uo@$IvKnEugAP840aF&10#fSI>qTST5S
z6z}N0am}E+ZcY0$b&(2nJBXD4X5^OFoAM#jd65vnSp;SQTvi3+Sk=zWuL$L#<IT4m
zC<UML5(EJ1a;#tPm!lsKp{ejk03e_U(bjj|UUg!@tvW$%ZJ{ZzY+Mnp;IBb^AHc<Q
zGLw18ExF%$D?PudBwG#e?Z%y(@2!7j!^F`5=JGIFl8U&bdWwB7qS0~x#X#N5ZP!A$
zFpYux`{MC?(At`G)~Rma*ihdT+De5@B&Vn6tCK+&8QBL<#LShkPAUGt42Aa9@7ntN
z#W1q!`6tBBngq0{xYrhG7n|K?(XU|naOo)WZ^}so=aOgzP(k8g%t~H0wD9)h&RX>^
zJv9p<^Cbe80bX+a%c%3>c<_=20O+zsR&+Nnf6W(Z_47|iuED2sI0T7U3Rd%}1+Dv?
zEo(Y{bV(TDP69KvsgFX2PK1WqkDx4`ev7iOd!Co5^f8d75|po-*EKpc0!m8E6R^Sc
zZi1@YH#S5h^kV`uOLH$jg7PihIdB(208ndyTN;15<#I1cbdHlJs}w?Xa4y{q-nj_6
zTX)6d>R}Dl{-{}5i6=qMp`*Tr#YKijn&U%1(tHR?mkZBVrh2Ak_cL`GNqKS#TN5>%
zDCI?<*4n*-+2*7G^5k&K%41GYQ--E526#guGQ4H(`H${i8BC`H{0+!{$7f%xLim1-
zq))@W98>6yTS@H;@DrbFt5;MHFuUK6lY5Ea^@L^5Jvwj6oFw@LA>PVDR8%XQ_B{95
zJV|HSy_~v;bh@KiMOEleDY$q%-Ae>}<H7|e=CAkwq}}tiB_E1`zXXuU4zL!KdvYY5
zRrk^-o3br#auS4&wh2^d9Y^<q2=~U!(=ENtO9z}oClWYHV93$e!iL>jX96B~8)x^T
z_UBMvD)wt9&<3O88p)&^#vyt^gnQ$HoBOV9?T1SuhFk-%HeVUF2DmUy(phvb$CLo_
z4Yd4){>>Xpnn|khh+b(68unNa05tC0F_)qq(;5R%z;$SEH$1PDbbuTN@V^2%Du4~i
zB+gVeO_ZN}K5Zm`A}F|6$criIbd1~GY~foP()M<PIDK_d_sUPd06|`I0A}_e+}w9<
ztCyfXTjm<DI|wwmKO;G(sWLU$^#)h7mUjio)&17b|Ff)&K<BzhU2?*=6xBZgG6j0y
zmJ;irv-)|FR6P}3zZl3Q00|4=2q7VWkwT=UC#IK+U~kMEZt*2(=Z=B|Wu($J?TZ|*
zl(b0<rl^(;EnM?I1xXl9n%BmAffwq2x@n@a@idvu-V%VMEF=7hHXS3?Ai(6Tjbxz+
zF<=vG<AaHgikirD!<L6Y{0Vf{)2+tHf*cY8<x<nvyorAu`me+9m&V2@l9GK;7z9w8
zAB(BDN}X_46QpVgW$Nxl0p!7+Z>-o100Tg8UFWu&BCxjr{8p}(k5!$a1?4&;Sf`wO
zT{c<?B$oLt{uxWsNRCkPv}-Z!P$;SW_TRG8Kc8^Ak^nX++TPXMymTOb^3-wxIzUJv
zf(k{k#ywl+8fHlZWqM>JpHI>^?=RN0KRUUTPDYam!k0s&!5zv0y?fK-Y4=7<Kta@(
z+<o>gT|1BvE(7>4X=}?j%vw;PC}zMYnV@us7*YP=oJ~e(;`g!Tp{kNQ^O3sFr!OG!
zFv)x_Jw16-Qo}k+hA||$*Yx?At0;Fj?%Xoh-FI*E(t-Gi-sQGPN0unz*jZ3cXb*Do
zOKsXpxDJDF0<sIlQN3j*ji&s+TqhzSMPoLI8wfO|d((~<2@CwniTTUl$+l_OxoN5a
z<G(@Fd!rY6Y#ZO~p1)i_HUOyW+*T7-vXx{-ObxgA60~ziSp*4~qHTXYL(=GpGQYEq
zThFxAbl)<eZ7W>Y)4XC=uF^Ygp{d=K|4!m^zq1b@1&M0d-(D>PgY@LZk&R*jT`W5y
zFo*<aC@&#nNl<~imjY?abPdtxTa!?Dr_kY$WP>u;;pciiUu_xkC8(S|NS6<eOdIT1
z<=(yAdZ5f9Kqy}8fh5u{pjGH_NE9Z@EoJXPPB^yx3w*vc>HoGQOOTIFohe-(#iE>h
z4S_2g+V$5~2^ha5<VdcSPk1NTV2nc47+4Sl7`83h2xPJV<L+KrU5}ujQMD6)&j~CO
zwx4pQHe3xe*3AaPWJlv3FHvJ*K>#4Y&%5U@{|x|`9`}N-XJPv4+8^(Rtr6sH8KRBr
z0lepIkt8>Sz}19IcZWD9K0-AZKu6>5?Tfo3AHEI%jfojo8!(<fQ-UB!Q1}C6ewW25
zKY7M^p@(zwWk;`ki9bR4wuh35<Yn$nw`tdwwL<lHfi;7RyqG}#Et74y5@1D<>6at|
zK7HhCi(1n;_;fx=&W3yC{&kcIc)n>GH@QJt3L60I$zdr>5CBvV{6mmejR`@5kCUnR
z16hIqKtW`{FIu_vK+(&!pAhiP91>8<Fz#&XXv_aUDFC|XEgu$1-VUHkC&xq3n2G>H
zpuM_hzW(+`fyT2!icZFvN3TNGquE6I@pE>la*Z4Cv2U#WSjg)II6U6uWF%oh?mRMY
z**^CN>STQ6Zz=L)f->Ijm3wkUFGAga-md57xWOHrx8z*`7YJ~u<f)b+0u0!|s_uD9
zH~D>@hT8sUWnIOjB?{6?awgN?>2cQZ-LQ*BFIT<XQ-N|o-aK+Nbsbi&jJZKJ?A?Az
zSg=`uFLA8RN^rm?Rvn$U<QIji=mWO3h3co874a&w^j~JVq^8VvLow6tpTFc3yg!Eq
zkiMUV;)!pQybJC;OL-C#Vn@QZ?>q7JWk-uuJS)yVmeR0$>r9jU4#7nLCI+`GiHTsZ
zMdR<g=PmMFmi^?MBPk=S>)dvJ#9*@m77KA1Y^fvZ$=nEF12`#yk4SXdmb`Fm=#}?_
zyxcffNpcG7cW<4l#BMM`p(fhaWC$w(o`zsVEbDLzR#(sbmE9=we=_)gsxb1cF0%L8
P00000NkvXXu0mjfs|W>x

literal 1841
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
H5;Ok+fsWZ)

diff --git a/static/images/order_033.png b/static/images/order_033.png
index a046e2b29d40d0a87814149ad73c5dcc60357f16..cc3e816700998218cb5b3614702b253ac7c499ef 100644
GIT binary patch
literal 2286
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
IM6N<$f?R)6q5uE@

literal 1781
zcmaJ?X;2eq7!KluGg@^F5FxG$Dxl=zOyo)kXoO%4h^WveBnyPF*^pfzfc7ATN@c_W
zR7AXL2P;Kdsa3(CKy@f`C?izBj#yM^1v#W1(E{C2!2T%RnceT0=Xu`eeZTjc%@c)h
zCRtJ}2?PR3u!S$iM`z<}PQ<_YQ&(Ypu)~6*u?Qp{OP6XO0#}a2L4W|3CO~3HD$hu1
zhI|PGQ%6N)G!`uk<H!)0CN*McT3C&<2?XB&ty(HmLKqMSB`8#W;OMm*AfS-@fjd2g
z452y*N>psg)IbrL;gPaTrHm~H1N;GBEe98XAxsKr;baxc(fWZix*U9N+@^!T3<Oj9
zf&Z9_7K(r%L<0eyG%q(9)58bwX49Bn9t?M{jR1?mWYZZwbf&u-gUMldaXh_&*$2d<
zY2@)7F+XHB7QXTW6ERH9q0`gT(`o7MG(?j?XR_J228+&Ox#0*mG(&|+wQefZaZZ5`
zp)!p^jVTZnU{sXGA*q-jh&%l!1z0^Vt3qeXgcppim8$7X8pD{<98f6ye<%#kqftx@
zz4!Z{!f0fM8lsCK6iL;{@PmtYG=@@hf;5m6Lo|^Hk~~*MQ6hpNXd<EpShyv?d8a}p
zN77N38G=yA5vWj1s**thz8{E7&=d+ehvC6u@wo0hu4gcp$qWwWg?Mv$EOxLrpYIdQ
z=JMvad_<NCLn>^JD}T=oT99k(1z3$o=0h4q8YB<VATThKGe@zo7xsdBvt0SYUbqW#
z>9`rX@nrvX(sNsQ`xvM5eTy&VJ0DWv?XJQ5I;rO{AHOb%0zNlV+dF(rnYc}A-*ksI
zpyKE9M!@?F9!Yt`Bd5#UrPQvb?oiem`ppA%f%$hEtHo)*<%C)zA!I~R8I20;WL86?
z@05LK&)s8BPm~RQ^6GVb-`h)QMmu_adeHYqAG(X@wESY^N*kL!CO=Z`O@cC}tb7*_
z)o*SIG#Cui2UlF^_OOi+wdRQf$v&zaAVT+`UMM0KYGF59i;)+;UqGKP8~5^Y*l0ST
zrJZ_Vscj*zd?~YA)72@dzBAb&(ThjOZ=Q>3q~yh2r-7~eit3%I-r2hg-tHxpSFerY
zRE2)K_oa3~AEHYpJUBeDRAS>yiW61s$TmbZDL=SMe5;G7C0<D?*|2!iB3r`<I_>0a
zHi}u36ZK>3Eka|tRG%|4bxiS>?Tlr|lcI{VWMN-*pWoroy*i??RhJTRt|44Ey{C5j
zM)oLCyW;V?%ulTu?qNDuVxpyp&pN5KEmlJ-0<1d9ocldTN-6e@A32og<|st2o01sM
zw1R=7O^r(mCnf9OBul=b#+bdXSB_ET8au%KMVBPGlK9-*o_bmz7Lx7`^cD}b@mY=g
zs?4ED7Bjy&yNdc*%vj!FY>7p@dTn>>FZ#CC;_&{sG3L)ix0rF5Xx0!|u>ZQ{s~TaH
zj#7N5vwmycpQOsuHIeIH2m7;ANYR!@bY|tm1N9%?t=Q!+_^GVodJMDOgsv+;#;MZp
zHocT4C7_pUb<5AKchCv_Pj$ijQk(+~WU#dLk)>R1Sweo4W7R-tt4^&9I5Bx&bFibi
zbn<*@$1B&ZO7b{T8){W2nbwrHNcu-^b>1^;^|B~@NNMQ+A!gM&$j&pVe%JTSx5}&u
zEA1!T5;&IbOVeb4CwqAsso=`kQx-YFWuT(uW~_}NkII#TSp}jKowSR+-mK@ot~IJf
zZGw~f$Be<f54$Ai&v3IgRNYRQ1e<mb4iuLh9};iNIn`h~?8t@a&sO<lZP!)icU&k%
zA3$$R+6{JpH6Dyzbyu=3A~&(1&};ZtXUAKLF{j(){jJHA)a<WM{=pkaI>6l~Eb6hZ
zc-GVB%I0-*BW<7dwA3Eoe0fU!y9;x;h;_dR)`v#DYp*!^<Ok~I-Ybv5@zSNenM=ww
sxkW7o31vd&5O8hyN#@kG{_hB;gpWHeUVu#~hm1cWL2x*~iYLkb8)Wdh)&Kwi

diff --git a/static/images/order_04.png b/static/images/order_04.png
index 7b9a7c2c3393c1e17ed3fe048aa21e57f212ba06..c4763288d0ac6e324547390eb25f6f452f0174f0 100644
GIT binary patch
literal 4021
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
bN|FBqjK>FdiiR`R00000NkvXXu0mjfRS&*5

literal 1373
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdXL6JG+^hIXgL;x;h&gy1F`9x*EBdm^fJ)
zyIQ)rn47`$y5uL9=BDPA!1Sgd^g83z3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G{U%
z=0WwQ;C726PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|nD-*ZQW?*2v;OXKR
zQgJKk&;S4S%$g0W54baV#IhzSvR!gC6!@;lT{C+F>v}ddBb|#1mkSjZxUXVUYjfm_
z*x<5|YXTQ@l9|a${sS*&IH*?ZHr!y&lHc^Bbb+k)M=Jr2GNz3}VjtTbe0<rjJ@$Bf
zys@vQMZaq*hs3`oruMyxPQ3;T1&(kx?Ay)wWvSUT6$hRjZiP}un2$KR@?2=tZ}=e<
zG-ZPDB(*IC3hV;$j8-qWT3`AzbbQTx=n(O1!}4@P;}@q72D0~A6<oM_wBmrj0^8Ne
z?-$m@Dey5S?K}ABfKCFVE&tkkG2BbG@lDgPYj=I4BDJ46DvayV!3En=bk}lam3$EI
z<@aKG-*JIG=(<lX`={j9^Dq9G>tG|?@&BP=yI{xT48bPZ118~YOYEJ0&T+WYu<RIb
z7rV;j2C13tZeYv9N_Q}>sF}@s#C}0dm_i?W(o3MtJPD!OrPi*x-8gNtW8Z$ymdLCN
zNnNY>_Vl{)?5!7KJ@UHK;56^8|H~?+{`9L#3NYWhwB&ZDtB+joex8o+356C`1q)i4
z)fq3#tZ4e*bcI*fF<9Bv%ho%Wy-DcXql-laR~i@d$uRN#F+Py@%lAa1tOqYs74wA)
g?}bws8yJ`w?l&YV>~?q{2P*J9UHx3vIVCg!00n#Bh5!Hn

diff --git a/static/images/order_044.png b/static/images/order_044.png
index b9fa0dc3b635a9b6f70bcf324ca5eb193e4d0c6a..51218ce407e5b5893a733a04d9ecbbbd07a3fad8 100644
GIT binary patch
literal 2016
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

literal 1345
zcmaJ>ZA=?=9KO=6Yzr-=EJPN_E=L$M(B8GBw7pTF^a@ldX-W;%n8>yFFTJsQ;qI^p
zvW#{l4&8+9gW;2JgoVt+fn$l$DKo2X%hZ4(>Shc9_h}#I!eW*Mtye~wAH+-U{x5l+
z=lA?xa-)HcR_(q6`ydF?`r3$~vL4R9do;@T^xvN_%2FzM!%`;~lM<u=AUDND0PJJP
z9uNd1HPCkx)I*TEf)0hHu)iITa*T=0VoWl_D{Kg=Z<Kj5+6yE&0(xlHh1~ya9)W4f
zg>>2cn4kB6INdfVfX=~=P;{_2>ZFjy2Do0v6#)iFBrG$>SP_?9$fho??6cP>0&ha3
zUKjGjRM;PYJ)8hwo2kwiHP<>|yVGQ@tHrE!HLwLUJ5kJmnyp66jAM1U%?@uph!Rbp
zVt9~f*@~r{Tu5A!cpOC&iG(R(HE}`@YIZsm4GU_q7!`z39AG6<HnL(xPJsYoRG@i@
z=2$qZNJhAR$%QCRpQOO>+p?^<RVJlis7&&x*@R_N$^rfU|A#WnHd>T|;HlsL6c$4R
zJV1j$<oboE(zsYfHWZJ01VBoh5aPIFxhe+YoWzN7j)yIZCHQa`%~D)Ke0G!I_v1cR
zlt?xTe1r>8Buq3-;nwClhq)PZx@}&M+3fW?F*oLEv0JP*hozRlupF1*qWuhDr5u-f
z%60F^&CUYDE0GBx(60ijMc^2CGiRLM*^7Ngy)7=avlqvXTvRcGW;^?@PUo(a@yTwt
z=T<pvPd;FkaTk=iUKVe{5Tu&(5$=$DJF=0<G^#BVw%!u83Rb1NlHpTHDNv9;KC*vm
zYU;~h+Ntmd?(=I+O=BT#d%?-FneL)a)hY(ZJjEF(T|7-)+^v7DyJ%jQuHNh9tMt`m
z(TO&Yzq~enM3)}>!#itGU3(?4GGiyEiw^Bija=2j%U_?{bxQTq^jS@xsxMx&o+^8D
zVR)~x?1mEly$J&hr614naLw_bf4DSJ`ta_`w7Rw2@yxx*%PUoL?+g{*UC-;=qhHsS
z<i}JG>T72&H(lwUAs#quB2|lz$`?Kk>I*fOD|_h|0+T1_<3j<1+&a=Q{%P#!k@17A
zf1NJClky>b=2}!&p})R}>~b%5Y0~e$Khy!UO`U6+uhi#!O=rIGOm4>g5dReleetbk
z^<bc(T7O+V`>?yOTcf|&QhX=*_9gdQ^S+T6k1j;sxS+do##`|D3B&I6y;1Cz_IBp{
zz=4gi%2K`hx9>098P)y1_~_QKTv+n@q&oj42XB~5Wl~F8qr0=h`<&}}CO>8Pb9GVR
zmy(mZvOL{}^(y<=e<NAmrp+5vFD%?Irc}d_8v1dm<-5vtEtdVM`Me#(N6p=-e*k?v
B&3*s?


From 1e8d9b4f7bd855015fce6045eeb608b0b2a7197e Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 1 Jul 2024 20:24:23 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/hetong/index.vue        |  25 +++++++
 pages/index/index.vue         |   2 +-
 pages/xingxiangzhao/index.vue | 137 ++++++++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+), 1 deletion(-)
 create mode 100644 pages/hetong/index.vue
 create mode 100644 pages/xingxiangzhao/index.vue

diff --git a/pages/hetong/index.vue b/pages/hetong/index.vue
new file mode 100644
index 0000000..f01f2eb
--- /dev/null
+++ b/pages/hetong/index.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="content">
+		<empty></empty>
+	</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
+	export default {
+		components:{tRefresh,empty},
+		data(){
+			return{
+				
+			}
+		},
+		onLoad(e) {
+		},
+		methods:{
+		}
+	}
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8d04ead..5e6b69f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -754,7 +754,7 @@ export default {
 				that.time = setInterval(function () {
 					that.getNewOrder()
 					console.log(that.time);
-				}, 1000000)
+				}, 10000)
 			}
 		} else {
 			console.log(this.userId,"false============>");
diff --git a/pages/xingxiangzhao/index.vue b/pages/xingxiangzhao/index.vue
new file mode 100644
index 0000000..6573e31
--- /dev/null
+++ b/pages/xingxiangzhao/index.vue
@@ -0,0 +1,137 @@
+<template>
+	<view class="content">
+		<view class="flex" style="overflow: hidden;flex-wrap: wrap;padding-bottom: 10rpx;">
+			<view class="margin-top flex margin-right-sm flex-wrap" v-if="infantImg.length" style="width:100%;">
+				<view class="flex" style="width: 200rpx;height: 200rpx;margin-right: 5rpx;position: relative;"
+					v-for="(image,index) in  infantImg" :key="index">
+					<image :src="image" style="width: 100%;height: 100%;"></image>
+						<view 
+							style="z-index: 9;position: absolute;top: -15rpx;right: -15rpx;" @click="removeImg(index)">
+							<u-icon name="close-circle-fill" color="#d81e06" size="50rpx"></u-icon>
+						</view>
+				</view>
+			</view>
+			<view class="margin-top" @click="addImages(3)" v-if="infantImg.length<6" >
+				<view style="width: 200rpx;height: 200rpx;background: #f7f8fa; margin-bottom: 20rpx;"
+					class="flex justify-center align-center">
+					<view>
+						<view class="text-center">
+							<image src="../../static/images/my/add.png" style="width: 80rpx;height: 80rpx;">
+							</image>
+						</view>
+						<view class="text-center add-word">添加图片</view>
+					</view>
+				</view>
+			</view>
+			<view class="tabbar" style="background: linear-gradient(to right, #019c88, #2dbe93); border-radius: 50rpx;"
+				@click="submit()" >提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
+	import * as websocketUtils from 'utils/websocketUtils.js';
+	export default {
+		components:{tRefresh,empty},
+		data(){
+			return{
+				infantImg: [],
+				form:{},
+			}
+		},
+		onLoad(e) {
+		},
+		methods:{
+			removeImg(index) {
+				this.infantImg.splice(index, 1)
+			},
+			addImages(e) {
+				let that = this
+				let urlName = websocketUtils.getBaseUrl() + '/alioss/upload';
+				if (e == 2) {
+					urlName = websocketUtils.getBaseUrl() + '/alioss/uploadWatermark';
+				}
+				uni.chooseImage({
+					count: 6,
+					sourceType: ['album', 'camera'],
+					success: res => {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							that.$queue.showLoading("上传中...");
+							uni.uploadFile({ // 上传接口
+								//url: websocketUtils.uploadFileUrl(), //真实的接口地址
+								url: urlName,
+								filePath: res.tempFilePaths[i],
+								name: 'file',
+								success: (uploadFileRes) => {
+									if (e == 3) {
+										if (that.infantImg.length <= 5) {
+											that.infantImg.push(JSON.parse(uploadFileRes.data).data)
+										}
+									} else if (e == 2) {
+										if (that.certificateImg.length <= 5) {
+											that.certificateImg.push(JSON.parse(uploadFileRes.data).data)
+										}
+									}
+									uni.hideLoading();
+								}
+							});
+						}
+					}
+				})
+			},
+			submit() {
+				this.form.infantImg = this.infantImg
+				this.form.infantImg = this.form.infantImg.toString();
+				if (!this.form.infantImg) {
+					uni.showToast({
+						title: '请上传生活照',
+						icon: 'none',
+						duration: 1000
+					})
+					return;
+				}
+				let data = {
+					artificerId: uni.getStorageSync("artificerId"),
+					lifePhoto: this.form.infantImg,
+				}
+				
+				this.$Request.postJson("/app/artificer/updateShz", data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '提交成功！',
+							icon: 'none'
+						})
+						setTimeout(function() {
+							uni.switchTab({
+								url: '/pages/my/index'
+							})
+						}, 1000)
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				});
+			
+			
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.tabbar {
+		width: 690upx;
+		height: 86upx;
+		background: #019c88;
+		border-radius: 8upx;
+		margin: 0 auto;
+		text-align: center;
+		line-height: 86upx;
+		color: #FFFFFF;
+		margin-top: 20rpx;
+	}
+</style>
\ No newline at end of file

From 744e3381a9d08001be25d6fe2151c1fd71f84491 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 1 Jul 2024 20:27:17 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=B7=B2=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    | 10 ++--------
 pages/order/index.vue |  3 ++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pages/my/index.vue b/pages/my/index.vue
index ee77739..5be1dad 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 text-white" v-if="isLogin && userName">
+					<view class="u-flex-1" v-if="isLogin && userName">
 						<view class="u-font-18 ">
 							<view class="flex align-center" style="margin-bottom: 5px;">
 								<view class="margin-left-sm">{{ userName }}</view>
@@ -168,7 +168,7 @@
 							证件资质
 						</view>
 					</view>
-					<view class="sdza" @click="goHetong()"
+					<view class="sdza" @click="goNfeedback()"
 						style="background: url(../../static/images/my/gyw06.png);background-size: cover;">
 						<image src="../../static/images/my/hetong.png"
 							style="width: 54rpx;height: 60rpx;margin-bottom: 4px;margin-top: 20px;"></image>
@@ -415,12 +415,6 @@
 					url:'/my/feedback/index'
 				})
 			},
-			// 跳转合同页面
-			goHetong(){
-				uni.navigateTo({
-					url:'/pages/hetong/index'
-				})
-			},
 			getMyPageNum() {
 				let artificerId = uni.getStorageSync("artificerId");
 				console.log("artificerId--->",artificerId);
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 2818ee4..84a6e5d 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -1146,7 +1146,8 @@
 		font-size: 30rpx;
 	}
 	.order-details{
-		font-size: 34rpx;
+		font-size: 32rpx;
+		font-weight: bold;
 		
 	}
 </style>
\ No newline at end of file