diff --git a/components/vertify/vertify-settingSubscribe.vue b/components/vertify/vertify-settingSubscribe.vue
new file mode 100644
index 0000000..a338898
--- /dev/null
+++ b/components/vertify/vertify-settingSubscribe.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+ 检测到订单消息未订阅,是否前往修改订阅设置?
+
+
+ 取消
+
+ 确定
+
+
+
+
+
+
+
+
+
diff --git a/components/vertify/vertify-subscribe.vue b/components/vertify/vertify-subscribe.vue
index 82b5ced..12ecafe 100644
--- a/components/vertify/vertify-subscribe.vue
+++ b/components/vertify/vertify-subscribe.vue
@@ -4,7 +4,7 @@
- 前往确认是否授权订单进度消息提醒
+ 是否授权订单进度消息提醒
取消
@@ -34,7 +34,7 @@
confirm(e) {
this.hideModal();
// 提示订阅消息
- uni.requestSubscribeMessage({
+ wx.requestSubscribeMessage({
tmplIds: ['JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM'],
complete(res) {
console.log(res)
diff --git a/main.js b/main.js
index 9a5d247..06e015e 100644
--- a/main.js
+++ b/main.js
@@ -11,13 +11,15 @@ import dateUtil from './common/js/dateUtil.js';
import globalData from './common/js/globalData.js';
import vertifyLogin from '@/components/vertify/vertify-login.vue';
import vertifyPhone from '@/components/vertify/vertify-phone.vue';
-import vertifySubscribe from '@/components/vertify/vertify-subscribe.vue';
+import vertifySubscribe from '@/components/vertify/vertify-subscribe.vue';
+import vertifySettingSubscribe from '@/components/vertify/vertify-settingSubscribe.vue';
Vue.component('cu-custom', CuCustom)
Vue.component('confirm-modal', ConfirmModal);
Vue.component('vertify-login', vertifyLogin);
Vue.component('vertify-phone', vertifyPhone);
Vue.component('vertify-subscribe', vertifySubscribe);
+Vue.component('vertify-settingSubscribe', vertifySettingSubscribe);
const data = type => {
//模拟异步请求数据
diff --git a/manifest.json b/manifest.json
index cf66f7b..ad9eade 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,6 +61,6 @@
"desc" : "因涉及上门家政服务,需获取地理位置"
}
},
- "requiredPrivateInfos": ["getLocation"]
+ "requiredPrivateInfos" : [ "getLocation" ]
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 12c1c35..1f7f57c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -11,7 +11,8 @@
-
+
+
@@ -160,15 +161,19 @@
}
}
let _this = this;
+
+ // 提示授权订单进度消息提示
wx.getSetting({
withSubscriptions: true,
success(res) {
console.log(res.subscriptionsSetting)
- if (!res.subscriptionsSetting.mainSwitch
- || !res.subscriptionsSetting.itemSettings
- || res.subscriptionsSetting.itemSettings['JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM'] !== 'accept') {
+ if (res.subscriptionsSetting.mainSwitch && (!res.subscriptionsSetting.itemSettings
+ || !res.subscriptionsSetting.itemSettings['JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM'])) {
// 提示授权订单进度消息提示
_this.$refs.vertifySubscribe.showModal();
+ } else if (!res.subscriptionsSetting.mainSwitch
+ || res.subscriptionsSetting.itemSettings['JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM'] !== 'accept') {
+ _this.$refs.vertifySettingSubscribe.showModal();
}
}
})
diff --git a/pages/my/components/modal/apply-after-service.vue b/pages/my/components/modal/apply-after-service.vue
index fcbe771..9f0c172 100644
--- a/pages/my/components/modal/apply-after-service.vue
+++ b/pages/my/components/modal/apply-after-service.vue
@@ -66,10 +66,6 @@
myUniCombox
},
props: {
- show: {
- type: Boolean,
- default: false
- },
data: {
type: Object,
default: {}
@@ -79,6 +75,36 @@
return {
show: false,
afterServiceType: 2, // 1为申请退款,2为发起售后
+ customerReasonTypeArr: [
+ {
+ code: 1,
+ name: '上门/服务不守时'
+ },{
+ code: 2,
+ name: '态度不友好,无法继续'
+ },{
+ code: 3,
+ name: '服务效果差,未达到合格'
+ },{
+ code: 4,
+ name: '技能水平问题,未妥善完成'
+ },{
+ code: 5,
+ name: '要求加费用,费用不合理'
+ },{
+ code: 6,
+ name: '订单拖太久了'
+ },{
+ code: 7,
+ name: '超了些服务内容,师傅不接受'
+ },{
+ code: 8,
+ name: '客户/我时间不方便了'
+ },{
+ code: 9,
+ name: '客户/我已让别的师傅服务了'
+ }
+ ],
customerReasonType: null,
refund: null,
remark: null,
@@ -188,7 +214,7 @@
})
})
let res = await this.$request.addAfterServiceRecord({
- customerReasonType: this.customerReasonType,
+ customerReasonType: this.customerReasonType.code,
customerReason: this.remark,
orderDetailId: this.detailObj.orderDetailId,
operType: this.afterServiceType,
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 6905104..5207153 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -169,10 +169,22 @@
退款金额:
{{afterServiceRecord.refund}}
+
+
+ 退款原因:
+ 上门/服务不守时
+ 态度不友好,无法继续
+ 服务效果差,未达到合格
+ 技能水平问题,未妥善完成
+ 要求加费用,费用不合理
+ 订单拖太久了
+ 超了些服务内容,师傅不接受
+ 客户/我时间不方便了
+ 客户/我已让别的师傅服务了
- 退款原因:
- {{afterServiceRecord.customerReason}}
+ 具体原因:
+ {{afterServiceRecord.customerReason}}
售后原因:
- {{afterServiceRecord.customerReason}}
+ 上门/服务不守时
+ 态度不友好,无法继续
+ 服务效果差,未达到合格
+ 技能水平问题,未妥善完成
+ 要求加费用,费用不合理
+ 订单拖太久了
+ 超了些服务内容,师傅不接受
+ 客户/我时间不方便了
+ 客户/我已让别的师傅服务了
+
+
+ 具体原因:
+ {{afterServiceRecord.customerReason}}
完成操作:点击“处理完成”提交由客服回访!
@@ -267,7 +291,7 @@
+ @click="showNotice(item)">同意
@@ -335,7 +359,8 @@
+ @confirmFeedback="loadData(servDetail.orderMasterId)" @cancel="blurCurOrder">
+
@@ -362,7 +387,8 @@
servedValFields: ['standardName', 'standardNum', 'serverNum'],
process: '',
ifShowPageMeta: false,
- sendUrgentMsgModal: false
+ sendUrgentMsgModal: false,
+ curDetailOrder: null
}
},
onLoad(options) {
@@ -534,6 +560,17 @@
uni.makePhoneCall({
phoneNumber: phoneNum
})
+ },
+ showNotice(detailOrder) {
+ if (detailOrder.drawCashStatus != null && detailOrder.drawCashStatus >= 1) {
+ this.curDetailOrder = detailOrder;
+ this.$refs.notice.showModal();
+ } else {
+ this.afterServiceFinalCheck(detailOrder.afterServiceRecordList[0].id, 1)
+ }
+ },
+ noticeCancel() {
+ this.curDetailOrder = null;
}
}
}