Commit 0ef917436146d22123cb96e494bd098b6b809cd9
1 parent
0a98958a
使用过滤器，筛选所有的规格值
Showing
6 changed files
with
31 additions
and
21 deletions
pages/cart/cart2/cart2.wxml
| 1 | 1 | <wxs module="filter" src="c_filter.wxs"></wxs> |
| 2 | 2 | <wxs src="filter.wxs" module="util"></wxs> |
| 3 | 3 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
| 4 | -<wxs module="filters" src="../../../utils/filter.wxs"></wxs> | |
| 4 | + | |
| 5 | 5 | <form bindsubmit="submitForm"> |
| 6 | 6 | <view class="container"> |
| 7 | 7 | <!--要进行判断地址是否显示----> |
| ... | ... | @@ -51,11 +51,12 @@ |
| 51 | 51 | <!-- 商品属性 --> |
| 52 | 52 | <view class="flex-vertical fs28 color-gray n_guige"> |
| 53 | 53 | <view class="goods-color"> |
| 54 | - <block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block> | |
| 55 | - <block wx:else> | |
| 56 | - <text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text> | |
| 57 | - <text wx:if="{{items.goods_color}}">{{items.goods_color}}</text> | |
| 58 | - </block> | |
| 54 | + <block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block> | |
| 55 | + <!--<block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>--> | |
| 56 | + <!--<block wx:else>--> | |
| 57 | + <!--<text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>--> | |
| 58 | + <!--<text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>--> | |
| 59 | + <!--</block>--> | |
| 59 | 60 | </view> |
| 60 | 61 | </view> |
| 61 | 62 | |
| ... | ... | @@ -173,11 +174,12 @@ |
| 173 | 174 | <!-- 商品属性 --> |
| 174 | 175 | <view class="flex-vertical fs28 xc-ash color-gray n_guige"> |
| 175 | 176 | <view class="goods-color"> |
| 176 | - <block wx:if="{{!bn_goods.goods_spec && !bn_goods.goods_color}}"><text>规格1</text></block> | |
| 177 | - <block wx:else> | |
| 178 | - <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}<text wx:if="{{bn_goods.goods_color}}">/</text></text> | |
| 179 | - <text wx:if="{{bn_goods.goods_color}}">{{bn_goods.goods_color}}</text> | |
| 180 | - </block> | |
| 177 | + <block><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text></block> | |
| 178 | + <!--<block wx:if="{{!bn_goods.goods_spec && !bn_goods.goods_color}}"><text>规格1</text></block>--> | |
| 179 | + <!--<block wx:else>--> | |
| 180 | + <!--<text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}<text wx:if="{{bn_goods.goods_color}}">/</text></text>--> | |
| 181 | + <!--<text wx:if="{{bn_goods.goods_color}}">{{bn_goods.goods_color}}</text>--> | |
| 182 | + <!--</block>--> | |
| 181 | 183 | </view> |
| 182 | 184 | </view> |
| 183 | 185 | ... | ... |
pages/cart/cart2_pt/cart2_pt.wxml
| ... | ... | @@ -40,11 +40,9 @@ |
| 40 | 40 | <view class="goods-name">{{bn_goods.goods_name}}</view> |
| 41 | 41 | <!-- 商品属性 --> |
| 42 | 42 | <view class="flex-vertical fs28 color-gray n_guige"> |
| 43 | - <view class="goods-color"> | |
| 44 | - <text wx:if="{{bn_goods.goods_spec!=''}}"> {{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}} | |
| 43 | + <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text> | |
| 45 | 44 | </view></view> |
| 46 | 45 | |
| 47 | - | |
| 48 | 46 | <!-----商品名称规格------> |
| 49 | 47 | <view class="order-num flex-space-between"> |
| 50 | 48 | <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view> | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -540,6 +540,10 @@ Page({ |
| 540 | 540 | else { |
| 541 | 541 | var gg = "", |
| 542 | 542 | item = t.data.data; |
| 543 | + | |
| 544 | + if(item.goods_spec=="null") item.goods_spec=""; | |
| 545 | + if(item.goods_color=="null") item.goods_color=""; | |
| 546 | + | |
| 543 | 547 | if (item.goods_spec != "" && item.goods_color != "") { |
| 544 | 548 | gg = item.goods_spec + "/" + item.goods_color; |
| 545 | 549 | } else if (item.goods_spec != "" || item.goods_color != "") { |
| ... | ... | @@ -1168,6 +1172,10 @@ Page({ |
| 1168 | 1172 | for (var i = 0; i < arrdata.length; i++) { |
| 1169 | 1173 | var item = arrdata[i], |
| 1170 | 1174 | gg = ""; |
| 1175 | + | |
| 1176 | + if(item.goods_spec=="null") item.goods_spec=""; | |
| 1177 | + if(item.goods_color=="null") item.goods_color=""; | |
| 1178 | + | |
| 1171 | 1179 | if (item.goods_spec != "" && item.goods_color != "") { |
| 1172 | 1180 | gg = item.goods_spec + "/" + item.goods_color; |
| 1173 | 1181 | } else if (item.goods_spec != "" || item.goods_color != "") { | ... | ... |
pages/user/order_detail/order_detail.wxml
| ... | ... | @@ -26,7 +26,8 @@ |
| 26 | 26 | |
| 27 | 27 | <navigator class="order-cont" openType="navigate" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> |
| 28 | 28 | <view class="goods-name">{{item.goods_name}}</view> |
| 29 | - <view class="goods-color">{{item.goods_spec}} {{item.goods_color}}</view> | |
| 29 | + <!--<view class="goods-color">{{item.goods_spec}} {{item.goods_color}}</view>--> | |
| 30 | + <view class="goods-color">{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</view> | |
| 30 | 31 | </navigator> |
| 31 | 32 | |
| 32 | 33 | <view class="order-num"> | ... | ... |
pages/user/order_list/order_list.wxml
| ... | ... | @@ -56,9 +56,10 @@ |
| 56 | 56 | <view class="flex-space-between"> |
| 57 | 57 | <!-- 商品规格 --> |
| 58 | 58 | <view class="Commodity_spec fs28 flex-center"> |
| 59 | - <text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text> | |
| 60 | - <text class="ellipsis-1" wx:elif="{{goods.goods_color.length>1 || goods.goods_spec.length>1}}">{{goods.goods_color==undefined?"":goods.goods_color}}{{goods.goods_spec==undefined?"":goods.goods_spec}}</text> | |
| 61 | - <text class="ellipsis-1" wx:else>规格1</text> | |
| 59 | + <!--<text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>--> | |
| 60 | + <!--<text class="ellipsis-1" wx:elif="{{goods.goods_color.length>1 || goods.goods_spec.length>1}}">{{goods.goods_color==undefined?"":goods.goods_color}}{{goods.goods_spec==undefined?"":goods.goods_spec}}</text>--> | |
| 61 | + <!--<text class="ellipsis-1" wx:else>规格1</text>--> | |
| 62 | + <text class="ellipsis-1">{{filters.show_gui_ge(goods.goods_spec, goods.goods_color)}}</text> | |
| 62 | 63 | </view> |
| 63 | 64 | <view class="flex-level-right fs26 refund"> |
| 64 | 65 | <!-- 不是整单退的时候 --> | ... | ... |
utils/filter.wxs
| ... | ... | @@ -25,11 +25,11 @@ var filters = { |
| 25 | 25 | }, |
| 26 | 26 | |
| 27 | 27 | show_gui_ge:function(spec,color){ |
| 28 | - if((spec=="" || spec==null)){ | |
| 29 | - if((color=="" || color==null)){ return "规格1"; | |
| 28 | + if((spec=="" || spec==null || spec=="null")){ | |
| 29 | + if((color=="" || color==null || color=="null")){ return "规格1"; | |
| 30 | 30 | }else{return color; } |
| 31 | 31 | }else{ |
| 32 | - if((color=="" || color==null)){ return spec; | |
| 32 | + if((color=="" || color==null || color=="null")){ return spec; | |
| 33 | 33 | }else{ return spec+"/"+color; } |
| 34 | 34 | } |
| 35 | 35 | } | ... | ... |