From eda588e2e3cd0e7fc89ae3ef84d8b8ebbfe78155 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: Mon, 21 Feb 2022 09:12:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?if=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/AppVillager/AppVillager.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mods/AppVillager/AppVillager.vue b/src/mods/AppVillager/AppVillager.vue
index 754977b..db84099 100644
--- a/src/mods/AppVillager/AppVillager.vue
+++ b/src/mods/AppVillager/AppVillager.vue
@@ -238,12 +238,14 @@ export default {
     },
 
     toAdd(index) {
+      this.delAndEdit = false
       if (this.statDisabled == 0 && index == 0) {
-        this.delAndEdit = false
         return this.$u.toast('该数据未审核')
       }
+      if (this.tabIndex0 == 3 && this.tabCurrent1 == 1) {
+        return
+      }
 
-      this.delAndEdit = false
       if (index == 0) {
         this.$linkTo(`./add?id=${this.editId}`)
       } else {

From 351b0582b207b59fd0c616fb6f3318c2d25ae2b6 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: Mon, 21 Feb 2022 09:53:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/AppServiceOnlineNew/serviceForm.vue   | 1 +
 src/mods/AppServiceOnlineNew/serviceNotice.vue | 2 +-
 src/mods/AppVillager/AppVillager.vue           | 9 +--------
 src/mods/AppVillager/add.vue                   | 1 -
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/mods/AppServiceOnlineNew/serviceForm.vue b/src/mods/AppServiceOnlineNew/serviceForm.vue
index b8bc8e8..9023601 100644
--- a/src/mods/AppServiceOnlineNew/serviceForm.vue
+++ b/src/mods/AppServiceOnlineNew/serviceForm.vue
@@ -36,6 +36,7 @@
           </div>
         </div>
       </div>
+
       <div class="service-example" v-if="exampleList.length">
         <h2>上传样例</h2>
         <div class="service-example__list">
diff --git a/src/mods/AppServiceOnlineNew/serviceNotice.vue b/src/mods/AppServiceOnlineNew/serviceNotice.vue
index d29a376..6dbbecb 100644
--- a/src/mods/AppServiceOnlineNew/serviceNotice.vue
+++ b/src/mods/AppServiceOnlineNew/serviceNotice.vue
@@ -7,7 +7,7 @@
       <!-- <u-parse className="articalContent" :html="content"></u-parse> -->
     </div>
     <div class="service-btn" v-if="processType != 2" @click="toSubmit">我已阅读并同意</div>
-    <AiLogin ref="login"></AiLogin>
+    <!-- <AiLogin ref="login"></AiLogin> -->
   </div>
 </template>
 
diff --git a/src/mods/AppVillager/AppVillager.vue b/src/mods/AppVillager/AppVillager.vue
index db84099..f151846 100644
--- a/src/mods/AppVillager/AppVillager.vue
+++ b/src/mods/AppVillager/AppVillager.vue
@@ -35,11 +35,6 @@
               <div class="statusDele">
                 <div class="status status0" :class="item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2'" v-if="tabIndex0 == 3">{{ $dict.getLabel('auditStatus', item.status) }}</div>
 
-                <!-- <div class="statusRight">
-                  <div class="dels" @click.stop="toAdd(item)">编辑</div>
-                  <div class="dels" @click.stop=";(delShow = true), (deleId = item.id)">删除</div>
-                </div> -->
-
                 <img src="https://cdn.cunwuyun.cn/dvcp/AppVillager/4.png" alt="" @click.stop=";(delAndEdit = true), (editId = item.id), (deleId = item.id), (statDisabled = item.status)" class="dels" />
               </div>
             </div>
@@ -140,7 +135,7 @@ export default {
         },
       ],
       tabCurrent1: 0,
-      data: [{ value: 0, title: '弃捐勿复道，努力加餐饭' }],
+      data: [],
       itemList: [
         {
           name: '全部',
@@ -310,8 +305,6 @@ export default {
           this.flag = false
         })
     },
-
-    toDel() {},
   },
   onReachBottom() {
     this.current = this.current + 1
diff --git a/src/mods/AppVillager/add.vue b/src/mods/AppVillager/add.vue
index e0bdf03..8902576 100644
--- a/src/mods/AppVillager/add.vue
+++ b/src/mods/AppVillager/add.vue
@@ -128,7 +128,6 @@ export default {
         this.$instance.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then((res) => {
           if (res.code == 0) {
             this.forms = res.data
-            console.log(this.form)
             this.forms.topicValue = this.$dict.getLabel('villagerCircleTopic', this.forms.topic)
           }
         })