添加优惠券

src/assets/css/common.css

@@ -183,3 +183,102 @@
 .brd0{
     border-radius: 0;
 }
+
+.pfR{
+    font-family: "PingFangR"
+}
+.commonF ._choice_box{
+      height: 19px;
+      position: absolute;
+      right: 10px;
+      bottom: 8px;
+      display: flex;
+      align-items: center;
+    }
+  .commonF  ._choice_box span{
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      line-height: 16px;
+      text-align: center;
+      background-color: white;
+      display: inline-block;
+      font-size: 12px !important;
+    }
+.commonF .sawtooth .input{
+    position: relative;
+    top: 2px;
+}
+.commonF .sawtooth {
+    /* 相对定位，方便让before和after伪元素绝对定位偏移 */
+    position: relative;
+    /* 把超出p的部分隐藏起来 */
+    overflow: hidden;
+    width:234px;
+    height:84px;
+    background: #6776D2;
+    display: inline-block;
+    margin-right:26px;
+    padding-left:20px;
+    color:#fff;
+
+}
+.commonF .sawtooth .kdj{
+    position: absolute;
+    display: inline-block;
+    width:51px;
+    height:22px;
+    background:rgba(255,231,27,1);
+    right:20px;
+    top:12px;
+    color:#7C6F01; 
+    font-size: 12px;
+    text-align: center;
+    line-height: 22px;
+ }
+.commonF .sawtooth:before, .sawtooth:after {
+    content: ' ';
+    width: 0;
+    height: 100%;
+    /* 绝对定位进行偏移 */
+    position: absolute;
+    top: 10px;
+}
+ 
+.commonF .sawtooth:before {
+    /* 圆点型的border */
+    border-right: 10px dotted white;
+    /* 偏移一个半径，让圆点的一半覆盖p */
+    left: -5px;
+}
+.commonF .Yhq{
+    background: #fff;
+    padding:20px 0;
+}
+.commonF .yhqUl{
+    padding:0 20px;
+    margin:20px 0;
+}
+.commonF .icon-xuanzhong2{
+    color: #31AA21;
+}
+.commonF .sawtooth:hover {
+    cursor: pointer;
+    /* box-shadow: 0px 1px 13px 0px rgb(189, 189, 189);
+    transition: all linear .5s; */
+}
+.commonF .yhqUl .blue{
+    background-color: #8794E2;
+  }
+  .commonF .yhqUl .blue:hover{
+    background-color: #6776D2;
+  }
+  .commonF .yhqUl .blue ._time{
+    color: #4C58A4 !important;
+  }
+  .commonF .yhqUl ._active{
+    background-color: #D9A24D;
+  }
+  .commonF .yhqUl .blue._active{
+    background-color: #6776D2;
+  }
\ No newline at end of file

src/components/FreeTravel/OrderConfirmation.vue

@@ -423,7 +423,8 @@ export default {
            dataDetail:{},
            form:{},
            freeMsg:{
-              custom:[],
+            custom:[],
+            
               
            },
            UserCanUseCouponList: [],
@@ -493,6 +494,8 @@ export default {
         this.freeMsg.custom=[];
         this.freeMsg.pay={};
         this.freeMsg.buyer_tel_country_code="86";
+        this.freeMsg.OrderSource=2;
+        this.freeMsg.OrderForm=1;
 
 
         // this.freeMsg.buyer_tel_number="13183813102";

src/components/LocalTour/Appointment.vue

@@ -273,13 +273,10 @@ export default {
           this.SettlementPrice = this.price
         }
         // this.SettlementPrice=parseInt(this.SettlementPrice).toFixed(2);
-        let allmonney=this.price - this.SettlementPrice;
+        // let allmonney=this.price - this.SettlementPrice;
         this.form.discountMoney = (this.price - this.SettlementPrice).toFixed(2);
         this.CouponIds=this.CouponIds.substring(0,this.CouponIds.length-1)
         this.form.couponAllotIds=this.CouponIds; 
-        
-        
-        
       },
       
       filterCoupon() {

src/components/newPersonalCenter/block/MyCoupon.vue

@@ -24,7 +24,7 @@
               <el-dropdown-item @click.native="dropdownText = '定制游'">定制游</el-dropdown-item>
               <el-dropdown-item @click.native="dropdownText = '签证', msg.couponsUseScope = 3, getList(), resetPageIndex()">签证</el-dropdown-item>
               <el-dropdown-item @click.native="dropdownText = '机票', msg.couponsUseScope = 4, getList(), resetPageIndex()">机票</el-dropdown-item>
-              <el-dropdown-item @click.native="dropdownText = '酒店'">酒店</el-dropdown-item>
+              <el-dropdown-item @click.native="dropdownText = '酒店', msg.couponsUseScope = 10, getList(), resetPageIndex()">酒店</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </li>

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

@@ -60,12 +60,14 @@
               </td>
               <td class="money">
                 <p>总额 ¥{{item.TotalPrice | priceFormat}}</p>
+                <p v-if="item.DiscountMoney">优惠金额 ¥{{item.DiscountMoney | priceFormat}}</p>
+                
               </td>
               <td class="color333 font-size14">
                 <span>{{item.OrderStatus}}</span>
               </td>
               <td style="text-align:center;">
-                <el-button size="mini"type="danger" v-if="item.OrderStatus!='已取消'"  @click="goPay(item)">立即付款</el-button> 
+                <el-button size="mini" type="danger" v-if="item.OrderStatus!='已取消'"  @click="goPay(item)">立即付款</el-button> 
                 <el-button style="margin: 10px 0 0 0;" v-if="item.OrderStatus!='已取消'" size="mini" @click="canCelHotel(item.ThirdOrderNo)">取消订单</el-button>
                  <el-button style="margin: 10px 0 0 0;" size="mini" @click="goDetail(item.OrderID)">详情</el-button>
               </td>

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

@@ -238,6 +238,7 @@
                 <p>总额 ¥{{item.totalPrice | priceFormat}}</p>
                 <!-- <p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥{{item.totalPrice | priceFormat}} <i class="iconfont icon-xia"></i></p> -->
                 <p class="__cp pay_no"  @click="item.payShow = false">已付总额 ¥{{item.income | priceFormat}} 
+                <p>优惠金额 ¥{{item.discountMoney | priceFormat}} 
                     <!-- <i class="iconfont icon-xia shang"></i> -->
                     </p>
                 <!-- :class="{height_aotu: item.payShow}" -->

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

@@ -106,6 +106,7 @@
               <p>总金额：￥{{scope.row.preferPrice | priceFormat}}</p>
               <p>实付金额：￥{{scope.row.customerPayMoney | priceFormat}}</p>
               <p>退款金额：￥{{scope.row.refund | priceFormat}}</p>
+              <p v-if="scope.row.discountMoney>0">优惠金额：￥{{scope.row.discountMoney | priceFormat}}</p>
             </template>
         </el-table-column>
         
@@ -329,6 +330,9 @@ export default {
 </script>
 
 <style>
+.CustomizedList .el-table thead{
+  color:#666666;
+}
 .CustomizedList .clearfix li.__cp._active {
     color: #E73828;
 }

src/components/taskPage/JuanList.vue

@@ -426,57 +426,19 @@
             @current-change="handleCurrentChange"
           ></el-pagination>
         </el-row>
-        <!-- <div class="content">
-            <vue-waterfall-easy ref="waterfall" :enablePullDownEvent='enableEvent' :maxCols='3' :imgWidth="385" :imgsArr="dataList" @scrollReachBottom="getDatatype">
-                <div class="img-info" slot-scope="props">
-                    <div @click="Gourl(props.value)" class="moreItem">
-                        <div class="itemImg">
-                            <div class="noneData">
-                            <img src="../../assets/img/logo_t.png" alt="">
-                            </div>
-                        </div>
-                        <div class="textDiv">
-                            <p class="text2 pfR" style="padding:16px 0">{{props.value.title}}</p>
-                            <p class="text2 f12 c88">
-                            <span v-html="props.value.descriptions"></span>
-                            </p> 
-                            <p style="display:flex;align-item:center;justify-content: flex-end;margin-top:10px">
-                            <span class="f12 cee pfR" style="text-decoration: underline">Read More</span>
-                            <img style="margin-left:10px" src="../../assets/img/juan/more.png" alt="">
-
-                            </p>
-                        </div>
-                    </div>
-                </div>
-            </vue-waterfall-easy>  
-                  
-        </div>   -->
+   
       </div>
       <div class="nodataDiv" v-if='dataList.length==0' style='width:100%;margin-top:50px;color: #ccc;'>
-          <div class="moreItem">
-              <div class="itemImg">
-                  <div class="noneData">
-                  <img src="../../assets/img/logo_t.png" alt="">
-                  </div>
-              </div>
-              <div class="textDiv">
-                  <p class="text2 pfR" style="padding:16px 0">暂无数据</p>
-                  <p class="text2 f12 c88">
-                  <span>暂无数据</span>
-                  </p> 
-                  <p style="display:flex;align-item:center;justify-content: flex-end;margin-top:10px">
-                  <span class="f12 cee pfR" style="text-decoration: underline">暂无数据</span>
-                  <img style="margin-left:10px" src="../../assets/img/juan/more.png" alt="">
-
-                  </p>
-              </div>
+          <div class="empty-data">
+              <i class="iconfont icon-kong"></i>
+              很抱歉，你想要的信息我们真的找不到了
           </div>
       </div> 
     </div>
    
     <div class="GreyDiv">
       <p class="f30" style="text-align:center">旅行<span style="color:#EE4454"> . 体验师</span></p>
-      <p class="f20" style="color:#999999;text-align:center">Hot Destinations</p>
+      <p class="f20" style="color:#999999;text-align:center">Travel Experiencer</p>
       <div class="iconDiv" style="margin-top:40px">
        <div class="w1200 basefix">
           <div class="iconItem">