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

# Conflicts:
#	src/saas/AppGridManagement/AppGridManagement.vue

src/apps/AppGridManagement/AppGridManagement.vue

@@ -6,12 +6,11 @@
         <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
         <div @click="linkTo('./SelectGird')">
           {{params.girdName}}
-          <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
+          <img src="./components/img/down-icon.png" alt="" class="down-icon">
         </div>
         <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
       </div>
     <!-- </div> -->
-    
     <component v-if="refresh && isAdmin" :is="component" @change="onChange" :params="params"> </component>
     <div class="tabs" v-if="isTab && isAdmin">
       <div class="item" @click="tabClick(index, item.component)" v-for="(item, index) in tabs" :key="index">
@@ -115,7 +114,7 @@ export default {
     this.isGirdUser()
     uni.$on('goback', (res) => {
       this.params = res
-    }) 
+    })
   },
   onReachBottom() {
     if(!this.tabIndex) {