From d9f89b553115442d14eeac7ce78ca3deeb9a54a4 Mon Sep 17 00:00:00 2001
From: Cyy <547766613@qq.com>
Date: Mon, 6 Mar 2023 10:39:11 +0800
Subject: [PATCH] OA118060

---
 pages/goods/goodsInfo/goodsInfo.wxml | 2 +-
 pages/goods/goodsList/goodsList.js   | 2 +-
 pages/goods/search/search.js         | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index e9e1030..4f28081 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -88,7 +88,7 @@
               {{djs.min}}
             </view>
             <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view>
-            <view class='time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}">
+            <view class='time-val white t-c' style="background:{{prom_st==1?'#d40022':'#0097e0'}}">
               {{djs.sec}}
             </view>
             <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 7dbbee3..05a440c 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -497,7 +497,7 @@ Page({
 	 },
 
     go_url:function (e) {
-       var url = e.currentTarget.dataset.url;
+       var url = e.currentTarget.dataset.url+'&cat_id='+this.data.cat_id;
 			 //var rq_data = JSON.stringify(this.data.rq_data);
 			 //url += `&o=${rq_data}`;
 			 // console.log('url!!!=======<<<<', url);
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index cfaa24e..37a569f 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -47,6 +47,10 @@ Page({
         if (t.o) {
             this.data.rq_data.o = JSON.parse(t.o);
         };
+        if(t.cat_id){
+          var baseUrl= "/api/weshop/goods/page?isnewwhere=1&cat_id="+t.cat_id
+          this.setData({ baseUrl: baseUrl });
+        }
 
 
         //接受有没有导购的参数
--
libgit2 0.21.4