DMJS-IT
/
merchant-web
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
KangKang0928 2025-02-19 10:07:36 +08:00
parent 913ac0d8c3 09dc3fe8d1
commit 4800980a48
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/modules/marketing/level/index.vue
View File

@ -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,
};

10
src/views/modules/marketing/points-mall/index.vue
View File

@ -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,
};

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

@ -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 = "添加积分兑换商品";

5
src/views/modules/marketing/points-setting/index.vue
View File

@ -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,
};

5
src/views/modules/marketing/user/index.vue
View File

@ -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,
};