diff --git a/common/js/request.js b/common/js/request.js
index 0e5345c..e3a6698 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -13,8 +13,8 @@ export default {
})
let userInfo = _this.getCurUserInfo();
// request 触发前拼接 url
- args.url = 'https://www.opsoul.com' + args.url;
- // args.url = 'http://127.0.0.1:80' + args.url;
+ // args.url = 'https://www.opsoul.com' + args.url;
+ args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url;
if (!args.data) {
@@ -382,6 +382,14 @@ export default {
})
return res[1].data;
},
+ async getOrderMasterDetail(params = {}) {
+ let res = await uni.request({
+ url: '/order/master/app/detail',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
+ },
async updateOrder(params = {}) {
let res = await uni.request({
url: '/order/master/editOrderMaster',
diff --git a/components/goods-card/product-picked.vue b/components/goods-card/product-picked.vue
index 953335b..460b2b9 100644
--- a/components/goods-card/product-picked.vue
+++ b/components/goods-card/product-picked.vue
@@ -12,8 +12,7 @@
{{item[valFieldArr[0]]}}
- {{item[valFieldArr[1]]}}
- {{item[valFieldArr[2]]}}
+ {{item[item1]}}
diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue
index 7aaa586..de30170 100644
--- a/pages/demand-center/accept-demand-center.vue
+++ b/pages/demand-center/accept-demand-center.vue
@@ -72,14 +72,14 @@
+ @click="showModal($event, task)">转发
+ @click="showModal($event, task)">加价
+ @click="showDemandDetail($event, task)">查看
+ data-certify-modal="showTakeCertifiedModal" @click="takeTask($event, task)">接单
@@ -220,16 +220,18 @@
areaList: [],
areaMultiIndex: [0, 0, 0],
categoryList: [],
- categoryMultiIndex: [0, 0, 0]
+ categoryMultiIndex: [0, 0, 0],
+ curUserInfo: {}
}
- },
- onLoad() {
- this.loadData();
+ },
+ onShow() {
+ this.loadData();
},
methods: {
async loadData() {
// this.tasks = await this.$api.data('tasks');
- this.loadMasterOrderPage();
+ this.curUserInfo = this.$request.getCurUserInfo();
+ this.reloadMasterOrderPage();
this.takeCertify = await this.$api.data('takeCertify');
this.areaList = await this.$api.data('areaList');
this.categoryList = await this.$api.data('categoryList');
@@ -305,31 +307,44 @@
}
this.taskConditions[this.tabCur].value = chosenCategory;
},
- showDemandDetail(e, taskIndex) {
+ showDemandDetail(e, task) {
let paramObj = {
- orderId: this.tasks[taskIndex].id
+ orderMasterId: task.orderMasterId
}
uni.navigateTo({
url: '/pages/demand-center/demand-detail?paramObj=' + encodeURIComponent(JSON.stringify(
paramObj))
})
},
- takeTask(e, taskIndex) {
- if (this.takeCertify) {
- // 已认证可直接接单
- e.currentTarget.dataset.modal = e.currentTarget.dataset.takeModal;
- this.showModal(e, taskIndex);
- } else {
- // 未认证需提示前往认证
+ async takeTask(e, task) {
+ if (this.curUserInfo.status !== 0 || this.curUserInfo.type !== 0) {
+ // 未认证需提示前往认证
e.currentTarget.dataset.modal = e.currentTarget.dataset.certifyModal;
- this.showModal(e, taskIndex);
- }
+ } else {
+ // 已认证可直接接单
+ let res = await this.$request.updateOrder({
+ workerId: this.curUserInfo.workerId,
+ id: task.orderMasterId
+ });
+ if (res && res.code === 0) {
+ e.currentTarget.dataset.modal = e.currentTarget.dataset.takeModal;
+ this.reloadMasterOrderPage();
+ }
+ }
+ this.showModal(e, task);
},
- contactCustomer() {
- // 跳转到未约未排
+ contactCustomer(e) {
+ uni.makePhoneCall({
+ phoneNumber: this.curTask.customerPhone
+ })
+ },
+ goToCertify() {
+ uni.navigateTo({
+ url: '/pages/my/master-settled-info'
+ })
},
- showModal(e, taskIndex) {
- this.curTask = this.tasks[taskIndex];
+ showModal(e, task) {
+ this.curTask = task;
this[e.currentTarget.dataset.modal] = true;
},
hideModal(e) {
diff --git a/pages/demand-center/demand-detail.vue b/pages/demand-center/demand-detail.vue
index e870b3e..0d8fdcc 100644
--- a/pages/demand-center/demand-detail.vue
+++ b/pages/demand-center/demand-detail.vue
@@ -7,15 +7,15 @@
- {{order.title}}
+ {{order.goodsName}}
- {{order.price}}
+ {{order.totalMoney}}
加急：{{order.expeditedPrice}}
-
+
{{tagContent}}
@@ -24,12 +24,12 @@
- {{order.doorTime}}
+ {{order.expectTimeStart + '~' + order.expectTimeEnd}}
- {{order.contactPerson}}
- {{order.phoneNum}}
+ {{order.customerName}}
+ {{order.customerPhone}}
@@ -39,12 +39,15 @@
-
- 商品规格：{{order.spec}}
- 服务类别：{{order.servType}}
- 订单编码：{{order.serialId}}
+
+
+
+
+
+
+ 订单编码：{{order.orderMasterCode}}
订单时间：{{order.createTime}}
- 备注：{{order.comments}}
+ 备注：{{order.remark}}
@@ -82,31 +85,53 @@
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index 4c9d78d..0f9d7d6 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -95,12 +95,27 @@
请您选择入驻类型！到家服务类请选择-服务商；商品销售类请选择-配件商。
- 配件商
+ 配件商
服务商
+ data-modal="isShowSteer" @click="chooseEntryType(0)">服务商
+
+
+
+
+
+
+ 您还未进行认证
+
+
+ 以后认证
+ 立即认证
+
+
@@ -186,7 +201,8 @@
myInfo: {},
isShowSteer: false,
isAuthWxLoginModal: false,
- isAuthWxPhoneModal: false
+ isAuthWxPhoneModal: false,
+ showTakeCertifiedModal: false
}
},
onReady() {
@@ -209,8 +225,10 @@
this.curUserInfo = curUserInfo;
// 是否展示选择入驻类型的模态框
- this.isShowSteer = this.curUserInfo.type == null || this.curUserInfo.status !== 0 ? true : false;
-
+ this.isShowSteer = this.curUserInfo.type == null ? true : false;
+ // 是否展示认证提示模态框
+ this.showTakeCertifiedModal = this.curUserInfo.type === 0 && this.curUserInfo.status !== 0 ? true : false;
+
this.myInfo = await this.$api.data('myInfo');
// this.isShowSteer = !this.myInfo.entryType;
let newServModules = this.servModules.concat();
@@ -244,7 +262,7 @@
}
},
hideModal(e) {
- this.isShowSteer = false
+ this[e.currentTarget.dataset.modal] = false;
},
showMasterRule() {
let paramObj = {