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

src/sass/AppAskForm/components/AddForm.vue

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

src/sass/AppAskForm/components/PreviewForm.vue

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

src/sass/AppInterview/interviewDetail.vue

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

src/sass/AppMeetingNotice/addMeeting.vue

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

src/sass/AppMeetingNotice/belongToMe.vue

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

src/sass/AppMeetingNotice/detail.vue

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

src/sass/AppMeetingNotice/meetingList.vue

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

src/sass/AppNotification/add.vue

@@ -61,7 +61,6 @@
         <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/sass/AppNotification/detail.vue

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

src/sass/AppNotification/read.vue

@@ -9,7 +9,6 @@
         <AiOpenData type="userName" :openid="item.id"></AiOpenData>
       </div>
     </div>
-    <AiBack/>
   </div>
 </template>