Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

components.d.ts

@@ -29,7 +29,6 @@ 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 +70,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']
-  }
 }

src/views/mall/components/details/order/confirm.vue

@@ -360,6 +360,22 @@
     if (Object.keys(state.userAccount).length) userAccount.value = state.userAccount
   })
 
+  // 获得支付方式 // 暂时只对接余额支付(wallet) 
+  const channel = 'wallet'
+  const payOrderSubmitFun = async () => {
+    // 提交支付订单
+    let obj = {
+      id: payState.orderInfo.id,
+      channelCode: channel,
+      channelExtras: {},
+    };
+    const res = await payOrderSubmit(obj)
+    console.log('提交支付订单payOrderSubmit:', res)
+    Snackbar.warning('支付成功！')
+    emit('paySuccess')
+    userStore.getUserInfos()
+  }
+
   // 设置支付订单信息
   const payImmediately = async (id) => {
     // 获得支付订单信息
@@ -369,10 +385,6 @@
       return;
     }
     payState.orderInfo = orderRes;
-    // 获得支付方式
-    // 
-    // 暂时只对接余额支付(wallet) 
-    const channel = 'wallet'
     // 对比余额是否不足 订单金额:orderInfo?.price-0
     const balance = userAccount.value?.balance ? userAccount.value.balance-0 : 0
     // const balanceShow = userAccount.value?.balance && userAccount.value?.balance > 0 ? (userAccount.value?.balance / 100.0).toFixed(2) : 0
@@ -382,17 +394,9 @@
         router.push({ path: '/personalRecharge' })
       })
     } else {
-      // 提交支付订单
-      let obj = {
-        id: payState.orderInfo.id,
-        channelCode: channel,
-        channelExtras: {},
-      };
-      const res = await payOrderSubmit(obj)
-      console.log('提交支付订单payOrderSubmit:', res)
-      Snackbar.warning('支付成功！')
-      emit('paySuccess')
-      userStore.getUserInfos()
+      Confirm(t('common.confirmTitle'), `将会从余额扣除￥${fen2yuan(state.orderInfo.price.payPrice)}，是否确定支付？`).then(() => {
+        payOrderSubmitFun()
+      })
     }
   }