Merge remote-tracking branch 'origin/master'

src/views/operation/orderDetail.vue

@@ -186,10 +186,7 @@
                     商户订单号：
                   </div>
                   <div>
-                    <el-input
-                      v-model="input"
-              
-                    ></el-input>
+                    <el-input v-model="input"></el-input>
                   </div>
                   <el-link
                     type="primary"
@@ -382,9 +379,11 @@
                       >强制完单</el-button
                     >
 
-                    <el-button type="warning" size="mini" @click="setpaystatus"
+                    <el-button
+                      type="warning"
+                      size="mini"
+                      @click="setpaystatus"
                       v-if="
-                       
                         dataSource.status * 1 >= 6 &&
                         (dataSource.orderSource * 1 == 6 ||
                           dataSource.orderSource * 1 == 4 ||
@@ -891,10 +890,11 @@ export default {
       this.driverStatus = true;
     },
     setpaystatusBtn() {
-      if (this.value < 1 && !this.input) {
+      var pattern = /([a-fA-F0-9]{32})/;
+      if (this.value < 1 && !pattern.test(this.input)) {
         this.$message({
           type: "info",
-          message: "商户订单号不能为空！",
+          message: "请输入32位商户订单号！",
         });
         return;
       }
@@ -984,9 +984,9 @@ export default {
       this.paystatus = true;
     },
     getpayInfoFun() {
-// let json={
-//   orderId:"20210301095247903_1H2wew42w7T2w"
-// }
+      // let json={
+      //   orderId:"20210301095247903_1H2wew42w7T2w"
+      // }
       getpayInfo(this.payData).then((res) => {
         if (res.status == 200) {
           this.input = res.data[0].businessSerial;