Browse Source

fix: 支付问题及样式

LaveyD 4 hours atrás
parent
commit
7554f540da

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ticket",
-  "version": "1.0.17.5",
+  "version": "1.0.17.6",
   "private": true,
   "description": "售检票系统",
   "author": "",

+ 3 - 3
src/components/GlobalComponents/OrderDetail.vue

@@ -343,9 +343,9 @@
             <el-table border :data="orderData.payContext.payList || []">
               <el-table-column prop="orderNo" label="支付订单号">
               </el-table-column>
-              <el-table-column prop="payStatus" label="支付状态">
+              <el-table-column prop="payStatus" label="支付状态" align="center">
                 <template slot-scope="scope">
-                  <el-tag :type="getPayStatus(scope.row.payStatus, 'type')">
+                  <el-tag :type="getPayStatus(scope.row.payStatus, 'type')" style="float: none">
                     {{ getPayStatus(scope.row.payStatus) }}
                   </el-tag>
                 </template>
@@ -404,7 +404,7 @@
             <div class="title" v-if="orderData.payContext && orderData.payChannel === '工行支付'" style="display: flex;justify-content: space-between;margin: 10px 0;">
               工行分账明细
             </div>
-            <el-table border :data="orderData.payContext.payGonghangSplitRecordList || []" :max-height="200">
+            <el-table v-if="orderData.payContext && orderData.payChannel === '工行支付'" border :data="orderData.payContext.payGonghangSplitRecordList || []" :max-height="200">
               <el-table-column prop="id" label="ID"> </el-table-column>
               <el-table-column prop="createTime" label="创建时间"> </el-table-column>
               <el-table-column prop="recNum" label="拆分顺序号"> </el-table-column>

+ 6 - 2
src/pages/sellManage/common/confirmMixin.js

@@ -181,6 +181,9 @@ export default {
       this.createOrder(this.params)
     },
     submit: debounce(1000, true, function (qrcode, cardInfo) {
+      this.handleSubmit(qrcode, cardInfo)
+    }),
+    handleSubmit (qrcode, cardInfo) {
       console.log(this.payType)
       // 西宁景区储值卡支付预留
       if (this.payType === 'VALUECARD' && this.scenicName === '西宁景区') {
@@ -246,7 +249,7 @@ export default {
 
       this.$log.warn(this.pageName + '支付下单')
       this.createOrder(this.params)
-    }),
+    },
     handleValueCardPay (cardInfo) {
       console.log('储值卡信息', cardInfo)
       this.$log.info('储值卡信息', JSON.stringify(cardInfo))
@@ -264,7 +267,8 @@ export default {
         return
       }
       this.payCodeDialogVisible = false
-      this.submit(this.payCode)
+      // 直接调用 handleSubmit,避免被 submit 的 1000ms 前置节流吞掉(扫码盒子输入极快时必现)
+      this.handleSubmit(this.payCode)
       // this.createOrder(this.params, true)
     },
     cancelOnlinePay () {