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

src/assets/utils/tripUtils.js

@@ -520,6 +520,7 @@ var tripUtils = {
       Description: "",
       Rank: 0,
       KMNumber:"",
+      ShowTripType:1,//1-单张图；2-多张图
     };
   },
 

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -6006,6 +6006,7 @@
           "sellorder_get_GetOrderListByTCID",
           msg,
           (res) => {
+            console.log("RegistrationList_sellorder_get_GetOrderListByTCID",res.data);
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;