wxd / MShopWeApp

Commit 4545fb6b21b9c480f8923b62429e6c35de6f53af

Authored by 后端研发-苏明海
2 parents 37a7ae48 d39b815d

Merge branch 'dev' into 'test' 

搜索传到测试，oa

See merge request !1113
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
pages/goods/goodsList/goodsList.js
  View file @4545fb6
... ... @@ -333,7 +333,7 @@ Page({
333 333 await getApp().request.promiseGet(url, {}).then(res => {
334 334 var prom =null;
335 335 if(res && res.data) prom=res.data.data;
336   - if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
  336 + if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom_type!=2 && prom.show_time && prom.show_time<now)) ) {
337 337 item.prom_price = res.data.data.price;
338 338 if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
339 339 var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
... ...
pages/goods/search/search.js
  View file @4545fb6
... ... @@ -285,7 +285,7 @@ Page({
285 285 if (res.data.code == 0 && res.data.data) {
286 286 prom = res.data.data;
287 287  
288   - if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) {
  288 + if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
289 289 item.prom_price = res.data.data.price;
290 290 if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
291 291 var vNum = prom.virtual_num ? prom.virtual_num : 0;
... ...