Merge branch 'master' of https://gitlab.gsstcloud.com/poc/poc-fe into beta

package.json

@@ -40,7 +40,7 @@
     "spark-md5": "^3.0.2",
     "type-fest": "^4.26.1",
     "validator": "^13.12.0",
-    "vue": "^3.5.12",
+    "vue": "^3.5.13",
     "vue-i18n": "^9.14.0",
     "vue-router": "^4.4.5"
   },

src/views/equity/components/pay-sidebar.vue

 <script setup lang="ts">
 import { fetchCreateEquityOrder, fetchGetEquityPayQrCode, fetchGetPayStatus } from '@/apis/equity'
 import { useUserStore } from '@/store/modules/user'
-import { computed, onMounted, ref, watch, watchEffect } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 type VersionName = 'BasicVersion' | 'ProfessionalVersion' | 'FlagshipVersion' | 'EnterpriseVersion' | null
@@ -70,11 +70,15 @@ watch(currentPackageInfo, (info) => {
   }
 })
 
-watchEffect(() => {
-  if (isShowPayQrCode.value) {
+watch(
+  isShowPayQrCode,
+  (newVal) => {
+    if (newVal) {
       getEquityPayQrCode()
     }
-})
+  },
+  { immediate: true },
+)
 
 onMounted(() => {
   if (currentPackageInfo.value) {
@@ -185,7 +189,7 @@ function getPayStatus() {
 }
 
 function clearPayStatusTimer() {
-  if (payStatusTimer) {
+  if (payStatusTimer !== null) {
     clearInterval(payStatusTimer)
     payStatusTimer = null
   }
@@ -204,6 +208,10 @@ function handlePackageSwitch(packageKey: typeof currentSelectPackage.value, pric
 
   getEquityPayQrCode()
 }
+
+function handlePayQrCodeRefresh() {
+  getEquityPayQrCode()
+}
 </script>
 
 <template>
@@ -305,7 +313,10 @@ function handlePackageSwitch(packageKey: typeof currentSelectPackage.value, pric
           <div v-show="isPayQrcodeInvalid" class="flex-center absolute inset-0 flex">
             <div class="absolute inset-0 bg-[rgba(0,0,0,0.6)] blur-sm"></div>
 
-            <i class="iconfont icon-huanyihuan font-600 z-1 relative text-[30px] text-[#fff]"></i>
+            <i
+              class="iconfont icon-huanyihuan font-600 z-1 relative cursor-pointer text-[30px] text-[#fff]"
+              @click="handlePayQrCodeRefresh"
+            ></i>
           </div>
         </Transition>
       </div>

src/views/equity/components/point-recharge-modal.vue

@@ -213,6 +213,10 @@ function onModalAfterLeave() {
   clearPayStatusTimer()
   clearPayInfo()
 }
+
+function handlePayQrCodeRefresh() {
+  getEquityPayQrCode()
+}
 </script>
 
 <template>
@@ -319,7 +323,10 @@ function onModalAfterLeave() {
             <div v-show="isPayQrcodeInvalid" class="flex-center absolute inset-0 flex">
               <div class="absolute inset-0 bg-[rgba(0,0,0,0.6)] blur-sm"></div>
 
-              <i class="iconfont icon-huanyihuan font-600 z-1 relative text-[30px] text-[#fff]"></i>
+              <i
+                class="iconfont icon-huanyihuan font-600 z-1 relative cursor-pointer text-[30px] text-[#fff]"
+                @click="handlePayQrCodeRefresh"
+              ></i>
             </div>
           </Transition>
         </div>

src/views/equity/equity.vue

@@ -78,12 +78,11 @@ function handlePointRecharge() {
                 </div>
               </div>
 
-              <div
-                class="flex cursor-pointer select-none items-center justify-end text-[15px] text-[#0B7DFF]"
-                @click="handlePointRecharge"
-              >
+              <div class="flex select-none items-center justify-end text-[15px] text-[#0B7DFF]">
+                <span class="cursor-pointer" @click="handlePointRecharge">
                   <span>{{ t('equity_module.top_up_immediately') }}</span>
                   <i class="iconfont icon-left ml-[2px] inline-block rotate-180 text-[12px]"></i>
+                </span>
               </div>
             </section>
             <section