Commit 37bb6ed8fb0b972155bdd08b0a7a099c0312ad52
1 parent
e072f1d5
tyrh商家 商品排序问题
Showing
2 changed files
with
127 additions
and
125 deletions
components/diy_goodsGroup/diy_goodsGroup.js
@@ -211,6 +211,8 @@ Component({ | @@ -211,6 +211,8 @@ Component({ | ||
211 | pageSize: th.data.goodscount, | 211 | pageSize: th.data.goodscount, |
212 | page: th.data.currentPage, | 212 | page: th.data.currentPage, |
213 | isonsale: 1, | 213 | isonsale: 1, |
214 | + orderField: "sort", | ||
215 | + orderType: 'asc', | ||
214 | }; | 216 | }; |
215 | if(th.data.is_recommend) r_data.is_recommend=th.data.is_recommend; | 217 | if(th.data.is_recommend) r_data.is_recommend=th.data.is_recommend; |
216 | if(th.data.is_hot) r_data.is_hot=th.data.is_hot; | 218 | if(th.data.is_hot) r_data.is_hot=th.data.is_hot; |
@@ -241,6 +243,8 @@ Component({ | @@ -241,6 +243,8 @@ Component({ | ||
241 | pageSize: th.data.goodscount, | 243 | pageSize: th.data.goodscount, |
242 | page: th.data.currentPage, | 244 | page: th.data.currentPage, |
243 | isonsale: 1, | 245 | isonsale: 1, |
246 | + orderField: "sort", | ||
247 | + orderType: 'asc', | ||
244 | } | 248 | } |
245 | }).then(res => { | 249 | }).then(res => { |
246 | th.data.loading=0; | 250 | th.data.loading=0; |
components/goods_list/goods_list.js
@@ -21,9 +21,8 @@ Component({ | @@ -21,9 +21,8 @@ Component({ | ||
21 | properties: { | 21 | properties: { |
22 | // 这⾥定义了innerText属性,属性值可以在组件使⽤时指定 | 22 | // 这⾥定义了innerText属性,属性值可以在组件使⽤时指定 |
23 | }, | 23 | }, |
24 | - ready: function () { | ||
25 | - }, | ||
26 | - pageLifetimes:{ | 24 | + ready: function () {}, |
25 | + pageLifetimes: { | ||
27 | //要处理一下,游客登录后的界面的变化,主要还该是改变会员 | 26 | //要处理一下,游客登录后的界面的变化,主要还该是改变会员 |
28 | show: function () { | 27 | show: function () { |
29 | this.init(); | 28 | this.init(); |
@@ -33,55 +32,55 @@ Component({ | @@ -33,55 +32,55 @@ Component({ | ||
33 | methods: { | 32 | methods: { |
34 | init: function () { | 33 | init: function () { |
35 | var th = this; | 34 | var th = this; |
36 | - if(!getApp().globalData.user_id) return false; | 35 | + if (!getApp().globalData.user_id) return false; |
37 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { | 36 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { |
38 | - isShowLoading:false, | 37 | + isShowLoading: false, |
39 | success: function (e) { | 38 | success: function (e) { |
40 | - if(e.data.code==0 && e.data && e.data.data){ | ||
41 | - getApp().globalData.userInfo = e.data.data; | ||
42 | - getApp().getConfig2(function (e) { | ||
43 | - var swithc_list = e.switch_list; | ||
44 | - var sw_arr = JSON.parse(swithc_list); | ||
45 | - //---如果后台有开等级卡的开关--- | ||
46 | - if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { | ||
47 | - th.setData({ | ||
48 | - rank_switch: true | ||
49 | - }); | ||
50 | - //---回调卡的列表--- | ||
51 | - th.getPlusCardType(function (ob) { | ||
52 | - th.setData({ | ||
53 | - card_list: ob.card_list | ||
54 | - }); | ||
55 | - var ti = setInterval(function () { | ||
56 | - var user = getApp().globalData.userInfo; | ||
57 | - if (!user) return false; | ||
58 | - clearInterval(ti); | ||
59 | - if (user.card_field && user['card_expiredate']) { | ||
60 | - var str = user['card_expiredate'].replace(/-/g, '/'); | ||
61 | - var end = new Date(str); | ||
62 | - end = Date.parse(end) / 1000; | ||
63 | - var now = ut.gettimestamp(); | ||
64 | - //--- 判断是等级会员,且在有效期范围内 --- | ||
65 | - if (user.card_field && now < end) { | ||
66 | - var card_name = ob.name_map.get(user.card_field); | ||
67 | - if (card_name.length > 4) card_name = card_name.substring(0, 8); | ||
68 | - th.setData({ | ||
69 | - card_field: user.card_field, | ||
70 | - card_name: card_name, | ||
71 | - card_list: ob.card_list | ||
72 | - }); | ||
73 | - } | ||
74 | - } | ||
75 | - }, 500) | ||
76 | - }) | ||
77 | - } | ||
78 | - }) | ||
79 | - | ||
80 | - } | ||
81 | - | ||
82 | - | ||
83 | - | ||
84 | - } | 39 | + if (e.data.code == 0 && e.data && e.data.data) { |
40 | + getApp().globalData.userInfo = e.data.data; | ||
41 | + getApp().getConfig2(function (e) { | ||
42 | + var swithc_list = e.switch_list; | ||
43 | + var sw_arr = JSON.parse(swithc_list); | ||
44 | + //---如果后台有开等级卡的开关--- | ||
45 | + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { | ||
46 | + th.setData({ | ||
47 | + rank_switch: true | ||
48 | + }); | ||
49 | + //---回调卡的列表--- | ||
50 | + th.getPlusCardType(function (ob) { | ||
51 | + th.setData({ | ||
52 | + card_list: ob.card_list | ||
53 | + }); | ||
54 | + var ti = setInterval(function () { | ||
55 | + var user = getApp().globalData.userInfo; | ||
56 | + if (!user) return false; | ||
57 | + clearInterval(ti); | ||
58 | + if (user.card_field && user['card_expiredate']) { | ||
59 | + var str = user['card_expiredate'].replace(/-/g, '/'); | ||
60 | + var end = new Date(str); | ||
61 | + end = Date.parse(end) / 1000; | ||
62 | + var now = ut.gettimestamp(); | ||
63 | + //--- 判断是等级会员,且在有效期范围内 --- | ||
64 | + if (user.card_field && now < end) { | ||
65 | + var card_name = ob.name_map.get(user.card_field); | ||
66 | + if (card_name.length > 4) card_name = card_name.substring(0, 8); | ||
67 | + th.setData({ | ||
68 | + card_field: user.card_field, | ||
69 | + card_name: card_name, | ||
70 | + card_list: ob.card_list | ||
71 | + }); | ||
72 | + } | ||
73 | + } | ||
74 | + }, 500) | ||
75 | + }) | ||
76 | + } | ||
77 | + }) | ||
78 | + | ||
79 | + } | ||
80 | + | ||
81 | + | ||
82 | + | ||
83 | + } | ||
85 | }) | 84 | }) |
86 | }, | 85 | }, |
87 | // get_list: function () { | 86 | // get_list: function () { |
@@ -96,51 +95,51 @@ Component({ | @@ -96,51 +95,51 @@ Component({ | ||
96 | // } | 95 | // } |
97 | // }) | 96 | // }) |
98 | // }, | 97 | // }, |
99 | - get_list: function() { | ||
100 | - var that = this; | ||
101 | - if (that.data.is_no_more == 0) return false; | ||
102 | - var curPage = that.data.curPage; | ||
103 | - getApp().request.get('/api/weshop/goods/page?page', { | ||
104 | - isShowLoading:false, | ||
105 | - data: { | ||
106 | - is_mainshow: 1, | ||
107 | - isonsale: 1, | ||
108 | - is_recommend: 1, | ||
109 | - is_on_sale: 1, | ||
110 | - store_id: o.stoid, | ||
111 | - page: curPage, | ||
112 | - pageSize: 6, | ||
113 | - orderField:"sort", | ||
114 | - orderType:'asc', | ||
115 | - }, | ||
116 | - success: function(res) { | ||
117 | - var data = res.data; | ||
118 | - var total = data.data.total; | ||
119 | - if (total <= curPage * 6) { | ||
120 | - that.setData({ | ||
121 | - is_no_more: 0 | ||
122 | - }); | ||
123 | - } else { | ||
124 | - that.data.curPage++; | ||
125 | - } | ||
126 | - //加载完成 | ||
127 | - if (data.data.pageData) { | ||
128 | - that.setData({ | ||
129 | - load_complete: 1 | ||
130 | - }); | ||
131 | - } | ||
132 | - if (that.data.recommend != null) { | ||
133 | - var ra = that.data.recommend.concat(data.data.pageData); | ||
134 | - that.setData({ | ||
135 | - recommend: ra | ||
136 | - }); | ||
137 | - } else { | ||
138 | - that.setData({ | ||
139 | - recommend: data.data.pageData | ||
140 | - }); | ||
141 | - } | ||
142 | - } | ||
143 | - }) | 98 | + get_list: function () { |
99 | + var that = this; | ||
100 | + if (that.data.is_no_more == 0) return false; | ||
101 | + var curPage = that.data.curPage; | ||
102 | + getApp().request.get('/api/weshop/goods/page?page', { | ||
103 | + isShowLoading: false, | ||
104 | + data: { | ||
105 | + is_mainshow: 1, | ||
106 | + isonsale: 1, | ||
107 | + is_recommend: 1, | ||
108 | + is_on_sale: 1, | ||
109 | + store_id: o.stoid, | ||
110 | + page: curPage, | ||
111 | + pageSize: 6, | ||
112 | + orderField: "sort", | ||
113 | + orderType: 'asc', | ||
114 | + }, | ||
115 | + success: function (res) { | ||
116 | + var data = res.data; | ||
117 | + var total = data.data.total; | ||
118 | + if (total <= curPage * 6) { | ||
119 | + that.setData({ | ||
120 | + is_no_more: 0 | ||
121 | + }); | ||
122 | + } else { | ||
123 | + that.data.curPage++; | ||
124 | + } | ||
125 | + //加载完成 | ||
126 | + if (data.data.pageData) { | ||
127 | + that.setData({ | ||
128 | + load_complete: 1 | ||
129 | + }); | ||
130 | + } | ||
131 | + if (that.data.recommend != null) { | ||
132 | + var ra = that.data.recommend.concat(data.data.pageData); | ||
133 | + that.setData({ | ||
134 | + recommend: ra | ||
135 | + }); | ||
136 | + } else { | ||
137 | + that.setData({ | ||
138 | + recommend: data.data.pageData | ||
139 | + }); | ||
140 | + } | ||
141 | + } | ||
142 | + }) | ||
144 | }, | 143 | }, |
145 | bind_bnerr_xc: function (e) { | 144 | bind_bnerr_xc: function (e) { |
146 | var _errImg = e.target.dataset.errorimg; | 145 | var _errImg = e.target.dataset.errorimg; |
@@ -156,41 +155,40 @@ Component({ | @@ -156,41 +155,40 @@ Component({ | ||
156 | getPlusCardType: function (func) { | 155 | getPlusCardType: function (func) { |
157 | var storid = o.stoid; | 156 | var storid = o.stoid; |
158 | var th = this; | 157 | var th = this; |
159 | - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, | ||
160 | - {}).then(res => { | 158 | + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { |
161 | 159 | ||
162 | - if(res.data.code!=0 || !res.data.data){ | ||
163 | - var ob = { | ||
164 | - "card_list": [], | ||
165 | - "name_map": "" | ||
166 | - }; | ||
167 | - func(ob); | ||
168 | - return false; | ||
169 | - } | 160 | + if (res.data.code != 0 || !res.data.data) { |
161 | + var ob = { | ||
162 | + "card_list": [], | ||
163 | + "name_map": "" | ||
164 | + }; | ||
165 | + func(ob); | ||
166 | + return false; | ||
167 | + } | ||
170 | 168 | ||
171 | - var plusCard = res.data.data; | ||
172 | - var arr = [1219, 2089, 3031]; | ||
173 | - var new_arr = new Array(); | ||
174 | - var card_name_map = new Map(); | ||
175 | - | ||
176 | - var user = getApp().globalData.userInfo; | ||
177 | - if(plusCard) { | ||
178 | - for (var i = 0; i < plusCard.length; i++) { | ||
179 | - if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { | ||
180 | - continue; | ||
181 | - } | ||
182 | - var name = "card" + plusCard[i].CorrPrice.toLowerCase(); | ||
183 | - card_name_map.set(name, plusCard[i].CardName); | ||
184 | - new_arr.push(plusCard[i]); | 169 | + var plusCard = res.data.data; |
170 | + var arr = [1219, 2089, 3031]; | ||
171 | + var new_arr = new Array(); | ||
172 | + var card_name_map = new Map(); | ||
185 | 173 | ||
174 | + var user = getApp().globalData.userInfo; | ||
175 | + if (plusCard) { | ||
176 | + for (var i = 0; i < plusCard.length; i++) { | ||
177 | + if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { | ||
178 | + continue; | ||
186 | } | 179 | } |
180 | + var name = "card" + plusCard[i].CorrPrice.toLowerCase(); | ||
181 | + card_name_map.set(name, plusCard[i].CardName); | ||
182 | + new_arr.push(plusCard[i]); | ||
183 | + | ||
187 | } | 184 | } |
188 | - var ob = { | ||
189 | - "card_list": new_arr, | ||
190 | - "name_map": card_name_map | ||
191 | - }; | ||
192 | - func(ob); | ||
193 | - }) | 185 | + } |
186 | + var ob = { | ||
187 | + "card_list": new_arr, | ||
188 | + "name_map": card_name_map | ||
189 | + }; | ||
190 | + func(ob); | ||
191 | + }) | ||
194 | }, | 192 | }, |
195 | }, | 193 | }, |
196 | }) | 194 | }) |
197 | \ No newline at end of file | 195 | \ No newline at end of file |