Commit d9f89b553115442d14eeac7ce78ca3deeb9a54a4

Authored by 前端开发-陈颖阳
1 parent 45595b5e

OA118060

pages/goods/goodsInfo/goodsInfo.wxml
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 {{djs.min}} 88 {{djs.min}}
89 </view> 89 </view>
90 <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view> 90 <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view>
91 - <view class='time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}"> 91 + <view class='time-val white t-c' style="background:{{prom_st==1?'#d40022':'#0097e0'}}">
92 {{djs.sec}} 92 {{djs.sec}}
93 </view> 93 </view>
94 <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view> 94 <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
pages/goods/goodsList/goodsList.js
@@ -497,7 +497,7 @@ Page({ @@ -497,7 +497,7 @@ Page({
497 }, 497 },
498 498
499 go_url:function (e) { 499 go_url:function (e) {
500 - var url = e.currentTarget.dataset.url; 500 + var url = e.currentTarget.dataset.url+'&cat_id='+this.data.cat_id;
501 //var rq_data = JSON.stringify(this.data.rq_data); 501 //var rq_data = JSON.stringify(this.data.rq_data);
502 //url += `&o=${rq_data}`; 502 //url += `&o=${rq_data}`;
503 // console.log('url!!!=======<<<<', url); 503 // console.log('url!!!=======<<<<', url);
pages/goods/search/search.js
@@ -47,6 +47,10 @@ Page({ @@ -47,6 +47,10 @@ Page({
47 if (t.o) { 47 if (t.o) {
48 this.data.rq_data.o = JSON.parse(t.o); 48 this.data.rq_data.o = JSON.parse(t.o);
49 }; 49 };
  50 + if(t.cat_id){
  51 + var baseUrl= "/api/weshop/goods/page?isnewwhere=1&cat_id="+t.cat_id
  52 + this.setData({ baseUrl: baseUrl });
  53 + }
50 54
51 55
52 //接受有没有导购的参数 56 //接受有没有导购的参数