From ff2093c15dff95c3eee5985c50ad04ceec00f817 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 11 Mar 2022 09:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=89=88=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/SetGird.vue | 41 +++++++++++++++-----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/apps/AppGridManagement/SetGird.vue b/src/apps/AppGridManagement/SetGird.vue
index 83694d30..6ba36f36 100644
--- a/src/apps/AppGridManagement/SetGird.vue
+++ b/src/apps/AppGridManagement/SetGird.vue
@@ -9,11 +9,11 @@
         <div v-if="treeList.length > 0">
           <div class="cards" v-for="(item, index) in treeList" :key="index">
             <div class="imges">
-              <span v-if="item.girdRight == 1 && item.girdLevel != 2">
+              <!-- <span v-if="item.girdRight == 1 && item.girdLevel != 2">
                 <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
                 <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />
               </span>
-              <span v-else style="width:24px;"></span>
+              <span v-else style="width:24px;"></span> -->
               <img src="./components/img/gird--select-icon.png" alt="" class="avatras" />
             </div>
             <div class="rightes">
@@ -29,9 +29,9 @@
       </div>
     </div>
     <!-- <div style="padding-bottom: 70px;"></div> -->
-    <div class="subBtn" @click="toAddGird" v-if="slectList.length && slectList[slectList.length-1].girdLevel != 1">
+    <!-- <div class="subBtn" @click="toAddGird" v-if="slectList.length && slectList[slectList.length-1].girdLevel != 1">
       <div>添加网格</div>
-    </div>
+    </div> -->
 
      <u-popup v-model="show" mode="bottom" border-radius="14" height="1000">
       <div class="popup">
@@ -64,9 +64,10 @@
           </div>
         </div>
         <div style="height:56px;"></div>
-        <div class="btn" v-if="form.girdRight == 1">
-          <span class="del" @click="del">删除网格</span>
-          <span class="edit" @click="edit">编辑网格</span>
+        <div class="btn">
+          <span class="del mar-r32" @click="del" v-if="form.girdRight == 1">删除网格</span>
+          <span class="edit mar-r32" @click="edit" v-if="form.girdRight == 1">编辑网格</span>
+          <span class="edit" :class="form.girdRight == 1 ? '' : 'flex1'" v-if="form.girdLevel != 2" @click="toAddGird">添加下级网格</span>
         </div>
       </div>
     </u-popup>
@@ -220,11 +221,13 @@ export default {
     },
 
     toAddGird() {
-      if (this.setGird.id != null) {
-        uni.navigateTo({url: `./AddGird?id=${this.setGird.id}&fromType=add`})
-      } else {
-        return this.$u.toast('请选择网格')
-      }
+      console.log(this.setGird)
+      // if (this.setGird.id != null) {
+      //   uni.navigateTo({url: `./AddGird?id=${this.setGird.id}&fromType=add`})
+      // } else {
+      //   return this.$u.toast('请选择网格')
+      // }
+      uni.navigateTo({url: `./AddGird?id=${this.form.id}&fromType=add`})
     }
   }
 }
@@ -449,22 +452,26 @@ export default {
         height: 92px;
         line-height: 90px;
         border-radius: 8px;
-        font-size: 34px;
+        font-size: 32px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         box-sizing: border-box;
-        text-align: center;
+        padding: 0 28px;
       }
       .del{
         color: #f46;
         border: 1px solid #f46;
-        flex: 1;
-        margin-right: 32px;
       }
       .edit{
         background-color: #3671EE;
         color: #fff;
-        flex: 2;
+      }
+      .mar-r32{
+        margin-right: 32px;
+      }
+      .flex1{
+        width: 100%;
+        text-align: center;
       }
     }
   }