From d0aa39f1900ad2d038354922fc245a40aa20d4dd Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 29 Oct 2024 15:54:34 +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
---
service-uniapp-client/.env | 6 +-
.../components/address/redactAddress.vue | 4 +-
.../components/payOrder/selectAddressPopup.vue | 5 +-
.../components/payOrder/selectCouponPopup.vue | 2 +-
.../components/payOrder/selectTechnicianPopup.vue | 2 +-
.../components/payOrder/selectTime.vue | 8 +-
.../components/selectTechnicianCompoents.vue | 20 +-
service-uniapp-client/manifest.json | 2 +-
service-uniapp-client/pages.json | 2 +-
service-uniapp-client/pages/index/index.vue | 18 ++
service-uniapp-client/pages/login/login.vue | 10 +-
service-uniapp-client/pages/login/mobile.vue | 12 +-
service-uniapp-client/pages/mine/address.vue | 4 +-
service-uniapp-client/pages/mine/collect.vue | 17 +-
service-uniapp-client/pages/mine/coupon.vue | 4 +-
service-uniapp-client/pages/mine/phoneDetail.vue | 8 +-
.../pages/mine/settled - 副本.vue | 323 +++++++++++++++++++++
service-uniapp-client/pages/mine/settled.vue | 174 ++++++-----
service-uniapp-client/pages/mine/wallet.vue | 17 +-
service-uniapp-client/pages/order/payOrder.vue | 26 +-
.../pages/technician/subscribeService.vue | 4 +-
.../pages/technician/technicianDetail.vue | 8 +-
service-uniapp-client/static/bar/hms.png | Bin 1806 -> 3257 bytes
service-uniapp-client/static/bar/phs.png | Bin 1655 -> 1805 bytes
service-uniapp-client/static/bar/tps.png | Bin 916 -> 1683 bytes
service-uniapp-client/static/bar/wds.png | Bin 1693 -> 1871 bytes
service-uniapp-client/static/ms/select.png | Bin 1760 -> 2071 bytes
service-uniapp-client/uni.css | 2 +-
service-uniapp-client/utils/Share.js | 2 +-
service-uniapp-technician/.env | 2 +-
service-uniapp-technician/manifest.json | 2 +-
service-uniapp-technician/pages.json | 4 +-
service-uniapp-technician/pages/mine/upload.vue | 3 +-
service-uniapp-technician/plugins/upload.js | 13 +
service-uniapp-technician/static/bar/hms.png | Bin 1806 -> 3257 bytes
service-uniapp-technician/static/bar/phs.png | Bin 1655 -> 1805 bytes
service-uniapp-technician/static/bar/tps.png | Bin 916 -> 1683 bytes
service-uniapp-technician/static/bar/wds.png | Bin 1693 -> 1871 bytes
38 files changed, 543 insertions(+), 161 deletions(-)
create mode 100644 service-uniapp-client/pages/mine/settled - 副本.vue
diff --git a/service-uniapp-client/.env b/service-uniapp-client/.env
index c089c55..1eb335f 100644
--- a/service-uniapp-client/.env
+++ b/service-uniapp-client/.env
@@ -5,9 +5,9 @@
#VITE_REDIRECT_URI=http://tairoudj.natapp1.cc
# 生产环境
-VITE_GLOB_API=https://tai-testapi.sanhemovie.com/massage-api
-VITE_REDIRECT_URI=https://tai-testh5.sanhemovie.com
+VITE_GLOB_API=https://admin.yixuandaojia.com/massage-api-three
+VITE_REDIRECT_URI=https://h5.yixuandaojia.com
-VITE_APPID=wxe934cebcbc89d869
+VITE_APPID=wxe36bd1a3deea74a3
VITE_MAP_KEY=V5RBZ-QRK63-JAO3B-RLSOB-FLWJF-DVFGH
\ No newline at end of file
diff --git a/service-uniapp-client/components/address/redactAddress.vue b/service-uniapp-client/components/address/redactAddress.vue
index 5b3d6eb..8bdb322 100644
--- a/service-uniapp-client/components/address/redactAddress.vue
+++ b/service-uniapp-client/components/address/redactAddress.vue
@@ -73,10 +73,10 @@
width: 90%;
height: 80rpx;
border-radius: 40rpx;
- color: white;
font-size: 28rpx;
margin: 0rpx auto;
- background: linear-gradient(180deg, #6FDFBE, #5AC796);
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: #6e3009;
}
image {
diff --git a/service-uniapp-client/components/payOrder/selectAddressPopup.vue b/service-uniapp-client/components/payOrder/selectAddressPopup.vue
index 9d8d774..50ddd85 100644
--- a/service-uniapp-client/components/payOrder/selectAddressPopup.vue
+++ b/service-uniapp-client/components/payOrder/selectAddressPopup.vue
@@ -132,7 +132,7 @@
.box {
width: 100%;
height: 100%;
- background: linear-gradient(#57CAA0, #55B16E);
+ background: #ecb978;
box-sizing: border-box;
padding: 40rpx 40rpx 140rpx 40rpx;
@@ -247,7 +247,8 @@
color: white;
text-align: center;
font-size: 28rpx;
- background: linear-gradient(180deg, #6FDFBE, #5AC796);
+ background: #6e3009;
+ color: #fff;
}
}
diff --git a/service-uniapp-client/components/payOrder/selectCouponPopup.vue b/service-uniapp-client/components/payOrder/selectCouponPopup.vue
index 80055c2..4714524 100644
--- a/service-uniapp-client/components/payOrder/selectCouponPopup.vue
+++ b/service-uniapp-client/components/payOrder/selectCouponPopup.vue
@@ -96,7 +96,7 @@
.box{
width: 100%;
height: 100%;
- background: linear-gradient(#57CAA0, #55B16E);
+ background: #ecb978;
box-sizing: border-box;
padding: 40rpx;
.title{
diff --git a/service-uniapp-client/components/payOrder/selectTechnicianPopup.vue b/service-uniapp-client/components/payOrder/selectTechnicianPopup.vue
index 02a1814..6acd8bb 100644
--- a/service-uniapp-client/components/payOrder/selectTechnicianPopup.vue
+++ b/service-uniapp-client/components/payOrder/selectTechnicianPopup.vue
@@ -94,7 +94,7 @@
.box{
width: 100%;
height: 100%;
- background: linear-gradient(#57CAA0, #55B16E);
+ background: #ecb978;
box-sizing: border-box;
padding: 40rpx;
.title{
diff --git a/service-uniapp-client/components/payOrder/selectTime.vue b/service-uniapp-client/components/payOrder/selectTime.vue
index 2ff815b..3f4e4ee 100644
--- a/service-uniapp-client/components/payOrder/selectTime.vue
+++ b/service-uniapp-client/components/payOrder/selectTime.vue
@@ -121,7 +121,7 @@
.box{
width: 100%;
height: 100%;
- background: linear-gradient(#57CAA0, #55B16E);
+ background: #ecb978;
box-sizing: border-box;
padding: 40rpx;
.title{
@@ -146,7 +146,7 @@
}
.act{
background-color: #fff;
- color: #55B16E;
+ color: #6e3009;
border-radius: 10rpx;
}
}
@@ -177,7 +177,7 @@
}
.status{
- color: #56BD86;
+ color: #6e3009;
}
&.no{
background-color: #E4E4E4;
@@ -190,7 +190,7 @@
}
.act{
background-color: #fff;
- color: #55B16E;
+ color: #6e3009;
border-radius: 10rpx;
}
}
diff --git a/service-uniapp-client/components/selectTechnicianCompoents.vue b/service-uniapp-client/components/selectTechnicianCompoents.vue
index d1fd137..1702be9 100644
--- a/service-uniapp-client/components/selectTechnicianCompoents.vue
+++ b/service-uniapp-client/components/selectTechnicianCompoents.vue
@@ -165,12 +165,12 @@
position: absolute;
left: 10%;
bottom: -15rpx;
- background: #55CCA7;
width: 80%;
- color: white;
font-size: 22rpx;
height: 35rpx;
border-radius: 5rpx;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
}
@@ -194,21 +194,21 @@
}
.btn {
- border: 1px solid #55CCA7;
- color: #55CCA7;
font-size: 20rpx;
padding: 5rpx;
border-radius: 5rpx;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
}
.appointed-time {
width: 40%;
- background: #E7FDF7;
height: 40rpx;
border-radius: 22.5rpx;
font-size: 20rpx;
- color: #5DB9A3;
+ background: $uni-color;
+ color: #fff;
.capsule {
display: flex;
@@ -221,9 +221,9 @@
justify-content: center;
width: 50%;
height: 100%;
- color: white;
border-radius: 20rpx;
- background: #52CFB0;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
.today {
@@ -274,9 +274,9 @@
height: 50rpx;
width: 160rpx;
border-radius: 40rpx;
- color: white;
- background: linear-gradient(170deg, #53CEAC, #5AC796);
font-size: 24rpx;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
.notAvailable {
diff --git a/service-uniapp-client/manifest.json b/service-uniapp-client/manifest.json
index a8acfc1..40d0c0e 100644
--- a/service-uniapp-client/manifest.json
+++ b/service-uniapp-client/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "秦柔到家",
+ "name" : "宜轩到家",
"appid" : "__UNI__1EF9D8C",
"description" : "",
"versionName" : "1.0.0",
diff --git a/service-uniapp-client/pages.json b/service-uniapp-client/pages.json
index 7f8ac0f..6244072 100644
--- a/service-uniapp-client/pages.json
+++ b/service-uniapp-client/pages.json
@@ -184,7 +184,7 @@
},
"tabBar": {
"backgroundColor": "white",
- "selectedColor": "#56CBA4",
+ "selectedColor": "#ecb978",
"list": [
{
"selectedIconPath": "/static/bar/hms.png",
diff --git a/service-uniapp-client/pages/index/index.vue b/service-uniapp-client/pages/index/index.vue
index 583b5e1..a8f3c7a 100644
--- a/service-uniapp-client/pages/index/index.vue
+++ b/service-uniapp-client/pages/index/index.vue
@@ -107,6 +107,10 @@
+
+ 复制token
+
@@ -144,6 +148,17 @@
this.getLocation()
},
methods: {
+ copyToken(){
+ uni.setClipboardData({
+ data: uni.getStorageSync('token'),
+ success: () => {
+ uni.showToast({
+ title: 'token复制成功',
+ icon: 'none'
+ })
+ }
+ })
+ },
//list列表滑动到底部自动新增数据列表
onLoad() {
this.queryParams.pageSize += 10;
@@ -532,4 +547,7 @@
}
}
}
+ .copyToken{
+ padding: 100rpx;
+ }
\ No newline at end of file
diff --git a/service-uniapp-client/pages/login/login.vue b/service-uniapp-client/pages/login/login.vue
index 18684a9..f142bee 100644
--- a/service-uniapp-client/pages/login/login.vue
+++ b/service-uniapp-client/pages/login/login.vue
@@ -192,7 +192,6 @@
.a5 {
width: 568rpx;
height: 90rpx;
- background: #51d0b4;
border-radius: 16rpx;
margin: 0 auto;
@@ -202,7 +201,8 @@
font-family: PingFang SC, PingFang SC-Regular;
font-weight: 400;
text-align: center;
- color: #ffffff;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: #6e3009;
}
.a6 {
@@ -219,7 +219,7 @@
}
.a6 .agreement {
- color: #6FDFBE;
+ color: #6e3009;
}
.a7 {
@@ -233,8 +233,8 @@
}
.a8 {
- background-color: #6FDFBE;
border: none;
- color: #fff;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: #6e3009;
}
\ No newline at end of file
diff --git a/service-uniapp-client/pages/login/mobile.vue b/service-uniapp-client/pages/login/mobile.vue
index 3082eb1..5c2ca79 100644
--- a/service-uniapp-client/pages/login/mobile.vue
+++ b/service-uniapp-client/pages/login/mobile.vue
@@ -150,7 +150,7 @@
.input-m.active {
width: 90rpx;
height: 130rpx;
- border: 3rpx solid #51d0b4;
+ border: 3rpx solid #6e3009;
}
.b3 {
@@ -162,7 +162,7 @@
}
.b3 span {
- color: #51D0B4;
+ color: #6e3009;
}
.b4 {
@@ -170,15 +170,15 @@
height: 90rpx;
line-height: 90rpx;
border-radius: 46rpx;
- background: #51d0b4;
font-size: 28rpx;
font-family: PingFang SC, PingFang SC-Regular;
font-weight: 400;
text-align: center;
- color: #ffffff;
margin: 94rpx auto;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: #6e3009;
}
@@ -248,7 +248,6 @@
width: 556rpx;
height: 90rpx;
line-height: 90rpx;
- background: #51d0b4;
border-radius: 46px;
margin: 60rpx auto;
@@ -257,6 +256,7 @@
font-family: PingFang SC, PingFang SC-Regular;
font-weight: 400;
text-align: center;
- color: #ffffff;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: #6e3009;
}
\ No newline at end of file
diff --git a/service-uniapp-client/pages/mine/address.vue b/service-uniapp-client/pages/mine/address.vue
index 4260557..d0393d4 100644
--- a/service-uniapp-client/pages/mine/address.vue
+++ b/service-uniapp-client/pages/mine/address.vue
@@ -456,10 +456,10 @@
width: 85%;
height: 80rpx;
border-radius: 40rpx;
- color: white;
text-align: center;
font-size: 28rpx;
- background: linear-gradient(180deg, #6FDFBE, #5AC796);
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: #6e3009;
}
}
}
diff --git a/service-uniapp-client/pages/mine/collect.vue b/service-uniapp-client/pages/mine/collect.vue
index e81e774..fde1797 100644
--- a/service-uniapp-client/pages/mine/collect.vue
+++ b/service-uniapp-client/pages/mine/collect.vue
@@ -208,11 +208,11 @@
bottom: -13rpx;
width: 70%;
height: 40rpx;
- background: #60C285;
border-radius: 10rpx;
- color: white;
transform: translate(-50%);
-
+
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
.desc {
font-size: 18rpx;
}
@@ -281,7 +281,8 @@
border-radius: 22.5rpx;
font-size: 20rpx;
color: #5DB9A3;
-
+ background: $uni-color;
+ color: #fff;
.capsule {
display: flex;
height: 100%;
@@ -293,9 +294,9 @@
justify-content: center;
width: 50%;
height: 100%;
- color: white;
border-radius: 20rpx;
- background: #52CFB0;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
.today {
@@ -369,8 +370,8 @@
height: 60rpx;
width: 180rpx;
border-radius: 40rpx;
- color: white;
- background: linear-gradient(170deg, #53CEAC, #5AC796);
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
.notAvailable {
diff --git a/service-uniapp-client/pages/mine/coupon.vue b/service-uniapp-client/pages/mine/coupon.vue
index 5e93cc5..906b31a 100644
--- a/service-uniapp-client/pages/mine/coupon.vue
+++ b/service-uniapp-client/pages/mine/coupon.vue
@@ -101,8 +101,8 @@
\ No newline at end of file
diff --git a/service-uniapp-client/pages/mine/settled.vue b/service-uniapp-client/pages/mine/settled.vue
index 7245653..ce6e3f4 100644
--- a/service-uniapp-client/pages/mine/settled.vue
+++ b/service-uniapp-client/pages/mine/settled.vue
@@ -1,12 +1,17 @@
-
+
+
+
-
+
-
+ 技师招募
打造专业的技术服务
立即联系我们>>
@@ -22,10 +27,7 @@
技师性别
-
- 男
- 女
-
+
@@ -46,8 +48,9 @@
请上传本人近期照片
-
-
+
+
@@ -65,26 +68,35 @@
-
\ No newline at end of file
diff --git a/service-uniapp-client/pages/mine/wallet.vue b/service-uniapp-client/pages/mine/wallet.vue
index 4d3b4cd..f1dbd29 100644
--- a/service-uniapp-client/pages/mine/wallet.vue
+++ b/service-uniapp-client/pages/mine/wallet.vue
@@ -4,7 +4,8 @@
-
+
+
账号余额
¥{{ userInfo.price }}
@@ -26,7 +27,7 @@
{{ item.money }}
元
- 送{{ item.sendMoney }}.00元
+ 送{{ item.sendMoney }}.00元
{{ item.remarks }}
@@ -204,7 +205,7 @@
.banner {
width: 100vw;
height: 256rpx;
- background: #cfece7;
+ background: linear-gradient(to right, #ecb978, #ffe6ed);
}
.center {
@@ -276,7 +277,9 @@
width: 96%;
margin-left: 2%;
height: 200rpx;
- background-image: url(/static/ms/cz.png);
+ /* background-image: url(/static/ms/cz.png); */
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);;
+ color: #6e3009;
background-repeat: no-repeat;
background-size: 100% 100%;
overflow: hidden;
@@ -298,7 +301,7 @@
top: 0;
width: 100%;
height: 100%;
- background: url('../../static/ms/select.png');
+ background: url('../../static/ms/select.png?x=1');
background-repeat: no-repeat;
background-size: 100% 100%;
}
@@ -352,9 +355,9 @@
width: 85%;
height: 80rpx;
border-radius: 40rpx;
- color: white;
+ color: #6e3009;
font-size: 28rpx;
- background: linear-gradient(180deg, #6FDFBE, #5AC796);
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
}
@media all and (min-width: 961px) {
diff --git a/service-uniapp-client/pages/order/payOrder.vue b/service-uniapp-client/pages/order/payOrder.vue
index 10e5040..3595407 100644
--- a/service-uniapp-client/pages/order/payOrder.vue
+++ b/service-uniapp-client/pages/order/payOrder.vue
@@ -47,7 +47,7 @@
- {{ technicianDetail.title }}
+ {{ technicianDetail.title }}
@@ -57,7 +57,7 @@
-
+
{{ time.timeName ? (dateObj.format('MM-DD') + ' ' + time.timeName) : '' }}
@@ -69,7 +69,7 @@
出租车
@@ -88,7 +88,7 @@
全程共
- {{ distance || 0}}
公里
@@ -141,8 +141,8 @@
- 优惠 {{ coupon.money }}¥
- {{ couponNum == 0 ? '无' : `${couponNum}张` }}
+ 优惠 {{ coupon.money }}¥
+ {{ couponNum == 0 ? '无' : `${couponNum}张` }}
@@ -499,7 +499,8 @@
position: absolute;
width: 100%;
height: 100px;
- background: linear-gradient(to right, #4899a6, #6fc6ad);
+ background: linear-gradient(to right, #ecb978, #ffe6ed);
+ // color: $uni-color;
}
.box {
@@ -624,7 +625,7 @@
.top {
padding: 5px 10px;
padding-left: 25px;
- background-color: #A1D9CC99;
+ background-color: rgba($uni-color, 0.2);
font-size: 12px;
position: relative;
}
@@ -635,7 +636,7 @@
display: block;
width: 8px;
height: 8px;
- background-color: #6fc6ad;
+ background-color: $uni-color;
top: 50%;
left: 10px;
transform: translate(0, -40%);
@@ -644,7 +645,7 @@
.info {
padding: 10px;
- background-color: #ECFFFB;
+ background-color: rgba($uni-color, 0.1);
color: #888;
font-size: 11px;
line-height: 20px;
@@ -680,8 +681,6 @@
}
.btn {
- background: linear-gradient(178deg, #4FD3BC, #60C285);
- color: white;
width: 120px;
height: 45px;
border-radius: 23px;
@@ -689,6 +688,9 @@
display: flex;
justify-content: center;
align-items: center;
+
+ background: linear-gradient(178deg, #ecb978, #ffe6ed);
+ color: $uni-color;
}
}
}
diff --git a/service-uniapp-client/pages/technician/subscribeService.vue b/service-uniapp-client/pages/technician/subscribeService.vue
index 40af7b7..df24ef2 100644
--- a/service-uniapp-client/pages/technician/subscribeService.vue
+++ b/service-uniapp-client/pages/technician/subscribeService.vue
@@ -367,10 +367,10 @@
width: 90%;
height: 80rpx;
margin: 0 auto;
- background: #49B369;
border-radius: 42.5rpx;
- color: white;
font-size: 28rpx;
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
}
}
diff --git a/service-uniapp-client/pages/technician/technicianDetail.vue b/service-uniapp-client/pages/technician/technicianDetail.vue
index eb879a7..c9b5398 100644
--- a/service-uniapp-client/pages/technician/technicianDetail.vue
+++ b/service-uniapp-client/pages/technician/technicianDetail.vue
@@ -711,8 +711,8 @@
height: 60rpx;
width: 170rpx;
border-radius: 40rpx;
- color: white;
- background: linear-gradient(170deg, #53CEAC, #5AC796);
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
.notAvailable {
@@ -755,8 +755,8 @@
height: 50rpx;
width: 170rpx;
border-radius: 40rpx;
- color: white;
- background: linear-gradient(170deg, #53CEAC, #5AC796);
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
+ color: $uni-color;
}
}
}
diff --git a/service-uniapp-client/static/bar/hms.png b/service-uniapp-client/static/bar/hms.png
index 92547f58516fa090da7a5d33e187efe919368571..5f13ce4ecd9c5aeb22461fd2f71ffe6b23033a7e 100644
GIT binary patch
literal 3257
zcmbVP2~-o;8XgyrLMe(0DobMuqC)l%NMw~DpzNl~R^ucyfk=`GnXngd=Yc3v>w?H4
z$P-bDvRD>DBjtfb1w=#;Tv5QXxM0D`@+JtJ_8r^T(>XJlJNJJ7_wWBXN$_-c(o|oe
z4gi3ri!<9Bd#_PGYO2_8-ge+u?Dd({*%t)>jm64m4si0+G5}EN7jk^$K5nioJ|ZT9
z5W<6r5n?HZ1^_GD2r0-9hUGXO94M4nH_sU=k?|8lA~B!%@i;OA^_VM4=HV3>KZtqEd0w7ar3lg9I#Z_J(O)*q1dv
zNG_MMNTl%aaAG)(h{ys-6eg2NB2!6JDgi?f&`60Kj37wRuVxt7Fv^z+rE(!6!6_L*
z9ug|I#$%R#bU`egrIn!5VZs7NiU6e~3X!aIX$lDOXK~U{nP^Hm#3#WbSPV<#D2AoX
zVx>Wd96^JSKcSvI{(}N6v~F&*IzDNOSUjr&l{G8hCZkuqhj
zn;XkTg33V&A9i6|`W#U|3Mhsg?qWXUU__
z$g>fCsIm%Xaz$kZ8m51A0_LQwRN
zd6d1WEFYG$5XBN3Io&;*;gIQ-NQj%N7#7G^c7ipYuPgx=!cT7tKM{ey=fOwX@E{l?
z{foNz2tyHpJRFq4_JLTm{!ZzU{>*+94Et;A|6cw+W&I~g^&eV49bA48C<%nI;Yz|Q
z{UIsG(8tt}{x@q=XTKX+GjMDUDwneZ82gwV;jjdwmSF=L+I0#K0IH}9+n(dIZ{U6d
zqSv-`!Q)5iBc4X_*=F8%{gc=(k|k|ld#}q*yMONBD!bih@|v^Lu2+U}vs@Vjw=|5%j0%M)Lp?#FX-ECwhhIW+B@4_
z52z4-I$mjV{A~=gYRu94W!xI0TzW{PUs|sQTG;3NP7zucvd9Q#6r?TCIZ_*EV{Vko
zskF-Z`nTP~J5M$PfWmWOOGU}rXd_^!==idfa4y$bhd9W*Q`B|Nv^ZbyU3T(M%6G9OAf1XK!N;
zA;Us#Wl9a@`8C%&)%p^#DsV>o{IZ}US0lwl+snVyL-(v~GpVY6?~A%Ei9W{^MaC-{
z_f_#fELl@+GqU~e$eV!=wZ#h0S8+{r-paw+OTGg-x%5k>_4}YF+0Qx(*OvS=7idIJ
z&_?enh;X~<+t+@<+j@UB;Cc-tFY}lO*fl&~q}epCyUKizcYfvTAObzZn2P
z$$Nzd(-P|DYBy5Gll}F?udgVI#-1nQDuL}fn|ihGS7o{dzX&^>?C8C5F~7K@;30YB
zAcwaUSeV#fBRckeBqg@iNzLnWu}hg(RJr{U4_#)vD$r20=-rmfDMd3T@oHw2e
z3w6)wiVd9fJMh{ah0&i~N{N{NomtBLDz-__QZRj|JHLnh3(
z`?St<8Se_O!COcd=HC?_oe7=%UsS=}tJf&=|-8?6O=G0Y4kU^dp^^
z@L`kh&M)mkJv7t+hpvZJ@M{VwqrBAH3hid0kUYjw?zn{nyE6toqHlenhPkD*7V+Gw#jhLxT`$d;FtrPEqH&yzl35
zv=sSXKcwmoH~9E&R5WQEW>5G>Ck{81EC#R!?j5*(HYIDg;ZZ>SLEDofduj$7qy1NS
z2)3eXALfG|Da2f@dm*2zbA`H-V+V#1{kJ_Pw@|Cb^!dQ92k&dXtFY4O7>L+^VXKwH
zJ=2Vpzbu{9t&cw$>3{gO`fi}u=elR5hZRa|>_l9(N*k)5)LD%XD=v&tdl!CazEU_suYaGUz8`GrHSX7OPBnuy*Un?R^^hMsc@*5zD1Uh_-kHiv
zyoT)mc5+X`qsdX|Q6Y=%>_<$tS1~Ak^Copi75<5kZiLv`45QITgGVnY#&XKxh8!cm
zj`b(p+5=+@V_Woow4E5f*wu-fY}JM;(xV#IPHa2>aDRKu>KAcnZ0@LHH!;-TeP9o%
zk=iHw+4az{DT0(nBIkQ5mlwzdc$NKB_p`-Moc#*|3r;4C?tC-gXFj2k{Ho=lWtVM_
Q^3R2fqdWVD_1ky<7uA_6Q~&?~
delta 1790
zcmV1c$5P+ZUU3={W0x5wc
zKn`NSjuRjS0RcrxNT8q!T4+(LA|Swe?F7V)poLPXRF$?IZGpsI+sLJ~DwG>q#Cp^JeDFK7R{9Cy6>cI~9gXmv};h
zQUMg*p6xYloN%CMvK-&$OlamunON6@}>B@4XD=RBp7#aEpm9BUj_K*PpS%Br2
zIWUWDc1cOe0l7-K-H|$2?TxOa@IH`SE?r_Y8ozH3XqzGNoE#+#3p!>Wr;KK0Vjyrc
zKzgRghTO0F$e5S+JpTwS@g+5O(C02iIL{?6eFUW!i+?v8^7Jd(3fd+}T&o?&M2GID
zQU`~ys0aus7YI68Xhj}1O(RLN$k#cJIo}7Ut}sPux6h-cg_QH@7Je(10Lug7}P1j{AyE=*!zg9@IhEY3m`ehn*FOBXzcVk}EEJk0WJJ
z@becuR*)}oG7|$?|4K-%#mEztd5)C9^SnhME`1247fQF578NaT%a-9dp5loM+v`YG
z^yX4USnmL`(^d<#Js(%>Igm>rlu)pp?@wJL&?X6O-=$Npe
zQ`C4>Br8FhbNZCUiac!ao73J@@C(Vc7*S-;F?(iwUlv3879%@tc_65+
z`+snUUZ39)K<`>U2z`1UuxBbqdxH>k##%3|d@{wP*I)4U(E@TVK}>+Ly?&?C72SbI
z*t{Lb3#@{N4O2`eQ(0#KdTns&>0{*CM;Ocd?1uJiLJIdM!kOTi@u&i;u_5y
zS7JZClWQ>m0MS!Bl$|KNDr%&skRU){J?yU~%UTPfO5y^E@yI_n0wZ3SN>rEpS*JU2mnBJXN~(E
zeMx?hi455X#0Y}kt(_9k+1*j6?SEO%1urHh2H^_VUo)T2vTOo`aJ$K5Dr}E~wyxot
zJ0cc;Dg@w}%jMeO+fiCT;u_6+&M|TO-EqBz!3S?%GHv`ZrL7LzqmM6LxW92~(p0qS
z36x$cRvUDN9e$fR_mCinbqybn`~r5vfb4i-jd{(6=6=wMWMyUbz%We3FnvO(b`L}&iVvMlS3A+DwZ9Pen>pBIJAPAfu*k`*tDij46>NmFq9tI#a4G^{1
zww2wnENgAF>k>$=`sm@&r|Dt+1KM4*`WciSD_CVD$?yCv=o-jHIeQvDNuJJ4*=Wf_
zR@C@%0dg=bhBCAwT*M74vVRkI?wePC-TblRBV7VHcioDDrgw)Xa8pvqFITp?TrU2M
z^%WFFQ>e`No$di)Kzg+T{Ip=L-?Zow$k!S5!s0ld=15bVbq@{)*o`W%Q@i>NWQ(1A
z6Uol%lW!vVCX#;o(?ijs(G8$s}q
zTMG?&`mO%-)N1uG=NS17I-#!+seHm>SIW)`Sm5&2btxjo(MeHa-rmt$^9{NB+*YR`
ztyUZ3P=psd#>)Bci`NNuql!VVS14M$IN+x1*o;w?_KAtj*Kw~AEWg5o-mX&m+I#7k
zQfo9zoudbAqT?g^e|Hl63S@!AY6H@173;}dU5nYzS6`#iOm?Uu_tGO`#N2J#EA3sW
zSV`)1-}>tKr634m0zgF{FcLJ%pHUI*zRP&v(Llc}=V`S`A_!-}ZkU{9!Ak=&XAgSd
gA){XZr$2xH0Ht1ba9P#Ry8r+H07*qoM6N<$f~G53nE(I)
diff --git a/service-uniapp-client/static/bar/phs.png b/service-uniapp-client/static/bar/phs.png
index e09fdcc369e24a9ca9f87ddd9c7148e04ef33f9f..3a9d0568861d4a87ae87b5b730850f396e03554f 100644
GIT binary patch
literal 1805
zcmbVN3vAS69Pbz`fGpz?MA(Gd8Qg?E@3FO6y^XuUPPj3)3k-u7y7s$U*lfqib{e^f@m@|8WjeDArKUKMi;haU=*WU6qFbc{Cc~)fWa3{zkaXZ_xnG-
z|Nq~$b+vQyM^71zAV|Kq##0ab6042OgWvVnKa9X`lvcCYK#;p8SS<(H^2$93GNMTK
zH=2#Ud7P+52tiVt01=O95RD)euDB+MEx<&ZKuA`2Z1CfK7%EFVw#eb5e3~0H%QXod
zG$d;MVxmQ4CCv2@S`p_UK?Ilr8jpk(gNyT6ikE|9YnjB*6vS-du_{X-+UTo8-Kq{y
z2jRp;+U`KhSb}!i>?}JIWhlCwq{>O!hSN^YPH_x_rXLJS)1@F+@0p#J1!p|gY?>NJ
zlCfBfh}j5L50Ny>vLwZj41+@iZnP<;5XTjxIK$uphN#P$DXR)5vH#
zElaByX*WTKk#RvIX@as$N&zJ?i_@ZdI3-*XNe~7RpqK{4(pjw5teUFPto{vkcKa3q
z(6v5aR>p00iA1s@470iwnvr(MZPA9mO#@^-Fx03ng6dYNX0c_B#<_JMn5ynq)o|vb
z>M|;$Znt$YELyTiRwOlMl-_g(cmxyh7(+33oThNv;b$1mX1z10a*m>gpgvWSgKf7$
z8P-qRIUCK<<+ng#)JTFU{3}=zxuB{?1ZcAy5ki2}ln{nyJ;}M%u&P7BP&?br>t46J
zPFI6+7;YH#b7rC5YPXYSolcw~=#;uXALmsJQ&2?U_3#+<4z2}>`_ckF>7+E_Dyr2h~XLoh=PnlV8KRUzoD{}Os6
z)StA{cE}X+uU4k^Zc6bC9M%nMm@Qavk}Y{afpt!Y1?|cw!+t`LoR_?wDu3fs=UzS<
z`HULVzG@=-z|+J@;`pmvRqTgh7a9Iw?xs%&%L`39N5CeO7
zam_AsUVeSY?p>jM56@0ac~N@n&}yx}a6nr4z4Hii3a$TQ24A`N=yeZYd6H<@)cQ^L
z`9GHK`tC|cN2sFr@YRmOU%jrwH?G>e=MOzNd2oR5`YkBro_M3??a7PoUAcBu&c(8Z
U@jc$aA?t_bt*-U#nYDEFpMSh<7XSbN
delta 1638
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
delta 893
zcmV-@1A_dM4U`9vB!2;OQb$4nuFf3k0009{Nklcqgpw*-rP
z^uaf`Nf4CpN2t{bwuFuzVrMh3tX2GD9^YZb)9iaYemjxSq){*SVc8n}x=jRf2T(3o@1NHO@m
z{*ypwK1n~n|!MPBYy_sLX-$XfWe&(0n-3KD}XY!
zfDi=GmMbs~{jnbD?RK%1JYpiU0HU)XT4K$0I_?$s^sxLMbOu@DS0tVFRAcJ4n!P?#UbRp&m?x|LN
z%wG*a-Ox6q)@cWlAbd80t16%!uu9fcErOLevoq%q&`#8f*Eo)#-b{hNLquGDHd~-$
zrVP+DTY3mM1{4z!8ASS#6Pl?ipfv{T
zvmK|{x=U*-{(r!8^Ye|zk1V^X!C@6|QD)^&d$RPy$#De5g!}-6>(&xyGMn*G@k%$U
zS|oK3m`m}oWjARKQ!G$s<#!EIT$R-BW5n?uJOp%lqptg-uI?`jb${JDERu?fBq^`y
z3U-v4vQWz?7L*0Ty5crd77oy6Y6V!aHWNt6eXJGKtuz?XVs)z~fTik|fc{vwiMo|j
z4ieExCcaV=m;;Ow)8m*oSkNX-HEN$49TdQ0Ku!pE^c7dZAI$(rX`rdO63ylx1oMSQ
T(eLCY00000NkvXXu0mjfEdr^|JQvyt~nE
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
X6TC;R<2+{o0000Dn$}
diff --git a/service-uniapp-client/static/ms/select.png b/service-uniapp-client/static/ms/select.png
index 57be8ef26715d9e95198ffe0da55efed451c3e4e..12ae518eb8649e8ac1181346544e5e534a598ae4 100644
GIT binary patch
literal 2071
zcmd^AeM}Q)7=J4h@q^7sqRhGNJd&qmL#UNU_1JBVN
zVt!8n=9CnOS&UYKqcSX5rrk(c%^7z4a~N%+Y^2FXQf7j(G8ra@rm^@3N8S`Z$P~Jk
z#(klg125AwnIXwYBw~!1jgnGIQg*wYG|?nY69_@5Rieg52~k}zZovgrP7!2HkVH(k
z$OfcJ&4DAPV=49If{oLs4dV$OMvgdrG)qNXA&mB7kn
zk|wET(qEWPY~SMmN$c?>eB75yIGk{yYPoAs7;!=Fi&ni=G9(M3Dpe{R%w3CUF3_Wq
z8K(kSO;Ws)6dJ#%f^o{2)2UyK9ecW15P2!0J~QDAbg>$A;IxU(ASe?-S-dpOnDy^M
zlZ`Q%#-JXF7lKvyLTS5~vM^>dW3k=?MOnkM8vBo6o@0WN5@u1%LYOUuq%4-=SVBq0
zDTO2jIY#Wv6W85NXMrLGg%H|M3zsdy+__FGWw%-h+DOIddOVCL2
z;29cHT#ygaM5c{16J|>WN7z^^By6;mV=Y|3YO&kL&$}e9QqO|%^Zb82zd{jE6|$iR
zwxidko<2;TprVVdidRn&tcZ_70v5{{hUN51aNwMt0+7e!%fbUIFlIJV29eRf$%`?V
zDh0I&tH7L6q}IPlJreOJ^|Boch5U1rvAqc;J`P8HLmws@7Mdhl9u!fZQ&2-Y+G8mI
zVA8v8SB^K@cC{}jKaEX4efhU?zyEsw<0(_SnrH6se{JjFi9^$WFdW;U%u3qS_lfhf
zr6qGJ*Ua0s<2db=FUm4l)_Bm1t?hK#4eP-^BmwiWO8+uy4+*5sNbyasC`#S*A3-VGU!sz^qxQN*>mN>
z`)OeK#KHE>r#64yvIPv+r6)Z!ldA)P88fpR4U-zEY(OQaU|qm)G9CNBY<6Dy{y3;x
ze>Tv%I!Gt?eD&>jO2gjeU7)q6x_;49F?Hmu?VeLUq*6|!;e1V>x3A>u{O+NF*2uym
z4OHh_C3`RY^kGZ){wu>j-hQL^WcnJ{s)np%wWFuk1!nx5EoH6SePQtC7b6!xs+_-X
z7FRcA2(Kw_YCqJx{nMItZ>A?LUNWb*wkb2U!slCbY1`TrQ+vdb|Pv+TW$@tKif=Y*SmeI?l4bu+yQ-qfkNMuj>$R6JslgbS#$5!
z9>9`@^Y`BRy?bEg#d?2}p)2A@dF09d(Ty`YZMA3nQx9)TDe~}#j~Ai0I{@z7eAm7u
HYc~7=;Ul}#
literal 1760
zcmeAS@N?(olHy`uVBq!ia0y~yU`z(GQ#jawWblT-w?K-qILO_JVcj{ImkbPSvpiiK
zLn`9l-tq6a^Hh@k!}GbhyHL4f&nD!fLd7QbnVh;F9xE$EY<9$n
z@XI-6d|mYJ&BCt|f`5uH%#Hoc?!~9NS(?lCh?C}CPQx3^CRC=H`FSjQ`S0YpPZpnV
zdfzzn=idF#b@STw?eE>4D|Ef~@2~grZ>;~%zwPI$*&qLZ)_YC?1&0S}tXVY`AGWQZ
zXH|J!SbTll%9y{t>1)5oU8yMgQE&RnUh3ixjie9nXYbj18mQjjE7R6#&VflkCj5S!
zZ{Sxtd+l;JgYZK;F2A4K-@$D9XuJ2>YwMTA@i8zmu^dym@N)eg!N7i3&F8y|KbQ05
zZx%fEw(fnu>Z64_OlG{k_x;7M8SnBVnOHakez+~z{O@HBk5snlsZ&A4`$Fg0*8XZ2
z{~r4ze(l%RrPcj=+`2$!esg>9;@2te(t!B8=G*^IyY%wAU0=t1pfj@1^?zR`Qm*LG
zaG->{p7#dla
z4p}$~PXRI+6LZ)&1QaGXI7p~xGzkHj3O#2*4i@6zc+BD(zyxHrY?M@RXmDU+Oq{cT
z(+kLKFfd~V`rQMlR@lUm6UY=emIgG7iIb(Jut`m$5y(7rg9jK(3XKg0eiv9&flLR9
z*+8>6RDfzZXDwg>GC7isM;$XfL*{;bDgz
zaX|{0VrHZ?wnj-mzZRzV_M2Sm$Gq;SeulX5LA<=D>F(I5i{|u6M&)&DyP&ohJmx(uYI%I=$!ms@Xy27hb
zy7lAj&FzZ=y<}pee@;8C(b2A7bN%)8_y;E|wA@cG;}p2jccAxB#j+_C+21}K3)&wO
z-|PMLQ~thO^A20d{N>X3yc-T&;mRrV*=SMz)BIlF+`os9?LWM@bFH0Ve}Ju||J#b2
z7K}{MqBnGU+F$oDRc?6})~B{^-+wm=_aoAG(_a4wOh;{xFlRZR54@6^*WB{(}Avi
zuwhyDxlZf!s`@@5{v46$N1InX)mLQ`FALg}4J>vHG?~7Ba!=n@R%~zj$RAi5A6{&_
z|Eu%vbpQSJzmL|k+x2vut`B?E4Jw<;{1+U{vJ8-q-t+lH{rb2s+127o`H`ZW*}y7`
N!PC{xWt~$(69ByVwvGS*
diff --git a/service-uniapp-client/uni.css b/service-uniapp-client/uni.css
index 2625892..4ddbc2d 100644
--- a/service-uniapp-client/uni.css
+++ b/service-uniapp-client/uni.css
@@ -291,7 +291,7 @@
/* vant样式 */
:root{
- --van-primary-color : #60bda2 !important;
+ --van-primary-color : #6e3009 !important;
/* --primary-two-color : #60bda2 !important; */
}
diff --git a/service-uniapp-client/utils/Share.js b/service-uniapp-client/utils/Share.js
index 6c2013c..ebbab0e 100644
--- a/service-uniapp-client/utils/Share.js
+++ b/service-uniapp-client/utils/Share.js
@@ -12,7 +12,7 @@ function share() { //微信分享
nonceStr,
signature,
timestamp
- } = res.result
+ } = res.result || {}
window.jWeixin.config({
debug: false,
appId: appId,
diff --git a/service-uniapp-technician/.env b/service-uniapp-technician/.env
index 653d26e..e234708 100644
--- a/service-uniapp-technician/.env
+++ b/service-uniapp-technician/.env
@@ -6,7 +6,7 @@ VITE_REDIRECT_URI=http://tairoudj.natapp1.cc
# 生产环境
-VITE_GLOB_API=https://tai-testapi.sanhemovie.com/massage-api
+VITE_GLOB_API=https://admin.yixuandaojia.com/massage-api-three
#VITE_REDIRECT_URI=https://tai-testh5.sanhemovie.com
diff --git a/service-uniapp-technician/manifest.json b/service-uniapp-technician/manifest.json
index 98dd7b3..9773144 100644
--- a/service-uniapp-technician/manifest.json
+++ b/service-uniapp-technician/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "秦柔到家",
+ "name" : "宜轩到家",
"appid" : "__UNI__A35F936",
"description" : "",
"versionName" : "1.0.0",
diff --git a/service-uniapp-technician/pages.json b/service-uniapp-technician/pages.json
index f5990c0..d819f5f 100644
--- a/service-uniapp-technician/pages.json
+++ b/service-uniapp-technician/pages.json
@@ -122,7 +122,7 @@
],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "anmo.com",
+ "navigationBarTitleText": "宜轩到家",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
"navigationStyle": "custom",
@@ -176,7 +176,7 @@
},
"tabBar": {
"backgroundColor": "white",
- "selectedColor": "#56CBA4",
+ "selectedColor": "#ecb978",
"list": [{
"selectedIconPath": "/static/bar/hms.png",
"iconPath": "/static/bar/hm.png",
diff --git a/service-uniapp-technician/pages/mine/upload.vue b/service-uniapp-technician/pages/mine/upload.vue
index cdacdf3..ac81411 100644
--- a/service-uniapp-technician/pages/mine/upload.vue
+++ b/service-uniapp-technician/pages/mine/upload.vue
@@ -104,13 +104,14 @@ export default {
}
},
deleteImage(index){
+ let self = this
uni.showModal({
title: '确认删除这张照片吗',
confirmText : '确认',
cancelText : '取消',
success: function (res) {
if (res.confirm) {
- this.list.splice(index, 1)
+ self.list.splice(index, 1)
} else if (res.cancel) {}
}
});
diff --git a/service-uniapp-technician/plugins/upload.js b/service-uniapp-technician/plugins/upload.js
index 147fe22..730374e 100644
--- a/service-uniapp-technician/plugins/upload.js
+++ b/service-uniapp-technician/plugins/upload.js
@@ -18,6 +18,17 @@ function uploadFileToOSS(file) {
// bucket: 'mangoimageapplet',
// endpoint:'oss-cn-shenzhen.aliyuncs.com'
+ //桶的地址
+ // region: 'oss-cn-hangzhou',
+ // //id
+ // accessKeyId:'LTAI5tDL3dP95KCoepUtqRZX',
+ // //密钥
+ // accessKeySecret:'WHUemsg4V9xyZUWRU9WvqwJjTcwe2u',
+ // //桶的名字
+ // bucket: 'daohomeimage',
+ // endpoint:'oss-cn-hangzhou.aliyuncs.com',
+
+
//桶的地址
region: 'oss-cn-guangzhou',
//id
@@ -27,6 +38,7 @@ function uploadFileToOSS(file) {
//桶的名字
bucket: 'zhuoqiu-image',
endpoint:'oss-cn-guangzhou.aliyuncs.com',
+
});
// 设置文件名和文件目录
@@ -41,6 +53,7 @@ function uploadFileToOSS(file) {
}
}).then(res => {
uni.hideLoading();
+ // resolve('https://image.yixuandaojia.com/' + res.name);
resolve('https://tennis-oss.xzaiyp.top/' + res.name);
}).catch(err => {
uni.hideLoading();
diff --git a/service-uniapp-technician/static/bar/hms.png b/service-uniapp-technician/static/bar/hms.png
index 92547f58516fa090da7a5d33e187efe919368571..5f13ce4ecd9c5aeb22461fd2f71ffe6b23033a7e 100644
GIT binary patch
literal 3257
zcmbVP2~-o;8XgyrLMe(0DobMuqC)l%NMw~DpzNl~R^ucyfk=`GnXngd=Yc3v>w?H4
z$P-bDvRD>DBjtfb1w=#;Tv5QXxM0D`@+JtJ_8r^T(>XJlJNJJ7_wWBXN$_-c(o|oe
z4gi3ri!<9Bd#_PGYO2_8-ge+u?Dd({*%t)>jm64m4si0+G5}EN7jk^$K5nioJ|ZT9
z5W<6r5n?HZ1^_GD2r0-9hUGXO94M4nH_sU=k?|8lA~B!%@i;OA^_VM4=HV3>KZtqEd0w7ar3lg9I#Z_J(O)*q1dv
zNG_MMNTl%aaAG)(h{ys-6eg2NB2!6JDgi?f&`60Kj37wRuVxt7Fv^z+rE(!6!6_L*
z9ug|I#$%R#bU`egrIn!5VZs7NiU6e~3X!aIX$lDOXK~U{nP^Hm#3#WbSPV<#D2AoX
zVx>Wd96^JSKcSvI{(}N6v~F&*IzDNOSUjr&l{G8hCZkuqhj
zn;XkTg33V&A9i6|`W#U|3Mhsg?qWXUU__
z$g>fCsIm%Xaz$kZ8m51A0_LQwRN
zd6d1WEFYG$5XBN3Io&;*;gIQ-NQj%N7#7G^c7ipYuPgx=!cT7tKM{ey=fOwX@E{l?
z{foNz2tyHpJRFq4_JLTm{!ZzU{>*+94Et;A|6cw+W&I~g^&eV49bA48C<%nI;Yz|Q
z{UIsG(8tt}{x@q=XTKX+GjMDUDwneZ82gwV;jjdwmSF=L+I0#K0IH}9+n(dIZ{U6d
zqSv-`!Q)5iBc4X_*=F8%{gc=(k|k|ld#}q*yMONBD!bih@|v^Lu2+U}vs@Vjw=|5%j0%M)Lp?#FX-ECwhhIW+B@4_
z52z4-I$mjV{A~=gYRu94W!xI0TzW{PUs|sQTG;3NP7zucvd9Q#6r?TCIZ_*EV{Vko
zskF-Z`nTP~J5M$PfWmWOOGU}rXd_^!==idfa4y$bhd9W*Q`B|Nv^ZbyU3T(M%6G9OAf1XK!N;
zA;Us#Wl9a@`8C%&)%p^#DsV>o{IZ}US0lwl+snVyL-(v~GpVY6?~A%Ei9W{^MaC-{
z_f_#fELl@+GqU~e$eV!=wZ#h0S8+{r-paw+OTGg-x%5k>_4}YF+0Qx(*OvS=7idIJ
z&_?enh;X~<+t+@<+j@UB;Cc-tFY}lO*fl&~q}epCyUKizcYfvTAObzZn2P
z$$Nzd(-P|DYBy5Gll}F?udgVI#-1nQDuL}fn|ihGS7o{dzX&^>?C8C5F~7K@;30YB
zAcwaUSeV#fBRckeBqg@iNzLnWu}hg(RJr{U4_#)vD$r20=-rmfDMd3T@oHw2e
z3w6)wiVd9fJMh{ah0&i~N{N{NomtBLDz-__QZRj|JHLnh3(
z`?St<8Se_O!COcd=HC?_oe7=%UsS=}tJf&=|-8?6O=G0Y4kU^dp^^
z@L`kh&M)mkJv7t+hpvZJ@M{VwqrBAH3hid0kUYjw?zn{nyE6toqHlenhPkD*7V+Gw#jhLxT`$d;FtrPEqH&yzl35
zv=sSXKcwmoH~9E&R5WQEW>5G>Ck{81EC#R!?j5*(HYIDg;ZZ>SLEDofduj$7qy1NS
z2)3eXALfG|Da2f@dm*2zbA`H-V+V#1{kJ_Pw@|Cb^!dQ92k&dXtFY4O7>L+^VXKwH
zJ=2Vpzbu{9t&cw$>3{gO`fi}u=elR5hZRa|>_l9(N*k)5)LD%XD=v&tdl!CazEU_suYaGUz8`GrHSX7OPBnuy*Un?R^^hMsc@*5zD1Uh_-kHiv
zyoT)mc5+X`qsdX|Q6Y=%>_<$tS1~Ak^Copi75<5kZiLv`45QITgGVnY#&XKxh8!cm
zj`b(p+5=+@V_Woow4E5f*wu-fY}JM;(xV#IPHa2>aDRKu>KAcnZ0@LHH!;-TeP9o%
zk=iHw+4az{DT0(nBIkQ5mlwzdc$NKB_p`-Moc#*|3r;4C?tC-gXFj2k{Ho=lWtVM_
Q^3R2fqdWVD_1ky<7uA_6Q~&?~
delta 1790
zcmV1c$5P+ZUU3={W0x5wc
zKn`NSjuRjS0RcrxNT8q!T4+(LA|Swe?F7V)poLPXRF$?IZGpsI+sLJ~DwG>q#Cp^JeDFK7R{9Cy6>cI~9gXmv};h
zQUMg*p6xYloN%CMvK-&$OlamunON6@}>B@4XD=RBp7#aEpm9BUj_K*PpS%Br2
zIWUWDc1cOe0l7-K-H|$2?TxOa@IH`SE?r_Y8ozH3XqzGNoE#+#3p!>Wr;KK0Vjyrc
zKzgRghTO0F$e5S+JpTwS@g+5O(C02iIL{?6eFUW!i+?v8^7Jd(3fd+}T&o?&M2GID
zQU`~ys0aus7YI68Xhj}1O(RLN$k#cJIo}7Ut}sPux6h-cg_QH@7Je(10Lug7}P1j{AyE=*!zg9@IhEY3m`ehn*FOBXzcVk}EEJk0WJJ
z@becuR*)}oG7|$?|4K-%#mEztd5)C9^SnhME`1247fQF578NaT%a-9dp5loM+v`YG
z^yX4USnmL`(^d<#Js(%>Igm>rlu)pp?@wJL&?X6O-=$Npe
zQ`C4>Br8FhbNZCUiac!ao73J@@C(Vc7*S-;F?(iwUlv3879%@tc_65+
z`+snUUZ39)K<`>U2z`1UuxBbqdxH>k##%3|d@{wP*I)4U(E@TVK}>+Ly?&?C72SbI
z*t{Lb3#@{N4O2`eQ(0#KdTns&>0{*CM;Ocd?1uJiLJIdM!kOTi@u&i;u_5y
zS7JZClWQ>m0MS!Bl$|KNDr%&skRU){J?yU~%UTPfO5y^E@yI_n0wZ3SN>rEpS*JU2mnBJXN~(E
zeMx?hi455X#0Y}kt(_9k+1*j6?SEO%1urHh2H^_VUo)T2vTOo`aJ$K5Dr}E~wyxot
zJ0cc;Dg@w}%jMeO+fiCT;u_6+&M|TO-EqBz!3S?%GHv`ZrL7LzqmM6LxW92~(p0qS
z36x$cRvUDN9e$fR_mCinbqybn`~r5vfb4i-jd{(6=6=wMWMyUbz%We3FnvO(b`L}&iVvMlS3A+DwZ9Pen>pBIJAPAfu*k`*tDij46>NmFq9tI#a4G^{1
zww2wnENgAF>k>$=`sm@&r|Dt+1KM4*`WciSD_CVD$?yCv=o-jHIeQvDNuJJ4*=Wf_
zR@C@%0dg=bhBCAwT*M74vVRkI?wePC-TblRBV7VHcioDDrgw)Xa8pvqFITp?TrU2M
z^%WFFQ>e`No$di)Kzg+T{Ip=L-?Zow$k!S5!s0ld=15bVbq@{)*o`W%Q@i>NWQ(1A
z6Uol%lW!vVCX#;o(?ijs(G8$s}q
zTMG?&`mO%-)N1uG=NS17I-#!+seHm>SIW)`Sm5&2btxjo(MeHa-rmt$^9{NB+*YR`
ztyUZ3P=psd#>)Bci`NNuql!VVS14M$IN+x1*o;w?_KAtj*Kw~AEWg5o-mX&m+I#7k
zQfo9zoudbAqT?g^e|Hl63S@!AY6H@173;}dU5nYzS6`#iOm?Uu_tGO`#N2J#EA3sW
zSV`)1-}>tKr634m0zgF{FcLJ%pHUI*zRP&v(Llc}=V`S`A_!-}ZkU{9!Ak=&XAgSd
gA){XZr$2xH0Ht1ba9P#Ry8r+H07*qoM6N<$f~G53nE(I)
diff --git a/service-uniapp-technician/static/bar/phs.png b/service-uniapp-technician/static/bar/phs.png
index e09fdcc369e24a9ca9f87ddd9c7148e04ef33f9f..3a9d0568861d4a87ae87b5b730850f396e03554f 100644
GIT binary patch
literal 1805
zcmbVN3vAS69Pbz`fGpz?MA(Gd8Qg?E@3FO6y^XuUPPj3)3k-u7y7s$U*lfqib{e^f@m@|8WjeDArKUKMi;haU=*WU6qFbc{Cc~)fWa3{zkaXZ_xnG-
z|Nq~$b+vQyM^71zAV|Kq##0ab6042OgWvVnKa9X`lvcCYK#;p8SS<(H^2$93GNMTK
zH=2#Ud7P+52tiVt01=O95RD)euDB+MEx<&ZKuA`2Z1CfK7%EFVw#eb5e3~0H%QXod
zG$d;MVxmQ4CCv2@S`p_UK?Ilr8jpk(gNyT6ikE|9YnjB*6vS-du_{X-+UTo8-Kq{y
z2jRp;+U`KhSb}!i>?}JIWhlCwq{>O!hSN^YPH_x_rXLJS)1@F+@0p#J1!p|gY?>NJ
zlCfBfh}j5L50Ny>vLwZj41+@iZnP<;5XTjxIK$uphN#P$DXR)5vH#
zElaByX*WTKk#RvIX@as$N&zJ?i_@ZdI3-*XNe~7RpqK{4(pjw5teUFPto{vkcKa3q
z(6v5aR>p00iA1s@470iwnvr(MZPA9mO#@^-Fx03ng6dYNX0c_B#<_JMn5ynq)o|vb
z>M|;$Znt$YELyTiRwOlMl-_g(cmxyh7(+33oThNv;b$1mX1z10a*m>gpgvWSgKf7$
z8P-qRIUCK<<+ng#)JTFU{3}=zxuB{?1ZcAy5ki2}ln{nyJ;}M%u&P7BP&?br>t46J
zPFI6+7;YH#b7rC5YPXYSolcw~=#;uXALmsJQ&2?U_3#+<4z2}>`_ckF>7+E_Dyr2h~XLoh=PnlV8KRUzoD{}Os6
z)StA{cE}X+uU4k^Zc6bC9M%nMm@Qavk}Y{afpt!Y1?|cw!+t`LoR_?wDu3fs=UzS<
z`HULVzG@=-z|+J@;`pmvRqTgh7a9Iw?xs%&%L`39N5CeO7
zam_AsUVeSY?p>jM56@0ac~N@n&}yx}a6nr4z4Hii3a$TQ24A`N=yeZYd6H<@)cQ^L
z`9GHK`tC|cN2sFr@YRmOU%jrwH?G>e=MOzNd2oR5`YkBro_M3??a7PoUAcBu&c(8Z
U@jc$aA?t_bt*-U#nYDEFpMSh<7XSbN
delta 1638
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
delta 893
zcmV-@1A_dM4U`9vB!2;OQb$4nuFf3k0009{Nklcqgpw*-rP
z^uaf`Nf4CpN2t{bwuFuzVrMh3tX2GD9^YZb)9iaYemjxSq){*SVc8n}x=jRf2T(3o@1NHO@m
z{*ypwK1n~n|!MPBYy_sLX-$XfWe&(0n-3KD}XY!
zfDi=GmMbs~{jnbD?RK%1JYpiU0HU)XT4K$0I_?$s^sxLMbOu@DS0tVFRAcJ4n!P?#UbRp&m?x|LN
z%wG*a-Ox6q)@cWlAbd80t16%!uu9fcErOLevoq%q&`#8f*Eo)#-b{hNLquGDHd~-$
zrVP+DTY3mM1{4z!8ASS#6Pl?ipfv{T
zvmK|{x=U*-{(r!8^Ye|zk1V^X!C@6|QD)^&d$RPy$#De5g!}-6>(&xyGMn*G@k%$U
zS|oK3m`m}oWjARKQ!G$s<#!EIT$R-BW5n?uJOp%lqptg-uI?`jb${JDERu?fBq^`y
z3U-v4vQWz?7L*0Ty5crd77oy6Y6V!aHWNt6eXJGKtuz?XVs)z~fTik|fc{vwiMo|j
z4ieExCcaV=m;;Ow)8m*oSkNX-HEN$49TdQ0Ku!pE^c7dZAI$(rX`rdO63ylx1oMSQ
T(eLCY00000NkvXXu0mjfEdr^|JQvyt~nE
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
X6TC;R<2+{o0000Dn$}