diff --git a/components/vertify/vertify-subscribe.vue b/components/vertify/vertify-subscribe.vue
new file mode 100644
index 0000000..5c478f8
--- /dev/null
+++ b/components/vertify/vertify-subscribe.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+ 前往确认是否授权订单进度消息提醒
+
+
+ 取消
+
+ 确定
+
+
+
+
+
+
+
+
+
diff --git a/main.js b/main.js
index 4780da3..fe3f412 100644
--- a/main.js
+++ b/main.js
@@ -16,7 +16,8 @@ import vertifyPhone from '@/components/vertify/vertify-phone.vue';
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 vertifyBankBind from '@/components/vertify/vertify-bank-bind.vue';
+import vertifySubscribe from '@/components/vertify/vertify-subscribe.vue';
Vue.component('cu-custom', CuCustom)
Vue.component('confirm-modal', ConfirmModal);
@@ -26,6 +27,7 @@ Vue.component('vertify-certify', vertifyCertify);
Vue.component('vertify-worker-type', vertifyWorkerType);
Vue.component('vertify-bank-bind', vertifyBankBind);
Vue.component('vertify-business-certify', vertifyBusinessCertify);
+Vue.component('vertify-subscribe', vertifySubscribe);
const data = type => {
//模拟异步请求数据
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 79d8aea..a25add2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -10,7 +10,9 @@
-
+
+
+
@@ -51,7 +53,24 @@
// console.log('高度:' + res.screenHeight)
// }
// })
- this.moduleBarInfos = await this.$api.data('moduleBarInfos');
+ 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') {
+ // 提示授权订单进度消息提示
+ _this.$refs.vertifySubscribe.showModal();
+ }
+ }
+ })
+ }
},
reloadForwardPage() {
this.getCurPageInfo({
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
index a47b0d1..3517acd 100644
--- a/pages/my/my-money-bag.vue
+++ b/pages/my/my-money-bag.vue
@@ -32,7 +32,7 @@
-
+
{{billItem.createTime}}
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index eb35449..4ba84fd 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -1070,18 +1070,7 @@
},
acceptOrder(id, code, status, funName) {
let _this = this;
- // 提示订阅消息
- uni.requestSubscribeMessage({
- tmplIds: ['Yd2PJIdgBhEadi3EkAGyS4DiFp1Rd5ErsEs_jEt-HX4'],
- complete(res) {
- _this.noticeMsg({
- remind: '接单提醒',
- name: _this.curUserInfo.name,
- orderId: code
- });
- _this.updateOrderStatus(id, status, funName);
- }
- })
+ _this.updateOrderStatus(id, status, funName);
},
async noticeMsg(params = {}) {
this.$request.noticeMsg({