src/router/index.js

@@ -143,24 +143,14 @@ router.beforeEach((to, from, next) => {
             });
           console.log(data.data.markets);
         } else if (data.data.shopId) {
-          // 存在单个店铺或云店
+          // 存在单个店铺
-          if(data.data.marketId) {
+          store.commit("userData/setState", {
-            store.commit("userData/setState", {
+            isMerchant: true,
-              isMerchant: true,
+            marketList: [],
-              marketList: [],
+            storeList: [],
-              storeList: [],
+            marketId: data.data.marketId,
-              marketId: data.data.marketId,
+            shopId: data.data.shopId,
-              shopId: data.data.shopId,
+          });
-            });
-          } else {
-            store.commit("userData/setState", {
-              isMerchant: true,
-              marketList: [],
-              storeList: [],
-              marketId: -1,
-              shopId: data.data.shopId,
-            });
-          }
         } else {
           // 不存在店铺
           store.commit("userData/setState", {

src/views/modules/marketing/level/index.vue

@@ -32,7 +32,7 @@
     <div class="tipsLevel">
       <div>
         <span style="margin-right: 30px">全部等级({{ list.length }})</span
-        ><el-button @click="add" type="primary">+新增等级</el-button>
+        ><el-button @click="add" type="primary">+新增套餐</el-button>
       </div>
       <div>
         <span v-if="!form.effective" style="margin-right: 30px"

src/views/modules/operation-management/notice/popup/add-or-update.vue

@@ -63,16 +63,6 @@ export default {
             status: true,
             app: 1,
           };
-          if (
-            JSON.parse(sessionStorage.getItem("userInfo")).role ===
-              "ROLE_MANAGER" ||
-            JSON.parse(sessionStorage.getItem("userInfo")).role ===
-              "ROLE_MERCHANT"
-          ) {
-            this.modalData.type = 0;
-          } else {
-            this.modalData.type = 1
-          }
           this.fileList = [];
           this.modalConfig.title = "添加公告";
           this.isAdd = true;
@@ -103,40 +93,40 @@ export default {
             trigger: "blur",
           },
         },
-        // {
+        {
-        //   label: "分类",
+          label: "分类",
-        //   prop: "type",
+          prop: "type",
-        //   maxlength: "30",
+          maxlength: "30",
-        //   rules: {
+          rules: {
-        //     required: true,
+            required: true,
-        //     message: "请输入分类",
+            message: "请输入分类",
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        //   type: "jsx",
+          type: "jsx",
-        //   render: () => {
+          render: () => {
-        //     return (
+            return (
-        //       <el-select
+              <el-select
-        //         v-model={this.modalData.type}
+                v-model={this.modalData.type}
-        //         placeholder="请选择销售单位"
+                placeholder="请选择销售单位"
-        //       >
+              >
-        //         {[
+                {[
-        //           { label: "菜市场", value: 0 },
+                  { label: "菜市场", value: 0 },
-        //           {
+                  {
-        //             label: "云店",
+                    label: "云店",
-        //             value: 1,
+                    value: 1,
-        //           },
+                  },
-        //         ].map((item) => {
+                ].map((item) => {
-        //           return (
+                  return (
-        //             <el-option
+                    <el-option
-        //               label={item.label}
+                      label={item.label}
-        //               value={item.value}
+                      value={item.value}
-        //             ></el-option>
+                    ></el-option>
-        //           );
+                  );
-        //         })}
+                })}
-        //       </el-select>
+              </el-select>
-        //     );
+            );
-        //   },
+          },
-        // },
+        },
         {
           label: "状态",
           prop: "status",

src/views/modules/presale/products/popup/add-or-update.vue

@@ -17,7 +17,7 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item label="定支付时间：" prop="startTime">
+              <el-form-item label="订金支付时间：" prop="startTime">
                 <el-date-picker
                   @change="getOrderTime"
                   format="yyyy-MM-dd HH:mm"