Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/FreeTravel/payInfo.vue

@@ -206,7 +206,7 @@ export default {
     defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
     dialogFormVisible:false,
     exitMsg:{
-        order_no:'',
+        orderId:'',
         cancel_type:"",
         cancel_desc:"",
         CancelBy:'',
@@ -283,8 +283,8 @@ export default {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
             this.$emit('queryDays')
-            this. exitMsg={
-                order_no:'',
+            this.exitMsg={
+                orderId:'',
                 cancel_type:"",
                 cancel_desc:"",
                 CancelBy:'',

src/components/newPersonalCenter/block/model/OrderInfoModel/FreeTable.vue

@@ -325,7 +325,7 @@ export default {
       ],
       dialogFormVisible:false,
       exitMsg:{
-          order_no:'',
+          orderId:'',
           cancel_type:"",
           cancel_desc:"",
           CancelBy:'',
@@ -348,8 +348,8 @@ export default {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
             this.$emit('queryDays')
-            this. exitMsg={
-                order_no:'',
+            this.exitMsg={
+                orderId:'',
                 cancel_type:"",
                 cancel_desc:"",
                 CancelBy:'',
@@ -364,7 +364,7 @@ export default {
       Exit(item){
           let userInfo = this.getLocalStorage();
           this.dialogFormVisible=true;
-          this.exitMsg.order_no=item.OrderID;
+          this.exitMsg.orderId=item.OrderID;
           this.exitMsg.CancelBy=userInfo.name;
       },
       gopayInfo(item){