Merge branch 'master' into 1.4.0

src/views/Auth/components/wechatLogin.vue

 <template>
-    <div class="wechatLoginForm text-center q-mt-lg" v-loading="qrLoading"
+    <div class="wechatLoginForm text-center q-mt-lg"
     style="position: relative;">
-        <img :src="qrCode" style="width: 164px;height: 164px;border: 1px solid #EBEBEB;border-radius: 12px;" v-if="!qrLoading"></img>
-        <QRCode value="http://www.viitto.com" style="width: 159px;height: 159px;border: 1px solid #EBEBEB;" v-if="qrLoading"></QRCode>
-        <div v-if="!qrCode" class="q-pt-md" style="position: absolute;left: 0;right: 0;">
+        <div v-loading="qrLoading">
+            <img :src="qrCode" style="width: 164px;height: 164px;border: 1px solid #EBEBEB;border-radius: 12px;" v-if="!qrLoading"></img>
+            <QRCode value="http://www.viitto.com" style="width: 159px;height: 159px;border: 1px solid #EBEBEB;" v-if="qrLoading"></QRCode>
+        </div>
+        <div v-if="!qrCode||loseEffect" class="q-pt-md" style="position: absolute;left: 0;right: 0;">
             <el-icon class="cursor-pointer">
                 <RefreshRight
                 v-if="!RefreshLoading"
@@ -43,6 +45,8 @@ const props = defineProps({
     },
 })
 
+const loseEffect = ref(false)
+
 
 const beginTimerHandler = ()=>{
     queryTimer.value = setInterval(async ()=>{
@@ -67,6 +71,7 @@ const getQrcode = async (type:any) =>{
             beginTimerHandler()
             scene_id.value = result.data.data.scene_id
         }
+        loseEffect.value = false
     }
     qrLoading.value = false
     if(type)RefreshLoading.value = false
@@ -84,8 +89,8 @@ const userLoginHandler = async ()=>{
         location.href='/space';
     }else if(result.status=='ERROR') {
         stopTimerHandler()
-        qrCode.value = ''
-        ElMessage.error({message:'一维码已失效，请重新获取'})
+        loseEffect.value = true
+        ElMessage.error({message:'二维码维码已失效，请重新获取'})
     }
 }
 

src/views/TeamCenter/Index.vue

@@ -55,7 +55,7 @@
             <span class="title">存储空间</span>
             <div class="text-small text-info q-mt-sm">会员可以使用平台全部预设模板</div>
           </div>
-          <el-button type="info" class="normal">会员尊享10G空间</el-button>
+          <el-button type="info" class="normal">会员尊享{{TravelDesign.CloudTotsl}}{{TravelDesign.CloudTotallnit}}空间</el-button>
         </div>
         <div style="font-size: 14px;" class="q-mt-xl">
           <el-progress :percentage="TravelDesign.storagePercent" />

src/views/UserCenter/Index.vue

@@ -59,7 +59,7 @@
             <span class="title">存储空间</span>
             <div class="text-small text-info q-mt-sm">会员可以使用平台全部预设模板</div>
           </div>
-          <el-button type="info" class="normal">会员尊享10G空间</el-button>
+          <el-button type="info" class="normal">会员尊享{{TravelDesign.CloudTotsl}}{{TravelDesign.CloudTotallnit}}空间</el-button>
         </div>
         <div style="font-size: 14px;" class="q-mt-xl">
           <el-progress :percentage="TravelDesign.storagePercent" />