Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web

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

@@ -133,7 +133,10 @@ export default {
   },
   created() {
     this.formInline = {
-      unitType: JSON.parse(sessionStorage.getItem("userInfo")).unitType,
+      unitType:
+        JSON.parse(sessionStorage.getItem("userInfo")).role == "ROLE_MERCHANT"
+          ? 3
+          : 2,
       marketId: this.marketId,
       shopId: this.shopId,
     };

src/views/modules/marketing/points-mall/index.vue

@@ -103,7 +103,10 @@ export default {
   },
   created() {
     this.formInline = {
-      unitType: JSON.parse(sessionStorage.getItem("userInfo")).unitType,
+      unitType:
+        JSON.parse(sessionStorage.getItem("userInfo")).role == "ROLE_MERCHANT"
+          ? 3
+          : 2,
       marketId: this.marketId,
       shopId: this.shopId,
     };
@@ -135,7 +138,10 @@ export default {
     },
     reset() {
       this.formInline = {
-        unitType: JSON.parse(sessionStorage.getItem("userInfo")).unitType,
+        unitType:
+          JSON.parse(sessionStorage.getItem("userInfo")).role == "ROLE_MERCHANT"
+            ? 3
+            : 2,
         marketId: this.marketId,
         shopId: this.shopId,
       };

src/views/modules/marketing/points-mall/popup/add-or-update.vue

@@ -344,7 +344,11 @@ export default {
           this.ruleForm = {
             marketId: this.marketId,
             shopId: this.shopId,
-            unitType: JSON.parse(sessionStorage.getItem("userInfo")).unitType,
+            unitType:
+              JSON.parse(sessionStorage.getItem("userInfo")).role ==
+              "ROLE_MERCHANT"
+                ? 3
+                : 2,
             list: [],
           };
           this.modalConfig.title = "添加积分兑换商品";

src/views/modules/marketing/points-setting/index.vue

@@ -105,7 +105,10 @@ export default {
   },
   created() {
     this.formInline = {
-      unitType: JSON.parse(sessionStorage.getItem("userInfo")).unitType,
+      unitType:
+        JSON.parse(sessionStorage.getItem("userInfo")).role == "ROLE_MERCHANT"
+          ? 3
+          : 2,
       marketId: this.marketId,
       shopId: this.shopId,
     };

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

@@ -159,7 +159,10 @@ export default {
   },
   created() {
     this.formInline = {
-      unitType: JSON.parse(sessionStorage.getItem("userInfo")).unitType,
+      unitType:
+        JSON.parse(sessionStorage.getItem("userInfo")).role == "ROLE_MERCHANT"
+          ? 3
+          : 2,
       marketId: this.marketId,
       shopId: this.shopId,
     };