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

src/App.vue

@@ -78,6 +78,7 @@ export default {
 @import './assets/global/font.css';
 @import '//at.alicdn.com/t/font_863923_juczt3mz8sh.css';
 @import './assets/global/global.css';
+@import './assets/css/common.css';
 body,html{
   padding: 0px;
   margin: 0px;

src/assets/css/groupTour/index.css

@@ -98,6 +98,11 @@
   color:#666666;
   font-size: 12px;
   margin-top:8px;  
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
 }
 .GroupTour .GroupTour_top_bg .typeLi>li .typeAdress span{
   margin-right: 5px;

src/assets/css/home.css

@@ -343,6 +343,10 @@ p {
 a{
   text-decoration: none;
 }
+.Home .Grouptour .tour_left_content span:hover a{
+  text-decoration: underline;
+  color: #ee4454;
+}
 .Home .Grouptour .tour_left_content span a{
   color: #333333;
 }
@@ -390,10 +394,14 @@ a{
 }
 .Home .Grouptour .tour_right_item .Remarks{
   position: absolute;
-  bottom: 6px;
+  bottom:0;
   font-size: 12px;
   color: #fff;
-  padding: 0 6px;
+  padding:2px 6px;
+  width: 100%;
+  box-sizing: border-box;
+  background: rgba(0,0,0,0.35);
+  
 }
 .Home .travel_right_content{
   height: 323px;
@@ -414,11 +422,14 @@ a{
   height: 100%;
 }
 .Home .travel_right_content .travel_right_item .Remarks{
+  width: 100%;
   position: absolute;
-  bottom: 10px;
-  padding: 0 6px;
+  bottom: 0px;
+  padding:6px;
   color:#fff;
   font-size: 12px;
+  box-sizing: border-box;
+  background:linear-gradient(0deg,rgba(0,0,0,0.6) 0%,rgba(0,0,0,0) 100%);
 }
 .Home .travel_samll_div{
   width: 470px;

src/assets/css/localtourhome.css

@@ -139,6 +139,11 @@
     color:#333333;
     top: 18px;
     right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
 }
 .Localtourhome .outoneday .dayContent .dayConDiv1 div .price{
     position: absolute;

src/components/DependentTravel/IndependentList.vue

@@ -25,8 +25,8 @@
                     <div>
                         <div class="select_title" style="top:15px">线路</div>
                         <ul class="select_ul" :class="lineselect?'':'select_ul_height'">
-                           <li @click="ChangeLine(0)" :class="listmsg.lineId==0?'visa_active':''">不限</li>
-                           <li @click="ChangeLine(item.id)" :class="listmsg.lineId==item.id?'visa_active':''" v-for="item in linesList" :key="item.id">{{item.name}}</li>
+                           <li @click="ChangeLine(0)" :class="listmsg.lineTeamId==0?'visa_active':''">不限</li>
+                           <li @click="ChangeLine(item.id)" :class="listmsg.lineTeamId==item.id?'visa_active':''" v-for="item in linesList" :key="item.id">{{item.name}}{{item.id}}</li>
                             
                         </ul>
                         <span class="czd" @click="ChangeSelect(2)">{{lineselecttext}}<i :class="lineselect?'rolate':''" class="iconfont icon-moban"></i></span>
@@ -233,7 +233,7 @@ export default {
           this.listmsg.searchKey=this.$route.query.keywords;
       }
      if(this.$route.query.lineteamId){
-         this.listmsg.lineId=this.$route.query.lineteamId;
+         this.listmsg.lineTeamId=this.$route.query.lineteamId;
      }
      this.isLogin=this.$store.state.isLogin;
     if(this.isLogin==1){
@@ -355,7 +355,7 @@ export default {
     
        //   选择线路
     ChangeLine(id){
-        this.listmsg.lineId=id;
+        this.listmsg.lineTeamId=id;
         this.GetList();
     },
      loadRecoItems(){
@@ -372,6 +372,8 @@ export default {
           this.GetList();
       },
     GetList(){
+         
+         
         this.listmsg.minPrice=-1;
         this.listmsg.maxPrice=-1;
           if(this.minPrice!=''){

src/components/DependentTravel/IndependentTravel.vue

@@ -945,14 +945,7 @@ p {
   border-bottom: 0;
   text-align: center;
   float: left;
-  box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186);
-  /* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35);
-   */
-   /* box-shadow: */
-/* 1px 0px 0px 0px #E2B2D1, //左边阴影 */
-/* 0 -2px 3px -1px transparent, //顶部阴影 */
-/* 0 2px 3px -1px transparent, //底部阴影 */
- /* 0px 0px 0px 0px #E2B2D1; //右边阴影 */
+  /* box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186); */
 }
 ._top_box .wrap2{
   background:rgba(71,165,255,1);
@@ -987,7 +980,7 @@ p {
   overflow: hidden;
   left:0;
   border:1px solid rgba(226, 178, 209, 1);
-  box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186);
+  /* box-shadow: -2px 0 1px -1px rgb(219, 170, 186),2px 0 3px -1px rgb(219, 170, 186); */
   border-radius: 5px;
   border-top: 0;
   border-bottom: 0;

src/components/DependentTravel/PersonalTailor.vue

@@ -40,7 +40,7 @@
   .PersonalTailor .main .info .info_.info_left .info_left_sub{
     display: flex;
     align-items: center;
-    padding: 15px 30px;
+    padding: 15px 9px;
   }
   .PersonalTailor .main .info .info_.info_left .info_left_sub ._sub_left>._icon,._sub_right>._icon{
     display: inline-block;
@@ -200,7 +200,7 @@
   <div class="PersonalTailor">
     <el-row class="max-w1500">
       <el-col class="header"></el-col>
-      <el-col v-loading="loading" :span="18" :offset="3" class="main" v-show="!orderShow">
+      <div style="width:1180px;margin:0 auto" v-loading="loading" class="main" v-show="!orderShow">
         <el-row class="info">
           <el-col :span="14" class="info_ info_left">
             <p class="info_left_tit">填写需求，快速定制行程</p>
@@ -217,17 +217,17 @@
                 <span> 2、联系人信息</span>
               </div>
             </div>
-            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm">
-              <div v-if="showType === 1">
+            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
+              <div v-show="showType === 1">
                 <el-form-item label="出发地：">
                   <el-popover v-model="startcity"
                       placement="bottom"
                       trigger="click">
-                          <div v-show="startcity" class="citycompent">
+                          <div class="citycompent">
                               <v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city>
                           </div>
                       <span slot="reference">
-                          <el-input size="small" :disabled="true" clearable @focus="CityCompStatus('start')" class="ChooseCity w220" v-model="ruleForm.departureName" placeholder="城市">
+                          <el-input size="small" clearable readonly="readonly"  @focus="!startcity" class="ChooseCity w220" v-model="ruleForm.departureName" placeholder="城市">
                           </el-input>
                       </span>
                     </el-popover>
@@ -240,7 +240,7 @@
                           <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
                       </div>
                       <span slot="reference">
-                          <el-input size="small" :disabled="true" clearable @focus="!endcity" class="ChooseCity w220" v-model="ruleForm.destinationNames" placeholder="城市">
+                          <el-input size="small" clearable readonly="readonly" @focus="!endcity" class="ChooseCity w220" v-model="ruleForm.destinationNames" placeholder="城市">
                           </el-input>
                       </span>
                     </el-popover>
@@ -301,7 +301,7 @@
                   <el-button type="primary" class="_next w100" @click="onSubmit" size="small">下一步</el-button>
                 </el-form-item>
               </div>
-              <div v-else>
+              <div v-show="showType === 2">
                 <el-form-item prop="contact" label="联系人：">
                   <el-input v-model="ruleForm.contact" size="small" class="w220" placeholder="必填，定制师对您的称呼"></el-input>
                 </el-form-item>
@@ -348,7 +348,7 @@
           </el-col>
         </el-row>
 
-      </el-col>
+      </div>
        <!--  -->
       <el-col v-show="orderShow" class="ordershow" el-col :span="18" :offset="3">
         <div class="content">
@@ -426,7 +426,7 @@ export default {
           { type: 'string', required: true, message: '请选择日期', trigger: 'change' }
         ],
         phoneNumber: [
-          { required: true, message: '请输入电话', trigger: 'blur' },
+          { required: true, message: '请输入手机号', trigger: 'blur' },
           { required: true, trigger: 'blur', pattern: /^1[3|4|5|7|8][0-9]\d{8}$/ ,message: '请填写正确的手机号'}
         ],
         contact: [
@@ -439,6 +439,7 @@ export default {
       destinationarr:[],
       OrderId:0,
       orderShow:false,
+      isLogin:0,
     }
   }, 
   methods: {
@@ -459,6 +460,7 @@ export default {
     SubmitOK(){
       let that=this;
       this.$refs['ruleForm'].validate((valid) => {
+        console.log(valid);
           if (valid) {
             if(that.ruleForm.departureName==""){
               this.Error("请选择出发地！")
@@ -468,7 +470,16 @@ export default {
               this.Error("请选择目的地！")
               return;
             }
+            
+            return
+            if(that.isLogin==0){
+              this.Error("请先登录！")
+              this.$router.push({name:'login'})
+              return;
+            }
+
             this.loading=true;
+
             this.apiJavaPost(
               "/api/b2b/free/setTravelCusotom",
               that.ruleForm,
@@ -493,8 +504,6 @@ export default {
     },
     onSubmit: function() {
       let that=this;
-      this.$refs['ruleForm'].validate((valid) => {
-          if (valid) {
             if(that.ruleForm.departureName==""){
               this.Error("请选择出发地！")
               return;
@@ -513,11 +522,6 @@ export default {
             }
             
             this.showType = 2;
-          } else {
-            
-            return false;
-          }
-        });
     },
     handleClose(tag){
       let that=this;
@@ -565,14 +569,7 @@ export default {
     CityCompClose1(val) {
       this.endcity = false;
     },
-    //   城市组件状态
-    CityCompStatus(str) {
-      if (str == "start") {
-        this.startcity = true;
-      } else {
-        this.endcity = true;
-      }
-    },
+    
     //  出发地关闭子组件
     CityCompClose(val) {
       this.startcity = false;
@@ -600,7 +597,7 @@ export default {
   }, mounted() {
 
   },created(){
-    
+    this.isLogin=this.$store.state.isLogin;
     this.active = [
       {
         lable: '线路设计',

src/components/GroupTour/block/diving.vue

@@ -104,7 +104,7 @@
     <el-row :gutter="20">
       <template v-for="(item, index) in data">
         <el-col :span="6" v-if="index < 8">
-          <div class="item" >
+          <div class="item" @click="goUrl(item)">
             <div class="label">
               {{item.title.substr(0, 2)}}
             </div>
@@ -138,7 +138,11 @@ export default {
     }
   },
   methods: {
-    
+    goUrl(item){
+      let path = 'detailTwo'
+      path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`;
+      this.$router.push({ path })
+    },
   },
   mounted () {
     console.log("data",this.data)

src/components/GroupTour/block/list.vue

@@ -310,7 +310,7 @@
             <el-tab-pane :label="lineItem.name" :name="`${lineItem.id}_${index}`"></el-tab-pane>
           </template>
         </el-tabs>
-        <div class="more">更多特惠>></div>
+        <div class="more"><router-link style="color:#888888;text-decoration: none;" :to="{ path: '/search',query:{'keywords':'','lineId':dataList.name} }">更多特惠>></router-link></div>
       </el-row>
       <el-row class="right_bottom" :gutter="20">
         <template v-if="dataList.pageData && dataList.pageData.length > 0">
@@ -410,6 +410,11 @@ export default {
     }
   },
   methods: {
+    GoMore(path,dataList){
+      console.log(dataList)
+      return;
+      this.$router.push({ path })      
+    },
     goUrl(id, obj){
       let path = 'detailTwo'
       path=`${path}/${encodeURIComponent(id)}/${obj.tcid}`;

src/components/GroupTour/index.vue

@@ -155,7 +155,6 @@ export default {
             },null)
     },
     loadModuleData(sno){
-      console.log(this.recoItems.line)
       if(sno < this.recoItems.line.length){
         let msg={
           pageIndex: 1,

src/components/Home.vue

@@ -364,7 +364,7 @@
           <!-- 跟团游 -->
           <div class="Grouptour">
               <div class="tour_left">
-                  <p>跟团游</p>
+                  <p class="pfR">跟团游</p>
                   <div class="tour_left_content">
                       <p style="font-size:14px;font-weight:700">热门目的地</p>
                       <span v-if="index<10" v-for="(item,index) in packageTravel.placeNames" :key="index">
@@ -399,7 +399,7 @@
           <!-- 自由行 -->
           <div class="travel Grouptour">
               <div class="tour_left">
-                  <p>自由行</p>
+                  <p class="pfR">自由行</p>
                   <div class="tour_left_content travel_left" style="height:325px;">
                       <p style="font-size:14px;font-weight:700">热门目的地</p>
                       <span v-if="index<7" v-for="(item,index) in freeTravel.placeNames" :key="index">
@@ -480,7 +480,7 @@
                                 <div>
                                     <p class="Remarks text2" style="height:34px">{{item.name}}</p>
                                     <span style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
-                                         {{item.b2bPrice | NoDesnum}}    
+                                         {{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}} 
                                     </span>起</span>
                                     <span style="color:#666666;float:right;margin-top:6px">席位充足</span>
                                 </div>
@@ -502,7 +502,7 @@
                         <div class="hot_right">
                             <p class="text2" style="height:34px">{{item.name}}</p>
                             <p style="text-align:right"><span style="color:#FF6600">￥<span style="font-size:16px;font-weight:bold">
-                                 {{item.b2bPrice | NoDesnum}}    
+                                 {{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}    
                             </span>起</span></p>
                         </div>
                     </li>
@@ -519,8 +519,8 @@
                   </span>
                   
               </el-col>
-              <el-col :span="5">
-                  <p style="font-size:20px;color:#202020">客户第一的购买政策</p>
+              <el-col :span="5" style="text-align:left">
+                  <p class="pfR" style="font-size:20px;color:#202020">客户第一的购买政策</p>
                   <p style="font-size:12px;color:#FF9000">快速响应客户需求，开心出游你、我、他</p>
               </el-col>
               <el-col :span="2">
@@ -529,7 +529,7 @@
                   </span>
                   
               </el-col>
-              <el-col :span="4">
+              <el-col :span="4" style="text-align:left">
                   <p style="font-size:20px;color:#202020">专业行程定制师</p>
                   <p style="font-size:12px;">定制套餐自由搭配 <br> 价位行程自行安排 保障最优出行
                         </p>
@@ -540,19 +540,19 @@
                   </span>
                   
               </el-col>
-              <el-col :span="4">
+              <el-col :span="4" style="text-align:left">
                   <p style="font-size:20px;color:#202020">7*24小时客服服务</p>
                   <p style="font-size:12px;">24小时订单客服<br>随时解决客服需求咨询</p>
               </el-col>
-              <el-col :span="2">
+              <el-col :span="2" >
                   <span class="icon1 icon">
                       <i class="iconfont icon-Shape2"></i>
                   </span>
                   
               </el-col>
-              <el-col :span="3">
-                  <p style="font-size:12px;color:#FF9000">客服服务电话</p>
-                  <p style="font-size:12px;color:#FF9000">028-88888888</p>
+              <el-col :span="3" style="text-align:left">
+                  <p style="font-size:14px;color:#FF9000">客服服务电话</p>
+                  <p class="pfR" style="font-size:18px;color:#FF9000">028-88888888</p>
               </el-col>
           </el-row>
           <!-- 酒店 -->

src/components/IntegralMall/OrderdetailsCompleted.vue

@@ -169,7 +169,7 @@
             </div>
             <div class="Order_Top_right">
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-order_icon" v-if="dataList.orderStatus==1"/>
+                    <i class="iconfont icon-order_icon" v-if="dataList.orderStatus==1||dataList.orderStatus==2||dataList.orderStatus==3||dataList.orderStatus==4"/>
                     <i class="iconfont icon-order_icon" v-else style="color:gray"/>
                       待处理
                 </div>
@@ -177,7 +177,7 @@
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-xunhuan" v-if="dataList.orderStatus==2"/>
+                    <i class="iconfont icon-xunhuan" v-if="dataList.orderStatus==2||dataList.orderStatus==3||dataList.orderStatus==4"/>
                     <i class="iconfont icon-xunhuan" v-else style="color:gray"/>
                       待配送
                 </div>
@@ -185,7 +185,7 @@
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-if="dataList.orderStatus==3"></i>
+                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-if="dataList.orderStatus==3||dataList.orderStatus==4"></i>
                     <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-else style="color:gray"></i>
                       配送中
                 </div>

src/components/IntegralMall/block/detailsLeftHot.vue

@@ -65,7 +65,7 @@
       </el-col>
     </el-row>
     <ul v-if="showList==1">
-      <li class="list_item" v-for="item in dataList"  @click="goDetail(item.id)">
+      <li class="list_item" v-for="(item,index) in dataList"  @click="goDetail(item.id)" v-if="index<5">
         <div>
           <img :src="getImgUrl(item.images)" alt="">
         </div>
@@ -74,7 +74,7 @@
       </li>
     </ul>
     <ul v-else>
-      <li class="list_item" v-for="item in dataList" @click="goDetail2(item.Id)">
+      <li class="list_item" v-for="(item,index) in dataList" @click="goDetail2(item.Id)" v-if="index<5">
         <div>
           <img :src="getImgUrl(item.Images)" alt="">
         </div>

src/components/IntegralMall/confirOrder.vue

@@ -115,9 +115,11 @@
 }
 .confirOrder .product_box {
   margin-top: 30px;
+  background-color: #fff;
 }
 .confirOrder .product_box .product_item{
   display: flex;
+  margin:30px 0 20px 20px;
 }
 .confirOrder .product_box .product_item .img_box{
   width: 80px;
@@ -131,18 +133,28 @@
 }
 .confirOrder .product_box .product_name {
   color: #333333;
+  display:inline-block;
+  width:400px;
 }
 .confirOrder .product_box .product_color {
   color: #999999;
 }
+.confirOrder .product_box .sunm{
+  width:100%;
+  height:90px;
+  background-color: #fff;
+}
 .confirOrder .product_box .sunm p{
   text-align: right;
-  padding: 20px;
   font-size: 12px;
+  height:60px;
+  line-height: 60px;
+  padding:0 20px;
+  margin:0 20px;
+  position: relative;
+  top:5px;
   color: #333333;
-  border: 1px solid #ECECEC;
-  border-top: none;
-  background-color: white;
+  background-color: #ECECEC;
 }
 .confirOrder .product_box .small_s {
   font-size: 14px;
@@ -175,10 +187,27 @@
   font-size: 18px;
 }
 .confirOrder .details_box .details_box_btn{
-  margin-top: 30px;
+  margin: 40px 0 20px 0;
 }
 .confirOrder .details_box .details_box_btn .edit_addr_btn{
-  padding: 13px 48px;
+  padding: 17px 56px;
+  font-size:20px;
+}
+.confirOrder .confirTable tr th{
+  color:#666666;
+  height:54px;
+  text-align: left;
+  padding:0 20px;
+  border-bottom:1px solid #ECECEC;
+  font-size:16px;
+}
+.confirOrder .confirTable tr th:first-child{
+  color:#333333;
+}
+.confirOrder .confirTable td{
+  color:#333333;
+  font-size:12px;
+  padding:0 20px;
 }
 </style>
 <template>
@@ -252,47 +281,40 @@
       </el-row>
       <!-- product -->
       <el-row class="product_box">
-        <el-table :data="tableData" border style="width: 100%">
-          <el-table-column prop="images" label="商品信息">
-            <template slot-scope="scope">
+        <table class="confirTable">
+            <tr>
+              <th>商品信息</th>
+              <th width="200">单价</th>
+              <th width="200">数量</th>
+              <th width="100">小计</th>
+            </tr>
+            <tr>
+              <td>
                 <div class="product_item">
                   <div class="img_box">
-                  <img :src="scope.row.imgUrl" alt=""/>
+                    <img v-if="dataList.images" :src="getImgUrl(dataList.images)" alt=""/>
                   </div>
                   <div>
-                  <p class="product_name">{{scope.row.date}}</p>
-                  <!-- <p class="product_color">颜色：{{scope.row.color}}</p> -->
+                    <p class="product_name">{{dataList.name}}</p>
                   </div>
                 </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="name" label="单价" width="180">
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">{{scope.row.score }} 积分</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num" label="数量" width="80">
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">* {{scope.row.num }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="小计" width="180">
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.score * scope.row.num }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
+              </td>
+              <td>{{dataList.price}}积分</td>
+              <td>×{{buyNum}}</td>
+              <td>{{dataList.price*buyNum}}积分</td>
+            </tr>
+        </table>
         <div class="sunm">
-          <p>合计：<span class="small_s">￥ <span>{{tableData[0].score*tableData[0].num}}</span>积分</span></p>
+          <p>合计：<span class="small_s">￥ <span>{{dataList.price*buyNum}}</span>积分</span></p>
         </div>
       </el-row>
       <!-- details -->
       <el-row class="details_box">
         <div class="details_box_info">
-          <p>商品金额 <span>¥ {{tableData[0].score*tableData[0].num}}积分</span></p>
+          <p>商品金额 <span>¥ {{dataList.price*buyNum}}积分</span></p>
           <p>总积分 <span>¥ {{score}}积分</span></p>
           <p>运费 <span>0元</span></p>
-          <p>应付 <span class="_pay">¥ <span>{{tableData[0].score*tableData[0].num}}</span> 积分</span></p>
+          <p>应付 <span class="_pay">¥ <span>{{dataList.price*buyNum}}</span> 积分</span></p>
         </div>
         <div class="details_box_btn">
           <span class="edit_addr_btn" @click="goDetail(id)" style="margin-right:20px;">取消</span>
@@ -335,21 +357,14 @@ export default {
         desc: [{ required: true, message: "请输入详细地址", trigger: "blur" }],
         addr: [{ required: true, message: "请输入地址", trigger: "blur" }]
       },
-      tableData: [
-        {
-          date: "",
-          imgUrl:'',
-          color: '白色',
-          score:0,
-          num:0
-        },
-      ],
       OrderAddList: [],
       upAddressId:0,
       addressObj:[],
       id:0,
       //个人总积分
       score:0,
+      buyNum:0,
+      dataList:{},
     };
   },
   methods: {
@@ -417,11 +432,7 @@ export default {
           this.loading = false;
           if (res.data.resultCode === 1) { 
             let detail = res.data.data;
-            console.log(res,'ressssss');
             this.dataList = res.data.data;
-            this.tableData[0].date = res.data.data.name;
-            this.tableData[0].imgUrl = res.data.data.images.split(',')[0];
-            this.tableData[0].score = res.data.data.price;
           } else {
             this.Error(res.data.message);
           }
@@ -441,18 +452,18 @@ export default {
     },
     //兑换商品
     exchangeGood(){
-      if(this.score<this.tableData[0].score){
+      if(this.score<this.dataList.price){
         this.Error("积分太少，无法兑换");
         return;
       }
       var msg = {
-        goodsName:this.tableData[0].date,
-        goodsPrice:this.tableData[0].score,
-        goodsImg:this.tableData[0].imgUrl,
+        goodsName:this.dataList.name,
+        goodsPrice:this.dataList.price,
+        goodsImg:this.dataList.images.split(',')[0],
         shippingAdd:this.OrderAddList.id,
         goodsInfoId:this.id,
-        buyNum:this.tableData[0].num,
-        orderTotalPrice:this.tableData[0].num*this.tableData[0].score,
+        buyNum:this.buyNum,
+        orderTotalPrice:this.buyNum*this.dataList.price,
       }
       this.apiJavaPost('/api/orderForm/confirmOrder',msg,res=>{
           if(res.data.resultCode==1){
@@ -476,6 +487,11 @@ export default {
     goDetail: function (id) {
       this.$router.push({ path: 'productDetail', query: {id: id}})
     },
+    getImgUrl(imgUrl){
+      var url= imgUrl.split(",")[0];
+      return url;
+    },
+
   },
   mounted() {
     this.getOrderAdd();
@@ -483,7 +499,7 @@ export default {
     this.getScore();
   },created(){
     this.id = this.$route.query.id;
-    this.tableData[0].num = this.$route.query.num;
+    this.buyNum = this.$route.query.num;
   }
 };
 </script>

src/components/IntegralMall/productDetail.vue

@@ -71,7 +71,9 @@
     display: flex;
     align-items: center;
     height: 90px;
-    margin-top: 26px;
+    background-color: #FFF8F9;
+    margin: 26px 0 30px 0;
+    padding:0 20px;
   }
   .pd_top_info_right .jifen{
     color: #FF0101;
@@ -173,6 +175,11 @@
     color:#666666;
     margin:10px 0 0 53px;
   }
+  .proDuiRemind{
+    font-size:12px;
+    color:#666666;
+    margin:10px 0 0 53px;
+  }
 </style>
 
 <template>
@@ -211,6 +218,9 @@
           <div class="pd_quota" v-if="detail.quota!=0">
               限购数量：{{detail.quota}}
           </div>
+          <div class="proDuiRemind">
+            该商品一经兑换，概不退换，请知晓！
+          </div>
           <div class="_yunfei">
             <span class="_yunfei_name">运费</span>
             <div>

src/components/LocalTour/AdmissionTicket.vue

@@ -19,7 +19,9 @@
                         </p>
                     </div>
                     <div class="threeDiv">
-                        <p><span style="color:#FDAC11;font-size:22px">￥{{item.b2bPrice | NoDesnum}}</span>起</p>
+                        <p><span style="color:#FDAC11;font-size:22px">￥
+                            {{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
+                            </span>起</p>
                         <p style="margin-top:10px;cursor:pointer"><span @click="GoUrl(item)">查看详情</span></p>
                     </div>
                 </li>
@@ -29,7 +31,10 @@
                             <span class="ticketdes">{{item.name}} {{ticket.ticketDesc}}门票></span>
                             <span class="peopleType">{{ticket.ticketName}}</span></span>
                         <span class="SecondSpan">
-                            <span class="price">￥{{ticket.b2bPrice | NoDesnum}}</span> 
+                            <span class="price">￥
+                                
+                            {{(isLogin!=1 ? ticket.b2cPrice : ticket.b2bPrice) | NoDesnum}}
+                                </span> 
                             <!-- <span style="color:#999999;font-size:12px;margin-left:7px;text-decoration: line-through">原价:￥300</span> -->
                         </span>
                         <span class="ThreeSpan">
@@ -53,7 +58,9 @@
                 <div class="hotcontent">
                     <span style="color:#fff;width:125px;" class="textHidden font12">{{item.name}}</span>
                     <span style="width:75px;color:#FDAC11;text-align:right">
-                        ￥<span class="pfR font18">{{item.b2bPrice | NoDesnum}}</span>起
+                        ￥<span class="pfR font18">
+                            {{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
+                        </span>起
                     </span>
                 </div>
             </li>
@@ -64,7 +71,7 @@
 </template>
 <script>
 export default {
-    props:["ticketList","hotList"],
+    props:["ticketList","hotList","isLogin"],
   data () {
     return {
       dataList:[],

src/components/LocalTour/LocalCuisine.vue

@@ -83,7 +83,9 @@
                          <div>
                              <p class="f12 text2">{{item.name}}</p>
                              <p>
-                                 <span style="color:#FF0101">￥{{item.b2bPrice | NoDesnum}}</span>起
+                                 <span style="color:#FF0101">￥
+                                     {{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}} 
+                                </span>起
                              </p>
                          </div>
                      </div>
@@ -114,7 +116,7 @@
                             </el-col>
                             <el-col :span="5">
                                 <p class="f12 pfR" style="text-align:right;">
-                                    <span style="font-size:22px;color:#FF0101">￥{{item.b2bPrice | NoDesnum}}</span>起
+                                    <span style="font-size:22px;color:#FF0101">￥{{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}} </span>起
                                 </p>
                             </el-col>
                         </el-row>
@@ -180,10 +182,11 @@ export default {
           cityList:[],
           Load:false,
           LikeList:[],
-      
+        isLogin:0,
       }
   },
   created(){
+      this.isLogin=this.$store.state.isLogin;
       this.GetTicketList();   
       if(localStorage.LikeList){
           this.LikeList=JSON.parse(localStorage.LikeList);

src/components/LocalTour/LocalTourList.vue

@@ -5,7 +5,7 @@
             <li class="tab_li">
                 <span @click="ChangeTab(1)" :class="tab==1?'tab_active':''"  style="z-index:10">一日游</span>
                 <span @click="ChangeTab(2)" :class="tab==2?'tab_active':''" style="z-index:5">门票</span>
-                <span @click="ChangeTab(3)" :class="tab==3?'tab_active':''"  style="z-index:1">巴厘岛</span>
+                <!-- <span @click="ChangeTab(3)" :class="tab==3?'tab_active':''"  style="z-index:1">巴厘岛</span> -->
             </li>
             <li class="iconlist">
                 <div class="icon">
@@ -186,7 +186,7 @@
         <!-- 数据 -->
         <div style="margin-top:14px" v-loading="Loading">
             <OnedayList :isLogin="isLogin" :onelist="onelist" v-show="tab==1"></OnedayList>
-            <AdmissionTicket :ticketList="ticketList" :hotList="hotList" v-show="tab==2"></AdmissionTicket>
+            <AdmissionTicket :isLogin="isLogin" :ticketList="ticketList" :hotList="hotList" v-show="tab==2"></AdmissionTicket>
         </div>
         <div style="text-align:right;width:950px;margin-top:15px">
             <el-pagination

src/components/LocalTour/Localtourhome.vue

@@ -154,7 +154,9 @@
                           </div> -->
                           <div class="bottom">
                               <span>{{item.name}}</span>
-                              <span class="font12 textHidden1">¥<a class="font14">{{item.b2bPrice | NoDesnum}}</a>起/人</span>
+                              <span class="font12 textHidden1">¥<a class="font14">
+                                  {{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
+                                </a>起/人</span>
                           </div>
                       </li>
                   </ul>
@@ -310,7 +312,9 @@
                           <img :src='compressImg(item.coverImgs[0], "filt", 245, "")' alt="">
                           <div class="bottom">
                               <span>{{item.name}}</span>
-                              <span class="font12 textHidden1">¥<a class="font14">{{item.b2bPrice | NoDesnum}}</a>起/人</span>
+                              <span class="font12 textHidden1">¥<a class="font14">
+                                  {{(isLogin!=1 ? item.b2cPrice : item.b2bPrice) | NoDesnum}}
+                                  </a>起/人</span>
                           </div>
                       </li>
                   </ul>

src/components/Ticket/EditTicketOrder.vue

@@ -301,6 +301,7 @@ export default {
 .ticket_list .padd{
     padding-left:25px;
     box-sizing: border-box;
+    margin-top: 15px;
 }
 .ticket_list .el-col-9{
     padding-left:0!important;

src/components/Ticket/FillItinerary.vue

 
 <template>
-    <div class="FillItinerary">
+    <div class="FillItinerary commonF">
         <el-row style="width:1200px;margin:0 auto">
          
                 <!-- 订单详情 -->
@@ -9,7 +9,7 @@
                         <div class="bz">去程</div> 
                         <div class="padd">  
                             
-                            <p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.goFlightTime}}  
+                            <p class="pfR" style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.goFlightTime}}  
                             {{getlistSigel.goStartCityName}} - {{getlistSigel.goEndCityName}}
                             </p>
                         <p style="font-size:12px;color:#666666">
@@ -23,7 +23,7 @@
                                 <p class="time">{{getlistSigel.goStartHouseTime}}</p>
                                 <p>{{getlistSigel.goStartAirPlace}}</p>
                             </el-col>
-                            <el-col :span="8" style="text-align:center;color:#a8a8a8">
+                            <el-col :span="8" style="text-align:center;color:#a8a8a8;padding:0 10px">
                                 <p>
                                     {{getlistSigel.goTotalTime}}
                                 </p>
@@ -40,7 +40,7 @@
                     <el-col v-if="getlistSigel.ticketType==2"  class="coupon_left" :span="9" style="position:relative;border-left:1px dashed #aaaaaa;">
                         <div class="bz">返程</div>
                         <div class="padd">
-                            <p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}  
+                            <p class="pfR" style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}  
                             {{getlistSigel.backStartCityName}} - {{getlistSigel.backEndCityName}}
                             </p>
                         <p style="font-size:12px;color:#666666">
@@ -54,7 +54,7 @@
                                 <p class="time">{{getlistSigel.backStartHouseTime}}</p>
                                 <p>{{getlistSigel.goStartAirPlace}}</p>
                             </el-col>
-                            <el-col :span="8" style="text-align:center;color:#a8a8a8">
+                            <el-col :span="8" style="text-align:center;color:#a8a8a8;padding:0 10px">
                                 <p>
                                     {{getlistSigel.backTotalTime}}
                                 </p>
@@ -112,16 +112,16 @@
 
                             <el-form class="personnum_form" :model="personNum" label-width="60px">
                                 <el-form-item label="成人：">
-                                    <el-input-number size="mini" v-model="personNum.manNum" :min="0" :max="10" label="描述文字"></el-input-number>
+                                    <el-input-number @change="PersonNumChange" size="mini" v-model="personNum.manNum" :min="0" :max="10" label="描述文字"></el-input-number>
                                 </el-form-item>
                                 <el-form-item label="儿童：">
-                                    <el-input-number size="mini" v-model="personNum.chirdNum" :min="0" :max="10" label="描述文字"></el-input-number>
+                                    <el-input-number @change="PersonNumChange" size="mini" v-model="personNum.chirdNum" :min="0" :max="10" label="描述文字"></el-input-number>
                                 </el-form-item>
                                 <el-form-item label="婴儿：">
                                     <el-input-number size="mini" v-model="personNum.babyNum" :min="0" :max="10" label="描述文字"></el-input-number>
                                 </el-form-item>
                                 <el-form-item label="老人：">
-                                    <el-input-number size="mini" v-model="personNum.oldPeopleNum" :min="0" :max="10" label="描述文字"></el-input-number>
+                                    <el-input-number @change="PersonNumChange" size="mini" v-model="personNum.oldPeopleNum" :min="0" :max="10" label="描述文字"></el-input-number>
                                 </el-form-item>
                                  <el-form-item>
                                     <el-button @click="ConfirmedPersonNum" size="mini" style="background:#EE4454;color:#fff">确认</el-button>
@@ -179,6 +179,15 @@
                                         <el-radio label="2" value="2">女</el-radio>
                                         </el-radio-group>
                                     </el-form-item>
+                                    <el-form-item label="签证有效期" :prop="'guestList.'+index+'.sex'" :rules="[{ required: true, message: '请选择签证有效期', trigger: 'change' }]">
+                                        <el-date-picker
+                                            v-model="value1"
+                                            type="daterange"
+                                            range-separator="至"
+                                            start-placeholder="开始日期"
+                                            end-placeholder="结束日期">
+                                            </el-date-picker>
+                                    </el-form-item>
                             </el-col>
                         </div>
                     </el-form>
@@ -258,7 +267,11 @@ export default {
        this.SellInfo();
     },
     methods: {
-     
+        PersonNumChange(){
+            if(this.personNum.manNum+this.personNum.chirdNum+this.personNum.oldPeopleNum>this.getlistSigel.synum){
+                this.Error("票数不够！");
+            }
+        },
         // 国籍
         GetCountroy(){
             this.apipost(
@@ -293,6 +306,10 @@ export default {
         },
         // 确认订单人数
         ConfirmedPersonNum(){
+            if(this.personNum.manNum+this.personNum.chirdNum+this.personNum.oldPeopleNum>this.getlistSigel.synum){
+                this.Error("票数不够！");
+                return;
+            }
             if(this.personNum.manNum==0 && this.personNum.chirdNum==0 && this.personNum.oldPeopleNum==0){
                 this.$message.error("乘机人数至少1人！")
                 return;
@@ -501,6 +518,7 @@ export default {
 .ticket_list .padd{
     padding-left:25px;
     box-sizing: border-box;
+    margin-top: 15px;
 }
 .ticket_list .el-col-9{
     padding-left:0!important;

src/components/Ticket/OrderDetails.vue

 
 <template>
-    <div class="OrderDetails">
+    <div class="OrderDetails commonF">
         <!-- <div class="baner_top">
             <el-row :gutter="20">
             <el-col :span="24" :offset="2">
@@ -16,7 +16,7 @@
                         <div class="bz">去程</div> 
                         <div class="padd">  
                             
-                            <p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.goFlightTime}}  
+                            <p class="pfR" style="font-size:16px;color:#333333;padding-top:10px;">{{getlistSigel.goFlightTime}}  
                             {{getlistSigel.goStartCityName}} - {{getlistSigel.goEndCityName}}
                             </p>
                         <p style="font-size:12px;color:#666666">
@@ -47,7 +47,7 @@
                     <el-col v-if="getlistSigel.ticketType==2" :span="9" style="border-left:1px dashed #aaaaaa;position:relative">
                         <div class="bz">返程</div>
                         <div class="padd">
-                            <p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}  
+                            <p class="pfR" style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}  
                             {{getlistSigel.backStartCityName}} - {{getlistSigel.backEndCityName}}
                             </p>
                         <p style="font-size:12px;color:#666666">
@@ -351,6 +351,7 @@ export default {
 .ticket_list .padd{
     padding-left:25px;
     box-sizing: border-box;
+    margin-top: 15px;
 }
 .ticket_list .el-col-9{
     padding-left:0!important;

src/components/Ticket/TicketList.vue

@@ -175,7 +175,7 @@
                                 </el-col>
                             </el-row>
                         </el-col>
-                        <el-col class="second" :span="12">
+                        <el-col class="second" :span="13">
                             <div style="width:100%;overflow:auto;margin-bottom:10px">
                                 <el-col v-if="item.ticketType==2" :span="2" style="text-align:right">
                                     <span class="cilcle">往</span>
@@ -226,7 +226,7 @@
                             </div>
                             
                         </el-col>
-                        <el-col class="third" :span="8" style="text-align:center">
+                        <el-col class="third" :span="7" style="text-align:center">
                              <el-col :span="8">
                                  <p  class="orange font_12" style="margin-top:15px;position:relative">
                                      <el-popover visible-arrow="false"

src/components/global/pay.vue

@@ -73,7 +73,7 @@
 		},
 		methods: {
 			deleteOrder(obj){
-				this.$confirm('是否删除?', '提示', {
+				this.$confirm('是否取消订单?', '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'

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

@@ -241,7 +241,7 @@
                     <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>
+                    <el-button @click="Exit(item)" size="mini">取消订单</el-button>
                 </p>
                 <p class="font-size12 colo33" v-if="item.status==2">
                     取消
@@ -296,6 +296,24 @@ export default {
   mounted() {
   },
   methods: {
+    Exit(item){
+      this.$confirm("是否取消订单？", '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.apiJavaPost('/api/b2b/food/cancelFoodOrder',{orderId:item.id},res=>{
+                        if(res.data.resultCode==1){
+                            this.Success(res.data.message);
+                            this.$emit('fatherMethod');
+                        }else{
+                            this.Error(res.data.message);
+                        }
+                    },null)
+				}).catch(() => {
+				});
+
+    },
     Pay(item){
       let data={};
       data=item.payInfo;

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

@@ -116,6 +116,13 @@
   .orderTable tbody .info .money .pay_list.height_aotu{
     height: 66px;
   }
+  .orderTable .text2{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
   .shang{
     transform: rotate(180deg);
     display: inline-block;
@@ -200,7 +207,7 @@
                     <img v-if="item.imgCover.length>0" style="width:100%;height:100%" :src="item.imgCover[0].url" alt="">
                   </div>
                   <div class="_right">
-                    <p class="color333 font-size14">{{item.title}}</p>
+                    <p class="text2 color333 font-size14">{{item.title}}</p>
                     <p>{{item.ltName}}</p>
                     <p>团号：{{item.tcid}}</p>
                   </div>

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

@@ -15,7 +15,7 @@
       </template>
     </ul>
     <!-- 表格 -->
-    <ScenTable v-loading="orderLoading" :tableData="tableData"  v-on:queryDays="queryDays"/>
+    <ScenTable v-loading="orderLoading" :tableData="tableData"  v-on:queryDays="queryDays" @fatherMethod="fatherMethod"/>
 
     <div class="empty-data" v-if="tableData.length<1">
       <i class="iconfont icon-kong"></i>
@@ -86,6 +86,10 @@ export default {
     // this.b2b_get_GetWaitDealOrderPageList();
   },
   methods: {
+     fatherMethod(){
+        this.gerOrderList();
+          
+      },
     queryDays(val){
       this.getOrderMsg.queryDays=val;
       this.gerOrderList();

src/components/newPersonalCenter/integral/model/commodity.vue

@@ -4,7 +4,7 @@
   border-bottom: 1px solid rgba(236, 236, 236, 1);
 }
 .commodity .info{
-  padding: 26px;
+  padding:0 26px;
   text-align: center;
   border-left: 1px solid rgba(236, 236, 236, 1);
   font-size:14px;
@@ -79,6 +79,7 @@
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   overflow: hidden;
+  max-height:32px;
 }
 .com_bigImg{
   max-width: 357px;

src/components/newPersonalCenter/integral/model/integralHomeV2.vue

@@ -97,7 +97,7 @@
     border-left: 1px solid rgba(236, 236, 236, 1);
   }
   .integralHomeV2 .class .item img{
-    max-height: 150px;
+    max-height: 135px;
     max-width:100%;
   }
   .integralHomeV2 .class .item ._name{

src/components/visa/SchedProduct.vue

@@ -495,7 +495,7 @@ export default {
 .SchedProduct .yd_info .adress{
     margin-top: 15px;
     position: relative;
-    width:663px;
+    width:67%;
     background:rgba(255,255,255,1);
     border:1px solid #D2D2D2;
     margin-left:82px;

src/components/visa/Visalist.vue

@@ -25,7 +25,7 @@
                     <div>
                         <div class="select_title" style="top:15px">常住地</div>
                         <ul class="select_ul" :class="selectcon?'':'select_ul_height'">
-                            <!-- <li @click="SelectCity(0)" :class="listmsg.companyId==0?'visa_active':''">不限</li>                             -->
+                            <li @click="SelectCity(-1)" :class="listmsg.companyId==-1?'visa_active':''">不限</li>                            
                             <li @click="SelectCity(item.companyId)" :class="listmsg.companyId==item.companyId?'visa_active_city':''" v-for="item in cityList" :key="item.cityId">{{item.cityName}}({{item.productCount}})</li>
                             
                         </ul>
@@ -151,7 +151,7 @@ export default {
         tagType3:[],
         listmsg:{
             visaCountryId:0,
-            companyId:0,//常住地
+            companyId:-1,//常住地
             tags:[],
             orderByPrice:0,
             orderByBookAdvance:0,
@@ -172,9 +172,9 @@ export default {
       if(this.$route.query.searchKey){
           this.listmsg.searchKey=this.$route.query.searchKey;
       }
-      if(window.localStorage.site){
-          this.msg.companyId=parseInt(window.localStorage.site)
-      }
+    //   if(window.localStorage.site){
+    //       this.msg.companyId=parseInt(window.localStorage.site)
+    //   }
       
       if(this.$route.query.id){
           this.listmsg.visaCountryId=Number(this.$route.query.id);

src/router.js

@@ -500,7 +500,7 @@ export default new Router({
           component: resolve =>
             require(["@/components/DependentTravel/IndependentList.vue"], resolve),
           meta: {
-            title: "首页"
+            title: "自由行列表"
           }
         },
         {