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

src/assets/mall/newHead.css

@@ -74,7 +74,7 @@ ul,li{list-style: none;}
 /* 二级样式 */
 .new_header_nav_two{
   padding: 25px 0;
-  height: 100px;
+  height: 108px;
 }
 .new_header_nav_two .logo{
   height: 50px;

src/components/global/newHead.vue

@@ -266,10 +266,10 @@
             </div>
           </li>
           <!-- 活动中心 -->
-          <li :class="{_active: navActive === 9}">
+          <li :class="{_active: navActive === 9}" style="width: auto;">
             <div @click="handleSelect('/IceCreamTask', 9), navActive = 9">
-              <span>活动中心</span>
-              <span class="__splice">|</span>
+              <img style="z-index: -1;position: absolute;top: -27px;" src="../../assets/img/task/nav_bg.png" alt="">
+              <img src="../../assets/img/task/nav_text.png" alt="">
             </div>
           </li>
         </ul>

src/components/newPersonalCenter/block/HomePage.vue

@@ -10,13 +10,21 @@
         <!-- 订单信息 -->
         <OrderInfo/>
         <!-- 活动链接 -->
-        <el-row class="active">
+        <!-- <el-row class="active">
           <img
             @click="goUrl('TurnaroundDraw')"
             class="huodong_img"
             src="../../../assets/img/active/huodong_img.png"
             alt
           >
+        </el-row> -->
+        <el-row class="active">
+          <img
+            @click="goUrl('IceCreamTask')"
+            class="huodong_img"
+            src="../../../assets/img/active/huodong_img2.png"
+            alt
+          >
         </el-row>
         <!-- 即将过期优惠券 -->
         <OverCoupon/>

src/components/taskPage/IceCream/IceCreamTask.vue

@@ -151,7 +151,7 @@
       <template v-if="!smallWindow">
         <div class="IceCreamTask_main" >
           <!-- 返回首页 -->
-          <router-link to='heel' class="hoverBank_btn">
+          <router-link to='Home' class="hoverBank_btn">
             <img v-if="hoverBank === 1" @mouseover="hoverBank = 2"  src="../../../assets/img/task/fanhuishouye1.png" alt="">
             <img v-else @mouseout="hoverBank = 1" src="../../../assets/img/task/fanhuishouye.png" alt="">
           </router-link>

src/components/taskPage/IceCream/myExchange.vue

@@ -57,6 +57,7 @@
   line-height: 33px;
   cursor: pointer;
   transition: all linear .5s;
+  overflow: hidden;
 }
 .myExchange .myExchange_box .item .item_name:hover{
   background:rgb(239, 194, 18);
@@ -92,7 +93,7 @@
           <div class="item_img">
             <img :src="item.imgs" alt="">
           </div>
-          <span class="item_name" @click="goUrl('myPointOrder')">{{item.name}}</span>
+          <span class="item_name" :title="item.name" @click="goUrl('myPointOrder')">{{item.name}}</span>
         </div>
       </div>
       <div @mouseover="closeShow = 1" @mouseout="closeShow = 2" class="myExchange_close" @click="close">

src/components/taskPage/IceCream/raffleTickets.vue

@@ -40,6 +40,7 @@
 .raffleTickets .tips{
   width: 174px;
   padding: 10px 0;
+  height: 81px;
   font-size: 24px;
   color: rgba(255, 78, 0, 1);
   font-weight:bold;
@@ -48,6 +49,11 @@
   left: 166px;
   top: 203px;
   text-align: center;
+  align-items: center;
+  display: flex;
+}
+.raffleTickets .tips>p.cailiap_p {
+  padding-left: 15px;
 }
 .raffleTickets .tips .small{
   color: RGBA(123, 53, 0, 1);
@@ -61,7 +67,13 @@
     <div class="raffleTickets_bg">
       <div>
         <div class="tips">
-          <p>{{raffleTicketsData.mName}}</p>
+          <template v-if="getImg(raffleTicketsData.mName)">
+            <img :src="getImg(raffleTicketsData.mName)" alt="">
+            <p class="cailiap_p">{{raffleTicketsData.mName}}</p>
+          </template>
+          <template v-else>
+            <p>{{raffleTicketsData.mName}}</p>
+          </template>
           <!-- <p class="small">仅限于（2019年8月21日 21：）“  狂欢夜·瓜分百万现金  ”活动中使用</p> -->
         </div>
       </div>
@@ -76,6 +88,27 @@ export default {
     return{
     }
   },methods:{
+    getImg: function (Name) { 
+      if (Name === '牛奶') {
+        return require('../../../assets/img/task/ice/niunai.png')
+      } else if (Name === '糖') {
+        return require('../../../assets/img/task/ice/tangg.png')
+      } else if (Name === '蛋黄') {
+        return require('../../../assets/img/task/ice/danhuang.png')
+      } else if (Name === '酸奶') {
+        return require('../../../assets/img/task/ice/suannai.png')
+      } else if (Name === '草莓') {
+        return require('../../../assets/img/task/ice/caomei.png')
+      } else if (Name === '葡萄干') {
+        return require('../../../assets/img/task/ice/putaogan.png')
+      } else if (Name === '巧克力') {
+        return require('../../../assets/img/task/ice/qiaokeli.png')
+      } else if (Name === '礼盒') {
+        return require('../../../assets/img/task/ice/lihe.png')
+      } else if (Name === '' || !Name) {
+        return false
+      }
+    },
     close: function () {
       this.$emit('closeMyWindow', 'raffleTickets')
     }

src/components/taskPage/IceCream/ticketList.vue

@@ -238,7 +238,7 @@
               <img v-else @click="activeNav = 2" src="../../../assets/img/task/yishiyong.png" alt="">
             </div>
           </div>
-          <div v-if="activeNav === 1" class="hebing_nav">
+          <div v-if="activeNav === 1 && dataList.length > 1" class="hebing_nav">
             <template>
               <el-checkbox v-if="hebing === 2" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
               <span v-else>&nbsp;</span>
@@ -280,7 +280,7 @@
                 <div class="right">
                   <p class="_name">{{ticketName}}</p>
                   <p class="_type" :title="item.couponsName">{{item.couponsName}}</p>
-                  <span class="_btn">立即使用</span>
+                  <span class="_btn" @click="goUrl()">立即使用</span>
                 </div>
               </el-col>
             </el-row>
@@ -330,6 +330,24 @@ export default {
       this.ticketName = '抽奖券'
     }
   },methods:{
+    // 去使用优惠券
+    goUrl: function (name){
+      let path = '/'
+      if (this.ticketName === '签证') {
+        path += 'VisaHomePage' 
+      } else if (this.ticketName === '特价机票') {
+        path += 'TicketHome' 
+      } else if (this.ticketName === '跟团游') {
+        path += 'heel' 
+      } else if (this.ticketName === '当地游') {
+        path += 'Localtourhome' 
+      } else if (this.ticketName === '自由行') {
+        path += 'IndependentTravel' 
+      } else if (this.ticketName === '抽奖券') {
+        path += 'Home' 
+      }
+      this.$router.push({ path: path})
+    },
     //用户合并
     hebingTicket: function () {
       if (this.checkedCities.length < 2) {

src/views/newLogin.vue

@@ -111,7 +111,7 @@
 </style>
 <template>
   <div class="new_login">
-    <div class="container">
+    <div class="container" :style="{zoom: zoom}">
       <div class="top_logo">
         <img src="../assets/img/logo_t.png" alt>
         <span>-同业登录</span>
@@ -207,7 +207,7 @@ export default {
   data() {
     return {
       active: false,
-      checked: false,
+      checked: true,
       loginMsg: {
         account: "",
         password: ""
@@ -227,6 +227,7 @@ export default {
       show:true,
       count:'',
       mobileCodeType: 1,
+      zoom: 1,
     };
   },
   methods: {
@@ -338,6 +339,11 @@ export default {
         msg,
         r => {
           if (r.data.resultCode == 1) {
+            let autoLogin =  this.checked ? {
+              acc: this.loginMsg.account,
+              pwd: this.loginMsg.password,
+            } : null ;
+            localStorage.autoLogin = JSON.stringify(autoLogin)
             let userInfo = r.data.data;
             let userJson = JSON.stringify(userInfo);
             localStorage.userInfo = userJson;
@@ -350,7 +356,7 @@ export default {
               let path = `${this.$route.query.path}/${this.$route.query.id}`;
               this.$router.push({ path });
             } else {
-              this.$router.push({ path: "/" });
+              this.$router.push({ path: "/Home" });
             }
             this.$message.success(r.data.message);
             this.loging = false;
@@ -375,6 +381,15 @@ export default {
         code: ""
       }
     }
+  },
+  created(){
+    let Height = window.innerHeight
+    this.zoom = (Math.round((Height/1080) * 100) / 100) + 0.1
+    let autoLogin = localStorage.autoLogin ? JSON.parse(localStorage.autoLogin) : null
+    console.log(autoLogin)
+    this.loginMsg.account = autoLogin ? autoLogin.acc : ''
+    this.loginMsg.password = autoLogin ? autoLogin.pwd : ''
+    this.checked = autoLogin ? true : false
   }
 };
 </script>