、合并代码

src/assets/css/LocalCuisine.css

@@ -49,7 +49,7 @@
     padding-bottom:10px;
     cursor: pointer;
 }
-.LocalCuisine .spanPrice span{
+.LocalCuisine .spanPrice>span{
     display: inline-block;
     font-size: 12px;
     margin-right:18px;

src/assets/css/home.css

@@ -35,10 +35,11 @@
   text-align: center;
   background: rgba(238, 238, 238, 1);
   border-radius: 8px;
-  padding: 3px 0;
+  padding: 3px 5px;
   margin-right: 10px;
   margin-bottom: 8px;
   cursor: pointer;
+  box-sizing: border-box;
 }
 .Home .Home_top .el-radio__input.is-checked .el-radio__inner{
   border-color: #FD6473;
@@ -268,6 +269,26 @@ p {
     border-bottom-left-radius:4px;
     border-bottom-right-radius:4px;
 }
+.Home .cztm .tj_ticket .ticket_content .ticketTitle{
+  position: relative;
+  width: 95%;
+  margin:0 auto;
+}
+.Home .cztm .tj_ticket .ticket_content .ticketTitle .Divtitle>span{
+  display: inline-block;
+  background: #fff;
+  max-width: 50%;
+  font-family: "PingFangR";
+  font-size: 16px;
+
+}
+.Home .cztm .tj_ticket .ticket_content .ticketTitle div .bg{
+  position: absolute;
+  top: 8px;
+  text-align: center;
+  z-index: 0;
+  width: 100%;
+}
 .Home .cztm .tj_ticket .ticket_content .dashed{
     display: inline-block;
     width: 100%;
@@ -316,6 +337,12 @@ p {
   background: url("../../assets/img/home/tour.png") 100% 100%;
 
 }
+a{
+  text-decoration: none;
+}
+.Home .Grouptour .tour_left_content span a{
+  color: #333333;
+}
 .Home .Grouptour .tour_left_content span{
   display: inline-block;
   /* width: 50%; */

src/assets/css/localtourhome.css

@@ -90,7 +90,8 @@
 }
 .Localtourhome .commontitle .outone_top_right .content span{
     display: inline-block;
-    width:63px;
+    min-width:43px;
+    padding: 0 10px;
     height:24px;
     border-radius:8px;
     font-size:14px;

src/components/DependentTravel/IndependentList.vue

@@ -197,6 +197,7 @@ export default {
             maxPrice:'',
             companyId:parseInt(localStorage.site),
             priceOrderByField:0,
+            searchKey:'',
         },
         minPrice:'',
         maxPrice:'',
@@ -228,6 +229,9 @@ export default {
     }
   },
   created(){
+      if(this.$route.query.keywords){
+          this.listmsg.searchKey=this.$route.query.keywords;
+      }
      if(this.$route.query.lineteamId){
          this.listmsg.lineId=this.$route.query.lineteamId;
      }
@@ -248,7 +252,7 @@ export default {
   methods: {
       goUrl(path,id,tcid){
             // detailTwo
-            path = 'detailThree'
+            path = 'detailTwo'
             path=`${path}/${encodeURIComponent(id)}/`+tcid
             this.$router.push({ path })
         },

src/components/DependentTravel/IndependentTravel.vue

@@ -390,7 +390,7 @@ export default {
     // 
     goUrl(path,id,tcid){
             // detailTwo
-            path = 'detailThree'
+            path = 'detailTwo'
             path=`${path}/${encodeURIComponent(id)}/`+tcid
             this.$router.push({ path })
       },

src/components/IntegralMall/IntegralMall.vue

@@ -49,7 +49,7 @@
       <div class="_block" v-for="item in ClassifyGoodsList">
         <el-row class="tit">
           <div>
-            <img src="../../assets/img/ps/shafa.png" alt="">
+            <img :src="item.typeIcon" alt="">
             <p>{{item.typeName}}</p>
           </div>
         </el-row>
@@ -86,6 +86,26 @@ export default {
         res => {
           if (res.data.resultCode === 1) {
             this.ClassifyGoodsList = res.data.data;
+            var num = 0;
+            this.ClassifyGoodsList.forEach(x=>{
+               if(x.list.length<8){
+                  num=8-x.list.length;
+                }else{
+                  num=0;
+                }
+                var obj = {
+                  Id:'',
+                  Images:'',
+                  Price:'',
+                  name:'',
+                  typeIcon:'',
+                  typeId:'',
+                  typeName:''
+                } 
+                for(var i=0;i<num;i++){
+                  x.list.push(obj);
+                }
+            })
           } else {
             this.Error(res.data.message);
           }
@@ -98,6 +118,27 @@ export default {
       this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{
           if(res.data.resultCode==1){
               this.dataList = res.data.data;
+              var num=0;
+              this.dataList.forEach(x=>{
+                if(x.list.length<6){
+                  num=6-x.list.length;
+                }else{
+                  num=0;
+                }
+                var obj = {
+                  Description:'',
+                  Id:'',
+                  Images:'',
+                  Price:'',
+                  activityId:'',
+                  activityImg:'',
+                  activityName:'',
+                  name:''
+                } 
+                for(var i=0;i<num;i++){
+                  x.list.push(obj);
+                }
+              })
           }else{
               this.Error(res.data.message);
           }

src/components/IntegralMall/block/commodity2.vue

@@ -41,7 +41,6 @@
   border: 1px solid rgba(236, 236, 236, 1);
   border-right: none;
   border-top: none;
-  cursor: pointer;
 }
 .commodity2 .commodity2_right .r_item>div img{
   max-height: 150px;
@@ -58,6 +57,9 @@
 .commodity2 .r_item_img_box{
   height: 175px;
 }
+.comCanClick{
+  cursor: pointer;
+}
 </style>
 <template>
   <el-row class="commodity2">
@@ -71,12 +73,12 @@
       <el-row>
         <template v-for="item in data.list">
           <el-col :span="6" class="r_item">
-            <div @click="goDetail(item.Id)">
+            <div @click="goDetail(item.Id)" :class="{'comCanClick':item.Id}">
               <div class="r_item_img_box">
                 <img :src="item.Images.split(',')[0]" alt="">
               </div>
               <p>{{item.name}}</p>
-              <p>¥ {{item.Price}}积分</p>
+              <p v-if="item.Price">¥ {{item.Price}}积分</p>
             </div>
           </el-col>
         </template>
@@ -97,7 +99,9 @@ export default {
   methods:{
     //跳转详情页面
     goDetail: function (id) {
+      if(id){
         this.$router.push({ path: 'productDetail', query: {id: id}})
+      }
     },
     goList: function (type) {
       this.$router.push({path: 'productList', query: {type: type}})

src/components/LocalTour/LocalCuisine.vue

@@ -19,7 +19,7 @@
                      <div class="title pfR f14">游玩日期</div>
                      <div class="change">
                          <el-date-picker style="width:160px;"
-                            v-model="msg.startDate"
+                            v-model="startDate" @change="ChangeDate()"
                             type="date" :picker-options="pickerBeginDateBefore"
                             placeholder="选择日期" size="mini"
                             format="yyyy-MM-dd"
@@ -27,7 +27,7 @@
                             </el-date-picker>
                             <span class="pfR" style="margin:0 10px;color:#000000">-</span>
                             <el-date-picker style="width:160px;"
-                            v-model="msg.endDate" @change="ChangeDate"
+                            v-model="endDate" @change="ChangeDate()"
                             type="date" :picker-options="pickerBeginDateAfter"
                             placeholder="选择日期" size="mini"
                             format="yyyy-MM-dd"
@@ -47,7 +47,7 @@
                         <span class="pfR" style="margin:0 10px;color:#000000">-</span>
                         
                         <el-input style="width:100px" size="mini" v-model="maxPrice" placeholder="输入价格"></el-input>
-                
+                        <el-button style="margin-left:15px;text-align:center" size="mini" @click="GetList">搜索</el-button>
                         </span>
                      </div>
                  </li>
@@ -282,6 +282,8 @@ export default {
             },null)
         },
       ChangeDate(){
+        this.msg.startDate=this.startDate;
+        this.msg.endDate=this.endDate;
         this.GetList();          
       },
       Gourl(item){

src/components/PersonalCenter/OrderInvoiceTwo.vue

@@ -10,6 +10,7 @@
         :tcid="tcid"
         :numPeople="numPeople"
         v-if="tcid && ID"
+        :teamType="teamType"
       ></trade>
       <div class="baidumap" id="allmap"></div>
     </el-col>
@@ -46,6 +47,7 @@ export default {
     this.ID = decodeURIComponent(this.$route.query.id)
     this.tcid = decodeURIComponent(this.$route.query.tcid)
     this.numPeople = JSON.parse(this.$route.query.numPeople)
+    this.teamType=this.$route.query.teamType;
   },
   mounted() {
     this.b2b_get_GetCustomerInfo();

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

@@ -124,7 +124,6 @@ export default {
     },
     //跳转详情页面
     goDetail: function (id) {
-      console.log(id);
       if(id){
         this.$router.push({ path: 'productDetail', query: {id: id}})
       }

src/components/trade/order/OneDayIndex.vue

@@ -297,7 +297,7 @@ export default {
                 }
                 this.$router.push({
                     path: '/OrderInvoiceTwo',
-                    query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople)}
+                    query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople),teamType:2}
                 })
                 return
             }

src/components/trade/order/index.vue

@@ -407,7 +407,7 @@ export default {
                 }
                 this.$router.push({
                     path: '/OrderInvoiceTwo',
-                    query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople)}
+                    query: {id: encodeURIComponent(ID), tcid: tcid, numPeople: JSON.stringify(numPeople),teamType:0}
                 })
                 return
             }

src/components/trade/order/indexTwo.vue

@@ -412,7 +412,7 @@ import bus from '../../../plugins/event-bus'
 import LuckDraw from '../../mall/LuckDraw'
 export default {
     components: {LuckDraw},
-    props:['ID','tcid','numPeople'],
+    props:['ID','tcid','numPeople',"teamType"],
     data () {
         let that=this
         return {
@@ -636,7 +636,7 @@ export default {
               this.priceList.forEach((x, i)=>{
                   if(x.startDate==this.chosenObj.startDate){
                       this.priceFlight=x
-                      let msg = {configId:this.priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:this.priceList[i].tcid,teamType:2}
+                      let msg = {configId:this.priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:this.priceList[i].tcid,teamType:this.teamType}
                       this.getDataT(msg, 2)
                       this.getUnicos(this.priceList[i].tcid)
                   }
@@ -950,7 +950,7 @@ export default {
             cityId: city,
             preview: this.pre,
             tcid: this.tcid,
-            teamType:2
+            teamType:this.teamType
           };
           this.getData(msg, days);
         });
@@ -966,7 +966,7 @@ export default {
               let priceList = data.priceList;
               for ( let i = 0; i < priceList.length; i++) {
                   if (days===priceList[i].startDate){
-                      let msg = {configId:priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:priceList[i].tcid,teamType:2}
+                      let msg = {configId:priceList[i].configIDDes, cityId:this.city, preview:this.pre, tcid:priceList[i].tcid,teamType:this.teamType}
                       this.getDataT(msg)
                   }
               }

src/components/visa/Visalist.vue

@@ -157,6 +157,7 @@ export default {
             orderByBookAdvance:0,
             pageIndex:1,
             pageSize:10,
+            searchKey:"",
         },
         total:0,
         datalist:[],
@@ -167,6 +168,9 @@ export default {
     }
   },
   created(){
+      if(this.$route.query.searchKey){
+          this.listmsg.searchKey=this.$route.query.searchKey;
+      }
       if(window.localStorage.site){
           this.msg.companyId=parseInt(window.localStorage.site)
       }

src/router.js

@@ -64,15 +64,15 @@ export default new Router({
 					}
         },
         // 自由行详情
-        {
-          path: "/detailThree/:id/:tcid",
-          name: "detailThree",
-          component: resolve =>
-            require(["@/components/mall/detailThree"], resolve),
-          meta: {
-            title: "团队详情-印象之旅~感动与世界同步"
-          }
-        },
+        // {
+        //   path: "/detailThree/:id/:tcid",
+        //   name: "detailThree",
+        //   component: resolve =>
+        //     require(["@/components/mall/detailThree"], resolve),
+        //   meta: {
+        //     title: "团队详情-印象之旅~感动与世界同步"
+        //   }
+        // },
         {
           path: "/OneDayDetailTwo/:id/:tcid",
           name: "OneDayDetailTwo",