Merge remote-tracking branch 'origin/master'

src/views/operation/orderDetail.vue

@@ -916,7 +916,7 @@ export default {
             this.driverStatus = true;
         },
         setpaystatusBtn() {
-            var pattern = /^[A-Za-z0-9]{32}/
+            var pattern = /^[A-Za-z0-9_]{32}/
            
             if (this.value < 1 && !pattern.test(this.input)) {
                 this.$message({
@@ -927,10 +927,9 @@ export default {
             }
             let data = this.payData;
             let a = this.datainput;
-        debugger
             let json = {
                 orderId: data.orderId,
-                tPaymentId: this.value < 1 ? !!this.datainput?a.businessId:'' : "",
+                tPaymentId: this.value < 1 ?this.input : "",
                 tPaymentStatus:2,
                 tPaymentType: this.value < 1 ?!!this.datainput?a.executeStatus:'4': "4",
                 tRealMoney:
@@ -1015,7 +1014,7 @@ export default {
             // let json={
             //   orderId:"20210301095247903_1H2wew42w7T2w"
             // }
-            getpayInfo(this.payData).then((res) => {
+            getpayInfo(json).then((res) => {
                 if (res.status == 200) {
                     this.input = res.data[0].businessSerial;
                     this.datainput = res.data[0];