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

src/components/IntegralMall/IntegralMall.vue

@@ -28,7 +28,7 @@
   <el-row class="IntegralMall">
     <el-row class="w1180">
       <IntegralHead/>
-      <div class="_block" v-for="item in dataList" v-if="item.activityId==1">
+      <div class="_block" v-for="(item,index) in dataList" v-if="item.activityId==1">
         <el-row class="tit">
           <div>
             <img :src="item.activityImg" alt="">
@@ -49,11 +49,11 @@
       <div class="_block" v-for="item in ClassifyGoodsList">
         <el-row class="tit">
           <div>
-            <img :src="item.typeIcon" alt="">
+            <img :src="item.typeLog" alt="">
             <p>{{item.typeName}}</p>
           </div>
         </el-row>
-        <commodity2 :data="item"/>
+        <commodity2 :data="item" :typeImg="item.typeImg"/>
       </div>
     </el-row>
   </el-row>
@@ -89,7 +89,7 @@ export default {
             var num = 0;
             this.ClassifyGoodsList.forEach(x=>{
                if(x.list.length<8){
-                  num=8-x.list.length;
+                  num=8 -x.list.length;
                 }else{
                   num=0;
                 }

src/components/IntegralMall/block/IntegralHead.vue

@@ -31,7 +31,7 @@
 <template>
   <el-row class="IntegralHead">
     <div class="top_img">
-      <img src="../../../assets/img/ps/IntegralHead.png" alt="">
+      <img src="../../../assets/img/ps/IntegralHead.jpg" alt="">
     </div>
     <el-row class="bottom_class">
       <template v-for="item in dataList">

src/components/IntegralMall/block/commodity2.vue

@@ -32,8 +32,7 @@
   cursor: pointer;
 }
 .commodity2 .commodity2_left .l_img img{
-  /* height: 480px; */
-  width: 100%;
+  height: 480px;
 }
 .commodity2 .commodity2_right .r_item{
   height: 240px;
@@ -53,7 +52,7 @@
   font-size: 12px;
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 1;
+  -webkit-line-clamp: 2;
   overflow: hidden;
 }
 .commodity2 .commodity2_right .r_item p:nth-child(3){
@@ -74,13 +73,13 @@
   <el-row class="commodity2">
     <el-col :span="5" class="commodity2_left">
       <div class="l_img">
-        <img :src="data.list[0].Images.split(',')[0]" alt="">
+        <img :src="typeImg" alt=""/>
         <span class="see_all" @click="goList(data.typeId)">查看全部 ></span>
       </div>
     </el-col>
     <el-col :span="19" class="commodity2_right">
       <el-row>
-        <template v-for="item in data.list">
+        <template v-for="(item,index) in data.list" v-if="index<9">
           <el-col :span="6" class="r_item">
             <div @click="goDetail(item.Id)" :class="{'comCanClick':item.Id}">
               <div class="r_item_img_box">
@@ -99,7 +98,7 @@
 export default {
   components: {
   },
-  props:['data'],
+  props:['data',"typeImg"],
   data(){
     return{
       list: [1,2,3,4,5,6,7,8]

src/components/IntegralMall/block/detailsLeftHot.vue

@@ -32,6 +32,10 @@
   margin-top: 16px;
   color: #333333;
   font-size: 13px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
 }
 .list_item p._num{
   color: #999999;

src/components/IntegralMall/myPointOrder.vue

@@ -241,7 +241,7 @@
                 </div>
                 <div class="pro_title">
                     <div class="pro_T1">
-                        <el-dropdown trigger="click" @command="handleCommandTwo">
+                        <el-dropdown trigger="click" @command="handleCommandTwo" style="display:none;">
                             <span class="el-dropdown-link">
                                 {{orderTime}}
                                 <i class="el-icon-arrow-down el-icon--right"></i>

src/components/IntegralMall/productDetail.vue

@@ -205,9 +205,10 @@
           <p class="_price">售价<span class="jifen">¥ <span>{{detail.price}}</span> {{detail.priceUnit === 1 ? '现金' : '积分'}}</span></p>
           <div class="_numbers">
             <span class="_numbers_name">数量</span>
-            <el-input-number v-model="numbers" :min="1" :max="detail.quota === 0 ? 0 : detail.quota" size="mini"></el-input-number>
+            <el-input-number v-model="numbers" :min="1" v-if="detail.quota==0" size="mini"></el-input-number>
+            <el-input-number v-model="numbers" :min="1" v-else :max="detail.quota" size="mini"></el-input-number>
           </div>
-          <div class="pd_quota">
+          <div class="pd_quota" v-if="detail.quota!=0">
               限购数量：{{detail.quota}}
           </div>
           <div class="_yunfei">

src/components/IntegralMall/productList.vue

@@ -120,10 +120,11 @@
   max-height: 146px;
 }
 .productList .list_item .list_item_box ._name{
+  width:180px;
   margin: 15px 0 15px 0;
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 1;
+  -webkit-line-clamp: 2;
   overflow: hidden;
 }
 .productList .list_item .list_item_box ._num{

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

@@ -11,10 +11,17 @@
   color: #333333;
 }
 .commodity .info ._name{
-  padding: 15px 0 10px 0;
+  margin:15px 0;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  font-size: 14px;
+  color:#333;
 }
 .commodity .info ._detais{
   color: #999999;
+  font-size:14px;
 }
 .commodity .small{
   text-align: center;
@@ -36,13 +43,17 @@
 }
 .commodity .small ._name{
   margin: 5px 0 10px 0;
+  padding:0 20px;
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 1;
+  -webkit-line-clamp: 2;
   overflow: hidden;
+  font-size:12px;
+  color:#333;
 }
 .commodity .small ._detais{
   color: #999999;
+  font-size:12px;
 }
 .commodity .medium{
   padding: 29px ;
@@ -56,11 +67,18 @@
   margin: 5px 0 15px 0;
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 1;
+  -webkit-line-clamp: 2;
   overflow: hidden;
+  font-size:12px;
+  color:#333;
 }
 .commodity .medium ._detais{
   color: #999999;
+  font-size:12px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
 }
 .com_bigImg{
   max-width: 357px;
@@ -73,7 +91,7 @@
   min-height:480px;border-right:1px solid #ECECEC;
 }
 .commodity .r_item_img_box{
-  min-height: 175px;
+  min-height: 170px;
 }
 .r_item_btmBox{
   min-height: 135px;
@@ -95,7 +113,7 @@
           <img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt>
         </div>
         <p class="_name" :title="message[0].name">{{message[0].name}}</p>
-        <p class="_detais">{{message[0].Price}}积分抢兑</p>
+        <p class="_detais" v-html="message[0].Description"></p>
       </div>
     </el-col>
     <el-col :span="14">
@@ -106,7 +124,7 @@
               <img :src="getImgUrl(item.Images)" alt>
             </div>
             <p class="_name" :title="item.name">{{item.name}}</p>
-            <p class="_detais" v-if="item.Price!=''">{{item.Price}}积分抢兑</p>
+            <p class="_detais" v-html="item.Description"></p>
           </div>
         </el-col>
       </el-row>
@@ -117,7 +135,7 @@
               <img :src="getImgUrl(item.Images)" alt>
             </div>
             <p class="_name" :title="item.name">{{item.name}}</p>
-            <p class="_detais" v-if="item.Price!=''">{{item.Price}}积分抢兑</p>
+            <p class="_detais" v-html="item.Description"></p>
           </div>
         </el-col>
       </el-row>

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

@@ -102,12 +102,16 @@
   }
   .integralHomeV2 .class .item ._name{
     font-size:12px;
-    color:rgba(51,51,51,1);
+    color:#333;
     margin-top: 10px;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
   }
   .integralHomeV2 .class .item ._detais{
     font-size:12px;
-    color:rgba(255,1,1,1);
+    color:#FF0101;
     margin-top: 12px;
   }
   .font_bla:hover{