fe / yoho-brand-shop · Commits

Go to a project

Authored by 李奇
Commit d2df9f57029309fd5cb10c857d941e9f6cac65a7 1 parent a61c1c02

检索页修改

Inline Side-by-side
Showing 10 changed files with 140 additions and 527 deletions
@@ -7,6 +7,7 @@ Component({ @@ -7,6 +7,7 @@ Component({
7 }, 7 },
8 methods: { 8 methods: {
9 goDetail: function () { 9 goDetail: function () {
  10 + console.log(this.properties.item.skn)
10 wx.navigateTo({ 11 wx.navigateTo({
11 url: `/pages/goodsDetail/goodsDetail?productSkn=${this.properties.item.skn}` 12 url: `/pages/goodsDetail/goodsDetail?productSkn=${this.properties.item.skn}`
12 }); 13 });
@@ -809,11 +809,11 @@ Page(extend({}, Actionsheet, { @@ -809,11 +809,11 @@ Page(extend({}, Actionsheet, {
809 is_secKill:data.data.is_secKill, 809 is_secKill:data.data.is_secKill,
810 is_advance:data.data.is_advance, 810 is_advance:data.data.is_advance,
811 sales_phrase: data.data.sales_phrase, 811 sales_phrase: data.data.sales_phrase,
812 - expect_arrival_time: data.data.expect_arrival_time, 812 + expect_arrival_time: data.data.expect_arrival_time || '',
813 isInstalment:data.data.isInstalment, 813 isInstalment:data.data.isInstalment,
814 pickerData:temData, 814 pickerData:temData,
815 product_id: data.data.product_id, 815 product_id: data.data.product_id,
816 - vipPrice : data.data.vip, 816 + vipPrice : data.data.vip || '',
817 storage_sum: data.data.storage_sum, 817 storage_sum: data.data.storage_sum,
818 is_supplyed: data.data.is_supplyed, 818 is_supplyed: data.data.is_supplyed,
819 bundle_type: data.data.bundle_type, 819 bundle_type: data.data.bundle_type,
@@ -152,24 +152,6 @@ @@ -152,24 +152,6 @@
152 <view class="seperator"></view> 152 <view class="seperator"></view>
153 <image src="{{productMeasurementImage}}" mode="widthFix"></image> 153 <image src="{{productMeasurementImage}}" mode="widthFix"></image>
154 </view> 154 </view>
155 -  
156 - <!-- <view class="gap"></view> -->  
157 - <!--<view class="goodsInfo" style="display:{{productMeasurementImage?'block':'none'}}">  
158 - <text class="title">模特试穿</text>  
159 - <text class="subtitle">REFERENCE</text>  
160 - <view class="seperator"></view>  
161 - <scroll-view class="brandContainer" scroll-x="true">  
162 - <view class="table">  
163 - <view class="tr">  
164 - <view class="td" wx:for="{{productModelTitleList}}" wx:key="unique">{{item}}</view>  
165 - </view>  
166 - <!--<view class="tr" wx:for="{{productModelList}}" wx:key="unique">  
167 - <view class="td" wx:for="{{productModelList[index]}}" wx:key="unique">{{item}}</view>  
168 - </view>  
169 - </view>  
170 - </scroll-view>  
171 - </view>-->  
172 -  
173 <view class="goodsInfo" style="display:{{productMaterialList[0].remark?'block':'none'}}"> 155 <view class="goodsInfo" style="display:{{productMaterialList[0].remark?'block':'none'}}">
174 <text class="title">商品材质</text> 156 <text class="title">商品材质</text>
175 <text class="subtitle">MATERIALS</text> 157 <text class="subtitle">MATERIALS</text>
@@ -107,171 +107,6 @@ Page({ @@ -107,171 +107,6 @@ Page({
107 }); 107 });
108 list.push(item); 108 list.push(item);
109 }); 109 });
110 -  
111 - list = [  
112 - {  
113 -  
114 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
115 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
116 - salePriceStr: '3',  
117 - originPriceStr: '3',  
118 - showOriginPrice: true,  
119 - skn: 512587352  
120 - },  
121 - {  
122 -  
123 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
124 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
125 - salePriceStr: '3',  
126 - originPriceStr: '3',  
127 - showOriginPrice: true,  
128 - skn: 512587352  
129 - },  
130 - {  
131 -  
132 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
133 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
134 - salePriceStr: '3',  
135 - originPriceStr: '3',  
136 - showOriginPrice: true,  
137 - skn: 512587352  
138 - },  
139 - {  
140 -  
141 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
142 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
143 - salePriceStr: '3',  
144 - originPriceStr: '3',  
145 - showOriginPrice: true,  
146 - skn: 512587352  
147 - },  
148 - {  
149 -  
150 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
151 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
152 - salePriceStr: '3',  
153 - originPriceStr: '3',  
154 - showOriginPrice: true,  
155 - skn: 512587352  
156 - },  
157 - {  
158 -  
159 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
160 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
161 - salePriceStr: '3',  
162 - originPriceStr: '3',  
163 - showOriginPrice: true,  
164 - skn: 512587352  
165 - },  
166 - {  
167 -  
168 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
169 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
170 - salePriceStr: '3',  
171 - originPriceStr: '3',  
172 - showOriginPrice: true,  
173 - skn: 512587352  
174 - },  
175 - {  
176 -  
177 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
178 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
179 - salePriceStr: '3',  
180 - originPriceStr: '3',  
181 - showOriginPrice: true,  
182 - skn: 512587352  
183 - },  
184 - {  
185 -  
186 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
187 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
188 - salePriceStr: '3',  
189 - originPriceStr: '3',  
190 - showOriginPrice: true,  
191 - skn: 512587352  
192 - },  
193 - {  
194 -  
195 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
196 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
197 - salePriceStr: '3',  
198 - originPriceStr: '3',  
199 - showOriginPrice: true,  
200 - skn: 512587352  
201 - },  
202 - {  
203 -  
204 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
205 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
206 - salePriceStr: '3',  
207 - originPriceStr: '3',  
208 - showOriginPrice: true,  
209 - skn: 512587352  
210 - },  
211 - {  
212 -  
213 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
214 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
215 - salePriceStr: '3',  
216 - originPriceStr: '3',  
217 - showOriginPrice: true,  
218 - skn: 512587352  
219 - },  
220 - {  
221 -  
222 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
223 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
224 - salePriceStr: '3',  
225 - originPriceStr: '3',  
226 - showOriginPrice: true,  
227 - skn: 512587352  
228 - },  
229 - {  
230 -  
231 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
232 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
233 - salePriceStr: '3',  
234 - originPriceStr: '3',  
235 - showOriginPrice: true,  
236 - skn: 512587352  
237 - },  
238 - {  
239 -  
240 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
241 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
242 - salePriceStr: '3',  
243 - originPriceStr: '3',  
244 - showOriginPrice: true,  
245 - skn: 512587352  
246 - },  
247 - {  
248 -  
249 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
250 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
251 - salePriceStr: '3',  
252 - originPriceStr: '3',  
253 - showOriginPrice: true,  
254 - skn: 512587352  
255 - },  
256 - {  
257 -  
258 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
259 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
260 - salePriceStr: '3',  
261 - originPriceStr: '3',  
262 - showOriginPrice: true,  
263 - skn: 512587352  
264 - },  
265 - {  
266 -  
267 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
268 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
269 - salePriceStr: '3',  
270 - originPriceStr: '3',  
271 - showOriginPrice: true,  
272 - skn: 512587352  
273 - }  
274 - ];  
275 110
276 this.setData({ 111 this.setData({
277 productList: list 112 productList: list
@@ -280,175 +115,6 @@ Page({ @@ -280,175 +115,6 @@ Page({
280 115
281 116
282 }); 117 });
283 -  
284 - let list = [  
285 - {  
286 -  
287 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
288 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
289 - salePriceStr: '3',  
290 - originPriceStr: '3',  
291 - showOriginPrice: true,  
292 - skn: 512587352  
293 - },  
294 - {  
295 -  
296 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
297 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
298 - salePriceStr: '3',  
299 - originPriceStr: '3',  
300 - showOriginPrice: true,  
301 - skn: 512587352  
302 - },  
303 - {  
304 -  
305 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
306 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
307 - salePriceStr: '3',  
308 - originPriceStr: '3',  
309 - showOriginPrice: true,  
310 - skn: 512587352  
311 - },  
312 - {  
313 -  
314 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
315 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
316 - salePriceStr: '3',  
317 - originPriceStr: '3',  
318 - showOriginPrice: true,  
319 - skn: 512587352  
320 - },  
321 - {  
322 -  
323 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
324 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
325 - salePriceStr: '3',  
326 - originPriceStr: '3',  
327 - showOriginPrice: true,  
328 - skn: 512587352  
329 - },  
330 - {  
331 -  
332 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
333 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
334 - salePriceStr: '3',  
335 - originPriceStr: '3',  
336 - showOriginPrice: true,  
337 - skn: 512587352  
338 - },  
339 - {  
340 -  
341 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
342 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
343 - salePriceStr: '3',  
344 - originPriceStr: '3',  
345 - showOriginPrice: true,  
346 - skn: 512587352  
347 - },  
348 - {  
349 -  
350 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
351 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
352 - salePriceStr: '3',  
353 - originPriceStr: '3',  
354 - showOriginPrice: true,  
355 - skn: 512587352  
356 - },  
357 - {  
358 -  
359 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
360 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
361 - salePriceStr: '3',  
362 - originPriceStr: '3',  
363 - showOriginPrice: true,  
364 - skn: 512587352  
365 - },  
366 - {  
367 -  
368 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
369 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
370 - salePriceStr: '3',  
371 - originPriceStr: '3',  
372 - showOriginPrice: true,  
373 - skn: 512587352  
374 - },  
375 - {  
376 -  
377 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
378 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
379 - salePriceStr: '3',  
380 - originPriceStr: '3',  
381 - showOriginPrice: true,  
382 - skn: 512587352  
383 - },  
384 - {  
385 -  
386 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
387 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
388 - salePriceStr: '3',  
389 - originPriceStr: '3',  
390 - showOriginPrice: true,  
391 - skn: 512587352  
392 - },  
393 - {  
394 -  
395 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
396 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
397 - salePriceStr: '3',  
398 - originPriceStr: '3',  
399 - showOriginPrice: true,  
400 - skn: 512587352  
401 - },  
402 - {  
403 -  
404 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
405 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
406 - salePriceStr: '3',  
407 - originPriceStr: '3',  
408 - showOriginPrice: true,  
409 - skn: 512587352  
410 - },  
411 - {  
412 -  
413 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
414 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
415 - salePriceStr: '3',  
416 - originPriceStr: '3',  
417 - showOriginPrice: true,  
418 - skn: 512587352  
419 - },  
420 - {  
421 -  
422 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
423 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
424 - salePriceStr: '3',  
425 - originPriceStr: '3',  
426 - showOriginPrice: true,  
427 - skn: 512587352  
428 - },  
429 - {  
430 -  
431 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
432 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
433 - salePriceStr: '3',  
434 - originPriceStr: '3',  
435 - showOriginPrice: true,  
436 - skn: 512587352  
437 - },  
438 - {  
439 -  
440 - defaultImages: 'http://img10.static.yhbimg.com/goodsimg/2017/12/06/11/0186f48aaa66d73d10d4c2037bcadd9896.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
441 - productName: '测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的测试商品名称有点长你懂得地方大幅度的',  
442 - salePriceStr: '3',  
443 - originPriceStr: '3',  
444 - showOriginPrice: true,  
445 - skn: 512587352  
446 - }  
447 - ];  
448 -  
449 - this.setData({  
450 - productList: list  
451 - });  
452 }, 118 },
453 toSearch: function () { 119 toSearch: function () {
454 wx.navigateTo({ 120 wx.navigateTo({
1 <import src ='defraudtip/defraudtip.wxml'/> 1 <import src ='defraudtip/defraudtip.wxml'/>
2 <view class="container order-page"> 2 <view class="container order-page">
3 <form bindsubmit="formSubmit" report-submit='true'> 3 <form bindsubmit="formSubmit" report-submit='true'>
4 -  
5 -<!-- <view class='fraud-remind' bindtap='fraudRemindAction'>  
6 -  
7 - <view class='fraud-remind-left-view'>  
8 - <view class='fraud-remind-left-view-top-view'>  
9 - <image class='fraud-remind-left-view-top-view-icon-image' src="images/tan_ic@2x.png"></image>  
10 - <view class='fraud-remind-left-view-top-view-main-title'>关于防诈骗的重要提醒</view>  
11 - </view>  
12 -  
13 - <view class='fraud-remind-left-view-sub-title'>  
14 - 有货不会以任何理由要求您退货退款，请您提高警惕。  
15 - </view>  
16 - </view>  
17 -  
18 - <view class='fraud-remind-arrow'>></view>  
19 -  
20 -</view>  
21 -<view class='fraud-remind-bottom-sep'></view> -->  
22 -  
23 - <template is='fraudtip' data="{{tipimgsrc,arrowImg}}"></template>  
24 -  
25 -  
26 <view id="order-nav" class="order-nav clearfix"> 4 <view id="order-nav" class="order-nav clearfix">
27 <view class="tap-hightlight {{index == 0 ? 'active' : ''}}" data-type="1" bindtap="onSelectChanged"> 5 <view class="tap-hightlight {{index == 0 ? 'active' : ''}}" data-type="1" bindtap="onSelectChanged">
28 <view class="nav-tap" >全部</view> 6 <view class="nav-tap" >全部</view>
@@ -102,9 +80,6 @@ @@ -102,9 +80,6 @@
102 <block wx:if="{{link == 'readd'}}"> 80 <block wx:if="{{link == 'readd'}}">
103 <view class="btn cancel" style="margin-left: 20rpx;" catchtap="onReaddTapped" data-order_code="{{item.order_code}}" data-tab_index='1'>再次购买</view> 81 <view class="btn cancel" style="margin-left: 20rpx;" catchtap="onReaddTapped" data-order_code="{{item.order_code}}" data-tab_index='1'>再次购买</view>
104 </block> 82 </block>
105 - <!-- <block wx:if="{{link == 'refundApply'}}">  
106 - <view class="btn cancel" catchtap="onCloseOrderTapped" data-order_code="{{item.order_code}}" data-tab_index='1'>申请退款</view> </block>-->  
107 -  
108 <block wx:if="{{link == 'buyNow'}}"> 83 <block wx:if="{{link == 'buyNow'}}">
109 <view class="btn pay" catchtap="onBuyNowTapped" data-order_code="{{item.order_code}}">立即付款</view> 84 <view class="btn pay" catchtap="onBuyNowTapped" data-order_code="{{item.order_code}}">立即付款</view>
110 </block> 85 </block>
@@ -118,7 +93,7 @@ @@ -118,7 +93,7 @@
118 93
119 <button formType="submit" class="button pay" catchtap="onConfirmTapped" data-order_code="{{item.order_code}}">确认收货</button> 94 <button formType="submit" class="button pay" catchtap="onConfirmTapped" data-order_code="{{item.order_code}}">确认收货</button>
120 </block> 95 </block>
121 - <block wx:if="{{link == 'refundApply'}}"><!--link == 'refundApply'--> 96 + <block wx:if="{{link == 'refundApply'}}">
122 <button class="button" formType="submit" type="default" size="{{defaultSize}}" plain='true' catchtap="onRefundApplyTapped" data-order_code="{{item.order_code}}">申请退款</button> 97 <button class="button" formType="submit" type="default" size="{{defaultSize}}" plain='true' catchtap="onRefundApplyTapped" data-order_code="{{item.order_code}}">申请退款</button>
123 </block> 98 </block>
124 <block wx:if="{{link == 'afterService'}}"> 99 <block wx:if="{{link == 'afterService'}}">
@@ -140,7 +115,6 @@ @@ -140,7 +115,6 @@
140 115
141 <picker-view wx:if="{{showReason}}"class='picker-view' value='{{value}}' bindchange='bindChange' indicator-style="height: 50px;"> 116 <picker-view wx:if="{{showReason}}"class='picker-view' value='{{value}}' bindchange='bindChange' indicator-style="height: 50px;">
142 <picker-view-column> 117 <picker-view-column>
143 - <!-- bindtap='chooseReason' data-id="{{item.id}}" data-reason="{{item.reason}}" -->  
144 <view wx:for="{{refundReason}}" class="addr-item">{{item.reason}}</view> 118 <view wx:for="{{refundReason}}" class="addr-item">{{item.reason}}</view>
145 </picker-view-column> 119 </picker-view-column>
146 </picker-view> 120 </picker-view>
@@ -14,11 +14,32 @@ Page({ @@ -14,11 +14,32 @@ Page({
14 let query = e.detail.value; 14 let query = e.detail.value;
15 15
16 this.setData({searched: true, query}); 16 this.setData({searched: true, query});
17 - this.search(); 17 + this.search({query});
18 }, 18 },
19 search: function (params) { 19 search: function (params) {
20 searchModel.productList(params).then(res => { 20 searchModel.productList(params).then(res => {
21 - console.log(res) 21 + if (res.code === 200) {
  22 + const keyAdapter = {
  23 + skn: 'product_skn',
  24 + salePriceStr: 'sales_price',
  25 + productName: 'product_name',
  26 + defaultImages: 'default_images'
  27 + };
  28 + let list = [];
  29 +
  30 + (res.data.product_list || []).forEach(product => {
  31 + let item = {};
  32 +
  33 + Object.keys(keyAdapter).forEach(key => {
  34 + item[key] = product[keyAdapter[key]]
  35 + });
  36 + list.push(item);
  37 + });
  38 +
  39 + this.setData({
  40 + productList: list
  41 + });
  42 + }
22 }); 43 });
23 }, 44 },
24 orderChange: function () { 45 orderChange: function () {
1 { 1 {
2 "navigationBarTitleText": "红人小店", 2 "navigationBarTitleText": "红人小店",
3 "usingComponents": { 3 "usingComponents": {
  4 + "copyright": "/components/layout/copyright/copyright",
  5 + "product-list": "/components/product/list",
4 "product-list-filter": "/components/product/list-filter" 6 "product-list-filter": "/components/product/list-filter"
5 } 7 }
6 } 8 }
@@ -8,12 +8,14 @@ @@ -8,12 +8,14 @@
8 <view class="fixed-filter"> 8 <view class="fixed-filter">
9 <product-list-filter bind:sortchange="orderChange"></product-list-filter> 9 <product-list-filter bind:sortchange="orderChange"></product-list-filter>
10 </view> 10 </view>
11 - <block wx:if="{{productList.length == 0}}">  
12 - <view class="no-res">  
13 - <image class="no-res-img" src="images/nosearch-ic@3x.png"></image>  
14 - <view class="no-res-txt">未搜索到任何相关商品</view>  
15 - </view>  
16 - </block> 11 + <view class="no-res" wx:if="{{productList.length == 0}}">
  12 + <image class="no-res-img" src="images/nosearch-ic@3x.png"></image>
  13 + <view class="no-res-txt">未搜索到任何相关商品</view>
  14 + </view>
  15 + <view wx:if="{{productList.length > 0}}"
  16 + class="product-list"><product-list list="{{productList}}"></product-list></view>
  17 +
  18 +
17 <view class="loadMore" wx:if="{{list.data.length > 0 && list.isLoading && !list.endReached}}"> 19 <view class="loadMore" wx:if="{{list.data.length > 0 && list.isLoading && !list.endReached}}">
18 <text class="loadText">加载中...</text> 20 <text class="loadText">加载中...</text>
19 </view> 21 </view>
@@ -22,4 +24,5 @@ @@ -22,4 +24,5 @@
22 </view> 24 </view>
23 <loading wx:if="{{list.currentPage == 0 && list.isLoading}}">加载中</loading> 25 <loading wx:if="{{list.currentPage == 0 && list.isLoading}}">加载中</loading>
24 </view> 26 </view>
  27 + <copyright></copyright>
25 </view> 28 </view>
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 height: 72rpx; 10 height: 72rpx;
11 padding: 18rpx 30rpx; 11 padding: 18rpx 30rpx;
12 background-color: #fff; 12 background-color: #fff;
  13 + z-index: 10001;
13 } 14 }
14 15
15 .search-input { 16 .search-input {
@@ -104,4 +105,9 @@ @@ -104,4 +105,9 @@
104 text-align: center; 105 text-align: center;
105 margin-top: 21rpx; 106 margin-top: 21rpx;
106 color: #444444; 107 color: #444444;
  108 +}
  109 +
  110 +.product-list {
  111 + padding-top: 256rpx;
  112 + padding-bottom: 60rpx;
107 } 113 }
1 <!--userCenter.wxml--> 1 <!--userCenter.wxml-->
2 <import src="../goodsList/productListCell.wxml"/> 2 <import src="../goodsList/productListCell.wxml"/>
3 <scroll-view scroll-y='true' style="height: {{windowHeight}}px" bindscroll="scroll" scroll-top="{{scrollTop}}"> 3 <scroll-view scroll-y='true' style="height: {{windowHeight}}px" bindscroll="scroll" scroll-top="{{scrollTop}}">
4 -<view class="container">  
5 -  
6 - <view class="my-page yoho-page" >  
7 - <view class="my-header">  
8 - <image src="images/mine_bg@2x.png" class="header_bg"></image>  
9 - <view class="user-info">  
10 - <button wx:if="{{!isLogin}}" class="login-btn" bindtap="{{!hasUnionID?'loginAndRegisterTapped':''}}" open-type="{{hasUnionID?'getPhoneNumber':''}}" bindgetphonenumber="getPhoneNumber">登录/注册</button>  
11 - <block wx:else>  
12 - <image src="{{userInfo.avatarUrl}}" class="user-avatar"></image>  
13 - <view class="username">{{userInfo.nickName}}</view>  
14 -  
15 - <image wx:if="{{userInfo.uid}}" class='vip-icon-image' src='{{vipImg}}'></image>  
16 - </block>  
17 -  
18 - </view>  
19 - <!-- <image src='images/mine_bg@2x.png' class="new_head_bg">  
20 -  
21 - </image> -->  
22 - </view>  
23 - <view class="my-order" style='border-bottom:0'>  
24 - <view class="my-order-title" data-index="0" bindtap="navToOrders">  
25 - <view class='titleDesc' style='color:#444444'>我的订单</view>  
26 - <view style="color: #aeaeae;font-size:29rpx;">全部订单</view>  
27 - <image class='arrow-image' style='margin-right:20rpx' src='images/arrow_right@2x.png'></image>  
28 - </view>  
29 - <view class="order-type clearfix" style='border-bottom:0'>  
30 - <view class="type-item" data-index="1" bindtap="navToOrders">  
31 - <view class="iconfont">  
32 - <image src="images/dd_icon_dfk@2x.png" class="icon-image"></image>  
33 - <view class='red-point' hidden='{{infoNum.wait_pay_num?false:true}}'>  
34 - {{infoNum.wait_pay_num>100?'99+':infoNum.wait_pay_num}} 4 + <view class="container">
  5 +
  6 + <view class="my-page yoho-page">
  7 + <view class="my-header">
  8 + <image src="images/mine_bg@2x.png" class="header_bg"></image>
  9 + <view class="user-info">
  10 + <button wx:if="{{!isLogin}}" class="login-btn" bindtap="{{!hasUnionID?'loginAndRegisterTapped':''}}"
  11 + open-type="{{hasUnionID?'getPhoneNumber':''}}" bindgetphonenumber="getPhoneNumber">登录/注册
  12 + </button>
  13 + <block wx:else>
  14 + <image src="{{userInfo.avatarUrl}}" class="user-avatar"></image>
  15 + <view class="username">{{userInfo.nickName}}</view>
  16 +
  17 + <image wx:if="{{userInfo.uid}}" class='vip-icon-image' src='{{vipImg}}'></image>
  18 + </block>
  19 +
  20 + </view>
  21 + <!-- <image src='images/mine_bg@2x.png' class="new_head_bg">
  22 +
  23 + </image> -->
35 </view> 24 </view>
36 - </view>  
37 - 待付款  
38 - </view>  
39 - <view class="type-item" data-index="2" bindtap="navToOrders">  
40 - <view class="iconfont">  
41 - <image src="images/dd_icon_dfh@2x.png" class="icon-image"></image>  
42 - <view class='red-point' hidden='{{infoNum.wait_cargo_num?false:true}}'>  
43 - {{infoNum.wait_cargo_num>100?'99+':infoNum.wait_cargo_num}} 25 + <view class="my-order" style='border-bottom:0'>
  26 + <view class="my-order-title" data-index="0" bindtap="navToOrders">
  27 + <view class='titleDesc' style='color:#444444'>我的订单</view>
  28 + <view style="color: #aeaeae;font-size:29rpx;">全部订单</view>
  29 + <image class='arrow-image' style='margin-right:20rpx' src='images/arrow_right@2x.png'></image>
  30 + </view>
  31 + <view class="order-type clearfix" style='border-bottom:0'>
  32 + <view class="type-item" data-index="1" bindtap="navToOrders">
  33 + <view class="iconfont">
  34 + <image src="images/dd_icon_dfk@2x.png" class="icon-image"></image>
  35 + <view class='red-point' hidden='{{infoNum.wait_pay_num?false:true}}'>
  36 + {{infoNum.wait_pay_num>100?'99+':infoNum.wait_pay_num}}
  37 + </view>
  38 + </view>
  39 + 待付款
  40 + </view>
  41 + <view class="type-item" data-index="2" bindtap="navToOrders">
  42 + <view class="iconfont">
  43 + <image src="images/dd_icon_dfh@2x.png" class="icon-image"></image>
  44 + <view class='red-point' hidden='{{infoNum.wait_cargo_num?false:true}}'>
  45 + {{infoNum.wait_cargo_num>100?'99+':infoNum.wait_cargo_num}}
  46 + </view>
  47 + </view>
  48 + 待发货
  49 + </view>
  50 + <view class="type-item" data-index="3" bindtap="navToOrders">
  51 + <view class="iconfont">
  52 + <image src="images/dd_icon_dsh@2x.png" class="icon-image"></image>
  53 + <view class='red-point' hidden='{{infoNum.send_cargo_num?false:true}}'>
  54 + {{infoNum.send_cargo_num>100?'99+':infoNum.send_cargo_num}}
  55 + </view>
  56 + </view>
  57 + 待收货
  58 + </view>
  59 + </view>
44 </view> 60 </view>
45 - </view>  
46 - 待发货  
47 - </view>  
48 - <view class="type-item" data-index="3" bindtap="navToOrders">  
49 - <view class="iconfont">  
50 - <image src="images/dd_icon_dsh@2x.png" class="icon-image"></image>  
51 - <view class='red-point' hidden='{{infoNum.send_cargo_num?false:true}}'>  
52 - {{infoNum.send_cargo_num>100?'99+':infoNum.send_cargo_num}} 61 + <view class="view-splite clearfix">
  62 + </view>
  63 + <view class='address-back-view' style='border-top:0;border-bottom:0' bindtap='navToAddressManagerPage'>
  64 + <view class='address-left-back-view'>
  65 + <view class="left-icon-image">
  66 + <image src="images/address-ic@2x.png" class="icon-image"></image>
  67 + </view>
  68 + <view class="address-title">地址管理</view>
  69 + </view>
  70 + <image class='arrow-image' src='images/arrow_right@2x.png'></image>
  71 + </view>
  72 + <view class='address-back-view' style='border-top:0;border-bottom:0' catchtap='navToServiceFeedBack'>
  73 + <view class='address-left-back-view'>
  74 + <view class="left-icon-image">
  75 + <image src="images/fwyfk-ic@2x.png" class="icon-image"></image>
  76 + </view>
  77 + <view class="address-title">服务与反馈</view>
  78 + </view>
  79 +
  80 + <image class='arrow-image' src='images/arrow_right@2x.png'></image>
  81 + </view>
  82 + <view class="view-splite clearfix"/>
  83 + <view class='titleContainer'>
  84 + <view class='titleLine'></view>
  85 + <view class='titleDesc'> 为你优选</view>
53 </view> 86 </view>
54 - </view>  
55 - 待收货  
56 - </view>  
57 - </view>  
58 - </view>  
59 - <view class="view-splite clearfix">  
60 - </view>  
61 -  
62 - <view class='address-back-view'style='border-top:0' bindtap='couponTapAction'>  
63 - <view class='address-left-back-view'>  
64 - <view class="left-icon-image">  
65 - <image src="images/yhq-ic@2x.png" class="icon-image"></image>  
66 - </view>  
67 - <view class="address-title">优惠券</view>  
68 - </view>  
69 -  
70 - <view class='arrow-text' wx:if='{{infoNum.coupon_num?true:false}}'>{{infoNum.coupon_num}} 张 </view>  
71 - <image class='arrow-image' src='images/arrow_right@2x.png'></image>  
72 -  
73 - </view>  
74 -  
75 - <view class='yohocoin-back-view'style='border-bottom:0' bindtap='yohocoinTapAction'>  
76 - <view class='address-left-back-view'>  
77 - <view class="left-icon-image">  
78 - <image src="images/yoho-coin@2x.png" class="icon-image"></image>  
79 - </view>  
80 - <view class="address-title" >有货币</view>  
81 - </view>  
82 -  
83 - <view class='arrow-text' style='margin-right:20rpx'>{{infoNum.yoho_coin_num?infoNum.yoho_coin_num:0}}个</view>  
84 -  
85 - </view>  
86 - <view class="view-splite clearfix"/>  
87 -  
88 - <view class='address-back-view' style='border-top:0' bindtap='navToGoodsCollectPage'>  
89 - <view class='address-left-back-view'>  
90 - <view class="left-icon-image">  
91 - <image src="images/like@2x.png" class="icon-image"></image>  
92 - </view>  
93 - <view class="address-title">商品收藏</view>  
94 - </view>  
95 - <image class='arrow-image' src='images/arrow_right@2x.png'></image>  
96 - </view>  
97 -  
98 - <view class='address-back-view' style='border-top:0;border-bottom:0' bindtap='navToAddressManagerPage'>  
99 - <view class='address-left-back-view'>  
100 - <view class="left-icon-image">  
101 - <image src="images/address-ic@2x.png" class="icon-image"></image>  
102 - </view>  
103 - <view class="address-title">地址管理</view>  
104 - </view>  
105 - <image class='arrow-image' src='images/arrow_right@2x.png'></image>  
106 - </view>  
107 87
108 - <view class="view-splite clearfix"/> 88 + <!--猜你喜欢列表-->
  89 + <view class="likeContainer">
  90 + <block wx:for="{{recommdData}}" wx:key="{{index}}">
  91 + <template is="productListCell"
  92 + data="{{listWidth, listHeight, listImageWidth, listImageHeight, listImageTop, listMarginHorizontal,index,f_index:3, item}}"/>
  93 + </block>
  94 + </view>
109 95
110 - <view class='address-back-view' style='border-top:0;border-bottom:0' catchtap='navToServiceFeedBack'>  
111 - <view class='address-left-back-view'>  
112 - <view class="left-icon-image">  
113 - <image src="images/fwyfk-ic@2x.png" class="icon-image"></image> 96 + <view class="my-service" hidden='true'>
  97 + <view class="service-type clearfix">
  98 + <text class="service-text">更多优质服务，您可以选择：\n1.关注微信服务号“ YOHOBUY有货”咨询在线客服\n2.拨打 400-889-9646 电话客服</text>
  99 + </view>
  100 + </view>
114 </view> 101 </view>
115 - <view class="address-title">服务与反馈</view>  
116 - </view>  
117 -  
118 - <image class='arrow-image' src='images/arrow_right@2x.png'></image>  
119 - </view>  
120 - <view class="view-splite clearfix"/>  
121 - <!-- 猜你喜欢标题 -->  
122 - <!-- <view class="sectionContainer">  
123 - <view class="sectionLine"></view>  
124 - <view class="sectionTitle">猜你喜欢</view>  
125 - <view class="sectionLine"></view>  
126 - </view> -->  
127 - <view class='titleContainer'>  
128 - <view class='titleLine'></view>  
129 - <view class='titleDesc'> 为你优选</view>  
130 - </view>  
131 -  
132 - <!--猜你喜欢列表-->  
133 - <view class="likeContainer">  
134 - <block wx:for="{{recommdData}}" wx:key="{{index}}">  
135 - <template is="productListCell" data="{{listWidth, listHeight, listImageWidth, listImageHeight, listImageTop, listMarginHorizontal,index,f_index:3, item}}"/>  
136 - </block>  
137 - </view>  
138 -  
139 - <view class="my-service" hidden='true'>  
140 - <view class="service-type clearfix">  
141 - <text class="service-text">更多优质服务，您可以选择：\n1.关注微信服务号“ YOHOBUY有货”咨询在线客服\n2.拨打 400-889-9646 电话客服</text>  
142 - </view>  
143 </view> 102 </view>
144 - </view>  
145 -</view>  
146 </scroll-view> 103 </scroll-view>
147 -<quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" isShowShopCart="{{true}}" isShowMenu="{{false}}" marginBottom="{{50}}" bind:backToTop="backToTop"></quickNavigation>  
148 -<import src="../../vendors/toast/wetoast.wxml" />  
149 -<template is="wetoast" data="{{...__wetoast__}}" />  
  104 +<quickNavigation id="quickNavigation" isShowIndicator="{{isShowIndicator}}" isShowShopCart="{{true}}"
  105 + isShowMenu="{{false}}" marginBottom="{{50}}" bind:backToTop="backToTop"></quickNavigation>
  106 +<import src="../../vendors/toast/wetoast.wxml"/>
  107 +<template is="wetoast" data="{{...__wetoast__}}"/>