diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 1df8518..92ba60b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -44,6 +44,7 @@ const user = { localStorage.setItem("loginType", res.loginType); localStorage.setItem("userInfo", JSON.stringify(res.user.user)); localStorage.setItem("mainId", res.mainId); + localStorage.setItem("expireDate", res.expireDate); setToken(res.token, rememberMe); commit("SET_TOKEN", res.token); setUserInfo(res.user, commit); diff --git a/src/views/home/home.vue b/src/views/home/home.vue index 9c58d17..ac6d163 100644 --- a/src/views/home/home.vue +++ b/src/views/home/home.vue @@ -314,6 +314,11 @@ export default { }; }, mounted() { + // 增加首页提示是否账号30天过期 + let date = dayjs(localStorage.getItem("expireDate")).diff(dayjs().format('YYYY-MM-DD'), 'day') + if (date <= 30 && date >= 0) { + this.$alert(`店铺账号有限期至${localStorage.getItem("expireDate")},店铺账号到期剩余${date}天!`, '提示'); + } // this.summaryGet(); this.dateAmount(); this.dateProduct(); diff --git a/src/views/tool/Instead/components/dialogpackage.vue b/src/views/tool/Instead/components/dialogpackage.vue index 6851a66..755f04a 100644 --- a/src/views/tool/Instead/components/dialogpackage.vue +++ b/src/views/tool/Instead/components/dialogpackage.vue @@ -45,9 +45,14 @@ export default { }, methods: { toggleSelection() { - this.$refs.refdialogpackagetable.forEach((a) => { - a.clearSelection(); - }) + try { + this.$refs.refdialogpackagetable.forEach((a) => { + a.clearSelection(); + }) + this.show = false + } catch (error) { + + } }, handleSelectionChange(val, index) { try { @@ -56,7 +61,7 @@ export default { }) this.disabledshow = !this.listdata.proGroupVo.every((element, num) => element.number == this.multipleSelection[num].length); } catch (error) { } - + this.$set(this.listdata.proGroupVo, index, { ...this.listdata.proGroupVo[index], alertshow: this.listdata.proGroupVo[index].number != this.multipleSelection[index].length ? true : false }); }, confirm() { @@ -73,6 +78,11 @@ export default { }) } catch (error) { } this.multipleSelection = [] + // 不用选套餐 + if (item.groupType == 0) { + this.$emit("dialogpackageconfirm", this.listdata, [item.proGroupVo[0].goods]); + return false; + } this.disabledshow = true console.log(this.listdata, this.multipleSelection); this.show = true;