diff --git a/common/js/request.js b/common/js/request.js
index 5581436..963a43e 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -12,7 +12,7 @@ export default {
})
// request 触发前拼接 url
args.url = 'https://www.opsoul.com:8881' + args.url;
- // args.url = 'http://192.168.2.12:80' + args.url;
+ // args.url = 'http://192.168.2.54:80' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url;
if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
args.data.deptId = globalData.deptId;
diff --git a/pages/index/home.vue b/pages/index/home.vue
index fb1680f..328b6e6 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -25,10 +25,10 @@
-
{{searchInfo.area && searchInfo.area.length ? searchInfo.area[1].areaName : areaList[1][0].areaName}}
-
+
diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue
index 1420484..c9c0a96 100644
--- a/pages/index/my-home.vue
+++ b/pages/index/my-home.vue
@@ -348,6 +348,9 @@
}, {
type: 5,
name: '已完成'
+ }, {
+ type: 6,
+ name: '已取消'
}
],
servOrderType: 0,
diff --git a/pages/my/b-account-bind.vue b/pages/my/b-account-bind.vue
index b3ada9a..47ef42c 100644
--- a/pages/my/b-account-bind.vue
+++ b/pages/my/b-account-bind.vue
@@ -29,7 +29,7 @@
身份证号
-
+
手机号
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index 712afa8..049c4fc 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -4,7 +4,18 @@
返回
我的订单
-
+
+
+
+
+
+
+
+
+
+
+
-->
- {{servDetail.address}}
+ {{servDetail.address}}
+
{{servDetail.workerName}}
- {{servDetail.workerPhone}}
+ {{servDetail.workerPhone}}
+
@@ -102,7 +104,7 @@
师傅：{{item.workerName}}
- 联系方式：{{item.workerPhone}}
+ 联系方式：{{item.workerPhone}}
预约时间：{{item.expectTimeStartFront + '~' + item.expectTimeEndFront}}
预约时间：{{item.expectTimeStartFront}}
上门时间：{{item.workBeginTime}}
@@ -363,9 +365,19 @@
if (options && options.order) {
this.order = JSON.parse(decodeURIComponent(options.order));
}
- this.loadData(this.order.orderMasterId);
+ this.loadData(this.order.orderMasterId);
+ this.bindEvent();
+ },
+ onUnload() {
+ this.offBindEvent();
},
- methods: {
+ methods: {
+ bindEvent() {
+ uni.$on(this.$globalFun.CHOOSE_ADDRESS, this.editAddress);
+ },
+ offBindEvent() {
+ uni.$off(this.$globalFun.CHOOSE_ADDRESS);
+ },
async loadData(orderMasterId) {
// this.servDetail = await this.$api.data('servDetail');
// this.finishList4Show = this.servDetail.finishRecord;
@@ -491,7 +503,20 @@
duration: 1000
})
}
- },
+ },
+ showAddress2Choose() {
+ uni.navigateTo({
+ url: '/pages/my/my-address?chooseMode=true'
+ })
+ },
+ editAddress(addressInfo) {
+ console.log(addressInfo)
+ },
+ makePhoneCall(phoneNum) {
+ uni.makePhoneCall({
+ phoneNumber: phoneNum
+ })
+ }
}
}
diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue
index 6923a86..92204f8 100644
--- a/pages/product/product-detail.vue
+++ b/pages/product/product-detail.vue
@@ -15,8 +15,8 @@
详情
-
-
+
+
@@ -65,6 +65,13 @@
{{productDetail.servActivity}}
+
+
+
+ {{productDetail.parGoodsCategoryName}}
+ /
+
+ {{productDetail.deptGoodsCategoryName}}
{{productDetail.goodsName}}
@@ -125,6 +132,16 @@
{{productDetail.areaDesc}}
+
+
+
+
+
+
+ 请核对下单地址与服务区域相匹配
+
+
+