diff --git a/common/js/data.js b/common/js/data.js
index 62a74f4..e5486e1 100644
--- a/common/js/data.js
+++ b/common/js/data.js
@@ -1,6 +1,6 @@
/**
* 页面静态数据
- */
+ */
const moduleBarInfos = [{
id: 1,
cuIcon: 'homefill',
@@ -22,64 +22,187 @@ const moduleBarInfos = [{
cuIcon: 'my',
pageCode: 'myPage',
name: '我的'
+}]
+
+const myInfo = {
+ id: 1,
+ picUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5000.jpg',
+ name: '叮咚任务师傅端',
+ entryType: null,
+ hasCheckedRule: true,
+ order: {
+ noReservation: 5,
+ noSchedule: 6,
+ onsiteTimeout: 3,
+ onsiteToday: [{
+ id: 1,
+ work: '灯具维修-灯泡射灯',
+ address: '广东省 广州市 白云区 xx街道',
+ datetime: '2022-4-22 10:00:00'
+ }, {
+ id: 2,
+ work: '冰箱维修',
+ address: '广东省 广州市 天河区 xx街道',
+ datetime: '2022-4-22 14:00:00'
+ }]
+ },
+ weekNotice: {
+ id: 1,
+ title: '您的一笔订单金额已到帐',
+ ifHasNoReadNotice: true
+ }
+}
+
+const myTeamInfo = {
+ takeRate: 0.5,
+ members: [{
+ id: '1sdfasdf',
+ name: '师傅1',
+ avatarUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5001.jpg',
+ noteName: '备注名称1',
+ phoneNum: '13455444567',
+ showEditInput: false
+ }, {
+ id: 'dfsdfsdfds',
+ name: '师傅2',
+ avatarUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5002.jpg',
+ noteName: '',
+ phoneNum: '13655455434',
+ showEditInput: true
+ }, {
+ id: 'sdcec',
+ name: '师傅3',
+ avatarUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5002.jpg',
+ noteName: '',
+ phoneNum: '13655455422',
+ showEditInput: true
+ }]
+}
+
+const masterRules = [
+ '0规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容',
+ '1规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容',
+ '2规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容',
+ '3规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容',
+ '4规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容',
+ '5规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容',
+ '6规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容',
+ '7规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容',
+ '8规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容规则内容'
+]
+
+// type: 0=升降序，1=功能按钮；order: 0=升序，1=降序；
+const taskConditions = [{
+ code: 'area',
+ title: '区域'
+}, {
+ code: 'category',
+ title: '品类'
+}, {
+ code: 'distance',
+ title: '距离',
+ type: 0,
+ value: 0,
+}, {
+ code: 'time',
+ title: '时间',
+ type: 0,
+ value: 0,
+}, {
+ code: 'reset',
+ type: 1,
+ title: '重置'
}]
-const myInfo = {
+const tasks = [{
id: 1,
- picUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5000.jpg',
- name: '叮咚任务师傅端',
- entryType: null,
- order: {
- noReservation: 5,
- noSchedule: 6,
- onsiteTimeout: 3,
- onsiteToday: [{
- id: 1,
- work: '灯具维修-灯泡射灯',
- address: '广东省 广州市 白云区 xx街道',
- datetime: '2022-4-22 10:00:00'
- }, {
- id: 2,
- work: '冰箱维修',
- address: '广东省 广州市 天河区 xx街道',
- datetime: '2022-4-22 14:00:00'
- }]
- },
- weekNotice: {
- id: 1,
- title: '您的一笔订单金额已到帐',
- ifHasNoReadNotice: true
- }
-}
+ title: '清洗-油烟机/油烟机全拆洗+空调挂机',
+ tag: ['油烟机全拆洗+空调挂机', '京东店铺'],
+ address: '广东省惠州市惠城区小金口街道兴华街10号',
+ doorTime: '2022-01-17 12:00:00-12:15:00',
+ price: '170.00',
+ expeditedPrice: '70.00',
+ phoneNum: '13455635441',
+ canQuote: true
+}, {
+ id: 2,
+ title: '清洗-油烟机/油烟机全拆洗+空调挂机',
+ tag: ['油烟机全拆洗+空调挂机', '京东店铺'],
+ address: '广东省惠州市惠城区小金口街道兴华街10号',
+ doorTime: '2022-01-17 12:00:00-12:15:00',
+ price: '170.00',
+ expeditedPrice: '70.00',
+ phoneNum: '13455635442',
+ canQuote: true
+}, {
+ id: 3,
+ title: '清洗-油烟机/油烟机全拆洗+空调挂机',
+ tag: ['油烟机全拆洗+空调挂机', '京东店铺'],
+ address: '广东省惠州市惠城区小金口街道兴华街10号',
+ doorTime: '2022-01-17 12:00:00-12:15:00',
+ price: '170.00',
+ expeditedPrice: '70.00',
+ phoneNum: '13455635443',
+ canQuote: true
+}];
-const myTeamInfo = {
- takeRate: 0.5,
- members: [{
- id: '1sdfasdf',
- name: '师傅1',
- avatarUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5001.jpg',
- noteName: '备注名称1',
- phoneNum: '13455444567',
- showEditInput: false
- }, {
- id: 'dfsdfsdfds',
- name: '师傅2',
- avatarUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5002.jpg',
- noteName: '',
- phoneNum: '13655455434',
- showEditInput: true
- }, {
- id: 'sdcec',
- name: '师傅3',
- avatarUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5002.jpg',
- noteName: '',
- phoneNum: '13655455422',
- showEditInput: true
- }]
+const takeCertify = true;
+
+const areaList = [[{
+ id: 100,
+ name: '广东'
+}, {
+ id: 101,
+ name: '海南'
+}], [{
+ id: 200,
+ name: '广州'
+}], [{
+ id: 300,
+ name: '天河'
+}]]
+
+const categoryList = [[{
+ id: 100,
+ name: '电器类'
+}, {
+ id: 101,
+ name: '家政类'
+}], [{
+ id: 200,
+ name: '全部'
+}], [{
+ id: 300,
+ name: '全部'
+}]];
+
+const order = {
+ id: 1,
+ title: '清洗-油烟机/油烟机全拆洗+空调挂机',
+ tag: ['油烟机全拆洗+空调挂机', '京东店铺'],
+ address: '广东省惠州市惠城区小金口街道兴华街10号',
+ doorTime: '2022-01-17 12:00:00-12:15:00',
+ price: '170.00',
+ expeditedPrice: '70.00',
+ phoneNum: '13455635441',
+ contactPerson: '周梅',
+ picUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big6001.jpg',
+ spec: '200*300cm',
+ servType: '空调清洗',
+ serialId: '12233342345223',
+ createTime: '2022-01-17 15:44:32',
+ comments: '上门前10分钟先电话联系'
}
export default {
- moduleBarInfos,
- myInfo,
- myTeamInfo
+ moduleBarInfos,
+ myInfo,
+ myTeamInfo,
+ masterRules,
+ taskConditions,
+ tasks,
+ takeCertify,
+ categoryList,
+ areaList,
+ order
}
diff --git a/pages.json b/pages.json
index b3f0aef..72202b8 100644
--- a/pages.json
+++ b/pages.json
@@ -8,6 +8,15 @@
"pages": [{
"path": "my-team"
}]
+ }, {
+ "root": "pages/demand-center/",
+ "pages": [{
+ "path": "rule"
+ }, {
+ "path": "accept-demand-center"
+ }, {
+ "path": "demand-detail"
+ }]
}],
"globalStyle": {
"navigationStyle": "custom",
diff --git a/pages/area-proxy/my-team.vue b/pages/area-proxy/my-team.vue
index 35496b8..30fa018 100644
--- a/pages/area-proxy/my-team.vue
+++ b/pages/area-proxy/my-team.vue
@@ -39,11 +39,41 @@
-
+
设置扣点
(扣点：{{myTeamInfo.takeRate}}%)
- 提交订单
+ 邀请团队
+
+
+
+
+
+
+ 设置扣点
+
+
+
+
+
+ 设置区域代理扣点可按百分比扣取或金额扣取的方式（建议二选一进行申请）
+
+ 扣点：
+
+ %
+
+
+ 金额：
+
+ 元
+
+
+
+ 取消
+ 提交申请
+
+
@@ -53,7 +83,8 @@
data() {
return {
myTeamInfo: {},
- members: []
+ members: [],
+ isShowTakeRateSet: false
}
},
onLoad() {
@@ -86,6 +117,22 @@
uni.makePhoneCall({
phoneNumber: phoneNum
})
+ },
+ showTakeRateSetModal(e) {
+ this.showModal(e);
+ },
+ showModal(e) {
+ this.isShowTakeRateSet = true
+ },
+ hideModal(e) {
+ this.isShowTakeRateSet = false
+ },
+ applySetTakeRate() {
+ uni.showToast({
+ title: '保存成功',
+ icon: 'success',
+ mask: true
+ })
}
},
}
@@ -94,13 +141,6 @@
diff --git a/pages/demand-center/demand-detail.vue b/pages/demand-center/demand-detail.vue
new file mode 100644
index 0000000..e870b3e
--- /dev/null
+++ b/pages/demand-center/demand-detail.vue
@@ -0,0 +1,129 @@
+
+
+
+
+ 返回
+ 任务详情
+
+
+
+ {{order.title}}
+
+ {{order.price}}
+
+ 加急：{{order.expeditedPrice}}
+
+
+
+
+ {{tagContent}}
+
+
+
+ {{order.address}}
+
+
+
+ {{order.doorTime}}
+
+
+
+ {{order.contactPerson}}
+ {{order.phoneNum}}
+
+
+
+
+
+ 商品信息
+
+
+
+
+ 商品规格：{{order.spec}}
+ 服务类别：{{order.servType}}
+ 订单编码：{{order.serialId}}
+ 订单时间：{{order.createTime}}
+ 备注：{{order.comments}}
+
+
+
+
+
+
+
+
+
+
+ 您还未进行认证
+
+
+ 以后认证
+ 立即认证
+
+
+
+
+
+
+
+
+ 接单成功
+ 请在30分钟内联系客户，预约好上门时间，并在订单中操作排单时间，超时6倍将受平台处罚管理；该订单佣金在完成任务24小时内计入您的账户
+
+
+ 联系客户
+ 继续接单
+
+
+
+
+
+
+
+
+
diff --git a/pages/demand-center/rule.vue b/pages/demand-center/rule.vue
new file mode 100644
index 0000000..52ee729
--- /dev/null
+++ b/pages/demand-center/rule.vue
@@ -0,0 +1,84 @@
+
+
+
+
+ 返回
+ 服务规则
+
+
+
+
+
+
+
+ {{item}}
+
+
+ 总结【约单迅速，上门准时，友好客气，分清责任，不踩红线，流程沟通，验收评价，完单复查，前后确认】
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index bd07c01..febfc03 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -13,7 +13,7 @@
-->
- 师傅规则
+ 师傅规则
@@ -136,17 +136,17 @@
name: '查看详情',
color: 'pink',
cuIcon: 'profile',
- pageUrl: '/pages/area-proxy/my-team'
+ pageUrl: ''
}, {
id: 5,
title: '区域代理',
name: '查看详情',
color: 'olive',
cuIcon: 'group',
- pageUrl: ''
+ pageUrl: '/pages/area-proxy/my-team'
}],
myInfo: {},
- isShowSteer: false,
+ isShowSteer: false
}
},
onReady() {
@@ -155,13 +155,33 @@
methods: {
async loadData() {
this.myInfo = await this.$api.data('myInfo');
- this.isShowSteer = !this.myInfo.entryType;
+ this.isShowSteer = !this.myInfo.entryType;
+ let newServModules = this.servModules.concat();
+ if (this.myInfo.hasCheckedRule) {
+ newServModules[0].pageUrl = '/pages/demand-center/accept-demand-center';
+ } else {
+ let paramObj = {
+ hasCheckedRule: this.myInfo.hasCheckedRule,
+ navigate: true
+ }
+ newServModules[0].pageUrl = '/pages/demand-center/rule?paramObj=' + encodeURIComponent(JSON.stringify(paramObj));
+ }
+ this.servModules = newServModules;
},
chooseEntryType(typeCode) {
},
hideModal(e) {
this.isShowSteer = false
+ },
+ showMasterRule() {
+ let paramObj = {
+ hasCheckedRule: this.myInfo.hasCheckedRule,
+ navigate: false
+ }
+ uni.navigateTo({
+ url: '/pages/demand-center/rule?paramObj=' + encodeURIComponent(JSON.stringify(paramObj))
+ })
}
},
}
@@ -205,13 +225,4 @@
right: -30rpx;
border-radius: 40rpx 0 0 40rpx;
}
-
- .cu-bar .action:first-child {
- margin-left: 30rpx;
- font-size: inherit;
- }
-
- .big-icon {
- font-size: 111rpx;
- }
diff --git a/style/default.css b/style/default.css
index 12893d8..8eb11a4 100644
--- a/style/default.css
+++ b/style/default.css
@@ -127,6 +127,7 @@
transform: translateY(0px);
}
}
+
/* colorui end */
.margin-bottom-with-bar {
margin-bottom: calc(120rpx + constant(safe-area-inset-bottom) / 2);
@@ -226,4 +227,20 @@
.cu-form-group textarea {
margin: 0 0 20rpx 0 !important;
padding: 20rpx !important;
+}
+
+.radius-input {
+ border: 1rpx solid rgba(0, 0, 0, 0.1);
+ border-radius: 10rpx;
+ padding: 10rpx;
+ box-sizing: content-box;
+}
+
+.cu-dialog .cu-bar .action:first-child {
+ margin-left: 30rpx !important;
+ font-size: inherit !important;
+}
+
+.big-icon {
+ font-size: 111rpx !important;
}