Bläddra i källkod

二维码失效,请重试!

lifanagju_citu 4 månader sedan
förälder
incheckning
cb2cc2f4f7

+ 1 - 3
components.d.ts

@@ -29,6 +29,7 @@ declare module 'vue' {
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']
@@ -71,7 +72,4 @@ declare module 'vue' {
     VerifySlide: typeof import('./src/components/Verifition/Verify/VerifySlide.vue')['default']
     WangEditor: typeof import('./src/components/FormUI/wangEditor/index.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }

+ 2 - 1
src/views/mall/components/GoodsItem/index.vue

@@ -40,7 +40,8 @@ defineProps({
   }
 })
 
-const handleDetail = ({ id }) => {
+const handleDetail = (val) => {
+  debugger
   window.open(`/mall/goodsDetail/${id}`)
 }
 </script>

+ 3 - 2
src/views/mall/components/details/order/pay.vue

@@ -22,6 +22,7 @@
         </v-chip>
       </v-chip-group>
       <div v-if="tip" style="text-align: center;" class="mt-2">{{ tip }}</div>
+      <div v-if="isQrCodePay && !remainder" style="text-align: center;" class="my-10">二维码失效,请重试!</div>
       <div>
         <!-- 钱包支付 -->
         <div v-if="isWalletPay" class="py-10" style="text-align: center;">
@@ -43,7 +44,7 @@
         <!-- 模拟支付 -->
         <div v-if="payment === 'mock'" class="py-10"></div>
         <!-- 二维码支付 -->
-        <div v-if="isQrCodePay" style="text-align: center;">
+        <div v-if="isQrCodePay && remainder" style="text-align: center;">
           <QrCode :text="payQrCodeTxt" :width="170" style="margin: 0 auto;" />
           <div
             v-if="payQrCodeTxt"
@@ -173,7 +174,6 @@ const setOrder = async () => {
   try {
     const data = await getOrder(props.id, true) // 获取待支付的订单 (order:业务订单; orderInfo:支付订单)
     orderInfo.value = data || null
-    console.log('orderInfo:', data)
     // 设置支付状态
     checkPayStatus()
     // await updateAccountInfo()
@@ -283,6 +283,7 @@ const remainderCalc = () => {
   remainder -= 1000
   remainderZhShow.value = formatDuration(remainder)
   if (remainder <= 0) {
+    tip.value = ''
     emit('stopInterval') // 倒计时结束,关闭倒计时弹窗
   }
 }