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

src/assets/css/LocalCuisine.css

@@ -268,7 +268,8 @@
     margin-top:15px;
     background:rgba(255,248,249,1);
     border:1px solid rgba(249, 229, 232, 1);
-    height:80px;padding-top:15px;
+    /* height:80px; */
+    padding:15px 15px;
     box-sizing: border-box;
 }
 .LocalCuisineDetails .ydDiv .el-form-item{

src/assets/css/common.css

@@ -183,3 +183,111 @@
 .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;
+  }
+
+  .commonF ._trip_xiangqing_tips{
+    color: red !important;
+    font-size: 14px !important;
+  }
+  .commonF ._trip_xiangqing_tips span{
+    color: #3965B0;
+    cursor: pointer;
+  }
\ No newline at end of file

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>
@@ -200,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:'',
@@ -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;
@@ -277,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/LocalTour/Appointment.vue

@@ -263,23 +263,20 @@ export default {
           })
           this.CouponIds = CouponIds
           if (type === 1) {
-            this.SettlementPrice = this.price - CouponMoney
+            this.SettlementPrice = Math.round((this.price - CouponMoney) * 100) / 100
           } else if (type === 2) {
-            this.SettlementPrice = this.price * CouponSale
+            this.SettlementPrice = Math.round((this.price * CouponSale) * 100) / 100
           } else if (type === 0) {
-            this.SettlementPrice = this.price
+            this.SettlementPrice = Math.round(this.price * 100) / 100
           }
         } else {
-          this.SettlementPrice = this.price
+          this.SettlementPrice = Math.round(this.price * 100) / 100
         }
         // 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() {
@@ -293,7 +290,7 @@ export default {
         this.UserCanUseCouponList = list
       },
       SaveOrder(formName){
-          this.form.preferPrice=this.SettlementPrice;
+          this.form.preferPrice=this.price;
           if(this.form.useDate==""){
               this.Error("请选择使用日期！")
               return;

src/components/Ticket/Pay.vue

@@ -23,7 +23,7 @@
                 
               <div style="text-align:center;float:right"> 
               <span style="font-weight:200">应付金额</span>
-              <span style="color:#FF680B;font-size:18px">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
+              <span style="color:#FF680B;font-size:18px">￥{{Commoditydetails.customerPayMoney | priceFormat}}</span>
           </div>  
                   
             </div>
@@ -38,7 +38,7 @@
                   <div class="triangle_border_left"></div>
               </div>
               <p style="text-align:center;font-size:18px">支付金额
-                  <span style="color:#FF680B;font-size:20px;font-weight:700">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
+                  <span style="color:#FF680B;font-size:20px;font-weight:700">￥{{Commoditydetails.customerPayMoney | priceFormat}}</span>
               </p>
               <el-row style="margin-top:15px" v-loading="codeLoading">
                 <el-col class="position" style="padding-right:50px" :span="12">
@@ -110,7 +110,7 @@
           </div>
           <div class="div_2">
               <p>
-                <span>支付金额：￥{{Commoditydetails.preferPrice | priceFormat}}</span>
+                <span>支付金额：￥{{Commoditydetails.customerPayMoney | priceFormat}}</span>
                 <!-- <span>支付平台：支付宝</span> -->
               </p>
               <p>
@@ -172,8 +172,9 @@ export default {
       let Visainfo=JSON.parse(sessionStorage.Visainfo);
       this.Commoditydetails=Visainfo;
       this.Commoditydetails.airOrderId=Visainfo.AirOrderId;
+      this.Commoditydetails.customerPayMoney = Visainfo.customerPayMoney;
       this.code.OrderSource=Visainfo.orderResourceId;
-      this.code.total_fee=Visainfo.preferPrice+'';
+      this.code.total_fee=Visainfo.customerPayMoney+'';
       this.code.body=Visainfo.description;
       this.code.attach=`${Visainfo.costType}|${Visainfo.customerName}|${Visainfo.AirOrderId}|${Visainfo.customerId}|${Visainfo.outBranchId}`
     }else{
@@ -194,8 +195,9 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             this.Commoditydetails = res.data.data;
+            console.log("this.Commoditydetails",this.Commoditydetails)
             this.code.OrderSource=this.Commoditydetails.orderResourceId;
-            this.code.total_fee=this.Commoditydetails.preferPrice+'';
+            this.code.total_fee=this.Commoditydetails.customerPayMoney+'';
             this.code.body=this.Commoditydetails.description;
             this.code.attach=`${this.Commoditydetails.costType}|${this.Commoditydetails.customerName}|${this.AirOrderId}|${this.Commoditydetails.customerId}|${this.Commoditydetails.outBranchId}`
             // this.Time15();

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,15 @@
               </td>
               <td class="money">
                 <p>总额 ¥{{item.TotalPrice | priceFormat}}</p>
+                <p>实付款 ¥{{item.CustomerPayMoney}}</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>
@@ -191,7 +194,7 @@ export default {
             RB_Branch_id:item.RB_Branch_id,
             costType:item.costType,
             orderId:item.OrderID,
-            bookMoney:item.TotalPrice,
+            bookMoney:item.CustomerPayMoney,
             CancelTime:item.EndTime,
             hotelName:item.HotelName,
             totalPnumber:item.Number

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

@@ -193,7 +193,6 @@
               <td colspan="6">
                 <span class="time">{{item.createDate}}</span>
                 <span class="num">订单号：<span>{{item.id}}</span></span>
-                <!-- <span class="contacts"><i class="iconfont icon-dianhua"></i> <span>{{item.salesName}} {{item.salesMobile}}</span></span> -->
               </td>
             </tr>
             <tr class="info" @mouseenter="enter(index)" :key="index+100" @mouseleave="enter()" :class="{hover_bg: activeRow === index}">
@@ -205,7 +204,6 @@
                   <div class="_right">
                     <p class="color333 font-size14">{{item.diningName}}</p>
                     <p>{{item.mealName}}</p>
-                    <!-- <p>团号：{{item.tcid}}</p> -->
                   </div>
                 </div>
               </td>
@@ -215,8 +213,9 @@
                 <p>使用日期：{{item.useDate}}</p>
               </td>
               <td class="money">
-                <p>{{item.preferPrice | priceFormat}}</p>
-                
+                <p>总金额：{{item.preferPrice | priceFormat}}</p>
+                <p>应付款：{{item.customerPayMoney | priceFormat}}</p>
+                <p>优惠金额：{{item.discountMoney | priceFormat}}</p>
               </td>
               <td class="color333 font-size12">
                 <span v-if="item.status === 1">正常</span>
@@ -226,15 +225,10 @@
               <td>
                 <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 === 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 @click="Exit(item)" size="mini">取消订单</el-button>
                 </p>
-                
               </td>
             </tr>
           </template>
@@ -296,12 +290,12 @@ export default {
         });
       },
     Pay(item){
+      console.log(item)
       let data={};
       data=item.payInfo;
       data.AirOrderId=item.payInfo.airOrderId;
-      
+      item.payInfo.preferPrice = item.customerPayMoney
       sessionStorage.Visainfo=JSON.stringify(item.payInfo)
-      
       this.$router.push({
           name: "Pay",
           query: {

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>
@@ -323,7 +325,7 @@ export default {
       ],
       dialogFormVisible:false,
       exitMsg:{
-          order_no:'',
+          orderId:'',
           cancel_type:"",
           cancel_desc:"",
           CancelBy:'',
@@ -346,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:'',
@@ -362,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){
@@ -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/newPersonalCenter/block/model/OrderInfoModel/ScenTable.vue

@@ -223,7 +223,8 @@
                   <p style="margin-top:6px">{{item.contactMobile}}</p>
               </td>
               <td class="money">
-                <p>{{item.preferPrice | priceFormat}}</p>
+                <p>总金额：{{item.preferPrice | priceFormat}}</p>
+                <p>实付款：{{item.customerPayMoney | priceFormat}}</p>
                 <p style="color:#999999">已优惠：{{item.discountMoney | priceFormat}}</p>
                 
               </td>

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

@@ -236,8 +236,10 @@
               </td>
               <td class="money">
                 <p>总额 ¥{{item.totalPrice | priceFormat}}</p>
+                <p>实付款 ¥{{item.customerPayMoney | 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>优惠金额：￥{{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">

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;

src/plugins/index.js

@@ -15,13 +15,13 @@ export default {
                 //var domainUrl = "http://reborn.oytour.com"; //主域名
                 //  var domainUrl = "http://192.168.2.65:8025"//主域名
                 //  let domainUrl = "https://reborn.oytour.com";
-                let domainUrl = "http://test.viitto.com"
+                let domainUrl = "http://testapi.oytour.com"
                 // let domainUrl = "http://192.168.2.214:8082" 
                 // var domainUrl = "http://reborn.oytour.com";
                 let locationName = window.location.hostname;
                 if (this.isOnline()) {
-                    if (window.location.host.indexOf('viitto.com') != -1)
-                        domainUrl = "http://test.viitto.com"
+                    if (window.location.host.indexOf('testb2b.oytour.com') != -1)
+                        domainUrl = "http://testapi.oytour.com"
                     else if (window.location.host.indexOf('oytour.com') != -1)
                         domainUrl = "https://reborn.oytour.com"
                 }
@@ -30,26 +30,14 @@ export default {
                     DomainUrl: domainUrl,
                     //常用提交数据URL 
                     PostUrl: domainUrl + "/api/common/post",
-                    // javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
+                    // javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
+                    javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000",
                     // javaUrl: "http://efficient.oytour.com",
-                    javaUrl: "http://47.96.12.235:9001",
-                    // javaUrl: locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : locationName.indexOf('viitto') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000",
-                    javaUrl: "http://efficient.oytour.com",
-                    ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
-                    UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
+                    // javaUrl: "http://47.96.12.235:9001",
+                    ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
+                    UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
                     LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
                 };
-                // domainUrl = "https://reborn.oytour.com"
-                // var obj = {
-                //     //主地址
-                //     DomainUrl: domainUrl,
-                //     //常用提交数据URL 
-                //     PostUrl: domainUrl + "/api/common/post",
-                //     javaUrl: "http://efficient.oytour.com",
-                //     ViittoFileUrl:"http://imgfile.oytour.com",
-                //     UploadUrl: "http://upload.oytour.com",
-                //     LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
-                // };
                 return obj;
             },
             Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {