From 047b4d69728f4cd51fe726102a635951f0819851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 18 Feb 2022 09:36:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=91=E6=B0=91=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIntegralApply/AppIntegralApply.vue     |  1 +
 src/mods/AppVillager/AppVillager.vue          | 59 ++++++++++---------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/mods/AppIntegralApply/AppIntegralApply.vue b/src/mods/AppIntegralApply/AppIntegralApply.vue
index b9ae398..f779dd6 100644
--- a/src/mods/AppIntegralApply/AppIntegralApply.vue
+++ b/src/mods/AppIntegralApply/AppIntegralApply.vue
@@ -81,6 +81,7 @@ export default {
   },
   onshow() {
     uni.$on('updateList', () => {
+      this.current = 1
       this.getList()
     })
   },
diff --git a/src/mods/AppVillager/AppVillager.vue b/src/mods/AppVillager/AppVillager.vue
index 3fa32c6..0c65479 100644
--- a/src/mods/AppVillager/AppVillager.vue
+++ b/src/mods/AppVillager/AppVillager.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="Page">
-    <u-tabs class="u-tabs1" :list="tabs" :is-scroll="false" :current="tabIndex1" @change="change" bg-color="#197df0" style="width: 50%" active-color="#FFF;" inactive-color="#FFF"></u-tabs>
+    <u-tabs class="u-tabs1" :list="tabs" :is-scroll="false" :current="tabIndex0" @change="change" bg-color="#197df0" style="width: 50%" active-color="#FFF;" inactive-color="#FFF"></u-tabs>
 
     <div class="top">
-      <div class="tabIndex012" v-if="tabIndex1 != 3">
+      <div class="tabIndex012" v-if="tabIndex0 != 3">
         <div class="tags" v-for="(items, i) in $dict.getDict('villagerCircleTopic')" :key="i">{{ items.dictName }}</div>
       </div>
 
-      <u-tabs class="u-tabs2" :list="tabList" :is-scroll="false" :current="tabCurrent2" @change="changetabIndex" bg-color="#fff" active-color="#333;" inactive-color="#999" v-if="tabIndex1 == 3"></u-tabs>
+      <u-tabs class="u-tabs2" :list="tabList" :is-scroll="false" :current="tabCurrent1" @change="changetabIndex" bg-color="#fff" active-color="#333;" inactive-color="#999" v-if="tabIndex0 == 3"></u-tabs>
 
-      <div class="indexTab3" v-if="tabIndex1 == 3">
-        <div class="tags" v-for="(e, i) in itemList" :key="i" :class="indexTab3 == i ? 'active' : 'noactive'" @click="hander(i)">{{ e.name }}</div>
+      <div class="indexTab22" v-if="tabIndex0 == 3">
+        <div class="tags" v-for="(e, i) in itemList" :key="i" :class="indexTab2 == i ? 'active' : 'noactive'" @click="hander(i)">{{ e.name }}</div>
       </div>
     </div>
 
@@ -29,14 +29,16 @@
 
               <!-- :style="{ class: item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2' }"  -->
               <div class="statusDele">
-                <div class="status status0" v-if="tabIndex1 == 3">审核中</div>
+                <div class="status status0" v-if="tabIndex0 == 3">审核中</div>
 
-                <img src="../../static/AppVillager/4.png" alt="" @click.stop="delShow = true" class="dels" />
+                <div class="dels" @click.stop="toAdd(item)">编辑</div>
+                <div class="dels" @click.stop=";(delShow = true), (deleId = item.id)">删除</div>
+                <!-- <img src="../../static/AppVillager/4.png" alt="" @click.stop="delShow = true" class="dels" /> -->
               </div>
             </div>
           </div>
 
-          <div class="tabCurrent0" v-if="tabIndex1 != 3 || tabCurrent2 == 0">
+          <div class="tabCurrent0" v-if="tabIndex0 != 3 || tabCurrent1 == 0">
             <div class="cardConts">⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。</div>
 
             <div class="cardImg">
@@ -49,7 +51,7 @@
                 <span>东湖生态旅游风景区听涛景区</span>
               </div>
 
-              <div class="icones" v-if="tabIndex1 != 3">
+              <div class="icones" v-if="tabIndex0 != 3">
                 <div class="img1">
                   <img src="../../static/AppVillager/1.png" alt="" class="img11" />
                 </div>
@@ -62,7 +64,7 @@
             </div>
           </div>
 
-          <div class="tabCurrent1" v-if="tabIndex1 == 3 && tabCurrent2 == 1">
+          <div class="tabCurrent11" v-if="tabIndex0 == 3 && tabCurrent1 == 1">
             <div class="cardsConts">针不戳！</div>
 
             <div class="reply">
@@ -80,10 +82,10 @@
       <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
     </div>
 
-    <!-- <AiFixedBtn v-if="tabIndex1 == 3 && tabCurrent2 == 1" @click.native="toAdd()">
+    <!-- <AiFixedBtn v-if="tabIndex0 == 3 && tabCurrent1 == 1" @click.native="toAdd()">
       <div class="addBtn iconfont iconfont-iconfangda">发起审核</div>
     </AiFixedBtn> -->
-    <div class="addBtn" v-if="tabIndex1 == 3 && tabCurrent2 == 1" @click.native="toAdd()">发起审核</div>
+    <div class="addBtn" v-if="tabIndex0 == 3 && tabCurrent1 == 1" @click.native="toAdd()">发起审核</div>
 
     <u-modal v-model="delShow" content="确定删除该数据" :mask-close-able="true" @confirm="confirmDel"></u-modal>
   </div>
@@ -111,7 +113,7 @@ export default {
           name: '我参与的',
         },
       ],
-      tabIndex1: 3,
+      tabIndex0: 0,
       tabList: [
         {
           name: '我的话题',
@@ -120,27 +122,27 @@ export default {
           name: '我的评论',
         },
       ],
-      tabCurrent2: 0,
+      tabCurrent1: 0,
       data: [{ value: 0, title: '弃捐勿复道，努力加餐饭' }],
       itemList: [
         {
           name: '全部',
-          indexTab3: 0,
+          indexTab2: 0,
         },
         {
           name: '已通过',
-          indexTab3: 1,
+          indexTab2: 1,
         },
         {
           name: '未通过',
-          indexTab3: 2,
+          indexTab2: 2,
         },
         {
           name: '审核中',
-          indexTab3: 3,
+          indexTab2: 3,
         },
       ],
-      indexTab3: 0,
+      indexTab2: 0,
       delShow: false,
       current: 1,
     }
@@ -176,26 +178,29 @@ export default {
 
     change(index) {
       // this.data = []
-      this.tabIndex1 = index
+      this.tabIndex0 = index
       this.current = 1
       // this.getList()
     },
 
     changetabIndex(e) {
-      this.tabCurrent2 = e
+      this.tabCurrent1 = e
     },
 
     hander(i) {
-      this.indexTab3 = i
+      this.indexTab2 = i
     },
 
     toDetail(item) {
       this.$linkTo(`./detail?id=${item.id}`)
     },
 
-    toAdd() {
-      console.log(1)
-      this.$linkTo(`./add`)
+    toAdd(item) {
+      if (item) {
+        this.$linkTo(`./add?id=${item.id}`)
+      } else {
+        this.$linkTo(`./add`)
+      }
     },
 
     confirmDel() {
@@ -265,7 +270,7 @@ export default {
       }
     }
 
-    .indexTab3 {
+    .indexTab22 {
       padding-top: 32px;
       display: flex;
       .tags {
@@ -392,7 +397,7 @@ export default {
           }
         }
 
-        .tabCurrent1 {
+        .tabCurrent11 {
           .cardsConts {
             margin-top: 24px;
             font-size: 32px;