Commit bf48a0f6b56d4693d5701354c2c31acfe811c3dd
1 parent
288fade0
自定义模板显示秒杀，拼团价格
Showing
5 changed files
with
273 additions
and
934 deletions
components/diy_goodsGroup/diy_goodsGroup.js
| @@ -115,9 +115,9 @@ Component({ | @@ -115,9 +115,9 @@ Component({ | ||
| 115 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 | 115 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 |
| 116 | 116 | ||
| 117 | var url = ""; | 117 | var url = ""; |
| 118 | - if (prom_type == 1) { | 118 | + if (prom_type == 6) { |
| 119 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; | 119 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; |
| 120 | - } else if (prom_type == 6) { | 120 | + } else if (prom_type == 1) { |
| 121 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; | 121 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; |
| 122 | } | 122 | } |
| 123 | if(url==""){ | 123 | if(url==""){ |
| @@ -130,11 +130,11 @@ Component({ | @@ -130,11 +130,11 @@ Component({ | ||
| 130 | return app.request.promiseGet(url, {}) | 130 | return app.request.promiseGet(url, {}) |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | - | ||
| 134 | }).then(res => { | 133 | }).then(res => { |
| 135 | index++; | 134 | index++; |
| 136 | var prom = res.data.data; | 135 | var prom = res.data.data; |
| 137 | - if (prom != null) { | 136 | + var now=ut.gettimestamp(); |
| 137 | + if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) { | ||
| 138 | item.shop_price = res.data.data.price; | 138 | item.shop_price = res.data.data.price; |
| 139 | } | 139 | } |
| 140 | th.data.requestData.push(item); | 140 | th.data.requestData.push(item); |
| @@ -170,8 +170,9 @@ Component({ | @@ -170,8 +170,9 @@ Component({ | ||
| 170 | total: res.data.data.total | 170 | total: res.data.data.total |
| 171 | }) | 171 | }) |
| 172 | th.data.currentPage++; | 172 | th.data.currentPage++; |
| 173 | + var now=ut.gettimestamp(); | ||
| 173 | 174 | ||
| 174 | - goods.forEach(function (val, ind) { | 175 | + goods.forEach(async function (val, ind) { |
| 175 | var item = {}; | 176 | var item = {}; |
| 176 | var prom_id = null; | 177 | var prom_id = null; |
| 177 | console.log(val.goodsid); | 178 | console.log(val.goodsid); |
| @@ -187,18 +188,18 @@ Component({ | @@ -187,18 +188,18 @@ Component({ | ||
| 187 | item.goods_id = val.goods_id; | 188 | item.goods_id = val.goods_id; |
| 188 | prom_id = val.prom_id; | 189 | prom_id = val.prom_id; |
| 189 | 190 | ||
| 190 | - var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 | 191 | + var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 |
| 191 | 192 | ||
| 192 | var url = ""; | 193 | var url = ""; |
| 193 | - if (prom_type == 1) { | 194 | + if (prom_type == 6) { |
| 194 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; | 195 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; |
| 195 | - } else if (prom_type == 6) { | 196 | + } else if (prom_type == 1) { |
| 196 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; | 197 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; |
| 197 | } | 198 | } |
| 198 | if(url!="") { | 199 | if(url!="") { |
| 199 | - app.request.promiseGet(url, {}).then(res => { | 200 | + await app.request.promiseGet(url, {}).then(res => { |
| 200 | var prom = res.data.data; | 201 | var prom = res.data.data; |
| 201 | - if (prom != null) { | 202 | + if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) { |
| 202 | item.shop_price = res.data.data.price; | 203 | item.shop_price = res.data.data.price; |
| 203 | } | 204 | } |
| 204 | th.data.requestData.push(item); | 205 | th.data.requestData.push(item); |
| @@ -237,18 +238,15 @@ Component({ | @@ -237,18 +238,15 @@ Component({ | ||
| 237 | }) | 238 | }) |
| 238 | 239 | ||
| 239 | th.data.currentPage++; | 240 | th.data.currentPage++; |
| 240 | - goods.forEach(function (val, ind) { | 241 | + var now=ut.gettimestamp(); |
| 242 | + goods.forEach(async function (val, ind) { | ||
| 241 | var item = {}; | 243 | var item = {}; |
| 242 | var prom_id = null; | 244 | var prom_id = null; |
| 243 | console.log(val.goodsid); | 245 | console.log(val.goodsid); |
| 244 | //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => { | 246 | //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => { |
| 245 | //商品地址 | 247 | //商品地址 |
| 246 | var goods = res.data.data; | 248 | var goods = res.data.data; |
| 247 | - console.log("goods"); | ||
| 248 | - console.log(goods); | ||
| 249 | - // th.setData({ | ||
| 250 | - // goods_btn: res.data.data | ||
| 251 | - // }) | 249 | + |
| 252 | item.goods_name = val.goods_name; | 250 | item.goods_name = val.goods_name; |
| 253 | item.goods_img = th.data.imghost + val.original_img; | 251 | item.goods_img = th.data.imghost + val.original_img; |
| 254 | item.market_price = val.market_price; | 252 | item.market_price = val.market_price; |
| @@ -260,16 +258,16 @@ Component({ | @@ -260,16 +258,16 @@ Component({ | ||
| 260 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 | 258 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 |
| 261 | 259 | ||
| 262 | var url = ""; | 260 | var url = ""; |
| 263 | - if (prom_type == 1) { | 261 | + if (prom_type == 6) { |
| 264 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; | 262 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; |
| 265 | - } else if (prom_type == 6) { | 263 | + } else if (prom_type == 1) { |
| 266 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; | 264 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; |
| 267 | } | 265 | } |
| 268 | 266 | ||
| 269 | if(url!=null){ | 267 | if(url!=null){ |
| 270 | - app.request.promiseGet(url, {}).then(res => { | 268 | + await app.request.promiseGet(url, {}).then(res => { |
| 271 | var prom = res.data.data; | 269 | var prom = res.data.data; |
| 272 | - if (prom != null) { | 270 | + if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) { |
| 273 | item.shop_price = res.data.data.price; | 271 | item.shop_price = res.data.data.price; |
| 274 | } | 272 | } |
| 275 | th.data.requestData.push(item); | 273 | th.data.requestData.push(item); |
| @@ -306,7 +304,7 @@ Component({ | @@ -306,7 +304,7 @@ Component({ | ||
| 306 | }, | 304 | }, |
| 307 | 305 | ||
| 308 | //---卡的初始化---- | 306 | //---卡的初始化---- |
| 309 | - card_init: function() { | 307 | + card_init: function(func) { |
| 310 | var th = this; | 308 | var th = this; |
| 311 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { | 309 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { |
| 312 | success: function(e) { | 310 | success: function(e) { |
| @@ -345,7 +343,11 @@ Component({ | @@ -345,7 +343,11 @@ Component({ | ||
| 345 | card_list: ob.card_list | 343 | card_list: ob.card_list |
| 346 | }); | 344 | }); |
| 347 | } | 345 | } |
| 346 | + //---回调---- | ||
| 347 | + if(func) func() | ||
| 348 | } | 348 | } |
| 349 | + //---回调---- | ||
| 350 | + if(func) func() | ||
| 349 | }, 500) | 351 | }, 500) |
| 350 | }) | 352 | }) |
| 351 | 353 |
components/diy_goodsGroup/diy_goodsGroup.wxml
| 1 | <!--pages/diy_zs/diy_zs.wxml--> | 1 | <!--pages/diy_zs/diy_zs.wxml--> |
| 2 | -<!--1个--> | ||
| 3 | -<view class="zs_goods_wai"> | ||
| 4 | - <!--右下角--> | ||
| 5 | - <block wx:if='{{object.column==1 && object.position==4}}'> | ||
| 6 | - <block wx:for="{{goods_array}}" > | 2 | +<wxs module="filter" src="../../utils/filter.wxs"></wxs> |
| 3 | +<wxs module="g_filter" src="g_filter.wxs"></wxs> | ||
| 4 | +<!--1个列表的时候--> | ||
| 5 | +<view class="zs_goods_wai" wx:if='{{object.column==1}}'> | ||
| 6 | + <block wx:for="{{goods_array}}" > | ||
| 7 | <view class='zs_goods'> | 7 | <view class='zs_goods'> |
| 8 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 8 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> |
| 9 | - <view class='zs_top'> | ||
| 10 | - <block> | 9 | + <view class='zs_top rel'> |
| 11 | <image class='zs_t_img' src="{{item.goods_img}}" | 10 | <image class='zs_t_img' src="{{item.goods_img}}" |
| 12 | data-errorimg="goods_array[{{index}}].goods_img" | 11 | data-errorimg="goods_array[{{index}}].goods_img" |
| 13 | binderror="bind_bnerr3" | 12 | binderror="bind_bnerr3" |
| 14 | - ></image></block> | 13 | + ></image> |
| 15 | 14 | ||
| 16 | <block wx:if="{{object.goodicon==3}}"> | 15 | <block wx:if="{{object.goodicon==3}}"> |
| 17 | - <image class='zs_t1' wx:if="{{ object.position==4}}" | ||
| 18 | - src='{{object.customicon}}'></image> | ||
| 19 | - <!--<image class='zs_t1' wx:if="{{object.position==1}}"--> | ||
| 20 | - <!--src='{{object.customicon}}'></image>--> | ||
| 21 | - <!--<image class='zs_t1' wx:if="{{ object.position==1}}"--> | ||
| 22 | - <!--src='{{object.customicon}}'></image>--> | ||
| 23 | - <!--<image class='zs_t1' wx:if="{{object.position==1}}"--> | ||
| 24 | - <!--src='{{object.customicon}}'></image>--> | 16 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> |
| 25 | </block> | 17 | </block> |
| 26 | <block wx:if="{{object.goodicon==1}}"> | 18 | <block wx:if="{{object.goodicon==1}}"> |
| 27 | - <image class='zs_t1' src=''></image> | 19 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> |
| 28 | </block> | 20 | </block> |
| 29 | <block wx:if="{{object.goodicon==2}}"> | 21 | <block wx:if="{{object.goodicon==2}}"> |
| 30 | - <image class='zs_t1' wx:if="{{object.styleicon==1}}" | 22 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" |
| 31 | src='{{imghost}}/miniapp/images/Recommend.png'></image> | 23 | src='{{imghost}}/miniapp/images/Recommend.png'></image> |
| 32 | - <image class='zs_t1' wx:if="{{object.styleicon==2}}" | 24 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}" |
| 33 | src='{{imghost}}/miniapp/images/hot.png'></image> | 25 | src='{{imghost}}/miniapp/images/hot.png'></image> |
| 34 | - <image class='zs_t1' wx:if="{{object.styleicon==3}}" | 26 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" |
| 35 | src='{{imghost}}/miniapp/images/new.png'></image> | 27 | src='{{imghost}}/miniapp/images/new.png'></image> |
| 36 | - <image class='zs_t1' wx:if="{{object.styleicon==4}}" | 28 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4}}" |
| 37 | src='{{imghost}}/miniapp/images/Promotion.png'></image> | 29 | src='{{imghost}}/miniapp/images/Promotion.png'></image> |
| 38 | </block> | 30 | </block> |
| 39 | </view> | 31 | </view> |
| 40 | <view class='zs_center'> | 32 | <view class='zs_center'> |
| 41 | - | ||
| 42 | <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | 33 | <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
| 34 | + <!--如果有显示价格 --> | ||
| 43 | <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | 35 | <view class='zs_wz2' wx:if="{{object.goodsprice}}"> |
| 44 | - <view class='wz_red'>￥{{item.shop_price}}</view> | 36 | + |
| 37 | + <block> | ||
| 38 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 39 | + </block> | ||
| 40 | + | ||
| 45 | <view class='del'>￥{{item.market_price}}</view> | 41 | <view class='del'>￥{{item.market_price}}</view> |
| 46 | </view> | 42 | </view> |
| 47 | - <!-- <view class='zs_wz3'>美妆价：¥9.00</view> | ||
| 48 | - <view class='zs_wz4'>等级价：¥8.00</view> --> | ||
| 49 | <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | 43 | <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> |
| 50 | 44 | ||
| 51 | </view> | 45 | </view> |
| 52 | </navigator> | 46 | </navigator> |
| 53 | - </view> | 47 | + </view> |
| 48 | + <view style="height:20rpx"></view> | ||
| 54 | </block> | 49 | </block> |
| 55 | - </block> | ||
| 56 | - | ||
| 57 | - <!-- 右上角 --> | ||
| 58 | - <block wx:if='{{object.column==1 && object.position==2}}'> | ||
| 59 | - <block wx:for="{{goods_array}}" > | ||
| 60 | - <view class='zs_goods' > | ||
| 61 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 62 | - <view class='zs_top'> | ||
| 63 | - | ||
| 64 | - <block> | ||
| 65 | - <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 66 | - binderror="bind_bnerr3"></image> | ||
| 67 | - </block> | ||
| 68 | - | ||
| 69 | - <!-- <image class='zs_t2' src='http://jmh.xinda100.cn/public/static/images/model/Recommend.png'></image> --> | ||
| 70 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 71 | - <image class='zs_t2' wx:if="{{object.position==2}}" | ||
| 72 | - src='{{object.customicon}}'></image> | ||
| 73 | - <!--<image class='zs_t2' wx:if="{{object.styleicon==2 && object.position==2}}"--> | ||
| 74 | - <!--src='{{object.customicon}}'></image>--> | ||
| 75 | - <!--<image class='zs_t2' wx:if="{{object.styleicon==3 && object.position==2}}"--> | ||
| 76 | - <!--src='{{object.customicon}}'></image>--> | ||
| 77 | - <!--<image class='zs_t2' wx:if="{{object.styleicon==4 && object.position==2}}"--> | ||
| 78 | - <!--src='{{object.customicon}}'></image>--> | ||
| 79 | - </block> | ||
| 80 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 81 | - <image class='zs_t2' src=''></image> | ||
| 82 | - </block> | ||
| 83 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 84 | - <image class='zs_t2' wx:if="{{object.styleicon==1}}" | ||
| 85 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 86 | - <image class='zs_t2' wx:if="{{object.styleicon==2 }}" | ||
| 87 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 88 | - <image class='zs_t2' wx:if="{{object.styleicon==3}}" | ||
| 89 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 90 | - <image class='zs_t2' wx:if="{{object.styleicon==4 }}" | ||
| 91 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 92 | - </block> | ||
| 93 | - </view> | ||
| 94 | - | ||
| 95 | - <view class='zs_center'> | ||
| 96 | - <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 97 | - <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | ||
| 98 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 99 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 100 | - </view> | ||
| 101 | - <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 102 | - | ||
| 103 | - </view> | ||
| 104 | - </navigator> | ||
| 105 | - | ||
| 106 | - </view> | ||
| 107 | - </block> | ||
| 108 | - </block> | ||
| 109 | - <!-- 左上角 --> | ||
| 110 | - <block wx:if='{{object.column==1 && object.position==1}}'> | ||
| 111 | - <block wx:for="{{goods_array}}"> | ||
| 112 | - <view class='zs_goods'> | ||
| 113 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 114 | - <view class='zs_top'> | ||
| 115 | - | ||
| 116 | - <block> | ||
| 117 | - <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 118 | - binderror="bind_bnerr3"></image> | ||
| 119 | - </block> | ||
| 120 | - <!-- <image class='zs_t3' src='http://jmh.xinda100.cn/public/static/images/model/hot.png'></image> --> | ||
| 121 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 122 | - <image class='zs_t3' wx:if="{{ object.position==1}}" | ||
| 123 | - src='{{object.customicon}}'></image> | ||
| 124 | - <!--<image class='zs_t3' wx:if="{{object.styleicon==2 && object.position==3}}"--> | ||
| 125 | - <!--src='{{object.customicon}}'></image>--> | ||
| 126 | - <!--<image class='zs_t3' wx:if="{{object.styleicon==3 && object.position==3}}"--> | ||
| 127 | - <!--src='{{object.customicon}}'></image>--> | ||
| 128 | - <!--<image class='zs_t3' wx:if="{{object.styleicon==4 && object.position==3}}"--> | ||
| 129 | - <!--src='{{object.customicon}}'></image>--> | ||
| 130 | - </block> | ||
| 131 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 132 | - <image class='zs_t3' src=''></image> | ||
| 133 | - </block> | ||
| 134 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 135 | - <image class='zs_t3' wx:if="{{object.styleicon==1}}" | ||
| 136 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 137 | - <image class='zs_t3' wx:if="{{object.styleicon==2 }}" | ||
| 138 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 139 | - <image class='zs_t3' wx:if="{{object.styleicon==3}}" | ||
| 140 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 141 | - <image class='zs_t3' wx:if="{{object.styleicon==4 }}" | ||
| 142 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 143 | - </block> | ||
| 144 | - </view> | ||
| 145 | - | ||
| 146 | - <view class='zs_center'> | ||
| 147 | - | ||
| 148 | - <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 149 | - <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | ||
| 150 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 151 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 152 | - </view> | ||
| 153 | - <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 154 | - | ||
| 155 | - </view> | ||
| 156 | - </navigator> | ||
| 157 | - | ||
| 158 | - </view> | ||
| 159 | - </block> | ||
| 160 | - </block> | ||
| 161 | - <!-- 左下角 --> | ||
| 162 | - <block wx:if='{{object.column==1 && object.position==3}}'> | ||
| 163 | - <block wx:for="{{goods_array}}" > | ||
| 164 | - <view class='zs_goods' > | ||
| 165 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 166 | - <view class='zs_top'> | ||
| 167 | - | ||
| 168 | - <block> | ||
| 169 | - <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 170 | - binderror="bind_bnerr3"></image> | ||
| 171 | - </block> | ||
| 172 | - <!-- <image class='zs_t4' src='http://jmh.xinda100.cn/public/static/images/model/new.png'></image> --> | ||
| 173 | - | ||
| 174 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 175 | - <image class='zs_t4' wx:if="{{ object.position==3}}" | ||
| 176 | - src='{{object.customicon}}'></image> | ||
| 177 | - <!--<image class='zs_t4' wx:if="{{object.styleicon==2 && object.position==4}}"--> | ||
| 178 | - <!--src='{{object.customicon}}'></image>--> | ||
| 179 | - <!--<image class='zs_t4' wx:if="{{object.styleicon==3 && object.position==4}}"--> | ||
| 180 | - <!--src='{{object.customicon}}'></image>--> | ||
| 181 | - <!--<image class='zs_t4' wx:if="{{object.styleicon==4 && object.position==4}}"--> | ||
| 182 | - <!--src='{{object.customicon}}'></image>--> | ||
| 183 | - </block> | ||
| 184 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 185 | - <image class='zs_t4' src=''></image> | ||
| 186 | - </block> | ||
| 187 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 188 | - <image class='zs_t4' wx:if="{{object.styleicon==1}}" | ||
| 189 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 190 | - <image class='zs_t4' wx:if="{{object.styleicon==2 }}" | ||
| 191 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 192 | - <image class='zs_t4' wx:if="{{object.styleicon==3}}" | ||
| 193 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 194 | - <image class='zs_t4' wx:if="{{object.styleicon==4 }}" | ||
| 195 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 196 | - </block> | ||
| 197 | - </view> | ||
| 198 | - | ||
| 199 | - <view class='zs_center'> | ||
| 200 | - <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 201 | - <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | ||
| 202 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 203 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 204 | - </view> | ||
| 205 | - <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 206 | - | ||
| 207 | - </view> | ||
| 208 | - </navigator> | ||
| 209 | - </view> | ||
| 210 | - </block> | ||
| 211 | - </block> | 50 | + |
| 212 | </view> | 51 | </view> |
| 213 | - | ||
| 214 | - | ||
| 215 | -<!-- 列表显示 --> | ||
| 216 | -<view class="zs_goods_xiao_wai"> | ||
| 217 | - <!--右上角--> | ||
| 218 | - <block wx:if='{{object.column==4 && object.position==2}}'> | ||
| 219 | - <block wx:for="{{goods_array}}" > | ||
| 220 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 221 | - <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 222 | - <view class='zs_top_x'> | ||
| 223 | - <!--<image class='zs_t_img_x'></image>--> | ||
| 224 | - <block> | ||
| 225 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 226 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 227 | - </block> | ||
| 228 | - | ||
| 229 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 230 | - <image class='zs_t1_x' wx:if="{{object.position==2}}" | ||
| 231 | - src='{{object.customicon}}'></image> | ||
| 232 | - <!--<image class='zs_t1_x' wx:if="{{object.styleicon==2 && object.position==1}}"--> | ||
| 233 | - <!--src='{{object.customicon}}'></image>--> | ||
| 234 | - <!--<image class='zs_t1_x' wx:if="{{object.styleicon==3 && object.position==1}}"--> | ||
| 235 | - <!--src='{{object.customicon}}'></image>--> | ||
| 236 | - <!--<image class='zs_t1_x' wx:if="{{object.styleicon==4 && object.position==1}}"--> | ||
| 237 | - <!--src='{{object.customicon}}'></image>--> | ||
| 238 | - </block> | ||
| 239 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 240 | - <image class='zs_t1_x' src=''></image> | ||
| 241 | - </block> | ||
| 242 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 243 | - <image class='zs_t1_x' wx:if="{{object.styleicon==1}}" | ||
| 244 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 245 | - <image class='zs_t1_x' wx:if="{{object.styleicon==2 }}" | ||
| 246 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 247 | - <image class='zs_t1_x' wx:if="{{object.styleicon==3}}" | ||
| 248 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 249 | - <image class='zs_t1_x' wx:if="{{object.styleicon==4 }}" | ||
| 250 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 251 | - </block> | ||
| 252 | - </view> | ||
| 253 | - | ||
| 254 | - <view class='zs_center_x'> | ||
| 255 | - | ||
| 256 | - | ||
| 257 | - <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 258 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 259 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 260 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 261 | - </view> | ||
| 262 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 263 | - | ||
| 264 | - | ||
| 265 | - </view> | ||
| 266 | - | ||
| 267 | - </view> | ||
| 268 | - </navigator> | ||
| 269 | - </block> | ||
| 270 | - </block> | ||
| 271 | - <!-- 左上角 --> | ||
| 272 | - <block wx:if='{{object.column==4 && object.position==1}}'> | ||
| 273 | - <block wx:for="{{goods_array}}" > | ||
| 274 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 275 | - <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 276 | - <view class='zs_top_x'> | ||
| 277 | - | ||
| 278 | - <block wx:if="{{item.goods_img!=''}}"> | ||
| 279 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 280 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 281 | - </block> | ||
| 282 | - | ||
| 283 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 284 | - <image class='zs_t1_x1' wx:if="{{ object.position==1}}" | ||
| 285 | - src='{{object.customicon}}'></image> | ||
| 286 | - <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==2 && object.position==2}}"--> | ||
| 287 | - <!--src='{{object.customicon}}'></image>--> | ||
| 288 | - <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==3 && object.position==2}}"--> | ||
| 289 | - <!--src='{{object.customicon}}'></image>--> | ||
| 290 | - <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==4 && object.position==2}}"--> | ||
| 291 | - <!--src='{{object.customicon}}'></image>--> | ||
| 292 | - </block> | ||
| 293 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 294 | - <image class='zs_t1_x1' src=''></image> | ||
| 295 | - </block> | ||
| 296 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 297 | - <image class='zs_t1_x1' wx:if="{{object.styleicon==1}}" | ||
| 298 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 299 | - <image class='zs_t1_x1' wx:if="{{object.styleicon==2 }}" | ||
| 300 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 301 | - <image class='zs_t1_x1' wx:if="{{object.styleicon==3}}" | ||
| 302 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 303 | - <image class='zs_t1_x1' wx:if="{{object.styleicon==4 }}" | ||
| 304 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 305 | - </block> | ||
| 306 | - </view> | ||
| 307 | - <view class='zs_center_x'> | ||
| 308 | - <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 309 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 310 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 311 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 312 | - </view> | ||
| 313 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 314 | - </view> | ||
| 315 | - | ||
| 316 | - </view> | ||
| 317 | - </navigator> | ||
| 318 | - </block> | ||
| 319 | - </block> | ||
| 320 | - <!-- 右下角 --> | ||
| 321 | - <block wx:if='{{object.column==4 && object.position==4}}'> | ||
| 322 | - <block wx:for="{{goods_array}}" > | ||
| 323 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 324 | - <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 325 | - <view class='zs_top_x'> | ||
| 326 | - | ||
| 327 | - <block> | ||
| 328 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 329 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 330 | - </block> | ||
| 331 | - | ||
| 332 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 333 | - <image class='zs_t1_x2' wx:if="{{object.position==4}}" | ||
| 334 | - src='{{object.customicon}}'></image> | ||
| 335 | - <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==2 && object.position==3}}"--> | ||
| 336 | - <!--src='{{object.customicon}}'></image>--> | ||
| 337 | - <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==3 && object.position==3}}"--> | ||
| 338 | - <!--src='{{object.customicon}}'></image>--> | ||
| 339 | - <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==4 && object.position==3}}"--> | ||
| 340 | - <!--src='{{object.customicon}}'></image>--> | ||
| 341 | - </block> | ||
| 342 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 343 | - <image class='zs_t1_x2' src=''></image> | ||
| 344 | - </block> | ||
| 345 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 346 | - <image class='zs_t1_x2' wx:if="{{object.styleicon==1}}" | ||
| 347 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 348 | - <image class='zs_t1_x2' wx:if="{{object.styleicon==2 }}" | ||
| 349 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 350 | - <image class='zs_t1_x2' wx:if="{{object.styleicon==3}}" | ||
| 351 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 352 | - <image class='zs_t1_x2' wx:if="{{object.styleicon==4 }}" | ||
| 353 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 354 | - </block> | ||
| 355 | - </view> | ||
| 356 | - | ||
| 357 | - <view class='zs_center_x'> | ||
| 358 | - <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 359 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 360 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 361 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 362 | - </view> | ||
| 363 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 364 | - | ||
| 365 | - </view> | ||
| 366 | - | ||
| 367 | - </view> | ||
| 368 | - </navigator> | ||
| 369 | - </block> | ||
| 370 | - </block> | ||
| 371 | - <!-- 左下角 --> | ||
| 372 | - <block wx:if='{{object.column==4 && object.position==3}}'> | ||
| 373 | - <block wx:for="{{goods_array}}" > | ||
| 374 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 375 | - <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 376 | - <view class='zs_top_x'> | ||
| 377 | - <block wx:if="{{item.goods_img!=''}}"> | ||
| 378 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 379 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 380 | - </block> | ||
| 381 | - | ||
| 382 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 383 | - <image class='zs_t1_x3' wx:if="{{object.position==3}}" | ||
| 384 | - src='{{object.customicon}}'></image> | ||
| 385 | - <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==2 && object.position==4}}"--> | ||
| 386 | - <!--src='{{object.customicon}}'></image>--> | ||
| 387 | - <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==3 && object.position==4}}"--> | ||
| 388 | - <!--src='{{object.customicon}}'></image>--> | ||
| 389 | - <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==4 && object.position==4}}"--> | ||
| 390 | - <!--src='{{object.customicon}}'></image>--> | ||
| 391 | - </block> | ||
| 392 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 393 | - <image class='zs_t1_x3' src=''></image> | ||
| 394 | - </block> | ||
| 395 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 396 | - <image class='zs_t1_x3' wx:if="{{object.styleicon==1}}" | ||
| 397 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 398 | - <image class='zs_t1_x3' wx:if="{{object.styleicon==2 }}" | ||
| 399 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 400 | - <image class='zs_t1_x3' wx:if="{{object.styleicon==3}}" | ||
| 401 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 402 | - <image class='zs_t1_x3' wx:if="{{object.styleicon==4 }}" | ||
| 403 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 404 | - </block> | ||
| 405 | - </view> | ||
| 406 | - <view class='zs_center_x'> | ||
| 407 | - | ||
| 408 | - <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 409 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 410 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 411 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 412 | - </view> | ||
| 413 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 414 | - </view> | ||
| 415 | - | ||
| 416 | - </view> | ||
| 417 | - </navigator> | ||
| 418 | - </block> | ||
| 419 | - </block> | ||
| 420 | -</view> | ||
| 421 | - | ||
| 422 | - | ||
| 423 | <!--2个一列--> | 52 | <!--2个一列--> |
| 424 | -<!--左上角--> | ||
| 425 | -<block wx:if="{{object.column==2 && object.position==1}}"> | ||
| 426 | -<block wx:for="{{goods_array}}" > | 53 | +<block wx:if="{{object.column==2}}"> |
| 54 | + <block wx:for="{{goods_array}}" > | ||
| 427 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 55 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> |
| 428 | - | ||
| 429 | <view class="zs_goods_wai_ban"> | 56 | <view class="zs_goods_wai_ban"> |
| 430 | <view class="zs_goods_ban"> | 57 | <view class="zs_goods_ban"> |
| 431 | <view class='zs_goods_2l'> | 58 | <view class='zs_goods_2l'> |
| 432 | - | ||
| 433 | - <view class='zs_top_2l'> | ||
| 434 | - <!--<image class='zs_t_img_2l'></image>--> | ||
| 435 | - <block wx:if="{{item.goods_img!=''}}"> | ||
| 436 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | 59 | + <view class='zs_top_2l rel'> |
| 60 | + <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 437 | binderror="bind_bnerr3"></image> | 61 | binderror="bind_bnerr3"></image> |
| 438 | - </block> | ||
| 439 | - | ||
| 440 | <block wx:if="{{object.goodicon==3}}"> | 62 | <block wx:if="{{object.goodicon==3}}"> |
| 441 | - <image class='zs_t1_2l' wx:if="{{object.position==1}}" | 63 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==1}}" |
| 442 | src='{{object.customicon}}'></image> | 64 | src='{{object.customicon}}'></image> |
| 443 | - <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==2 && object.position==1}}"--> | ||
| 444 | - <!--src='{{object.customicon}}'></image>--> | ||
| 445 | - <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==3 && object.position==1}}"--> | ||
| 446 | - <!--src='{{object.customicon}}'></image>--> | ||
| 447 | - <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==4 && object.position==1}}"--> | ||
| 448 | - <!--src='{{object.customicon}}'></image>--> | ||
| 449 | </block> | 65 | </block> |
| 450 | <block wx:if="{{object.goodicon==1}}"> | 66 | <block wx:if="{{object.goodicon==1}}"> |
| 451 | - <image class='zs_t1_2l' src=''></image> | 67 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> |
| 452 | </block> | 68 | </block> |
| 453 | <block wx:if="{{object.goodicon==2}}"> | 69 | <block wx:if="{{object.goodicon==2}}"> |
| 454 | - <image class='zs_t1_2l' wx:if="{{object.styleicon==1}}" | 70 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" |
| 455 | src='{{imghost}}/miniapp/images/Recommend.png'></image> | 71 | src='{{imghost}}/miniapp/images/Recommend.png'></image> |
| 456 | - <image class='zs_t1_2l' wx:if="{{object.styleicon==2 }}" | 72 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" |
| 457 | src='{{imghost}}/miniapp/images/hot.png'></image> | 73 | src='{{imghost}}/miniapp/images/hot.png'></image> |
| 458 | - <image class='zs_t1_2l' wx:if="{{object.styleicon==3}}" | 74 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" |
| 459 | src='{{imghost}}/miniapp/images/new.png'></image> | 75 | src='{{imghost}}/miniapp/images/new.png'></image> |
| 460 | - <image class='zs_t1_2l' wx:if="{{object.styleicon==4 }}" | 76 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" |
| 461 | src='{{imghost}}/miniapp/images/Promotion.png'></image> | 77 | src='{{imghost}}/miniapp/images/Promotion.png'></image> |
| 462 | </block> | 78 | </block> |
| 463 | </view> | 79 | </view> |
| @@ -476,223 +92,34 @@ | @@ -476,223 +92,34 @@ | ||
| 476 | </view> | 92 | </view> |
| 477 | </navigator> | 93 | </navigator> |
| 478 | </block> | 94 | </block> |
| 479 | - | ||
| 480 | -<view class="clear"></view> | 95 | + <view class="clear"></view> |
| 481 | </block> | 96 | </block> |
| 482 | -<!--右上角--> | ||
| 483 | -<block wx:if='{{object.column==2 && object.position==2}}'> | ||
| 484 | -<block wx:for="{{goods_array}}" > | ||
| 485 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 486 | - <view class="zs_goods_wai_ban" > | ||
| 487 | - <view class="zs_goods_ban"> | ||
| 488 | - <view class='zs_goods_2l'> | ||
| 489 | - | ||
| 490 | - <view class='zs_top_2l'> | ||
| 491 | - <!--<image class='zs_t_img_2l'></image>--> | ||
| 492 | - <block> | ||
| 493 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 494 | - binderror="bind_bnerr3"></image> | ||
| 495 | - </block> | ||
| 496 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 497 | - <image class='zs_t2_2l' wx:if="{{ object.position==2}}" | ||
| 498 | - src='{{object.customicon}}'></image> | ||
| 499 | - <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==2 && object.position==2}}"--> | ||
| 500 | - <!--src='{{object.customicon}}'></image>--> | ||
| 501 | - <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==3 && object.position==2}}"--> | ||
| 502 | - <!--src='{{object.customicon}}'></image>--> | ||
| 503 | - <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==4 && object.position==2}}"--> | ||
| 504 | - <!--src='{{object.customicon}}'></image>--> | ||
| 505 | - </block> | ||
| 506 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 507 | - <image class='zs_t2_2l' src=''></image> | ||
| 508 | - </block> | ||
| 509 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 510 | - <image class='zs_t2_2l' wx:if="{{object.styleicon==1}}" | ||
| 511 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 512 | - <image class='zs_t2_2l' wx:if="{{object.styleicon==2 }}" | ||
| 513 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 514 | - <image class='zs_t2_2l' wx:if="{{object.styleicon==3}}" | ||
| 515 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 516 | - <image class='zs_t2_2l' wx:if="{{object.styleicon==4 }}" | ||
| 517 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 518 | - </block> | ||
| 519 | - </view> | ||
| 520 | - <view class='zs_center_2l'> | ||
| 521 | - | ||
| 522 | - | ||
| 523 | - <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 524 | - <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | ||
| 525 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 526 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 527 | - </view> | ||
| 528 | - <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 529 | - | ||
| 530 | - </view> | ||
| 531 | - </view> | ||
| 532 | - </view> | ||
| 533 | - | ||
| 534 | - </view> | ||
| 535 | - </navigator> | ||
| 536 | -</block> | ||
| 537 | - | ||
| 538 | -<view class="clear"></view> | ||
| 539 | -</block> | ||
| 540 | -<!--右下角--> | ||
| 541 | -<block wx:if='{{object.column==2 && object.position==4}}'> | ||
| 542 | -<block wx:for="{{goods_array}}" > | ||
| 543 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 544 | - <view class="zs_goods_wai_ban" > | ||
| 545 | - <view class="zs_goods_ban"> | ||
| 546 | - <view class='zs_goods_2l'> | ||
| 547 | - | ||
| 548 | - <view class='zs_top_2l'> | ||
| 549 | - <!--<image class='zs_t_img_2l'></image>--> | ||
| 550 | - <block> | ||
| 551 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 552 | - binderror="bind_bnerr3"></image> | ||
| 553 | - </block> | ||
| 554 | - | ||
| 555 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 556 | - <image class='zs_t3_2l' wx:if="{{ object.position==4}}" | ||
| 557 | - src='{{object.customicon}}'></image> | ||
| 558 | - <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==2 && object.position==3}}"--> | ||
| 559 | - <!--src='{{object.customicon}}'></image>--> | ||
| 560 | - <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==3 && object.position==3}}"--> | ||
| 561 | - <!--src='{{object.customicon}}'></image>--> | ||
| 562 | - <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==4 && object.position==3}}"--> | ||
| 563 | - <!--src='{{object.customicon}}'></image>--> | ||
| 564 | - </block> | ||
| 565 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 566 | - <image class='zs_t3_2l' src=''></image> | ||
| 567 | - </block> | ||
| 568 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 569 | - <image class='zs_t3_2l' wx:if="{{object.styleicon==1}}" | ||
| 570 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 571 | - <image class='zs_t3_2l' wx:if="{{object.styleicon==2 }}" | ||
| 572 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 573 | - <image class='zs_t3_2l' wx:if="{{object.styleicon==3}}" | ||
| 574 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 575 | - <image class='zs_t3_2l' wx:if="{{object.styleicon==4 }}" | ||
| 576 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 577 | - </block> | ||
| 578 | - </view> | ||
| 579 | - | ||
| 580 | - <view class='zs_center_2l'> | ||
| 581 | - | ||
| 582 | - <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 583 | - <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | ||
| 584 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 585 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 586 | - </view> | ||
| 587 | - <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 588 | - </view> | ||
| 589 | - | ||
| 590 | - </view> | ||
| 591 | - </view> | ||
| 592 | - | ||
| 593 | - | ||
| 594 | - </view> | ||
| 595 | - </navigator> | ||
| 596 | -</block> | ||
| 597 | - | ||
| 598 | -<view class="clear"></view> | ||
| 599 | -</block> | ||
| 600 | -<!--左下角--> | ||
| 601 | -<block wx:if='{{object.column==2 && object.position==3}}'> | ||
| 602 | -<block wx:for="{{goods_array}}" > | ||
| 603 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 604 | - <view class="zs_goods_wai_ban" > | ||
| 605 | - <view class="zs_goods_ban"> | ||
| 606 | - <view class='zs_goods_2l'> | ||
| 607 | - | ||
| 608 | - <view class='zs_top_2l'> | ||
| 609 | - <!--<image class='zs_t_img_2l'></image>--> | ||
| 610 | - <block> | ||
| 611 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 612 | - binderror="bind_bnerr3"></image> | ||
| 613 | - </block> | ||
| 614 | - | ||
| 615 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 616 | - <image class='zs_t4_2l' wx:if="{{ object.position==3}}" | ||
| 617 | - src='{{object.customicon}}'></image> | ||
| 618 | - <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==2 && object.position==4}}"--> | ||
| 619 | - <!--src='{{object.customicon}}'></image>--> | ||
| 620 | - <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==3 && object.position==4}}"--> | ||
| 621 | - <!--src='{{object.customicon}}'></image>--> | ||
| 622 | - <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==4 && object.position==4}}"--> | ||
| 623 | - <!--src='{{object.customicon}}'></image>--> | ||
| 624 | - </block> | ||
| 625 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 626 | - <image class='zs_t4_2l' src=''></image> | ||
| 627 | - </block> | ||
| 628 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 629 | - <image class='zs_t4_2l' wx:if="{{object.styleicon==1}}" | ||
| 630 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 631 | - <image class='zs_t4_2l' wx:if="{{object.styleicon==2 }}" | ||
| 632 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 633 | - <image class='zs_t4_2l' wx:if="{{object.styleicon==3}}" | ||
| 634 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 635 | - <image class='zs_t4_2l' wx:if="{{object.styleicon==4 }}" | ||
| 636 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 637 | - </block> | ||
| 638 | - </view> | ||
| 639 | - | ||
| 640 | - <view class='zs_center_2l'> | ||
| 641 | - | ||
| 642 | - <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 643 | - <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | ||
| 644 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 645 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 646 | - </view> | ||
| 647 | - <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 648 | - | ||
| 649 | - </view> | ||
| 650 | - </view> | ||
| 651 | - </view> | ||
| 652 | - | ||
| 653 | - </view> | ||
| 654 | - </navigator> | ||
| 655 | -</block> | ||
| 656 | - | ||
| 657 | -<view class="clear"></view> | ||
| 658 | -</block> | ||
| 659 | - | ||
| 660 | <!--3个一列--> | 97 | <!--3个一列--> |
| 661 | -<!--左上角--> | ||
| 662 | -<block wx:if='{{object.column==3 && object.position==1}}'> | ||
| 663 | -<view class="zwp_3"> | 98 | +<block wx:if='{{object.column==3}}'> |
| 99 | + <view class="zwp_3"> | ||
| 664 | <block wx:for="{{goods_array}}" > | 100 | <block wx:for="{{goods_array}}" > |
| 665 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 101 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> |
| 666 | <view class="zs_goods_wai_san" > | 102 | <view class="zs_goods_wai_san" > |
| 667 | <view class="zs_goods_san"> | 103 | <view class="zs_goods_san"> |
| 668 | <view class='zs_goods_3l'> | 104 | <view class='zs_goods_3l'> |
| 669 | - <view class='zs_top_3l'> | ||
| 670 | - <block> | ||
| 671 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | 105 | + <view class='zs_top_3l rel'> |
| 106 | + <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 672 | binderror="bind_bnerr3"></image> | 107 | binderror="bind_bnerr3"></image> |
| 673 | - </block> | ||
| 674 | - | ||
| 675 | <block wx:if="{{object.goodicon==3}}"> | 108 | <block wx:if="{{object.goodicon==3}}"> |
| 676 | - <image class='zs_t1_3l' wx:if="{{ object.position==1}}" | ||
| 677 | - src='{{object.customicon}}'></image> | ||
| 678 | - <!-- <image class='zs_t1_3l' wx:if="{{object.styleicon==2 && object.position==1}}" | 109 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{ object.position==1}}" |
| 679 | src='{{object.customicon}}'></image> | 110 | src='{{object.customicon}}'></image> |
| 680 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==3 && object.position==1}}" | ||
| 681 | - src='{{object.customicon}}'></image> | ||
| 682 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==4 && object.position==1}}" | ||
| 683 | - src='{{object.customicon}}'></image> --> | ||
| 684 | </block> | 111 | </block> |
| 685 | <block wx:if="{{object.goodicon==1}}"> | 112 | <block wx:if="{{object.goodicon==1}}"> |
| 686 | - <image class='zs_t1_3l' src=''></image> | 113 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> |
| 687 | </block> | 114 | </block> |
| 688 | <block wx:if="{{object.goodicon==2}}"> | 115 | <block wx:if="{{object.goodicon==2}}"> |
| 689 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==1}}" | 116 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" |
| 690 | src='{{imghost}}/miniapp/images/Recommend.png'></image> | 117 | src='{{imghost}}/miniapp/images/Recommend.png'></image> |
| 691 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==2 }}" | 118 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" |
| 692 | src='{{imghost}}/miniapp/images/hot.png'></image> | 119 | src='{{imghost}}/miniapp/images/hot.png'></image> |
| 693 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==3}}" | 120 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" |
| 694 | src='{{imghost}}/miniapp/images/new.png'></image> | 121 | src='{{imghost}}/miniapp/images/new.png'></image> |
| 695 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==4 }}" | 122 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" |
| 696 | src='{{imghost}}/miniapp/images/Promotion.png'></image> | 123 | src='{{imghost}}/miniapp/images/Promotion.png'></image> |
| 697 | </block> | 124 | </block> |
| 698 | </view> | 125 | </view> |
| @@ -712,203 +139,61 @@ | @@ -712,203 +139,61 @@ | ||
| 712 | </navigator> | 139 | </navigator> |
| 713 | </block> | 140 | </block> |
| 714 | </view> | 141 | </view> |
| 715 | -<view class="clear"></view> | 142 | + <view class="clear"></view> |
| 716 | </block> | 143 | </block> |
| 717 | -<!--右上角--> | ||
| 718 | -<block wx:if='{{object.column==3 && object.position==2}}'> | ||
| 719 | -<block wx:for="{{goods_array}}" > | ||
| 720 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 721 | - <view class="zs_goods_wai_san" > | ||
| 722 | - <view class="zs_goods_san"> | ||
| 723 | - <view class='zs_goods_3l'> | ||
| 724 | - <view class='zs_top_3l'> | ||
| 725 | - <!--<image class='zs_t_img_3l'></image>--> | ||
| 726 | - <block> | ||
| 727 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 728 | - binderror="bind_bnerr3"></image> | ||
| 729 | - </block> | ||
| 730 | - | ||
| 731 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 732 | - <image class='zs_t2_3l' wx:if="{{ object.position==2}}" | ||
| 733 | - src='{{object.customicon}}'></image> | ||
| 734 | - <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==2 && object.position==2}}"--> | ||
| 735 | - <!--src='{{object.customicon}}'></image>--> | ||
| 736 | - <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==3 && object.position==2}}"--> | ||
| 737 | - <!--src='{{object.customicon}}'></image>--> | ||
| 738 | - <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==4 && object.position==2}}"--> | ||
| 739 | - <!--src='{{object.customicon}}'></image>--> | ||
| 740 | - </block> | ||
| 741 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 742 | - <image class='zs_t2_3l' src=''></image> | ||
| 743 | - </block> | ||
| 744 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 745 | - <image class='zs_t2_3l' wx:if="{{object.styleicon==1}}" | ||
| 746 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 747 | - <image class='zs_t2_3l' wx:if="{{object.styleicon==2 }}" | ||
| 748 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 749 | - <image class='zs_t2_3l' wx:if="{{object.styleicon==3}}" | ||
| 750 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 751 | - <image class='zs_t2_3l' wx:if="{{object.styleicon==4 }}" | ||
| 752 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 753 | - </block> | ||
| 754 | - </view> | ||
| 755 | - <view class='zs_center_3l'> | ||
| 756 | - | ||
| 757 | - | ||
| 758 | - <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 759 | - <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 760 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 761 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 762 | - </view> | ||
| 763 | - <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 764 | - | ||
| 765 | - <!--<view class='zs_wz3_3l'>美妆价：¥9.00</view>--> | ||
| 766 | - <!--<view class='zs_wz4_3l'>等级价：¥8.00</view>--> | 144 | +<!-- 列表显示 --> |
| 145 | +<view class="zs_goods_xiao_wai" wx:if='{{object.column==4 }}'> | ||
| 146 | + <block wx:for="{{goods_array}}" > | ||
| 147 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 148 | + <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 149 | + <view class='zs_top_x'> | ||
| 150 | + <!--<image class='zs_t_img_x'></image>--> | ||
| 151 | + <block> | ||
| 152 | + <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 153 | + binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 154 | + </block> | ||
| 767 | 155 | ||
| 768 | - </view> | 156 | + <block wx:if="{{object.goodicon==3}}"> |
| 157 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==2}}" | ||
| 158 | + src='{{object.customicon}}'></image> | ||
| 159 | + </block> | ||
| 160 | + <block wx:if="{{object.goodicon==1}}"> | ||
| 161 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 162 | + </block> | ||
| 163 | + <block wx:if="{{object.goodicon==2}}"> | ||
| 164 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" | ||
| 165 | + src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 166 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" | ||
| 167 | + src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 168 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" | ||
| 169 | + src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 170 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" | ||
| 171 | + src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 172 | + </block> | ||
| 769 | </view> | 173 | </view> |
| 770 | - </view> | ||
| 771 | - </view> | ||
| 772 | - </navigator> | ||
| 773 | -</block> | ||
| 774 | -<view class="clear"></view> | ||
| 775 | -</block> | ||
| 776 | -<!--右下角--> | ||
| 777 | - | ||
| 778 | -<block wx:if='{{object.column==3 && object.position==4}}'> | ||
| 779 | -<block wx:for="{{goods_array}}" > | ||
| 780 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 781 | - <view class="zs_goods_wai_san" > | ||
| 782 | - <view class="zs_goods_san"> | ||
| 783 | - <view class='zs_goods_3l'> | ||
| 784 | - <view class='zs_top_3l'> | ||
| 785 | - | ||
| 786 | - <block> | ||
| 787 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 788 | - binderror="bind_bnerr3"></image> | ||
| 789 | - </block> | ||
| 790 | - | ||
| 791 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 792 | - <image class='zs_t3_3l' wx:if="{{ object.position==4}}" | ||
| 793 | - src='{{object.customicon}}'></image> | ||
| 794 | - <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==2 && object.position==3}}"--> | ||
| 795 | - <!--src='{{object.customicon}}'></image>--> | ||
| 796 | - <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==3 && object.position==3}}"--> | ||
| 797 | - <!--src='{{object.customicon}}'></image>--> | ||
| 798 | - <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==4 && object.position==3}}"--> | ||
| 799 | - <!--src='{{object.customicon}}'></image>--> | ||
| 800 | - </block> | ||
| 801 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 802 | - <image class='zs_t3_3l' src=''></image> | ||
| 803 | - </block> | ||
| 804 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 805 | - <image class='zs_t3_3l' wx:if="{{object.styleicon==1}}" | ||
| 806 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 807 | - <image class='zs_t3_3l' wx:if="{{object.styleicon==2 }}" | ||
| 808 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 809 | - <image class='zs_t3_3l' wx:if="{{object.styleicon==3}}" | ||
| 810 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 811 | - <image class='zs_t3_3l' wx:if="{{object.styleicon==4 }}" | ||
| 812 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 813 | - </block> | ||
| 814 | - </view> | ||
| 815 | - <view class='zs_center_3l'> | ||
| 816 | 174 | ||
| 817 | - | ||
| 818 | - <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 819 | - <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 820 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 821 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 822 | - </view> | ||
| 823 | - <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 824 | - <!--<view class='zs_wz3_3l'>美妆价：¥9.00</view>--> | ||
| 825 | - <!--<view class='zs_wz4_3l'>等级价：¥8.00</view>--> | 175 | + <view class='zs_center_x'> |
| 176 | + <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 177 | + <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 178 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 179 | + <view class='del'>￥{{item.market_price}}</view> | ||
| 826 | </view> | 180 | </view> |
| 181 | + <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 827 | </view> | 182 | </view> |
| 828 | - </view> | ||
| 829 | 183 | ||
| 830 | - </view> | ||
| 831 | - </navigator> | ||
| 832 | -</block> | ||
| 833 | - | ||
| 834 | - | ||
| 835 | -<view class="clear"></view> | ||
| 836 | -</block> | ||
| 837 | -<!-- ----左下角---- --> | ||
| 838 | -<block wx:if='{{object.column==3 && object.position==3}}'> | ||
| 839 | -<block wx:for="{{goods_array}}" > | ||
| 840 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 841 | - <view class="zs_goods_wai_san" > | ||
| 842 | - <view class="zs_goods_san"> | ||
| 843 | - <view class='zs_goods_3l'> | ||
| 844 | - | ||
| 845 | - <view class='zs_top_3l'> | ||
| 846 | - | ||
| 847 | - <block> | ||
| 848 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 849 | - binderror="bind_bnerr3"></image> | ||
| 850 | - </block> | ||
| 851 | - | ||
| 852 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 853 | - <image class='zs_t4_3l' wx:if="{{object.position==3}}" | ||
| 854 | - src='{{object.customicon}}'></image> | ||
| 855 | - <!--<image class='zs_t4_3l' wx:if="{{ object.position==4}}"--> | ||
| 856 | - <!--src='{{object.customicon}}'></image>--> | ||
| 857 | - <!--<image class='zs_t4_3l' wx:if="{{object.position==4}}"--> | ||
| 858 | - <!--src='{{object.customicon}}'></image>--> | ||
| 859 | - <!--<image class='zs_t4_3l' wx:if="{{ object.position==4}}"--> | ||
| 860 | - <!--src='{{object.customicon}}'></image>--> | ||
| 861 | - </block> | ||
| 862 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 863 | - <image class='zs_t4_3l' src=''></image> | ||
| 864 | - </block> | ||
| 865 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 866 | - <image class='zs_t4_3l' wx:if="{{object.styleicon==1}}" | ||
| 867 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 868 | - <image class='zs_t4_3l' wx:if="{{object.styleicon==2 }}" | ||
| 869 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 870 | - <image class='zs_t4_3l' wx:if="{{object.styleicon==3}}" | ||
| 871 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 872 | - <image class='zs_t4_3l' wx:if="{{object.styleicon==4 }}" | ||
| 873 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 874 | - </block> | ||
| 875 | - </view> | ||
| 876 | - | ||
| 877 | - <view class='zs_center_3l'> | ||
| 878 | - | ||
| 879 | - <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 880 | - <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 881 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 882 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 883 | - </view> | ||
| 884 | - <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 885 | - | ||
| 886 | - | ||
| 887 | - </view> | ||
| 888 | - | ||
| 889 | - | ||
| 890 | - </view> | ||
| 891 | </view> | 184 | </view> |
| 185 | + </navigator> | ||
| 186 | + </block> | ||
| 187 | + <view class="clear"></view> | ||
| 188 | +</view> | ||
| 892 | 189 | ||
| 893 | - </view> | ||
| 894 | - </navigator> | ||
| 895 | -</block> | ||
| 896 | -<view class="clear"></view> | ||
| 897 | -</block> | ||
| 898 | - | ||
| 899 | - | ||
| 900 | -<block wx:if="{{object.classstyle=='1' }}"> | ||
| 901 | -<view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> | 190 | +<block wx:if="{{object.classstyle=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> |
| 902 | <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> | 191 | <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> |
| 903 | {{loadText}} | 192 | {{loadText}} |
| 904 | </button> | 193 | </button> |
| 905 | -</view> | ||
| 906 | -</block> | ||
| 907 | - | 194 | +</view></block> |
| 908 | <block wx:if="{{object.classstyle!='1' }}"> | 195 | <block wx:if="{{object.classstyle!='1' }}"> |
| 909 | <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> | 196 | <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> |
| 910 | - <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> | ||
| 911 | - {{loadText}} | ||
| 912 | - </button> | ||
| 913 | - </view> | 197 | + <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button> |
| 198 | + </view> | ||
| 914 | </block> | 199 | </block> |
| 915 | \ No newline at end of file | 200 | \ No newline at end of file |
components/diy_goodsGroup/diy_goodsGroup.wxss
| 1 | /* pages/diy_zs/diy_zs.wxss */ | 1 | /* pages/diy_zs/diy_zs.wxss */ |
| 2 | - | 2 | +.zwp_3{ margin-top: 10rpx} |
| 3 | .zs_goods{ | 3 | .zs_goods{ |
| 4 | - width: 100%; | ||
| 5 | - min-height: 500rpx; | ||
| 6 | -border: 2rpx #ddd solid; | ||
| 7 | -margin: 0 auto; | ||
| 8 | -} | ||
| 9 | - | ||
| 10 | -.zwp_3{ | ||
| 11 | - /* width: 30%; */ | 4 | + width: 700rpx; |
| 5 | + border: 1rpx #ddd solid; | ||
| 6 | + margin-bottom: 10rpx; | ||
| 7 | + margin: 0 auto; | ||
| 8 | + | ||
| 12 | } | 9 | } |
| 13 | - | ||
| 14 | .s1_gk_a1{ | 10 | .s1_gk_a1{ |
| 15 | display: inline; | 11 | display: inline; |
| 16 | width: auto; | 12 | width: auto; |
| 17 | height: auto; | 13 | height: auto; |
| 18 | } | 14 | } |
| 19 | -.clear{ | ||
| 20 | - clear: both; | ||
| 21 | -} | 15 | +.clear{ clear: both;} |
| 22 | .zs_top{ | 16 | .zs_top{ |
| 23 | width: 100%; | 17 | width: 100%; |
| 24 | min-height: 700rpx; | 18 | min-height: 700rpx; |
| 25 | margin: 0 auto; | 19 | margin: 0 auto; |
| 26 | - padding-left:22rpx; | ||
| 27 | -padding-bottom:30rpx; | ||
| 28 | - | ||
| 29 | -display: flex; | ||
| 30 | -/* padding-left: 6rpx; */ | ||
| 31 | -/* padding-right: 30rpx; */ | 20 | + margin-bottom:30rpx; |
| 21 | + display: flex; | ||
| 32 | } | 22 | } |
| 33 | 23 | ||
| 34 | .zs_t_img { | 24 | .zs_t_img { |
| 35 | - width: 700rpx; | ||
| 36 | - height: 700rpx; | ||
| 37 | - /* margin: 0 auto; */ | ||
| 38 | - /* background-color: bisque; */ | ||
| 39 | - | 25 | + width: 698rpx; |
| 26 | + height: 698rpx; | ||
| 27 | + margin: 1rpx auto; | ||
| 40 | } | 28 | } |
| 41 | 29 | ||
| 42 | .zs_center{ | 30 | .zs_center{ |
| @@ -53,8 +41,9 @@ display: flex; | @@ -53,8 +41,9 @@ display: flex; | ||
| 53 | overflow: hidden; | 41 | overflow: hidden; |
| 54 | text-overflow: ellipsis; | 42 | text-overflow: ellipsis; |
| 55 | margin-bottom:10rpx; | 43 | margin-bottom:10rpx; |
| 56 | -font-size:28rpx; | 44 | + font-size:28rpx; |
| 57 | white-space: nowrap; | 45 | white-space: nowrap; |
| 46 | + width: 640rpx | ||
| 58 | } | 47 | } |
| 59 | 48 | ||
| 60 | 49 | ||
| @@ -104,43 +93,39 @@ font-size:28rpx; | @@ -104,43 +93,39 @@ font-size:28rpx; | ||
| 104 | .zs_t1{ | 93 | .zs_t1{ |
| 105 | width: 56rpx; | 94 | width: 56rpx; |
| 106 | height: 56rpx; | 95 | height: 56rpx; |
| 107 | - position: relative; | ||
| 108 | - right: 58rpx; | ||
| 109 | - bottom: -640rpx; | 96 | + position: absolute; |
| 97 | + left: 0rpx; | ||
| 98 | + top: 10rpx; | ||
| 110 | } | 99 | } |
| 111 | 100 | ||
| 112 | 101 | ||
| 113 | .zs_t2{ | 102 | .zs_t2{ |
| 114 | width: 56rpx; | 103 | width: 56rpx; |
| 115 | height: 56rpx; | 104 | height: 56rpx; |
| 116 | - position: relative; | ||
| 117 | - right: 58rpx; | ||
| 118 | - bottom: -2rpx; | 105 | + position: absolute; |
| 106 | + right: 0rpx; | ||
| 107 | + top: 10rpx; | ||
| 119 | } | 108 | } |
| 120 | 109 | ||
| 121 | .zs_t3{ | 110 | .zs_t3{ |
| 122 | width: 56rpx; | 111 | width: 56rpx; |
| 123 | height: 56rpx; | 112 | height: 56rpx; |
| 124 | - position: relative; | ||
| 125 | - right: 692rpx; | ||
| 126 | - bottom: -4rpx; | 113 | + position: absolute; |
| 114 | + left: 0rpx; | ||
| 115 | + bottom: 10rpx; | ||
| 127 | } | 116 | } |
| 128 | 117 | ||
| 129 | 118 | ||
| 130 | .zs_t4{ | 119 | .zs_t4{ |
| 131 | width: 56rpx; | 120 | width: 56rpx; |
| 132 | height: 56rpx; | 121 | height: 56rpx; |
| 133 | - position: relative; | ||
| 134 | - right: 692rpx; | ||
| 135 | - bottom: -642rpx; | 122 | + position: absolute; |
| 123 | + right: 20rpx; | ||
| 124 | + bottom: 10rpx; | ||
| 136 | } | 125 | } |
| 137 | 126 | ||
| 138 | 127 | ||
| 139 | 128 | ||
| 140 | - | ||
| 141 | -/* xiao */ | ||
| 142 | - | ||
| 143 | - | ||
| 144 | .zs_goods_xiao_bottom{ | 129 | .zs_goods_xiao_bottom{ |
| 145 | width: 100%; | 130 | width: 100%; |
| 146 | min-height: 300rpx; | 131 | min-height: 300rpx; |
| @@ -165,24 +150,15 @@ font-size:28rpx; | @@ -165,24 +150,15 @@ font-size:28rpx; | ||
| 165 | .zs_top_x{ | 150 | .zs_top_x{ |
| 166 | width: 400rpx; | 151 | width: 400rpx; |
| 167 | height: 318rpx; | 152 | height: 318rpx; |
| 168 | - margin-top: 20rpx; | ||
| 169 | - /* /* padding-top:30rpx; | ||
| 170 | -padding-bottom:30rpx; */ | ||
| 171 | - | ||
| 172 | -display: flex; | ||
| 173 | - | 153 | + margin-top: 20rpx; |
| 154 | + display: flex; | ||
| 174 | } | 155 | } |
| 175 | 156 | ||
| 176 | -/* .zs_goods_xiao{ | ||
| 177 | - background-color: white; | ||
| 178 | -} */ | ||
| 179 | - | ||
| 180 | .zs_t_img_x { | 157 | .zs_t_img_x { |
| 181 | width: 290rpx; | 158 | width: 290rpx; |
| 182 | height: 290rpx; | 159 | height: 290rpx; |
| 183 | margin-left: 20rpx; | 160 | margin-left: 20rpx; |
| 184 | - /* background-color: bisque; */ | ||
| 185 | - | 161 | + |
| 186 | } | 162 | } |
| 187 | 163 | ||
| 188 | .zs_center_x{ | 164 | .zs_center_x{ |
| @@ -381,61 +357,57 @@ top: 234rpx; | @@ -381,61 +357,57 @@ top: 234rpx; | ||
| 381 | } | 357 | } |
| 382 | 358 | ||
| 383 | 359 | ||
| 360 | + | ||
| 361 | +/*---俩列图片位置---*/ | ||
| 384 | .zs_t1_2l{ | 362 | .zs_t1_2l{ |
| 385 | width: 56rpx; | 363 | width: 56rpx; |
| 386 | height: 56rpx; | 364 | height: 56rpx; |
| 387 | - position: relative; | ||
| 388 | - right: -2rpx; | ||
| 389 | - top: -310rpx; | 365 | + position: absolute; |
| 366 | + left: 0rpx; | ||
| 367 | + top: 10rpx; | ||
| 390 | } | 368 | } |
| 391 | 369 | ||
| 392 | - | ||
| 393 | .zs_t2_2l{ | 370 | .zs_t2_2l{ |
| 394 | width: 56rpx; | 371 | width: 56rpx; |
| 395 | height: 56rpx; | 372 | height: 56rpx; |
| 396 | - position: relative; | ||
| 397 | - right: -294rpx; | ||
| 398 | - bottom: 310rpx; | 373 | + position: absolute; |
| 374 | + right: 0rpx; | ||
| 375 | + top: 10rpx; | ||
| 399 | } | 376 | } |
| 400 | 377 | ||
| 401 | .zs_t3_2l{ | 378 | .zs_t3_2l{ |
| 402 | width: 56rpx; | 379 | width: 56rpx; |
| 403 | height: 56rpx; | 380 | height: 56rpx; |
| 404 | - position: relative; | ||
| 405 | - right: -294rpx; | ||
| 406 | - bottom: 68rpx; | 381 | + position: absolute; |
| 382 | + left: 0rpx; | ||
| 383 | + bottom: 10rpx; | ||
| 407 | } | 384 | } |
| 408 | 385 | ||
| 409 | 386 | ||
| 410 | .zs_t4_2l{ | 387 | .zs_t4_2l{ |
| 411 | width: 56rpx; | 388 | width: 56rpx; |
| 412 | height: 56rpx; | 389 | height: 56rpx; |
| 413 | - position: relative; | ||
| 414 | - right: -2rpx; | ||
| 415 | - bottom: 68rpx; | 390 | + position: absolute; |
| 391 | + right: 0rpx; | ||
| 392 | + bottom: 10rpx; | ||
| 416 | } | 393 | } |
| 417 | 394 | ||
| 395 | + | ||
| 396 | + | ||
| 418 | /*一个3列*/ | 397 | /*一个3列*/ |
| 419 | .zs_goods_wai_san{ | 398 | .zs_goods_wai_san{ |
| 420 | - width: 240rpx; | 399 | + width: 230rpx; |
| 421 | display: flex; | 400 | display: flex; |
| 422 | - margin-left: 8rpx; | 401 | + margin-left: 10rpx; |
| 423 | float: left; | 402 | float: left; |
| 424 | margin-bottom: 8rpx; | 403 | margin-bottom: 8rpx; |
| 425 | - background-color:white; | ||
| 426 | - | 404 | + background-color:white; |
| 427 | } | 405 | } |
| 428 | 406 | ||
| 429 | .zs_goods_san{ | 407 | .zs_goods_san{ |
| 430 | width: 240rpx; | 408 | width: 240rpx; |
| 431 | 409 | ||
| 432 | } | 410 | } |
| 433 | - | ||
| 434 | - | ||
| 435 | - | ||
| 436 | - | ||
| 437 | - | ||
| 438 | - | ||
| 439 | .zs_goods_3l{ | 411 | .zs_goods_3l{ |
| 440 | width: 240rpx; | 412 | width: 240rpx; |
| 441 | min-height: 300rpx; | 413 | min-height: 300rpx; |
| @@ -445,22 +417,15 @@ top: 234rpx; | @@ -445,22 +417,15 @@ top: 234rpx; | ||
| 445 | } | 417 | } |
| 446 | 418 | ||
| 447 | .zs_top_3l{ | 419 | .zs_top_3l{ |
| 448 | - width: 240rpx; | ||
| 449 | - height: 240rpx; | ||
| 450 | - | ||
| 451 | - | ||
| 452 | - | ||
| 453 | - | ||
| 454 | - | ||
| 455 | - | 420 | + width: 232rpx; |
| 421 | + height: 232rpx; | ||
| 456 | } | 422 | } |
| 457 | 423 | ||
| 458 | .zs_t_img_3l { | 424 | .zs_t_img_3l { |
| 459 | - width:237rpx; | ||
| 460 | - height: 240rpx; | 425 | + width:232rpx; |
| 426 | + height: 232rpx; | ||
| 461 | margin: 0 auto; | 427 | margin: 0 auto; |
| 462 | background-color: bisque; | 428 | background-color: bisque; |
| 463 | - | ||
| 464 | } | 429 | } |
| 465 | 430 | ||
| 466 | .zs_center_3l{ | 431 | .zs_center_3l{ |
| @@ -469,27 +434,28 @@ top: 234rpx; | @@ -469,27 +434,28 @@ top: 234rpx; | ||
| 469 | font-size: 28rpx; | 434 | font-size: 28rpx; |
| 470 | color: #333; | 435 | color: #333; |
| 471 | text-align: left; | 436 | text-align: left; |
| 472 | - padding: 0 10rpx; | 437 | + padding: 0 10rpx; |
| 473 | } | 438 | } |
| 474 | 439 | ||
| 475 | .zs_wz1_3l{ | 440 | .zs_wz1_3l{ |
| 476 | - overflow: hidden; | ||
| 477 | - text-overflow: ellipsis; | 441 | + |
| 478 | margin-bottom:10rpx; | 442 | margin-bottom:10rpx; |
| 479 | font-size:30rpx; | 443 | font-size:30rpx; |
| 480 | height: 80rpx; | 444 | height: 80rpx; |
| 481 | - width: 227rpx; | ||
| 482 | - /* white-space: nowrap; */ | 445 | + width: 220rpx; |
| 446 | + | ||
| 447 | + overflow: hidden; | ||
| 448 | + text-overflow: ellipsis; | ||
| 449 | + display: -webkit-box; | ||
| 450 | + -webkit-box-orient: vertical; | ||
| 451 | + -webkit-line-clamp: 2; | ||
| 483 | } | 452 | } |
| 484 | 453 | ||
| 485 | 454 | ||
| 486 | .zs_wz2_3l{ | 455 | .zs_wz2_3l{ |
| 487 | - /* overflow: hidden; | ||
| 488 | - text-overflow: ellipsis; */ | ||
| 489 | margin-bottom:10rpx; | 456 | margin-bottom:10rpx; |
| 490 | font-size:30rpx; | 457 | font-size:30rpx; |
| 491 | - /* white-space: nowrap; */ | ||
| 492 | - display: flex; | 458 | + display: flex; |
| 493 | } | 459 | } |
| 494 | 460 | ||
| 495 | .zs_wz3_3l{ | 461 | .zs_wz3_3l{ |
| @@ -497,7 +463,7 @@ top: 234rpx; | @@ -497,7 +463,7 @@ top: 234rpx; | ||
| 497 | text-overflow: ellipsis; | 463 | text-overflow: ellipsis; |
| 498 | margin-bottom:10rpx; | 464 | margin-bottom:10rpx; |
| 499 | font-size:30rpx; | 465 | font-size:30rpx; |
| 500 | - white-space: nowrap; | 466 | + white-space: nowrap; |
| 501 | } | 467 | } |
| 502 | 468 | ||
| 503 | .zs_wz4_3l{ | 469 | .zs_wz4_3l{ |
| @@ -505,7 +471,7 @@ top: 234rpx; | @@ -505,7 +471,7 @@ top: 234rpx; | ||
| 505 | text-overflow: ellipsis; | 471 | text-overflow: ellipsis; |
| 506 | margin-bottom:10rpx; | 472 | margin-bottom:10rpx; |
| 507 | font-size:30rpx; | 473 | font-size:30rpx; |
| 508 | - white-space: nowrap; | 474 | + white-space: nowrap; |
| 509 | } | 475 | } |
| 510 | 476 | ||
| 511 | .zs_wz5_3l{ | 477 | .zs_wz5_3l{ |
| @@ -519,38 +485,40 @@ top: 234rpx; | @@ -519,38 +485,40 @@ top: 234rpx; | ||
| 519 | .zs_t1_3l{ | 485 | .zs_t1_3l{ |
| 520 | width: 56rpx; | 486 | width: 56rpx; |
| 521 | height: 56rpx; | 487 | height: 56rpx; |
| 522 | - position: relative; | ||
| 523 | - right: 0rpx; | ||
| 524 | - top: -250rpx; | 488 | + position: absolute; |
| 489 | + left: 0rpx; | ||
| 490 | + top: 10rpx; | ||
| 525 | } | 491 | } |
| 526 | 492 | ||
| 527 | 493 | ||
| 528 | .zs_t2_3l{ | 494 | .zs_t2_3l{ |
| 529 | width: 56rpx; | 495 | width: 56rpx; |
| 530 | height: 56rpx; | 496 | height: 56rpx; |
| 531 | - position: relative; | ||
| 532 | - right: -177rpx; | ||
| 533 | - bottom: 250rpx; | 497 | + position: absolute; |
| 498 | + right: 0rpx; | ||
| 499 | + top: 10rpx; | ||
| 534 | } | 500 | } |
| 535 | 501 | ||
| 536 | .zs_t3_3l{ | 502 | .zs_t3_3l{ |
| 537 | width: 56rpx; | 503 | width: 56rpx; |
| 538 | height: 56rpx; | 504 | height: 56rpx; |
| 539 | - position: relative; | ||
| 540 | - right: -177rpx; | ||
| 541 | - bottom: 67rpx; | 505 | + position: absolute; |
| 506 | + left: 0rpx; | ||
| 507 | + bottom: 10rpx; | ||
| 542 | } | 508 | } |
| 543 | 509 | ||
| 544 | 510 | ||
| 545 | .zs_t4_3l{ | 511 | .zs_t4_3l{ |
| 546 | width: 56rpx; | 512 | width: 56rpx; |
| 547 | height: 56rpx; | 513 | height: 56rpx; |
| 548 | - position: relative; | 514 | + position: absolute; |
| 549 | right: 0rpx; | 515 | right: 0rpx; |
| 550 | - bottom: 67rpx; | 516 | + bottom: 10rpx; |
| 551 | } | 517 | } |
| 552 | 518 | ||
| 553 | .zs_goods_wai{ | 519 | .zs_goods_wai{ |
| 554 | background-color: white; | 520 | background-color: white; |
| 555 | margin-top: 10rpx; | 521 | margin-top: 10rpx; |
| 556 | -} | ||
| 557 | \ No newline at end of file | 522 | \ No newline at end of file |
| 523 | +} | ||
| 524 | + | ||
| 525 | +.rel{position: relative} | ||
| 558 | \ No newline at end of file | 526 | \ No newline at end of file |
components/diy_goodsGroup/g_filter.wxs
0 → 100644
| 1 | +//获取样式 | ||
| 2 | +var get_class = function(column,position) { | ||
| 3 | + //--列的情况 | ||
| 4 | + if(column==1){ return "zs_t"+position; } | ||
| 5 | + //--俩列的情况 | ||
| 6 | + if(column==2){ return "zs_t"+position+"_2l"; } | ||
| 7 | + //--三列的情况 | ||
| 8 | + if(column==3){ return "zs_t"+position+"_3l"; } | ||
| 9 | + //----列表的情况----- | ||
| 10 | + if(column==4 ){ return "zs_t1_x"+position; } | ||
| 11 | + | ||
| 12 | +} | ||
| 13 | + | ||
| 14 | + | ||
| 15 | +var g_filters = { | ||
| 16 | + //-- 判断是不是有等级价 -- | ||
| 17 | + is_has_rank:function(rank_switch,item){ | ||
| 18 | + if(!rank_switch) return false; | ||
| 19 | + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true} | ||
| 20 | + return false; | ||
| 21 | + }, | ||
| 22 | + | ||
| 23 | + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- | ||
| 24 | + get_card_price:function(goods,all_card,type){ | ||
| 25 | + var price1=parseFloat(goods['cardprice1']); | ||
| 26 | + var price2 = parseFloat(goods['cardprice2']); | ||
| 27 | + var price3 = parseFloat(goods['cardprice3']); | ||
| 28 | + if(!all_card){ | ||
| 29 | + if(type==0) return 0; | ||
| 30 | + return ""; | ||
| 31 | + } | ||
| 32 | + | ||
| 33 | + var min_price=null; | ||
| 34 | + var min_name=null; | ||
| 35 | + //---设置对应的价格名字---- | ||
| 36 | + for(var i=0;i<3;i++) { | ||
| 37 | + var vl=all_card[i]; | ||
| 38 | + if(vl['CorrPrice']=="Price1" && price1>0) | ||
| 39 | + { | ||
| 40 | + if(min_price==null) { | ||
| 41 | + min_price=price1;min_name=vl['CardName']; | ||
| 42 | + } | ||
| 43 | + else if(price1<min_price) { | ||
| 44 | + min_price=price1;min_name=vl['CardName']; | ||
| 45 | + } | ||
| 46 | + } | ||
| 47 | + if(vl['CorrPrice']=="Price2" && price2>0) | ||
| 48 | + { | ||
| 49 | + if(min_price==null) { | ||
| 50 | + min_price=price2;min_name=vl['CardName']; | ||
| 51 | + } | ||
| 52 | + else if(price2<min_price) { | ||
| 53 | + min_price=price2;min_name=vl['CardName']; | ||
| 54 | + } | ||
| 55 | + } | ||
| 56 | + | ||
| 57 | + if(vl['CorrPrice']=="Price3" && price3>0) | ||
| 58 | + { | ||
| 59 | + if(min_price==null) { | ||
| 60 | + min_price=price3;min_name=vl['CardName']; | ||
| 61 | + } | ||
| 62 | + else if(price3<min_price) { | ||
| 63 | + min_price=price3;min_name=vl['CardName']; | ||
| 64 | + } | ||
| 65 | + } | ||
| 66 | + | ||
| 67 | + } | ||
| 68 | + if(min_price==null){ | ||
| 69 | + if(type==0) return 0; | ||
| 70 | + return ""; | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | + if(type==0) return min_price; | ||
| 74 | + if(min_name.length>4 ) min_name=min_name.substring(0, 4); | ||
| 75 | + return min_name; | ||
| 76 | + }, | ||
| 77 | +} | ||
| 78 | + | ||
| 79 | + | ||
| 80 | +module.exports = { | ||
| 81 | + get_class: get_class, | ||
| 82 | + is_has_rank:g_filters.is_has_rank, | ||
| 83 | + get_card_price:g_filters.get_card_price, | ||
| 84 | +} |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -262,7 +262,7 @@ | @@ -262,7 +262,7 @@ | ||
| 262 | 262 | ||
| 263 | <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 --> | 263 | <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 --> |
| 264 | 264 | ||
| 265 | - <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}"> | 265 | + <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && !prom_type}}"> |
| 266 | 266 | ||
| 267 | <view class="flex ai-center grade-card-frame card-frame" > | 267 | <view class="flex ai-center grade-card-frame card-frame" > |
| 268 | <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | 268 | <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> |
| @@ -278,7 +278,7 @@ | @@ -278,7 +278,7 @@ | ||
| 278 | 278 | ||
| 279 | <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}"> | 279 | <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}"> |
| 280 | 280 | ||
| 281 | - <view wx:if="{{!card_field }}"> | 281 | + <view wx:if="{{!card_field && !prom_type }}"> |
| 282 | <view class="beauty-makeup-frame flex ai-center"> | 282 | <view class="beauty-makeup-frame flex ai-center"> |
| 283 | <view class="left flex ai-center"> | 283 | <view class="left flex ai-center"> |
| 284 | <view class="flex ai-center grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" > | 284 | <view class="flex ai-center grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" > |