From 02be1364d522f93de44e21e3c0ce5e2375adddb2 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 28 Jun 2024 09:33:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=89=AF=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js               | 4 ++--
 uview-ui/libs/request/index.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/config.js b/common/config.js
index 15d567e..832a2ce 100644
--- a/common/config.js
+++ b/common/config.js
@@ -4,8 +4,8 @@
 //测试环境
 const PROT = "http://"
 // const ROOTHOST = "47.75.182.93:8090";
-const ROOTHOST = "192.168.2.222:8187";
-// const ROOTHOST = "120.46.52.165";
+// const ROOTHOST = "192.168.2.222:8187";
+const ROOTHOST = "120.46.52.165";
 // const ROOTHOST = "192.168.0.115:8187";
 // const ROOTHOST = "192.168.1.169:8187";
 // 后端本地张聪
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
index 7cd3e99..1d18b84 100644
--- a/uview-ui/libs/request/index.js
+++ b/uview-ui/libs/request/index.js
@@ -103,8 +103,8 @@ class Request {
 		this.config = {
 			// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
 			// baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名
-			// baseUrl: 'http://120.46.52.165/', // 请求的根域名
-			baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
+			baseUrl: 'http://120.46.52.165/', // 请求的根域名
+			// baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
 			// 默认的请求头
 			header: {},
 			method: 'POST',

From b8195f391072a86a441ea21eb4e4ffe707868635 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 28 Jun 2024 09:40:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue  | 12 ++++++------
 pages/public/login.vue |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8d5afaa..a89cca4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,7 @@
 		<view class="jishi-index">
 			<view class=" u-flex padding-lr" style="padding: 30px 30rpx 120px;align-items: center;">
 				<view class="u-m-r-10">
-					<image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx;"
+					<image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx; border: 2px solid #fffff;"
 						@click="goNav('/pages/my/userinfo')"></image>
 				</view>
 				<view class="u-flex-1 u-m-l-10 text-white" v-if="isLogin && userName">
@@ -85,7 +85,7 @@
 				</view>
 				
 				<view class="" style="margin-top: 20px;">
-					<text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
+					<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"
@@ -122,16 +122,16 @@
 				<view class="flex align-center"
 					style="justify-content: space-evenly;text-align: center;">
 					<view class="" @click="dangqian">
-						<view class="" style="font-size: 22px;font-weight: bold;">
+						<view class="" style="font-size: 24px;font-weight: bold;">
 							{{ currentRealIncome ? currentRealIncome : 0 }}
 						</view>
-						<view class="" style="font-size: 12px;">当期收益(元)</view>
+						<view class="" style="font-size: 14px; margin-top: 5px;">当期收益(元)</view>
 					</view>
 					<view class="shuxian"></view>
 					<view class="" @tap="goNav('/pages/index/currentPoints')">
-						<view class="" style="font-size: 22px;font-weight: bold;">{{ currentIntegral ? currentIntegral : 0 }}
+						<view class="" style="font-size: 24px;font-weight: bold;">{{ currentIntegral ? currentIntegral : 0 }}
 						</view>
-						<view class="" style="font-size: 12px;" >当期积分</view>
+						<view class="" style="font-size: 14px; margin-top: 5px;" >当期积分</view>
 					</view>
 				</view>
 			</view>
diff --git a/pages/public/login.vue b/pages/public/login.vue
index bbfeecc..ee8921b 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -40,7 +40,7 @@
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN -->
 		<view style="text-align: center;">
-			<view style="font-size: 48upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view>
+			<view style="font-size: 40upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view>
 			<image style="width: 300upx;height: 300upx;margin-top: 200upx;margin-bottom:100rpx;border-radius:20upx"
 				src="../../static/logo.png"></image>
 			<button v-if="weixinLogin" class="confirm-btn" @click="weixinLo">微信登录</button>

From ac0206d5deafe4adaae0e9493df1722efd192fc4 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 28 Jun 2024 10:45:52 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/currentIncome.vue | 24 +++++++-------
 pages/index/currentPoints.vue | 60 ++++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index 2356b55..72b5a0c 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -2,22 +2,22 @@
 	<view class="content">
 		<view class="header">
 			<view class="header-top">
-				<view class="header-top-left">
+				<view class="header-top-left" style="margin-top: -10px;">
 					<image src="../../static/index/dangqian1.png" mode=""></image>
-					<span class="header-text" style="margin-right: 5px;">当前周期</span>
-					<span class="header-text">{{startTime}}~{{endTime}}</span>
+					<span class="header-text">当前周期</span>
+					<span class="header-text" style="font-size: 16px;">{{startTime}}~{{endTime}}</span>
 				</view>
-				<view class="header-top-btn" @click="wangqi">往期收益</view>
+				<view class="header-top-btn" @click="wangqi" style="font-size: 14px; margin-top: -8px;">往期收益</view>
 			</view>
-			<view class="header-bottom">
+			<view class="header-bottom" style="margin-bottom: 40rpx;">
 				<view class="header-bottom-money">{{shouyiMoeny}}</view>
-				<view class="header-text">当前收益</view>
+				<view class="header-text" style="font-size: 14px; margin-top: -5px;">当前收益</view>
 			</view>
 		</view>
 		<!-- 性别选择 -->
 		<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
-		<t-refresh class="mian" ref="refresh"  v-if="listData.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
-			<template slot="content">
+		<t-refresh class="mian" ref="refresh"  v-if="listData.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0" >
+			<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>
@@ -320,16 +320,16 @@
 		height: 49rpx;
 		line-height: 49rpx;
 		text-align: center;
-		font-size: 21rpx;
+		font-size: 26rpx;
 		color: #333333;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 	}
 	.header-text{
 		font-weight: 400;
-		font-size: 22rpx;
+		font-size: 28rpx;
 		color: #FFFFFF;
-		margin-top: 2px;
+		margin-right: 8rpx;
 	}
 	.header-top-left image{
 		width: 24.31rpx;
@@ -352,7 +352,7 @@
 		width: 100%;
 		height: 300rpx;
 		padding: 15px;
-		background-image: url('../../static/index/fun_banner4.png');
+		background:#fff url('../../static/index/fun_banner4.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		display: flex;
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index 9f7ed6e..f51b5fc 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -11,7 +11,7 @@
 				</view>
 				<view class="header-top-btn" @click="wangqi">往期积分</view>
 			</view>
-			<view class="header-bottom">
+			<view class="header-bottom" style="margin-bottom: 40rpx;">
 				<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
 				<view class="header-text">当前积分</view>
 			</view>
@@ -77,22 +77,22 @@
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
-						<span class="view-title-left-text">时长积分: <text class="view-num">{{zxscjf}}</text>(在线时长10分钟可获取1积分)</span>
+						<span class="view-title-left-text ">时长积分: <text class="view-num">{{zxscjf}}</text>(在线时长10分钟可获取1积分)</span>
 					</view>
 					<!-- <view class="view-title-right" @click.stop="toggle('时长积分')">更多</view> -->
 				</view>
 				<view class="mian-table">
 					<view class="table-view">
-						<span style="font-size: 22rpx;">序号</span>
-						<span v-for="(item , index) in zxscList">{{index+1}}</span>
+						<span style="font-weight: bold;">序号</span>
+						<span  class="table-view-child" v-for="(item , index) in zxscList">{{index+1}}</span>
 					</view>
 					<view class="table-view">
-						<span style="font-size: 22rpx;">获取时间</span>
-						<span v-for="(item , index) in zxscList">{{item.jftime}}</span>
+						<span style="font-weight: bold;">获取时间</span>
+						<span class="table-view-child" v-for="(item , index) in zxscList">{{item.jftime}}</span>
 					</view>
 					<view class="table-view">
-						<span style="font-size: 22rpx;">获取积分</span>
-						<span v-for="(item , index) in zxscList">{{item.jifen}}</span>
+						<span style="font-weight: bold;">获取积分</span>
+						<span  class="table-view-child" v-for="(item , index) in zxscList">{{item.jifen}}</span>
 					</view>
 				</view>
 			</view>
@@ -107,16 +107,16 @@
 				</view>
 				<view class="mian-table">
 					<view class="table-view">
-						<span style="font-size: 22rpx;">序号</span>
-						<span v-for="(item , index) in czjfList">{{index+1}}</span>
+						<span style="font-weight: bold;">序号</span>
+						<span class="table-view-child" v-for="(item , index) in czjfList">{{index+1}}</span>
 					</view>
 					<view class="table-view">
-						<span style="font-size: 22rpx;">获取时间</span>
-						<span v-for="(item , index) in czjfList">{{item.jftime}}</span>
+						<span style="font-weight: bold;">获取时间</span>
+						<span class="table-view-child" v-for="(item , index) in czjfList">{{item.jftime}}</span>
 					</view>
 					<view class="table-view">
-						<span style="font-size: 22rpx;">获取积分</span>
-						<span v-for="(item , index) in czjfList">{{item.jifen}}</span>
+						<span style="font-weight: bold;">获取积分</span>
+						<span class="table-view-child" v-for="(item , index) in czjfList">{{item.jifen}}</span>
 					</view>
 				</view>
 			</view>
@@ -332,7 +332,7 @@
 <style scoped>
 	.tapNav-name{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 28rpx;
 		color: #333333;
 	}
 	
@@ -452,15 +452,16 @@
 		flex-direction: column;
 	}
 	.table-view span{
-		font-weight: 400;
-		font-size: 19rpx;
-		color: #666666;
-	}
-	.table-view span:nth-child(1){
+		font-size: 27rpx;
+		}
+	.table-view-bold{
 		font-weight: bold;
 	}
+	.table-view-child{
+		color: #888;
+	}
 	.table-view span{
-		margin-bottom: 15px;
+		margin-bottom: 20px;
 	}
 	.table-view{
 		display: flex;
@@ -470,13 +471,13 @@
 	}
 	.mian-table{
 		width: 100%;
-		padding: 10px;
+		padding: 15px;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
 		background: #FFFFFF;
-		border-radius: 24rpx;
+		border-radius: 21rpx;
 		margin-bottom: 10px;
 	}
 	.view-num{
@@ -618,7 +619,8 @@
 		flex-direction: column;
 	}
 	.mina{
-		width: 95%;
+		width: 94%;
+		margin: 0 auto;
 		height: 300px;
 		display: flex;
 		flex-direction: column;
@@ -633,14 +635,14 @@
 		height: 49rpx;
 		line-height: 49rpx;
 		text-align: center;
-		font-size: 21rpx;
+		font-size: 26rpx;
 		color: #333333;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 	}
 	.header-text{
 		font-weight: 400;
-		font-size: 22rpx;
+		font-size: 28rpx;
 		color: #FFFFFF;
 	}
 	.header-top-left image{
@@ -663,9 +665,9 @@
 	}
 	.header{
 		width: 100%;
-		height: 200rpx;
-		padding: 15px;
-		background-image: url('../../static/index/fun_banner4.png');
+		height: 300rpx;
+		padding: 5px 20px;
+		background:#fff url('../../static/index/fun_banner4.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		display: flex;

From bfb503a07e72f1b1e98f72e4d1535405431cd912 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 28 Jun 2024 11:08:20 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/addClock.vue      | 11 ++++++-----
 pages/index/currentPoints.vue |  8 +++++---
 pages/my/mangshi.vue          |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index 7586ee9..c43f6f3 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -11,7 +11,7 @@
 				</view>
 				<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
 			</view>
-			<view class="header-bottom">
+			<view class="header-bottom" style="margin-bottom: 40rpx;">
 				<view class="header-bottom-money">
 					{{earnings}}
 				</view>
@@ -281,7 +281,7 @@
 	}
 	.tapNav-name{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 28rpx;
 		color: #333333;
 	}
 	
@@ -497,10 +497,11 @@
 		color: #333333;
 		background: #FFFFFF;
 		border-radius: 24rpx;
+		margin-top: 8rpx;
 	}
 	.header-text{
 		font-weight: 400;
-		font-size: 22rpx;
+		font-size: 27rpx;
 		color: #FFFFFF;
 		margin-top: 2px;
 	}
@@ -525,8 +526,8 @@
 	.header{
 		width: 100%;
 		height: 300rpx;
-		padding: 15px;
-		background-image: url('../../static/index/fun_banner4.png');
+		padding: 15px 20px;
+		background:#fff url('../../static/index/fun_banner4.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		display: flex;
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index f51b5fc..a204676 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -346,13 +346,15 @@
 		margin-bottom: 10px;
 	}
 	.tapNav-list{
-		width: 100%;
+		width: 96%;
 		margin: 0 auto;
 		display: flex;
 		flex-direction:row;
 		align-items: center;
 		justify-content: space-between;
 		background-color: #fff;
+		border-radius: 15rpx;
+		margin-top: -30px;
 	}
 	.tapNav-view{
 		height: 40px;
@@ -642,7 +644,7 @@
 	}
 	.header-text{
 		font-weight: 400;
-		font-size: 28rpx;
+		font-size: 26rpx;
 		color: #FFFFFF;
 	}
 	.header-top-left image{
@@ -667,7 +669,7 @@
 		width: 100%;
 		height: 300rpx;
 		padding: 5px 20px;
-		background:#fff url('../../static/index/fun_banner4.png');
+		background:#f7f7f7 url('../../static/index/fun_banner4.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		display: flex;
diff --git a/pages/my/mangshi.vue b/pages/my/mangshi.vue
index bf230b6..50a49eb 100644
--- a/pages/my/mangshi.vue
+++ b/pages/my/mangshi.vue
@@ -256,6 +256,6 @@
 		margin: 30rpx 10rpx;
 		color: #FFFFFF;
 		font-size: 30rpx;
-		background: linear-gradient(to right, #223845, #00a85b);
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
 	}
 </style>

From e8c0fb6392e5b3a6858e4a0b05a609dc0e8b0ce3 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 28 Jun 2024 13:45:11 +0800
Subject: [PATCH 5/6] =?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/fund/index.css               | 15 ++++++-----
 pages/index/technicianLevel.vue | 48 ++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/my/fund/index.css b/my/fund/index.css
index dc175cd..522dc34 100644
--- a/my/fund/index.css
+++ b/my/fund/index.css
@@ -34,7 +34,7 @@
 
 	.innerTopRight {
 		height: fit-content;
-		font-size: 16px;
+		font-size: 13px;
 		display: flex;
 		justify-content: right;
 		padding-right: 10px;
@@ -64,9 +64,9 @@
 		}
 	
 	.innerTimer{
-		font-size: 14px;
+		font-size: 13px;
 		margin-top: 5px;
-		color: #666;
+		color: #999;
 		margin-right: 10px;
 	}
 	.totalIntegral {
@@ -159,7 +159,7 @@
 		color: #0aa86a;
 		background-color: #FFFFFF;
 		padding: 6px;
-		border-radius: 10px;
+		border-radius: 30px;
 		width: 60px;
 		text-align: center;
 	}
@@ -224,12 +224,14 @@
 
 	.storedIntegralMiddle view:nth-child(1) {
 		margin-left: 3px;
-		color: #666;
+		color: #999;
+		font-size: 30rpx;
 	}
 
 	.storedIntegralMiddleofRight {
 		margin-right: 19px;
-		color: #666;
+		color: #333;
+		font-size: 30rpx;
 	}
 
 	.storedIntegralBottom {
@@ -238,6 +240,7 @@
 		margin-left: 3px;
 		border-bottom: 1px solid #f4f4f4;
 		color:#999;
+		font-size: 26rpx;
 	}
 
 	.withdrawalMoneyBtn {
diff --git a/pages/index/technicianLevel.vue b/pages/index/technicianLevel.vue
index d2cef09..8a9d4a1 100644
--- a/pages/index/technicianLevel.vue
+++ b/pages/index/technicianLevel.vue
@@ -18,7 +18,7 @@
 				</view>
 				<view class="header-right-bottom">
 					<view class="djimg">{{ artificerData.grade }}</view>
-					<view class="djimg-text">当期等级</view>
+					<!---<view class="djimg-text">当期等级</view>-->
 				</view>
 			</view>
 			<view class="mian-view">
@@ -101,22 +101,23 @@
 		top: 0;
 		background: url(../../static/images/index/vip.png) no-repeat center;
 		background-size: cover;
-		width: 76.39rpx;
-		height:54rpx;
+		width: 96.39rpx;
+		height:74rpx;
 		text-align: center;
-		line-height: 30px;
+		line-height: 48px;
 		font-weight: bold;
-		font-size: 17rpx;
+		font-size: 23rpx;
 		color: #FFFFFF;
 	}
 	.mian-list-view span:nth-child(1){
-		font-size: 23rpx;
-		color: #019D88;
+		font-size: 36rpx;
+		color: #019c88;
+		font-weight: bold;
 	}
 	.mian-list-view span:nth-child(2){
-		font-size: 18rpx;
-		color: #666666;
-		margin-top: 5px;
+		font-size: 22rpx;
+		color: #333;
+		margin-top: 2px;
 	}
 	.mian-list-view{
 		width: 25%;
@@ -131,6 +132,7 @@
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
+		margin-top: 35rpx;
 	}
 	.fencheng span{
 		font-size: 23rpx;
@@ -142,6 +144,7 @@
 		color: #FE912A;
 		margin-top: 2px;
 		margin-left: 5px;
+		font-weight: bold;
 	}
 	.fencheng{
 		display: flex;
@@ -168,7 +171,7 @@
 		border-radius: 14rpx;
 		display: flex;
 		flex-direction: column;
-		padding: 10px;
+		padding: 15px;
 		margin-bottom: 10px;
 		position: relative;
 	}
@@ -193,13 +196,14 @@
 		background: url(../../static/images/index/vip.png) no-repeat center;
 		background-size: cover;
 		width: 198rpx;
-		height: 70px;
+		height: 80px;
 		text-align: center;
-		line-height: 84px;
+		line-height: 96px;
 		font-weight: normal;
-		font-size: 30rpx;
+		font-size: 40rpx;
 		color: #FEFEFE;
 		font-style: italic;
+		font-weight: bold;
 	}
 	.header-right-bottom{
 		width: 30%;
@@ -207,12 +211,12 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: space-evenly;
-		margin-top: 42px;
-		margin-right: 8px;
+		margin-top: 20px;
+		margin-right: 6px;
 	}
 	.header-right-text{
-		margin-top: 10px;
-		font-size: 18rpx;
+		margin-top: 6px;
+		font-size: 22rpx;
 		color: #FFFFFF;
 	}
 	.header-right-top span:nth-child(1){
@@ -220,13 +224,13 @@
 		height: 34rpx;
 		text-align: center;
 		line-height: 34rpx;
-		font-size: 22rpx;
+		font-size: 24rpx;
 		color: #843200;
 		background: linear-gradient(-36deg, #FFE45A, #FFBB46);
 		border-radius: 15rpx 0rpx 15rpx 0rpx;
 	}
 	.header-right-top span:nth-child(2){
-		font-size: 22rpx;
+		font-size: 26rpx;
 		color: #FFF5BC;
 		margin-left: 5px;
 	}
@@ -235,7 +239,7 @@
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		margin-top: 15px;
+		margin-top: 20px;
 	}
 	.header-right{
 		width: 65%;
@@ -246,7 +250,7 @@
 	
 	.header{
 		width: 100%;
-		padding: 10px;
+		padding: 13px 23px;
 		height: 263rpx;
 		display: flex;
 		flex-direction: row;

From f0e0102c9efab32d8b95cd83068ee5be4434ced5 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 28 Jun 2024 13:46:07 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js               |  4 +--
 manifest.json                  |  3 +-
 my/order/revenueDetails.vue    | 59 ++++++++++++++++++++--------------
 pages/order/index.vue          | 18 +++++------
 uview-ui/libs/request/index.js |  4 +--
 5 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/common/config.js b/common/config.js
index 832a2ce..15d567e 100644
--- a/common/config.js
+++ b/common/config.js
@@ -4,8 +4,8 @@
 //测试环境
 const PROT = "http://"
 // const ROOTHOST = "47.75.182.93:8090";
-// const ROOTHOST = "192.168.2.222:8187";
-const ROOTHOST = "120.46.52.165";
+const ROOTHOST = "192.168.2.222:8187";
+// const ROOTHOST = "120.46.52.165";
 // const ROOTHOST = "192.168.0.115:8187";
 // const ROOTHOST = "192.168.1.169:8187";
 // 后端本地张聪
diff --git a/manifest.json b/manifest.json
index ade7ac4..ffded07 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,8 @@
             "OAuth" : {},
             "Maps" : {},
             "Camera" : {},
-            "Record" : {}
+            "Record" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index c6c4349..537874f 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -16,14 +16,15 @@
 						<view class="mian-title" v-if="order && order.ordersMassageList">
 							
 							<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
-							<view class="nav-btn" v-if="order.status ==1">待付款</view>
+							<!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
 							<view class="nav-btn" v-if="order.status ==2">待服务</view>
-							<view class="nav-btn" v-if="order.status ==5">待评价</view>
-							<view class="nav-btn" v-if="order.status ==3">已完成</view>
+							<view class="nav-btn" v-if="order.status ==3">待评价</view>
+							<!-- <view class="nav-btn" v-if="order.status ==4">已取消</view> -->
+							<view class="nav-btn" v-if="order.status ==5">已完成</view>
 							<view class="nav-btn" v-if="order.status ==6">服务中</view>
-							<view class="nav-btn" v-if="order.status ==7">已出发</view>
-							<view class="nav-btn" v-if="order.status ==8">已到达</view>
-							<view class="nav-btn" v-if="order.status ==4">已取消</view>
+							<view class="nav-btn" v-if="order.status ==7">技师出发</view>
+							<view class="nav-btn" v-if="order.status ==8">技师到达</view>
+							<view class="nav-btn" v-if="order.status ==9">确认接单</view>
 						</view>
 						<view class="mian-time" v-if="order && order.ordersMassageList">
 							服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
@@ -103,50 +104,59 @@
 					<span class="mian-view-list-text">70.00%</span>
 				</view> -->
 			</view>
-			<view class="mian-view" v-if="order.status != 9">
+			<view class="mian-view" v-if="order.status == 6">
+				<view class="mian-view-list" style="font-size: 16px;font-weight: bold;">
+					<span class="mian-view-list-title">加钟信息</span>
+				</view>
 				<view class="mian-view-list">
 					<span class="mian-view-list-title">是否加钟</span>
-					<span class="mian-view-list-text">{{order.addNum!=''?'是':'否'}}</span>
+					<span class="mian-view-list-text">{{order.addNum!=null?'是':'-'}}</span>
 				</view>
 				<view class="mian-view-list">
 					<span class="mian-view-list-title">加钟项目</span>
-					<span class="mian-view-list-text">{{order.jzName!=''?order.jzName:'无'}}</span>
+					<span class="mian-view-list-text">{{order.jzName!=null?order.jzName:'-'}}</span>
 				</view>
 				<view class="mian-view-list">
 					<span class="mian-view-list-title">加钟数量</span>
-					<span class="mian-view-list-text">{{order.addNum}}</span>
+					<span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
 				</view>
 				<view class="mian-view-list">
 					<span class="mian-view-list-title">加钟金额</span>
-					<span class="mian-view-list-text">￥{{order.addMoney}}</span>
+					<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
+					<span class="mian-view-list-text" v-else>-</span>
 				</view>
 			</view>
-			<view class="mian-view" v-if="order.status != 9">
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">是否改价</span>
-					<span class="mian-view-list-text">{{order.isSupplement!=''?'是':'否'}}</span>
+			<view class="mian-view"  v-if="order.status == 6">
+				<view class="mian-view-list" style="font-size: 16px;font-weight: bold;">
+					<span class="mian-view-list-title">服务升级</span>
 				</view>
 				<view class="mian-view-list">
-					<span class="mian-view-list-title">改价项目</span>
-					<span class="mian-view-list-text">{{order.gjName!=''?order.gjName:'无'}}</span>
+					<span class="mian-view-list-title">是否升级</span>
+					<span class="mian-view-list-text">{{order.isSupplement!=null?'是':'-'}}</span>
 				</view>
 				<view class="mian-view-list">
-					<span class="mian-view-list-title">改价金额</span>
-					<span class="mian-view-list-text">￥{{order.gjPrice}}</span>
+					<span class="mian-view-list-title">升级项目</span>
+					<span class="mian-view-list-text">{{order.gjName!=null?order.gjName:'-'}}</span>
+				</view>
+				<view class="mian-view-list">
+					<span class="mian-view-list-title">升级金额</span>
+					<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.gjPrice}}</span>
+					<span class="mian-view-list-text" v-else>-</span>
 				</view>
 				<view class="mian-view-list">
 					<span class="mian-view-list-title">支付差价</span>
-					<span class="mian-view-list-text">￥{{order.gjcePrice}}</span>
+					<span class="mian-view-list-text" v-if="order.gjcePrice!=null">￥{{order.gjcePrice}}</span>
+					<span class="mian-view-list-text" v-else>-</span>
 				</view>
 			</view>
-			<view class="mian-content" style="margin-bottom: 10px;"  v-if="order.status != 9">
+			<view class="mian-content" style="margin-bottom: 10px;"  v-if="order.status == 6">
 				<view class="mian-content-list">
 					<span class="mian-content-list-title">是否提前结束</span>
-					<span class="mian-content-list-text">{{order.earlyFinishReason!=''?'是':'否'}}</span>
+					<span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
 				</view>
 				<view class="mian-content-textarea">
 					<span class="mian-content-list-title"  style="margin: 10px 0px;">提前结束原因</span>
-					<textarea class="textarea-mian" v-model="order.earlyFinishReason" placeholder="请输入备注...." maxlength="100" name="" id=""></textarea>
+					<textarea class="textarea-mian" :disabled="true"  v-model="order.earlyFinishReason"  maxlength="100" name="" id=""></textarea>
 				</view>
 				<!-- <view class="yingde">
 					<view class="yingde-title">应得收益</view>
@@ -238,7 +248,7 @@
 				</view>
 			</view>
 			<view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'">
-				<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片1
+				<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
 				</view>
 				<view class="flex flex-wrap">
 					<view v-if="startImgs.length">
@@ -485,6 +495,7 @@
 				textareaTxt:'',
 				checkbox2:[],
 				refusalContent:'',
+				imgList:[]
 			}
 		},
 		watch: {
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 9f53155..745a006 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -65,16 +65,16 @@
 			<view class="bgwhite radius margin-bottom-sm padding-bottom-sm" 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" v-if="item.status == 1">待付款...</view>
-					<view class="text-green" v-if="item.status == 2">待服务</view>
-					<view class="text-green" v-if="item.status == 3">已完成</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 == 5">待评价</view>
-					<view class="text-green" 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.status == 1">待支付</view> -->
+					<view class="text-green" 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="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
 			
 					<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
index 1d18b84..7cd3e99 100644
--- a/uview-ui/libs/request/index.js
+++ b/uview-ui/libs/request/index.js
@@ -103,8 +103,8 @@ class Request {
 		this.config = {
 			// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
 			// baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名
-			baseUrl: 'http://120.46.52.165/', // 请求的根域名
-			// baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
+			// baseUrl: 'http://120.46.52.165/', // 请求的根域名
+			baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
 			// 默认的请求头
 			header: {},
 			method: 'POST',