提交订单中心

src/components/Ticket/Pay.vue

@@ -352,32 +352,32 @@ export default {
   position: absolute;
   top:8px;
 }
-.orderPay .div_2 p span:nth-child(2){
+.pay_vue .orderPay .div_2 p span:nth-child(2){
   float: right;
 }
-.orderPay .div_2 {
+.pay_vue .orderPay .div_2 {
   margin-top: 20px;
   width: 320px;
 }
-.orderPay .div_2 p{
+.pay_vue .orderPay .div_2 p{
   padding:6px 0;
   margin:20px 0;
   font-size: 12px;
   color:#333;
   border-bottom:1px solid rgba(221,221,221,1);
 }
-.orderPay .div_1 img{
+.pay_vue .orderPay .div_1 img{
   width: 54px;
   height:54px;
   position: absolute;
 
 }
-.orderPay .div_1{
+.pay_vue .orderPay .div_1{
   position: relative;
   box-sizing: border-box;
   
 }
-.orderPay{
+.pay_vue .orderPay{
   padding-top:130px;
   padding-left:150px;
   margin:30px auto;
@@ -387,7 +387,7 @@ export default {
     box-shadow:0px 4px 38px 0px rgba(107,107,107,0.2);
     box-sizing: border-box;
 }
-.orderPay .back{
+.pay_vue .orderPay .back{
   position: absolute;
   width: 384px;
   height: 289px;

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

@@ -233,9 +233,13 @@
                 <span v-else-if="item.status === 3">待付款</span>
               </td>
               <td>
-                <p v-if="item.status === 3" style="margin-bottom:10px;">
-                    <el-button @click="Pay(item)" size="mini" type="danger">查看详情</el-button>
+                <p v-if="item.status === 1 || item.status === 3" style="margin-bottom:10px;">
+                  <el-button @click="Pay(item)" size="mini" type="danger">支付</el-button>
+                  
                 </p>
+                <!-- <p v-if="item.status === 3" style="margin-bottom:10px;">
+                    <el-button @click="Pay(item)" size="mini" type="danger">查看详情</el-button>
+                </p> -->
                 <p v-if="item.status === 1 || item.status === 3" style="margin-bottom:10px;">
                     <el-button size="mini">取消订单</el-button>
                 </p>

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

@@ -216,14 +216,23 @@
                     width="200"
                     trigger="click">
                     <ul>
-                      <li class="__item">
+                      <li v-for="(guest,index) in item.guestList" :key="index+500" class="__item">
                         <div class="img">
 
                         </div>
                         <div class="__info">
-                          <p class="__name color333">李健国 <i class="iconfont icon-nan"></i></p>
-                          <p class="color666">13880879660</p>
-                          <p class="color666">房号：403 单人间</p>
+                          <p class="__name color333">{{guest.name}} 
+                            <i v-if="guest.sex==1" class="iconfont icon-nan"></i>
+                            <i v-if="guest.sex==2" class="iconfont icon-xingbie-nv"></i>
+                          </p>
+                          <p class="color666">{{guest.mobilePhone}}</p>
+                          <p class="color666">房号：
+                            <span v-if="guest.houseType==1">单间</span>
+                            <span v-if="guest.houseType==2">标准双人间</span>
+                            <span v-if="guest.houseType==3">大床房</span>
+                            <span v-if="guest.houseType==4">三人间</span>
+                            <span v-if="guest.houseType==5">拼凑双人间</span>
+                          </p>
                         </div>
                       </li>
                       

src/components/newPersonalCenter/block/model/TDDOrder.vue

@@ -15,7 +15,7 @@
       </template>
     </ul>
     <!-- 表格 -->
-    <TCTable :tableData="tableData" v-on:queryDays="queryDays"/>
+    <TCTable v-loading="orderLoading" :tableData="tableData" v-on:queryDays="queryDays"/>
 
     <div class="empty-data" v-if="tableData.length<1">
       <i class="iconfont icon-kong"></i>
@@ -43,7 +43,7 @@ export default {
     return {
       activeName: -1,
       currentPage: 1,
-      rderLoading: false,
+      orderLoading: false,
       totalCount: 1,
       Count: 1,
       WaitDealOrderPageList: "",

src/components/newPersonalCenter/block/model/TcOrder.vue

@@ -8,13 +8,13 @@
       <template v-for="item in TitList">
         <li
           class="__cp"
-          @click="handleClick(item)"
+          @click="handleClick(item)" :key="item.ID"
           :class="{_active: activeName === item.ID}"
         >{{item.Type}}</li>
       </template>
     </ul>
     <!-- 表格 -->
-    <TCTable :tableData ="tableData"/>
+    <TCTable  v-loading="orderLoading" :tableData ="tableData" v-on:queryDays="queryDays"/>
     <div class="empty-data" v-if="tableData.length<1">
       <i class="iconfont icon-kong"></i>
       很抱歉，你想要的信息我们真的找不到了
@@ -41,7 +41,7 @@ export default {
     return {
       activeName: -1,
       currentPage: 1,
-      rderLoading: false,
+      orderLoading: false,
       totalCount: 1,
       Count: 1,
       WaitDealOrderPageList: "",
@@ -78,22 +78,6 @@ export default {
           Type: "取消",
           ID: 5
         }
-        // {
-        //   val: 6,
-        //   lable: '等待商家确认'
-        // },
-        // {
-        //   val: 7,
-        //   lable: '退款中'
-        // },
-        // {
-        //   val: 8,
-        //   lable: '退款成功'
-        // },
-        // {
-        //   val: 9,
-        //   lable: '交易完成'
-        // },
       ],
       tableData: []
     };
@@ -109,6 +93,11 @@ export default {
     this.b2b_get_GetWaitDealOrderPageList();
   },
   methods: {
+    queryDays(val){
+      this.getOrderMsg.queryDays=val;
+      this.gerOrderList();
+
+    },
     b2b_get_GetWaitDealOrderPageList() {
       //获取待处理订单
       let msg = {

src/components/newPersonalCenter/block/model/TdOrder.vue

@@ -15,7 +15,7 @@
       </template>
     </ul>
     <!-- 表格 -->
-    <TCTable :tableData="tableData" v-on:queryDays="queryDays"/>
+    <TCTable v-loading="orderLoading" :tableData="tableData" v-on:queryDays="queryDays"/>
 
     <div class="empty-data" v-if="tableData.length<1">
       <i class="iconfont icon-kong"></i>
@@ -43,7 +43,7 @@ export default {
     return {
       activeName: -1,
       currentPage: 1,
-      rderLoading: false,
+      orderLoading: false,
       totalCount: 1,
       Count: 1,
       WaitDealOrderPageList: "",
@@ -80,22 +80,6 @@ export default {
           Type: "取消",
           ID: 5
         }
-        // {
-        //   val: 6,
-        //   lable: '等待商家确认'
-        // },
-        // {
-        //   val: 7,
-        //   lable: '退款中'
-        // },
-        // {
-        //   val: 8,
-        //   lable: '退款成功'
-        // },
-        // {
-        //   val: 9,
-        //   lable: '交易完成'
-        // },
       ],
       tableData: []
     };
@@ -113,7 +97,6 @@ export default {
   },
   methods: {
     queryDays(val){
-      console.log("val",val)
       this.getOrderMsg.queryDays=val;
       this.gerOrderList();
       

src/components/newPersonalCenter/block/model/TkOrder.vue

@@ -9,13 +9,13 @@
       <template v-for="item in TitList">
         <li
           class="__cp"
-          @click="handleClick(item)"
+          @click="handleClick(item)" :key="item.ID"
           :class="{_active: activeName === item.ID}"
         >{{item.Type}}</li>
       </template>
     </ul>
     <!-- 表格 -->
-    <NewTKtable :tableData="tableData"/>
+    <NewTKtable v-loading="orderLoading" :tableData="tableData"/>
     <div class="empty-data" v-if="tableData.length<1">
       <i class="iconfont icon-kong"></i>
       很抱歉，你想要的信息我们真的找不到了
@@ -42,7 +42,7 @@ export default {
     return {
       activeName: -1,
       currentPage: 1,
-      rderLoading: false,
+      orderLoading: false,
       totalCount: 1,
       Count: 1,
       WaitDealOrderPageList: "",

src/components/newPersonalCenter/block/model/TzOrder.vue

@@ -8,13 +8,13 @@
       <template v-for="item in TitList">
         <li
           class="__cp"
-          @click="handleClick(item)"
+          @click="handleClick(item)" :key="item.ID"
           :class="{_active: activeName === item.ID}"
         >{{item.Type}}</li>
       </template>
     </ul>
     <!-- 表格 -->
-    <TCTable :tableData="tableData"/>
+    <TCTable v-loading="orderLoading" :tableData="tableData" v-on:queryDays="queryDays"/>
     <div class="empty-data" v-if="tableData.length<1">
       <i class="iconfont icon-kong"></i>
       很抱歉，你想要的信息我们真的找不到了
@@ -41,7 +41,7 @@ export default {
     return {
       activeName: -1,
       currentPage: 1,
-      rderLoading: false,
+      orderLoading: false,
       totalCount: 1,
       Count: 1,
       WaitDealOrderPageList: "",
@@ -110,6 +110,11 @@ export default {
     this.b2b_get_GetWaitDealOrderPageList();
   },
   methods: {
+    queryDays(val){
+      this.getOrderMsg.queryDays=val;
+      this.gerOrderList();
+
+    },
     b2b_get_GetWaitDealOrderPageList() {
       //获取待处理订单
       let msg = {
@@ -135,9 +140,10 @@ export default {
         "/api/b2b/user/getrecentorder",
         this.getOrderMsg,
         res => {
-            console.log("自由行订单",res);
           if (res.data.resultCode == 1) { 
             this.tableData = res.data.data.pageData;
+            console.log("自由行订单",this.tableData);
+            
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
             this.orderLoading = false;

src/components/trade/order/indexTwo.vue

@@ -636,7 +636,7 @@ export default {
               this.priceList.forEach((x, i)=>{
                   if(x.startDate==this.chosenObj.startDate){
                       this.priceFlight=x
-                      let msg = {configId:this.priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:this.priceList[i].tcid}
+                      let msg = {configId:this.priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:this.priceList[i].tcid,teamType:2}
                       this.getDataT(msg, 2)
                       this.getUnicos(this.priceList[i].tcid)
                   }
@@ -949,7 +949,8 @@ export default {
             configId: this.ID,
             cityId: city,
             preview: this.pre,
-            tcid: this.tcid
+            tcid: this.tcid,
+            teamType:2
           };
           this.getData(msg, days);
         });
@@ -965,7 +966,7 @@ export default {
               let priceList = data.priceList;
               for ( let i = 0; i < priceList.length; i++) {
                   if (days===priceList[i].startDate){
-                      let msg = {configId:priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:priceList[i].tcid}
+                      let msg = {configId:priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:priceList[i].tcid,teamType:2}
                       this.getDataT(msg)
                   }
               }