From d39b815dc5af0c4f7de0b0dd813365c25f7dec2e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 24 Aug 2022 10:52:44 +0800
Subject: [PATCH] 搜索传到测试，oa

---
 pages/goods/goodsList/goodsList.js | 2 +-
 pages/goods/search/search.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 0135340..53f61ef 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.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;
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index bbf575e..b139c54 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -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;
--
libgit2 0.21.4