Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz

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);

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();

src/views/tool/Instead/components/dialogpackage.vue

@@ -45,9 +45,14 @@ export default {
     },
     methods: {
         toggleSelection() {
-            this.$refs.refdialogpackagetable.forEach((a) => {
+            try {
-                a.clearSelection();
+                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;