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

src/assets/css/common.css

@@ -143,6 +143,24 @@
             border-radius: 4px;
             background: #EDEDED;
 }
+.content-item-box .content-item-box-hover::-webkit-scrollbar{
+/*滚动条整体样式*/
+    width: 0px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 0px;
+}
+.content-item-box .content-item-box-hover::-webkit-scrollbar-thumb{
+			/*滚动条里面小方块*/
+			border-radius: 0px;
+			-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0);
+			background: #c9c9c9;
+}
+.content-item-box .content-item-box-hover::-webkit-scrollbar-track{
+			/*滚动条里面轨道*/
+            -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0);
+            border-radius: 0px;
+            background: #EDEDED;
+}
 .w200{
     width: 200px !important;
 }

src/components/FreeTravel/FreeList.vue

@@ -498,7 +498,7 @@
     <div class="content"> 
       <div class="hot-p" v-if="dataHotList.length > 0">
         <div class="hot-p-item">
-          <p class="f24 hot-p-item-tit"><strong>TOP{{dataHotList.length}}</strong> 目的地热销产品</p>
+          <p class="f24 hot-p-item-tit"><strong>TOP{{dataHotList.length > 2 ? 3 : dataHotList.length}}</strong> 目的地热销产品</p>
           <div v-for="(item, index) in dataHotList" v-if="index < 3" @click="goDetails(item)" class="__cp">
             <p class="f20 hot-p-item-tit-s">
               <span class="hot-p-item-tit-s-line"></span>
@@ -510,8 +510,8 @@
                 <div class="pro-item" >
                   <span class="pro-item-tag bgc-b cff" :class="`bgc-b${sItem.prod_type == 'M01' ? 1 : sItem.prod_type == 'M04' ? 2 : sItem.prod_type == 'M05' ? 3 : 4}`">{{sItem.prod_type == 'M01' ? '一日游' : sItem.prod_type == 'M04' ? '交通' : sItem.prod_type == 'M05' ? '门票' : '其他'}}</span>
                   <div class="pro-item-top">
-                    <img :onerror="defaultImg" :src="KkdayDomain + item.prod_img_url" alt="">
-                    <p class="text4 f14 PingFangR">{{sItem.prod_name}}</p>
+                    <img :onerror="defaultImg" :src="KkdayDomain + sItem.prod_img_url" alt="">
+                    <p class="text4 f14 PingFangR">{{sItem.prod_name.replace(/KKday/g, '印象之旅')}}</p>
                   </div>
                   <div class="pro-item-btm">
                     <div>
@@ -616,8 +616,9 @@
             :page-size="16"
             layout="total, prev, pager, next"
             :total="totalCount"
-            @prev-click="handleCurrentChange(1)"
-            @next-click="handleCurrentChange(2)"
+            @current-change="handleCurrentChange"
+            @prev-click="handleCurrentChange('p')"
+            @next-click="handleCurrentChange('n')"
           ></el-pagination>
         </div>
       </div>
@@ -1019,11 +1020,15 @@ export default {
     },
     handleCurrentChange(val) {
       let start = this.msg.start
-      if (val == 1) {
+      console.log(val, start)
+      if (val == 'p') {
         start = start == 0 ? 0 : start - 16
-      } else {
+      } else if (val == 'n'){
         start = start + 16
+      } else{
+        start = (val * 16) - 16
       }
+      console.log(val, start)
       // 翻页
       this.msg.start = start;
       this.getList();
@@ -1083,6 +1088,7 @@ export default {
     },
     // 获取列表
     getList(type, id){
+      this.dataList = [];
       let query = this.$route.query;
       if(query.type == 1) {
         this.msg.country_keys = [query.id]

src/components/FreeTravel/FreeList2.vue

@@ -626,7 +626,7 @@
               <div class="tag">
                 <span><i class="iconfont icon-mudedi"></i>  <span  class="PingFangR">{{item.countries[0].name + '-' + item.countries[0].cities[0].name}}</span> </span>
               </div> 
-              <p class="text2 f14 c33 PingFangR">{{item.prod_name}}</p>
+              <p class="text2 f14 c33 PingFangR">{{item.prod_name.replace(/KKday/g, '印象之旅')}}</p>
               <div class="pro-item-btm">
                 <div>
                   <p><span class="price-box">￥<strong class="PingFangR">{{item.b2c_price}}</strong>/人</span></p>
@@ -650,8 +650,9 @@
             :page-size="16"
             layout="total, prev, pager, next"
             :total="totalCount"
-            @prev-click="handleCurrentChange(1)"
-            @next-click="handleCurrentChange(2)"
+            @current-change="handleCurrentChange"
+             @prev-click="handleCurrentChange('p')"
+            @next-click="handleCurrentChange('n')"
           ></el-pagination>
           
             <!-- @current-change="handleCurrentChange" -->
@@ -1041,6 +1042,7 @@ export default {
     },
     // 获取列表
     getList(type, id){
+      this.dataList = [];
       let query = this.$route.query;
       if(query.type == 1) {
         this.msg.country_keys = [query.id]
@@ -1107,10 +1109,12 @@ export default {
     },
     handleCurrentChange(val) {
       let start = this.msg.start
-      if (val == 1) {
+      if (val == 'p') {
         start = start == 0 ? 0 : start - 16
-      } else {
+      } else if (val == 'n'){
         start = start + 16
+      } else{
+        start = (val * 16) - 16
       }
       // 翻页
       this.msg.start = start;