diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index 83eb91e..ec66ad2 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -211,6 +211,8 @@ Component({ pageSize: th.data.goodscount, page: th.data.currentPage, isonsale: 1, + orderField: "sort", + orderType: 'asc', }; if(th.data.is_recommend) r_data.is_recommend=th.data.is_recommend; if(th.data.is_hot) r_data.is_hot=th.data.is_hot; @@ -241,6 +243,8 @@ Component({ pageSize: th.data.goodscount, page: th.data.currentPage, isonsale: 1, + orderField: "sort", + orderType: 'asc', } }).then(res => { th.data.loading=0; diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index 6d29215..cb4fb85 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -21,9 +21,8 @@ Component({ properties: { // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定 }, - ready: function () { - }, - pageLifetimes:{ + ready: function () {}, + pageLifetimes: { //要处理一下，游客登录后的界面的变化,主要还该是改变会员 show: function () { this.init(); @@ -33,55 +32,55 @@ Component({ methods: { init: function () { var th = this; - if(!getApp().globalData.user_id) return false; + if (!getApp().globalData.user_id) return false; getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { - isShowLoading:false, + isShowLoading: false, success: function (e) { - if(e.data.code==0 && e.data && e.data.data){ - getApp().globalData.userInfo = e.data.data; - getApp().getConfig2(function (e) { - var swithc_list = e.switch_list; - var sw_arr = JSON.parse(swithc_list); - //---如果后台有开等级卡的开关--- - if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { - th.setData({ - rank_switch: true - }); - //---回调卡的列表--- - th.getPlusCardType(function (ob) { - th.setData({ - card_list: ob.card_list - }); - var ti = setInterval(function () { - var user = getApp().globalData.userInfo; - if (!user) return false; - clearInterval(ti); - if (user.card_field && user['card_expiredate']) { - var str = user['card_expiredate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); - //--- 判断是等级会员，且在有效期范围内 --- - if (user.card_field && now < end) { - var card_name = ob.name_map.get(user.card_field); - if (card_name.length > 4) card_name = card_name.substring(0, 8); - th.setData({ - card_field: user.card_field, - card_name: card_name, - card_list: ob.card_list - }); - } - } - }, 500) - }) - } - }) - - } - - - - } + if (e.data.code == 0 && e.data && e.data.data) { + getApp().globalData.userInfo = e.data.data; + getApp().getConfig2(function (e) { + var swithc_list = e.switch_list; + var sw_arr = JSON.parse(swithc_list); + //---如果后台有开等级卡的开关--- + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { + th.setData({ + rank_switch: true + }); + //---回调卡的列表--- + th.getPlusCardType(function (ob) { + th.setData({ + card_list: ob.card_list + }); + var ti = setInterval(function () { + var user = getApp().globalData.userInfo; + if (!user) return false; + clearInterval(ti); + if (user.card_field && user['card_expiredate']) { + var str = user['card_expiredate'].replace(/-/g, '/'); + var end = new Date(str); + end = Date.parse(end) / 1000; + var now = ut.gettimestamp(); + //--- 判断是等级会员，且在有效期范围内 --- + if (user.card_field && now < end) { + var card_name = ob.name_map.get(user.card_field); + if (card_name.length > 4) card_name = card_name.substring(0, 8); + th.setData({ + card_field: user.card_field, + card_name: card_name, + card_list: ob.card_list + }); + } + } + }, 500) + }) + } + }) + + } + + + + } }) }, // get_list: function () { @@ -96,51 +95,51 @@ Component({ // } // }) // }, - get_list: function() { - var that = this; - if (that.data.is_no_more == 0) return false; - var curPage = that.data.curPage; - getApp().request.get('/api/weshop/goods/page?page', { - isShowLoading:false, - data: { - is_mainshow: 1, - isonsale: 1, - is_recommend: 1, - is_on_sale: 1, - store_id: o.stoid, - page: curPage, - pageSize: 6, - orderField:"sort", - orderType:'asc', - }, - success: function(res) { - var data = res.data; - var total = data.data.total; - if (total <= curPage * 6) { - that.setData({ - is_no_more: 0 - }); - } else { - that.data.curPage++; - } - //加载完成 - if (data.data.pageData) { - that.setData({ - load_complete: 1 - }); - } - if (that.data.recommend != null) { - var ra = that.data.recommend.concat(data.data.pageData); - that.setData({ - recommend: ra - }); - } else { - that.setData({ - recommend: data.data.pageData - }); - } - } - }) + get_list: function () { + var that = this; + if (that.data.is_no_more == 0) return false; + var curPage = that.data.curPage; + getApp().request.get('/api/weshop/goods/page?page', { + isShowLoading: false, + data: { + is_mainshow: 1, + isonsale: 1, + is_recommend: 1, + is_on_sale: 1, + store_id: o.stoid, + page: curPage, + pageSize: 6, + orderField: "sort", + orderType: 'asc', + }, + success: function (res) { + var data = res.data; + var total = data.data.total; + if (total <= curPage * 6) { + that.setData({ + is_no_more: 0 + }); + } else { + that.data.curPage++; + } + //加载完成 + if (data.data.pageData) { + that.setData({ + load_complete: 1 + }); + } + if (that.data.recommend != null) { + var ra = that.data.recommend.concat(data.data.pageData); + that.setData({ + recommend: ra + }); + } else { + that.setData({ + recommend: data.data.pageData + }); + } + } + }) }, bind_bnerr_xc: function (e) { var _errImg = e.target.dataset.errorimg; @@ -156,41 +155,40 @@ Component({ getPlusCardType: function (func) { var storid = o.stoid; var th = this; - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, - {}).then(res => { + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { - if(res.data.code!=0 || !res.data.data){ - var ob = { - "card_list": [], - "name_map": "" - }; - func(ob); - return false; - } + if (res.data.code != 0 || !res.data.data) { + var ob = { + "card_list": [], + "name_map": "" + }; + func(ob); + return false; + } - var plusCard = res.data.data; - var arr = [1219, 2089, 3031]; - var new_arr = new Array(); - var card_name_map = new Map(); - - var user = getApp().globalData.userInfo; - if(plusCard) { - for (var i = 0; i < plusCard.length; i++) { - if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { - continue; - } - var name = "card" + plusCard[i].CorrPrice.toLowerCase(); - card_name_map.set(name, plusCard[i].CardName); - new_arr.push(plusCard[i]); + var plusCard = res.data.data; + var arr = [1219, 2089, 3031]; + var new_arr = new Array(); + var card_name_map = new Map(); + var user = getApp().globalData.userInfo; + if (plusCard) { + for (var i = 0; i < plusCard.length; i++) { + if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { + continue; } + var name = "card" + plusCard[i].CorrPrice.toLowerCase(); + card_name_map.set(name, plusCard[i].CardName); + new_arr.push(plusCard[i]); + } - var ob = { - "card_list": new_arr, - "name_map": card_name_map - }; - func(ob); - }) + } + var ob = { + "card_list": new_arr, + "name_map": card_name_map + }; + func(ob); + }) }, }, }) \ No newline at end of file