From 9e4596b8e8626606dfccdbc19c87e49769fcf2cf Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 7 Nov 2019 14:18:01 +0800
Subject: [PATCH] 商品分类的字体大小和布局大小，  购卡详情过期的购买功能

---
 pages/goods/categoryList/categoryList.wxml | 14 +++++++-------
 pages/goods/categoryList/categoryList.wxss |  6 ++++--
 pages/user/cardinfo/cardinfo.wxml          |  1 -
 pages/user/index/index.js                  | 16 ++++++++--------
 pages/user/index/index.wxml                | 11 +++++++++++
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 9e3345b..867df8c 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -116,20 +116,20 @@
                <view class="project_type">
            <view class="project_type-frame">
            <view wx:if="{{is_show_gb}}">
-              <view  bindtap="click_classify"  class="share_type fs32 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
+              <view  bindtap="click_classify"  class="share_type fs30 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
                <text>国</text><text>家</text>
 
               </view>
               </view>
               <view wx:if="{{is_show_pp}}">
-                  <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} share_type fs32 flex-space-between xc-letter-spacing" wx:if="{{is_brand}}"data-index="220"data-name="品牌">
+                  <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} share_type fs30 flex-space-between xc-letter-spacing" wx:if="{{is_brand}}"data-index="220"data-name="品牌">
              <text>品</text><text>牌</text>
               </view>
               </view>
               <view wx:if="{{is_show_pl}}">
 
                 <view wx:for="{{one_level_classify}}" wx:for-item="ittms" >
-                 <view bindtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}} share_type fs32 t-c {{ittms.items.name.length==2? 'world_sn':''}} {{select_classify_on==index&&ittms.items.name.length==2?'text-indent':''}} {{select_classify_on==index&&ittms.items.name.length==3?'text3':''}}"data-index="{{index}}"data-name="{{ittms.items.name}}">
+                 <view bindtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}} share_type fs30 t-c {{ittms.items.name.length==2? 'world_sn':''}} {{select_classify_on==index&&ittms.items.name.length==2?'text-indent':''}} {{select_classify_on==index&&ittms.items.name.length==3?'text3':''}}"data-index="{{index}}"data-name="{{ittms.items.name}}">
                  <view class="{{ittms.items.name.length==3?'flex-center-around':'flex-space-between'}}" wx:if="{{ittms.items.name.length<4}}">
                  <view wx:for="{{ittms.items.name}}" wx:for-item="name"wx:for-index="index">
                  <view>
@@ -152,7 +152,7 @@
                 <view class="classify_content">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
-        <view class="classify_name fs30 flex-space-between">
+        <view class="classify_name fs28 flex-space-between">
         <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
 
         </view>
@@ -175,7 +175,7 @@
         <!-- 品牌 -->
         <block wx:if="{{select_classify_on==220&&is_show_pp}}">
 
-        <view class="classify_name fs30 flex-space-between">
+        <view class="classify_name fs28 flex-space-between">
            <view>{{classify_name}}</view>
         </view>
 
@@ -198,7 +198,7 @@
         <block  wx:if="{{is_show_pl}}">
         <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
              <view>
-                 <view class="classify_name fs30 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
+                 <view class="classify_name fs28 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
             <view class="classify_title ellipsis-1">{{classify_name}}</view>
               <view class="flex select_more" >
                 <view class="red-co fs24" >更多</view>
@@ -228,7 +228,7 @@
         <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds">
         <view>
 
-        <view class="classify_name fs30 flex-space-between"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
+        <view class="classify_name fs28 flex-space-between"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
         <view class="classify_title ellipsis-1">{{goods.items.name}}</view>
         <view class="flex select_more" >
           <view class="red-co fs24" >更多</view>
diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss
index 7502669..479bd8e 100644
--- a/pages/goods/categoryList/categoryList.wxss
+++ b/pages/goods/categoryList/categoryList.wxss
@@ -327,7 +327,7 @@ line-height: 65rpx;
     height: 160rpx;
  }
  .brand_img{
-   width:200rpx;
+   width:220rpx;
    height:86rpx;
    margin-bottom: 10rpx;
    margin-top: 10rpx;
@@ -388,4 +388,6 @@ margin: auto;
 .no_child_lev{width: 100%; text-align: center; color: #adadad; padding-top: 30rpx}
 .classify_title {
   width: 80%;
-}
\ No newline at end of file
+}
+
+.brand_img_name {color: #666;}
\ No newline at end of file
diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml
index 2ada240..de4d709 100644
--- a/pages/user/cardinfo/cardinfo.wxml
+++ b/pages/user/cardinfo/cardinfo.wxml
@@ -6,7 +6,6 @@
   <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
 </view>
 
-
         <view class="MemberPlus rel"style="background-image:url('{{user_card.CardImg}}');background-size: 100% 100%;background-repead:no-repead;">
 
           <view class="flex-space-between">
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index f901e90..e73aa49 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -195,15 +195,15 @@ Page({
           if(t_swi) t_swi=JSON.parse(t_swi)
           if(parseInt(t_swi.rank_switch)==2){
               var userInfo=th.data.userInfo;
-              if(userInfo.card_field!=null && userInfo.card_field!=undefined && userInfo.card_field!="" ){
-                  th.setData({is_dengji:1})
+              if(userInfo.card_field!=null && userInfo.card_field!=undefined && userInfo.card_field!="" ){	  
+				  var now=ut.gettimestamp();
+				  var str= userInfo.card_expiredate;
+				  var end = new Date(str);
+				  end = Date.parse(end) / 1000;
+				  //---判断是不是有过期---
+				  if(now<end){ th.setData({is_dengji:1}) }else{ th.setData({is_dengji:3})  }
               }else{
-				 var now=ut.gettimestamp();
-				 var str= userInfo.card_expiredate;
-				 
-				 
-				  
-                 th.setData({is_dengji:2})
+				  th.setData({is_dengji:2})
               }
           }
         })
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 5e83b50..bb4b52e 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -73,6 +73,17 @@
         </view>
       </view>
     </view>
+	
+	<view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3}}">
+	  <view class="xc-add-member flex-vertical four-level-word">
+	    <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
+	    <view class="member"> 加入plus会员</view>
+	    <view class="t-c xc-save-money"> 预计可省3031元</view>
+	    <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
+	      <view class="xc-opening fs20">立即续费</view>
+	    </view>
+	  </view>
+	</view>
 
   </view>
   <view class="xc-after-sale rel">
--
libgit2 0.21.4