Merge branch 'main' into feature/v1.0.40

apps/bigmember_pc/src/views/portrayal/UnitPortrayal.vue

@@ -1066,10 +1066,8 @@ export default {
           if (res.error_msg === '' && res.data) {
             this.unitData = res.data
           }
-          if (!this.loginFlag) {
-            this.loading = false
-          }
         })
+        this.loading = false
       }
     })
     this.$nextTick(() => {