From 789a25a5bd2ee93dc5b917e78741318e4d40a1aa Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 6 Aug 2024 15:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E5=B8=88=E7=AB=AF?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
service-uniapp-technician/pages.json | 83 +++++------
service-uniapp-technician/pages/index/center.vue | 155 ++++++++++++++++++---
service-uniapp-technician/pages/index/index.vue | 68 +++++----
service-uniapp-technician/pages/index/order.vue | 55 ++++----
service-uniapp-technician/pages/login/mobile.vue | 6 +-
.../pages/order/orderDetail.vue | 29 ++--
.../static/address/address-icon.png | Bin 11831 -> 0 bytes
.../static/address/delete-icon.png | Bin 809 -> 0 bytes
.../static/address/edit-icon.png | Bin 1069 -> 0 bytes
.../static/address/lightning-icon.png | Bin 905 -> 0 bytes
.../static/address/position-icon.png | Bin 2168 -> 0 bytes
service-uniapp-technician/static/bar/hms.png | Bin 1806 -> 2581 bytes
service-uniapp-technician/static/bar/ph.png | Bin 1563 -> 0 bytes
service-uniapp-technician/static/bar/phs.png | Bin 1655 -> 0 bytes
service-uniapp-technician/static/bar/tps.png | Bin 916 -> 1682 bytes
service-uniapp-technician/static/bar/wd.png | Bin 1594 -> 1479 bytes
service-uniapp-technician/static/bar/wds.png | Bin 1693 -> 1479 bytes
.../static/collect/alert-collect-icon.png | Bin 1946 -> 0 bytes
.../static/collect/review-icon.png | Bin 1108 -> 0 bytes
service-uniapp-technician/static/coupon/c.png | Bin 8404 -> 0 bytes
service-uniapp-technician/static/ms/tx.png | Bin 55515 -> 20785 bytes
service-uniapp-technician/static/payOrder/1.png | Bin 2179 -> 0 bytes
service-uniapp-technician/static/payOrder/2.png | Bin 2077 -> 0 bytes
service-uniapp-technician/static/payOrder/3.png | Bin 1628 -> 0 bytes
service-uniapp-technician/static/payOrder/4.png | Bin 909 -> 0 bytes
service-uniapp-technician/static/payOrder/5.png | Bin 1091 -> 0 bytes
service-uniapp-technician/static/payOrder/7.png | Bin 1645 -> 0 bytes
service-uniapp-technician/static/payOrder/8.png | Bin 1870 -> 0 bytes
service-uniapp-technician/static/payOrder/9.png | Bin 2251 -> 0 bytes
service-uniapp-technician/uni.css | 2 +-
30 files changed, 256 insertions(+), 142 deletions(-)
delete mode 100644 service-uniapp-technician/static/address/address-icon.png
delete mode 100644 service-uniapp-technician/static/address/delete-icon.png
delete mode 100644 service-uniapp-technician/static/address/edit-icon.png
delete mode 100644 service-uniapp-technician/static/address/lightning-icon.png
delete mode 100644 service-uniapp-technician/static/address/position-icon.png
delete mode 100644 service-uniapp-technician/static/bar/ph.png
delete mode 100644 service-uniapp-technician/static/bar/phs.png
delete mode 100644 service-uniapp-technician/static/collect/alert-collect-icon.png
delete mode 100644 service-uniapp-technician/static/collect/review-icon.png
delete mode 100644 service-uniapp-technician/static/coupon/c.png
delete mode 100644 service-uniapp-technician/static/payOrder/1.png
delete mode 100644 service-uniapp-technician/static/payOrder/2.png
delete mode 100644 service-uniapp-technician/static/payOrder/3.png
delete mode 100644 service-uniapp-technician/static/payOrder/4.png
delete mode 100644 service-uniapp-technician/static/payOrder/5.png
delete mode 100644 service-uniapp-technician/static/payOrder/7.png
delete mode 100644 service-uniapp-technician/static/payOrder/8.png
delete mode 100644 service-uniapp-technician/static/payOrder/9.png
diff --git a/service-uniapp-technician/pages.json b/service-uniapp-technician/pages.json
index 05e6cfa..c1c6e02 100644
--- a/service-uniapp-technician/pages.json
+++ b/service-uniapp-technician/pages.json
@@ -1,15 +1,20 @@
{
- "pages": [{
+ "pages": [
+ {
+ "path": "pages/index/center",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
"path": "pages/index/index",
"style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "首页"
+ "navigationStyle": "custom"
}
},
{
"path": "pages/login/mobile",
"style": {
- "navigationBarTitleText": "登陆"
}
},
{
@@ -27,57 +32,37 @@
{
"path": "pages/index/order",
"style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "订单",
- "navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "white"
- }
- },
- {
- "path": "pages/index/center",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "我的"
+ "navigationStyle": "custom"
}
},
{
"path": "pages/mine/nodes",
"style": {
- "navigationBarTitleText": "",
- "navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#4899a6"
+ "navigationBarTitleText": ""
}
},
{
"path": "pages/mine/recharge",
"style": {
- "navigationBarTitleText": "",
- "navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#4899a6"
+ "navigationBarTitleText": ""
}
},
{
"path": "pages/mine/settled",
"style": {
- "navigationBarTitleText": "",
- "navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#4899a6"
+ "navigationBarTitleText": ""
}
},
{
"path": "pages/mine/wallet",
"style": {
- "navigationBarTitleText": "",
- "navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#4299a9"
+ "navigationBarTitleText": ""
}
},
{
"path": "pages/mine/upload",
"style": {
- "navigationBarTitleText": "",
- "navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "white"
+ "navigationBarTitleText": ""
}
},
{
@@ -170,23 +155,27 @@
},
"tabBar": {
"backgroundColor": "white",
- "selectedColor": "#56CBA4",
- "list": [{
- "selectedIconPath": "/static/bar/hms.png",
- "iconPath": "/static/bar/hm.png",
- "pagePath": "pages/index/index",
- "text": "首页"
- }, {
- "selectedIconPath": "/static/bar/tps.png",
- "iconPath": "/static/bar/tp.png",
- "pagePath": "pages/index/order",
- "text": "订单"
- }, {
- "selectedIconPath": "/static/bar/wds.png",
- "iconPath": "/static/bar/wd.png",
- "pagePath": "pages/index/center",
- "text": "我的"
- }]
+ "selectedColor": "#EF8C94",
+ "list": [
+ {
+ "selectedIconPath": "/static/bar/hms.png",
+ "iconPath": "/static/bar/hm.png",
+ "pagePath": "pages/index/center",
+ "text": "首页"
+ },
+ {
+ "selectedIconPath": "/static/bar/wds.png",
+ "iconPath": "/static/bar/wd.png",
+ "pagePath": "pages/index/index",
+ "text": "接单大厅"
+ },
+ {
+ "selectedIconPath": "/static/bar/tps.png",
+ "iconPath": "/static/bar/tp.png",
+ "pagePath": "pages/index/order",
+ "text": "订单"
+ }
+ ]
},
"uniIdRouter": {}
}
\ No newline at end of file
diff --git a/service-uniapp-technician/pages/index/center.vue b/service-uniapp-technician/pages/index/center.vue
index 17a9be9..1722f41 100644
--- a/service-uniapp-technician/pages/index/center.vue
+++ b/service-uniapp-technician/pages/index/center.vue
@@ -9,27 +9,107 @@
{{ userInfo.title }}
{{ userInfo.notes }}
+ 已完成实名认证
+
+
+
+ 总佣金
+
-
-
-
- 账号余额
-
- ¥{{ belece.money }}
-
+
+
+ 总佣金
+
+ ¥{{ belece.money }}
+
+
+ 立即提现
+
+
+
+
+ 一键求救
+
+
+
+
+
+
+
+
+ 实时获取你当前的位置
+
+
+
+
+ 如果你遇到了让你感到不安全情况下，可点击下方
+
+
+ 一键求救
+
+
+ 我们会立即发送您的求救位置
- 立即提现
-
+
+
+ 请假日历
+
+
+
+
+
{
+ if(day.date.getMonth() == n.getMonth()
+ && day.date.getDate() == n.getDate()){
+ day.bottomInfo = '请假';
+ }
+ })
+
+ return day
+ },
+ onConfirm(dates){
+ this.defaultDate = dates
+ },
getUserInfo() {
this.$api('giveTenInfo', {}, res => {
if (res.code == 200) {
@@ -152,14 +247,31 @@
background-color: #f5f5f5;
}
+ .font-n {
+ height: 42rpx;
+ line-height: 42rpx;
+ font-size: 20rpx;
+ font-family: PingFang SC, PingFang SC-Medium;
+ font-weight: 500;
+ text-align: center;
+ color: #fdfaf8;
+
+ width: 168rpx;
+ background: #4eed78;
+ border-radius: 8px;
+
+ margin-top: 5rpx;
+ margin-left: 0rpx;
+ }
+
.banner {
width: 100%;
- height: calc(392rpx - 60rpx);
- background: #fff;
+ /* height: calc(392rpx - 60rpx); */
+ /* background: #fff; */
}
.head-div{
width: calc(100vw - 72rpx);
- height: 268rpx;
+ height: 168rpx;
padding: 72rpx 36rpx 0;
margin: 0 auto;
}
@@ -183,9 +295,8 @@
.one-card{
width: 678rpx;
- height: 116rpx;
border-radius: 16rpx;
- margin: -30rpx auto 0;
+ margin: 0 auto 0;
}
.two-card{
@@ -254,15 +365,15 @@
width: 200rpx;
height: 58rpx;
line-height: 58rpx;
- background: linear-gradient(182deg,#ffffff 2%, #a6fce3 88%);
+ background: linear-gradient(182deg,#ffffff 2%, #FFD8DC 88%);
border-radius: 30rpx;
- box-shadow: 0 6rpx 12rpx 0 rgba(129,209,186,0.66);
+ box-shadow: 0 6rpx 12rpx 0 #ababab55;
font-size: 28rpx;
font-family: PingFang SC, PingFang SC-Bold;
font-weight: 700;
- text-align: center;
- color: #3fc791;
+ text-align: center;
+ color: #EF8C94;
position: absolute;
top: 72rpx;
@@ -276,4 +387,10 @@
flex-direction: column;
align-items: center;
}
+
+ .Ask-for-help{
+ background-color: #ffffff;
+ margin: 0 40rpx;
+ display: flex;
+ }
diff --git a/service-uniapp-technician/pages/index/index.vue b/service-uniapp-technician/pages/index/index.vue
index d8415fa..af41608 100644
--- a/service-uniapp-technician/pages/index/index.vue
+++ b/service-uniapp-technician/pages/index/index.vue
@@ -17,25 +17,34 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
本月订单统计
@@ -46,38 +55,23 @@
{{ item.size }}
{{ item.name }}
-
-
-
-
-
-
-
-
+
-
+
-
-
+
@@ -142,7 +136,8 @@
statistics: [],
cardColor: ['item-a', 'item-b', 'item-c', 'item-d'],
config: [],
- notice: ''
+ notice: '',
+ active : 0,
}
},
onShow() {
@@ -154,6 +149,9 @@
this.initData()
},
methods: {
+ onClickTab(){
+
+ },
getUserInfo() {
this.$api('giveTenInfo', {}, res => {
if (res.code == 200) {
diff --git a/service-uniapp-technician/pages/index/order.vue b/service-uniapp-technician/pages/index/order.vue
index 4c26e74..30ccfe5 100644
--- a/service-uniapp-technician/pages/index/order.vue
+++ b/service-uniapp-technician/pages/index/order.vue
@@ -1,16 +1,28 @@
+
+
+ 我的订单
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+ -->
-
+
{{ completedQuantity }}
- 已完成
+ 总接单数
-
+
{{ confirmedQuantity }}
- 待确认
+ 总佣金数额
-
+
{{ numberOfVisits }}
- 待上门
+ 今日待上门
@@ -149,7 +154,6 @@
dateList: [],
active: 0,
queryParams: {
- state: 1,
pageNo: 1,
pageSize: 10
},
@@ -181,6 +185,7 @@
}
},
methods: {
+ onClickTab(){},
onLoad() {
this.queryParams.pageSize += 10
this.getOrderList()
@@ -292,7 +297,7 @@
height: 92rpx;
background-color: #fff;
border-radius: 16rpx;
-
+ font-size: 26rpx;
padding: 40rpx;
text-align: center;
color: #ccc;
@@ -399,7 +404,7 @@
}
.b2 {
- background: linear-gradient(178deg, #4FD3BC, #60C285);
+ background-color: #EF8C94;
color: #fff;
}
diff --git a/service-uniapp-technician/pages/login/mobile.vue b/service-uniapp-technician/pages/login/mobile.vue
index 407f114..21ffc32 100644
--- a/service-uniapp-technician/pages/login/mobile.vue
+++ b/service-uniapp-technician/pages/login/mobile.vue
@@ -93,10 +93,12 @@
},
//微信登录
toWxLogin(code) {
- this.$api('wxTechnicianLogin', {
+ let data = {
code : this.yzmCode,
phone : this.phone
- }, res=> {
+ }
+ console.log(data);
+ this.$api('wxTechnicianLogin', data, res=> {
if(res.code == 200){
uni.setStorageSync("token", res.result.token)
uni.setStorageSync("userInfo", JSON.stringify(res.result.userInfo))
diff --git a/service-uniapp-technician/pages/order/orderDetail.vue b/service-uniapp-technician/pages/order/orderDetail.vue
index ba312fa..6626518 100644
--- a/service-uniapp-technician/pages/order/orderDetail.vue
+++ b/service-uniapp-technician/pages/order/orderDetail.vue
@@ -1,11 +1,14 @@
-
+
-
+
@@ -76,7 +79,7 @@
+ background: #EF8C94;border-radius: 6rpx;" />
服务项目
@@ -368,7 +371,7 @@