diff --git a/pages/index/game/myOrder.vue b/pages/index/game/myOrder.vue index b22f21d..142f79a 100644 --- a/pages/index/game/myOrder.vue +++ b/pages/index/game/myOrder.vue @@ -21,8 +21,7 @@ --> 适用说明 - - {{order.content}} + diff --git a/pages/index/index.vue b/pages/index/index.vue index 8d5afaa..c19b234 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -543,6 +543,7 @@ export default { isCashDeposit: 0, loglattime: '', loglataddress: '', + isJsjdsfxywl:false,//技师接单是否需要物料 switchList: [{ title: '在线', value: true @@ -686,6 +687,14 @@ export default { } }); // this.getcity() + + // 理疗师端首页是否弹框 380 + this.$Request.get('/app/common/type/448').then(res => { + console.log('res448--->',res); + this.isJsjdsfxywl = res.data.value; + }); + + }, onShow() { console.log(this.isLogin); @@ -720,7 +729,7 @@ export default { if (this.userId) { console.log(this.userId, "dwdwadwdawd============>"); this.isLogin = true - // this.getJinRiOrder(); + this.getJinRiOrder(); this.getUserInfo() this.getFb() @@ -983,9 +992,8 @@ export default { }); }, stateSave() { - let materialPackageCountFlag = this.homeMaterialPackageList.some((item) => item.residue <= item - .materialMinimum); - if (!this.isTrue && materialPackageCountFlag) { + let materialPackageCountFlag = this.homeMaterialPackageList.some((item) => item.residue <= item.materialMinimum); + if (!this.isTrue && materialPackageCountFlag && this.isJsjdsfxywl == '是') { this.$queue.showToast("当前剩余物料包数量不足,请检查"); return; }