From 1bf7bf777c09472613547888375051d8f737fc35 Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Mon, 31 Aug 2020 22:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E8=A1=A8=E5=8D=95=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/bookmark/content/index.vue |  4 ++-
 ruoyi-ui/src/views/bookmark/index/index.vue   | 25 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/bookmark/content/index.vue b/ruoyi-ui/src/views/bookmark/content/index.vue
index a98b92e72..1fd91f6f6 100644
--- a/ruoyi-ui/src/views/bookmark/content/index.vue
+++ b/ruoyi-ui/src/views/bookmark/content/index.vue
@@ -116,8 +116,10 @@
             <el-input v-model="form.url" placeholder="请输入书签地址" />
           </el-form-item>
           <el-form-item label="书签描述" prop="description">
-            <el-input v-model="form.description" placeholder="请输入书签描述" />
+            <el-input v-model="form.description" type="textarea" placeholder="请输入书签描述"
+                      :autosize="{minRows: 3, maxRows:4}" :style="{width: '100%'}"></el-input>
           </el-form-item>
+
           <el-form-item label="书签标签" prop="label">
             <el-input v-model="form.label" placeholder="请输入标签" />
           </el-form-item>
diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue
index b76768622..971cab8dd 100644
--- a/ruoyi-ui/src/views/bookmark/index/index.vue
+++ b/ruoyi-ui/src/views/bookmark/index/index.vue
@@ -129,16 +129,22 @@
         <div class="labelname">上级菜单</div>
         <treeselect class="menutreeselect"  v-model="form.parentId" :options="menuOptions" :normalizer="normalizer"  />
       </el-form-item>
+
+
+<!--      <el-form-item  prop="menuOrder">-->
+<!--        <div class="labelname">排序</div>-->
+<!--        <el-input class="custom-input" v-model="form.menuOrder" placeholder="请输入菜单排序" />-->
+<!--      </el-form-item>-->
+
       <el-form-item  prop="menuOrder">
-        <div class="labelname">排序</div>
-        <el-input class="custom-input" v-model="form.menuOrder" placeholder="请输入菜单排序" />
+        <div class="labelname">排序(小到大)</div><br/>
+        <el-input-number v-model="form.menuOrder" placeholder="计数器"></el-input-number>
       </el-form-item>
+
+
     </el-form>
     <div slot="footer" class="dialog-footer">
-
       <el-button type="danger"  round  @click="deleteMmenu(form.menuId)">删除</el-button>
-
-
       <el-button type="primary"  round  @click="submitForm">确定</el-button>
       <el-button round  @click="cancel">取消</el-button>
 
@@ -260,6 +266,14 @@
     },
     methods:{
 
+
+
+
+
+
+
+
+
       /** 转换书签菜单数据结构 */
       normalizer(node) {
         if (node.children && !node.children.length) {
@@ -905,6 +919,7 @@
     color: rgb(0, 0, 0);
     float: left;
     margin-bottom: -10px;
+    margin-right: 5px;
   }
   .el-form-item__content{
     margin-left: 0px!important;