1 participants
-
mentioned in commit 67d5963189c18312963847956c4c66acecbe647f
-
Status changed to merged
-
mentioned in commit e9d8ab2a96e4a2b4a5fea81b111d9e074d3cb38a
started a discussion on commit
0ce9c52a
Showing
14 changed files
components/diy_advertising/diy_advertising.wxss
components/diy_goodsGroup/diy_goodsGroup.js
| @@ -25,6 +25,7 @@ Component({ | @@ -25,6 +25,7 @@ Component({ | ||
| 25 | is_new: 0, | 25 | is_new: 0, |
| 26 | baseUrl: "/api/weshop/goods/page", | 26 | baseUrl: "/api/weshop/goods/page", |
| 27 | resourceUrl: t.globalData.setting.resourceUrl, | 27 | resourceUrl: t.globalData.setting.resourceUrl, |
| 28 | + url: t.globalData.setting.imghost, | ||
| 28 | currentPage: 1, | 29 | currentPage: 1, |
| 29 | requestData: null, | 30 | requestData: null, |
| 30 | requestUrl: "", | 31 | requestUrl: "", |
| @@ -43,37 +44,80 @@ Component({ | @@ -43,37 +44,80 @@ Component({ | ||
| 43 | }, | 44 | }, |
| 44 | 45 | ||
| 45 | ready: function () { | 46 | ready: function () { |
| 46 | - console.log("ready"); | ||
| 47 | - this.data.classstyle_id = this.data.object.classstyle; | ||
| 48 | - this.data.goodscount = this.data.object.goodscount; | ||
| 49 | - console.log(this.data.classstyle_id); | ||
| 50 | - this.data.wgroup = this.data.object.wgroup; | ||
| 51 | - console.log(this.data.wgroup); | ||
| 52 | - this.setData({ | ||
| 53 | - classstyle_id: this.data.object.classstyle | ||
| 54 | - }) | ||
| 55 | - if (this.data.object.goodsclass == 1) { | ||
| 56 | - this.data.is_recommend = 1 | ||
| 57 | - } | ||
| 58 | - if (this.data.object.goodsclass == 2) { | ||
| 59 | - this.data.is_hot = 1 | ||
| 60 | - } | ||
| 61 | - if (this.data.object.goodsclass == 3) { | ||
| 62 | - this.data.is_new = 1 | ||
| 63 | - } | ||
| 64 | - this.data.requestData = new Array(); | ||
| 65 | - this.data.g_id = this.data.object.data; | ||
| 66 | - var arr = []; | ||
| 67 | - | ||
| 68 | - for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) { | ||
| 69 | - arr.push(this.data.g_id.slice(i, i + this.data.goodscount)); | ||
| 70 | - } | ||
| 71 | - this.data.firist_type_data = arr; | ||
| 72 | - console.log("firist_type_data"); | ||
| 73 | - console.log(this.data.firist_type_data); | ||
| 74 | - this.init(this.data.classstyle_id, this.data.wgroup); | ||
| 75 | 47 | ||
| 76 | }, | 48 | }, |
| 49 | + | ||
| 50 | + | ||
| 51 | + lifetimes: { | ||
| 52 | + attached: function() { | ||
| 53 | + // 在组件实例进入页面节点树时执行 | ||
| 54 | + this.data.classstyle_id = this.data.object.classstyle; | ||
| 55 | + this.data.goodscount = this.data.object.goodscount; | ||
| 56 | + this.data.wgroup = this.data.object.wgroup; | ||
| 57 | + | ||
| 58 | + this.setData({ | ||
| 59 | + classstyle_id: this.data.object.classstyle | ||
| 60 | + }) | ||
| 61 | + if (this.data.object.goodsclass == 1) { | ||
| 62 | + this.data.is_recommend = 1 | ||
| 63 | + } | ||
| 64 | + if (this.data.object.goodsclass == 2) { | ||
| 65 | + this.data.is_hot = 1 | ||
| 66 | + } | ||
| 67 | + if (this.data.object.goodsclass == 3) { | ||
| 68 | + this.data.is_new = 1 | ||
| 69 | + } | ||
| 70 | + this.data.requestData = new Array(); | ||
| 71 | + this.data.g_id = this.data.object.data; | ||
| 72 | + var arr = []; | ||
| 73 | + | ||
| 74 | + for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) { | ||
| 75 | + arr.push(this.data.g_id.slice(i, i + this.data.goodscount)); | ||
| 76 | + } | ||
| 77 | + this.data.firist_type_data = arr; | ||
| 78 | + this.init(this.data.classstyle_id, this.data.wgroup); | ||
| 79 | + }, | ||
| 80 | + detached: function() { | ||
| 81 | + // 在组件实例被从页面节点树移除时执行 | ||
| 82 | + }, | ||
| 83 | + }, | ||
| 84 | + | ||
| 85 | + pageLifetimes: { | ||
| 86 | + show: function () { | ||
| 87 | + this.data.firist_type_curr=0, | ||
| 88 | + this.data.currentPage=1, | ||
| 89 | + this.setData({ goods_array: null}) | ||
| 90 | + | ||
| 91 | + // 页面被展示 | ||
| 92 | + // 在组件实例进入页面节点树时执行 | ||
| 93 | + this.data.classstyle_id = this.data.object.classstyle; | ||
| 94 | + this.data.goodscount = this.data.object.goodscount; | ||
| 95 | + this.data.wgroup = this.data.object.wgroup; | ||
| 96 | + | ||
| 97 | + this.setData({ | ||
| 98 | + classstyle_id: this.data.object.classstyle | ||
| 99 | + }) | ||
| 100 | + if (this.data.object.goodsclass == 1) { | ||
| 101 | + this.data.is_recommend = 1 | ||
| 102 | + } | ||
| 103 | + if (this.data.object.goodsclass == 2) { | ||
| 104 | + this.data.is_hot = 1 | ||
| 105 | + } | ||
| 106 | + if (this.data.object.goodsclass == 3) { | ||
| 107 | + this.data.is_new = 1 | ||
| 108 | + } | ||
| 109 | + this.data.requestData = new Array(); | ||
| 110 | + this.data.g_id = this.data.object.data; | ||
| 111 | + var arr = []; | ||
| 112 | + | ||
| 113 | + for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) { | ||
| 114 | + arr.push(this.data.g_id.slice(i, i + this.data.goodscount)); | ||
| 115 | + } | ||
| 116 | + this.data.firist_type_data = arr; | ||
| 117 | + this.init(this.data.classstyle_id, this.data.wgroup); | ||
| 118 | + }, | ||
| 119 | + }, | ||
| 120 | + | ||
| 77 | methods: { | 121 | methods: { |
| 78 | // 这里是一个自定义方法 | 122 | // 这里是一个自定义方法 |
| 79 | init: function (classstyle_id, wgroup) { | 123 | init: function (classstyle_id, wgroup) { |
| @@ -90,6 +134,11 @@ Component({ | @@ -90,6 +134,11 @@ Component({ | ||
| 90 | index = 0, | 134 | index = 0, |
| 91 | gdata = []; | 135 | gdata = []; |
| 92 | 136 | ||
| 137 | + //--初始化卡类-- | ||
| 138 | + th.card_init(); | ||
| 139 | + | ||
| 140 | + var os=getApp().globalData.setting; | ||
| 141 | + | ||
| 93 | classstyle_id = classstyle_id + ""; | 142 | classstyle_id = classstyle_id + ""; |
| 94 | switch (classstyle_id) { | 143 | switch (classstyle_id) { |
| 95 | case "1": | 144 | case "1": |
| @@ -110,14 +159,18 @@ Component({ | @@ -110,14 +159,18 @@ Component({ | ||
| 110 | item.shop_price = goods.shop_price; | 159 | item.shop_price = goods.shop_price; |
| 111 | item.sales_sum = goods.sales_sum; | 160 | item.sales_sum = goods.sales_sum; |
| 112 | item.goods_id = goods.goods_id; | 161 | item.goods_id = goods.goods_id; |
| 162 | + item.cardprice1 = val.cardprice1; | ||
| 163 | + item.cardprice2 = val.cardprice2; | ||
| 164 | + item.cardprice3 = val.cardprice3; | ||
| 165 | + | ||
| 113 | prom_id = res.data.data.prom_id; | 166 | prom_id = res.data.data.prom_id; |
| 114 | 167 | ||
| 115 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 | 168 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 |
| 116 | 169 | ||
| 117 | var url = ""; | 170 | var url = ""; |
| 118 | - if (prom_type == 1) { | 171 | + if (prom_type == 6) { |
| 119 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; | 172 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; |
| 120 | - } else if (prom_type == 6) { | 173 | + } else if (prom_type == 1) { |
| 121 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; | 174 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; |
| 122 | } | 175 | } |
| 123 | if(url==""){ | 176 | if(url==""){ |
| @@ -130,12 +183,12 @@ Component({ | @@ -130,12 +183,12 @@ Component({ | ||
| 130 | return app.request.promiseGet(url, {}) | 183 | return app.request.promiseGet(url, {}) |
| 131 | } | 184 | } |
| 132 | 185 | ||
| 133 | - | ||
| 134 | }).then(res => { | 186 | }).then(res => { |
| 135 | index++; | 187 | index++; |
| 136 | var prom = res.data.data; | 188 | var prom = res.data.data; |
| 137 | - if (prom != null) { | ||
| 138 | - item.shop_price = res.data.data.price; | 189 | + var now=ut.gettimestamp(); |
| 190 | + if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) { | ||
| 191 | + item.prom_price = res.data.data.price; | ||
| 139 | } | 192 | } |
| 140 | th.data.requestData.push(item); | 193 | th.data.requestData.push(item); |
| 141 | th.setData({ | 194 | th.setData({ |
| @@ -170,8 +223,9 @@ Component({ | @@ -170,8 +223,9 @@ Component({ | ||
| 170 | total: res.data.data.total | 223 | total: res.data.data.total |
| 171 | }) | 224 | }) |
| 172 | th.data.currentPage++; | 225 | th.data.currentPage++; |
| 226 | + var now=ut.gettimestamp(); | ||
| 173 | 227 | ||
| 174 | - goods.forEach(function (val, ind) { | 228 | + goods.forEach(async function (val, ind) { |
| 175 | var item = {}; | 229 | var item = {}; |
| 176 | var prom_id = null; | 230 | var prom_id = null; |
| 177 | console.log(val.goodsid); | 231 | console.log(val.goodsid); |
| @@ -185,21 +239,26 @@ Component({ | @@ -185,21 +239,26 @@ Component({ | ||
| 185 | item.shop_price = val.shop_price; | 239 | item.shop_price = val.shop_price; |
| 186 | item.sales_sum = val.sales_sum; | 240 | item.sales_sum = val.sales_sum; |
| 187 | item.goods_id = val.goods_id; | 241 | item.goods_id = val.goods_id; |
| 242 | + | ||
| 243 | + item.cardprice1 = val.cardprice1; | ||
| 244 | + item.cardprice2 = val.cardprice2; | ||
| 245 | + item.cardprice3 = val.cardprice3; | ||
| 246 | + | ||
| 188 | prom_id = val.prom_id; | 247 | prom_id = val.prom_id; |
| 189 | 248 | ||
| 190 | - var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 | 249 | + var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 |
| 191 | 250 | ||
| 192 | var url = ""; | 251 | var url = ""; |
| 193 | - if (prom_type == 1) { | 252 | + if (prom_type == 6) { |
| 194 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; | 253 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; |
| 195 | - } else if (prom_type == 6) { | 254 | + } else if (prom_type == 1) { |
| 196 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; | 255 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; |
| 197 | } | 256 | } |
| 198 | if(url!="") { | 257 | if(url!="") { |
| 199 | - app.request.promiseGet(url, {}).then(res => { | 258 | + await app.request.promiseGet(url, {}).then(res => { |
| 200 | var prom = res.data.data; | 259 | var prom = res.data.data; |
| 201 | - if (prom != null) { | ||
| 202 | - item.shop_price = res.data.data.price; | 260 | + if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) { |
| 261 | + item.prom_price = res.data.data.price; | ||
| 203 | } | 262 | } |
| 204 | th.data.requestData.push(item); | 263 | th.data.requestData.push(item); |
| 205 | th.setData({ | 264 | th.setData({ |
| @@ -237,40 +296,42 @@ Component({ | @@ -237,40 +296,42 @@ Component({ | ||
| 237 | }) | 296 | }) |
| 238 | 297 | ||
| 239 | th.data.currentPage++; | 298 | th.data.currentPage++; |
| 240 | - goods.forEach(function (val, ind) { | 299 | + var now=ut.gettimestamp(); |
| 300 | + goods.forEach(async function (val, ind) { | ||
| 241 | var item = {}; | 301 | var item = {}; |
| 242 | var prom_id = null; | 302 | var prom_id = null; |
| 243 | console.log(val.goodsid); | 303 | console.log(val.goodsid); |
| 244 | //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => { | 304 | //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => { |
| 245 | //商品地址 | 305 | //商品地址 |
| 246 | var goods = res.data.data; | 306 | var goods = res.data.data; |
| 247 | - console.log("goods"); | ||
| 248 | - console.log(goods); | ||
| 249 | - // th.setData({ | ||
| 250 | - // goods_btn: res.data.data | ||
| 251 | - // }) | 307 | + |
| 252 | item.goods_name = val.goods_name; | 308 | item.goods_name = val.goods_name; |
| 253 | item.goods_img = th.data.imghost + val.original_img; | 309 | item.goods_img = th.data.imghost + val.original_img; |
| 254 | item.market_price = val.market_price; | 310 | item.market_price = val.market_price; |
| 255 | item.shop_price = val.shop_price; | 311 | item.shop_price = val.shop_price; |
| 256 | item.sales_sum = val.sales_sum; | 312 | item.sales_sum = val.sales_sum; |
| 257 | item.goods_id = val.goods_id; | 313 | item.goods_id = val.goods_id; |
| 314 | + | ||
| 315 | + item.cardprice1 = val.cardprice1; | ||
| 316 | + item.cardprice2 = val.cardprice2; | ||
| 317 | + item.cardprice3 = val.cardprice3; | ||
| 318 | + | ||
| 258 | prom_id = val.prom_id; | 319 | prom_id = val.prom_id; |
| 259 | 320 | ||
| 260 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 | 321 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 |
| 261 | 322 | ||
| 262 | var url = ""; | 323 | var url = ""; |
| 263 | - if (prom_type == 1) { | 324 | + if (prom_type == 6) { |
| 264 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; | 325 | url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id; |
| 265 | - } else if (prom_type == 6) { | 326 | + } else if (prom_type == 1) { |
| 266 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; | 327 | url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id; |
| 267 | } | 328 | } |
| 268 | 329 | ||
| 269 | if(url!=null){ | 330 | if(url!=null){ |
| 270 | - app.request.promiseGet(url, {}).then(res => { | 331 | + await app.request.promiseGet(url, {}).then(res => { |
| 271 | var prom = res.data.data; | 332 | var prom = res.data.data; |
| 272 | - if (prom != null) { | ||
| 273 | - item.shop_price = res.data.data.price; | 333 | + if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) { |
| 334 | + item.prom_price = res.data.data.price; | ||
| 274 | } | 335 | } |
| 275 | th.data.requestData.push(item); | 336 | th.data.requestData.push(item); |
| 276 | th.setData({ | 337 | th.setData({ |
| @@ -303,6 +364,83 @@ Component({ | @@ -303,6 +364,83 @@ Component({ | ||
| 303 | var _errObj = {}; | 364 | var _errObj = {}; |
| 304 | _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif"; | 365 | _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif"; |
| 305 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | 366 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; |
| 306 | - } | 367 | + }, |
| 368 | + | ||
| 369 | + //---卡的初始化---- | ||
| 370 | + card_init: function() { | ||
| 371 | + var th = this,os=getApp().globalData.setting; | ||
| 372 | + getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { | ||
| 373 | + success: function(e) { | ||
| 374 | + getApp().globalData.userInfo = e.data.data; | ||
| 375 | + getApp().getConfig2(function(e) { | ||
| 376 | + var swithc_list = e.switch_list; | ||
| 377 | + var sw_arr = JSON.parse(swithc_list); | ||
| 378 | + //---如果后台又开等级卡的开关--- | ||
| 379 | + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { | ||
| 380 | + th.setData({ | ||
| 381 | + rank_switch: true | ||
| 382 | + }); | ||
| 383 | + //---回调卡的列表--- | ||
| 384 | + th.getPlusCardType(function(ob) { | ||
| 385 | + th.setData({ | ||
| 386 | + card_list: ob.card_list | ||
| 387 | + }); | ||
| 388 | + var ti = setInterval(function() { | ||
| 389 | + var user = getApp().globalData.userInfo; | ||
| 390 | + if (!user) return false; | ||
| 391 | + clearInterval(ti); | ||
| 392 | + | ||
| 393 | + if (user.card_field) { | ||
| 394 | + var str = user['card_expiredate'].replace(/-/g, '/'); | ||
| 395 | + var end = new Date(str); | ||
| 396 | + end = Date.parse(end) / 1000; | ||
| 397 | + var now = ut.gettimestamp(); | ||
| 398 | + | ||
| 399 | + //--- 判断是等级会员，且在有效期范围内 --- | ||
| 400 | + if (user.card_field && now < end) { | ||
| 401 | + var card_name = ob.name_map.get(user.card_field); | ||
| 402 | + if (card_name.length > 4) card_name = card_name.substring(0, 4); | ||
| 403 | + th.setData({ | ||
| 404 | + card_field: user.card_field, | ||
| 405 | + card_name: card_name, | ||
| 406 | + card_list: ob.card_list | ||
| 407 | + }); | ||
| 408 | + } | ||
| 409 | + | ||
| 410 | + } | ||
| 411 | + | ||
| 412 | + }, 500) | ||
| 413 | + }) | ||
| 414 | + | ||
| 415 | + } | ||
| 416 | + }) | ||
| 417 | + } | ||
| 418 | + }) | ||
| 419 | + | ||
| 420 | + }, | ||
| 421 | + | ||
| 422 | + //--- 获取卡类列表 --- | ||
| 423 | + getPlusCardType: function(func) { | ||
| 424 | + var storid = o.stoid; | ||
| 425 | + var th = this; | ||
| 426 | + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { | ||
| 427 | + var plusCard = res.data.data; | ||
| 428 | + var arr = [1219, 2089, 3031]; | ||
| 429 | + var new_arr = new Array(); | ||
| 430 | + var card_name_map = new Map(); | ||
| 431 | + for (var i = 0; i < plusCard.length; i++) { | ||
| 432 | + var name = "card" + plusCard[i].CorrPrice.toLowerCase(); | ||
| 433 | + card_name_map.set(name, plusCard[i].CardName); | ||
| 434 | + } | ||
| 435 | + | ||
| 436 | + var ob = { | ||
| 437 | + "card_list": plusCard, | ||
| 438 | + "name_map": card_name_map | ||
| 439 | + }; | ||
| 440 | + func(ob); | ||
| 441 | + }) | ||
| 442 | + }, | ||
| 443 | + | ||
| 444 | + | ||
| 307 | } | 445 | } |
| 308 | }) | 446 | }) |
| 309 | \ No newline at end of file | 447 | \ No newline at end of file |
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 | - | ||
| 6 | - <block wx:if='{{object.column==1 && object.position==4}}'> | ||
| 7 | - <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}}" > | ||
| 8 | <view class='zs_goods'> | 7 | <view class='zs_goods'> |
| 9 | <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"> |
| 10 | - <view class='zs_top'> | ||
| 11 | - <block> | 9 | + <view class='zs_top rel'> |
| 12 | <image class='zs_t_img' src="{{item.goods_img}}" | 10 | <image class='zs_t_img' src="{{item.goods_img}}" |
| 13 | data-errorimg="goods_array[{{index}}].goods_img" | 11 | data-errorimg="goods_array[{{index}}].goods_img" |
| 14 | binderror="bind_bnerr3" | 12 | binderror="bind_bnerr3" |
| 15 | - ></image></block> | 13 | + ></image> |
| 16 | 14 | ||
| 17 | <block wx:if="{{object.goodicon==3}}"> | 15 | <block wx:if="{{object.goodicon==3}}"> |
| 18 | - <image class='zs_t1' wx:if="{{ object.position==4}}" | ||
| 19 | - src='{{object.customicon}}'></image> | ||
| 20 | - <!--<image class='zs_t1' wx:if="{{object.position==1}}"--> | ||
| 21 | - <!--src='{{object.customicon}}'></image>--> | ||
| 22 | - <!--<image class='zs_t1' wx:if="{{ object.position==1}}"--> | ||
| 23 | - <!--src='{{object.customicon}}'></image>--> | ||
| 24 | - <!--<image class='zs_t1' wx:if="{{object.position==1}}"--> | ||
| 25 | - <!--src='{{object.customicon}}'></image>--> | 16 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> |
| 26 | </block> | 17 | </block> |
| 27 | <block wx:if="{{object.goodicon==1}}"> | 18 | <block wx:if="{{object.goodicon==1}}"> |
| 28 | - <image class='zs_t1' src=''></image> | 19 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> |
| 29 | </block> | 20 | </block> |
| 30 | <block wx:if="{{object.goodicon==2}}"> | 21 | <block wx:if="{{object.goodicon==2}}"> |
| 31 | - <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}}" |
| 32 | src='{{imghost}}/miniapp/images/Recommend.png'></image> | 23 | src='{{imghost}}/miniapp/images/Recommend.png'></image> |
| 33 | - <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}}" |
| 34 | src='{{imghost}}/miniapp/images/hot.png'></image> | 25 | src='{{imghost}}/miniapp/images/hot.png'></image> |
| 35 | - <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}}" |
| 36 | src='{{imghost}}/miniapp/images/new.png'></image> | 27 | src='{{imghost}}/miniapp/images/new.png'></image> |
| 37 | - <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}}" |
| 38 | src='{{imghost}}/miniapp/images/Promotion.png'></image> | 29 | src='{{imghost}}/miniapp/images/Promotion.png'></image> |
| 39 | </block> | 30 | </block> |
| 40 | </view> | 31 | </view> |
| 41 | <view class='zs_center'> | 32 | <view class='zs_center'> |
| 42 | - | ||
| 43 | <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 | + <!--如果有显示价格 --> | ||
| 44 | <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | 35 | <view class='zs_wz2' wx:if="{{object.goodsprice}}"> |
| 45 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 46 | - <view class='del'>￥{{item.market_price}}</view> | 36 | + <block wx:if="{{item.prom_price}}"> |
| 37 | + <view class='wz_red'>￥{{item.prom_price}}</view> | ||
| 38 | + <view class='del'>￥{{item.market_price}}</view> | ||
| 39 | + </block> | ||
| 40 | + <block wx:else> | ||
| 41 | + | ||
| 42 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
| 43 | + <!-- 当会员是等级卡的时候 --> | ||
| 44 | + <block wx:if="{{card_field}}"> | ||
| 45 | + <!-- 等级价>0 --> | ||
| 46 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 47 | + <view class="money flex ai_and"> | ||
| 48 | + <!-- 办卡价 --> | ||
| 49 | + <view class="flex xc-wc ai_and"> | ||
| 50 | + <view class="fs24 wz_red">￥</view> | ||
| 51 | + <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 52 | + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
| 53 | + </view> | ||
| 54 | + </view> | ||
| 55 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 56 | + <!-- 原价 --> | ||
| 57 | + <view class="price flex xc-ash line_th"> | ||
| 58 | + <view class="fs22">￥</view> | ||
| 59 | + <view class="fs22">{{item.market_price}}</view> | ||
| 60 | + </view> | ||
| 61 | + </view> | ||
| 62 | + </block> | ||
| 63 | + <blocK wx:else> | ||
| 64 | + <view class="money flex" > | ||
| 65 | + <!-- 办卡价 --> | ||
| 66 | + <view class="flex xc-wc"> | ||
| 67 | + <view class="fs24 wz_red">￥</view> | ||
| 68 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 69 | + </view> | ||
| 70 | + </view> | ||
| 71 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 72 | + <!-- 原价 --> | ||
| 73 | + <view class="price flex xc-ash line_th"> | ||
| 74 | + <view class="fs22">￥</view> | ||
| 75 | + <view class="fs22">{{item.market_price}}</view> | ||
| 76 | + </view> | ||
| 77 | + </view> | ||
| 78 | + </blocK> | ||
| 79 | + </block> | ||
| 80 | + <block wx:else> | ||
| 81 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 82 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 83 | + <view class="money flex" > | ||
| 84 | + <!-- 办卡价 --> | ||
| 85 | + <view class="flex xc-wc"> | ||
| 86 | + <view class="fs24 wz_red">￥</view> | ||
| 87 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 88 | + </view> | ||
| 89 | + <!-- 原价 --> | ||
| 90 | + <view class="price flex xc-ash line_th"> | ||
| 91 | + <view class="fs22">￥</view> | ||
| 92 | + <view class="fs22">{{item.market_price}}</view> | ||
| 93 | + </view> | ||
| 94 | + | ||
| 95 | + </view> | ||
| 96 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 97 | + <!-- 等级价 --> | ||
| 98 | + <view class="price flex ai_and"> | ||
| 99 | + <view class="fs22">￥</view> | ||
| 100 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 101 | + <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 102 | + </view> | ||
| 103 | + </view> | ||
| 104 | + </block> | ||
| 105 | + <block wx:else> | ||
| 106 | + <view class="money flex" > | ||
| 107 | + <!-- 办卡价 --> | ||
| 108 | + <view class="flex xc-wc"> | ||
| 109 | + <view class="fs24 wz_red">￥</view> | ||
| 110 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 111 | + </view> | ||
| 112 | + </view> | ||
| 113 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 114 | + <!-- 原价 --> | ||
| 115 | + <view class="price flex xc-ash line_th"> | ||
| 116 | + <view class="fs22">￥</view> | ||
| 117 | + <view class="fs22">{{item.market_price}}</view> | ||
| 118 | + </view> | ||
| 119 | + </view> | ||
| 120 | + </block> | ||
| 121 | + </block> | ||
| 122 | + </block> | ||
| 123 | + | ||
| 124 | + <block wx:else> | ||
| 125 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 126 | + <view class='del'>￥{{item.market_price}}</view> | ||
| 127 | + </block> | ||
| 128 | + | ||
| 129 | + </block> | ||
| 130 | + | ||
| 47 | </view> | 131 | </view> |
| 48 | - <!-- <view class='zs_wz3'>美妆价：¥9.00</view> | ||
| 49 | - <view class='zs_wz4'>等级价：¥8.00</view> --> | ||
| 50 | <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | 132 | <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> |
| 51 | 133 | ||
| 52 | </view> | 134 | </view> |
| 53 | </navigator> | 135 | </navigator> |
| 54 | - </view> | 136 | + </view> |
| 137 | + <view style="height:20rpx"></view> | ||
| 55 | </block> | 138 | </block> |
| 56 | - </block> | ||
| 57 | - | ||
| 58 | - <!-- 右上角 --> | ||
| 59 | - <block wx:if='{{object.column==1 && object.position==2}}'> | ||
| 60 | - <block wx:for="{{goods_array}}" > | ||
| 61 | - <view class='zs_goods' > | ||
| 62 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 63 | - <view class='zs_top'> | ||
| 64 | - | ||
| 65 | - <block> | ||
| 66 | - <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 67 | - binderror="bind_bnerr3"></image> | ||
| 68 | - </block> | ||
| 69 | - | ||
| 70 | - <!-- <image class='zs_t2' src='http://jmh.xinda100.cn/public/static/images/model/Recommend.png'></image> --> | ||
| 71 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 72 | - <image class='zs_t2' wx:if="{{object.position==2}}" | ||
| 73 | - src='{{object.customicon}}'></image> | ||
| 74 | - <!--<image class='zs_t2' wx:if="{{object.styleicon==2 && object.position==2}}"--> | ||
| 75 | - <!--src='{{object.customicon}}'></image>--> | ||
| 76 | - <!--<image class='zs_t2' wx:if="{{object.styleicon==3 && object.position==2}}"--> | ||
| 77 | - <!--src='{{object.customicon}}'></image>--> | ||
| 78 | - <!--<image class='zs_t2' wx:if="{{object.styleicon==4 && object.position==2}}"--> | ||
| 79 | - <!--src='{{object.customicon}}'></image>--> | ||
| 80 | - </block> | ||
| 81 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 82 | - <image class='zs_t2' src=''></image> | ||
| 83 | - </block> | ||
| 84 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 85 | - <image class='zs_t2' wx:if="{{object.styleicon==1}}" | ||
| 86 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 87 | - <image class='zs_t2' wx:if="{{object.styleicon==2 }}" | ||
| 88 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 89 | - <image class='zs_t2' wx:if="{{object.styleicon==3}}" | ||
| 90 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 91 | - <image class='zs_t2' wx:if="{{object.styleicon==4 }}" | ||
| 92 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 93 | - </block> | ||
| 94 | - </view> | ||
| 95 | - | ||
| 96 | - <view class='zs_center'> | ||
| 97 | - <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 98 | - <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | ||
| 99 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 100 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 101 | - </view> | ||
| 102 | - <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 103 | - | ||
| 104 | - </view> | ||
| 105 | - </navigator> | ||
| 106 | - | ||
| 107 | - </view> | ||
| 108 | - </block> | ||
| 109 | - </block> | ||
| 110 | - <!-- 左上角 --> | ||
| 111 | - <block wx:if='{{object.column==1 && object.position==1}}'> | ||
| 112 | - <block wx:for="{{goods_array}}"> | ||
| 113 | - <view class='zs_goods'> | ||
| 114 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 115 | - <view class='zs_top'> | ||
| 116 | - | ||
| 117 | - <block> | ||
| 118 | - <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 119 | - binderror="bind_bnerr3"></image> | ||
| 120 | - </block> | ||
| 121 | - <!-- <image class='zs_t3' src='http://jmh.xinda100.cn/public/static/images/model/hot.png'></image> --> | ||
| 122 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 123 | - <image class='zs_t3' wx:if="{{ object.position==1}}" | ||
| 124 | - src='{{object.customicon}}'></image> | ||
| 125 | - <!--<image class='zs_t3' wx:if="{{object.styleicon==2 && object.position==3}}"--> | ||
| 126 | - <!--src='{{object.customicon}}'></image>--> | ||
| 127 | - <!--<image class='zs_t3' wx:if="{{object.styleicon==3 && object.position==3}}"--> | ||
| 128 | - <!--src='{{object.customicon}}'></image>--> | ||
| 129 | - <!--<image class='zs_t3' wx:if="{{object.styleicon==4 && object.position==3}}"--> | ||
| 130 | - <!--src='{{object.customicon}}'></image>--> | ||
| 131 | - </block> | ||
| 132 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 133 | - <image class='zs_t3' src=''></image> | ||
| 134 | - </block> | ||
| 135 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 136 | - <image class='zs_t3' wx:if="{{object.styleicon==1}}" | ||
| 137 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 138 | - <image class='zs_t3' wx:if="{{object.styleicon==2 }}" | ||
| 139 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 140 | - <image class='zs_t3' wx:if="{{object.styleicon==3}}" | ||
| 141 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 142 | - <image class='zs_t3' wx:if="{{object.styleicon==4 }}" | ||
| 143 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 144 | - </block> | ||
| 145 | - </view> | ||
| 146 | - | ||
| 147 | - <view class='zs_center'> | ||
| 148 | - | ||
| 149 | - <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 150 | - <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | ||
| 151 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 152 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 153 | - </view> | ||
| 154 | - <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 155 | - | ||
| 156 | - </view> | ||
| 157 | - </navigator> | ||
| 158 | - | ||
| 159 | - </view> | ||
| 160 | - </block> | ||
| 161 | - </block> | ||
| 162 | - <!-- 左下角 --> | ||
| 163 | - <block wx:if='{{object.column==1 && object.position==3}}'> | ||
| 164 | - <block wx:for="{{goods_array}}" > | ||
| 165 | - <view class='zs_goods' > | ||
| 166 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 167 | - <view class='zs_top'> | ||
| 168 | - | ||
| 169 | - <block> | ||
| 170 | - <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 171 | - binderror="bind_bnerr3"></image> | ||
| 172 | - </block> | ||
| 173 | - <!-- <image class='zs_t4' src='http://jmh.xinda100.cn/public/static/images/model/new.png'></image> --> | ||
| 174 | - | ||
| 175 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 176 | - <image class='zs_t4' wx:if="{{ object.position==3}}" | ||
| 177 | - src='{{object.customicon}}'></image> | ||
| 178 | - <!--<image class='zs_t4' wx:if="{{object.styleicon==2 && object.position==4}}"--> | ||
| 179 | - <!--src='{{object.customicon}}'></image>--> | ||
| 180 | - <!--<image class='zs_t4' wx:if="{{object.styleicon==3 && object.position==4}}"--> | ||
| 181 | - <!--src='{{object.customicon}}'></image>--> | ||
| 182 | - <!--<image class='zs_t4' wx:if="{{object.styleicon==4 && object.position==4}}"--> | ||
| 183 | - <!--src='{{object.customicon}}'></image>--> | ||
| 184 | - </block> | ||
| 185 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 186 | - <image class='zs_t4' src=''></image> | ||
| 187 | - </block> | ||
| 188 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 189 | - <image class='zs_t4' wx:if="{{object.styleicon==1}}" | ||
| 190 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 191 | - <image class='zs_t4' wx:if="{{object.styleicon==2 }}" | ||
| 192 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 193 | - <image class='zs_t4' wx:if="{{object.styleicon==3}}" | ||
| 194 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 195 | - <image class='zs_t4' wx:if="{{object.styleicon==4 }}" | ||
| 196 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 197 | - </block> | ||
| 198 | - </view> | ||
| 199 | - | ||
| 200 | - <view class='zs_center'> | ||
| 201 | - <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 202 | - <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | ||
| 203 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 204 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 205 | - </view> | ||
| 206 | - <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 207 | - | ||
| 208 | - </view> | ||
| 209 | - </navigator> | ||
| 210 | - </view> | ||
| 211 | - </block> | ||
| 212 | - </block> | 139 | + |
| 213 | </view> | 140 | </view> |
| 214 | - | ||
| 215 | - | ||
| 216 | -<!-- 列表显示 --> | ||
| 217 | -<view class="zs_goods_xiao_wai"> | ||
| 218 | - <!--右上角--> | ||
| 219 | - <block wx:if='{{object.column==4 && object.position==2}}'> | ||
| 220 | - <block wx:for="{{goods_array}}" > | ||
| 221 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 222 | - <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 223 | - <view class='zs_top_x'> | ||
| 224 | - <!--<image class='zs_t_img_x'></image>--> | ||
| 225 | - <block> | ||
| 226 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 227 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 228 | - </block> | ||
| 229 | - | ||
| 230 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 231 | - <image class='zs_t1_x' wx:if="{{object.position==2}}" | ||
| 232 | - src='{{object.customicon}}'></image> | ||
| 233 | - <!--<image class='zs_t1_x' wx:if="{{object.styleicon==2 && object.position==1}}"--> | ||
| 234 | - <!--src='{{object.customicon}}'></image>--> | ||
| 235 | - <!--<image class='zs_t1_x' wx:if="{{object.styleicon==3 && object.position==1}}"--> | ||
| 236 | - <!--src='{{object.customicon}}'></image>--> | ||
| 237 | - <!--<image class='zs_t1_x' wx:if="{{object.styleicon==4 && object.position==1}}"--> | ||
| 238 | - <!--src='{{object.customicon}}'></image>--> | ||
| 239 | - </block> | ||
| 240 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 241 | - <image class='zs_t1_x' src=''></image> | ||
| 242 | - </block> | ||
| 243 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 244 | - <image class='zs_t1_x' wx:if="{{object.styleicon==1}}" | ||
| 245 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 246 | - <image class='zs_t1_x' wx:if="{{object.styleicon==2 }}" | ||
| 247 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 248 | - <image class='zs_t1_x' wx:if="{{object.styleicon==3}}" | ||
| 249 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 250 | - <image class='zs_t1_x' wx:if="{{object.styleicon==4 }}" | ||
| 251 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 252 | - </block> | ||
| 253 | - </view> | ||
| 254 | - | ||
| 255 | - <view class='zs_center_x'> | ||
| 256 | - | ||
| 257 | - | ||
| 258 | - <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 259 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 260 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 261 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 262 | - </view> | ||
| 263 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 264 | - | ||
| 265 | - | ||
| 266 | - </view> | ||
| 267 | - | ||
| 268 | - </view> | ||
| 269 | - </navigator> | ||
| 270 | - </block> | ||
| 271 | - </block> | ||
| 272 | - <!-- 左上角 --> | ||
| 273 | - <block wx:if='{{object.column==4 && object.position==1}}'> | ||
| 274 | - <block wx:for="{{goods_array}}" > | ||
| 275 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 276 | - <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 277 | - <view class='zs_top_x'> | ||
| 278 | - | ||
| 279 | - <block wx:if="{{item.goods_img!=''}}"> | ||
| 280 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 281 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 282 | - </block> | ||
| 283 | - | ||
| 284 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 285 | - <image class='zs_t1_x1' wx:if="{{ object.position==1}}" | ||
| 286 | - src='{{object.customicon}}'></image> | ||
| 287 | - <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==2 && object.position==2}}"--> | ||
| 288 | - <!--src='{{object.customicon}}'></image>--> | ||
| 289 | - <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==3 && object.position==2}}"--> | ||
| 290 | - <!--src='{{object.customicon}}'></image>--> | ||
| 291 | - <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==4 && object.position==2}}"--> | ||
| 292 | - <!--src='{{object.customicon}}'></image>--> | ||
| 293 | - </block> | ||
| 294 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 295 | - <image class='zs_t1_x1' src=''></image> | ||
| 296 | - </block> | ||
| 297 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 298 | - <image class='zs_t1_x1' wx:if="{{object.styleicon==1}}" | ||
| 299 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 300 | - <image class='zs_t1_x1' wx:if="{{object.styleicon==2 }}" | ||
| 301 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 302 | - <image class='zs_t1_x1' wx:if="{{object.styleicon==3}}" | ||
| 303 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 304 | - <image class='zs_t1_x1' wx:if="{{object.styleicon==4 }}" | ||
| 305 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 306 | - </block> | ||
| 307 | - </view> | ||
| 308 | - <view class='zs_center_x'> | ||
| 309 | - <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 310 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 311 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 312 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 313 | - </view> | ||
| 314 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 315 | - </view> | ||
| 316 | - | ||
| 317 | - </view> | ||
| 318 | - </navigator> | ||
| 319 | - </block> | ||
| 320 | - </block> | ||
| 321 | - <!-- 右下角 --> | ||
| 322 | - <block wx:if='{{object.column==4 && object.position==4}}'> | ||
| 323 | - <block wx:for="{{goods_array}}" > | ||
| 324 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 325 | - <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 326 | - <view class='zs_top_x'> | ||
| 327 | - | ||
| 328 | - <block> | ||
| 329 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 330 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 331 | - </block> | ||
| 332 | - | ||
| 333 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 334 | - <image class='zs_t1_x2' wx:if="{{object.position==4}}" | ||
| 335 | - src='{{object.customicon}}'></image> | ||
| 336 | - <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==2 && object.position==3}}"--> | ||
| 337 | - <!--src='{{object.customicon}}'></image>--> | ||
| 338 | - <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==3 && object.position==3}}"--> | ||
| 339 | - <!--src='{{object.customicon}}'></image>--> | ||
| 340 | - <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==4 && object.position==3}}"--> | ||
| 341 | - <!--src='{{object.customicon}}'></image>--> | ||
| 342 | - </block> | ||
| 343 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 344 | - <image class='zs_t1_x2' src=''></image> | ||
| 345 | - </block> | ||
| 346 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 347 | - <image class='zs_t1_x2' wx:if="{{object.styleicon==1}}" | ||
| 348 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 349 | - <image class='zs_t1_x2' wx:if="{{object.styleicon==2 }}" | ||
| 350 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 351 | - <image class='zs_t1_x2' wx:if="{{object.styleicon==3}}" | ||
| 352 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 353 | - <image class='zs_t1_x2' wx:if="{{object.styleicon==4 }}" | ||
| 354 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 355 | - </block> | ||
| 356 | - </view> | ||
| 357 | - | ||
| 358 | - <view class='zs_center_x'> | ||
| 359 | - <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 360 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 361 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 362 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 363 | - </view> | ||
| 364 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 365 | - | ||
| 366 | - </view> | ||
| 367 | - | ||
| 368 | - </view> | ||
| 369 | - </navigator> | ||
| 370 | - </block> | ||
| 371 | - </block> | ||
| 372 | - <!-- 左下角 --> | ||
| 373 | - <block wx:if='{{object.column==4 && object.position==3}}'> | ||
| 374 | - <block wx:for="{{goods_array}}" > | ||
| 375 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 376 | - <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 377 | - <view class='zs_top_x'> | ||
| 378 | - <block wx:if="{{item.goods_img!=''}}"> | ||
| 379 | - <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 380 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 381 | - </block> | ||
| 382 | - | ||
| 383 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 384 | - <image class='zs_t1_x3' wx:if="{{object.position==3}}" | ||
| 385 | - src='{{object.customicon}}'></image> | ||
| 386 | - <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==2 && object.position==4}}"--> | ||
| 387 | - <!--src='{{object.customicon}}'></image>--> | ||
| 388 | - <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==3 && object.position==4}}"--> | ||
| 389 | - <!--src='{{object.customicon}}'></image>--> | ||
| 390 | - <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==4 && object.position==4}}"--> | ||
| 391 | - <!--src='{{object.customicon}}'></image>--> | ||
| 392 | - </block> | ||
| 393 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 394 | - <image class='zs_t1_x3' src=''></image> | ||
| 395 | - </block> | ||
| 396 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 397 | - <image class='zs_t1_x3' wx:if="{{object.styleicon==1}}" | ||
| 398 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 399 | - <image class='zs_t1_x3' wx:if="{{object.styleicon==2 }}" | ||
| 400 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 401 | - <image class='zs_t1_x3' wx:if="{{object.styleicon==3}}" | ||
| 402 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 403 | - <image class='zs_t1_x3' wx:if="{{object.styleicon==4 }}" | ||
| 404 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 405 | - </block> | ||
| 406 | - </view> | ||
| 407 | - <view class='zs_center_x'> | ||
| 408 | - | ||
| 409 | - <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 410 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 411 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 412 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 413 | - </view> | ||
| 414 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 415 | - </view> | ||
| 416 | - | ||
| 417 | - </view> | ||
| 418 | - </navigator> | ||
| 419 | - </block> | ||
| 420 | - </block> | ||
| 421 | -</view> | ||
| 422 | - | ||
| 423 | - | ||
| 424 | <!--2个一列--> | 141 | <!--2个一列--> |
| 425 | -<!--左上角--> | ||
| 426 | -<block wx:if="{{object.column==2 && object.position==1}}"> | ||
| 427 | -<block wx:for="{{goods_array}}" > | 142 | +<block wx:if="{{object.column==2}}"> |
| 143 | + <block wx:for="{{goods_array}}" > | ||
| 428 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 144 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> |
| 429 | - | ||
| 430 | <view class="zs_goods_wai_ban"> | 145 | <view class="zs_goods_wai_ban"> |
| 431 | <view class="zs_goods_ban"> | 146 | <view class="zs_goods_ban"> |
| 432 | <view class='zs_goods_2l'> | 147 | <view class='zs_goods_2l'> |
| 433 | - | ||
| 434 | - <view class='zs_top_2l'> | ||
| 435 | - <!--<image class='zs_t_img_2l'></image>--> | ||
| 436 | - <block wx:if="{{item.goods_img!=''}}"> | ||
| 437 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | 148 | + <view class='zs_top_2l rel'> |
| 149 | + <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 438 | binderror="bind_bnerr3"></image> | 150 | binderror="bind_bnerr3"></image> |
| 439 | - </block> | ||
| 440 | - | ||
| 441 | <block wx:if="{{object.goodicon==3}}"> | 151 | <block wx:if="{{object.goodicon==3}}"> |
| 442 | - <image class='zs_t1_2l' wx:if="{{object.position==1}}" | 152 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==1}}" |
| 443 | src='{{object.customicon}}'></image> | 153 | src='{{object.customicon}}'></image> |
| 444 | - <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==2 && object.position==1}}"--> | ||
| 445 | - <!--src='{{object.customicon}}'></image>--> | ||
| 446 | - <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==3 && object.position==1}}"--> | ||
| 447 | - <!--src='{{object.customicon}}'></image>--> | ||
| 448 | - <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==4 && object.position==1}}"--> | ||
| 449 | - <!--src='{{object.customicon}}'></image>--> | ||
| 450 | </block> | 154 | </block> |
| 451 | <block wx:if="{{object.goodicon==1}}"> | 155 | <block wx:if="{{object.goodicon==1}}"> |
| 452 | - <image class='zs_t1_2l' src=''></image> | 156 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> |
| 453 | </block> | 157 | </block> |
| 454 | <block wx:if="{{object.goodicon==2}}"> | 158 | <block wx:if="{{object.goodicon==2}}"> |
| 455 | - <image class='zs_t1_2l' wx:if="{{object.styleicon==1}}" | 159 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" |
| 456 | src='{{imghost}}/miniapp/images/Recommend.png'></image> | 160 | src='{{imghost}}/miniapp/images/Recommend.png'></image> |
| 457 | - <image class='zs_t1_2l' wx:if="{{object.styleicon==2 }}" | 161 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" |
| 458 | src='{{imghost}}/miniapp/images/hot.png'></image> | 162 | src='{{imghost}}/miniapp/images/hot.png'></image> |
| 459 | - <image class='zs_t1_2l' wx:if="{{object.styleicon==3}}" | 163 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" |
| 460 | src='{{imghost}}/miniapp/images/new.png'></image> | 164 | src='{{imghost}}/miniapp/images/new.png'></image> |
| 461 | - <image class='zs_t1_2l' wx:if="{{object.styleicon==4 }}" | 165 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" |
| 462 | src='{{imghost}}/miniapp/images/Promotion.png'></image> | 166 | src='{{imghost}}/miniapp/images/Promotion.png'></image> |
| 463 | </block> | 167 | </block> |
| 464 | </view> | 168 | </view> |
| @@ -466,187 +170,100 @@ | @@ -466,187 +170,100 @@ | ||
| 466 | <view class='zs_center_2l'> | 170 | <view class='zs_center_2l'> |
| 467 | <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | 171 | <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
| 468 | <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | 172 | <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> |
| 469 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 470 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 471 | - </view> | ||
| 472 | - <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 473 | - </view> | ||
| 474 | - </view> | ||
| 475 | - </view> | ||
| 476 | - | ||
| 477 | - </view> | ||
| 478 | - </navigator> | ||
| 479 | -</block> | ||
| 480 | 173 | ||
| 481 | -<view class="clear"></view> | ||
| 482 | -</block> | ||
| 483 | -<!--右上角--> | ||
| 484 | -<block wx:if='{{object.column==2 && object.position==2}}'> | ||
| 485 | -<block wx:for="{{goods_array}}" > | ||
| 486 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 487 | - <view class="zs_goods_wai_ban" > | ||
| 488 | - <view class="zs_goods_ban"> | ||
| 489 | - <view class='zs_goods_2l'> | ||
| 490 | - | ||
| 491 | - <view class='zs_top_2l'> | ||
| 492 | - <!--<image class='zs_t_img_2l'></image>--> | ||
| 493 | - <block> | ||
| 494 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 495 | - binderror="bind_bnerr3"></image> | ||
| 496 | - </block> | ||
| 497 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 498 | - <image class='zs_t2_2l' wx:if="{{ object.position==2}}" | ||
| 499 | - src='{{object.customicon}}'></image> | ||
| 500 | - <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==2 && object.position==2}}"--> | ||
| 501 | - <!--src='{{object.customicon}}'></image>--> | ||
| 502 | - <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==3 && object.position==2}}"--> | ||
| 503 | - <!--src='{{object.customicon}}'></image>--> | ||
| 504 | - <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==4 && object.position==2}}"--> | ||
| 505 | - <!--src='{{object.customicon}}'></image>--> | ||
| 506 | - </block> | ||
| 507 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 508 | - <image class='zs_t2_2l' src=''></image> | ||
| 509 | - </block> | ||
| 510 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 511 | - <image class='zs_t2_2l' wx:if="{{object.styleicon==1}}" | ||
| 512 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 513 | - <image class='zs_t2_2l' wx:if="{{object.styleicon==2 }}" | ||
| 514 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 515 | - <image class='zs_t2_2l' wx:if="{{object.styleicon==3}}" | ||
| 516 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 517 | - <image class='zs_t2_2l' wx:if="{{object.styleicon==4 }}" | ||
| 518 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 519 | - </block> | ||
| 520 | - </view> | ||
| 521 | - <view class='zs_center_2l'> | ||
| 522 | - | ||
| 523 | - | ||
| 524 | - <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 525 | - <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | ||
| 526 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 527 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 528 | - </view> | ||
| 529 | - <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 530 | - | ||
| 531 | - </view> | ||
| 532 | - </view> | ||
| 533 | - </view> | ||
| 534 | - | ||
| 535 | - </view> | ||
| 536 | - </navigator> | ||
| 537 | -</block> | ||
| 538 | - | ||
| 539 | -<view class="clear"></view> | ||
| 540 | -</block> | ||
| 541 | -<!--右下角--> | ||
| 542 | -<block wx:if='{{object.column==2 && object.position==4}}'> | ||
| 543 | -<block wx:for="{{goods_array}}" > | ||
| 544 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 545 | - <view class="zs_goods_wai_ban" > | ||
| 546 | - <view class="zs_goods_ban"> | ||
| 547 | - <view class='zs_goods_2l'> | ||
| 548 | - | ||
| 549 | - <view class='zs_top_2l'> | ||
| 550 | - <!--<image class='zs_t_img_2l'></image>--> | ||
| 551 | - <block> | ||
| 552 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 553 | - binderror="bind_bnerr3"></image> | ||
| 554 | - </block> | ||
| 555 | - | ||
| 556 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 557 | - <image class='zs_t3_2l' wx:if="{{ object.position==4}}" | ||
| 558 | - src='{{object.customicon}}'></image> | ||
| 559 | - <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==2 && object.position==3}}"--> | ||
| 560 | - <!--src='{{object.customicon}}'></image>--> | ||
| 561 | - <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==3 && object.position==3}}"--> | ||
| 562 | - <!--src='{{object.customicon}}'></image>--> | ||
| 563 | - <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==4 && object.position==3}}"--> | ||
| 564 | - <!--src='{{object.customicon}}'></image>--> | ||
| 565 | - </block> | ||
| 566 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 567 | - <image class='zs_t3_2l' src=''></image> | ||
| 568 | - </block> | ||
| 569 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 570 | - <image class='zs_t3_2l' wx:if="{{object.styleicon==1}}" | ||
| 571 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 572 | - <image class='zs_t3_2l' wx:if="{{object.styleicon==2 }}" | ||
| 573 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 574 | - <image class='zs_t3_2l' wx:if="{{object.styleicon==3}}" | ||
| 575 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 576 | - <image class='zs_t3_2l' wx:if="{{object.styleicon==4 }}" | ||
| 577 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 578 | - </block> | ||
| 579 | - </view> | ||
| 580 | - | ||
| 581 | - <view class='zs_center_2l'> | ||
| 582 | - | ||
| 583 | - <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 584 | - <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | ||
| 585 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 586 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 587 | - </view> | ||
| 588 | - <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 589 | - </view> | ||
| 590 | - | ||
| 591 | - </view> | ||
| 592 | - </view> | ||
| 593 | - | ||
| 594 | - | ||
| 595 | - </view> | ||
| 596 | - </navigator> | ||
| 597 | -</block> | ||
| 598 | - | ||
| 599 | -<view class="clear"></view> | ||
| 600 | -</block> | ||
| 601 | -<!--左下角--> | ||
| 602 | -<block wx:if='{{object.column==2 && object.position==3}}'> | ||
| 603 | -<block wx:for="{{goods_array}}" > | ||
| 604 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 605 | - <view class="zs_goods_wai_ban" > | ||
| 606 | - <view class="zs_goods_ban"> | ||
| 607 | - <view class='zs_goods_2l'> | ||
| 608 | - | ||
| 609 | - <view class='zs_top_2l'> | ||
| 610 | - <!--<image class='zs_t_img_2l'></image>--> | ||
| 611 | - <block> | ||
| 612 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 613 | - binderror="bind_bnerr3"></image> | ||
| 614 | - </block> | ||
| 615 | - | ||
| 616 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 617 | - <image class='zs_t4_2l' wx:if="{{ object.position==3}}" | ||
| 618 | - src='{{object.customicon}}'></image> | ||
| 619 | - <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==2 && object.position==4}}"--> | ||
| 620 | - <!--src='{{object.customicon}}'></image>--> | ||
| 621 | - <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==3 && object.position==4}}"--> | ||
| 622 | - <!--src='{{object.customicon}}'></image>--> | ||
| 623 | - <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==4 && object.position==4}}"--> | ||
| 624 | - <!--src='{{object.customicon}}'></image>--> | ||
| 625 | - </block> | ||
| 626 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 627 | - <image class='zs_t4_2l' src=''></image> | ||
| 628 | - </block> | ||
| 629 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 630 | - <image class='zs_t4_2l' wx:if="{{object.styleicon==1}}" | ||
| 631 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 632 | - <image class='zs_t4_2l' wx:if="{{object.styleicon==2 }}" | ||
| 633 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 634 | - <image class='zs_t4_2l' wx:if="{{object.styleicon==3}}" | ||
| 635 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 636 | - <image class='zs_t4_2l' wx:if="{{object.styleicon==4 }}" | ||
| 637 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 638 | - </block> | ||
| 639 | - </view> | ||
| 640 | - | ||
| 641 | - <view class='zs_center_2l'> | ||
| 642 | - | ||
| 643 | - <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 644 | - <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | ||
| 645 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 646 | - <view class='del'>￥{{item.market_price}}</view> | 174 | + <block wx:if="{{item.prom_price}}"> |
| 175 | + <view class='wz_red'>￥{{item.prom_price}}</view> | ||
| 176 | + <view class='del'>￥{{item.market_price}}</view> | ||
| 177 | + </block> | ||
| 178 | + <block wx:else> | ||
| 179 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
| 180 | + <!-- 当会员是等级卡的时候 --> | ||
| 181 | + <block wx:if="{{card_field}}"> | ||
| 182 | + <!-- 等级价>0 --> | ||
| 183 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 184 | + <view class="money flex" > | ||
| 185 | + <!-- 办卡价 --> | ||
| 186 | + <view class="flex xc-wc ai_and"> | ||
| 187 | + <view class="fs24 wz_red">￥</view> | ||
| 188 | + <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 189 | + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
| 190 | + </view> | ||
| 191 | + </view> | ||
| 192 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 193 | + <!-- 原价 --> | ||
| 194 | + <view class="price flex xc-ash line_th"> | ||
| 195 | + <view class="fs22">￥</view> | ||
| 196 | + <view class="fs22">{{item.market_price}}</view> | ||
| 197 | + </view> | ||
| 198 | + </view> | ||
| 199 | + </block> | ||
| 200 | + <blocK wx:else> | ||
| 201 | + <view class="money flex" > | ||
| 202 | + <!-- 办卡价 --> | ||
| 203 | + <view class="flex xc-wc"> | ||
| 204 | + <view class="fs24 wz_red">￥</view> | ||
| 205 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 206 | + </view> | ||
| 207 | + </view> | ||
| 208 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 209 | + <!-- 原价 --> | ||
| 210 | + <view class="price flex xc-ash line_th"> | ||
| 211 | + <view class="fs22">￥</view> | ||
| 212 | + <view class="fs22">{{item.market_price}}</view> | ||
| 213 | + </view> | ||
| 214 | + </view> | ||
| 215 | + </blocK> | ||
| 216 | + </block> | ||
| 217 | + <block wx:else> | ||
| 218 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 219 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 220 | + <view class="money flex" > | ||
| 221 | + <!-- 办卡价 --> | ||
| 222 | + <view class="flex xc-wc"> | ||
| 223 | + <view class="fs24 wz_red">￥</view> | ||
| 224 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 225 | + </view> | ||
| 226 | + <!-- 原价 --> | ||
| 227 | + <view class="price flex xc-ash line_th"> | ||
| 228 | + <view class="fs22">￥</view> | ||
| 229 | + <view class="fs22">{{item.market_price}}</view> | ||
| 230 | + </view> | ||
| 231 | + | ||
| 232 | + </view> | ||
| 233 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 234 | + <!-- 等级价 --> | ||
| 235 | + <view class="price flex ai_and"> | ||
| 236 | + <view class="fs22">￥</view> | ||
| 237 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 238 | + <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 239 | + </view> | ||
| 240 | + </view> | ||
| 241 | + </block> | ||
| 242 | + <block wx:else> | ||
| 243 | + <view class="money flex" > | ||
| 244 | + <!-- 办卡价 --> | ||
| 245 | + <view class="flex xc-wc"> | ||
| 246 | + <view class="fs24 wz_red">￥</view> | ||
| 247 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 248 | + </view> | ||
| 249 | + </view> | ||
| 250 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 251 | + <!-- 原价 --> | ||
| 252 | + <view class="price flex xc-ash line_th"> | ||
| 253 | + <view class="fs22">￥</view> | ||
| 254 | + <view class="fs22">{{item.market_price}}</view> | ||
| 255 | + </view> | ||
| 256 | + </view> | ||
| 257 | + </block> | ||
| 258 | + </block> | ||
| 259 | + </block> | ||
| 260 | + <block wx:else> | ||
| 261 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 262 | + <view class='del'>￥{{item.market_price}}</view> | ||
| 263 | + </block> | ||
| 264 | + </block> | ||
| 647 | </view> | 265 | </view> |
| 648 | <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | 266 | <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> |
| 649 | - | ||
| 650 | </view> | 267 | </view> |
| 651 | </view> | 268 | </view> |
| 652 | </view> | 269 | </view> |
| @@ -654,46 +271,34 @@ | @@ -654,46 +271,34 @@ | ||
| 654 | </view> | 271 | </view> |
| 655 | </navigator> | 272 | </navigator> |
| 656 | </block> | 273 | </block> |
| 657 | - | ||
| 658 | -<view class="clear"></view> | 274 | + <view class="clear"></view> |
| 659 | </block> | 275 | </block> |
| 660 | - | ||
| 661 | <!--3个一列--> | 276 | <!--3个一列--> |
| 662 | -<!--左上角--> | ||
| 663 | -<block wx:if='{{object.column==3 && object.position==1}}'> | ||
| 664 | -<view class="zwp_3"> | 277 | +<block wx:if='{{object.column==3}}'> |
| 278 | + <view class="zwp_3"> | ||
| 665 | <block wx:for="{{goods_array}}" > | 279 | <block wx:for="{{goods_array}}" > |
| 666 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | 280 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> |
| 667 | <view class="zs_goods_wai_san" > | 281 | <view class="zs_goods_wai_san" > |
| 668 | <view class="zs_goods_san"> | 282 | <view class="zs_goods_san"> |
| 669 | <view class='zs_goods_3l'> | 283 | <view class='zs_goods_3l'> |
| 670 | - <view class='zs_top_3l'> | ||
| 671 | - <block> | ||
| 672 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | 284 | + <view class='zs_top_3l rel'> |
| 285 | + <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 673 | binderror="bind_bnerr3"></image> | 286 | binderror="bind_bnerr3"></image> |
| 674 | - </block> | ||
| 675 | - | ||
| 676 | <block wx:if="{{object.goodicon==3}}"> | 287 | <block wx:if="{{object.goodicon==3}}"> |
| 677 | - <image class='zs_t1_3l' wx:if="{{ object.position==1}}" | ||
| 678 | - src='{{object.customicon}}'></image> | ||
| 679 | - <!-- <image class='zs_t1_3l' wx:if="{{object.styleicon==2 && object.position==1}}" | 288 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{ object.position==1}}" |
| 680 | src='{{object.customicon}}'></image> | 289 | src='{{object.customicon}}'></image> |
| 681 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==3 && object.position==1}}" | ||
| 682 | - src='{{object.customicon}}'></image> | ||
| 683 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==4 && object.position==1}}" | ||
| 684 | - src='{{object.customicon}}'></image> --> | ||
| 685 | </block> | 290 | </block> |
| 686 | <block wx:if="{{object.goodicon==1}}"> | 291 | <block wx:if="{{object.goodicon==1}}"> |
| 687 | - <image class='zs_t1_3l' src=''></image> | 292 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> |
| 688 | </block> | 293 | </block> |
| 689 | <block wx:if="{{object.goodicon==2}}"> | 294 | <block wx:if="{{object.goodicon==2}}"> |
| 690 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==1}}" | 295 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" |
| 691 | src='{{imghost}}/miniapp/images/Recommend.png'></image> | 296 | src='{{imghost}}/miniapp/images/Recommend.png'></image> |
| 692 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==2 }}" | 297 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" |
| 693 | src='{{imghost}}/miniapp/images/hot.png'></image> | 298 | src='{{imghost}}/miniapp/images/hot.png'></image> |
| 694 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==3}}" | 299 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" |
| 695 | src='{{imghost}}/miniapp/images/new.png'></image> | 300 | src='{{imghost}}/miniapp/images/new.png'></image> |
| 696 | - <image class='zs_t1_3l' wx:if="{{object.styleicon==4 }}" | 301 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" |
| 697 | src='{{imghost}}/miniapp/images/Promotion.png'></image> | 302 | src='{{imghost}}/miniapp/images/Promotion.png'></image> |
| 698 | </block> | 303 | </block> |
| 699 | </view> | 304 | </view> |
| @@ -702,8 +307,97 @@ | @@ -702,8 +307,97 @@ | ||
| 702 | 307 | ||
| 703 | <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | 308 | <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
| 704 | <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | 309 | <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> |
| 705 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 706 | - <view class='del'>￥{{item.market_price}}</view> | 310 | + <block wx:if="{{item.prom_price}}"> |
| 311 | + <view class='wz_red'>￥{{item.prom_price}}</view> | ||
| 312 | + <view class='del'>￥{{item.market_price}}</view> | ||
| 313 | + </block> | ||
| 314 | + <block wx:else> | ||
| 315 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
| 316 | + <!-- 当会员是等级卡的时候 --> | ||
| 317 | + <block wx:if="{{card_field}}"> | ||
| 318 | + <!-- 等级价>0 --> | ||
| 319 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 320 | + <view class="money flex" > | ||
| 321 | + <!-- 办卡价 --> | ||
| 322 | + <view class="flex xc-wc ai_and"> | ||
| 323 | + <view class="fs24 wz_red">￥</view> | ||
| 324 | + <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 325 | + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
| 326 | + </view> | ||
| 327 | + </view> | ||
| 328 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 329 | + <!-- 原价 --> | ||
| 330 | + <view class="price flex xc-ash line_th"> | ||
| 331 | + <view class="fs22">￥</view> | ||
| 332 | + <view class="fs22">{{item.market_price}}</view> | ||
| 333 | + </view> | ||
| 334 | + </view> | ||
| 335 | + </block> | ||
| 336 | + <blocK wx:else> | ||
| 337 | + <view class="money flex" > | ||
| 338 | + <!-- 办卡价 --> | ||
| 339 | + <view class="flex xc-wc"> | ||
| 340 | + <view class="fs24 wz_red">￥</view> | ||
| 341 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 342 | + </view> | ||
| 343 | + </view> | ||
| 344 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 345 | + <!-- 原价 --> | ||
| 346 | + <view class="price flex xc-ash line_th"> | ||
| 347 | + <view class="fs22">￥</view> | ||
| 348 | + <view class="fs22">{{item.market_price}}</view> | ||
| 349 | + </view> | ||
| 350 | + </view> | ||
| 351 | + </blocK> | ||
| 352 | + </block> | ||
| 353 | + <block wx:else> | ||
| 354 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 355 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 356 | + <view class="money flex" > | ||
| 357 | + <!-- 办卡价 --> | ||
| 358 | + <view class="flex xc-wc"> | ||
| 359 | + <view class="fs24 wz_red">￥</view> | ||
| 360 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 361 | + </view> | ||
| 362 | + <!-- 原价 --> | ||
| 363 | + <view class="price flex xc-ash line_th"> | ||
| 364 | + <view class="fs22">￥</view> | ||
| 365 | + <view class="fs22">{{item.market_price}}</view> | ||
| 366 | + </view> | ||
| 367 | + | ||
| 368 | + </view> | ||
| 369 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 370 | + <!-- 等级价 --> | ||
| 371 | + <view class="price flex ai_and"> | ||
| 372 | + <view class="fs22">￥</view> | ||
| 373 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 374 | + <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 375 | + </view> | ||
| 376 | + </view> | ||
| 377 | + </block> | ||
| 378 | + <block wx:else> | ||
| 379 | + <view class="money flex" > | ||
| 380 | + <!-- 办卡价 --> | ||
| 381 | + <view class="flex xc-wc"> | ||
| 382 | + <view class="fs24 wz_red">￥</view> | ||
| 383 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 384 | + </view> | ||
| 385 | + </view> | ||
| 386 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 387 | + <!-- 原价 --> | ||
| 388 | + <view class="price flex xc-ash line_th"> | ||
| 389 | + <view class="fs22">￥</view> | ||
| 390 | + <view class="fs22">{{item.market_price}}</view> | ||
| 391 | + </view> | ||
| 392 | + </view> | ||
| 393 | + </block> | ||
| 394 | + </block> | ||
| 395 | + </block> | ||
| 396 | + <block wx:else> | ||
| 397 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 398 | + <view class='del'>￥{{item.market_price}}</view> | ||
| 399 | + </block> | ||
| 400 | + </block> | ||
| 707 | </view> | 401 | </view> |
| 708 | <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | 402 | <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> |
| 709 | </view> | 403 | </view> |
| @@ -713,212 +407,145 @@ | @@ -713,212 +407,145 @@ | ||
| 713 | </navigator> | 407 | </navigator> |
| 714 | </block> | 408 | </block> |
| 715 | </view> | 409 | </view> |
| 716 | -<view class="clear"></view> | 410 | + <view class="clear"></view> |
| 717 | </block> | 411 | </block> |
| 718 | -<!--右上角--> | ||
| 719 | -<block wx:if='{{object.column==3 && object.position==2}}'> | ||
| 720 | -<block wx:for="{{goods_array}}" > | ||
| 721 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 722 | - <view class="zs_goods_wai_san" > | ||
| 723 | - <view class="zs_goods_san"> | ||
| 724 | - <view class='zs_goods_3l'> | ||
| 725 | - <view class='zs_top_3l'> | ||
| 726 | - <!--<image class='zs_t_img_3l'></image>--> | ||
| 727 | - <block> | ||
| 728 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 729 | - binderror="bind_bnerr3"></image> | ||
| 730 | - </block> | ||
| 731 | - | ||
| 732 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 733 | - <image class='zs_t2_3l' wx:if="{{ object.position==2}}" | ||
| 734 | - src='{{object.customicon}}'></image> | ||
| 735 | - <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==2 && object.position==2}}"--> | ||
| 736 | - <!--src='{{object.customicon}}'></image>--> | ||
| 737 | - <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==3 && object.position==2}}"--> | ||
| 738 | - <!--src='{{object.customicon}}'></image>--> | ||
| 739 | - <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==4 && object.position==2}}"--> | ||
| 740 | - <!--src='{{object.customicon}}'></image>--> | ||
| 741 | - </block> | ||
| 742 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 743 | - <image class='zs_t2_3l' src=''></image> | ||
| 744 | - </block> | ||
| 745 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 746 | - <image class='zs_t2_3l' wx:if="{{object.styleicon==1}}" | ||
| 747 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 748 | - <image class='zs_t2_3l' wx:if="{{object.styleicon==2 }}" | ||
| 749 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 750 | - <image class='zs_t2_3l' wx:if="{{object.styleicon==3}}" | ||
| 751 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 752 | - <image class='zs_t2_3l' wx:if="{{object.styleicon==4 }}" | ||
| 753 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 754 | - </block> | ||
| 755 | - </view> | ||
| 756 | - <view class='zs_center_3l'> | ||
| 757 | - | ||
| 758 | - | ||
| 759 | - <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 760 | - <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 761 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 762 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 763 | - </view> | ||
| 764 | - <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 765 | - | ||
| 766 | - <!--<view class='zs_wz3_3l'>美妆价：¥9.00</view>--> | ||
| 767 | - <!--<view class='zs_wz4_3l'>等级价：¥8.00</view>--> | 412 | +<!-- 列表显示 --> |
| 413 | +<view class="zs_goods_xiao_wai" wx:if='{{object.column==4 }}'> | ||
| 414 | + <block wx:for="{{goods_array}}" > | ||
| 415 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 416 | + <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > | ||
| 417 | + <view class='zs_top_x'> | ||
| 418 | + <!--<image class='zs_t_img_x'></image>--> | ||
| 419 | + <block> | ||
| 420 | + <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 421 | + binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> | ||
| 422 | + </block> | ||
| 768 | 423 | ||
| 769 | - </view> | 424 | + <block wx:if="{{object.goodicon==3}}"> |
| 425 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==2}}" | ||
| 426 | + src='{{object.customicon}}'></image> | ||
| 427 | + </block> | ||
| 428 | + <block wx:if="{{object.goodicon==1}}"> | ||
| 429 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 430 | + </block> | ||
| 431 | + <block wx:if="{{object.goodicon==2}}"> | ||
| 432 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" | ||
| 433 | + src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 434 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" | ||
| 435 | + src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 436 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" | ||
| 437 | + src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 438 | + <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" | ||
| 439 | + src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 440 | + </block> | ||
| 770 | </view> | 441 | </view> |
| 771 | - </view> | ||
| 772 | - </view> | ||
| 773 | - </navigator> | ||
| 774 | -</block> | ||
| 775 | -<view class="clear"></view> | ||
| 776 | -</block> | ||
| 777 | -<!--右下角--> | ||
| 778 | - | ||
| 779 | -<block wx:if='{{object.column==3 && object.position==4}}'> | ||
| 780 | -<block wx:for="{{goods_array}}" > | ||
| 781 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 782 | - <view class="zs_goods_wai_san" > | ||
| 783 | - <view class="zs_goods_san"> | ||
| 784 | - <view class='zs_goods_3l'> | ||
| 785 | - <view class='zs_top_3l'> | ||
| 786 | 442 | ||
| 787 | - <block> | ||
| 788 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 789 | - binderror="bind_bnerr3"></image> | 443 | + <view class='zs_center_x'> |
| 444 | + <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 445 | + <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 446 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
| 447 | + <!-- 当会员是等级卡的时候 --> | ||
| 448 | + <block wx:if="{{card_field}}"> | ||
| 449 | + <!-- 等级价>0 --> | ||
| 450 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 451 | + <view class="money flex" > | ||
| 452 | + <!-- 办卡价 --> | ||
| 453 | + <view class="flex xc-wc ai_and"> | ||
| 454 | + <view class="fs24 wz_red">￥</view> | ||
| 455 | + <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 456 | + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
| 457 | + </view> | ||
| 458 | + </view> | ||
| 459 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 460 | + <!-- 原价 --> | ||
| 461 | + <view class="price flex xc-ash line_th"> | ||
| 462 | + <view class="fs22">￥</view> | ||
| 463 | + <view class="fs22">{{item.market_price}}</view> | ||
| 464 | + </view> | ||
| 465 | + </view> | ||
| 466 | + </block> | ||
| 467 | + <blocK wx:else> | ||
| 468 | + <view class="money flex" > | ||
| 469 | + <!-- 办卡价 --> | ||
| 470 | + <view class="flex xc-wc"> | ||
| 471 | + <view class="fs24">￥</view> | ||
| 472 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 473 | + </view> | ||
| 474 | + </view> | ||
| 475 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 476 | + <!-- 原价 --> | ||
| 477 | + <view class="price flex xc-ash line_th"> | ||
| 478 | + <view class="fs22">￥</view> | ||
| 479 | + <view class="fs22">{{item.market_price}}</view> | ||
| 480 | + </view> | ||
| 481 | + </view> | ||
| 482 | + </blocK> | ||
| 483 | + </block> | ||
| 484 | + <block wx:else> | ||
| 485 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 486 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 487 | + <view class="money flex" > | ||
| 488 | + <!-- 办卡价 --> | ||
| 489 | + <view class="flex xc-wc"> | ||
| 490 | + <view class="fs24">￥</view> | ||
| 491 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 492 | + </view> | ||
| 493 | + <!-- 原价 --> | ||
| 494 | + <view class="price flex xc-ash line_th"> | ||
| 495 | + <view class="fs22">￥</view> | ||
| 496 | + <view class="fs22">{{item.market_price}}</view> | ||
| 497 | + </view> | ||
| 498 | + | ||
| 499 | + </view> | ||
| 500 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 501 | + <!-- 等级价 --> | ||
| 502 | + <view class="price flex ai_and"> | ||
| 503 | + <view class="fs22">￥</view> | ||
| 504 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 505 | + <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 506 | + </view> | ||
| 507 | + </view> | ||
| 508 | + </block> | ||
| 509 | + <block wx:else> | ||
| 510 | + <view class="money flex" > | ||
| 511 | + <!-- 办卡价 --> | ||
| 512 | + <view class="flex xc-wc"> | ||
| 513 | + <view class="fs24 wz_red">￥</view> | ||
| 514 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 515 | + </view> | ||
| 516 | + </view> | ||
| 517 | + <view class="flex" style="line-height: 28rpx;" > | ||
| 518 | + <!-- 原价 --> | ||
| 519 | + <view class="price flex xc-ash line_th"> | ||
| 520 | + <view class="fs22">￥</view> | ||
| 521 | + <view class="fs22">{{item.market_price}}</view> | ||
| 522 | + </view> | ||
| 523 | + </view> | ||
| 524 | + </block> | ||
| 525 | + </block> | ||
| 790 | </block> | 526 | </block> |
| 791 | 527 | ||
| 792 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 793 | - <image class='zs_t3_3l' wx:if="{{ object.position==4}}" | ||
| 794 | - src='{{object.customicon}}'></image> | ||
| 795 | - <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==2 && object.position==3}}"--> | ||
| 796 | - <!--src='{{object.customicon}}'></image>--> | ||
| 797 | - <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==3 && object.position==3}}"--> | ||
| 798 | - <!--src='{{object.customicon}}'></image>--> | ||
| 799 | - <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==4 && object.position==3}}"--> | ||
| 800 | - <!--src='{{object.customicon}}'></image>--> | ||
| 801 | - </block> | ||
| 802 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 803 | - <image class='zs_t3_3l' src=''></image> | ||
| 804 | - </block> | ||
| 805 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 806 | - <image class='zs_t3_3l' wx:if="{{object.styleicon==1}}" | ||
| 807 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 808 | - <image class='zs_t3_3l' wx:if="{{object.styleicon==2 }}" | ||
| 809 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 810 | - <image class='zs_t3_3l' wx:if="{{object.styleicon==3}}" | ||
| 811 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 812 | - <image class='zs_t3_3l' wx:if="{{object.styleicon==4 }}" | ||
| 813 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | 528 | + <block wx:else> |
| 529 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 530 | + <view class='del'>￥{{item.market_price}}</view> | ||
| 814 | </block> | 531 | </block> |
| 815 | </view> | 532 | </view> |
| 816 | - <view class='zs_center_3l'> | ||
| 817 | - | ||
| 818 | - | ||
| 819 | - <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 820 | - <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 821 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 822 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 823 | - </view> | ||
| 824 | - <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 825 | - <!--<view class='zs_wz3_3l'>美妆价：¥9.00</view>--> | ||
| 826 | - <!--<view class='zs_wz4_3l'>等级价：¥8.00</view>--> | ||
| 827 | - </view> | 533 | + <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> |
| 828 | </view> | 534 | </view> |
| 829 | - </view> | ||
| 830 | - | ||
| 831 | - </view> | ||
| 832 | - </navigator> | ||
| 833 | -</block> | ||
| 834 | - | ||
| 835 | - | ||
| 836 | -<view class="clear"></view> | ||
| 837 | -</block> | ||
| 838 | -<!--左下角--> | ||
| 839 | -<block wx:if='{{object.column==3 && object.position==3}}'> | ||
| 840 | -<block wx:for="{{goods_array}}" > | ||
| 841 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> | ||
| 842 | - <view class="zs_goods_wai_san" > | ||
| 843 | - <view class="zs_goods_san"> | ||
| 844 | - <view class='zs_goods_3l'> | ||
| 845 | - | ||
| 846 | - <view class='zs_top_3l'> | ||
| 847 | - | ||
| 848 | - <block> | ||
| 849 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" | ||
| 850 | - binderror="bind_bnerr3"></image> | ||
| 851 | - </block> | ||
| 852 | - | ||
| 853 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 854 | - <image class='zs_t4_3l' wx:if="{{object.position==3}}" | ||
| 855 | - src='{{object.customicon}}'></image> | ||
| 856 | - <!--<image class='zs_t4_3l' wx:if="{{ object.position==4}}"--> | ||
| 857 | - <!--src='{{object.customicon}}'></image>--> | ||
| 858 | - <!--<image class='zs_t4_3l' wx:if="{{object.position==4}}"--> | ||
| 859 | - <!--src='{{object.customicon}}'></image>--> | ||
| 860 | - <!--<image class='zs_t4_3l' wx:if="{{ object.position==4}}"--> | ||
| 861 | - <!--src='{{object.customicon}}'></image>--> | ||
| 862 | - </block> | ||
| 863 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 864 | - <image class='zs_t4_3l' src=''></image> | ||
| 865 | - </block> | ||
| 866 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 867 | - <image class='zs_t4_3l' wx:if="{{object.styleicon==1}}" | ||
| 868 | - src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 869 | - <image class='zs_t4_3l' wx:if="{{object.styleicon==2 }}" | ||
| 870 | - src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 871 | - <image class='zs_t4_3l' wx:if="{{object.styleicon==3}}" | ||
| 872 | - src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 873 | - <image class='zs_t4_3l' wx:if="{{object.styleicon==4 }}" | ||
| 874 | - src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 875 | - </block> | ||
| 876 | - </view> | ||
| 877 | - | ||
| 878 | - <view class='zs_center_3l'> | ||
| 879 | 535 | ||
| 880 | - <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 881 | - <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 882 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 883 | - <view class='del'>￥{{item.market_price}}</view> | ||
| 884 | - </view> | ||
| 885 | - <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 886 | - | ||
| 887 | - | ||
| 888 | - </view> | ||
| 889 | - | ||
| 890 | - | ||
| 891 | - </view> | ||
| 892 | </view> | 536 | </view> |
| 893 | - | ||
| 894 | - </view> | ||
| 895 | - </navigator> | ||
| 896 | -</block> | ||
| 897 | -<view class="clear"></view> | ||
| 898 | -</block> | ||
| 899 | - | ||
| 900 | - | ||
| 901 | -<!-- <block wx:if="{{object.classstyle=='2' }}"> | ||
| 902 | -<view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> | ||
| 903 | - <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> | ||
| 904 | - {{loadText}} | ||
| 905 | - </button> | 537 | + </navigator> |
| 538 | + </block> | ||
| 539 | + <view class="clear"></view> | ||
| 906 | </view> | 540 | </view> |
| 907 | -</block> --> | ||
| 908 | 541 | ||
| 909 | -<block wx:if="{{object.classstyle=='1' }}"> | ||
| 910 | -<view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> | 542 | +<block wx:if="{{object.classstyle=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> |
| 911 | <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> | 543 | <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> |
| 912 | {{loadText}} | 544 | {{loadText}} |
| 913 | </button> | 545 | </button> |
| 914 | -</view> | ||
| 915 | -</block> | ||
| 916 | - | 546 | +</view></block> |
| 917 | <block wx:if="{{object.classstyle!='1' }}"> | 547 | <block wx:if="{{object.classstyle!='1' }}"> |
| 918 | - <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> | ||
| 919 | - <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> | ||
| 920 | - {{loadText}} | ||
| 921 | - </button> | ||
| 922 | -</view> | ||
| 923 | - | ||
| 924 | - </block> | ||
| 925 | \ No newline at end of file | 548 | \ No newline at end of file |
| 549 | + <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> | ||
| 550 | + <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button> | ||
| 551 | + </view> | ||
| 552 | +</block> | ||
| 926 | \ No newline at end of file | 553 | \ 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 | ||
| 3 | -.zs_goods{ | ||
| 4 | - width: 100%; | ||
| 5 | - min-height: 500rpx; | ||
| 6 | -border: 2rpx #ddd solid; | ||
| 7 | -margin: 0 auto; | 3 | +.zwp_3 { |
| 4 | + margin-top: 10rpx; | ||
| 8 | } | 5 | } |
| 9 | 6 | ||
| 10 | -.zwp_3{ | ||
| 11 | - /* width: 30%; */ | 7 | +.zs_goods { |
| 8 | + width: 700rpx; | ||
| 9 | + border: 1rpx #ddd solid; | ||
| 10 | + margin-bottom: 10rpx; | ||
| 11 | + margin: 0 auto; | ||
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | -.s1_gk_a1{ | 14 | +.s1_gk_a1 { |
| 15 | display: inline; | 15 | display: inline; |
| 16 | width: auto; | 16 | width: auto; |
| 17 | height: auto; | 17 | height: auto; |
| 18 | } | 18 | } |
| 19 | -.clear{ | 19 | + |
| 20 | +.clear { | ||
| 20 | clear: both; | 21 | clear: both; |
| 21 | } | 22 | } |
| 22 | -.zs_top{ | 23 | + |
| 24 | +.zs_top { | ||
| 23 | width: 100%; | 25 | width: 100%; |
| 24 | min-height: 700rpx; | 26 | min-height: 700rpx; |
| 25 | margin: 0 auto; | 27 | margin: 0 auto; |
| 26 | - padding-left:22rpx; | ||
| 27 | -padding-bottom:30rpx; | ||
| 28 | - | ||
| 29 | -display: flex; | ||
| 30 | -/* padding-left: 6rpx; */ | ||
| 31 | -/* padding-right: 30rpx; */ | 28 | + margin-bottom: 30rpx; |
| 29 | + display: flex; | ||
| 32 | } | 30 | } |
| 33 | 31 | ||
| 34 | .zs_t_img { | 32 | .zs_t_img { |
| 35 | - width: 700rpx; | ||
| 36 | - height: 700rpx; | ||
| 37 | - /* margin: 0 auto; */ | ||
| 38 | - /* background-color: bisque; */ | ||
| 39 | - | 33 | + width: 698rpx; |
| 34 | + height: 698rpx; | ||
| 35 | + margin: 1rpx auto; | ||
| 40 | } | 36 | } |
| 41 | 37 | ||
| 42 | -.zs_center{ | ||
| 43 | - width: 100%; | ||
| 44 | - min-height: 200rpx; | ||
| 45 | - font-size: 28rpx; | ||
| 46 | - color: #333; | ||
| 47 | - text-align: left; | ||
| 48 | - margin-left: 25rpx; | ||
| 49 | - padding: 0 10rpx; | 38 | +.zs_center { |
| 39 | + width: 100%; | ||
| 40 | + min-height: 200rpx; | ||
| 41 | + font-size: 28rpx; | ||
| 42 | + color: #333; | ||
| 43 | + text-align: left; | ||
| 44 | + margin-left: 25rpx; | ||
| 45 | + padding: 0 10rpx; | ||
| 50 | } | 46 | } |
| 51 | 47 | ||
| 52 | -.zs_wz1{ | 48 | +.zs_wz1 { |
| 53 | overflow: hidden; | 49 | overflow: hidden; |
| 54 | - text-overflow: ellipsis; | ||
| 55 | - margin-bottom:10rpx; | ||
| 56 | -font-size:28rpx; | ||
| 57 | - white-space: nowrap; | 50 | + text-overflow: ellipsis; |
| 51 | + margin-bottom: 10rpx; | ||
| 52 | + font-size: 28rpx; | ||
| 53 | + white-space: nowrap; | ||
| 54 | + width: 640rpx; | ||
| 58 | } | 55 | } |
| 59 | 56 | ||
| 60 | - | ||
| 61 | -.zs_wz2{ | 57 | +.zs_wz2 { |
| 62 | overflow: hidden; | 58 | overflow: hidden; |
| 63 | - text-overflow: ellipsis; | ||
| 64 | - margin-bottom:10rpx; | ||
| 65 | -font-size:28rpx; | ||
| 66 | - white-space: nowrap; | 59 | + text-overflow: ellipsis; |
| 60 | + margin-bottom: 10rpx; | ||
| 61 | + font-size: 28rpx; | ||
| 62 | + white-space: nowrap; | ||
| 67 | } | 63 | } |
| 68 | 64 | ||
| 69 | -.zs_wz3{ | 65 | +.zs_wz3 { |
| 70 | overflow: hidden; | 66 | overflow: hidden; |
| 71 | - text-overflow: ellipsis; | ||
| 72 | - margin-bottom:10rpx; | ||
| 73 | -font-size:28rpx; | ||
| 74 | - white-space: nowrap; | 67 | + text-overflow: ellipsis; |
| 68 | + margin-bottom: 10rpx; | ||
| 69 | + font-size: 28rpx; | ||
| 70 | + white-space: nowrap; | ||
| 75 | } | 71 | } |
| 76 | 72 | ||
| 77 | -.zs_wz4{ | 73 | +.zs_wz4 { |
| 78 | overflow: hidden; | 74 | overflow: hidden; |
| 79 | - text-overflow: ellipsis; | ||
| 80 | - margin-bottom:10rpx; | ||
| 81 | -font-size:28rpx; | ||
| 82 | - white-space: nowrap; | 75 | + text-overflow: ellipsis; |
| 76 | + margin-bottom: 10rpx; | ||
| 77 | + font-size: 28rpx; | ||
| 78 | + white-space: nowrap; | ||
| 83 | } | 79 | } |
| 84 | 80 | ||
| 85 | -.zs_wz5{ | 81 | +.zs_wz5 { |
| 86 | overflow: hidden; | 82 | overflow: hidden; |
| 87 | - text-overflow: ellipsis; | ||
| 88 | - font-size:30rpx; | ||
| 89 | - white-space: nowrap; | ||
| 90 | -} | ||
| 91 | - | ||
| 92 | -.wz_red{ | ||
| 93 | - | ||
| 94 | - color: #C4182E; | ||
| 95 | - font-size: 32rpx; | 83 | + text-overflow: ellipsis; |
| 84 | + font-size: 30rpx; | ||
| 85 | + white-space: nowrap; | ||
| 96 | } | 86 | } |
| 97 | 87 | ||
| 98 | -.del{ | ||
| 99 | - font-size: 24rpx; | ||
| 100 | - color: #999; | ||
| 101 | - text-decoration: line-through; | 88 | +.wz_red { |
| 89 | + color: #c4182e; | ||
| 90 | + font-size: 32rpx; | ||
| 102 | } | 91 | } |
| 103 | 92 | ||
| 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 | - | ||
| 113 | -.zs_t2{ | 101 | +.zs_t2 { |
| 114 | width: 56rpx; | 102 | width: 56rpx; |
| 115 | height: 56rpx; | 103 | height: 56rpx; |
| 116 | - position: relative; | ||
| 117 | - right: 58rpx; | ||
| 118 | - bottom: -2rpx; | 104 | + position: absolute; |
| 105 | + right: 0rpx; | ||
| 106 | + top: 10rpx; | ||
| 119 | } | 107 | } |
| 120 | 108 | ||
| 121 | -.zs_t3{ | 109 | +.zs_t3 { |
| 122 | width: 56rpx; | 110 | width: 56rpx; |
| 123 | height: 56rpx; | 111 | height: 56rpx; |
| 124 | - position: relative; | ||
| 125 | - right: 692rpx; | ||
| 126 | - bottom: -4rpx; | 112 | + position: absolute; |
| 113 | + left: 0rpx; | ||
| 114 | + bottom: 10rpx; | ||
| 127 | } | 115 | } |
| 128 | 116 | ||
| 129 | - | ||
| 130 | -.zs_t4{ | 117 | +.zs_t4 { |
| 131 | width: 56rpx; | 118 | width: 56rpx; |
| 132 | height: 56rpx; | 119 | height: 56rpx; |
| 133 | - position: relative; | ||
| 134 | - right: 692rpx; | ||
| 135 | - bottom: -642rpx; | 120 | + position: absolute; |
| 121 | + right: 20rpx; | ||
| 122 | + bottom: 10rpx; | ||
| 136 | } | 123 | } |
| 137 | 124 | ||
| 138 | - | ||
| 139 | - | ||
| 140 | - | ||
| 141 | -/* xiao */ | ||
| 142 | - | ||
| 143 | - | ||
| 144 | -.zs_goods_xiao_bottom{ | 125 | +.zs_goods_xiao_bottom { |
| 145 | width: 100%; | 126 | width: 100%; |
| 146 | min-height: 300rpx; | 127 | min-height: 300rpx; |
| 147 | - | ||
| 148 | display: flex; | 128 | display: flex; |
| 149 | border-bottom: 2rpx #eee solid; | 129 | border-bottom: 2rpx #eee solid; |
| 150 | padding: 10rpx; | 130 | padding: 10rpx; |
| 151 | background-color: white; | 131 | background-color: white; |
| 152 | - | ||
| 153 | } | 132 | } |
| 154 | 133 | ||
| 155 | -.zs_goods_xiao{ | 134 | +.zs_goods_xiao { |
| 156 | width: 100%; | 135 | width: 100%; |
| 157 | min-height: 300rpx; | 136 | min-height: 300rpx; |
| 158 | - | ||
| 159 | display: flex; | 137 | display: flex; |
| 160 | /* border-bottom: 2rpx #eee solid; */ | 138 | /* border-bottom: 2rpx #eee solid; */ |
| 161 | padding: 10rpx; | 139 | padding: 10rpx; |
| 162 | background-color: white; | 140 | background-color: white; |
| 163 | } | 141 | } |
| 164 | 142 | ||
| 165 | -.zs_top_x{ | 143 | +.zs_top_x { |
| 166 | width: 400rpx; | 144 | width: 400rpx; |
| 167 | height: 318rpx; | 145 | height: 318rpx; |
| 168 | - margin-top: 20rpx; | ||
| 169 | - /* /* padding-top:30rpx; | ||
| 170 | -padding-bottom:30rpx; */ | ||
| 171 | - | ||
| 172 | -display: flex; | ||
| 173 | - | 146 | + margin-top: 20rpx; |
| 147 | + display: flex; | ||
| 174 | } | 148 | } |
| 175 | 149 | ||
| 176 | -/* .zs_goods_xiao{ | ||
| 177 | - background-color: white; | ||
| 178 | -} */ | ||
| 179 | - | ||
| 180 | .zs_t_img_x { | 150 | .zs_t_img_x { |
| 181 | - width: 290rpx; | 151 | + width: 290rpx; |
| 182 | height: 290rpx; | 152 | height: 290rpx; |
| 183 | margin-left: 20rpx; | 153 | margin-left: 20rpx; |
| 184 | - /* background-color: bisque; */ | ||
| 185 | - | ||
| 186 | } | 154 | } |
| 187 | 155 | ||
| 188 | -.zs_center_x{ | ||
| 189 | - | 156 | +.zs_center_x { |
| 190 | width: 100%; | 157 | width: 100%; |
| 191 | min-height: 200rpx; | 158 | min-height: 200rpx; |
| 192 | font-size: 28rpx; | 159 | font-size: 28rpx; |
| 193 | color: #333; | 160 | color: #333; |
| 194 | text-align: left; | 161 | text-align: left; |
| 195 | margin-top: 30rpx; | 162 | margin-top: 30rpx; |
| 196 | - padding: 0 10rpx; | 163 | + padding: 0 10rpx; |
| 197 | } | 164 | } |
| 198 | 165 | ||
| 199 | -.zs_wz1_x{ | 166 | +.zs_wz1_x { |
| 200 | overflow: hidden; | 167 | overflow: hidden; |
| 201 | - text-overflow: ellipsis; | ||
| 202 | - margin-bottom:10rpx; | ||
| 203 | -font-size:28rpx; | ||
| 204 | - white-space: nowrap; | ||
| 205 | - width: 80%; | 168 | + text-overflow: ellipsis; |
| 169 | + margin-bottom: 10rpx; | ||
| 170 | + font-size: 28rpx; | ||
| 171 | + white-space: nowrap; | ||
| 172 | + width: 80%; | ||
| 206 | } | 173 | } |
| 207 | 174 | ||
| 208 | - | ||
| 209 | -.zs_wz2_x{ | 175 | +.zs_wz2_x { |
| 210 | overflow: hidden; | 176 | overflow: hidden; |
| 211 | - text-overflow: ellipsis; | ||
| 212 | - margin-bottom:10rpx; | ||
| 213 | -font-size:28rpx; | ||
| 214 | - white-space: nowrap; | 177 | + text-overflow: ellipsis; |
| 178 | + margin-bottom: 10rpx; | ||
| 179 | + font-size: 28rpx; | ||
| 180 | + white-space: nowrap; | ||
| 215 | } | 181 | } |
| 216 | 182 | ||
| 217 | -.zs_wz3_x{ | 183 | +.zs_wz3_x { |
| 218 | overflow: hidden; | 184 | overflow: hidden; |
| 219 | - text-overflow: ellipsis; | ||
| 220 | - margin-bottom:10rpx; | ||
| 221 | -font-size:28rpx; | ||
| 222 | - white-space: nowrap; | 185 | + text-overflow: ellipsis; |
| 186 | + margin-bottom: 10rpx; | ||
| 187 | + font-size: 28rpx; | ||
| 188 | + white-space: nowrap; | ||
| 223 | } | 189 | } |
| 224 | 190 | ||
| 225 | -.zs_wz4_x{ | 191 | +.zs_wz4_x { |
| 226 | overflow: hidden; | 192 | overflow: hidden; |
| 227 | - text-overflow: ellipsis; | ||
| 228 | - margin-bottom:10rpx; | ||
| 229 | -font-size:28rpx; | ||
| 230 | - white-space: nowrap; | 193 | + text-overflow: ellipsis; |
| 194 | + margin-bottom: 10rpx; | ||
| 195 | + font-size: 28rpx; | ||
| 196 | + white-space: nowrap; | ||
| 231 | } | 197 | } |
| 232 | 198 | ||
| 233 | -.zs_wz5_x{ | 199 | +.zs_wz5_x { |
| 234 | overflow: hidden; | 200 | overflow: hidden; |
| 235 | - text-overflow: ellipsis; | ||
| 236 | - font-size:30rpx; | ||
| 237 | - white-space: nowrap; | 201 | + text-overflow: ellipsis; |
| 202 | + font-size: 30rpx; | ||
| 203 | + white-space: nowrap; | ||
| 238 | } | 204 | } |
| 239 | 205 | ||
| 240 | -.wz_red{ | ||
| 241 | - color: #C4182E; | ||
| 242 | - font-size: 32rpx; | 206 | +.wz_red { |
| 207 | + color: #c4182e; | ||
| 208 | + font-size: 32rpx; | ||
| 243 | } | 209 | } |
| 244 | 210 | ||
| 245 | -.del{ | ||
| 246 | - font-size: 24rpx; | ||
| 247 | - color: #999; | ||
| 248 | - text-decoration: line-through; | ||
| 249 | - margin-left: 10rpx; | ||
| 250 | - margin-top: 8rpx; | 211 | +.del { |
| 212 | + font-size: 24rpx; | ||
| 213 | + color: #999; | ||
| 214 | + text-decoration: line-through; | ||
| 215 | + margin-top: 8rpx; | ||
| 251 | } | 216 | } |
| 252 | 217 | ||
| 253 | -.zs_t1_x{ | 218 | +.zs_t1_x { |
| 254 | width: 56rpx; | 219 | width: 56rpx; |
| 255 | height: 56rpx; | 220 | height: 56rpx; |
| 256 | position: relative; | 221 | position: relative; |
| 257 | right: 62rpx; | 222 | right: 62rpx; |
| 258 | -top: 6rpx; | 223 | + top: 6rpx; |
| 259 | } | 224 | } |
| 260 | 225 | ||
| 261 | -.zs_t1_x1{ | ||
| 262 | - width: 56rpx; | 226 | +.zs_t1_x1 { |
| 227 | + width: 56rpx; | ||
| 263 | height: 56rpx; | 228 | height: 56rpx; |
| 264 | position: relative; | 229 | position: relative; |
| 265 | right: 285rpx; | 230 | right: 285rpx; |
| 266 | -top: 6rpx; | 231 | + top: 6rpx; |
| 267 | } | 232 | } |
| 268 | 233 | ||
| 269 | -.zs_t1_x2{ | ||
| 270 | - width: 56rpx; | 234 | +.zs_t1_x2 { |
| 235 | + width: 56rpx; | ||
| 271 | height: 56rpx; | 236 | height: 56rpx; |
| 272 | position: relative; | 237 | position: relative; |
| 273 | right: 56rpx; | 238 | right: 56rpx; |
| 274 | -top: 234rpx; | 239 | + top: 234rpx; |
| 275 | } | 240 | } |
| 276 | 241 | ||
| 277 | - | ||
| 278 | -.zs_t1_x3{ | ||
| 279 | - width: 56rpx; | 242 | +.zs_t1_x3 { |
| 243 | + width: 56rpx; | ||
| 280 | height: 56rpx; | 244 | height: 56rpx; |
| 281 | position: relative; | 245 | position: relative; |
| 282 | right: 288rpx; | 246 | right: 288rpx; |
| 283 | -top: 234rpx; | 247 | + top: 234rpx; |
| 284 | } | 248 | } |
| 285 | 249 | ||
| 286 | /*1列2个*/ | 250 | /*1列2个*/ |
| 287 | 251 | ||
| 288 | -.zs_goods_ban{ | 252 | +.zs_goods_ban { |
| 289 | width: 100%; | 253 | width: 100%; |
| 290 | min-height: 300rpx; | 254 | min-height: 300rpx; |
| 291 | } | 255 | } |
| 292 | 256 | ||
| 293 | -.zs_goods_wai_ban{ | 257 | +.zs_goods_wai_ban { |
| 294 | display: flex; | 258 | display: flex; |
| 295 | /* padding-left: 2rpx; */ | 259 | /* padding-left: 2rpx; */ |
| 296 | margin-bottom: 12rpx; | 260 | margin-bottom: 12rpx; |
| 297 | width: 48.5%; | 261 | width: 48.5%; |
| 298 | float: left; | 262 | float: left; |
| 299 | background: #fff; | 263 | background: #fff; |
| 300 | - margin-left: 1% | 264 | + margin-left: 1%; |
| 301 | } | 265 | } |
| 302 | 266 | ||
| 303 | - | ||
| 304 | -.zs_goods_2l{ | 267 | +.zs_goods_2l { |
| 305 | width: 94%; | 268 | width: 94%; |
| 306 | min-height: 300rpx; | 269 | min-height: 300rpx; |
| 307 | /* border: 2rpx #ddd solid; */ | 270 | /* border: 2rpx #ddd solid; */ |
| 308 | margin: 0 auto; | 271 | margin: 0 auto; |
| 309 | - padding: 2rpx; | 272 | + padding: 2rpx; |
| 310 | } | 273 | } |
| 311 | 274 | ||
| 312 | -.zs_top_2l{ | 275 | +.zs_top_2l { |
| 313 | width: 340rpx; | 276 | width: 340rpx; |
| 314 | height: 340rpx; | 277 | height: 340rpx; |
| 315 | } | 278 | } |
| @@ -319,124 +282,117 @@ top: 234rpx; | @@ -319,124 +282,117 @@ top: 234rpx; | ||
| 319 | border: none; | 282 | border: none; |
| 320 | } | 283 | } |
| 321 | 284 | ||
| 322 | - | ||
| 323 | .zs_t_img_2l { | 285 | .zs_t_img_2l { |
| 324 | width: 100%; | 286 | width: 100%; |
| 325 | height: 100%; | 287 | height: 100%; |
| 326 | margin: 0 auto; | 288 | margin: 0 auto; |
| 327 | } | 289 | } |
| 328 | 290 | ||
| 329 | -.zs_center_2l{ | 291 | +.zs_center_2l { |
| 330 | width: 100%; | 292 | width: 100%; |
| 331 | min-height: 200rpx; | 293 | min-height: 200rpx; |
| 332 | font-size: 28rpx; | 294 | font-size: 28rpx; |
| 333 | color: #333; | 295 | color: #333; |
| 334 | text-align: left; | 296 | text-align: left; |
| 335 | - padding: 0 10rpx; | 297 | + padding: 0 10rpx; |
| 336 | } | 298 | } |
| 337 | 299 | ||
| 338 | -.zs_wz1_2l{ | 300 | +.zs_wz1_2l { |
| 339 | overflow: hidden; | 301 | overflow: hidden; |
| 340 | text-overflow: ellipsis; | 302 | text-overflow: ellipsis; |
| 341 | - margin-bottom:10rpx; | ||
| 342 | - font-size:30rpx; | 303 | + margin-bottom: 10rpx; |
| 304 | + font-size: 30rpx; | ||
| 343 | white-space: nowrap; | 305 | white-space: nowrap; |
| 344 | margin-top: 10rpx; | 306 | margin-top: 10rpx; |
| 345 | } | 307 | } |
| 346 | 308 | ||
| 347 | - | ||
| 348 | -.zs_wz2_2l{ | 309 | +.zs_wz2_2l { |
| 349 | overflow: hidden; | 310 | overflow: hidden; |
| 350 | text-overflow: ellipsis; | 311 | text-overflow: ellipsis; |
| 351 | - margin-bottom:10rpx; | ||
| 352 | - font-size:30rpx; | 312 | + margin-bottom: 10rpx; |
| 313 | + font-size: 30rpx; | ||
| 353 | white-space: nowrap; | 314 | white-space: nowrap; |
| 354 | margin-top: 10rpx; | 315 | margin-top: 10rpx; |
| 316 | + height: 80rpx; | ||
| 317 | + line-height: 40rpx; | ||
| 355 | } | 318 | } |
| 356 | 319 | ||
| 357 | -.zs_wz3_2l{ | 320 | +.zs_wz3_2l { |
| 358 | overflow: hidden; | 321 | overflow: hidden; |
| 359 | text-overflow: ellipsis; | 322 | text-overflow: ellipsis; |
| 360 | - margin-bottom:10rpx; | ||
| 361 | - font-size:30rpx; | 323 | + margin-bottom: 10rpx; |
| 324 | + font-size: 30rpx; | ||
| 362 | white-space: nowrap; | 325 | white-space: nowrap; |
| 363 | margin-top: 10rpx; | 326 | margin-top: 10rpx; |
| 364 | } | 327 | } |
| 365 | 328 | ||
| 366 | -.zs_wz4_2l{ | 329 | +.zs_wz4_2l { |
| 367 | overflow: hidden; | 330 | overflow: hidden; |
| 368 | text-overflow: ellipsis; | 331 | text-overflow: ellipsis; |
| 369 | - margin-bottom:10rpx; | ||
| 370 | - font-size:30rpx; | 332 | + margin-bottom: 10rpx; |
| 333 | + font-size: 30rpx; | ||
| 371 | white-space: nowrap; | 334 | white-space: nowrap; |
| 372 | margin-top: 10rpx; | 335 | margin-top: 10rpx; |
| 373 | } | 336 | } |
| 374 | 337 | ||
| 375 | -.zs_wz5_2l{ | 338 | +.zs_wz5_2l { |
| 376 | overflow: hidden; | 339 | overflow: hidden; |
| 377 | text-overflow: ellipsis; | 340 | text-overflow: ellipsis; |
| 378 | - font-size:30rpx; | 341 | + font-size: 30rpx; |
| 379 | white-space: nowrap; | 342 | white-space: nowrap; |
| 380 | margin-top: 10rpx; | 343 | margin-top: 10rpx; |
| 381 | } | 344 | } |
| 382 | 345 | ||
| 346 | +/*---俩列图片位置---*/ | ||
| 383 | 347 | ||
| 384 | -.zs_t1_2l{ | 348 | +.zs_t1_2l { |
| 385 | width: 56rpx; | 349 | width: 56rpx; |
| 386 | height: 56rpx; | 350 | height: 56rpx; |
| 387 | - position: relative; | ||
| 388 | - right: -2rpx; | ||
| 389 | - top: -310rpx; | 351 | + position: absolute; |
| 352 | + left: 0rpx; | ||
| 353 | + top: 10rpx; | ||
| 390 | } | 354 | } |
| 391 | 355 | ||
| 392 | - | ||
| 393 | -.zs_t2_2l{ | 356 | +.zs_t2_2l { |
| 394 | width: 56rpx; | 357 | width: 56rpx; |
| 395 | height: 56rpx; | 358 | height: 56rpx; |
| 396 | - position: relative; | ||
| 397 | - right: -294rpx; | ||
| 398 | - bottom: 310rpx; | 359 | + position: absolute; |
| 360 | + right: 0rpx; | ||
| 361 | + top: 10rpx; | ||
| 399 | } | 362 | } |
| 400 | 363 | ||
| 401 | -.zs_t3_2l{ | 364 | +.zs_t3_2l { |
| 402 | width: 56rpx; | 365 | width: 56rpx; |
| 403 | height: 56rpx; | 366 | height: 56rpx; |
| 404 | - position: relative; | ||
| 405 | - right: -294rpx; | ||
| 406 | - bottom: 68rpx; | 367 | + position: absolute; |
| 368 | + left: 0rpx; | ||
| 369 | + bottom: 10rpx; | ||
| 407 | } | 370 | } |
| 408 | 371 | ||
| 409 | - | ||
| 410 | -.zs_t4_2l{ | 372 | +.zs_t4_2l { |
| 411 | width: 56rpx; | 373 | width: 56rpx; |
| 412 | height: 56rpx; | 374 | height: 56rpx; |
| 413 | - position: relative; | ||
| 414 | - right: -2rpx; | ||
| 415 | - bottom: 68rpx; | 375 | + position: absolute; |
| 376 | + right: 0rpx; | ||
| 377 | + bottom: 10rpx; | ||
| 416 | } | 378 | } |
| 417 | 379 | ||
| 418 | /*一个3列*/ | 380 | /*一个3列*/ |
| 419 | -.zs_goods_wai_san{ | ||
| 420 | - width: 240rpx; | 381 | + |
| 382 | +.zs_goods_wai_san { | ||
| 383 | + width: 230rpx; | ||
| 421 | display: flex; | 384 | display: flex; |
| 422 | - margin-left: 8rpx; | 385 | + margin-left: 10rpx; |
| 423 | float: left; | 386 | float: left; |
| 424 | margin-bottom: 8rpx; | 387 | margin-bottom: 8rpx; |
| 425 | - background-color:white; | ||
| 426 | - | 388 | + background-color: white; |
| 427 | } | 389 | } |
| 428 | 390 | ||
| 429 | -.zs_goods_san{ | 391 | +.zs_goods_san { |
| 430 | width: 240rpx; | 392 | width: 240rpx; |
| 431 | - | ||
| 432 | } | 393 | } |
| 433 | 394 | ||
| 434 | - | ||
| 435 | - | ||
| 436 | - | ||
| 437 | - | ||
| 438 | - | ||
| 439 | -.zs_goods_3l{ | 395 | +.zs_goods_3l { |
| 440 | width: 240rpx; | 396 | width: 240rpx; |
| 441 | min-height: 300rpx; | 397 | min-height: 300rpx; |
| 442 | border: 2rpx #ddd solid; | 398 | border: 2rpx #ddd solid; |
| @@ -444,113 +400,161 @@ top: 234rpx; | @@ -444,113 +400,161 @@ top: 234rpx; | ||
| 444 | padding: 2rpx; | 400 | padding: 2rpx; |
| 445 | } | 401 | } |
| 446 | 402 | ||
| 447 | -.zs_top_3l{ | ||
| 448 | - width: 240rpx; | ||
| 449 | - height: 240rpx; | ||
| 450 | - | ||
| 451 | - | ||
| 452 | - | ||
| 453 | - | ||
| 454 | - | ||
| 455 | - | 403 | +.zs_top_3l { |
| 404 | + width: 232rpx; | ||
| 405 | + height: 232rpx; | ||
| 456 | } | 406 | } |
| 457 | 407 | ||
| 458 | .zs_t_img_3l { | 408 | .zs_t_img_3l { |
| 459 | - width:237rpx; | ||
| 460 | - height: 240rpx; | 409 | + width: 232rpx; |
| 410 | + height: 232rpx; | ||
| 461 | margin: 0 auto; | 411 | margin: 0 auto; |
| 462 | background-color: bisque; | 412 | background-color: bisque; |
| 463 | - | ||
| 464 | } | 413 | } |
| 465 | 414 | ||
| 466 | -.zs_center_3l{ | 415 | +.zs_center_3l { |
| 467 | width: 100%; | 416 | width: 100%; |
| 468 | min-height: 200rpx; | 417 | min-height: 200rpx; |
| 469 | font-size: 28rpx; | 418 | font-size: 28rpx; |
| 470 | color: #333; | 419 | color: #333; |
| 471 | text-align: left; | 420 | text-align: left; |
| 472 | - padding: 0 10rpx; | 421 | + padding: 0 10rpx; |
| 473 | } | 422 | } |
| 474 | 423 | ||
| 475 | -.zs_wz1_3l{ | 424 | +.zs_wz1_3l { |
| 425 | + margin-bottom: 10rpx; | ||
| 426 | + font-size: 30rpx; | ||
| 427 | + height: 80rpx; | ||
| 428 | + width: 220rpx; | ||
| 476 | overflow: hidden; | 429 | overflow: hidden; |
| 477 | text-overflow: ellipsis; | 430 | text-overflow: ellipsis; |
| 478 | - margin-bottom:10rpx; | ||
| 479 | - font-size:30rpx; | ||
| 480 | - height: 80rpx; | ||
| 481 | - width: 227rpx; | ||
| 482 | - /* white-space: nowrap; */ | 431 | + display: -webkit-box; |
| 432 | + -webkit-box-orient: vertical; | ||
| 433 | + -webkit-line-clamp: 2; | ||
| 483 | } | 434 | } |
| 484 | 435 | ||
| 485 | - | ||
| 486 | -.zs_wz2_3l{ | ||
| 487 | - /* overflow: hidden; | ||
| 488 | - text-overflow: ellipsis; */ | ||
| 489 | - margin-bottom:10rpx; | ||
| 490 | - font-size:30rpx; | ||
| 491 | - /* white-space: nowrap; */ | ||
| 492 | - display: flex; | 436 | +.zs_wz2_3l { |
| 437 | + margin-bottom: 10rpx; | ||
| 438 | + font-size: 30rpx; | ||
| 439 | + display: flex; | ||
| 493 | } | 440 | } |
| 494 | 441 | ||
| 495 | -.zs_wz3_3l{ | 442 | +.zs_wz3_3l { |
| 496 | overflow: hidden; | 443 | overflow: hidden; |
| 497 | text-overflow: ellipsis; | 444 | text-overflow: ellipsis; |
| 498 | - margin-bottom:10rpx; | ||
| 499 | - font-size:30rpx; | ||
| 500 | - white-space: nowrap; | 445 | + margin-bottom: 10rpx; |
| 446 | + font-size: 30rpx; | ||
| 447 | + white-space: nowrap; | ||
| 501 | } | 448 | } |
| 502 | 449 | ||
| 503 | -.zs_wz4_3l{ | 450 | +.zs_wz4_3l { |
| 504 | overflow: hidden; | 451 | overflow: hidden; |
| 505 | text-overflow: ellipsis; | 452 | text-overflow: ellipsis; |
| 506 | - margin-bottom:10rpx; | ||
| 507 | - font-size:30rpx; | ||
| 508 | - white-space: nowrap; | 453 | + margin-bottom: 10rpx; |
| 454 | + font-size: 30rpx; | ||
| 455 | + white-space: nowrap; | ||
| 509 | } | 456 | } |
| 510 | 457 | ||
| 511 | -.zs_wz5_3l{ | 458 | +.zs_wz5_3l { |
| 512 | overflow: hidden; | 459 | overflow: hidden; |
| 513 | text-overflow: ellipsis; | 460 | text-overflow: ellipsis; |
| 514 | - font-size:30rpx; | ||
| 515 | - white-space: nowrap; | 461 | + font-size: 30rpx; |
| 462 | + white-space: nowrap; | ||
| 516 | } | 463 | } |
| 517 | 464 | ||
| 518 | - | ||
| 519 | -.zs_t1_3l{ | 465 | +.zs_t1_3l { |
| 520 | width: 56rpx; | 466 | width: 56rpx; |
| 521 | height: 56rpx; | 467 | height: 56rpx; |
| 522 | - position: relative; | ||
| 523 | - right: 0rpx; | ||
| 524 | - top: -250rpx; | 468 | + position: absolute; |
| 469 | + left: 0rpx; | ||
| 470 | + top: 10rpx; | ||
| 525 | } | 471 | } |
| 526 | 472 | ||
| 527 | - | ||
| 528 | -.zs_t2_3l{ | 473 | +.zs_t2_3l { |
| 529 | width: 56rpx; | 474 | width: 56rpx; |
| 530 | height: 56rpx; | 475 | height: 56rpx; |
| 531 | - position: relative; | ||
| 532 | - right: -177rpx; | ||
| 533 | - bottom: 250rpx; | 476 | + position: absolute; |
| 477 | + right: 0rpx; | ||
| 478 | + top: 10rpx; | ||
| 534 | } | 479 | } |
| 535 | 480 | ||
| 536 | -.zs_t3_3l{ | 481 | +.zs_t3_3l { |
| 537 | width: 56rpx; | 482 | width: 56rpx; |
| 538 | height: 56rpx; | 483 | height: 56rpx; |
| 539 | - position: relative; | ||
| 540 | - right: -177rpx; | ||
| 541 | - bottom: 67rpx; | 484 | + position: absolute; |
| 485 | + left: 0rpx; | ||
| 486 | + bottom: 10rpx; | ||
| 542 | } | 487 | } |
| 543 | 488 | ||
| 544 | - | ||
| 545 | -.zs_t4_3l{ | 489 | +.zs_t4_3l { |
| 546 | width: 56rpx; | 490 | width: 56rpx; |
| 547 | height: 56rpx; | 491 | height: 56rpx; |
| 548 | - position: relative; | 492 | + position: absolute; |
| 549 | right: 0rpx; | 493 | right: 0rpx; |
| 550 | - bottom: 67rpx; | 494 | + bottom: 10rpx; |
| 551 | } | 495 | } |
| 552 | 496 | ||
| 553 | -.zs_goods_wai{ | 497 | +.zs_goods_wai { |
| 554 | background-color: white; | 498 | background-color: white; |
| 555 | margin-top: 10rpx; | 499 | margin-top: 10rpx; |
| 556 | -} | ||
| 557 | \ No newline at end of file | 500 | \ No newline at end of file |
| 501 | +} | ||
| 502 | + | ||
| 503 | +.rel { | ||
| 504 | + position: relative; | ||
| 505 | +} | ||
| 506 | + | ||
| 507 | +.flex { | ||
| 508 | + display: flex; | ||
| 509 | +} | ||
| 510 | + | ||
| 511 | +.fs24 { | ||
| 512 | + font-size: 24rpx; | ||
| 513 | +} | ||
| 514 | + | ||
| 515 | +.fs35 { | ||
| 516 | + font-size: 35rpx; | ||
| 517 | +} | ||
| 518 | + | ||
| 519 | +.xc-wc { | ||
| 520 | + align-items: center; | ||
| 521 | + margin-top: -3rpx; | ||
| 522 | +} | ||
| 523 | + | ||
| 524 | +.price.xc-ash { | ||
| 525 | + font-size: 24rpx; | ||
| 526 | + color: #999; | ||
| 527 | + text-decoration: line-through; | ||
| 528 | + margin-top: 8rpx; | ||
| 529 | +} | ||
| 530 | + | ||
| 531 | +.line_th { | ||
| 532 | + text-decoration: line-through; | ||
| 533 | +} | ||
| 534 | + | ||
| 535 | +.card_bg { | ||
| 536 | + display: flex; | ||
| 537 | + padding: 2rpx 10rpx; | ||
| 538 | + height: 25rpx; | ||
| 539 | + align-items: center; | ||
| 540 | + border-radius: 26rpx; | ||
| 541 | + font-size: 19rpx; | ||
| 542 | + line-height: 25rpx; | ||
| 543 | + max-width: 110rpx; | ||
| 544 | + background: #333; | ||
| 545 | + color: #fff; | ||
| 546 | + justify-content: center; | ||
| 547 | + margin-left: 8rpx; | ||
| 548 | +} | ||
| 549 | + | ||
| 550 | +.card_bg image { | ||
| 551 | + width: 19rpx; | ||
| 552 | + height: 19rpx; | ||
| 553 | + margin-right: 1rpx; | ||
| 554 | +} | ||
| 555 | + | ||
| 556 | +.card_bg .card_name { | ||
| 557 | + max-width: 76rpx; | ||
| 558 | + width: auto; | ||
| 559 | + overflow: hidden; | ||
| 560 | + white-space: nowrap; | ||
| 561 | +} |
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 | +} |
components/goods_list/goods_list.js
| 1 | -var t = getApp(), a = t.request, o = t.globalData.setting, os = o, | ||
| 2 | - i = require("../../utils/util.js"), ut = i, s = require("../../utils/common.js"); | ||
| 3 | - | 1 | +var t = getApp(), |
| 2 | + a = t.request, | ||
| 3 | + o = t.globalData.setting, | ||
| 4 | + os = o, | ||
| 5 | + i = require("../../utils/util.js"), | ||
| 6 | + ut = i, | ||
| 7 | + s = require("../../utils/common.js"); | ||
| 4 | Component({ | 8 | Component({ |
| 5 | data: { | 9 | data: { |
| 6 | url: o.imghost, | 10 | url: o.imghost, |
| 7 | object: null, | 11 | object: null, |
| 8 | - curPage:1, | ||
| 9 | - is_no_more:1,//加载完所有数据的控制器 | ||
| 10 | - load_complete:0,//加载完成, | ||
| 11 | - rank_switch:false, | ||
| 12 | - card_field:"", | ||
| 13 | - card_name:"", | ||
| 14 | - max_card_field:"", | ||
| 15 | - card_list:null | 12 | + curPage: 1, |
| 13 | + is_no_more: 1, //加载完所有数据的控制器 | ||
| 14 | + load_complete: 0, //加载完成, | ||
| 15 | + rank_switch: false, | ||
| 16 | + card_field: "", | ||
| 17 | + card_name: "", | ||
| 18 | + max_card_field: "", | ||
| 19 | + card_list: null | ||
| 16 | }, | 20 | }, |
| 17 | properties: { | 21 | properties: { |
| 18 | - // 这里定义了innerText属性，属性值可以在组件使用时指定 | 22 | + // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定 |
| 19 | }, | 23 | }, |
| 20 | ready: function () { | 24 | ready: function () { |
| 21 | - | ||
| 22 | }, | 25 | }, |
| 23 | - | ||
| 24 | - methods: { | ||
| 25 | - init:function(){ | ||
| 26 | - var th = this; | ||
| 27 | - getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { | ||
| 28 | - success: function (e) { | ||
| 29 | - getApp().globalData.userInfo = e.data.data; | ||
| 30 | - getApp().getConfig2(function (e) { | ||
| 31 | - var swithc_list = e.switch_list; | ||
| 32 | - var sw_arr = JSON.parse(swithc_list); | ||
| 33 | - //---如果后台又开等级卡的开关--- | ||
| 34 | - if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { | ||
| 35 | - th.setData({ rank_switch: true }); | ||
| 36 | - //---回调卡的列表--- | ||
| 37 | - th.getPlusCardType(function (ob) { | ||
| 38 | - th.setData({ card_list: ob.card_list }); | ||
| 39 | - var ti = setInterval(function () { | ||
| 40 | - var user = getApp().globalData.userInfo; | ||
| 41 | - if (!user) return false; | ||
| 42 | - clearInterval(ti); | ||
| 43 | - | ||
| 44 | - if (user.card_field) { | ||
| 45 | - var str = user['card_expiredate'].replace(/-/g, '/'); | ||
| 46 | - var end = new Date(str); | ||
| 47 | - end = Date.parse(end) / 1000; | ||
| 48 | - var now = ut.gettimestamp(); | ||
| 49 | - | ||
| 50 | - //--- 判断是等级会员，且在有效期范围内 --- | ||
| 51 | - if (user.card_field && now < end) { | ||
| 52 | - var card_name = ob.name_map.get(user.card_field); | ||
| 53 | - if (card_name.length > 4) card_name = card_name.substring(0, 4); | ||
| 54 | - th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list }); | ||
| 55 | - } | ||
| 56 | - } | ||
| 57 | - }, 500) | ||
| 58 | - }) | ||
| 59 | - | ||
| 60 | - } | ||
| 61 | - }) | ||
| 62 | - } | ||
| 63 | - }) | ||
| 64 | - | ||
| 65 | - }, | ||
| 66 | - | ||
| 67 | - | ||
| 68 | - get_list:function(){ | ||
| 69 | - var that = this; | ||
| 70 | - if (that.data.is_no_more == 0) return false; | ||
| 71 | - var curPage = that.data.curPage; | ||
| 72 | - getApp().request.get('/api/weshop/goods/page?page', { | ||
| 73 | - data: { | ||
| 74 | - is_mainshow: 1, isonsale: 1, | ||
| 75 | - is_recommend: 1, is_on_sale: 1, | ||
| 76 | - store_id: o.stoid, | ||
| 77 | - page: curPage, | ||
| 78 | - pageSize: 6, | ||
| 79 | - }, | ||
| 80 | - success: function (res) { | ||
| 81 | - var data = res.data; | ||
| 82 | - var total = data.data.total; | ||
| 83 | - if (total <= curPage * 6) { | ||
| 84 | - that.setData({ is_no_more: 0 }); | ||
| 85 | - } else { | ||
| 86 | - that.data.curPage++; | ||
| 87 | - } | ||
| 88 | - | ||
| 89 | - //加载完成 | ||
| 90 | - if (data.data.pageData) { | ||
| 91 | - that.setData({ load_complete: 1 }); | ||
| 92 | - } | ||
| 93 | - if (that.data.recommend != null) { | ||
| 94 | - var ra = that.data.recommend.concat(data.data.pageData); | ||
| 95 | - that.setData({ recommend: ra }); | ||
| 96 | - } else { | ||
| 97 | - that.setData({ recommend: data.data.pageData }); | ||
| 98 | - } | ||
| 99 | - } | ||
| 100 | - }) | ||
| 101 | - }, | ||
| 102 | - | ||
| 103 | - | 26 | + methods: { |
| 27 | + init: function () { | ||
| 28 | + var th = this; | ||
| 29 | + getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { | ||
| 30 | + success: function (e) { | ||
| 31 | + getApp().globalData.userInfo = e.data.data; | ||
| 32 | + getApp().getConfig2(function (e) { | ||
| 33 | + var swithc_list = e.switch_list; | ||
| 34 | + var sw_arr = JSON.parse(swithc_list); | ||
| 35 | + //---如果后台有开等级卡的开关--- | ||
| 36 | + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { | ||
| 37 | + th.setData({ | ||
| 38 | + rank_switch: true | ||
| 39 | + }); | ||
| 40 | + //---回调卡的列表--- | ||
| 41 | + th.getPlusCardType(function (ob) { | ||
| 42 | + th.setData({ | ||
| 43 | + card_list: ob.card_list | ||
| 44 | + }); | ||
| 45 | + var ti = setInterval(function () { | ||
| 46 | + var user = getApp().globalData.userInfo; | ||
| 47 | + if (!user) return false; | ||
| 48 | + clearInterval(ti); | ||
| 49 | + if (user.card_field) { | ||
| 50 | + var str = user['card_expiredate'].replace(/-/g, '/'); | ||
| 51 | + var end = new Date(str); | ||
| 52 | + end = Date.parse(end) / 1000; | ||
| 53 | + var now = ut.gettimestamp(); | ||
| 54 | + //--- 判断是等级会员，且在有效期范围内 --- | ||
| 55 | + if (user.card_field && now < end) { | ||
| 56 | + var card_name = ob.name_map.get(user.card_field); | ||
| 57 | + if (card_name.length > 4) card_name = card_name.substring(0, 4); | ||
| 58 | + th.setData({ | ||
| 59 | + card_field: user.card_field, | ||
| 60 | + card_name: card_name, | ||
| 61 | + card_list: ob.card_list | ||
| 62 | + }); | ||
| 63 | + } | ||
| 64 | + } | ||
| 65 | + }, 500) | ||
| 66 | + }) | ||
| 67 | + } | ||
| 68 | + }) | ||
| 69 | + } | ||
| 70 | + }) | ||
| 71 | + }, | ||
| 72 | + // get_list: function () { | ||
| 73 | + // var th = this; | ||
| 74 | + // var url = "http://172.20.0.233:8022/api/weshop/display"; | ||
| 75 | + // wx.request({ | ||
| 76 | + // url: url, | ||
| 77 | + // success: function (res) { | ||
| 78 | + // th.setData({ | ||
| 79 | + // recommend: res.data.data.pageData | ||
| 80 | + // }) | ||
| 81 | + // } | ||
| 82 | + // }) | ||
| 83 | + // }, | ||
| 84 | + get_list: function() { | ||
| 85 | + var that = this; | ||
| 86 | + if (that.data.is_no_more == 0) return false; | ||
| 87 | + var curPage = that.data.curPage; | ||
| 88 | + getApp().request.get('/api/weshop/goods/page?page', { | ||
| 89 | + data: { | ||
| 90 | + is_mainshow: 1, | ||
| 91 | + isonsale: 1, | ||
| 92 | + is_recommend: 1, | ||
| 93 | + is_on_sale: 1, | ||
| 94 | + store_id: o.stoid, | ||
| 95 | + page: curPage, | ||
| 96 | + pageSize: 6, | ||
| 97 | + }, | ||
| 98 | + success: function(res) { | ||
| 99 | + var data = res.data; | ||
| 100 | + var total = data.data.total; | ||
| 101 | + if (total <= curPage * 6) { | ||
| 102 | + that.setData({ | ||
| 103 | + is_no_more: 0 | ||
| 104 | + }); | ||
| 105 | + } else { | ||
| 106 | + that.data.curPage++; | ||
| 107 | + } | ||
| 108 | + //加载完成 | ||
| 109 | + if (data.data.pageData) { | ||
| 110 | + that.setData({ | ||
| 111 | + load_complete: 1 | ||
| 112 | + }); | ||
| 113 | + } | ||
| 114 | + if (that.data.recommend != null) { | ||
| 115 | + var ra = that.data.recommend.concat(data.data.pageData); | ||
| 116 | + that.setData({ | ||
| 117 | + recommend: ra | ||
| 118 | + }); | ||
| 119 | + } else { | ||
| 120 | + that.setData({ | ||
| 121 | + recommend: data.data.pageData | ||
| 122 | + }); | ||
| 123 | + } | ||
| 124 | + } | ||
| 125 | + }) | ||
| 126 | + }, | ||
| 104 | bind_bnerr_xc: function (e) { | 127 | bind_bnerr_xc: function (e) { |
| 105 | - var _errImg = e.target.dataset.errorimg; | ||
| 106 | - var _errurl = e.target.dataset.url; | ||
| 107 | - var _errObj = {}; | ||
| 108 | - _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; | ||
| 109 | - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | 128 | + var _errImg = e.target.dataset.errorimg; |
| 129 | + var _errurl = e.target.dataset.url; | ||
| 130 | + var _errObj = {}; | ||
| 131 | + _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; | ||
| 132 | + this.setData(_errObj) //注意这⾥的赋值⽅式,只是将数据列表中的此项图⽚路径值替换掉 ; | ||
| 110 | }, | 133 | }, |
| 111 | - | ||
| 112 | - reset:function(){ | ||
| 113 | - curPage=1; | ||
| 114 | - }, | ||
| 115 | - | ||
| 116 | - //--- 获取卡类列表 --- | ||
| 117 | - getPlusCardType: function (func) { | ||
| 118 | - var storid = o.stoid; | ||
| 119 | - var th = this; | ||
| 120 | - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { | ||
| 121 | - var plusCard = res.data.data; | ||
| 122 | - var arr = [1219, 2089, 3031]; | ||
| 123 | - var new_arr = new Array(); | ||
| 124 | - var card_name_map=new Map(); | ||
| 125 | - for (var i = 0; i < plusCard.length; i++) { | ||
| 126 | - var name="card"+plusCard[i].CorrPrice.toLowerCase(); | ||
| 127 | - card_name_map.set(name,plusCard[i].CardName); | ||
| 128 | - } | ||
| 129 | - | ||
| 130 | - var ob={"card_list":plusCard,"name_map":card_name_map}; | ||
| 131 | - func(ob); | ||
| 132 | - }) | ||
| 133 | - }, | ||
| 134 | - | 134 | + reset: function () { |
| 135 | + curPage = 1; | ||
| 135 | }, | 136 | }, |
| 136 | - | ||
| 137 | - | ||
| 138 | - | 137 | + //--- 获取卡类列表 --- |
| 138 | + getPlusCardType: function (func) { | ||
| 139 | + var storid = o.stoid; | ||
| 140 | + var th = this; | ||
| 141 | + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, | ||
| 142 | + {}).then(res => { | ||
| 143 | + var plusCard = res.data.data; | ||
| 144 | + var arr = [1219, 2089, 3031]; | ||
| 145 | + var new_arr = new Array(); | ||
| 146 | + var card_name_map = new Map(); | ||
| 147 | + for (var i = 0; i < plusCard.length; i++) { | ||
| 148 | + var name = "card" + plusCard[i].CorrPrice.toLowerCase(); | ||
| 149 | + card_name_map.set(name, plusCard[i].CardName); | ||
| 150 | + } | ||
| 151 | + var ob = { | ||
| 152 | + "card_list": plusCard, | ||
| 153 | + "name_map": card_name_map | ||
| 154 | + }; | ||
| 155 | + func(ob); | ||
| 156 | + }) | ||
| 157 | + }, | ||
| 158 | + }, | ||
| 139 | }) | 159 | }) |
| 140 | \ No newline at end of file | 160 | \ No newline at end of file |
components/goods_list/goods_list.wxml
| 1 | - <!-- 商品列表 --> | ||
| 2 | - <wxs module="filter" src="../../utils/filter.wxs"></wxs> | ||
| 3 | - <wxs module="g_filter" src="g_filter.wxs"></wxs> | ||
| 4 | - <view class="collects"> | ||
| 5 | - <view class="hang "> | ||
| 6 | - <!-- 商品详情 --> | ||
| 7 | - <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> | ||
| 8 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> | ||
| 9 | - <!-- 商品图片 --> | ||
| 10 | - <image class="sp" src="{{url+item.original_img}}" mode="scaleToFill" binderror="bind_bnerr_xc" data-url="{{item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image> | ||
| 11 | - <view class="bottom"> | ||
| 12 | - <!-- 商品名称 --> | ||
| 13 | - <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view> | ||
| 14 | - | ||
| 15 | - <!-- 商品价格,先判断下是后又等级价--> | ||
| 16 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
| 17 | - <!-- 当会员是等级卡的时候 --> | ||
| 18 | - <block wx:if="{{card_field}}"> | ||
| 19 | - <!-- 等级价>0 --> | ||
| 20 | - <block wx:if="{{item[card_field]>0}}"> | ||
| 21 | - <view class="money flex" > | ||
| 22 | - <!-- 办卡价 --> | ||
| 23 | - <view class="flex xc-wc"> | ||
| 24 | - <view class="fs24">￥</view> | ||
| 25 | - <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | ||
| 26 | - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
| 27 | - </view> | ||
| 28 | - </view> | ||
| 29 | - <view class="flex" style="line-height: 28rpx;" > | ||
| 30 | - <!-- 原价 --> | ||
| 31 | - <view class="price flex xc-ash line_th"> | ||
| 32 | - <view class="fs22">￥</view> | ||
| 33 | - <view class="fs22">{{item.market_price}}</view> | ||
| 34 | - </view> | ||
| 35 | - </view> | ||
| 36 | - </block> | ||
| 37 | - <blocK wx:else> | ||
| 38 | - <view class="money flex" > | ||
| 39 | - <!-- 办卡价 --> | ||
| 40 | - <view class="flex xc-wc"> | ||
| 41 | - <view class="fs24">￥</view> | ||
| 42 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 43 | - </view> | ||
| 44 | - </view> | ||
| 45 | - <view class="flex" style="line-height: 28rpx;" > | ||
| 46 | - <!-- 原价 --> | ||
| 47 | - <view class="price flex xc-ash line_th"> | ||
| 48 | - <view class="fs22">￥</view> | ||
| 49 | - <view class="fs22">{{item.market_price}}</view> | ||
| 50 | - </view> | ||
| 51 | - </view> | ||
| 52 | - </blocK> | ||
| 53 | - </block> | ||
| 54 | - <block wx:else> | ||
| 55 | - <!-- 如果商品有设置等级价大于0的 --> | ||
| 56 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 57 | - <view class="money flex" > | ||
| 58 | - <!-- 办卡价 --> | ||
| 59 | - <view class="flex xc-wc"> | ||
| 60 | - <view class="fs24">￥</view> | ||
| 61 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 62 | - </view> | ||
| 63 | - <!-- 原价 --> | ||
| 64 | - <view class="price flex xc-ash line_th"> | ||
| 65 | - <view class="fs22">￥</view> | ||
| 66 | - <view class="fs22">{{item.market_price}}</view> | ||
| 67 | - </view> | ||
| 68 | - | ||
| 69 | - </view> | ||
| 70 | - <view class="flex" style="line-height: 28rpx;" > | ||
| 71 | - <!-- 等级价 --> | ||
| 72 | - <view class="price flex"> | ||
| 73 | - <view class="fs22">￥</view> | ||
| 74 | - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 75 | - <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 76 | - </view> | ||
| 77 | - </view> | ||
| 78 | - </block> | ||
| 79 | - <block wx:else> | ||
| 80 | - <view class="money flex" > | ||
| 81 | - <!-- 办卡价 --> | ||
| 82 | - <view class="flex xc-wc"> | ||
| 83 | - <view class="fs24">￥</view> | ||
| 84 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 85 | - </view> | ||
| 86 | - </view> | ||
| 87 | - <view class="flex" style="line-height: 28rpx;" > | ||
| 88 | - <!-- 原价 --> | ||
| 89 | - <view class="price flex xc-ash line_th"> | ||
| 90 | - <view class="fs22">￥</view> | ||
| 91 | - <view class="fs22">{{item.market_price}}</view> | ||
| 92 | - </view> | ||
| 93 | - </view> | ||
| 94 | - </block> | ||
| 95 | - </block> | ||
| 96 | - </block> | ||
| 97 | - | ||
| 98 | - <!-- 商品压根就没有等级价 --> | ||
| 99 | - <block wx:else> | ||
| 100 | - <view class="money flex" > | ||
| 101 | - <!-- 办卡价 --> | ||
| 102 | - <view class="flex xc-wc"> | ||
| 103 | - <view class="fs24">￥</view> | ||
| 104 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 105 | - </view> | ||
| 106 | - </view> | ||
| 107 | - <view class="flex" style="line-height: 28rpx;" > | ||
| 108 | - <!-- 原价 --> | ||
| 109 | - <view class="price flex xc-ash line_th"> | ||
| 110 | - <view class="fs22">￥</view> | ||
| 111 | - <view class="fs22">{{item.market_price}}</view> | ||
| 112 | - </view> | ||
| 113 | - </view> | ||
| 114 | - </block> | ||
| 115 | - | ||
| 116 | - </view> | ||
| 117 | - </navigator> | 1 | +<!-- 商品列表 --> |
| 2 | +<wxs module="filter" src="../../utils/filter.wxs"></wxs> | ||
| 3 | +<wxs module="g_filter" src="g_filter.wxs"></wxs> | ||
| 4 | +<view class="collects"> | ||
| 5 | + <view class="hang "> | ||
| 6 | + <!-- 商品详情 --> | ||
| 7 | + <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> | ||
| 8 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> | ||
| 9 | + <!-- 商品图⽚ --> | ||
| 10 | + <image class="sp" src="{{url+item.original_img}}" mode="scaleToFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image> | ||
| 11 | + <view class="bottom"> | ||
| 12 | + <!-- 商品名称 --> | ||
| 13 | + <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view> | ||
| 14 | + <!-- 判断是否有活动价 --> | ||
| 15 | + <block wx:if="{{item.prom_price>0}}"> | ||
| 16 | + <view class="money flex"> | ||
| 17 | + <!-- 活动价 --> | ||
| 18 | + <view class="flex xc-wc"> | ||
| 19 | + <view class="fs24">￥</view> | ||
| 20 | + <view class="fs35">{{item.prom_price}}</view> | ||
| 21 | + </view> | ||
| 22 | + </view> | ||
| 23 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 24 | + <!-- 原价 --> | ||
| 25 | + <view class="price flex xc-ash line_th"> | ||
| 26 | + <view class="fs22">￥</view> | ||
| 27 | + <view class="fs22">{{item.market_price}}</view> | ||
| 28 | + </view> | ||
| 29 | + </view> | ||
| 30 | + </block> | ||
| 31 | + <block wx:else> | ||
| 32 | + <!-- 商品价格,先判断下是后⼜等级价--> | ||
| 33 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 34 | + <!-- 当会员是等级卡的时候 --> | ||
| 35 | + <block wx:if="{{card_field}}"> | ||
| 36 | + <!-- 等级价>0 --> | ||
| 37 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 38 | + <view class="money flex"> | ||
| 39 | + <!-- 办卡价 --> | ||
| 40 | + <view class="flex xc-wc ai_and"> | ||
| 41 | + <view class="fs24">￥</view> | ||
| 42 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | ||
| 43 | + <view class="card_bg"> | ||
| 44 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 45 | + <view class="card_name">{{card_name}}</view> | ||
| 46 | + </view> | ||
| 47 | + </view> | ||
| 48 | + </view> | ||
| 49 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 50 | + <!-- 原价 --> | ||
| 51 | + <view class="price flex xc-ash line_th"> | ||
| 52 | + <view class="fs22">￥</view> | ||
| 53 | + <view class="fs22">{{item.market_price}}</view> | ||
| 54 | + </view> | ||
| 55 | + </view> | ||
| 56 | + </block> | ||
| 57 | + <blocK wx:else> | ||
| 58 | + <view class="money flex"> | ||
| 59 | + <!-- 办卡价 --> | ||
| 60 | + <view class="flex xc-wc"> | ||
| 61 | + <view class="fs24">￥</view> | ||
| 62 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 63 | + </view> | ||
| 64 | + </view> | ||
| 65 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 66 | + <!-- 原价 --> | ||
| 67 | + <view class="price flex xc-ash line_th"> | ||
| 68 | + <view class="fs22">￥</view> | ||
| 69 | + <view class="fs22">{{item.market_price}}</view> | ||
| 70 | + </view> | ||
| 71 | + </view> | ||
| 72 | + </blocK> | ||
| 73 | + </block> | ||
| 74 | + <block wx:else> | ||
| 75 | + <!-- 如果商品有设置等级价⼤于0的 --> | ||
| 76 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 77 | + <view class="money flex"> | ||
| 78 | + <!-- 办卡价 --> | ||
| 79 | + <view class="flex xc-wc"> | ||
| 80 | + <view class="fs24">￥</view> | ||
| 81 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 82 | + </view> | ||
| 83 | + <!-- 原价 --> | ||
| 84 | + <view class="price flex xc-ash line_th"> | ||
| 85 | + <view class="fs22">￥</view> | ||
| 86 | + <view class="fs22">{{item.market_price}}</view> | ||
| 87 | + </view> | ||
| 88 | + </view> | ||
| 89 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 90 | + <!-- 等级价 --> | ||
| 91 | + <view class="price flex ai_and"> | ||
| 92 | + <view class="fs22">￥</view> | ||
| 93 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 94 | + <view class="card_bg"> | ||
| 95 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 96 | + </view> | ||
| 97 | + </view> | ||
| 98 | + </block> | ||
| 99 | + <block wx:else> | ||
| 100 | + <view class="money flex"> | ||
| 101 | + <!-- 办卡价 --> | ||
| 102 | + <view class="flex xc-wc"> | ||
| 103 | + <view class="fs24">￥</view> | ||
| 104 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 105 | + </view> | ||
| 106 | + </view> | ||
| 107 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 108 | + <!-- 原价 --> | ||
| 109 | + <view class="price flex xc-ash line_th"> | ||
| 110 | + <view class="fs22">￥</view> | ||
| 111 | + <view class="fs22">{{item.market_price}}</view> | ||
| 112 | + </view> | ||
| 113 | + </view> | ||
| 114 | + </block> | ||
| 115 | + </block> | ||
| 116 | + </block> | ||
| 117 | + <!-- 商品压根就没有等级价 --> | ||
| 118 | + <block wx:else> | ||
| 119 | + <view class="money flex"> | ||
| 120 | + <!-- 办卡价 --> | ||
| 121 | + <view class="flex xc-wc"> | ||
| 122 | + <view class="fs24">￥</view> | ||
| 123 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 124 | + </view> | ||
| 125 | + </view> | ||
| 126 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 127 | + <!-- 原价 --> | ||
| 128 | + <view class="price flex xc-ash line_th"> | ||
| 129 | + <view class="fs22">￥</view> | ||
| 130 | + <view class="fs22">{{item.market_price}}</view> | ||
| 131 | + </view> | ||
| 132 | + </view> | ||
| 133 | + </block> | ||
| 134 | + </block> | ||
| 118 | </view> | 135 | </view> |
| 119 | - </view> | ||
| 120 | - <view class="nothing flex-center" wx:if="{{is_no_more==0}}"> | ||
| 121 | - <view class="Foil"></view> | ||
| 122 | - <view class="no_content fs24">没有更多内容了</view> | ||
| 123 | - <view class="Foil"></view> | ||
| 124 | - </view> | ||
| 125 | - </view> | ||
| 126 | - | ||
| 127 | - | ||
| 128 | - | ||
| 129 | \ No newline at end of file | 136 | \ No newline at end of file |
| 137 | + </navigator> | ||
| 138 | + </view> | ||
| 139 | + </view> | ||
| 140 | + <view class="nothing flex-center" wx:if="{{is_no_more==0}}"> | ||
| 141 | + <view class="Foil"></view> | ||
| 142 | + <view class="no_content fs24">没有更多内容了</view> | ||
| 143 | + <view class="Foil"></view> | ||
| 144 | + </view> | ||
| 145 | +</view> | ||
| 130 | \ No newline at end of file | 146 | \ No newline at end of file |
components/goods_list/goods_list.wxss
| 1 | .collects { | 1 | .collects { |
| 2 | margin-top: 40rpx; | 2 | margin-top: 40rpx; |
| 3 | } | 3 | } |
| 4 | -.ib{ | ||
| 5 | - display: inline-block; | ||
| 6 | -} | ||
| 7 | -.fs20{ | ||
| 8 | - font-size: 20rpx; | ||
| 9 | -} | ||
| 10 | -.fs22{ | ||
| 11 | - font-size: 22rpx; | ||
| 12 | -} | ||
| 13 | -.fs24{ | ||
| 14 | - font-size: 24rpx; | ||
| 15 | -} | ||
| 16 | -.fs26{ | ||
| 17 | - font-size: 26rpx; | 4 | + |
| 5 | +.ib { | ||
| 6 | + display: inline-block; | ||
| 18 | } | 7 | } |
| 19 | -.fs28{ | ||
| 20 | - font-size: 28rpx; | 8 | + |
| 9 | +.fs20 { | ||
| 10 | + font-size: 20rpx; | ||
| 21 | } | 11 | } |
| 22 | -.fs35{ | ||
| 23 | - font-size:35rpx; | 12 | + |
| 13 | +.fs22 { | ||
| 14 | + font-size: 22rpx; | ||
| 24 | } | 15 | } |
| 25 | 16 | ||
| 17 | +.fs24 { | ||
| 18 | + font-size: 24rpx; | ||
| 19 | +} | ||
| 26 | 20 | ||
| 21 | +.fs26 { | ||
| 22 | + font-size: 26rpx; | ||
| 23 | +} | ||
| 27 | 24 | ||
| 28 | -.flex-center{ | ||
| 29 | -display:flex; | ||
| 30 | -justify-content:center; | ||
| 31 | -align-items:center; | 25 | +.fs28 { |
| 26 | + font-size: 28rpx; | ||
| 32 | } | 27 | } |
| 33 | -.xc-wc{ | ||
| 34 | - color: #d60021; | ||
| 35 | 28 | ||
| 29 | +.fs35 { | ||
| 30 | + font-size: 35rpx; | ||
| 36 | } | 31 | } |
| 37 | 32 | ||
| 33 | +.flex-center { | ||
| 34 | + display: flex; | ||
| 35 | + justify-content: center; | ||
| 36 | + align-items: center; | ||
| 37 | +} | ||
| 38 | 38 | ||
| 39 | +.xc-wc { | ||
| 40 | + color: #d60021; | ||
| 41 | +} | ||
| 39 | 42 | ||
| 40 | -.xc-ash{ | ||
| 41 | -color: #b9b9b9; | 43 | +.xc-ash { |
| 44 | + color: #b9b9b9; | ||
| 42 | } | 45 | } |
| 46 | + | ||
| 43 | .choice_box .choice_list .choice_footer .price { | 47 | .choice_box .choice_list .choice_footer .price { |
| 44 | - color: #f23030; height: 10px | 48 | + color: #f23030; |
| 49 | + height: 10px; | ||
| 50 | +} | ||
| 51 | + | ||
| 52 | +.flex { | ||
| 53 | + display: flex; | ||
| 45 | } | 54 | } |
| 46 | 55 | ||
| 47 | -.flex{display: flex} | ||
| 48 | .ellipsis-2 { | 56 | .ellipsis-2 { |
| 49 | - overflow: hidden; | ||
| 50 | - text-overflow: ellipsis; | ||
| 51 | - display: -webkit-box; | ||
| 52 | - -webkit-box-orient: vertical; | ||
| 53 | - -webkit-line-clamp: 2; | ||
| 54 | -} | ||
| 55 | -.goods_name{ | ||
| 56 | - height: 62rpx; | 57 | + overflow: hidden; |
| 58 | + text-overflow: ellipsis; | ||
| 59 | + display: -webkit-box; | ||
| 60 | + -webkit-box-orient: vertical; | ||
| 61 | + -webkit-line-clamp: 2; | ||
| 62 | +} | ||
| 63 | + | ||
| 64 | +.goods_name { | ||
| 65 | + height: 62rpx; | ||
| 57 | margin-top: 6rpx; | 66 | margin-top: 6rpx; |
| 58 | line-height: 30rpx; | 67 | line-height: 30rpx; |
| 59 | - | ||
| 60 | - | ||
| 61 | } | 68 | } |
| 69 | + | ||
| 62 | .hang { | 70 | .hang { |
| 63 | width: 100%; | 71 | width: 100%; |
| 64 | margin: auto; | 72 | margin: auto; |
| 65 | padding-left: 21rpx; | 73 | padding-left: 21rpx; |
| 66 | } | 74 | } |
| 67 | 75 | ||
| 68 | - | ||
| 69 | .hang .collect { | 76 | .hang .collect { |
| 70 | width: 347rpx; | 77 | width: 347rpx; |
| 71 | height: 520rpx; | 78 | height: 520rpx; |
| @@ -91,15 +98,19 @@ color: #b9b9b9; | @@ -91,15 +98,19 @@ color: #b9b9b9; | ||
| 91 | line-height: 28rpx; | 98 | line-height: 28rpx; |
| 92 | align-items: baseline; | 99 | align-items: baseline; |
| 93 | } | 100 | } |
| 94 | -.collect .money view{ | 101 | + |
| 102 | +.collect .money view { | ||
| 95 | line-height: 28rpx; | 103 | line-height: 28rpx; |
| 96 | } | 104 | } |
| 105 | + | ||
| 97 | .collect .money .flex { | 106 | .collect .money .flex { |
| 98 | - font-weight: bold; | 107 | + font-weight: bold; |
| 99 | } | 108 | } |
| 100 | -.collect .money .flex .fs24{ | 109 | + |
| 110 | +.collect .money .flex .fs24 { | ||
| 101 | padding-top: 5rpx; | 111 | padding-top: 5rpx; |
| 102 | } | 112 | } |
| 113 | + | ||
| 103 | .collect .Discount { | 114 | .collect .Discount { |
| 104 | width: 156rpx; | 115 | width: 156rpx; |
| 105 | height: 28rpx; | 116 | height: 28rpx; |
| @@ -150,12 +161,34 @@ color: #b9b9b9; | @@ -150,12 +161,34 @@ color: #b9b9b9; | ||
| 150 | background-color: rgb(138, 138, 138); | 161 | background-color: rgb(138, 138, 138); |
| 151 | } | 162 | } |
| 152 | 163 | ||
| 153 | -.line_th{ text-decoration: line-through} | ||
| 154 | -.card_bg {display: flex; padding: 2rpx 10rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;line-height: 28rpx;max-width: 110rpx; | ||
| 155 | -background: #333; color: #fff; justify-content: center; margin-left: 2rpx;} | ||
| 156 | -.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}.card_bg .card_name{ | ||
| 157 | - max-width: 76rpx; | ||
| 158 | - width: auto; | ||
| 159 | - overflow: hidden; | ||
| 160 | - white-space:nowrap; | ||
| 161 | -} | ||
| 162 | \ No newline at end of file | 164 | \ No newline at end of file |
| 165 | +.line_th { | ||
| 166 | + text-decoration: line-through; | ||
| 167 | +} | ||
| 168 | + | ||
| 169 | +.card_bg { | ||
| 170 | + display: flex; | ||
| 171 | + padding: 2rpx 10rpx; | ||
| 172 | + height: 25rpx; | ||
| 173 | + align-items: center; | ||
| 174 | + border-radius: 26rpx; | ||
| 175 | + font-size: 19rpx; | ||
| 176 | + line-height: 25rpx; | ||
| 177 | + max-width: 110rpx; | ||
| 178 | + background: #333; | ||
| 179 | + color: #fff; | ||
| 180 | + justify-content: center; | ||
| 181 | + margin-left: 8rpx; | ||
| 182 | +} | ||
| 183 | + | ||
| 184 | +.card_bg image { | ||
| 185 | + width: 19rpx; | ||
| 186 | + height: 19rpx; | ||
| 187 | + margin-right: 1rpx; | ||
| 188 | +} | ||
| 189 | + | ||
| 190 | +.card_bg .card_name { | ||
| 191 | + max-width: 76rpx; | ||
| 192 | + width: auto; | ||
| 193 | + overflow: hidden; | ||
| 194 | + white-space: nowrap; | ||
| 195 | +} |
pages/goods/goodsList/goodsList.wxml
| 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> | 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> |
| 2 | <view class="container"> | 2 | <view class="container"> |
| 3 | - <view class="nav"> | ||
| 4 | - <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合 | ||
| 5 | - <view class="ico-dg" wx:if="{{tabname=='goods_id'}}"> | ||
| 6 | - <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 7 | - <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 8 | - </view> | ||
| 9 | - </navigator> | ||
| 10 | - <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量 | ||
| 11 | - <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}"> | ||
| 12 | - <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 13 | - <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 14 | - </view> | ||
| 15 | - | ||
| 16 | - </navigator> | ||
| 17 | - <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}"> | ||
| 18 | - 价格 | ||
| 19 | - <view class="ico-dg" wx:if="{{tabname=='shop_price'}}"> | ||
| 20 | - <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 21 | - <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 22 | - </view> | ||
| 23 | - </navigator> | ||
| 24 | - <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter"> | 3 | + <view class="nav"> |
| 4 | + <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合 | ||
| 5 | + <view class="ico-dg" wx:if="{{tabname=='goods_id'}}"> | ||
| 6 | + <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 7 | + <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 8 | + </view> | ||
| 9 | + </navigator> | ||
| 10 | + <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量 | ||
| 11 | + <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}"> | ||
| 12 | + <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 13 | + <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 14 | + </view> | ||
| 15 | + | ||
| 16 | + </navigator> | ||
| 17 | + <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}"> | ||
| 18 | + 价格 | ||
| 19 | + <view class="ico-dg" wx:if="{{tabname=='shop_price'}}"> | ||
| 20 | + <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 21 | + <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 22 | + </view> | ||
| 23 | + </navigator> | ||
| 24 | + <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter"> | ||
| 25 | <image class="wh100" src="{{iurl}}/miniapp/images/xx.png"></image> | 25 | <image class="wh100" src="{{iurl}}/miniapp/images/xx.png"></image> |
| 26 | </view> | 26 | </view> |
| 27 | </navigator> --> | 27 | </navigator> --> |
| 28 | 28 | ||
| 29 | - <navigator class="nav-item search" url="/pages/goods/search/search"> | ||
| 30 | - <image class="wh100 search-img" src="{{iurl}}/miniapp/images/search.png"></image> | ||
| 31 | - </navigator> | ||
| 32 | - </view> | ||
| 33 | - <view class="choice_list"> | ||
| 34 | - <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}"> | ||
| 35 | - <view class="img-wrap"> | ||
| 36 | - <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{item.original_img}}" lazy-load="true" | ||
| 37 | - data-errorimg="requestData[{{index}}].original_img"></image> | 29 | + <navigator class="nav-item search" url="/pages/goods/search/search"> |
| 30 | + <image class="wh100 search-img" src="{{iurl}}/miniapp/images/search.png"></image> | ||
| 31 | + </navigator> | ||
| 32 | + </view> | ||
| 33 | + <view class="choice_list"> | ||
| 34 | + <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}"> | ||
| 35 | + <view class="img-wrap"> | ||
| 36 | + <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image> | ||
| 37 | + </view> | ||
| 38 | + <view class="item-cont"> | ||
| 39 | + <view class="title">{{item.goods_name}}</view> | ||
| 40 | + <!-- 判断是否有活动价 --> | ||
| 41 | + <block wx:if="{{item.prom_price>0}}"> | ||
| 42 | + <!-- 活动价 --> | ||
| 43 | + <view class="price">￥{{item.prom_price}}</view> | ||
| 44 | + <view class="comment flex jc_sb"> | ||
| 45 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 46 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 38 | </view> | 47 | </view> |
| 39 | - <view class="item-cont"> | ||
| 40 | - <view class="title">{{item.goods_name}}</view> | ||
| 41 | - | ||
| 42 | - <!-- 商品价格,先判断下是后又等级价--> | ||
| 43 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
| 44 | - <!-- 当会员是等级卡的时候 --> | ||
| 45 | - <block wx:if="{{card_field}}"> | ||
| 46 | - <!-- 等级价>0 --> | ||
| 47 | - <block wx:if="{{item[card_field]>0}}"> | ||
| 48 | - <view class="flex ai-center"> | ||
| 49 | - <view class="price">￥{{item[card_field]}}</view> | ||
| 50 | - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 51 | - <view class="card_name">{{card_name}}</view></view> | ||
| 52 | - </view> | ||
| 53 | - <view class="comment flex jc_sb"> | ||
| 54 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 55 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 56 | - </view> | ||
| 57 | - </block> | ||
| 58 | - <block wx:else> | ||
| 59 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 60 | - <view class="comment flex jc_sb"> | ||
| 61 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 62 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 63 | - </view> | ||
| 64 | - </block> | ||
| 65 | - </block> | ||
| 66 | - <block wx:else> | ||
| 67 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 68 | - <view class="flex ai-center"> | ||
| 69 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 70 | - <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view> | ||
| 71 | - </view> | ||
| 72 | - <view class="comment flex jc_sb"> | ||
| 73 | - <view class="flex"> | ||
| 74 | - <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view> | ||
| 75 | - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 76 | - {{g_filter.get_card_price(item,card_list,1)}} | ||
| 77 | - </view> | ||
| 78 | - </view> | ||
| 79 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 80 | - </view> | ||
| 81 | - </block> | ||
| 82 | - <block wx:else> | ||
| 83 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 84 | - <view class="comment flex jc_sb"> | ||
| 85 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 86 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 87 | - </view> | ||
| 88 | - </block> | ||
| 89 | - </block> | ||
| 90 | - </block> | ||
| 91 | - <block wx:else> | ||
| 92 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 93 | - <view class="comment flex jc_sb"> | ||
| 94 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 95 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 96 | - </view> | ||
| 97 | - </block> | 48 | + </block> |
| 49 | + <block wx:else> | ||
| 50 | + <!-- 商品价格,先判断下是后又等级价--> | ||
| 51 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 52 | + <!-- 当会员是等级卡的时候 --> | ||
| 53 | + <block wx:if="{{card_field}}"> | ||
| 54 | + <!-- 等级价>0 --> | ||
| 55 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 56 | + <view class="flex ai_and"> | ||
| 57 | + <view class="price">￥{{item[card_field]}}</view> | ||
| 58 | + <view class="card_bg"> | ||
| 59 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 60 | + <view class="card_name">{{card_name}}</view> | ||
| 61 | + </view> | ||
| 62 | + </view> | ||
| 63 | + <view class="comment flex jc_sb"> | ||
| 64 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 65 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 66 | + </view> | ||
| 67 | + </block> | ||
| 68 | + <block wx:else> | ||
| 69 | + <view class="price">￥{{item.shop_price}}</view> | ||
| 70 | + <view class="comment flex jc_sb"> | ||
| 71 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 72 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 73 | + </view> | ||
| 74 | + </block> | ||
| 75 | + </block> | ||
| 76 | + <block wx:else> | ||
| 77 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 78 | + <view class="flex ai-center"> | ||
| 79 | + <view class="price">￥{{item.shop_price}}</view> | ||
| 80 | + <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view> | ||
| 81 | + </view> | ||
| 82 | + <view class="comment flex jc_sb"> | ||
| 83 | + <view class="flex ai_and"> | ||
| 84 | + <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view> | ||
| 85 | + <view class="card_bg"> | ||
| 86 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 87 | + {{g_filter.get_card_price(item,card_list,1)}} | ||
| 88 | + </view> | ||
| 89 | + </view> | ||
| 90 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 91 | + </view> | ||
| 92 | + </block> | ||
| 93 | + <block wx:else> | ||
| 94 | + <view class="price">￥{{item.shop_price}}</view> | ||
| 95 | + <view class="comment flex jc_sb"> | ||
| 96 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 97 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 98 | + </view> | ||
| 99 | + </block> | ||
| 100 | + </block> | ||
| 101 | + </block> | ||
| 102 | + <block wx:else> | ||
| 103 | + <view class="price">￥{{item.shop_price}}</view> | ||
| 104 | + <view class="comment flex jc_sb"> | ||
| 105 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 106 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 98 | </view> | 107 | </view> |
| 99 | - </navigator> | 108 | + </block> |
| 109 | + </block> | ||
| 110 | + </view> | ||
| 111 | + </navigator> | ||
| 100 | </view> | 112 | </view> |
| 101 | <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}"> | 113 | <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}"> |
| 102 | - <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> | ||
| 103 | - <view class="no-data-title">没有相关的数据</view> | ||
| 104 | - <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator> | 114 | + <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> |
| 115 | + <view class="no-data-title">没有相关的数据</view> | ||
| 116 | + <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator> | ||
| 105 | </view> | 117 | </view> |
| 106 | -</view> | ||
| 107 | -<view hidden="{{!openFilterModal}}"> | 118 | + </view> |
| 119 | + <view hidden="{{!openFilterModal}}"> | ||
| 108 | <view bindtap="closeFilterModal" class="cover-layer"></view> | 120 | <view bindtap="closeFilterModal" class="cover-layer"></view> |
| 109 | <view class="filter-modal"> | 121 | <view class="filter-modal"> |
| 110 | - <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon> | ||
| 111 | - <button bindtap="restoreData" class="viewall-btn">显示全部分类</button> | ||
| 112 | - <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}"> | ||
| 113 | - <view class="filter-name">{{item.name}}</view> | ||
| 114 | - <view class="filter-items"> | ||
| 115 | - <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}"> | ||
| 116 | - {{item.name}}</view> | ||
| 117 | - </view> | 122 | + <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon> |
| 123 | + <button bindtap="restoreData" class="viewall-btn">显示全部分类</button> | ||
| 124 | + <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}"> | ||
| 125 | + <view class="filter-name">{{item.name}}</view> | ||
| 126 | + <view class="filter-items"> | ||
| 127 | + <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}"> | ||
| 128 | + {{item.name}}</view> | ||
| 118 | </view> | 129 | </view> |
| 119 | - <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}"> | ||
| 120 | - <view class="filter-name">{{item.name}}</view> | ||
| 121 | - <view class="filter-items"> | ||
| 122 | - <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}"> | ||
| 123 | - {{item.name}}</view> | ||
| 124 | - </view> | 130 | + </view> |
| 131 | + <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}"> | ||
| 132 | + <view class="filter-name">{{item.name}}</view> | ||
| 133 | + <view class="filter-items"> | ||
| 134 | + <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}"> | ||
| 135 | + {{item.name}}</view> | ||
| 125 | </view> | 136 | </view> |
| 126 | - <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}"> | ||
| 127 | - <view class="filter-name">相关品牌</view> | ||
| 128 | - <view class="filter-items"> | ||
| 129 | - <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}"> | ||
| 130 | - {{item.name}}</view> | ||
| 131 | - </view> | 137 | + </view> |
| 138 | + <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}"> | ||
| 139 | + <view class="filter-name">相关品牌</view> | ||
| 140 | + <view class="filter-items"> | ||
| 141 | + <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}"> | ||
| 142 | + {{item.name}}</view> | ||
| 132 | </view> | 143 | </view> |
| 133 | - <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}"> | ||
| 134 | - <view class="filter-name">价格区间</view> | ||
| 135 | - <view class="filter-items"> | ||
| 136 | - <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}"> | ||
| 137 | - {{item.name}}</view> | ||
| 138 | - </view> | 144 | + </view> |
| 145 | + <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}"> | ||
| 146 | + <view class="filter-name">价格区间</view> | ||
| 147 | + <view class="filter-items"> | ||
| 148 | + <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}"> | ||
| 149 | + {{item.name}}</view> | ||
| 139 | </view> | 150 | </view> |
| 151 | + </view> | ||
| 140 | </view> | 152 | </view> |
| 141 | -</view> | 153 | + </view> |
| 142 | \ No newline at end of file | 154 | \ No newline at end of file |
pages/goods/goodsList/goodsList.wxss
| 1 | - .container { | ||
| 2 | - color: #666; | 1 | +.container { |
| 2 | + color: #666; | ||
| 3 | } | 3 | } |
| 4 | 4 | ||
| 5 | .nav-item { | 5 | .nav-item { |
| 6 | - float: left; | ||
| 7 | - width: 30%; | ||
| 8 | - height: 90rpx; | ||
| 9 | - line-height: 90rpx; | ||
| 10 | - display: flex; | ||
| 11 | - align-items: center; | ||
| 12 | - justify-content: center; | ||
| 13 | - font-size: 32rpx; | ||
| 14 | - border-bottom: 1px solid #dfefef; | ||
| 15 | - background-color: #fff; | 6 | + float: left; |
| 7 | + width: 30%; | ||
| 8 | + height: 90rpx; | ||
| 9 | + line-height: 90rpx; | ||
| 10 | + display: flex; | ||
| 11 | + align-items: center; | ||
| 12 | + justify-content: center; | ||
| 13 | + font-size: 32rpx; | ||
| 14 | + border-bottom: 1px solid #dfefef; | ||
| 15 | + background-color: #fff; | ||
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | .nav-item .ico-dg { | 18 | .nav-item .ico-dg { |
| 19 | - width: 18rpx; | ||
| 20 | - height: 12rpx; | ||
| 21 | - margin-left: 10rpx; | ||
| 22 | - line-height: 0; | 19 | + width: 18rpx; |
| 20 | + height: 12rpx; | ||
| 21 | + margin-left: 10rpx; | ||
| 22 | + line-height: 0; | ||
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | .nav-item .ico-filter { | 25 | .nav-item .ico-filter { |
| 26 | - width: 20rpx; | ||
| 27 | - height: 20rpx; | ||
| 28 | - margin-left: 10rpx; | ||
| 29 | - line-height: 0; | 26 | + width: 20rpx; |
| 27 | + height: 20rpx; | ||
| 28 | + margin-left: 10rpx; | ||
| 29 | + line-height: 0; | ||
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | .ico-dir { | 32 | .ico-dir { |
| 33 | - width: 16rpx; | ||
| 34 | - height: 22rpx; | ||
| 35 | - margin-left: 10rpx; | ||
| 36 | - background-repeat: no-repeat; | ||
| 37 | - background-size: cover; | ||
| 38 | - background-position-x: 0; | 33 | + width: 16rpx; |
| 34 | + height: 22rpx; | ||
| 35 | + margin-left: 10rpx; | ||
| 36 | + background-repeat: no-repeat; | ||
| 37 | + background-size: cover; | ||
| 38 | + background-position-x: 0; | ||
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | .ico-dir-dn { | 41 | .ico-dir-dn { |
| 42 | - background-position-x: -16rpx; | 42 | + background-position-x: -16rpx; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | .ico-dir-up { | 45 | .ico-dir-up { |
| 46 | - background-position-x: -32rpx; | 46 | + background-position-x: -32rpx; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | .search { | 49 | .search { |
| 50 | - width: 10%; | 50 | + width: 10%; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | .search-img { | 53 | .search-img { |
| 54 | - width: 30rpx; | ||
| 55 | - height: 30rpx; | 54 | + width: 30rpx; |
| 55 | + height: 30rpx; | ||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | .choice_list { | 58 | .choice_list { |
| 59 | - background-color: #fff; | 59 | + background-color: #fff; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | .choice_item { | 62 | .choice_item { |
| 63 | - position: relative; | ||
| 64 | - width: 100%; | ||
| 65 | - min-height: 200rpx; | ||
| 66 | - padding: 10rpx 0; | ||
| 67 | - border-bottom: 1px solid #dfefef; | ||
| 68 | - font-size: 30rpx; | 63 | + position: relative; |
| 64 | + width: 100%; | ||
| 65 | + min-height: 200rpx; | ||
| 66 | + padding: 10rpx 0; | ||
| 67 | + border-bottom: 1px solid #dfefef; | ||
| 68 | + font-size: 30rpx; | ||
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | .img-wrap { | 71 | .img-wrap { |
| 72 | - float: left; | ||
| 73 | - width: 180rpx; | ||
| 74 | - height: 180rpx; | ||
| 75 | - padding: 0 10rpx 10rpx; | 72 | + float: left; |
| 73 | + width: 180rpx; | ||
| 74 | + height: 180rpx; | ||
| 75 | + padding: 0 10rpx 10rpx; | ||
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | .img-wrap image { | 78 | .img-wrap image { |
| 79 | - width: 100%; | ||
| 80 | - height: 100%; | 79 | + width: 100%; |
| 80 | + height: 100%; | ||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | .item-cont .title { | 83 | .item-cont .title { |
| 84 | - height: 72rpx; | ||
| 85 | - margin: 16rpx 0; | ||
| 86 | - padding-right: 10rpx; | ||
| 87 | - line-height: 36rpx; | ||
| 88 | - color: #333; | ||
| 89 | - overflow: hidden; | 84 | + height: 72rpx; |
| 85 | + margin: 16rpx 0; | ||
| 86 | + padding-right: 10rpx; | ||
| 87 | + line-height: 36rpx; | ||
| 88 | + color: #333; | ||
| 89 | + overflow: hidden; | ||
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | .price { | 92 | .price { |
| 93 | - display: inline-block; | ||
| 94 | - color: #f23030; | ||
| 95 | - line-height: 24rpx; | ||
| 96 | - /* padding-bottom: 20rpx; */ | 93 | + display: inline-block; |
| 94 | + color: #f23030; | ||
| 95 | + line-height: 24rpx; | ||
| 96 | + /* padding-bottom: 20rpx; */ | ||
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | .comment { | 99 | .comment { |
| 100 | - font-size: 25rpx; | ||
| 101 | - margin-top: 4rpx; | ||
| 102 | - padding-right:30rpx | 100 | + font-size: 25rpx; |
| 101 | + margin-top: 4rpx; | ||
| 102 | + padding-right: 30rpx; | ||
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | .filter-modal { | 105 | .filter-modal { |
| 106 | - position: fixed; | ||
| 107 | - left: 150rpx; | ||
| 108 | - top: 0; | ||
| 109 | - right: 0; | ||
| 110 | - bottom: 0; | ||
| 111 | - z-index: 20; | ||
| 112 | - background-color: white; | ||
| 113 | - overflow-x: hidden; | ||
| 114 | - padding-bottom: 30rpx; | 106 | + position: fixed; |
| 107 | + left: 150rpx; | ||
| 108 | + top: 0; | ||
| 109 | + right: 0; | ||
| 110 | + bottom: 0; | ||
| 111 | + z-index: 20; | ||
| 112 | + background-color: white; | ||
| 113 | + overflow-x: hidden; | ||
| 114 | + padding-bottom: 30rpx; | ||
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | .filter-box { | 117 | .filter-box { |
| 118 | - box-sizing: border-box; | ||
| 119 | - width: 100%; | ||
| 120 | - font-size: 28rpx; | ||
| 121 | - padding: 20rpx; | 118 | + box-sizing: border-box; |
| 119 | + width: 100%; | ||
| 120 | + font-size: 28rpx; | ||
| 121 | + padding: 20rpx; | ||
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | .filter-name { | 124 | .filter-name { |
| 125 | - width: 100%; | ||
| 126 | - padding: 20rpx 0; | ||
| 127 | - word-break: keep-all; | ||
| 128 | - white-space: nowrap; | ||
| 129 | - text-overflow: ellipsis; | ||
| 130 | - overflow: hidden; | ||
| 131 | - font-size: 30rpx; | 125 | + width: 100%; |
| 126 | + padding: 20rpx 0; | ||
| 127 | + word-break: keep-all; | ||
| 128 | + white-space: nowrap; | ||
| 129 | + text-overflow: ellipsis; | ||
| 130 | + overflow: hidden; | ||
| 131 | + font-size: 30rpx; | ||
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | .filter-items { | 134 | .filter-items { |
| 135 | - width: 100%; | 135 | + width: 100%; |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | .filter-item { | 138 | .filter-item { |
| 139 | - float: left; | ||
| 140 | - width: fit-content; | ||
| 141 | - max-width: 500rpx; | ||
| 142 | - word-break: keep-all; | ||
| 143 | - white-space: nowrap; | ||
| 144 | - text-overflow: ellipsis; | ||
| 145 | - overflow: hidden; | ||
| 146 | - padding: 10rpx; | ||
| 147 | - border-radius: 10rpx; | ||
| 148 | - border: 1rpx #ddd solid; | ||
| 149 | - margin: 0 10rpx 10rpx 0; | ||
| 150 | - background-color: #fdfdfd; | ||
| 151 | - color: #666; | 139 | + float: left; |
| 140 | + width: fit-content; | ||
| 141 | + max-width: 500rpx; | ||
| 142 | + word-break: keep-all; | ||
| 143 | + white-space: nowrap; | ||
| 144 | + text-overflow: ellipsis; | ||
| 145 | + overflow: hidden; | ||
| 146 | + padding: 10rpx; | ||
| 147 | + border-radius: 10rpx; | ||
| 148 | + border: 1rpx #ddd solid; | ||
| 149 | + margin: 0 10rpx 10rpx 0; | ||
| 150 | + background-color: #fdfdfd; | ||
| 151 | + color: #666; | ||
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | .viewall-btn { | 154 | .viewall-btn { |
| 155 | - margin-top: 20rpx; | ||
| 156 | - width: 300rpx; | 155 | + margin-top: 20rpx; |
| 156 | + width: 300rpx; | ||
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | -.card_bg {display: flex; max-width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx; | ||
| 160 | -background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx; | ||
| 161 | -padding: 2rpx 10rpx;width: auto; | 159 | +.card_bg { |
| 160 | + display: flex; | ||
| 161 | + max-width: 110rpx; | ||
| 162 | + height: 25rpx; | ||
| 163 | + align-items: center; | ||
| 164 | + border-radius: 26rpx; | ||
| 165 | + font-size: 19rpx; | ||
| 166 | + background: #333; | ||
| 167 | + color: #fff; | ||
| 168 | + justify-content: center; | ||
| 169 | + margin-left: 8rpx; | ||
| 170 | + margin-top: 7rpx; | ||
| 171 | + line-height: 25rpx; | ||
| 172 | + padding: 2rpx 10rpx; | ||
| 173 | + width: auto; | ||
| 174 | +} | ||
| 175 | + | ||
| 176 | +.card_bg .card_name { | ||
| 177 | + max-width: 76rpx; | ||
| 178 | + width: auto; | ||
| 179 | + overflow: hidden; | ||
| 180 | + white-space: nowrap; | ||
| 181 | +} | ||
| 162 | 182 | ||
| 183 | +.card_bg image { | ||
| 184 | + width: 19rpx; | ||
| 185 | + height: 19rpx; | ||
| 186 | + margin-right: 1rpx; | ||
| 187 | + vertical-align: middle; | ||
| 163 | } | 188 | } |
| 164 | -.card_bg .card_name{ | ||
| 165 | - max-width: 76rpx; | ||
| 166 | - width: auto; | ||
| 167 | - overflow: hidden; | ||
| 168 | - white-space:nowrap; | 189 | + |
| 190 | +.mk_price { | ||
| 191 | + margin-left: 10rpx; | ||
| 192 | + font-size: 25rpx; | ||
| 193 | +} | ||
| 194 | + | ||
| 195 | +.item-cont { | ||
| 196 | + line-height: 38rpx; | ||
| 169 | } | 197 | } |
| 170 | -.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle} | ||
| 171 | -.mk_price{margin-left: 10rpx; font-size: 25rpx;} | ||
| 172 | -.item-cont{ line-height: 38rpx} | ||
| 173 | \ No newline at end of file | 198 | \ No newline at end of file |
pages/goods/search/search.wxml
| 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> | 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> |
| 2 | <view class="container"> | 2 | <view class="container"> |
| 3 | - <view class="nav"> | ||
| 4 | - <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合 | ||
| 5 | - <view class="ico-dg" wx:if="{{tabname=='goods_id'}}"> | ||
| 6 | - <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 7 | - <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 8 | - </view> | ||
| 9 | - </navigator> | ||
| 10 | - <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}" >销量 | ||
| 11 | - <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}"> | ||
| 12 | - <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 13 | - <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 14 | - </view> | ||
| 15 | - </navigator> | ||
| 16 | - <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}" >价格 | ||
| 17 | - <view class="ico-dg" wx:if="{{tabname=='shop_price'}}"> | ||
| 18 | - <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 19 | - <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 20 | - </view> | ||
| 21 | - </navigator> | ||
| 22 | - <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter"> | 3 | + <view class="nav"> |
| 4 | + <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合 | ||
| 5 | + <view class="ico-dg" wx:if="{{tabname=='goods_id'}}"> | ||
| 6 | + <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 7 | + <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 8 | + </view> | ||
| 9 | + </navigator> | ||
| 10 | + <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量 | ||
| 11 | + <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}"> | ||
| 12 | + <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 13 | + <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 14 | + </view> | ||
| 15 | + </navigator> | ||
| 16 | + <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">价格 | ||
| 17 | + <view class="ico-dg" wx:if="{{tabname=='shop_price'}}"> | ||
| 18 | + <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | ||
| 19 | + <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | ||
| 20 | + </view> | ||
| 21 | + </navigator> | ||
| 22 | + <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter"> | ||
| 23 | <image class="wh100" src="{{url}}/miniapp/images/xx.png"></image> | 23 | <image class="wh100" src="{{url}}/miniapp/images/xx.png"></image> |
| 24 | </view> | 24 | </view> |
| 25 | </navigator> --> | 25 | </navigator> --> |
| 26 | - <navigator bindtap="openSearchModal" class="nav-item nav-search"> | ||
| 27 | - <image class="wh100 search-img" src="{{url}}/miniapp/images/search.png"></image> | ||
| 28 | - </navigator> | ||
| 29 | - </view> | ||
| 30 | - <view class="choice_list"> | ||
| 31 | - <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}"> | ||
| 32 | - <view class="img-wrap"> | ||
| 33 | - <image src="{{item.original_img}}" lazy-load="true" | ||
| 34 | - binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image> | ||
| 35 | - </view> | ||
| 36 | - <view class="item-cont"> | ||
| 37 | - <view class="title">{{item.goods_name}}</view> | ||
| 38 | - <!-- 商品价格,先判断下是后又等级价--> | ||
| 39 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
| 40 | - <!-- 当会员是等级卡的时候 --> | ||
| 41 | - <block wx:if="{{card_field}}"> | ||
| 42 | - <!-- 等级价>0 --> | ||
| 43 | - <block wx:if="{{item[card_field]>0}}"> | ||
| 44 | - <view class="flex ai-center"> | ||
| 45 | - <view class="price">￥{{item[card_field]}}</view> | ||
| 46 | - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 47 | - <view class="card_name">{{card_name}}</view> | ||
| 48 | - </view> | ||
| 49 | - </view> | ||
| 50 | - <view class="comment flex jc_sb"> | ||
| 51 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 52 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 53 | - </view> | ||
| 54 | - </block> | ||
| 55 | - <block wx:else> | ||
| 56 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 57 | - <view class="comment flex jc_sb"> | ||
| 58 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 59 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 60 | - </view> | ||
| 61 | - </block> | ||
| 62 | - </block> | ||
| 63 | - <block wx:else> | ||
| 64 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 65 | - <view class="flex ai-center"> | ||
| 66 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 67 | - <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view> | ||
| 68 | - </view> | ||
| 69 | - <view class="comment flex jc_sb"> | ||
| 70 | - <view class="flex"> | ||
| 71 | - <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view> | ||
| 72 | - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 73 | - {{g_filter.get_card_price(item,card_list,1)}} | ||
| 74 | - </view> | ||
| 75 | - </view> | ||
| 76 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 77 | - </view> | ||
| 78 | - </block> | ||
| 79 | - <block wx:else> | ||
| 80 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 81 | - <view class="comment flex jc_sb"> | ||
| 82 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 83 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 84 | - </view> | ||
| 85 | - </block> | ||
| 86 | - </block> | ||
| 87 | - </block> | ||
| 88 | - <block wx:else> | ||
| 89 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 90 | - <view class="comment flex jc_sb"> | ||
| 91 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 92 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 93 | - </view> | ||
| 94 | - </block> | 26 | + <navigator bindtap="openSearchModal" class="nav-item nav-search"> |
| 27 | + <image class="wh100 search-img" src="{{url}}/miniapp/images/search.png"></image> | ||
| 28 | + </navigator> | ||
| 29 | + </view> | ||
| 30 | + <view class="choice_list"> | ||
| 31 | + <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}"> | ||
| 32 | + <view class="img-wrap"> | ||
| 33 | + <image src="{{item.original_img}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image> | ||
| 34 | + </view> | ||
| 35 | + <view class="item-cont"> | ||
| 36 | + <view class="title">{{item.goods_name}}</view> | ||
| 37 | + <!-- 判断是否有活动价 --> | ||
| 38 | + <block wx:if="{{item.prom_price>0}}"> | ||
| 39 | + <!-- 活动价 --> | ||
| 40 | + <view class="price">￥{{item.prom_price}}</view> | ||
| 41 | + <view class="comment flex jc_sb"> | ||
| 42 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 43 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 44 | + </view> | ||
| 45 | + </block> | ||
| 46 | + <block wx:else> | ||
| 47 | + <!-- 商品价格,先判断下是后又等级价--> | ||
| 48 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 49 | + <!-- 当会员是等级卡的时候 --> | ||
| 50 | + <block wx:if="{{card_field}}"> | ||
| 51 | + <!-- 等级价>0 --> | ||
| 52 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 53 | + <view class="flex ai_and"> | ||
| 54 | + <view class="price">￥{{item[card_field]}}</view> | ||
| 55 | + <view class="card_bg"> | ||
| 56 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 57 | + <view class="card_name">{{card_name}}</view> | ||
| 58 | + </view> | ||
| 59 | + </view> | ||
| 60 | + <view class="comment flex jc_sb"> | ||
| 61 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 62 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 63 | + </view> | ||
| 64 | + </block> | ||
| 65 | + <block wx:else> | ||
| 66 | + <view class="price">￥{{item.shop_price}}</view> | ||
| 67 | + <view class="comment flex jc_sb"> | ||
| 68 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 69 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 70 | + </view> | ||
| 71 | + </block> | ||
| 72 | + </block> | ||
| 73 | + <block wx:else> | ||
| 74 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 75 | + <view class="flex ai-center"> | ||
| 76 | + <view class="price">￥{{item.shop_price}}</view> | ||
| 77 | + <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view> | ||
| 78 | + </view> | ||
| 79 | + <view class="comment flex jc_sb"> | ||
| 80 | + <view class="flex ai_and"> | ||
| 81 | + <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view> | ||
| 82 | + <view class="card_bg"> | ||
| 83 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 84 | + {{g_filter.get_card_price(item,card_list,1)}} | ||
| 85 | + </view> | ||
| 86 | + </view> | ||
| 87 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 88 | + </view> | ||
| 89 | + </block> | ||
| 90 | + <block wx:else> | ||
| 91 | + <view class="price">￥{{item.shop_price}}</view> | ||
| 92 | + <view class="comment flex jc_sb"> | ||
| 93 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 94 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 95 | + </view> | ||
| 96 | + </block> | ||
| 97 | + </block> | ||
| 98 | + </block> | ||
| 99 | + <block wx:else> | ||
| 100 | + <view class="price">￥{{item.shop_price}}</view> | ||
| 101 | + <view class="comment flex jc_sb"> | ||
| 102 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 103 | + <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 95 | </view> | 104 | </view> |
| 96 | - </navigator> | ||
| 97 | - </view> | ||
| 98 | - <view class="no-data" wx:if="{{!requestData||requestData.length==0}}"> | ||
| 99 | - <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image> | ||
| 100 | - <view class="no-data-title">没有相关的数据</view> | ||
| 101 | - <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator> | ||
| 102 | - </view> | 105 | + </block> |
| 106 | + </block> | ||
| 107 | + </view> | ||
| 108 | + </navigator> | ||
| 109 | + </view> | ||
| 110 | + <view class="no-data" wx:if="{{!requestData||requestData.length==0}}"> | ||
| 111 | + <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image> | ||
| 112 | + <view class="no-data-title">没有相关的数据</view> | ||
| 113 | + <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator> | ||
| 114 | + </view> | ||
| 103 | </view> | 115 | </view> |
| 104 | <view hidden="{{!openFilterModal}}"> | 116 | <view hidden="{{!openFilterModal}}"> |
| 105 | - <view bindtap="closeFilterModal" class="cover-layer"></view> | ||
| 106 | - <view class="filter-modal"> | ||
| 107 | - <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon> | ||
| 108 | - <button bindtap="restoreData" class="viewall-btn">显示全部分类</button> | ||
| 109 | - <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}"> | ||
| 110 | - <view class="filter-name">{{item.name}}</view> | ||
| 111 | - <view class="filter-items"> | ||
| 112 | - <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}"> | ||
| 113 | - {{item.name}}</view> | ||
| 114 | - </view> | ||
| 115 | - </view> | ||
| 116 | - <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}"> | ||
| 117 | - <view class="filter-name">{{item.name}}</view> | ||
| 118 | - <view class="filter-items"> | ||
| 119 | - <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}"> | ||
| 120 | - {{item.name}}</view> | ||
| 121 | - </view> | ||
| 122 | - </view> | ||
| 123 | - <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}"> | ||
| 124 | - <view class="filter-name">相关品牌</view> | ||
| 125 | - <view class="filter-items"> | ||
| 126 | - <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}"> | ||
| 127 | - {{item.name}}</view> | ||
| 128 | - </view> | ||
| 129 | - </view> | ||
| 130 | - <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}"> | ||
| 131 | - <view class="filter-name">价格区间</view> | ||
| 132 | - <view class="filter-items"> | ||
| 133 | - <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}"> | ||
| 134 | - {{item.name}}</view> | ||
| 135 | - </view> | ||
| 136 | - </view> | 117 | + <view bindtap="closeFilterModal" class="cover-layer"></view> |
| 118 | + <view class="filter-modal"> | ||
| 119 | + <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon> | ||
| 120 | + <button bindtap="restoreData" class="viewall-btn">显示全部分类</button> | ||
| 121 | + <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}"> | ||
| 122 | + <view class="filter-name">{{item.name}}</view> | ||
| 123 | + <view class="filter-items"> | ||
| 124 | + <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}"> | ||
| 125 | + {{item.name}}</view> | ||
| 126 | + </view> | ||
| 127 | + </view> | ||
| 128 | + <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}"> | ||
| 129 | + <view class="filter-name">{{item.name}}</view> | ||
| 130 | + <view class="filter-items"> | ||
| 131 | + <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}"> | ||
| 132 | + {{item.name}}</view> | ||
| 133 | + </view> | ||
| 134 | + </view> | ||
| 135 | + <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}"> | ||
| 136 | + <view class="filter-name">相关品牌</view> | ||
| 137 | + <view class="filter-items"> | ||
| 138 | + <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}"> | ||
| 139 | + {{item.name}}</view> | ||
| 140 | + </view> | ||
| 137 | </view> | 141 | </view> |
| 142 | + <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}"> | ||
| 143 | + <view class="filter-name">价格区间</view> | ||
| 144 | + <view class="filter-items"> | ||
| 145 | + <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}"> | ||
| 146 | + {{item.name}}</view> | ||
| 147 | + </view> | ||
| 148 | + </view> | ||
| 149 | + </view> | ||
| 138 | </view> | 150 | </view> |
| 139 | <view wx:if="{{openSearchModal}}"> | 151 | <view wx:if="{{openSearchModal}}"> |
| 140 | - <view class="search-modal"> | ||
| 141 | - <view class="search-bar"> | ||
| 142 | - <form bindsubmit="submitSearch"> | ||
| 143 | - <input autoFocus class="search-input" name="word" placeholder="搜索商品"></input> | ||
| 144 | - <button class="search-btn" formType="submit"> | ||
| 145 | - <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image> | ||
| 146 | - </button> | ||
| 147 | - </form> | ||
| 148 | - </view> | ||
| 149 | - <view class="search-hot"> | ||
| 150 | - <view class="hot-title">热门搜索</view> | ||
| 151 | - <block wx:if="{{hotWords.length>0}}"> | ||
| 152 | - <view class="hot-row" wx:for="{{hotWords}}" wx:key="{{index}}"> | ||
| 153 | - <view bindtap="searchHotWord" class="hot-item" data-word="{{item}}" wx:for="{{item}}" wx:key="{{index}}">{{item}}</view> | ||
| 154 | - </view> | ||
| 155 | - </block> | 152 | + <view class="search-modal"> |
| 153 | + <view class="search-bar"> | ||
| 154 | + <form bindsubmit="submitSearch"> | ||
| 155 | + <input autoFocus class="search-input" name="word" placeholder="搜索商品"></input> | ||
| 156 | + <button class="search-btn" formType="submit"> | ||
| 157 | + <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image> | ||
| 158 | + </button> | ||
| 159 | + </form> | ||
| 160 | + </view> | ||
| 161 | + <view class="search-hot"> | ||
| 162 | + <view class="hot-title">热门搜索</view> | ||
| 163 | + <block wx:if="{{hotWords.length>0}}"> | ||
| 164 | + <view class="hot-row" wx:for="{{hotWords}}" wx:key="{{index}}"> | ||
| 165 | + <view bindtap="searchHotWord" class="hot-item" data-word="{{item}}" wx:for="{{item}}" wx:key="{{index}}">{{item}}</view> | ||
| 156 | </view> | 166 | </view> |
| 167 | + </block> | ||
| 157 | </view> | 168 | </view> |
| 158 | -</view> | 169 | + </view> |
| 170 | +</view> | ||
| 159 | \ No newline at end of file | 171 | \ No newline at end of file |
pages/goods/search/search.wxss
| 1 | .container { | 1 | .container { |
| 2 | - color: #666; | 2 | + color: #666; |
| 3 | } | 3 | } |
| 4 | 4 | ||
| 5 | .nav-item { | 5 | .nav-item { |
| 6 | - float: left; | ||
| 7 | - width: 30%; | ||
| 8 | - height: 90rpx; | ||
| 9 | - line-height: 90rpx; | ||
| 10 | - display: flex; | ||
| 11 | - align-items: center; | ||
| 12 | - justify-content: center; | ||
| 13 | - font-size: 32rpx; | ||
| 14 | - border-bottom: 1px solid #dfefef; | ||
| 15 | - background-color: #fff; | 6 | + float: left; |
| 7 | + width: 30%; | ||
| 8 | + height: 90rpx; | ||
| 9 | + line-height: 90rpx; | ||
| 10 | + display: flex; | ||
| 11 | + align-items: center; | ||
| 12 | + justify-content: center; | ||
| 13 | + font-size: 32rpx; | ||
| 14 | + border-bottom: 1px solid #dfefef; | ||
| 15 | + background-color: #fff; | ||
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | .nav-item .ico-dg { | 18 | .nav-item .ico-dg { |
| 19 | - width: 18rpx; | ||
| 20 | - height: 12rpx; | ||
| 21 | - margin-left: 10rpx; | ||
| 22 | - line-height: 0; | 19 | + width: 18rpx; |
| 20 | + height: 12rpx; | ||
| 21 | + margin-left: 10rpx; | ||
| 22 | + line-height: 0; | ||
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | .nav-item .ico-filter { | 25 | .nav-item .ico-filter { |
| 26 | - width: 20rpx; | ||
| 27 | - height: 20rpx; | ||
| 28 | - margin-left: 10rpx; | ||
| 29 | - line-height: 0; | 26 | + width: 20rpx; |
| 27 | + height: 20rpx; | ||
| 28 | + margin-left: 10rpx; | ||
| 29 | + line-height: 0; | ||
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | .ico-dir { | 32 | .ico-dir { |
| 33 | - width: 16rpx; | ||
| 34 | - height: 22rpx; | ||
| 35 | - margin-left: 10rpx; | ||
| 36 | - background-repeat: no-repeat; | ||
| 37 | - background-size: cover; | ||
| 38 | - background-position-x: 0; | 33 | + width: 16rpx; |
| 34 | + height: 22rpx; | ||
| 35 | + margin-left: 10rpx; | ||
| 36 | + background-repeat: no-repeat; | ||
| 37 | + background-size: cover; | ||
| 38 | + background-position-x: 0; | ||
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | .ico-dir-dn { | 41 | .ico-dir-dn { |
| 42 | - background-position-x: -16rpx; | 42 | + background-position-x: -16rpx; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | .ico-dir-up { | 45 | .ico-dir-up { |
| 46 | - background-position-x: -32rpx; | 46 | + background-position-x: -32rpx; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | .nav-search { | 49 | .nav-search { |
| 50 | - width: 10%; | 50 | + width: 10%; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | .nav-item .search-img { | 53 | .nav-item .search-img { |
| 54 | - width: 30rpx; | ||
| 55 | - height: 30rpx; | 54 | + width: 30rpx; |
| 55 | + height: 30rpx; | ||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | .choice_list { | 58 | .choice_list { |
| 59 | - background-color: #fff; | 59 | + background-color: #fff; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | .choice_item { | 62 | .choice_item { |
| 63 | - position: relative; | ||
| 64 | - width: 100%; | ||
| 65 | - min-height: 200rpx; | ||
| 66 | - padding: 10rpx 0; | ||
| 67 | - border-bottom: 1px solid #dfefef; | ||
| 68 | - font-size: 30rpx; | 63 | + position: relative; |
| 64 | + width: 100%; | ||
| 65 | + min-height: 200rpx; | ||
| 66 | + padding: 10rpx 0; | ||
| 67 | + border-bottom: 1px solid #dfefef; | ||
| 68 | + font-size: 30rpx; | ||
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | .img-wrap { | 71 | .img-wrap { |
| 72 | - float: left; | ||
| 73 | - width: 180rpx; | ||
| 74 | - height: 180rpx; | ||
| 75 | - padding: 0 10rpx 10rpx; | 72 | + float: left; |
| 73 | + width: 180rpx; | ||
| 74 | + height: 180rpx; | ||
| 75 | + padding: 0 10rpx 10rpx; | ||
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | .img-wrap image { | 78 | .img-wrap image { |
| 79 | - width: 100%; | ||
| 80 | - height: 100%; | 79 | + width: 100%; |
| 80 | + height: 100%; | ||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | .item-cont .title { | 83 | .item-cont .title { |
| 84 | - height: 72rpx; | ||
| 85 | - margin: 16rpx 0; | ||
| 86 | - padding-right: 10rpx; | ||
| 87 | - line-height: 36rpx; | ||
| 88 | - color: #333; | ||
| 89 | - overflow: hidden; | 84 | + height: 72rpx; |
| 85 | + margin: 16rpx 0; | ||
| 86 | + padding-right: 10rpx; | ||
| 87 | + line-height: 36rpx; | ||
| 88 | + color: #333; | ||
| 89 | + overflow: hidden; | ||
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | .price { | 92 | .price { |
| 93 | - display: inline-block; | ||
| 94 | - color: #f23030; | ||
| 95 | - line-height: 24rpx; | ||
| 96 | - /* padding-bottom: 20rpx; */ | 93 | + display: inline-block; |
| 94 | + color: #f23030; | ||
| 95 | + line-height: 24rpx; | ||
| 96 | + /* padding-bottom: 20rpx; */ | ||
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | .comment { | 99 | .comment { |
| 100 | - font-size: 25rpx; | ||
| 101 | - padding-right:30rpx; | ||
| 102 | - margin-top:4rpx | ||
| 103 | - | 100 | + font-size: 25rpx; |
| 101 | + padding-right: 30rpx; | ||
| 102 | + margin-top: 4rpx; | ||
| 104 | } | 103 | } |
| 105 | 104 | ||
| 106 | .filter-modal { | 105 | .filter-modal { |
| 107 | - position: fixed; | ||
| 108 | - left: 150rpx; | ||
| 109 | - top: 0; | ||
| 110 | - right: 0; | ||
| 111 | - bottom: 0; | ||
| 112 | - z-index: 20; | ||
| 113 | - background-color: white; | ||
| 114 | - overflow-x: hidden; | ||
| 115 | - padding-bottom: 30rpx; | 106 | + position: fixed; |
| 107 | + left: 150rpx; | ||
| 108 | + top: 0; | ||
| 109 | + right: 0; | ||
| 110 | + bottom: 0; | ||
| 111 | + z-index: 20; | ||
| 112 | + background-color: white; | ||
| 113 | + overflow-x: hidden; | ||
| 114 | + padding-bottom: 30rpx; | ||
| 116 | } | 115 | } |
| 117 | 116 | ||
| 118 | .filter-box { | 117 | .filter-box { |
| 119 | - box-sizing: border-box; | ||
| 120 | - width: 100%; | ||
| 121 | - font-size: 28rpx; | ||
| 122 | - padding: 20rpx; | 118 | + box-sizing: border-box; |
| 119 | + width: 100%; | ||
| 120 | + font-size: 28rpx; | ||
| 121 | + padding: 20rpx; | ||
| 123 | } | 122 | } |
| 124 | 123 | ||
| 125 | .filter-name { | 124 | .filter-name { |
| 126 | - width: 100%; | ||
| 127 | - padding: 20rpx 0; | ||
| 128 | - word-break: keep-all; | ||
| 129 | - white-space: nowrap; | ||
| 130 | - text-overflow: ellipsis; | ||
| 131 | - overflow: hidden; | ||
| 132 | - font-size: 30rpx; | 125 | + width: 100%; |
| 126 | + padding: 20rpx 0; | ||
| 127 | + word-break: keep-all; | ||
| 128 | + white-space: nowrap; | ||
| 129 | + text-overflow: ellipsis; | ||
| 130 | + overflow: hidden; | ||
| 131 | + font-size: 30rpx; | ||
| 133 | } | 132 | } |
| 134 | 133 | ||
| 135 | .filter-items { | 134 | .filter-items { |
| 136 | - width: 100%; | 135 | + width: 100%; |
| 137 | } | 136 | } |
| 138 | 137 | ||
| 139 | .filter-item { | 138 | .filter-item { |
| 140 | - float: left; | ||
| 141 | - width: fit-content; | ||
| 142 | - max-width: 500rpx; | ||
| 143 | - word-break: keep-all; | ||
| 144 | - white-space: nowrap; | ||
| 145 | - text-overflow: ellipsis; | ||
| 146 | - overflow: hidden; | ||
| 147 | - padding: 10rpx; | ||
| 148 | - border-radius: 10rpx; | ||
| 149 | - border: 1rpx #ddd solid; | ||
| 150 | - margin: 0 10rpx 10rpx 0; | ||
| 151 | - background-color: #fdfdfd; | ||
| 152 | - color: #666; | 139 | + float: left; |
| 140 | + width: fit-content; | ||
| 141 | + max-width: 500rpx; | ||
| 142 | + word-break: keep-all; | ||
| 143 | + white-space: nowrap; | ||
| 144 | + text-overflow: ellipsis; | ||
| 145 | + overflow: hidden; | ||
| 146 | + padding: 10rpx; | ||
| 147 | + border-radius: 10rpx; | ||
| 148 | + border: 1rpx #ddd solid; | ||
| 149 | + margin: 0 10rpx 10rpx 0; | ||
| 150 | + background-color: #fdfdfd; | ||
| 151 | + color: #666; | ||
| 153 | } | 152 | } |
| 154 | 153 | ||
| 155 | .viewall-btn { | 154 | .viewall-btn { |
| 156 | - margin-top: 20rpx; | ||
| 157 | - width: 300rpx; | 155 | + margin-top: 20rpx; |
| 156 | + width: 300rpx; | ||
| 158 | } | 157 | } |
| 159 | 158 | ||
| 160 | .search-modal { | 159 | .search-modal { |
| 161 | - position: fixed; | ||
| 162 | - top: 0; | ||
| 163 | - right: 0; | ||
| 164 | - left: 0; | ||
| 165 | - bottom: 0; | ||
| 166 | - z-index: 20; | ||
| 167 | - background-color: white; | ||
| 168 | - overflow-x: hidden; | ||
| 169 | - padding: 80rpx 30rpx; | ||
| 170 | - font-size: 30rpx; | ||
| 171 | - color: #555555; | 160 | + position: fixed; |
| 161 | + top: 0; | ||
| 162 | + right: 0; | ||
| 163 | + left: 0; | ||
| 164 | + bottom: 0; | ||
| 165 | + z-index: 20; | ||
| 166 | + background-color: white; | ||
| 167 | + overflow-x: hidden; | ||
| 168 | + padding: 80rpx 30rpx; | ||
| 169 | + font-size: 30rpx; | ||
| 170 | + color: #555; | ||
| 172 | } | 171 | } |
| 173 | 172 | ||
| 174 | .search-bar { | 173 | .search-bar { |
| 175 | - width: 100%; | ||
| 176 | - box-sizing: border-box; | 174 | + width: 100%; |
| 175 | + box-sizing: border-box; | ||
| 177 | } | 176 | } |
| 178 | 177 | ||
| 179 | .search-input { | 178 | .search-input { |
| 180 | - width: 80%; | ||
| 181 | - float: left; | ||
| 182 | - border: 1rpx solid #e0e0e0; | ||
| 183 | - box-sizing: border-box; | ||
| 184 | - height: 80rpx; | ||
| 185 | - padding-left: 20rpx; | ||
| 186 | - border-top-left-radius: 10rpx; | ||
| 187 | - border-bottom-left-radius: 10rpx; | 179 | + width: 80%; |
| 180 | + float: left; | ||
| 181 | + border: 1rpx solid #e0e0e0; | ||
| 182 | + box-sizing: border-box; | ||
| 183 | + height: 80rpx; | ||
| 184 | + padding-left: 20rpx; | ||
| 185 | + border-top-left-radius: 10rpx; | ||
| 186 | + border-bottom-left-radius: 10rpx; | ||
| 188 | } | 187 | } |
| 189 | 188 | ||
| 190 | .search-btn { | 189 | .search-btn { |
| 191 | - width: 20%; | ||
| 192 | - height: 80rpx; | ||
| 193 | - background-color: #f23030; | ||
| 194 | - display: inline-block; | ||
| 195 | - text-align: center; | ||
| 196 | - border-top-right-radius: 10rpx; | ||
| 197 | - border-bottom-right-radius: 10rpx; | 190 | + width: 20%; |
| 191 | + height: 80rpx; | ||
| 192 | + background-color: #f23030; | ||
| 193 | + display: inline-block; | ||
| 194 | + text-align: center; | ||
| 195 | + border-top-right-radius: 10rpx; | ||
| 196 | + border-bottom-right-radius: 10rpx; | ||
| 198 | } | 197 | } |
| 199 | 198 | ||
| 200 | .search-btn .search-img { | 199 | .search-btn .search-img { |
| 201 | - height: 45rpx; | ||
| 202 | - width: 45rpx; | ||
| 203 | - padding: 20rpx; | 200 | + height: 45rpx; |
| 201 | + width: 45rpx; | ||
| 202 | + padding: 20rpx; | ||
| 204 | } | 203 | } |
| 205 | 204 | ||
| 206 | .search-hot { | 205 | .search-hot { |
| 207 | - margin-top: 40rpx; | 206 | + margin-top: 40rpx; |
| 208 | } | 207 | } |
| 209 | 208 | ||
| 210 | .hot-title { | 209 | .hot-title { |
| 211 | - font-size: 35rpx; | ||
| 212 | - color: black; | ||
| 213 | - margin-bottom: 30rpx; | 210 | + font-size: 35rpx; |
| 211 | + color: black; | ||
| 212 | + margin-bottom: 30rpx; | ||
| 214 | } | 213 | } |
| 215 | 214 | ||
| 216 | .hot-row { | 215 | .hot-row { |
| 217 | - display: flex; | ||
| 218 | - /*--justify-content: space-between---*/ | ||
| 219 | - padding: 15rpx 10rpx; | 216 | + display: flex; |
| 217 | + /*--justify-content: space-between---*/ | ||
| 218 | + padding: 15rpx 10rpx; | ||
| 220 | } | 219 | } |
| 221 | 220 | ||
| 222 | .hot-item { | 221 | .hot-item { |
| 223 | - padding: 8rpx 8rpx; | ||
| 224 | - border: 1rpx solid #e0e0e0; | ||
| 225 | - border-radius: 10rpx; | ||
| 226 | - font-size: 28rpx; | ||
| 227 | - margin-left: 15rpx; | ||
| 228 | -} | ||
| 229 | - | ||
| 230 | -.card_bg {display: flex; max-width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;padding: 2rpx 10rpx; | ||
| 231 | -background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx; width: auto} | ||
| 232 | -.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle} | ||
| 233 | -.card_bg .card_name{ | ||
| 234 | - max-width: 76rpx; | ||
| 235 | - width: auto; | ||
| 236 | - overflow: hidden; | ||
| 237 | - white-space:nowrap; | ||
| 238 | -} | ||
| 239 | -.mk_price{margin-left: 10rpx; font-size: 25rpx;} | ||
| 240 | -.item-cont{ line-height: 38rpx} | 222 | + padding: 8rpx 8rpx; |
| 223 | + border: 1rpx solid #e0e0e0; | ||
| 224 | + border-radius: 10rpx; | ||
| 225 | + font-size: 28rpx; | ||
| 226 | + margin-left: 15rpx; | ||
| 227 | +} | ||
| 228 | + | ||
| 229 | +.card_bg { | ||
| 230 | + display: flex; | ||
| 231 | + max-width: 110rpx; | ||
| 232 | + height: 25rpx; | ||
| 233 | + align-items: center; | ||
| 234 | + border-radius: 26rpx; | ||
| 235 | + font-size: 19rpx; | ||
| 236 | + padding: 2rpx 10rpx; | ||
| 237 | + background: #333; | ||
| 238 | + color: #fff; | ||
| 239 | + justify-content: center; | ||
| 240 | + margin-left: 8rpx; | ||
| 241 | + margin-top: 7rpx; | ||
| 242 | + line-height: 25rpx; | ||
| 243 | + width: auto; | ||
| 244 | +} | ||
| 245 | + | ||
| 246 | +.card_bg image { | ||
| 247 | + width: 19rpx; | ||
| 248 | + height: 19rpx; | ||
| 249 | + margin-right: 1rpx; | ||
| 250 | + vertical-align: middle; | ||
| 251 | +} | ||
| 252 | + | ||
| 253 | +.card_bg .card_name { | ||
| 254 | + max-width: 76rpx; | ||
| 255 | + width: auto; | ||
| 256 | + overflow: hidden; | ||
| 257 | + white-space: nowrap; | ||
| 258 | +} | ||
| 259 | + | ||
| 260 | +.mk_price { | ||
| 261 | + margin-left: 10rpx; | ||
| 262 | + font-size: 25rpx; | ||
| 263 | +} | ||
| 264 | + | ||
| 265 | +.item-cont { | ||
| 266 | + line-height: 38rpx; | ||
| 267 | +} |
pages/user/index/index.js
| @@ -20,7 +20,6 @@ Page({ | @@ -20,7 +20,6 @@ Page({ | ||
| 20 | txmon:0, | 20 | txmon:0, |
| 21 | byquan: 0, | 21 | byquan: 0, |
| 22 | yuer: 0, | 22 | yuer: 0, |
| 23 | - | ||
| 24 | currentPage:1, | 23 | currentPage:1, |
| 25 | recommend_list:[], | 24 | recommend_list:[], |
| 26 | tc_hide: true, | 25 | tc_hide: true, |
| @@ -28,12 +27,23 @@ Page({ | @@ -28,12 +27,23 @@ Page({ | ||
| 28 | qy_list:null, | 27 | qy_list:null, |
| 29 | gradeId:null, | 28 | gradeId:null, |
| 30 | is_init:0, | 29 | is_init:0, |
| 31 | - | ||
| 32 | cz_val:0, | 30 | cz_val:0, |
| 33 | full_cz_val:0, | 31 | full_cz_val:0, |
| 34 | is_dengji:0, //是不是等级 | 32 | is_dengji:0, //是不是等级 |
| 35 | }, | 33 | }, |
| 36 | - | 34 | + goto_service: function () { |
| 35 | + var th = this; | ||
| 36 | + if (th.data.userInfo != null) { | ||
| 37 | + var url = "/pages/user/my_service/i_service"; | ||
| 38 | + getApp().goto(url); | ||
| 39 | + } else { | ||
| 40 | + if(th.data.is_nav){ | ||
| 41 | + wx.navigateTo({ | ||
| 42 | + url: '/pages/getphone/getphone', | ||
| 43 | + }) | ||
| 44 | + } | ||
| 45 | + } | ||
| 46 | + }, | ||
| 37 | /** | 47 | /** |
| 38 | * 生命周期函数--监听页面加载 | 48 | * 生命周期函数--监听页面加载 |
| 39 | */ | 49 | */ |
| @@ -60,8 +70,6 @@ Page({ | @@ -60,8 +70,6 @@ Page({ | ||
| 60 | rq.get("/api/weshop/order/waitlist",{ | 70 | rq.get("/api/weshop/order/waitlist",{ |
| 61 | data: { user_id: app_d.user_id}, | 71 | data: { user_id: app_d.user_id}, |
| 62 | success: function (su) { | 72 | success: function (su) { |
| 63 | - console.log('waitlist'); | ||
| 64 | - console.log(su.data.data); | ||
| 65 | s.setData({ | 73 | s.setData({ |
| 66 | toji: su.data.data, | 74 | toji: su.data.data, |
| 67 | }); | 75 | }); |
| @@ -71,7 +79,6 @@ Page({ | @@ -71,7 +79,6 @@ Page({ | ||
| 71 | rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { | 79 | rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { |
| 72 | success: function (su) { | 80 | success: function (su) { |
| 73 | var data=su.data.data; | 81 | var data=su.data.data; |
| 74 | - console.log(data); | ||
| 75 | data.cashcount = parseInt(data.cashcount); | 82 | data.cashcount = parseInt(data.cashcount); |
| 76 | s.setData({ udata: data, }); | 83 | s.setData({ udata: data, }); |
| 77 | } | 84 | } |
| @@ -80,8 +87,6 @@ Page({ | @@ -80,8 +87,6 @@ Page({ | ||
| 80 | rq.get("/api/weshop/withdrawals/summoney", { | 87 | rq.get("/api/weshop/withdrawals/summoney", { |
| 81 | data: { user_id: e.user_id, store_id: os.stoid, status: 0 }, | 88 | data: { user_id: e.user_id, store_id: os.stoid, status: 0 }, |
| 82 | success: function (su) { | 89 | success: function (su) { |
| 83 | - console.log("withdrawals"); | ||
| 84 | - console.log(su); | ||
| 85 | if (su.data.code == 0) { | 90 | if (su.data.code == 0) { |
| 86 | var yuer = parseFloat(th.data.userInfo.user_money - | 91 | var yuer = parseFloat(th.data.userInfo.user_money - |
| 87 | th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2); | 92 | th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2); |
| @@ -94,8 +99,6 @@ Page({ | @@ -94,8 +99,6 @@ Page({ | ||
| 94 | rq.get("/api/weshop/userfeemail/page", { | 99 | rq.get("/api/weshop/userfeemail/page", { |
| 95 | data: { user_id: e.user_id, store_id: os.stoid, pageSize:1}, | 100 | data: { user_id: e.user_id, store_id: os.stoid, pageSize:1}, |
| 96 | success: function (su) { | 101 | success: function (su) { |
| 97 | - console.log("userfeemail"); | ||
| 98 | - console.log(su); | ||
| 99 | if (su.data.code == 0) { | 102 | if (su.data.code == 0) { |
| 100 | th.setData({ byquan: parseInt(su.data.data.total)}); | 103 | th.setData({ byquan: parseInt(su.data.data.total)}); |
| 101 | } | 104 | } |
| @@ -159,9 +162,6 @@ Page({ | @@ -159,9 +162,6 @@ Page({ | ||
| 159 | g_qy_list=res.data.data.pageData; | 162 | g_qy_list=res.data.data.pageData; |
| 160 | }); | 163 | }); |
| 161 | 164 | ||
| 162 | - console.log("aa-aa"); | ||
| 163 | - console.log(obj); | ||
| 164 | - | ||
| 165 | for(var i in arr_data){ | 165 | for(var i in arr_data){ |
| 166 | var item=arr_data[i]; | 166 | var item=arr_data[i]; |
| 167 | var FromId=th.check_is_has_qy(item,g_qy_list); | 167 | var FromId=th.check_is_has_qy(item,g_qy_list); |
| @@ -182,9 +182,6 @@ Page({ | @@ -182,9 +182,6 @@ Page({ | ||
| 182 | } | 182 | } |
| 183 | //th.setData({ qy_list: arr, need_money: need_money}); | 183 | //th.setData({ qy_list: arr, need_money: need_money}); |
| 184 | obj.qy_list=arr; | 184 | obj.qy_list=arr; |
| 185 | - | ||
| 186 | - console.log("111-111"); | ||
| 187 | - console.log(obj); | ||
| 188 | th.setData(obj); | 185 | th.setData(obj); |
| 189 | } | 186 | } |
| 190 | }) | 187 | }) |
| @@ -239,8 +236,6 @@ Page({ | @@ -239,8 +236,6 @@ Page({ | ||
| 239 | */ | 236 | */ |
| 240 | onHide: function () {}, | 237 | onHide: function () {}, |
| 241 | setappdata: function (t) { | 238 | setappdata: function (t) { |
| 242 | - console.log('setappdata'); | ||
| 243 | - console.log(t); | ||
| 244 | if (t.isout == 1) | 239 | if (t.isout == 1) |
| 245 | wx.navigateTo({ | 240 | wx.navigateTo({ |
| 246 | url: "/pages/error/error?msg=小程序已经过期", | 241 | url: "/pages/error/error?msg=小程序已经过期", |
pages/user/index/index.wxml
| @@ -212,7 +212,7 @@ | @@ -212,7 +212,7 @@ | ||
| 212 | <image class="xc-center-img " src="{{iurl}}/miniapp/images/add2.png"></image> | 212 | <image class="xc-center-img " src="{{iurl}}/miniapp/images/add2.png"></image> |
| 213 | <view class="four-level-word">我的地址</view> | 213 | <view class="four-level-word">我的地址</view> |
| 214 | </view> | 214 | </view> |
| 215 | - <view class="item t-c" data-url="/pages/user/my_service/i_service" bindtap="goto" > | 215 | + <view class="item t-c" data-url="/pages/user/my_service/i_service" bindtap="goto_service" > |
| 216 | <image class="xc-center-img " src="{{iurl}}/miniapp/images/yyservice/myservice.png"></image> | 216 | <image class="xc-center-img " src="{{iurl}}/miniapp/images/yyservice/myservice.png"></image> |
| 217 | <view class="four-level-word">我的服务</view> | 217 | <view class="four-level-word">我的服务</view> |
| 218 | </view> | 218 | </view> |