wxd / MShopWeApp

Commit 9e4596b8e8626606dfccdbc19c87e49769fcf2cf

Authored by yvan.ni
1 parent 1b0995c5

商品分类的字体大小和布局大小， 购卡详情过期的购买功能

Inline Side-by-side
Showing 5 changed files with 30 additions and 18 deletions
pages/goods/categoryList/categoryList.wxml
  View file @9e4596b
... ... @@ -116,20 +116,20 @@
116 116 <view class="project_type">
117 117 <view class="project_type-frame">
118 118 <view wx:if="{{is_show_gb}}">
119   - <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}}">
  119 + <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}}">
120 120 <text>国</text><text>家</text>
121 121  
122 122 </view>
123 123 </view>
124 124 <view wx:if="{{is_show_pp}}">
125   - <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="品牌">
  125 + <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="品牌">
126 126 <text>品</text><text>牌</text>
127 127 </view>
128 128 </view>
129 129 <view wx:if="{{is_show_pl}}">
130 130  
131 131 <view wx:for="{{one_level_classify}}" wx:for-item="ittms" >
132   - <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}}">
  132 + <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}}">
133 133 <view class="{{ittms.items.name.length==3?'flex-center-around':'flex-space-between'}}" wx:if="{{ittms.items.name.length<4}}">
134 134 <view wx:for="{{ittms.items.name}}" wx:for-item="name"wx:for-index="index">
135 135 <view>
... ... @@ -152,7 +152,7 @@
152 152 <view class="classify_content">
153 153 <!-- 国家的样式 -->
154 154 <block wx:if="{{select_classify_on==223&&is_show_gb}}">
155   - <view class="classify_name fs30 flex-space-between">
  155 + <view class="classify_name fs28 flex-space-between">
156 156 <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
157 157  
158 158 </view>
... ... @@ -175,7 +175,7 @@
175 175 <!-- 品牌 -->
176 176 <block wx:if="{{select_classify_on==220&&is_show_pp}}">
177 177  
178   - <view class="classify_name fs30 flex-space-between">
  178 + <view class="classify_name fs28 flex-space-between">
179 179 <view>{{classify_name}}</view>
180 180 </view>
181 181  
... ... @@ -198,7 +198,7 @@
198 198 <block wx:if="{{is_show_pl}}">
199 199 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
200 200 <view>
201   - <view class="classify_name fs30 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
  201 + <view class="classify_name fs28 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
202 202 <view class="classify_title ellipsis-1">{{classify_name}}</view>
203 203 <view class="flex select_more" >
204 204 <view class="red-co fs24" >更多</view>
... ... @@ -228,7 +228,7 @@
228 228 <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds">
229 229 <view>
230 230  
231   - <view class="classify_name fs30 flex-space-between"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
  231 + <view class="classify_name fs28 flex-space-between"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
232 232 <view class="classify_title ellipsis-1">{{goods.items.name}}</view>
233 233 <view class="flex select_more" >
234 234 <view class="red-co fs24" >更多</view>
... ...
pages/goods/categoryList/categoryList.wxss
  View file @9e4596b
... ... @@ -327,7 +327,7 @@ line-height: 65rpx;
327 327 height: 160rpx;
328 328 }
329 329 .brand_img{
330   - width:200rpx;
  330 + width:220rpx;
331 331 height:86rpx;
332 332 margin-bottom: 10rpx;
333 333 margin-top: 10rpx;
... ... @@ -388,4 +388,6 @@ margin: auto;
388 388 .no_child_lev{width: 100%; text-align: center; color: #adadad; padding-top: 30rpx}
389 389 .classify_title {
390 390 width: 80%;
391   -}
392 391 \ No newline at end of file
  392 +}
  393 +
  394 +.brand_img_name {color: #666;}
393 395 \ No newline at end of file
... ...
pages/user/cardinfo/cardinfo.wxml
  View file @9e4596b
... ... @@ -6,7 +6,6 @@
6 6 <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
7 7 </view>
8 8  
9   -
10 9 <view class="MemberPlus rel"style="background-image:url('{{user_card.CardImg}}');background-size: 100% 100%;background-repead:no-repead;">
11 10  
12 11 <view class="flex-space-between">
... ...
pages/user/index/index.js
  View file @9e4596b
... ... @@ -195,15 +195,15 @@ Page({
195 195 if(t_swi) t_swi=JSON.parse(t_swi)
196 196 if(parseInt(t_swi.rank_switch)==2){
197 197 var userInfo=th.data.userInfo;
198   - if(userInfo.card_field!=null && userInfo.card_field!=undefined && userInfo.card_field!="" ){
199   - th.setData({is_dengji:1})
  198 + if(userInfo.card_field!=null && userInfo.card_field!=undefined && userInfo.card_field!="" ){
  199 + var now=ut.gettimestamp();
  200 + var str= userInfo.card_expiredate;
  201 + var end = new Date(str);
  202 + end = Date.parse(end) / 1000;
  203 + //---判断是不是有过期---
  204 + if(now<end){ th.setData({is_dengji:1}) }else{ th.setData({is_dengji:3}) }
200 205 }else{
201   - var now=ut.gettimestamp();
202   - var str= userInfo.card_expiredate;
203   -
204   -
205   -
206   - th.setData({is_dengji:2})
  206 + th.setData({is_dengji:2})
207 207 }
208 208 }
209 209 })
... ...
pages/user/index/index.wxml
  View file @9e4596b
... ... @@ -73,6 +73,17 @@
73 73 </view>
74 74 </view>
75 75 </view>
  76 +
  77 + <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3}}">
  78 + <view class="xc-add-member flex-vertical four-level-word">
  79 + <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
  80 + <view class="member"> 加入plus会员</view>
  81 + <view class="t-c xc-save-money"> 预计可省3031元</view>
  82 + <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
  83 + <view class="xc-opening fs20">立即续费</view>
  84 + </view>
  85 + </view>
  86 + </view>
76 87  
77 88 </view>
78 89 <view class="xc-after-sale rel">
... ...