diff --git a/src/components/ModulesMenu/allMenus.vue b/src/components/ModulesMenu/allMenus.vue
index c5797284..4af0bb15 100644
--- a/src/components/ModulesMenu/allMenus.vue
+++ b/src/components/ModulesMenu/allMenus.vue
@@ -32,10 +32,13 @@
{{item.name}}
-
@@ -117,7 +120,7 @@ export default {
},
selectItem(item) {
- if(item.isBuy) {
+ if(item.isBuy||item.billMode=='0') {
//路由跳转
let name = "";
modulesOfRouter.forEach(e => {
@@ -149,14 +152,16 @@ export default {
this.menuLoading = true
getAllMenuModule({}).then(res => {
let tempData = res.data.data;
+ tempData.forEach(i=>{
+ i.isBuy=false;
+ })
getBuyMenuModule({}).then(res2 => {
let branchModules = res2.data.data;
tempData.forEach(k => {
branchModules.forEach(element => {
- // if(k.id == element.moduleId) {
- // k.isBuy = true;
- // }
- k.isBuy = true;
+ if(k.id == element.moduleId && element.status=='1') {
+ k.isBuy = true;
+ }
});
modulesOfIcon.forEach(element => {
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 7f1fc6d7..3a2e848c 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -160,9 +160,8 @@ export default {
})
getBuyMenuModule({}).then(res2 => {
let branchModules = res2.data.data;
- tempData.forEach(k => {
- branchModules.forEach(element => {
- k.isChecked = false;
+ tempData.forEach(k => {
+ branchModules.forEach(element => {
if(k.id == element.moduleId && element.status=='1') {
k.isBuy = true;
k.musers=element.musers