Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Ticketing/IndividualTicketOrderDetails.vue

@@ -53,8 +53,15 @@
                 <td>{{item.Refund}}</td>
                 <td>{{item.PlatformTax}}</td>
                 <td>
-                    <span v-if="item.Status==1" type="success">正常</span>
+                    <p v-if="item.RefundStatus!=1">
+                    <span v-if="item.RefundStatus==2">退款中</span>
+                    <span v-if="item.RefundStatus==3">已退款</span>
+                  </p>
+                  <p v-else>
+                      <span v-if="item.Status==1">正常</span>
                       <span v-if="item.Status==2">取消</span>
+                      <span v-if="item.Status==3">待付款</span>
+                  </p>
                 </td>
                 </tr>
                 <tr style="height:20px">
@@ -306,7 +313,7 @@ export default {
         "ticket_get_GetScatteringOrderForAirTicketList",
         this.msg,
         res => {
-          // console.log(res);
+          console.log(res);
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;

src/components/TravelManager/TravelList/SalesTravelCoupomList.vue

@@ -389,7 +389,6 @@ import moment from "moment"
                     query: { 
                         customId: item.customId,
                         allotId: item.allotId,
-                        blank: "y", 
                         tab: "行程定制方案" 
                     }
                 });