Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppAskForm/components/AddForm.vue

@@ -119,7 +119,7 @@
           </div>
         </div>
       </u-popup>
-      <AiBack custom @back="back"/>
+
     </div>
     <div class="detail" v-if="isShowConfig">
       <component

src/apps/AppAskForm/components/PreviewForm.vue

@@ -61,7 +61,7 @@
         </div>
       </div>
     </div>
-    <AiBack custom @back="$emit('back')"/>
+
   </div>
 </template>
 

src/apps/AppBroadcast/addPlay.vue

@@ -82,7 +82,7 @@
     <u-select v-model="showSelect" :list="selectList" @confirm="confirm" label-name="dictName"
               value-name="dictValue"></u-select>
     <u-picker v-model="showDateTime" mode="time" :params="params" @confirm="confirm"></u-picker>
-    <AiBack/>
+
   </div>
 </template>
 <script>

src/apps/AppBroadcast/onlineList.vue

@@ -10,7 +10,7 @@
       </div>
     </div>
     <AiEmpty v-if="!list.length"/>
-    <AiBack/>
+
   </div>
 </template>
 <script>

src/apps/AppBroadcast/onlinePlayList.vue

@@ -11,7 +11,7 @@
       </div>
     </div>
     <AiEmpty v-if="!list.length"></AiEmpty>
-    <AiBack/>
+
   </div>
 </template>
 <script>

src/apps/AppBroadcast/playList.vue

@@ -18,7 +18,7 @@
         <div class="btn bg-AFD0FC" v-if="item.broadcastStatus == 6">已取消</div>
       </div>
     </div>
-    <AiBack></AiBack>
+
   </div>
 </template>
 <script>

src/apps/AppInterview/interviewDetail.vue

@@ -28,7 +28,7 @@
         </div>
       </div>
     </template>
-    <AiBack/>
+
   </div>
 </template>
 

src/apps/AppMarryAndDie/Add.vue

@@ -48,7 +48,7 @@
 
     <div class="btn" @click="submit">确认上报</div>
 
-    <AiBack></AiBack>
+
   </div>
 </template>
 

src/apps/AppMeetingNotice/addMeeting.vue

@@ -83,7 +83,7 @@
       </div>
     </div>
     <u-picker mode="time" v-model="show" :params="options" @confirm="confirm"></u-picker>
-    <AiBack ref="aiBack" v-if="!userSelect"/>
+
   </div>
 </template>
 

src/apps/AppMeetingNotice/belongToMe.vue

@@ -38,7 +38,7 @@
         <AiEmpty/>
       </template>
     </div>
-    <AiBack/>
+
   </div>
 </template>
 

src/apps/AppMeetingNotice/detail.vue

@@ -95,7 +95,7 @@
       </div>
     </template>
     <u-modal v-model="show" title="提示" show-cancel-button content='是否要取消该会议？' @confirm="onConfirm"></u-modal>
-    <AiBack/>
+
   </div>
 </template>
 

src/apps/AppMeetingNotice/meetingList.vue

@@ -31,7 +31,7 @@
     </div>
     <u-loadmore :status="status" v-if="list.length"/>
     <AiEmpty v-if="!list.length"></AiEmpty>
-    <AiBack/>
+
   </div>
 </template>
 

src/apps/AppNotification/add.vue

@@ -61,7 +61,7 @@
         <div @click="add(1)">立即发布</div>
       </div>
     </div>
-    <AiBack ref="aiBack" v-if="!userSelect"/>
+
     <u-picker v-model="show" mode="time" :params="options" @confirm="confirm"></u-picker>
   </div>
 </template>

src/apps/AppNotification/detail.vue

@@ -51,7 +51,7 @@
       </div>
     </template>
     <AiEmpty description="该通知已撤回" v-else/>
-    <AiBack/>
+
   </div>
 </template>
 

src/apps/AppNotification/read.vue

@@ -9,7 +9,7 @@
         <span v-text="item.name"/>
       </div>
     </div>
-    <AiBack/>
+
   </div>
 </template>
 

src/apps/AppPovertyAlleviation/MonitorFamilySituation.vue

@@ -48,7 +48,7 @@
       <textarea placeholder-style="color: #999; font-size: 30rpx;" placeholder="请输入"></textarea>
     </div> -->
     <div class="btn" hover-class="text" @click="submit">保存</div>
-    <AiBack></AiBack>
+
   </div>
 </template>
 

src/apps/AppResident/components/tagManage.vue

@@ -9,7 +9,7 @@
         </div>
       </u-row>
     </div>
-    <AiBack custom @back="top.showTagManage=false"/>
+
   </section>
 </template>
 

src/apps/AppResident/groupResident.vue

@@ -71,7 +71,7 @@
       </div>
     </template>
     <tag-manage v-if="showTagManage"/>
-    <AiBack v-if="isNormal&&!showTagManage"/>
+
   </div>
 </template>
 

src/apps/AppResident/resident.vue

@@ -12,7 +12,7 @@
         <component :is="currentTab.comp"/>
       </template>
     </template>
-    <AiBack v-if="isNormal&&!showTagManage"/>
+
   </section>
 </template>
 

src/apps/AppResidentActivitie/Add.vue

@@ -54,7 +54,7 @@
 
     <div class="btn" @click="submit">保存</div>
 
-    <AiBack></AiBack>
+
   </div>
 </template>
 

src/apps/AppResidentFile/GroupList.vue

@@ -74,7 +74,7 @@
     </template>
 
     <TagManage v-if="showTagManage" />
-    <AiBack v-if="isNormal && !showTagManage" />
+
   </div>
 </template>
 

src/apps/AppResidentFile/resident.vue

@@ -11,7 +11,7 @@
         <component :is="currentTab.comp" />
       </template>
     </template>
-    <AiBack v-if="isNormal && !showTagManage" />
+
   </section>
 </template>
 

src/apps/AppResidentFile/tagManage.vue

@@ -8,7 +8,7 @@
         </div>
       </u-row>
     </div>
-    <AiBack custom @back="top.showTagManage = false" />
+
   </section>
 </template>
 

src/apps/AppResourcesManage/AppResourcesManage.vue

@@ -25,7 +25,7 @@
         <!-- <audio :src="url" ref="audio" :controls="true" :name="autioName" style="display: block;"></audio> -->
       </div>
     </u-popup>
-    <AiBack/>
+
   </div>
 </template>
 <script>

src/apps/AppResourcesManage/addPlay.vue

@@ -29,7 +29,7 @@
       </div>
     </div>
     <div class="btn" @click="confirm">确认</div>
-    <AiBack></AiBack>
+
   </div>
 </template>
 

src/apps/AppResourcesManage/recording.vue

@@ -113,7 +113,7 @@
       <img v-else :src="isRecording ? stopImg : microphone" @click="record">
       <span v-if="isStop" @click="save">保存</span>
     </div>
-    <AiBack/>
+
     <audio style="opacity: 0; visibility: hidden;" :src="audioSrc" @ended="onAudioEnd"></audio>
   </div>
 </template>

src/apps/AppServicePublic/Add.vue

@@ -35,7 +35,7 @@
 
     <div class="btn" @click="submit">保存</div>
 
-    <AiBack></AiBack>
+
   </div>
 </template>
 
@@ -70,7 +70,7 @@ export default {
     if(o.id) {
       this.id = o.id
     }
-    
+
     this.moduleId = o.moduleId
     this.forms.areaId = this.user.areaId
     this.listName = o.listName
@@ -139,7 +139,7 @@ export default {
         id: this.id,
         moduleId: this.moduleId,
         categoryId: categoryId,
-        categoryName: categoryName, 
+        categoryName: categoryName,
       })
       .then((res) => {
         console.log(333)
@@ -151,8 +151,6 @@ export default {
             uni.navigateBack()
           }, 600)
         }
-      }).catch((err) => {
-        console.log(444333)
       })
     },
 

src/apps/AppUniMsg/Add.vue

@@ -26,7 +26,7 @@
 
     <div class="btn" @click="submit">保存</div>
 
-    <AiBack></AiBack>
+
   </div>
 </template>
 

src/apps/AppWalkask/add.vue

@@ -45,7 +45,7 @@
 
       <div class="btn" @click="submit">保存</div>
 
-      <AiBack></AiBack>
+
     </div>
 
     <component v-else :is="comp" :paramss="params" @back="backlist"></component>

src/apps/AppWalkask/detail.vue

@@ -32,7 +32,7 @@
       </div>
     </div>
 
-    <AiBack></AiBack>
+
   </div>
 </template>
 

src/apps/AppWorkonline/Msg.vue

@@ -5,7 +5,7 @@
     <u-button type="primary" :custom-style="{ width: '100%', borderRadius: '4px', marginTop: '48px' }" @click="goBack">
       {{ btnText }}
     </u-button>
-    <AiBack></AiBack>
+
   </div>
 </template>
 

src/apps/AppWorkonline/Opinion.vue

@@ -77,7 +77,7 @@
 
     <!-- 日期选择器 -->
     <u-calendar v-model="show" :mode="mode" @change="calendar" />
-    <AiBack />
+
   </div>
 </template>
 

src/apps/AppWorkonline/detail.vue

@@ -223,7 +223,7 @@
       <div class="agree" @click="agree(1)">同意</div>
     </div>
 
-    <AiBack></AiBack>
+
   </div>
 </template>