diff --git a/src/views/bl/massage/massagePackage.vue b/src/views/bl/massage/massagePackage.vue index a030151..25867de 100644 --- a/src/views/bl/massage/massagePackage.vue +++ b/src/views/bl/massage/massagePackage.vue @@ -1187,6 +1187,7 @@ export default { labels: "",//标签 city: "",//城市 createTime: "",//创建时间 + fwxmtype:"",//服务项目类型 104服务套餐 page: 1, limit: 10, dialogFormVisibleSales: false, @@ -1808,7 +1809,9 @@ export default { }, showDetailView(row){ + console.log(`🚀 ~ showDetailView ~ row:`, row) this.mainId = row.id; + this.fwxmtype = row.type; this.handleSelectDetail(); this.dialogFormVisibleDetail = true; }, @@ -2049,26 +2052,38 @@ export default { }, handleAddMassage(){ - this.title = ""; - this.status = 1; - this.sales = "0"; - this.price = ""; - this.oldPrice = ""; - this.massageTypeId = ""; - this.massageImg = ""; - this.isSex = 0; - this.duration = ""; - this.applyPeople = ""; - this.contentImg = []; - this.content = ""; - this.city = ""; - this.labelsArr = []; - this.storeAddre = "请选择城市"; - this.type = ""; - this.jianjie = ""; - this.serviceCount = 1; - this.intervalDays = 0; - this.dialogFormVisibleAddMassage = true; + + var list = this.detailTableData.list; + var fwxmtype = this.fwxmtype; + if(fwxmtype==104){ + this.title = ""; + this.status = 1; + this.sales = "0"; + this.price = ""; + this.oldPrice = ""; + this.massageTypeId = ""; + this.massageImg = ""; + this.isSex = 0; + this.duration = ""; + this.applyPeople = ""; + this.contentImg = []; + this.content = ""; + this.city = ""; + this.labelsArr = []; + this.storeAddre = "请选择城市"; + this.type = ""; + this.jianjie = ""; + this.serviceCount = 1; + this.intervalDays = 0; + this.dialogFormVisibleAddMassage = true; + }else{ + this.$notify({ + title: "提示", + duration: 1800, + message: "只有【服务套餐】可以配置多条服务项目!", + type: "warning", + }); + } }, //提交新增服务项目 @@ -2238,10 +2253,22 @@ export default { }, showMassageView(){ - this.serviceCount = 1; - this.intervalDays = 0; - this.handleSelectMassage(); - this.dialogFormVisibleMassageList = true; + + var list = this.detailTableData.list; + var fwxmtype = this.fwxmtype; + if(fwxmtype==104){ + this.serviceCount = 1; + this.intervalDays = 0; + this.handleSelectMassage(); + this.dialogFormVisibleMassageList = true; + }else{ + this.$notify({ + title: "提示", + duration: 1800, + message: "只有【服务套餐】可以配置多条服务项目!", + type: "warning", + }); + } }, handleSelectMassage(){ diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 23b82c8..0dded59 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -528,41 +528,41 @@ export default { this.userId = window.localStorage.getItem('userId'); this.ringOrderId = window.localStorage.getItem('ringOrderId'); - this.chatNumJl = setInterval(() => { - this.dataSelect() - }, 6000) - this.chatNumQy = setInterval(() => { - this.dataSelectPy() - }, 6000) - this.chatNumJjqz = setInterval(() => { - this.dataSelectJjqz() - }, 6000) - - this.chatNumYh = setInterval(() => { - this.dataSelectYh() - }, 6000) + // this.chatNumJl = setInterval(() => { + // this.dataSelect() + // }, 6000) + // this.chatNumQy = setInterval(() => { + // this.dataSelectPy() + // }, 6000) + // this.chatNumJjqz = setInterval(() => { + // this.dataSelectJjqz() + // }, 6000) + // this.chatNumYh = setInterval(() => { + // this.dataSelectYh() + // }, 6000) // 目前的逻辑是只有客服账号才有订单相关(新订单、警告订单、超时订单)的提示 - if ((this.userId && this.ringOrderId) && (this.userId == this.ringOrderId)) { - this.chatNumJg = setInterval(() => { - this.dataSelectJg() - }, 6000) - this.chatNumCs = setInterval(() => { - this.dataSelectCs() - }, 6000) - this.chatNumXdd = setInterval(() => { - this.dataSelectXdd() - }, 3000) - } + // if ((this.userId && this.ringOrderId) && (this.userId == this.ringOrderId)) { + // this.chatNumJg = setInterval(() => { + // this.dataSelectJg() + // }, 6000) + // this.chatNumCs = setInterval(() => { + // this.dataSelectCs() + // }, 6000) + // this.chatNumXdd = setInterval(() => { + // this.dataSelectXdd() + // }, 3000) + // } }, beforeDestroy() { // clearInterval(this.chatNum) - clearInterval(this.chatNumJl); - clearInterval(this.chatNumQy); - clearInterval(this.chatNumJjqz); - clearInterval(this.chatNumYh); - clearInterval(this.chatNumJg); - clearInterval(this.chatNumCs); - clearInterval(this.chatNumXdd); + + // clearInterval(this.chatNumJl); + // clearInterval(this.chatNumQy); + // clearInterval(this.chatNumJjqz); + // clearInterval(this.chatNumYh); + // clearInterval(this.chatNumJg); + // clearInterval(this.chatNumCs); + // clearInterval(this.chatNumXdd); } }