From fd62f11691322f35bbc1a8a07c3a5a35a84a9682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 14 May 2022 02:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ModulesMenu/allMenus.vue | 17 +++++++++++------
 src/views/order/index.vue               |  5 ++---
 2 files changed, 13 insertions(+), 9 deletions(-)

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 @@
                 <img :src="item.logoUrl" alt="">
                 <span>{{item.name}}</span>
                 <el-divider></el-divider>
-                <div class="desc">
+                <div class="desc" v-if="item.billMode!=='0'">
                    <el-button @click="goBuy(item)" v-if="!item.isBuy" style="width:70px;" type="primary" round>购买</el-button>
                    <span class="buyAfter" v-else>（已购买）</span>
                 </div>
+                <div class="desc" v-else> 
+                   <span class="buyAfter">（免费）</span>
+                </div>
             </div>
         </div>
         
@@ -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