自由行使用优惠券

src/components/FreeTravel/FreeList.vue

@@ -609,7 +609,7 @@
             </div>
           </el-col>
         </el-row>
-        <div class="empty-data" v-if="dataList.length<1">
+        <div class="empty-data" v-if="dataList.length<1 && !laoding">
           <i class="iconfont icon-kong"></i>
           很抱歉，你想要的信息我们真的找不到了
         </div>
@@ -897,15 +897,22 @@ export default {
         if(item.id == "TAG_0") {
           delete this.msg.cat_main_keys
           this.msg.cat_keys = [item.list[0].id]
-        } else {
+          delete this.msg.keywords
+        } else if(item.id == "TAG_4") {
           this.msg.cat_main_keys = [item.id]
+          this.msg.keywords = '一日游'
           delete this.msg.cat_keys
+        }else {
+          this.msg.cat_main_keys = [item.id]
+          delete this.msg.cat_keys
+          delete this.msg.keywords
         }
        
         this.getList()
       } else {
         delete this.msg.cat_main_keys
         delete this.msg.cat_keys
+        delete this.msg.keywords
         this.getList()
       }
     },

src/components/FreeTravel/FreeList2.vue

@@ -488,7 +488,7 @@
             <div class="fl-ad-cont">
               <div class="search">
                 <span class="el-icon-close __cp" @click="addShow = !addShow"></span>
-                <el-input size="mini"></el-input>
+                <!-- <el-input size="mini"></el-input> -->
               </div>
               <el-row v-if="CCList.length>0 ">
                 <el-col :span="6">
@@ -643,7 +643,7 @@
             </div>
           </el-col>
         </el-row>
-        <div class="empty-data" v-if="dataList.length<1">
+        <div class="empty-data" v-if="dataList.length<1 && !laoding">
           <i class="iconfont icon-kong"></i>
           很抱歉，你想要的信息我们真的找不到了
         </div>
@@ -704,6 +704,7 @@ export default {
         ],
         "page_size": 16,
         "start": 0,
+        "keywords": '一日游'
       },
       priceSort: "PASC", // PDESC 高到低
       KkdayDomain: '',
@@ -952,13 +953,13 @@ export default {
       this.getList()
     },
     changeMainTag(e){
-      console.log(e)
       if(e.length > 0) {
         this.msg.cat_keys = e
       } else {
         delete this.msg.cat_keys
       }
       delete this.msg.cat_main_keys
+      delete this.msg.keywords
       this.getList()
     },
     changeNav(id, num){
@@ -966,12 +967,18 @@ export default {
         x.checkedCities = [];
       })
       this.typeTagIndex = num
-      if (id !== 'TAG_0') {
+      if (id !== 'TAG_0' && id !== "TAG_4") {
         this.msg.cat_main_keys = [id]
         delete this.msg.cat_keys
+        delete this.msg.keywords
+      } else if(id == "TAG_4") {
+        this.msg.cat_main_keys = [id]
+        this.msg.keywords = '一日游'
+        delete this.msg.cat_keys
       } else {
         delete this.msg.cat_main_keys
         this.msg.cat_keys = ["TAG_2_5"]
+        delete this.msg.keywords
       }
       this.getList()
     },
@@ -980,36 +987,6 @@ export default {
         name: "FreeHome",
       });
     },
-    // 选中小标签 加载数据
-    setChangeTag(item){
-      delete this.msg.cat_main_keys;
-      this.msg.cat_keys = item.checkedCities
-      this.getList()
-    },
-    // 游玩类型切换 取消其他选中
-    setChange(item, index){
-      if (item.checkd) {
-        this.typeTag.map((x, i)=>{
-          if (i !== index) {
-            x.checkd = false;
-            x.checkedCities = [];
-          }
-        })
-        if(item.id == "TAG_0") {
-          delete this.msg.cat_main_keys
-          this.msg.cat_keys = [item.list[0].id]
-        } else {
-          this.msg.cat_main_keys = [item.id]
-          delete this.msg.cat_keys
-        }
-       
-        this.getList()
-      } else {
-        this.msg.cat_main_keys = ["TAG_4"]
-        delete this.msg.cat_keys
-        this.getList()
-      }
-    },
     goDetails(obj){
       let dom = document.querySelector("#blankLink")
       let fullPath = `/FreeDetail?id=${obj.prod_no}`;

src/components/FreeTravel/payInfo.vue

@@ -53,7 +53,13 @@
                                 <el-col style="text-align:center" :span="6">{{oldModel.OldContent.price2_b2c}}</el-col>
                             </el-row>
                         </div>
-                        
+                        <div class="f14" >
+                            <el-row style="margin-bottom:7px">
+                                <el-col :span="6">优惠金额</el-col>
+                                <el-col :span="12"><div class="dashDiv"></div></el-col>
+                                <el-col style="text-align:center" :span="6">￥{{oldModel.DiscountMoney}}</el-col>
+                            </el-row>
+                        </div>
                         
                     </ul>
                 </div>
@@ -101,7 +107,7 @@
                         </li>
                          <div class="btnDiv">
                             <span @click="Exit" v-if="IsCanOrder==0" style="border:1px solid #EE4454;color:#EE4454">取消订单</span>
-                            <span @click="Pay" v-if="oldModel.Income!=oldModel.TotalPrice" style="background:#EE4454;color:#fff">立即付款</span>
+                            <span @click="Pay" v-if="oldModel.Income!=oldModel.TotalPrice && oldModel.CustomerPayMoney > 0" style="background:#EE4454;color:#fff">立即付款</span>
                         </div>
                         
                     </ul>
@@ -239,7 +245,7 @@ export default {
         let payInfoGo=this.payInfoGo;
         msg.CancelTime=payInfoGo.CancelTime;
         msg.OrderSource=15;
-        msg.total_fee=data.TotalPrice;
+        msg.total_fee=data.CustomerPayMoney;
         msg.body=payInfoGo.Describe;
         msg.orderId=data.OrderID;
         msg.costType=payInfoGo.costType;

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

@@ -230,6 +230,8 @@
               </td>
               <td class="money">
                 <p>总额 ¥{{item.TotalPrice | priceFormat}}</p>
+                <p v-if="item.DiscountMoney > 0">优惠金额 ¥{{item.DiscountMoney | priceFormat}}</p>
+                <p>应付金额 ¥{{item.CustomerPayMoney | priceFormat}}</p>
                 <p>实付金额 ¥{{item.Income | priceFormat}}</p>
                 <!-- <p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥{{item.customerPayMoney | priceFormat}} <i class="iconfont icon-xia"></i></p> -->
                 <!-- <p class="__cp pay_no" v-if="item.payShow"  @click="item.payShow = false">已付总额 ¥{{item.customerPayMoney | priceFormat}} <i class="iconfont icon-xia shang"></i></p> -->
@@ -247,7 +249,7 @@
                 <span>{{item.OrderStateStr}}</span>
               </td>
               <td>
-                  <p style="margin-bottom:6px" v-if="item.Income!=item.TotalPrice &&item.OrderStatus!=2">
+                  <p style="margin-bottom:6px" v-if="item.Income!=item.TotalPrice &&item.OrderStatus!=2 && item.CustomerPayMoney > 0">
                     <el-button @click="Pay(item)" size="mini" type="danger">立即支付</el-button>
 
                   </p>
@@ -382,7 +384,7 @@ export default {
         let data=item;
         msg.CancelTime=data.EndTime;
         msg.OrderSource=15;
-        msg.total_fee=data.TotalPrice;
+        msg.total_fee=data.CustomerPayMoney;
         msg.body=data.Describe;
         msg.orderId=data.OrderID;
         msg.costType=data.costType;

src/components/trade/order/indexTwo.vue

@@ -2,9 +2,6 @@
     @import url('../../../assets/trip/trade/index.css');
     ._coupon_box{
       border-bottom: 1px dashed #E5E5E5;
-    }
-    ._no_coupon{
-
     }
     ._pay_info{
       margin: 20px 0 0 0;