bug修改

src/pages/sellManage/common/confirmMixin.js

@@ -202,8 +202,9 @@ export default {
         createOrder(this.params).then(res => {
           this.$log.warn(this.pageName + '下单成功')
           this.createOrderStatus = 1
-          this.orderTempInfo = res
-          this.$refs.XSCQrCodeReader.show(this.tickets, this.currentPayChannel)
+          this.orderTempInfo = res.data.order || {}
+          this.payCodeDialogVisible = true
+          // this.$refs.XSCQrCodeReader.show(this.tickets, this.currentPayChannel)
         })
         return
       }
@@ -255,13 +256,14 @@ export default {
         return
       }
       this.payCodeDialogVisible = false
-      this.createOrder(this.params, true)
+      this.submit(this.payCode)
+      // this.createOrder(this.params, true)
     },
     createOrder (params, isOnlinePay = false) {
-      if (this.payType === 'B_SCAN_C_PAY' && !isOnlinePay) {
-        this.payCodeDialogVisible = true
-        return
-      }
+      // if (this.payType === 'B_SCAN_C_PAY' && !isOnlinePay) {
+      //   this.payCodeDialogVisible = true
+      //   return
+      // }
 
       this.submitDisable = true
       params.tickets.forEach(ticket => {
@@ -280,6 +282,7 @@ export default {
       params.discountDescription = params.tickets.map((item) => item.discountDescription).filter(i => i).join('，')
       params.createOrderRemark = this.createOrderRemark
       this.tickets = params.tickets
+      // debugger;
 
       if (this.createOrderStatus === 1) {
         handlePay(this.params, this.orderTempInfo, this, () => { })

src/pages/sellManage/common/keyBind.js

@@ -58,11 +58,6 @@ export default function (e, vue) {
         return
       }
 
-      const qrCode2 = vue.$refs.orderInfo.$refs.confirm.$refs.XSCQrCodeReader
-      if (qrCode2 && qrCode2.visible) {
-        return
-      }
-
       if (confirmComponent.visible) {
         if (confirmComponent.submitDisable) return
         confirmComponent.submit()

src/pages/sellManage/retail/Confirm.vue

@@ -156,13 +156,13 @@
         取消
       </el-button>
 
-      <el-button
+      <!-- <el-button
         type="warning"
         v-if="showRefresh"
         :disabled="isRefresh"
         @click="payRefresh">
         刷新支付状态<span v-if="isRefresh">({{ countNum }})</span>
-      </el-button>
+      </el-button> -->
 
       <el-button
         type="danger"

src/pages/sellManage/retail/FormInfo.vue

@@ -596,7 +596,7 @@ export default {
 
   },
   watch: {
-    async currentTicket (val) {
+    async currentTicket (val, oldVal) {
       if (!val) return
 
       await this.$nextTick()
@@ -648,7 +648,7 @@ export default {
       }, 300)
 
       this.setTimeout = setTimeout(() => {
-        if (this.category === 'batch' || this.isTeam) return
+        if (this.category === 'batch' || this.isTeam || (val && !oldVal) || val.id === oldVal?.id) return
         if (!this.ticketAutoAddMap[val.id]) {
           this.ticketAutoAddMap[val.id] = true
           this.addToOrder()