From 2a0573edf6f2d192aa3922b664018a002605c694 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 18 Oct 2024 20:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/base/m-navbar.vue                   |  4 +--
 service-uniapp-technician/pages/index/center.vue   |  7 ++--
 service-uniapp-technician/pages/index/index.vue    | 10 +++---
 service-uniapp-technician/pages/index/order.vue    | 21 ++++++------
 service-uniapp-technician/pages/login/login.vue    | 13 ++++----
 service-uniapp-technician/pages/login/mobile.vue   | 14 ++++----
 .../pages/mine/authentication.vue                  |  8 ++---
 .../pages/mine/serverTime.vue                      | 10 +++---
 service-uniapp-technician/pages/mine/settled.vue   | 17 +++++-----
 service-uniapp-technician/pages/mine/upload.vue    |  6 ++--
 service-uniapp-technician/pages/mine/wallet.vue    |  4 +--
 .../pages/order/orderDetail.vue                    | 39 ++++++++++++----------
 service-uniapp-technician/uni.css                  |  3 +-
 service-uniapp-technician/uni.scss                 | 10 +++---
 14 files changed, 88 insertions(+), 78 deletions(-)

diff --git a/service-uniapp-technician/components/base/m-navbar.vue b/service-uniapp-technician/components/base/m-navbar.vue
index 88c79ae..7eb451e 100644
--- a/service-uniapp-technician/components/base/m-navbar.vue
+++ b/service-uniapp-technician/components/base/m-navbar.vue
@@ -29,11 +29,11 @@
 	top: 0;
 	width: 100%;
 	height: 90rpx;
-	background: linear-gradient(to right, #4899a6, #6fc6ad);
+	background: linear-gradient(to right, #ecb978, #ffe6ed);
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	color: #fff;
+	color: $uni-color;
 	font-size: 26rpx;
 	z-index: 9999;
 	.leftClick{
diff --git a/service-uniapp-technician/pages/index/center.vue b/service-uniapp-technician/pages/index/center.vue
index 8a9c8a1..ac3b1a8 100644
--- a/service-uniapp-technician/pages/index/center.vue
+++ b/service-uniapp-technician/pages/index/center.vue
@@ -171,7 +171,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	body {
 		background-color: #f5f5f5;
 	}
@@ -287,7 +287,8 @@
 		width: 200rpx;
 		height: 58rpx;
 		line-height: 58rpx;
-		background: linear-gradient(182deg, #ffffff 2%, #a6fce3 88%);
+		background: linear-gradient(182deg, #ffffff 2%, #ecb978 88%);
+		/* background: linear-gradient(182deg, #ffffff 2%, #a6fce3 88%); */
 		border-radius: 30rpx;
 		box-shadow: 0 6rpx 12rpx 0 rgba(129, 209, 186, 0.66);
 
@@ -295,7 +296,7 @@
 		font-family: PingFang SC, PingFang SC-Bold;
 		font-weight: 700;
 		text-align: center;
-		color: #3fc791;
+		color: $uni-color;
 
 		position: absolute;
 		top: 72rpx;
diff --git a/service-uniapp-technician/pages/index/index.vue b/service-uniapp-technician/pages/index/index.vue
index dd90b36..cc4b10a 100644
--- a/service-uniapp-technician/pages/index/index.vue
+++ b/service-uniapp-technician/pages/index/index.vue
@@ -361,10 +361,10 @@
 		font-family: PingFang SC, PingFang SC-Medium;
 		font-weight: 500;
 		text-align: center;
-		color: #fdfaf8;
 
 		width: 168rpx;
-		background: #4eed78;
+		background: $uni-bg-color;
+		color: $uni-color;
 		border-radius: 8px;
 
 		margin-top: 5rpx;
@@ -421,7 +421,7 @@
 		font-family: PingFang SC, PingFang SC-Bold;
 		font-weight: 700;
 		text-align: center;
-		color: #26c591;
+		color: $uni-color;
 	}
 
 
@@ -652,8 +652,8 @@
 	}
 
 	.Top-line.online {
-		color: #fdfaf8;
-		background: #4eed78;
+		background: $uni-bg-color;
+		color: $uni-color;
 	}
 
 	.name,
diff --git a/service-uniapp-technician/pages/index/order.vue b/service-uniapp-technician/pages/index/order.vue
index 776992e..e0b36cd 100644
--- a/service-uniapp-technician/pages/index/order.vue
+++ b/service-uniapp-technician/pages/index/order.vue
@@ -171,21 +171,22 @@
 					{}
 			}
 		},
-		onShow() {
-			this.getOrderList(this.queryParams.state)
-			this.getConfig()
-
+		onLoad() {
 			this.dateList = []
-
+			
 			let today = this.dayjs()
-			this.selectDate = today;
-
+			// this.selectDate = today;
+			
 			this.dateList.push(today)
-
+			
 			for (let i = 1; i < 7; i++) {
 				this.dateList.push(today.add(i, 'day'))
 			}
 		},
+		onShow() {
+			this.getOrderList(this.queryParams.state)
+			this.getConfig()
+		},
 		methods: {
 			onLoad() {
 				this.queryParams.pageSize += 10
@@ -446,8 +447,8 @@
 			}
 
 			.b2 {
-				background: linear-gradient(178deg, #4FD3BC, #60C285);
-				color: #fff;
+				background: $uni-bg-color;
+				color: $uni-color;
 			}
 
 			.b3 {
diff --git a/service-uniapp-technician/pages/login/login.vue b/service-uniapp-technician/pages/login/login.vue
index bd3e1ee..c1e2585 100644
--- a/service-uniapp-technician/pages/login/login.vue
+++ b/service-uniapp-technician/pages/login/login.vue
@@ -139,7 +139,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	.a1 {
 		width: 336rpx;
 		height: 66rpx;
@@ -170,7 +170,8 @@
 	.a3 {
 		width: 148rpx;
 		height: 148rpx;
-		background: #51d0b4;
+		background: $uni-bg-color;
+		color: $uni-color;
 		border-radius: 16px;
 		margin: 0 auto;
 		overflow: hidden;
@@ -191,7 +192,8 @@
 	.a5 {
 		width: 568rpx;
 		height: 90rpx;
-		background: #51d0b4;
+		background: $uni-bg-color;
+		color: $uni-color;
 		border-radius: 16rpx;
 
 		margin: 0 auto;
@@ -201,7 +203,6 @@
 		font-family: PingFang SC, PingFang SC-Regular;
 		font-weight: 400;
 		text-align: center;
-		color: #ffffff;
 	}
 
 	.a6 {
@@ -220,11 +221,11 @@
 	}
 
 	.a7 {
-		background-color: #6FDFBE;
+		background: $uni-bg-color;
+		color: $uni-color;
 		width: 34rpx;
 		height: 34rpx;
 		line-height: 34rpx;
-		color: #fff;
 		border-radius: 50%;
 		display: inline-block;
 	}
diff --git a/service-uniapp-technician/pages/login/mobile.vue b/service-uniapp-technician/pages/login/mobile.vue
index 407f114..f22d52c 100644
--- a/service-uniapp-technician/pages/login/mobile.vue
+++ b/service-uniapp-technician/pages/login/mobile.vue
@@ -110,7 +110,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 
 
 	.b1{
@@ -155,7 +155,7 @@
 	.input-m.active{
 		width: 90rpx;
 		height: 130rpx;
-		border: 3rpx solid #51d0b4;
+		border: 3rpx solid $uni-color;
 	}
 
 	.b3{
@@ -167,7 +167,7 @@
 	}
 
 	.b3 span{
-		color: #51D0B4;
+		color: $uni-color;
 	}
 
 	.b4{
@@ -175,13 +175,13 @@
 		height: 90rpx;
 		line-height: 90rpx;
 		border-radius: 46rpx;
-		background: #51d0b4;
+		background: $uni-bg-color;
+		color: $uni-color;
 
 		font-size: 28rpx;
 		font-family: PingFang SC, PingFang SC-Regular;
 		font-weight: 400;
 		text-align: center;
-		color: #ffffff;
 
 		margin: 94rpx auto;
 	}
@@ -250,7 +250,8 @@
 		width: 556rpx;
 		height: 90rpx;
 		line-height: 90rpx;
-		background: #51d0b4;
+		background: $uni-bg-color;
+		color: $uni-color;
 		border-radius: 46px;
 		
 		margin: 60rpx auto;
@@ -259,7 +260,6 @@
 		font-family: PingFang SC, PingFang SC-Regular;
 		font-weight: 400;
 		text-align: center;
-		color: #ffffff;
 	}
 
 </style>
diff --git a/service-uniapp-technician/pages/mine/authentication.vue b/service-uniapp-technician/pages/mine/authentication.vue
index 6747ae3..62f5ad2 100644
--- a/service-uniapp-technician/pages/mine/authentication.vue
+++ b/service-uniapp-technician/pages/mine/authentication.vue
@@ -164,7 +164,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	
 	.content{
 		padding-bottom: 100rpx;
@@ -203,7 +203,7 @@ export default {
 .head-line{
 	width: 8rpx;
 	height: 34rpx;
-	background: #60bda2;
+	background: $uni-color;
 	border-radius: 4rpx;
 	margin: 8rpx 0;
 }
@@ -222,7 +222,6 @@ export default {
     width: 596rpx;
     height: 90rpx;
     line-height: 90rpx;
-    background: linear-gradient(180deg,#6fdfbe, #5ac796);
     border-radius: 46rpx;
 
     margin: 20rpx auto;
@@ -231,7 +230,8 @@ export default {
     font-family: PingFang SC, PingFang SC-Regular;
     font-weight: 400;
     text-align: center;
-    color: #ffffff;
+	background: $uni-bg-color;
+	color: $uni-color;
 }
 
 .tt{
diff --git a/service-uniapp-technician/pages/mine/serverTime.vue b/service-uniapp-technician/pages/mine/serverTime.vue
index 13448fb..cecafa1 100644
--- a/service-uniapp-technician/pages/mine/serverTime.vue
+++ b/service-uniapp-technician/pages/mine/serverTime.vue
@@ -359,8 +359,8 @@
 			}
 
 			.act {
-				background-color: #50a2a7;
-				color: #fff;
+				background: $uni-bg-color;
+				color: $uni-color;
 				border-radius: 10rpx;
 			}
 		}
@@ -392,11 +392,11 @@
 				}
 
 				&.no {
-					background-color: #50a2a7;
-					color: #fff;
+					background: $uni-bg-color;
+					color: $uni-color;
 
 					.status {
-						color: #fff;
+						color: $uni-color;
 					}
 				}
 
diff --git a/service-uniapp-technician/pages/mine/settled.vue b/service-uniapp-technician/pages/mine/settled.vue
index 3c3d166..b5d266c 100644
--- a/service-uniapp-technician/pages/mine/settled.vue
+++ b/service-uniapp-technician/pages/mine/settled.vue
@@ -49,7 +49,7 @@
 					<view class="label" style="width: 100%">请上传本人近期照片</view>
 				</view>
 				<view v-if="!technician.image" @click="fileUploads" class="upload b-relative">
-					<uni-icons type="plusempty" size="80rpx" color="#37bea7"
+					<uni-icons type="plusempty" size="80rpx" color="#6e3009"
 						style="position: absolute; top: 50rpx; left: 60rpx;" />
 				</view>
 				<view v-else @click="fileUploads" class="upload b-relative">
@@ -187,7 +187,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	body {
 		background-color: #f5f5f5;
 	}
@@ -195,7 +195,8 @@
 	.banner {
 		width: 100vw;
 		height: calc(392rpx - 160rpx);
-		background: linear-gradient(38deg, #4899a6 44%, #60bda2 100%);
+		background: linear-gradient(to right, #ecb978, #ffe6ed);
+		color: $uni-color;
 	}
 	
 	
@@ -275,7 +276,7 @@
 		content: "";
 		width: 8rpx;
 		height: 30rpx;
-		background: #4fd3bc;
+		background: $uni-color;
 		border-radius: 4rpx;
 		margin-right: 10rpx;
 		margin-top: 15rpx;
@@ -310,8 +311,8 @@
 		justify-content: center;
 		width: 200rpx;
 		height: 200rpx;
-		background: rgba(245, 245, 245, 0.82);
-		border: 2rpx dashed #99dcd0;
+		background: rgba($uni-color, 0.22);
+		border: 2rpx dashed $uni-color;
 		border-radius: 16rpx;
 	
 		margin: 10rpx 12rpx;
@@ -330,7 +331,6 @@
 		justify-content: center;
 		width: 596rpx;
 		height: 90rpx;
-		background: linear-gradient(180deg, #6fdfbe, #5ac796);
 		border-radius: 46rpx;
 	
 		margin: 20rpx auto;
@@ -339,6 +339,7 @@
 		font-family: PingFang SC, PingFang SC-Regular;
 		font-weight: 400;
 		text-align: center;
-		color: #ffffff;
+		background: $uni-bg-color;
+		color: $uni-color;
 	}
 </style>
\ No newline at end of file
diff --git a/service-uniapp-technician/pages/mine/upload.vue b/service-uniapp-technician/pages/mine/upload.vue
index 28a7af6..cdacdf3 100644
--- a/service-uniapp-technician/pages/mine/upload.vue
+++ b/service-uniapp-technician/pages/mine/upload.vue
@@ -145,7 +145,7 @@ body{
 .head-line{
 	width: 8rpx;
 	height: 34rpx;
-	background: #60bda2;
+	background: $uni-color;
 	border-radius: 4rpx;
 	margin: 8rpx 0;
 }
@@ -162,7 +162,7 @@ body{
     width: 596rpx;
     height: 90rpx;
     line-height: 90rpx;
-    background: linear-gradient(180deg,#6fdfbe, #5ac796);
+    background: $uni-bg-color;
     border-radius: 46rpx;
 
     margin: 20rpx auto;
@@ -171,7 +171,7 @@ body{
     font-family: PingFang SC, PingFang SC-Regular;
     font-weight: 400;
     text-align: center;
-    color: #ffffff;
+    color: $uni-color;
 }
 
 .tt{
diff --git a/service-uniapp-technician/pages/mine/wallet.vue b/service-uniapp-technician/pages/mine/wallet.vue
index 69e3933..2a6fd6b 100644
--- a/service-uniapp-technician/pages/mine/wallet.vue
+++ b/service-uniapp-technician/pages/mine/wallet.vue
@@ -106,7 +106,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	body {
 		background-color: #fff;
 	}
@@ -134,7 +134,7 @@
 		font-weight: 700;
 		text-align: left;
 		color: #ffffff;
-		text-shadow: 0 4rpx 6rpx 0 rgba(40, 170, 133, 0.81);
+		text-shadow: 0 4rpx 6rpx 0 rgba($uni-color, 0.81);
 	}
 
 	.font-menu {
diff --git a/service-uniapp-technician/pages/order/orderDetail.vue b/service-uniapp-technician/pages/order/orderDetail.vue
index a65077e..afc5f5f 100644
--- a/service-uniapp-technician/pages/order/orderDetail.vue
+++ b/service-uniapp-technician/pages/order/orderDetail.vue
@@ -1,11 +1,12 @@
 <template>
 	<view class="order">
-		<mNavbar title="订单详情" :leftClick="toLeft" style="background: linear-gradient(#4899a6, rgb(78 160 167));" />
+		<mNavbar title="订单详情" :leftClick="toLeft" 
+		style="background: linear-gradient(#ecb978, #edbe83);" />
 		<view class="box">
 
 			<view class="title">
 				<view class="icon">
-					<uni-icons type="wallet-filled" color="#4899a6" size="15"></uni-icons>
+					<uni-icons type="wallet-filled" color="#ecb978" size="15"></uni-icons>
 				</view>
 				<view class="text">
 					<!-- 订单已完成 -->
@@ -17,7 +18,9 @@
 				 请确认订单
 			</view> -->
 
-			<van-steps style="background: transparent;padding-bottom: 30px;" active-color="#fff" inactive-color="#ddd"
+			<van-steps style="background: transparent;padding-bottom: 30px;" 
+			active-color="#6e3009" 
+			inactive-color="rgba(#6e3009, 0.2)"
 				:active="stepsActive">
 				<van-step v-for="(item, index) in steps">
 
@@ -80,7 +83,7 @@
 		<view class="info">
 			<view class="flex">
 				<view style="width: 8rpx;height: 30rpx;
-				background: #6fc6ad;border-radius: 6rpx;" />
+				background: #6e3009;border-radius: 6rpx;" />
 				<view class="head-title">服务项目</view>
 			</view>
 
@@ -407,7 +410,7 @@
 
 <style scoped lang="scss">
 	.order {
-		background: linear-gradient(#4899a6, #6fc6ad, #6fc6ad);
+		background: linear-gradient(178deg, #ecb978, #ffe6ed);
 		padding-bottom: 10px;
 	}
 
@@ -417,7 +420,7 @@
 		.active-icon {
 			width: 12px;
 			height: 12px;
-			background-color: #fff;
+			background-color: $uni-color;
 			border-radius: 6px;
 			transform: translate(-25%, 0);
 		}
@@ -425,7 +428,7 @@
 		.inactive-icon {
 			width: 8px;
 			height: 8px;
-			background-color: #fff;
+			background-color: $uni-color;
 			border-radius: 4px;
 		}
 
@@ -440,18 +443,18 @@
 		.inactive-icon.tip {
 			width: 6px;
 			height: 6px;
-			background-color: #fff;
+			background-color: $uni-color;
 			border-radius: 3px;
 		}
 
 		.stepText.tip {
-			background-color: #b5d7d3;
+			background-color: $uni-color;
 			padding: 3px 5px;
 			position: relative;
 			top: 50px;
 			border-radius: 5px;
-			color: #4899a6;
 			display: flex;
+			color: #fff;
 			font-size: 10px;
 		}
 
@@ -461,7 +464,7 @@
 			left: 50%;
 			transform: translate(-50%, 0);
 			border-top: 7px solid transparent;
-			border-bottom: 7px solid #b5d7d3;
+			border-bottom: 7px solid $uni-color;
 			border-left: 7px solid transparent;
 			border-right: 7px solid transparent;
 		}
@@ -478,7 +481,7 @@
 			.icon {
 				width: 25px;
 				height: 25px;
-				background-color: #fff;
+				background-color: $uni-color;
 				border-radius: 15px;
 				display: flex;
 				justify-content: center;
@@ -486,7 +489,7 @@
 			}
 
 			.text {
-				color: #fff;
+				color: $uni-color;
 				padding-left: 5px;
 			}
 		}
@@ -511,8 +514,8 @@
 			.btn,
 			.cancel-btn {
 				color: #fff;
+				background: $uni-color;
 				padding: 10rpx 50rpx;
-				background-color: #ffb300;
 				border-radius: 30rpx;
 				font-size: 25rpx;
 				margin: 0 10rpx;
@@ -739,8 +742,8 @@
 		}
 
 		.btn-x {
-			color: #6fc6ad;
-			border: 1px solid #6fc6ad;
+			color: $uni-color;
+			border: 1px solid $uni-color;
 			padding: 10rpx 20rpx;
 			border-radius: 30rpx;
 		}
@@ -750,8 +753,8 @@
 			justify-content: center;
 
 			.btn {
-				color: #6fc6ad;
-				border: 1px solid #6fc6ad;
+				color: $uni-color;
+				border: 1px solid $uni-color;
 				padding: 10rpx 20rpx;
 				border-radius: 30rpx;
 			}
diff --git a/service-uniapp-technician/uni.css b/service-uniapp-technician/uni.css
index 2625892..9ba83dd 100644
--- a/service-uniapp-technician/uni.css
+++ b/service-uniapp-technician/uni.css
@@ -291,7 +291,8 @@
 
 /* vant样式 */
 :root{
-	--van-primary-color : #60bda2 !important;
+	/* #52300a */
+	--van-primary-color : #6e3009 !important;
 	/* --primary-two-color : #60bda2 !important; */
 }
 
diff --git a/service-uniapp-technician/uni.scss b/service-uniapp-technician/uni.scss
index b9249e9..f78ddaf 100644
--- a/service-uniapp-technician/uni.scss
+++ b/service-uniapp-technician/uni.scss
@@ -13,6 +13,8 @@
  */
 
 /* 颜色变量 */
+$uni-color : #6e3009;
+$uni-bg-color : linear-gradient(178deg, #ffe6ed, #ecb978);
 
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
@@ -28,10 +30,10 @@ $uni-text-color-placeholder: #808080;
 $uni-text-color-disable:#c0c0c0;
 
 /* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+// $uni-bg-color:#ffffff;
+// $uni-bg-color-grey:#f8f8f8;
+// $uni-bg-color-hover:#f1f1f1;//点击状态颜色
+// $uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
 
 /* 边框颜色 */
 $uni-border-color:#c8c7cc;