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 @@