Merge remote-tracking branch 'origin/dev' into dev

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">

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>
 

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: '全部',
@@ -238,12 +233,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 {
@@ -308,8 +305,6 @@ export default {
           this.flag = false
         })
     },
-
-    toDel() {},
   },
   onReachBottom() {
     this.current = this.current + 1

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)
           }
         })