From 530be4864b4f960530004dfce9b8c811029200cc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 23 Jun 2020 01:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechatMenuManage/wechatMenuManage.html    | 25 +++++++++++--------
 .../wechatMenuManage/wechatMenuManage.js      |  8 +++---
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/public/pages/property/wechatMenuManage/wechatMenuManage.html b/public/pages/property/wechatMenuManage/wechatMenuManage.html
index 2cc7f1ff6..cc7fa6622 100644
--- a/public/pages/property/wechatMenuManage/wechatMenuManage.html
+++ b/public/pages/property/wechatMenuManage/wechatMenuManage.html
@@ -1,5 +1,5 @@
 <div>
-    
+
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox">
@@ -10,7 +10,8 @@
                             <i class="glyphicon glyphicon-plus"></i>
                             发布菜单
                         </button>
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddWechatMenuModal(101)">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddWechatMenuModal(101)"
+                            v-if="wechatMenuManageInfo.wechatMenus.length < 3">
                             <i class="glyphicon glyphicon-plus"></i>
                             添加菜单
                         </button>
@@ -19,10 +20,11 @@
                 <div class="ibox-content">
 
                     <table class="footable table table-stripped toggle-arrow-tiny table-hover" data-page-size="15">
-                        <thead >
+                        <thead>
                             <tr>
                                 <th class="text-center">菜单名称</th>
                                 <th class="text-center">菜单类型</th>
+                                <th class="text-center">菜单顺序</th>
                                 <th class="text-center">值</th>
                                 <th class="text-center">AppId</th>
                                 <th class="text-center">小程序地址</th>
@@ -30,12 +32,12 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="(wechatMenu,index) in wechatMenuManageInfo.wechatMenus" 
-                            :class="{'table-active':wechatMenu.wechatMenuId=wechatMenuManageInfo.curParentMenuId}"
-                                @click="selectMenu(wechatMenu)"
-                            >
+                            <tr v-for="(wechatMenu,index) in wechatMenuManageInfo.wechatMenus"
+                                :class="{'table-active':wechatMenu.wechatMenuId==wechatMenuManageInfo.curParentMenuId}"
+                                @click="selectMenu(wechatMenu)">
                                 <td class="text-center">{{wechatMenu.menuName}}</td>
-                                <td class="text-center">{{wechatMenu.menuType}}</td>
+                                <td class="text-center">{{wechatMenu.menuTypeName}}</td>
+                                <td class="text-center">{{wechatMenu.seq}}</td>
                                 <td class="text-center">{{wechatMenu.menuValue}}</td>
                                 <td class="text-center">{{wechatMenu.appId}}</td>
                                 <td class="text-center">{{wechatMenu.pagepath}}</td>
@@ -71,7 +73,8 @@
                 <div class="ibox-title">
                     <h5>二级菜单</h5>
                     <div class="ibox-tools" style="top:10px;" v-if="wechatMenuManageInfo.curParentMenuId != ''">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddWechatMenuModal(202)">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddWechatMenuModal(202)"
+                            v-if="wechatMenuManageInfo.subWechatMenus.length < 5">
                             <i class="glyphicon glyphicon-plus"></i>
                             添加二级菜单
                         </button>
@@ -84,6 +87,7 @@
                             <tr>
                                 <th class="text-center">菜单名称</th>
                                 <th class="text-center">菜单类型</th>
+                                <th class="text-center">菜单顺序</th>
                                 <th class="text-center">值</th>
                                 <th class="text-center">AppId</th>
                                 <th class="text-center">小程序地址</th>
@@ -93,7 +97,8 @@
                         <tbody>
                             <tr v-for="wechatMenu in wechatMenuManageInfo.subWechatMenus">
                                 <td class="text-center">{{wechatMenu.menuName}}</td>
-                                <td class="text-center">{{wechatMenu.menuType}}</td>
+                                <td class="text-center">{{wechatMenu.menuTypeName}}</td>
+                                <td class="text-center">{{wechatMenu.seq}}</td>
                                 <td class="text-center">{{wechatMenu.menuValue}}</td>
                                 <td class="text-center">{{wechatMenu.appId}}</td>
                                 <td class="text-center">{{wechatMenu.pagepath}}</td>
diff --git a/public/pages/property/wechatMenuManage/wechatMenuManage.js b/public/pages/property/wechatMenuManage/wechatMenuManage.js
index a1929fbed..9a0ce8dcc 100644
--- a/public/pages/property/wechatMenuManage/wechatMenuManage.js
+++ b/public/pages/property/wechatMenuManage/wechatMenuManage.js
@@ -57,16 +57,16 @@
 
             _listSubWechatMenus: function () {
 
-                if($that.wechatMenuManageInfo.parentMenuId == ''){
+                if($that.wechatMenuManageInfo.curParentMenuId == ''){
                     return ;
                 }
 
                 var param = {
                     params: {
                         page: 1,
-                        row: 3,
+                        row: 5,
                         communityId: vc.getCurrentCommunity().communityId,
-                        parentMenuId: $that.wechatMenuManageInfo.parentMenuId,
+                        parentMenuId: $that.wechatMenuManageInfo.curParentMenuId,
                         menuLevel: '202'
                     }
                 };
@@ -90,6 +90,8 @@
                         vc.toast("请先选择一级菜单");
                         return ;
                     }
+                }else{
+                    $that.wechatMenuManageInfo.curParentMenuId = '-1';
                 }
                 vc.emit('addWechatMenu', 'openAddWechatMenuModal', {
                     menuLevel:_menuLevel,