From cc65ee33305faafaa41073ed88741f2ea51ce9f4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 8 Mar 2021 13:07:25 +0800
Subject: [PATCH] jiaruguishu

---
 public/components/dev/addMenuGroup/addMenuGroup.html   | 2 +-
 public/components/dev/addMenuGroup/addMenuGroup.js     | 4 ++--
 public/components/dev/editMenuGroup/editMenuGroup.html | 2 +-
 public/components/dev/editMenuGroup/editMenuGroup.js   | 4 ++--
 public/pages/dev/menuGroupManage/menuGroupManage.html  | 4 ++--
 public/pages/dev/menuGroupManage/menuGroupManage.js    | 6 ++++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/public/components/dev/addMenuGroup/addMenuGroup.html b/public/components/dev/addMenuGroup/addMenuGroup.html
index edd2b5c51..843f7d99c 100644
--- a/public/components/dev/addMenuGroup/addMenuGroup.html
+++ b/public/components/dev/addMenuGroup/addMenuGroup.html
@@ -52,7 +52,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">归属商户</label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addMenuGroupInfo.storeTypeCd">
+                                    <select class="custom-select" v-model="addMenuGroupInfo.storeType">
                                         <option selected value="">请选择商户类型</option>
                                         <option value="800900000001">运营团队</option>
                                         <option value="800900000002">代理商</option>
diff --git a/public/components/dev/addMenuGroup/addMenuGroup.js b/public/components/dev/addMenuGroup/addMenuGroup.js
index b31cec99b..2ea6c4e09 100644
--- a/public/components/dev/addMenuGroup/addMenuGroup.js
+++ b/public/components/dev/addMenuGroup/addMenuGroup.js
@@ -15,7 +15,7 @@
                 seq: '',
                 description: '',
                 groupType: '',
-                storeTypeCd: ''
+                storeType: ''
             }
         },
         _initMethod: function () {
@@ -128,7 +128,7 @@
                     seq: '',
                     description: '',
                     groupType: '',
-                    storeTypeCd: ''
+                    storeType: ''
                 };
             }
         }
diff --git a/public/components/dev/editMenuGroup/editMenuGroup.html b/public/components/dev/editMenuGroup/editMenuGroup.html
index 5d6682751..b4a5aa869 100644
--- a/public/components/dev/editMenuGroup/editMenuGroup.html
+++ b/public/components/dev/editMenuGroup/editMenuGroup.html
@@ -51,7 +51,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">归属商户</label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="editMenuGroupInfo.storeTypeCd">
+                                    <select class="custom-select" v-model="editMenuGroupInfo.storeType">
                                         <option selected value="">请选择商户类型</option>
                                         <option value="800900000001">运营团队</option>
                                         <option value="800900000002">代理商</option>
diff --git a/public/components/dev/editMenuGroup/editMenuGroup.js b/public/components/dev/editMenuGroup/editMenuGroup.js
index 21cfa5b1b..aa916cd65 100644
--- a/public/components/dev/editMenuGroup/editMenuGroup.js
+++ b/public/components/dev/editMenuGroup/editMenuGroup.js
@@ -10,7 +10,7 @@
                 seq: '',
                 description: '',
                 groupType: '',
-                storeTypeCd: ''
+                storeType: ''
             }
         },
         _initMethod: function () {
@@ -119,7 +119,7 @@
                     seq: '',
                     description: '',
                     groupType: '',
-                    storeTypeCd: ''
+                    storeType: ''
                 }
             }
         }
diff --git a/public/pages/dev/menuGroupManage/menuGroupManage.html b/public/pages/dev/menuGroupManage/menuGroupManage.html
index b582ae7d3..16d6ec621 100644
--- a/public/pages/dev/menuGroupManage/menuGroupManage.html
+++ b/public/pages/dev/menuGroupManage/menuGroupManage.html
@@ -37,7 +37,7 @@
                     </div>
                     <div class="row">
                         <div class="col-sm-4">
-                            <select class="custom-select" v-model="menuGroupManageInfo.conditions.storeTypeCd">
+                            <select class="custom-select" v-model="menuGroupManageInfo.conditions.storeType">
                                 <option selected value="">请选择归属商户</option>
                                 <option value="800900000001">运营团队</option>
                                 <option value="800900000002">代理商</option>
@@ -84,7 +84,7 @@
                                 <td class="text-center">{{menuGroup.gId}}</td>
                                 <td class="text-center">{{menuGroup.name}}</td>
                                 <td class="text-center">{{menuGroup.groupType == 'P_WEB'?'web菜单':'App菜单'}}</td>
-                                <td class="text-center">{{menuGroup.storeTypeCdName}}</td>
+                                <td class="text-center">{{_getStoreTypeName(menuGroup.storeType)}}</td>
                                 <td class="text-center">{{menuGroup.icon}}</td>
                                 <td class="text-center">{{menuGroup.label}}</td>
                                 <td class="text-center">{{menuGroup.seq}}</td>
diff --git a/public/pages/dev/menuGroupManage/menuGroupManage.js b/public/pages/dev/menuGroupManage/menuGroupManage.js
index 7ce3aee5e..e80787cd1 100644
--- a/public/pages/dev/menuGroupManage/menuGroupManage.js
+++ b/public/pages/dev/menuGroupManage/menuGroupManage.js
@@ -16,7 +16,7 @@
                     name: '',
                     icon: '',
                     label: '',
-                    storeTypeCd: ''
+                    storeType: ''
                 }
             }
         },
@@ -97,8 +97,10 @@
                     return "物流公司";
                 } else if (_storeTypeCd == '800900000005') {
                     return "商家";
-                } else {
+                } else if (_storeTypeCd == '800900000000') {
                     return "开发团队";
+                } else {
+                    return "未知";
                 }
             }