diff --git a/components/vertify/vertify-settingSubscribe.vue b/components/vertify/vertify-settingSubscribe.vue new file mode 100644 index 0000000..a407ab3 --- /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 5c478f8..369617f 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: ['yqd3p4qsqn1RiyUb8kO4dPqoGKipRQg_y99nGw0jtLE', 'gFoPAYF4J6Y_O5OzzNUbvMxTrsAS7aUWffdNH42xhzM'], complete(res) { diff --git a/main.js b/main.js index fe3f412..bf7bdf9 100644 --- a/main.js +++ b/main.js @@ -17,7 +17,8 @@ import vertifyCertify from '@/components/vertify/vertify-certify.vue'; import vertifyBusinessCertify from '@/components/vertify/vertify-business-certify.vue'; import vertifyWorkerType from '@/components/vertify/vertify-worker-type.vue'; import vertifyBankBind from '@/components/vertify/vertify-bank-bind.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); @@ -28,6 +29,7 @@ Vue.component('vertify-worker-type', vertifyWorkerType); Vue.component('vertify-bank-bind', vertifyBankBind); Vue.component('vertify-business-certify', vertifyBusinessCertify); Vue.component('vertify-subscribe', vertifySubscribe); +Vue.component('vertify-settingSubscribe', vertifySettingSubscribe); const data = type => { //模拟异步请求数据 diff --git a/manifest.json b/manifest.json index fbe9b14..81c180c 100644 --- a/manifest.json +++ b/manifest.json @@ -5,10 +5,10 @@ "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, - "networkTimeout": { - "request": 600000, - "uploadFile": 600000 - }, + "networkTimeout" : { + "request" : 600000, + "uploadFile" : 600000 + }, "app-plus" : { /* 5+App特有相关 */ "usingComponents" : true, diff --git a/pages/index/index.vue b/pages/index/index.vue index a25add2..285d0ae 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -12,7 +12,8 @@ - + + @@ -56,17 +57,21 @@ this.moduleBarInfos = await this.$api.data('moduleBarInfos'); let curUserInfo = this.$request.getCurUserInfo(); let _this = this; + if (curUserInfo && curUserInfo.phone && curUserInfo.type != null) { wx.getSetting({ withSubscriptions: true, success(res) { console.log(res.subscriptionsSetting) - if (!res.subscriptionsSetting.mainSwitch - || !res.subscriptionsSetting.itemSettings - || res.subscriptionsSetting.itemSettings['yqd3p4qsqn1RiyUb8kO4dPqoGKipRQg_y99nGw0jtLE'] !== 'accept' - || res.subscriptionsSetting.itemSettings['gFoPAYF4J6Y_O5OzzNUbvMxTrsAS7aUWffdNH42xhzM'] !== 'accept') { + if (res.subscriptionsSetting.mainSwitch && (!res.subscriptionsSetting.itemSettings + || !res.subscriptionsSetting.itemSettings['yqd3p4qsqn1RiyUb8kO4dPqoGKipRQg_y99nGw0jtLE'] + || !res.subscriptionsSetting.itemSettings['gFoPAYF4J6Y_O5OzzNUbvMxTrsAS7aUWffdNH42xhzM'])) { // 提示授权订单进度消息提示 _this.$refs.vertifySubscribe.showModal(); + } else if (!res.subscriptionsSetting.mainSwitch + || res.subscriptionsSetting.itemSettings['yqd3p4qsqn1RiyUb8kO4dPqoGKipRQg_y99nGw0jtLE'] !== 'accept' + || res.subscriptionsSetting.itemSettings['gFoPAYF4J6Y_O5OzzNUbvMxTrsAS7aUWffdNH42xhzM'] !== 'accept') { + _this.$refs.vertifySettingSubscribe.showModal(); } } }) diff --git a/pages/order-manage/modal/agree-after-sale.vue b/pages/order-manage/modal/agree-after-sale.vue index 233c963..231b0bb 100644 --- a/pages/order-manage/modal/agree-after-sale.vue +++ b/pages/order-manage/modal/agree-after-sale.vue @@ -48,9 +48,11 @@ 取消 确认 + @click="showNotice">确认 + + @@ -80,7 +82,7 @@ uni.$emit(this.$globalFun.HIDE_MODAL, e); }, resetData() { - this.data = null; + // this.data = null; this.agreedRefund = null; this.reasonType = null; this.remark = null; @@ -88,6 +90,31 @@ changeReasonRadio(e) { this.reasonType = e.detail.value; }, + showNotice(e) { + if (this.data.drawCashStatus != null && this.data.drawCashStatus >= 1) { + this.$refs.notice.showModal(); + } else { + this.submit(e); + } + }, + noticeConfirm() { + this.submit({ + currentTarget: { + dataset: { + modal: 'agreeAfterSale' + } + } + }); + }, + noticeCancel() { + this.hideModal({ + currentTarget: { + dataset: { + modal: 'agreeAfterSale' + } + } + }); + }, async submit(e) { let agreedRefund = this.agreedRefund; if (!agreedRefund && this.data.afterServiceRecordList[0].refund != null) { diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index 88f6feb..2f2b072 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -192,7 +192,7 @@ --> - 贷款分账成功：{{order.arrivalTime}} + 货款分账成功：{{order.arrivalTime}} @@ -269,7 +269,19 @@ 退款原因： - {{afterServiceRecord.customerReason}} + 上门/服务不守时 + 态度不友好，无法继续 + 服务效果差，未达到合格 + 技能水平问题，未妥善完成 + 要求加费用，费用不合理 + 订单拖太久了 + 超了些服务内容，师傅不接受 + 客户/我时间不方便了 + 客户/我已让别的师傅服务了 + + + 具体原因： + {{afterServiceRecord.customerReason}} @@ -289,7 +301,19 @@ 售后原因： - {{afterServiceRecord.customerReason}} + 上门/服务不守时 + 态度不友好，无法继续 + 服务效果差，未达到合格 + 技能水平问题，未妥善完成 + 要求加费用，费用不合理 + 订单拖太久了 + 超了些服务内容，师傅不接受 + 客户/我时间不方便了 + 客户/我已让别的师傅服务了 + + + 具体原因： + {{afterServiceRecord.customerReason}} 完成操作：点击“操作处理”提交由客服回访！ diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue index 84ed57b..0373818 100644 --- a/pages/order-manage/serv-detail.vue +++ b/pages/order-manage/serv-detail.vue @@ -174,7 +174,19 @@ 退款原因： - {{afterServiceRecord.customerReason}} + 上门/服务不守时 + 态度不友好，无法继续 + 服务效果差，未达到合格 + 技能水平问题，未妥善完成 + 要求加费用，费用不合理 + 订单拖太久了 + 超了些服务内容，师傅不接受 + 客户/我时间不方便了 + 客户/我已让别的师傅服务了 + + + 具体原因： + {{afterServiceRecord.customerReason}} 售后原因： - {{afterServiceRecord.customerReason}} + 上门/服务不守时 + 态度不友好，无法继续 + 服务效果差，未达到合格 + 技能水平问题，未妥善完成 + 要求加费用，费用不合理 + 订单拖太久了 + 超了些服务内容，师傅不接受 + 客户/我时间不方便了 + 客户/我已让别的师傅服务了 + + + 具体原因： + {{afterServiceRecord.customerReason}} 退款原因： - {{afterServiceRecord.customerReason}} + 上门/服务不守时 + 态度不友好，无法继续 + 服务效果差，未达到合格 + 技能水平问题，未妥善完成 + 要求加费用，费用不合理 + 订单拖太久了 + 超了些服务内容，师傅不接受 + 客户/我时间不方便了 + 客户/我已让别的师傅服务了 + + + 具体原因： + {{afterServiceRecord.customerReason}} 售后原因： - {{afterServiceRecord.customerReason}} + 上门/服务不守时 + 态度不友好，无法继续 + 服务效果差，未达到合格 + 技能水平问题，未妥善完成 + 要求加费用，费用不合理 + 订单拖太久了 + 超了些服务内容，师傅不接受 + 客户/我时间不方便了 + 客户/我已让别的师傅服务了 + + + 具体原因： + {{afterServiceRecord.customerReason}}