搜索传到测试，oa

yvan.ni
1 parent c4619391
Showing 2 changed files with 2 additions and 2 deletions
pages/goods/goodsList/goodsList.js
pages/goods/search/search.js
@@ -333,7 +333,7 @@ Page({
                       await getApp().request.promiseGet(url, {}).then(res => {
                           var prom =null;
                           if(res && res.data) prom=res.data.data;
-                          if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
+                          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)) ) {
                               item.prom_price = res.data.data.price;
                               if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
                               var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
@@ -285,7 +285,7 @@ Page({
                             if (res.data.code == 0 && res.data.data) {
                                 prom = res.data.data;
-                                if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) {
+                                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))) {
                                     item.prom_price = res.data.data.price;
                                     if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
                                     var vNum = prom.virtual_num ? prom.virtual_num : 0;