Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/saas/AppGridManagement/SelectGird.vue

@@ -52,9 +52,6 @@ export default {
     isMyGirds() {
       return !!this.$route.query.self
     },
-    userGird() {
-      return this.user?.gridInfo || {}
-    },
     isGridMember() {
       return this.user.girdCheckType > 0
     }
@@ -68,7 +65,7 @@ export default {
   methods: {
     getAllGrids() {
       this.slectList = []
-      let {girdMemberId} = this.userGird,
+      let {girdMemberId} = this.user,
           url = `/app/appgirdinfo/queryAppGirdInfoByGirdLevel`,
           params = {girdMemberId}
       if (this.isMyGirds) {

src/saas/AppGridManagement/SetGird.vue

@@ -35,8 +35,6 @@
     </div>
   </div>
 </template>
-
-`
 <script>
 export default {
   name: 'setGird',
@@ -166,9 +164,10 @@ export default {
 
 <style scoped lang="scss">
 .setGird {
-  height: 100%;
+  min-height: 100vh;
   background: #fff;
   padding-bottom: 140px;
+  box-sizing: border-box;
 
   .header-middle {
     .hint {