commit

js/root/orderSearch.js

@@ -2210,12 +2210,12 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
     function payConfirm(data, that, payType, noTicketno, isContinue) {
       if (!data.ticketno && !noTicketno) {
         layer.msg('<span class="text-danger">该订单无占座票号</span> ,无法自动支付!');
-      } else if (!isContinue && ['BOOKSUC', 'BIGBOOKSUC', 'AKAPPSUCCESS', 'PAYING', 'PaySuccess', 'PayError'].indexOf(data.status) == -1) {
+      } else if (!isContinue && ['BOOKSUC', 'BIGBOOKSUC', 'AKAPPSUCCESS', 'PAYING', 'PaySuccess', 'PayError', 'WEBBOOKSUC'].indexOf(data.status) == -1) {
         layer.msg('该订单状态：<span class="text-danger">[' + ticketStatus(data.status) + ']</span> ,无法自动支付!');
       } else {
         var btn = ['取消']
         var msg = '该订单状态：[<span class="text-danger">' + ticketStatus(data.status) + '</span>]，'
-        if (isContinue || ['BOOKSUC', 'BIGBOOKSUC', 'AKAPPSUCCESS', 'PayError'].indexOf(data.status) >= 0) {
+        if (isContinue || ['BOOKSUC', 'BIGBOOKSUC', 'AKAPPSUCCESS', 'PayError', 'WEBBOOKSUC'].indexOf(data.status) >= 0) {
           btn.unshift('确认')
           msg = `剩余舱位：[<span class="text-danger">${data.maxSeats}</span>] 报价：[<span class="text-danger">${data.totalprice}</span>]<br>占座价格：[<span class="text-danger">${data.bagprice}</span>] 官网价格：[<span class="text-danger">${data.priceinfo}</span>]<br>${msg}是否使用自动支付?`
         } else if (['PaySuccess'].indexOf(data.status) >= 0) {
@@ -2232,7 +2232,7 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
           skin: 'layui-layer-molv',
           yes: function () {
             layer.close(confirm)
-            if (isContinue || ['BOOKSUC', 'BIGBOOKSUC', 'AKAPPSUCCESS', 'PayError'].indexOf(data.status) >= 0) {
+            if (isContinue || ['BOOKSUC', 'BIGBOOKSUC', 'AKAPPSUCCESS', 'PayError', 'WEBBOOKSUC'].indexOf(data.status) >= 0) {
               pay({ innerpnr: data.qunarorderno, ticketno: data.ticketno, orderno: data.orderno }, that, payType)
             } else if (['PaySuccess'].indexOf(data.status) >= 0) {
               payInfo({ innerpnr: data.qunarorderno, ticketno: data.ticketno, orderno: data.orderno }, that, payType)

orderSearch.html

@@ -933,7 +933,7 @@
                 </div>
             </div>
             <div class="ibox-content">
-                <button type="button" class="btn btn-link btn-xs" id="passengerCopy"><i class="fa fa-clipboard"></i> 复制乘机人信息</button>{{if orderInfo.isAK||orderInfo.is5J}}
+                <button type="button" class="btn btn-link btn-xs" id="passengerCopy"><i class="fa fa-clipboard"></i> 复制乘机人信息</button>{{if orderInfo.isAK||orderInfo.is5J||orderInfo.isMM}}
                 <button type="button" class="btn btn-danger btn-xs fl-r m-f" id="checkOrder">核验订单</button>{{/if}}
                 <button type="button" class="btn btn-primary btn-xs fl-r m-f" id="rewrite" {{orderInfo.isRewrite? 'disabled': ''}}>{{orderInfo.isRewrite==1?'回填完成':orderInfo.isRewrite==2?'回填失败':'回填票号'}}</button>{{if orderInfo.status==1}}
                 <button type="button" class="btn btn-success btn-xs fl-r m-f" id="virtualCard" data-operator="{{orderInfo.operator}}" data-orderno="{{orderInfo.orderNo}}" data-totalprice="{{orderInfo.allPrice}}">查看虚拟卡</button>