diff --git a/service-uniapp-technician/pages.json b/service-uniapp-technician/pages.json
index c1c6e02..05e6cfa 100644
--- a/service-uniapp-technician/pages.json
+++ b/service-uniapp-technician/pages.json
@@ -1,20 +1,15 @@
{
- "pages": [
- {
- "path": "pages/index/center",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {
+ "pages": [{
"path": "pages/index/index",
"style": {
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "首页"
}
},
{
"path": "pages/login/mobile",
"style": {
+ "navigationBarTitleText": "登陆"
}
},
{
@@ -32,37 +27,57 @@
{
"path": "pages/index/order",
"style": {
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "订单",
+ "navigationBarTextStyle": "black",
+ "navigationBarBackgroundColor": "white"
+ }
+ },
+ {
+ "path": "pages/index/center",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "我的"
}
},
{
"path": "pages/mine/nodes",
"style": {
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#4899a6"
}
},
{
"path": "pages/mine/recharge",
"style": {
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#4899a6"
}
},
{
"path": "pages/mine/settled",
"style": {
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#4899a6"
}
},
{
"path": "pages/mine/wallet",
"style": {
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#4299a9"
}
},
{
"path": "pages/mine/upload",
"style": {
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "",
+ "navigationBarTextStyle": "black",
+ "navigationBarBackgroundColor": "white"
}
},
{
@@ -155,27 +170,23 @@
},
"tabBar": {
"backgroundColor": "white",
- "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": "订单"
- }
- ]
+ "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": "我的"
+ }]
},
"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 1722f41..17a9be9 100644
--- a/service-uniapp-technician/pages/index/center.vue
+++ b/service-uniapp-technician/pages/index/center.vue
@@ -9,107 +9,27 @@
{{ 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) {
@@ -247,31 +152,14 @@
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: 168rpx;
+ height: 268rpx;
padding: 72rpx 36rpx 0;
margin: 0 auto;
}
@@ -295,8 +183,9 @@
.one-card{
width: 678rpx;
+ height: 116rpx;
border-radius: 16rpx;
- margin: 0 auto 0;
+ margin: -30rpx auto 0;
}
.two-card{
@@ -365,15 +254,15 @@
width: 200rpx;
height: 58rpx;
line-height: 58rpx;
- background: linear-gradient(182deg,#ffffff 2%, #FFD8DC 88%);
+ background: linear-gradient(182deg,#ffffff 2%, #a6fce3 88%);
border-radius: 30rpx;
- box-shadow: 0 6rpx 12rpx 0 #ababab55;
+ box-shadow: 0 6rpx 12rpx 0 rgba(129,209,186,0.66);
font-size: 28rpx;
font-family: PingFang SC, PingFang SC-Bold;
font-weight: 700;
- text-align: center;
- color: #EF8C94;
+ text-align: center;
+ color: #3fc791;
position: absolute;
top: 72rpx;
@@ -387,10 +276,4 @@
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 af41608..d8415fa 100644
--- a/service-uniapp-technician/pages/index/index.vue
+++ b/service-uniapp-technician/pages/index/index.vue
@@ -17,34 +17,25 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
本月订单统计
@@ -55,23 +46,38 @@
{{ item.size }}
{{ item.name }}
+
-
+
+
+
+
+
+
+
-
+
-
+
@@ -136,8 +142,7 @@
statistics: [],
cardColor: ['item-a', 'item-b', 'item-c', 'item-d'],
config: [],
- notice: '',
- active : 0,
+ notice: ''
}
},
onShow() {
@@ -149,9 +154,6 @@
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 30ccfe5..4c26e74 100644
--- a/service-uniapp-technician/pages/index/order.vue
+++ b/service-uniapp-technician/pages/index/order.vue
@@ -1,28 +1,16 @@
-
-
- 我的订单
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
- -->
+
+
+
+
+
-
+
{{ completedQuantity }}
- 总接单数
+ 已完成
-
+
{{ confirmedQuantity }}
- 总佣金数额
+ 待确认
-
+
{{ numberOfVisits }}
- 今日待上门
+ 待上门
@@ -154,6 +149,7 @@
dateList: [],
active: 0,
queryParams: {
+ state: 1,
pageNo: 1,
pageSize: 10
},
@@ -185,7 +181,6 @@
}
},
methods: {
- onClickTab(){},
onLoad() {
this.queryParams.pageSize += 10
this.getOrderList()
@@ -297,7 +292,7 @@
height: 92rpx;
background-color: #fff;
border-radius: 16rpx;
- font-size: 26rpx;
+
padding: 40rpx;
text-align: center;
color: #ccc;
@@ -404,7 +399,7 @@
}
.b2 {
- background-color: #EF8C94;
+ background: linear-gradient(178deg, #4FD3BC, #60C285);
color: #fff;
}
diff --git a/service-uniapp-technician/pages/login/mobile.vue b/service-uniapp-technician/pages/login/mobile.vue
index 21ffc32..407f114 100644
--- a/service-uniapp-technician/pages/login/mobile.vue
+++ b/service-uniapp-technician/pages/login/mobile.vue
@@ -93,12 +93,10 @@
},
//微信登录
toWxLogin(code) {
- let data = {
+ this.$api('wxTechnicianLogin', {
code : this.yzmCode,
phone : this.phone
- }
- console.log(data);
- this.$api('wxTechnicianLogin', data, res=> {
+ }, 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 6626518..ba312fa 100644
--- a/service-uniapp-technician/pages/order/orderDetail.vue
+++ b/service-uniapp-technician/pages/order/orderDetail.vue
@@ -1,14 +1,11 @@
-
+
-
+
@@ -79,7 +76,7 @@
+ background: #6fc6ad;border-radius: 6rpx;" />
服务项目
@@ -371,7 +368,7 @@