修改部分样式问题

962dd660 · 华国豪 · f5555f94 · 962dd660 · 962dd660 · 962dd660
Commit 962dd660 authored Jun 12, 2019 by 华国豪 🙄
15 changed files
--- a/src/assets/css/newPersonalCenter/block/MemberCenter.css
+++ b/src/assets/css/newPersonalCenter/block/MemberCenter.css
+a{
+  text-decoration: none;
+}
 .MemberCenter .level_info .left{
  padding: 20px;
  background-color: #414352;
@@ -157,12 +160,15 @@
 .shangpin .content .left,.shangpin .content .right{
  height: 412px;
 }
-.shangpin .content .left>div{
-  background-color: gray;
+.shangpin .content .left>div{ 
  padding: 20px;
  width: 183px;
  height: 372px;
-  color: white;
+  color: white; 
+  background-position:center center;
+  background-repeat:no-repeat ;
+  background-color: rgba(0, 0, 0, 0.18);
+  cursor: pointer;
 }
 .shangpin .content .left>div h4{
  font-size: 16px;
@@ -198,8 +204,16 @@
 .shangpin .content .right .top .item .img {
  width: 200px;
  height: 164px;
-  background-color: gray;
+  background-color: rgba(0, 0, 0, 0.18);
  margin-top: 13px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  cursor: pointer;
+}
+.shangpin .content .right .top .item .img img{
+  max-height: 100%;
 }
 .shangpin .content .right .bottom{
  margin-top: 20px;
@@ -211,7 +225,15 @@
 .shangpin .content .right .bottom .item .img {
  width: 120px;
  height: 120px;
-  background-color: gray;
+  background-color: rgba(0, 0, 0, 0.18);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  cursor: pointer;
+}
+.shangpin .content .right .bottom .item .img img{
+  max-height: 100%;
 }
 .shangpin .content .right .bottom .item ._r{
  margin-left: 20px

--- a/src/assets/mall/newHead.css
+++ b/src/assets/mall/newHead.css
@@ -119,7 +119,7 @@ ul,li{list-style: none;}
 }
 .new_header_nav_two ._phone .icon-dianhua1{
  font-size: 30px;
-  color: #FFA835;
+  color: #FF8800;
 }
 .new_header_nav_two ._phone>div:nth-child(2){
  padding-left: 10px;
@@ -129,10 +129,10 @@ ul,li{list-style: none;}
  color: #999999;
 }
 .new_header_nav_two ._phone ._phone_text .icon-xia{
-  color: #FFA835;
+  color: #FF8800;
 }
 .new_header_nav_two ._phone ._phone_num{
-  color: #FFA835;
+  color: #FF8800;
  font-family: 'PingFangR';
 }
 /* 三级样式 */

--- a/src/components/DependentTravel/IndependentTravel.vue
+++ b/src/components/DependentTravel/IndependentTravel.vue
 <template>
-  <div class="Indepentdent">
+  <div class="Indepentdent" >
    <div class="top_img">
      <el-carousel class="carousel" arrow="always" style="height:100%" :interval="10000" trigger="click">
              <el-carousel-item v-for="item in slideList" :key="item.url">
@@ -12,7 +12,7 @@
        <!-- <div class="boxCont"></div> -->
      </div>
    </div>
-    <el-row class="back_middle">
+    <el-row class="back_middle" :style="{zoom: zoom}">
      <img class="left1" src="../../assets/img/travel/left1.png" alt>
      <img class="right1" src="../../assets/img/travel/right1.png" alt>
      <el-row class="max-w1500" :gutter="0">
@@ -366,9 +366,12 @@ export default {
       TreatmentList:[],
       HotCrashList:[],
       isLogin:0,
+      zoom: 1,
    };
  },
  created(){
+    let Height = window.innerHeight
+    this.zoom = Math.round((Height/1080) * 100) / 100
    this.isLogin=this.$store.state.isLogin;
  },
  mounted() {
@@ -927,6 +930,9 @@ p {
 ._top_box .wrap2{
  background:rgba(71,165,255,1);
  cursor: pointer;
+  /* position: relative;
+  right: -80px;
+  top: -60px; */
 }
 ._top_box .wrap2 .common{
  background:rgba(71,165,255,1);

--- a/src/components/GroupTour/block/hot.vue
+++ b/src/components/GroupTour/block/hot.vue
@@ -50,7 +50,7 @@
 }
 </style>
 <template>
-  <el-row class="hot">
+  <el-row class="hot" v-if="data[0]">
    <div class="box">
      <img src="../../../assets/img/groupTour/hot_img.png" alt="">
      <div>

--- a/src/components/GroupTour/block/list.vue
+++ b/src/components/GroupTour/block/list.vue
@@ -429,7 +429,6 @@ export default {
    },
    jiCha: function () {
      let cha = 5 - this.dataList.pageData.length
-      console.log(cha)
      this.chaList = [];
      for(let i = 0; i < cha; i ++) {
        this.chaList.push(i)

--- a/src/components/IntegralMall/block/commodity2.vue
+++ b/src/components/IntegralMall/block/commodity2.vue
@@ -14,7 +14,7 @@
  height: 480px;
  align-items: center;
  display: flex;
-  background-color: #c1c1c1;
+  background-color:white;
 }
 .commodity2 .commodity2_left .l_img .see_all{
  position: absolute;
@@ -41,6 +41,8 @@
  border: 1px solid rgba(236, 236, 236, 1);
  border-right: none;
  border-top: none;
+    box-sizing: border-box;
+  padding: 0 10px;
 }
 .commodity2 .commodity2_right .r_item>div img{
  max-height: 150px;
@@ -48,7 +50,11 @@
  max-width: 80%;
 }
 .commodity2 .commodity2_right .r_item p{
-  font-size: 12px
+  font-size: 12px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
 }
 .commodity2 .commodity2_right .r_item p:nth-child(3){
  color: #FF0101;
@@ -56,6 +62,9 @@
 }
 .commodity2 .r_item_img_box{
  height: 175px;
+    display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .comCanClick{
  cursor: pointer;

--- a/src/components/IntegralMall/productList.vue
+++ b/src/components/IntegralMall/productList.vue
@@ -102,6 +102,8 @@
  margin-bottom: 15px;
  margin-right: 10px;
  cursor: pointer;
+  box-sizing: border-box;
+  width: 228px;
 }
 .productList .list_item .list_item_box .img_box{
  width: 188px;
@@ -119,6 +121,10 @@
 }
 .productList .list_item .list_item_box ._name{
  margin: 15px 0 15px 0;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
 }
 .productList .list_item .list_item_box ._num{
  color: #FF0101
@@ -191,7 +197,7 @@
          <div class="img_box">
            <img :src="item.images.split(',')[0]" alt="">
          </div>
-          <p class="_name">{{item.name}}</p>
+          <p class="_name" :title="item.name">{{item.name}}</p>
          <p class="_num">¥ {{item.price}}积分</p>
        </div>  
      </div>

--- a/src/components/LocalTour/TicketDetails.vue
+++ b/src/components/LocalTour/TicketDetails.vue
@@ -13,7 +13,7 @@
                           <ul ref="Changeimg">
                               <li v-if="index<10" @mouseover="LiHover(item,index)" :class="imgHover==index?'liActive':''" v-for="(item,index) in dataDes.coverImgs" :key="index"  >
                                    
-                                    <a href="#">
+                                    <a>
                                        <img :src='compressImg(item, "filt", 77, "")' :onerror="defaultImg" alt="">
                                    </a>
                                    

--- a/src/components/global/newHead.vue
+++ b/src/components/global/newHead.vue
@@ -53,16 +53,16 @@
                  <el-dropdown-item @click.native="goUrl('newPersonalCenter', '9-1')">定制游</el-dropdown-item>
                  <el-dropdown-item @click.native="goUrl('newPersonalCenter', '8-1')">订单中心</el-dropdown-item>
                  <el-dropdown-item @click.native="goUrl('newPersonalCenter', '3-1')">个人信息</el-dropdown-item>
-                  <el-dropdown-item @click.native="">我的积分</el-dropdown-item>
-                  <el-dropdown-item @click.native="">我的优惠券</el-dropdown-item>
-                  <el-dropdown-item @click.native="">我的奖品</el-dropdown-item>
-                  <el-dropdown-item @click.native="">活动中心</el-dropdown-item>
+                  <el-dropdown-item @click.native="goUrl('integral')">我的积分</el-dropdown-item>
+                  <el-dropdown-item @click.native="goUrl('newPersonalCenter', '5')">我的优惠券</el-dropdown-item>
+                  <!-- <el-dropdown-item @click.native="">我的奖品</el-dropdown-item>
+                  <el-dropdown-item @click.native="">活动中心</el-dropdown-item> -->
                </el-dropdown-menu>
              </el-dropdown>
              <span class="__splice">|</span>
            </li>
            <!-- 我的订单 -->
-            <li v-if='user.account'>
+            <!-- <li v-if='user.account'>
              <el-dropdown trigger="click" placement="bottom-start">
                <span class="el-dropdown-link">
                  <span class="__cp">我的订单<i class="iconfont icon-xia"></i></span>
@@ -75,7 +75,7 @@
                </el-dropdown-menu>
              </el-dropdown>
              <span class="__splice">|</span>
-            </li>
+            </li> -->
            <li>
              <span class="__cp">客服中心</span>
              <span class="__splice">|</span>
@@ -102,13 +102,13 @@
              <el-select v-model="city" placeholder="请选择" class="w85" size="mini" @change="changeSite">
                <el-option v-for="item in sites" :key="item.companyId" :label="item.siteName" :value="item.companyId"></el-option>
              </el-select>
-              <el-select v-model="select" slot="prepend" size="small" class="w100" placeholder="请选择">
+              <el-select v-model="select" slot="prepend" size="mini" class="w100" placeholder="请选择">
                <el-option label="旅游" value="1"></el-option>
-                <el-option label="酒店" value="2"></el-option>
+                <!-- <el-option label="酒店" value="2"></el-option> -->
                <el-option label="机票" value="3"></el-option>
              </el-select>
              <span class="_splice"></span>
-              <el-input class="wb60" placeholder="搜索旅行地/酒店/旅游/门票/签证" size="small" @keyup.enter='goSearch' v-model="searchText"></el-input>
+              <el-input class="wb60" placeholder="搜索旅行地/酒店/旅游/门票/签证" size="mini" @keyup.enter='goSearch' v-model="searchText"></el-input>
              <span class="_search_btn __cp"  @click="goSearch"> <i class="iconfont icon-search"></i></span>
            </div>
          </el-col>
@@ -119,7 +119,8 @@
                <i class="iconfont icon-dianhua1"></i>
              </div>
              <div>
-                <p class="_phone_text"><span class="__cp">客服服务电话<i class="iconfont icon-xia"></i></span></p>
+                <!-- <i class="iconfont icon-xia"></i> -->
+                <p class="_phone_text"><span class="__cp">客服服务电话</span></p>
                <p class="_phone_num">028-62051755</p>
              </div>
            </div>
@@ -226,12 +227,12 @@
            </div>
          </li> -->
          <!-- 酒店 -->
-          <li :class="{_active: navActive === 4}">
+          <!-- <li :class="{_active: navActive === 4}">
            <div @click="handleSelect('/', 4), navActive = 4">
              <span>酒店</span>
              <span class="__splice">|</span>
            </div>
-          </li>
+          </li> -->
          <!-- 签证 -->
          <li :class="{_active: navActive === 5}">
            <div @click="handleSelect('/VisaHomePage', 5), navActive = 5">
@@ -247,12 +248,12 @@
            </div>
          </li>
          <!-- 景点门票 -->
-          <li :class="{_active: navActive === 7}">
+          <!-- <li :class="{_active: navActive === 7}">
            <div @click="handleSelect('/', 7), navActive = 7">
              <span>景点门票</span>
              <span class="__splice">|</span>
            </div>
-          </li>
+          </li> -->
          <!-- 积分商城 -->
          <li :class="{_active: navActive === 8}">
            <div @click="handleSelect('/IntegralMall', 8), navActive = 8">
@@ -362,7 +363,7 @@ export default {
    }
    if(localStorage.navActive){
      this.navActive = localStorage.navActive
-    }
+    } 
  }
 }
 </script>
--- a/src/components/mall/search.vue
+++ b/src/components/mall/search.vue
@@ -414,6 +414,7 @@ export default {
        loadRecoItems(){
            if(this.companyId!=-1){
                this.apipost('b2b_get_GetGroupSearchItem',{'companyId':this.companyId},r=>{
+                    console.log(r)
                    this.lines=r.data.data.line
                
                    

--- a/src/components/newPersonalCenter/block/MemberCenter.vue
+++ b/src/components/newPersonalCenter/block/MemberCenter.vue
@@ -38,62 +38,48 @@
        </el-carousel>
      </el-row>
    </el-row>
-    <el-row class="shangpin">
+    <el-row class="shangpin" v-if="ActivityClassifyGoodsList.length > 1">
      <el-row class="tit">
        <div>
          <p><i class="iconfont icon-mudedi"></i>热门兑换商品</p>
-          <span>更多&nbsp;></span>
+          <router-link to='IntegralMall'><span>更多&nbsp;></span></router-link>
        </div>
      </el-row>
      <el-row class="content">
        <el-col :span="6" class="left">
-          <div>
-            <h4>观影立减25元</h4>
-            <p>仅限猫眼、美团购电影票</p>
+          <div :style="{backgroundImage: `url(${ActivityClassifyGoodsList[0].Images.split(',')[0]})`}" @click="goUrl(ActivityClassifyGoodsList[0].Id)">
+            <h4>{{ActivityClassifyGoodsList[0].name}}</h4>
+            <p v-html="ActivityClassifyGoodsList[0].Description"></p>
          </div>
        </el-col>
        <el-col :span="18" class="right">
          <el-row class="top" :gutter="16">
-            <el-col :span="8" class="item">
-              <p class="name">利仁电饼铛家用双面加热</p>
-              <p class="jifen">兑换价：1000积分</p>
-              <p class="line"><span></span></p>
-              <div class="img"></div>
-            </el-col>
-            <el-col :span="8" class="item">
-              <p class="name">利仁电饼铛家用双面加热</p>
-              <p class="jifen">兑换价：1000积分</p>
-              <p class="line"><span></span></p>
-              <div class="img"></div>
-            </el-col>
-            <el-col :span="8" class="item">
-              <p class="name">利仁电饼铛家用双面加热</p>
-              <p class="jifen">兑换价：1000积分</p>
-              <p class="line"><span></span></p>
-              <div class="img"></div>
-            </el-col>
+            <template v-for="(item, index) in ActivityClassifyGoodsList">
+              <el-col :span="8" class="item" v-if="index > 0 && index < 4" >
+                <div @click="goUrl(item.Id)">
+                  <p class="name">{{item.name}}</p>
+                    <p class="jifen">兑换价：{{item.Price}}积分</p>
+                    <p class="line"><span></span></p>
+                    <div class="img">
+                      <img :src="item.Images.split(',')[0]" alt="">
+                    </div>
+                </div>
+              </el-col>
+            </template>
          </el-row>
          <el-row class="bottom" :gutter="16">
-            <el-col :span="12" class="item">
-              <div class="img">
-
-              </div>
-              <div class="_r">
-                <p class="name">利仁电饼铛家用双面加热</p>
-                <p class="jifen">兑换价：1000积分</p>
-                <p class="line"><span></span></p>
-              </div>
-            </el-col>
-            <el-col :span="12" class="item">
-              <div class="img">
-
-              </div>
-              <div class="_r">
-                <p class="name">利仁电饼铛家用双面加热</p>
-                <p class="jifen">兑换价：1000积分</p>
-                <p class="line"><span></span></p>
-              </div>
-            </el-col>
+            <template v-for="(item, index) in ActivityClassifyGoodsList">
+              <el-col :span="12" class="item" v-if="index > 3 && index < 6" >
+                <div class="img" @click="goUrl(item.Id)">
+                  <img :src="item.Images.split(',')[0]" alt="">
+                </div>
+                <div class="_r" @click="goUrl(item.Id)">
+                  <p class="name">{{item.name}}</p>
+                  <p class="jifen">兑换价：{{item.Price}}积分</p>
+                  <p class="line"><span></span></p>
+                </div>
+              </el-col>
+            </template>
          </el-row>
        </el-col>
      </el-row>
@@ -116,6 +102,7 @@ export default {
      showRule: false,
      point: 0,
      userInfo: {},
+      ActivityClassifyGoodsList: [],
      iconList: [
        {
          list: ['icon-qiandaotequan','icon-dikoutequan','icon-yudingjiangli']
@@ -142,9 +129,32 @@ export default {
    this.userInfo = this.getLocalStorage();
    this.getUserMemberExp()
    this.getUserAllJursdictions()
+    this.getActivityClassifyGoods()
  },
  methods: {
-
+    goUrl: function (id) {
+      this.$router.push({ path: 'productDetail', query: {id: id}})
+    },
+    // 获取商品活动
+    getActivityClassifyGoods: function () {
+      this.apiJavaPost(
+        "/api/goodsMarket/getActivityClassifyGoods",
+        {},
+        res => {
+          if (res.data.resultCode == 1) {
+            let data = res.data.data
+            data.forEach(x=>{
+              if (x.activityName === '热门活动') {
+                this.ActivityClassifyGoodsList = x.list
+              }
+            })
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
    // 获取用户所有特权
    getUserAllJursdictions: function () {
      this.apiJavaPost(
@@ -152,7 +162,6 @@ export default {
        {customer: this.userInfo.customerId},
        res => {
          if (res.data.resultCode == 1) {
-            // console.log(res)
            this.UserAllJursdictionsList = res.data.data
          } else {
            this.Error(res.data.message);
@@ -168,7 +177,6 @@ export default {
        {customer: this.userInfo.customerId},
        res => {
          if (res.data.resultCode == 1) {
-            // console.log(res)
            let UserMemberExp = res.data.data
            let getExpArr = [0]
            let getExpTimeArr = [{value: '-'}]

--- a/src/components/newPersonalCenter/integral/model/commodity.vue
+++ b/src/components/newPersonalCenter/integral/model/commodity.vue
@@ -24,6 +24,8 @@
  color: #333333;
  width:229px;
  height:241px;
+  box-sizing: border-box;
+  padding: 0 10px;
 }
 .commodity .small:last-child{
  width:230px;
@@ -34,6 +36,10 @@
 }
 .commodity .small ._name{
  margin: 5px 0 10px 0;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
 }
 .commodity .small ._detais{
  color: #999999;
@@ -48,6 +54,10 @@
 }
 .commodity .medium ._name{
  margin: 5px 0 15px 0;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
 }
 .commodity .medium ._detais{
  color: #999999;
@@ -71,15 +81,20 @@
 .comCanClick{
  cursor: pointer;
 }
+.commodity .com_bigImg_box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>
 <template>
  <el-row class="commodity">
    <el-col :span="10" class="com_BigDiv">
      <div @click="goDetail(item.Id)" class="info" :class="{'comCanClick':item.Id}" v-if="index==0" v-for="(item,index) in message" :key="index">
-        <div>
+        <div style="min-height: 360px;" class="com_bigImg_box">
          <img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt>
        </div>
-        <p class="_name">{{message[0].name}}</p>
+        <p class="_name" :title="message[0].name">{{message[0].name}}</p>
        <p class="_detais">{{message[0].Price}}积分抢兑</p>
      </div>
    </el-col>
@@ -90,18 +105,18 @@
            <div class="r_item_img_box">
              <img :src="getImgUrl(item.Images)" alt>
            </div>
-            <p class="_name">{{item.name}}</p>
+            <p class="_name" :title="item.name">{{item.name}}</p>
            <p class="_detais" v-if="item.Price!=''">{{item.Price}}积分抢兑</p>
          </div>
        </el-col>
      </el-row>
      <el-row>
-        <el-col :span="12" class="medium f" v-if="index>3" v-for="(item,index) in message"  :key="index">
+        <el-col :span="12" class="medium f" v-if="index>3 && index<6" v-for="(item,index) in message"  :key="index">
          <div @click="goDetail(item.Id)" :class="{'comCanClick':item.Id}">
            <div class="r_item_btmBox">
              <img :src="getImgUrl(item.Images)" alt>
            </div>
-            <p class="_name">{{item.name}}</p>
+            <p class="_name" :title="item.name">{{item.name}}</p>
            <p class="_detais" v-if="item.Price!=''">{{item.Price}}积分抢兑</p>
          </div>
        </el-col>

--- a/src/components/newPersonalCenter/newPersonalCenter.vue
+++ b/src/components/newPersonalCenter/newPersonalCenter.vue
@@ -68,7 +68,7 @@
                <el-menu-item index="8-3" @click="clickMenu('8-3')">当地游订单</el-menu-item>
                <el-menu-item index="8-4" @click="clickMenu('8-4')">签证订单</el-menu-item>
                <el-menu-item index="8-5" @click="clickMenu('8-5')">机票订单</el-menu-item>
-                <el-menu-item index="8-6" @click="clickMenu('8-6')">酒店订单</el-menu-item>
+                <!-- <el-menu-item index="8-6" @click="clickMenu('8-6')">酒店订单</el-menu-item> -->
                <el-menu-item index="8-8" @click="clickMenu('8-8')">门票订单</el-menu-item>
                <el-menu-item index="8-9" @click="clickMenu('8-9')">美食订单</el-menu-item>
              </el-submenu>
@@ -95,14 +95,14 @@
                <i class="iconfont icon-youhuiquanicon"></i>
                <span>我的优惠券</span>
              </el-menu-item>
-              <el-menu-item index="6" @click="clickMenu('6')">
+              <!-- <el-menu-item index="6" @click="clickMenu('6')">
                <i class="iconfont icon-youhuiquanicon"></i>
                <span slot="title">我的奖品</span>
              </el-menu-item>
              <el-menu-item index="7" @click="clickMenu('7')">
                <i class="iconfont icon-huodongicon"></i>
                <span slot="title">活动中心</span>
-              </el-menu-item>
+              </el-menu-item> -->
            </el-menu>
          </el-col>
          <!-- 右边内容板块 -->

--- a/src/components/taskPage/IceCream/IceCreamTask.vue
+++ b/src/components/taskPage/IceCream/IceCreamTask.vue
@@ -197,24 +197,28 @@
      </template>
      <template v-else>
        <div class="IceCreamTask_main" >
+          <router-link to='Home' class="hoverBank_btn" style="left: 20px;z-index:20">
+            <img style="width: 120px;" v-if="hoverBank === 1" @mouseover="hoverBank = 2"  src="../../../assets/img/task/fanhuishouye1.png" alt="">
+            <img style="width: 120px;" v-else @mouseout="hoverBank = 1" src="../../../assets/img/task/fanhuishouye.png" alt="">
+          </router-link>
          <!-- 上面标题 -->
          <div class="home_tit">
-            <img src="../../../assets/img/task/home_tit.png" alt="" :style="{height: Calculation ? `${height / 1080 * 482}px` : `${482 * zoom}px`}">
+            <img src="../../../assets/img/task/home_tit.png" alt="" :style="{height: Calculation ? `${height / 1080 * 482}px` : (oWidth === 1280 && (oHeight > 800 && oHeight <= 1024)) ? '344.24px' : `${482 * zoom}px`}">
            <p :style="{fontSize: `${24 * zoom}px`,bottom: '17px'}">{{beginTime[1]}}月{{beginTime[2]}}日~{{endTime[1]}}月{{endTime[2]}}日</p>
          </div>
          <!-- 右边积分什么的 -->
          <div class="right_box" :style="{zoom: zoom}">
-            <div>
+            <!-- <div>
              <img src="../../../assets/img/task/task_home3.png" alt="">
              <p>当前积分：1500</p>
-            </div>
+            </div> -->
            <img @click="descriptionShow = true" src="../../../assets/img/task/task_home5.png" alt="">
            <img @click="signCalendarShow = true" src="../../../assets/img/task/task_home8.png" alt="">
            <img src="../../../assets/img/task/task_home6.png" alt="">
          </div>
        </div>
        <!-- 底部一坨 -->
-        <div class="bottom_box" :style="{zoom: zoom, marginLeft: '22.33%',bottom: '32px'}">
+        <div class="bottom_box" :style="{zoom: zoom, marginLeft: (oWidth === 1440 || oWidth === 1680 || oWidth === 1600) ? '21.13%' : (oWidth === 1280 && (oHeight > 800 && oHeight <= 1024)) ? '18.33%' : '22.33%',bottom: '32px'}">
          <!-- 分类 -->
          <div class="left" >
            <div class="left_item" v-for="item in list" @click="openLayer(item)">
@@ -307,6 +311,8 @@ export default {
      endTime: '',
      ActivityInfo: '',
      hoverBank: 1,
+      oWidth: 0,
+      oHeight: 0,
      list: [
        {
          id: 0,
@@ -424,6 +430,8 @@ export default {
    let oWidth = window.outerWidth
    this.height = Height
    this.width = Width
+    this.oWidth = oWidth
+    this.oHeight = oHeight
    this.Calculation = Width/Height - 1.77 > 0.02 ? true : false
    console.log(Height, Width, oHeight, oWidth,Width/Height, this.Calculation, Width/Height - 1.77)
    if (oWidth < 1920) {

--- a/src/components/taskPage/IceCream/shoppingMall.vue
+++ b/src/components/taskPage/IceCream/shoppingMall.vue
@@ -76,6 +76,10 @@
  font-size: 12px;
  padding: 0 12px;
  box-sizing: border-box;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
 }
 .shoppingMall .content .item .bottom{
  background-color: white;
@@ -177,7 +181,7 @@
              <div class="img_box">
                <img :src="item.imgs[0]" alt="">
              </div>
-              <span class="info">{{item.name}}</span>
+              <span class="info" :title="item.name">{{item.name}}</span>
              <span class="_d">可兑换：<span>{{item.residue}}次</span></span>
            </div>
            <div class="bottom">