diff --git a/components/vertify/vertify-subscribe.vue b/components/vertify/vertify-subscribe.vue
new file mode 100644
index 0000000..82b5ced
--- /dev/null
+++ b/components/vertify/vertify-subscribe.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+ 前往确认是否授权订单进度消息提醒
+
+
+ 取消
+
+ 确定
+
+
+
+
+
+
+
+
+
diff --git a/main.js b/main.js
index 6a618eb..9a5d247 100644
--- a/main.js
+++ b/main.js
@@ -10,12 +10,14 @@ import request from './common/js/request.js';
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 vertifyPhone from '@/components/vertify/vertify-phone.vue';
+import vertifySubscribe from '@/components/vertify/vertify-subscribe.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);
const data = type => {
//模拟异步请求数据
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 48696b9..5774f38 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,7 +9,9 @@
-
+
+
+
@@ -156,7 +158,20 @@
if (res && res.code === 0) {
this.inParam = null;
}
- }
+ }
+ let _this = this;
+ wx.getSetting({
+ withSubscriptions: true,
+ success(res) {
+ console.log(res.subscriptionsSetting)
+ if (!res.subscriptionsSetting.mainSwitch
+ || !res.subscriptionsSetting.itemSettings
+ || res.subscriptionsSetting.itemSettings['yqd3p4qsqn1RiyUb8kO4dPqoGKipRQg_y99nGw0jtLE'] !== 'accept') {
+ // 提示授权订单进度消息提示
+ _this.$refs.vertifySubscribe.showModal();
+ }
+ }
+ })
},
changeCurPageCode(targetPageCode) {
// #ifdef MP
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
index 6473327..d1e391a 100644
--- a/pages/my/my-money-bag.vue
+++ b/pages/my/my-money-bag.vue
@@ -15,8 +15,8 @@
-
-
+
+
{{billItem.createTime}}
@@ -89,7 +89,13 @@
this.openStatusArr = [];
for (let i = 0; i < this.bill.length; i++) {
this.openStatusArr.push('1');
+ this.$nextTick(() => {
+ this.$refs.collapseItem[i].onClick(false, 'init');
+ })
}
+ this.$nextTick(() => {
+ this.$refs.collapse.resize();
+ })
},
async showStatement(e) {
let curIndex = e.currentTarget.dataset.index;
@@ -119,7 +125,7 @@
this.bill = newBill;
// #ifdef MP
this.$nextTick(() => {
- this.$refs.collapse[curIndex].resize();
+ this.$refs.collapse.resize();
uni.hideLoading();
})
// #endif
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 6cd91e5..2956f13 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -511,6 +511,20 @@
},
editAddress(addressInfo) {
console.log(addressInfo)
+ // let res = await this.$request.updateOrder({
+ // id: order.orderMasterId,
+ // orderStatus: status
+ // });
+ // if (res && res.code === 0) {
+ // this.reload();
+ // if (ifRollback) {
+ // uni.showToast({
+ // title: '订单已回滚至服务中状态,请联系师傅',
+ // icon: 'none',
+ // duration: 3000
+ // })
+ // }
+ // }
},
makePhoneCall(phoneNum) {
uni.makePhoneCall({