Commit 9daf44392ca9e4bd636569afaf2aaf2f540b12e1
1 parent
6e7ea1c7
1. 价格排序
2、 弹窗
Showing
5 changed files
with
15 additions
and
7 deletions
pages/goods/goodsList/goodsList.js
| @@ -66,6 +66,10 @@ Page({ | @@ -66,6 +66,10 @@ Page({ | ||
| 66 | 66 | ||
| 67 | if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; } | 67 | if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; } |
| 68 | if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; } | 68 | if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; } |
| 69 | + | ||
| 70 | + if(getApp().globalData.userInfo){ | ||
| 71 | + url += "&user_id=" + getApp().globalData.userInfo.user_id; | ||
| 72 | + } | ||
| 69 | 73 | ||
| 70 | //优惠活动的凑单 | 74 | //优惠活动的凑单 |
| 71 | if(t.prom_type==3){ | 75 | if(t.prom_type==3){ |
pages/goods/goodsList/goodsList.wxml
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | </view> | 28 | </view> |
| 29 | 29 | ||
| 30 | </navigator> | 30 | </navigator> |
| 31 | - <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}"> | 31 | + <navigator bindtap="changeTab" class="nav-item" data-href="final_price" data-ad="{{adname}}"> |
| 32 | 价格 | 32 | 价格 |
| 33 | <view class="ico-dg" wx:if="{{tabname=='final_price'}}"> | 33 | <view class="ico-dg" wx:if="{{tabname=='final_price'}}"> |
| 34 | <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | 34 | <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> |
pages/goods/search/search.js
| @@ -107,6 +107,7 @@ Page({ | @@ -107,6 +107,7 @@ Page({ | ||
| 107 | if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;} | 107 | if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;} |
| 108 | if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;} | 108 | if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;} |
| 109 | if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;} | 109 | if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;} |
| 110 | + | ||
| 110 | if (url != this.data.baseUrl) return this.requestSearch(url); | 111 | if (url != this.data.baseUrl) return this.requestSearch(url); |
| 111 | this.openSearchModal(); | 112 | this.openSearchModal(); |
| 112 | 113 | ||
| @@ -132,6 +133,10 @@ Page({ | @@ -132,6 +133,10 @@ Page({ | ||
| 132 | //-----------真的调用地址进行搜索------------ | 133 | //-----------真的调用地址进行搜索------------ |
| 133 | requestSearch: function(t) { | 134 | requestSearch: function(t) { |
| 134 | var a = this; | 135 | var a = this; |
| 136 | + | ||
| 137 | + if(getApp().globalData.userInfo){ | ||
| 138 | + t += "&user_id=" + getApp().globalData.userInfo.user_id; | ||
| 139 | + } | ||
| 135 | 140 | ||
| 136 | this.data.requestUrl = t, | 141 | this.data.requestUrl = t, |
| 137 | //t += "&orderField=" + a.data.tabname; | 142 | //t += "&orderField=" + a.data.tabname; |
pages/goods/search/search.wxml
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | 13 | <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> |
| 14 | </view> | 14 | </view> |
| 15 | </navigator> | 15 | </navigator> |
| 16 | - <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">价格 | 16 | + <navigator bindtap="changeTab" class="nav-item" data-href="final_price" data-ad="{{adname}}">价格 |
| 17 | <view class="ico-dg" wx:if="{{tabname=='final_price'}}"> | 17 | <view class="ico-dg" wx:if="{{tabname=='final_price'}}"> |
| 18 | <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> | 18 | <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image> |
| 19 | <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> | 19 | <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image> |
pages/index/index/index.wxml
| @@ -397,13 +397,12 @@ | @@ -397,13 +397,12 @@ | ||
| 397 | <view class="newreceive flex-center"> | 397 | <view class="newreceive flex-center"> |
| 398 | <view> | 398 | <view> |
| 399 | <navigator bindtap="new_nav"> | 399 | <navigator bindtap="new_nav"> |
| 400 | - <view class="flex-level"> | ||
| 401 | - <image class="receive" src="{{url}}{{new_image==''?'/miniapp/images/newpeople/newreceive.png':new_image}}"></image> | 400 | + <view class="flex-level" style="position: relative;"> |
| 401 | + <image class="receive" src="{{url}}{{new_image==''?'/miniapp/images/newpeople/newreceive.png':new_image}}"></image> | ||
| 402 | + <image class="close" src="{{url}}/miniapp/images/plus/Close.png" catchtap="close_disgraceful" style="margin-top: -70rpx; right: -60rpx;"></image> | ||
| 402 | </view> | 403 | </view> |
| 403 | </navigator> | 404 | </navigator> |
| 404 | - <view class="flex-level"> | ||
| 405 | - <image class="close" src="{{url}}/miniapp/images/plus/Close.png" bindtap="close_disgraceful"></image> | ||
| 406 | - </view> | 405 | + <view class="flex-level"></view> |
| 407 | </view> | 406 | </view> |
| 408 | </view> | 407 | </view> |
| 409 | </view> | 408 | </view> |