From d9958cd2bd291e650b20393b7696aaa64e506e2c Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 14 Jul 2021 15:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=89=8D=E7=BC=80;=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86pc/pda?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                              |  2 +-
 src/router/index.js                          |  3 ++-
 src/views/main-sidebar.vue                   |  4 +++-
 src/views/modules/sys/menu-add-or-update.vue | 11 ++++++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/config/index.js b/config/index.js
index 64abbd0..5cb71e4 100644
--- a/config/index.js
+++ b/config/index.js
@@ -13,7 +13,7 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
-        target: 'http://127.0.0.1:9090/xujie-fast/',
+        target: 'http://127.0.0.1:9090',
         changeOrigin: true,
         pathRewrite: {
           // 把 /proxyApi 替换成 /
diff --git a/src/router/index.js b/src/router/index.js
index 853cec5..9bb5af1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -67,7 +67,8 @@ router.beforeEach((to, from, next) => {
       url: http.adornUrl('/sys/menu/nav'),
       method: 'get',
       params: {
-        'l': i18n.locale //i18n.locale
+        'l': i18n.locale, //i18n.locale
+        menuType: "pc"
       }
     }).then(({data}) => {
       if (data && data.code === 0) {
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index bd33ba3..537f446 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -132,7 +132,9 @@ export default {
         languageCode:this.$i18n.locale
       }
       userFavoriteList(query).then(({data})=> {
-        this.favoriteList[0].list = data.list
+        if (data.list.length>0){
+          this.favoriteList[0].list = data.list
+        }
       })
     },
     // 搜索菜单方式1 start
diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue
index b414510..87396cc 100644
--- a/src/views/modules/sys/menu-add-or-update.vue
+++ b/src/views/modules/sys/menu-add-or-update.vue
@@ -39,6 +39,12 @@
       <el-form-item v-if="dataForm.type !== 2" label="排序号" prop="orderNum">
         <el-input-number v-model="dataForm.orderNum" controls-position="right" :min="0" label="排序号"></el-input-number>
       </el-form-item>
+      <el-form-item  label="菜单类型" prop="menuType">
+        <el-select v-model="dataForm.menuType">
+          <el-option label="pc" value="pc"></el-option>
+          <el-option label="pda" value="pda"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item v-if="dataForm.type !== 2" label="菜单图标" prop="icon">
         <el-row>
           <el-col :span="22">
@@ -102,7 +108,8 @@
           perms: '',
           orderNum: 0,
           icon: '',
-          iconList: []
+          iconList: [],
+          menuType: ''
         },
         dataRule: {
           name: [
@@ -134,6 +141,7 @@
           params: this.$http.adornParams()
         }).then(({data}) => {
           this.menuList = treeDataTranslate(data.menuList, 'menuId')
+          console.log( this.menuList)
         }).then(() => {
           this.visible = true
           this.$nextTick(() => {
@@ -158,6 +166,7 @@
               this.dataForm.perms = data.menu.perms
               this.dataForm.orderNum = data.menu.orderNum
               this.dataForm.icon = data.menu.icon
+              this.dataForm.menuType = data.menu.menuType
               this.menuListTreeSetCurrentNode()
             })
           }