diff --git a/pages/mall/fragment/index.js b/pages/mall/fragment/index.js
index a84b79e..b4cb08b 100644
--- a/pages/mall/fragment/index.js
+++ b/pages/mall/fragment/index.js
@@ -2,8 +2,10 @@
import { getFactoryPrice, getBannerList } from "../../../api/ztb"
import { getPreferList } from "../../../api/moment"
const event = require('../../../utils/event')
+const storage = require('../../../utils/storage')
const util = require('../../../utils/util')
const app = getApp()
+var form = {}
Component({
options: {
@@ -21,19 +23,14 @@ Component({
*/
data: {
height: app.globalData.safeFragmentHeight - 100,
- kg: app.globalData.kg,
firstShow: false,
- banning: true,
bannerList: [],
momentList: [],
tabList: [ '黄纸', '白纸', '灰纸', '杂纸' ],
tabIndex: 0,
- loading: true,
requesting: false,
- finished: false,
- form: { pageNum: 1 },
- orderList: [1],
- show: false,
+ orderList: [],
+ popover: false,
sortList: [
{sort: 1, text: '更新时间'},
{sort: 2, text: '价格升序'},
@@ -57,7 +54,6 @@ Component({
if(!this.data.firstShow){
this.setData({
height: app.globalData.safeFragmentHeight - 100,
- kg: app.globalData.kg,
StatusBar: app.globalData.StatusBar || 40,
customHeight: app.globalData.customHeight,
CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80),
@@ -69,25 +65,23 @@ Component({
this.fetchAgentList()
}
this.data.firstShow = true
+ var bannerstring = storage.get('ztb-banner-list')
+ if(!util.isEmpty(bannerstring)){
+ this.setData({ bannerList: JSON.parse(bannerstring) })
+ }
if(!this.data.bannerList.length){
getBannerList(1).then(result => {
this.setData({ bannerList: result.data })
- }).catch(err => {
+ storage.put('ztb-banner-list', JSON.stringify(result.data))
})
}
},
onEvent: function (message) {
console.log('mall>>fragment>>onEvent', message)
- if (message.what == 10 && app.globalData.isVIP == 1) {
- // this.setData({ token: app.globalData.token })
- // this.onRefreshList()
- } else if(message.what == 1001){
- this.setData({ kg: app.globalData.kg })
- } else if(message.what == 888){
- this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false })
+ if(message.what == 888){
this.fetchAgentList()
} else if(message.what == 444){
- this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false, cityName: app.nowCity.cityName })
+ this.setData({ cityName: app.nowCity.cityName })
this.fetchAgentList()
}
},
@@ -125,45 +119,37 @@ Component({
if(this.data.tabIndex == Number(detail.index)){
return
}
+ form.cateId = Number(detail.index)
this.fetchAgentList()
},
topBubble: function(e){
if(this.data.sortIndex == Number(e.currentTarget.dataset.index)){
- this.setData({ show: !this.data.show })
+ this.setData({ popover: !this.data.popover })
return
}
if(!util.isEmpty(e.currentTarget.dataset.index)){
this.data.sortIndex = Number(e.currentTarget.dataset.index)
- if(this.data.show){
+ if(this.data.popover){
+ form.sort = this.data.sortIndex
this.fetchAgentList()
}
}
- this.setData({ show: !this.data.show, sortIndex: this.data.sortIndex })
+ this.setData({ popover: !this.data.popover, sortIndex: this.data.sortIndex })
},
//*************************************************fetchAgentList************************************************//
- // 获取特价列表
fetchAgentList: function () {
- if (this.data.requesting || this.data.finished) {
+ if (this.data.requesting) {
return
}
- if (this.data.loading) {
- this.data.requesting = true
- } else {
- this.setData({ requesting: true })
- }
- getFactoryPrice(this.data.form).then(result => {
+ this.setData({ requesting: true, orderList: [] })
+ getFactoryPrice(form).then(result => {
if (result.data.records.length) {
- var respList = result.data.records
- let nowList = `orderList[${this.data.orderList.length}]`
- var num = result.data.current
- var finished = result.data.current >= result.data.pages
- this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
+ this.setData({ orderList: result.data.records, requesting: false })
} else {
- this.setData({ requesting: false, finished: true, loading: false })
+ this.setData({ requesting: false })
}
}).catch(err => {
- //异常回调
- this.setData({ requesting: false, finished: true, loading: false })
+ this.setData({ requesting: false })
})
}
}
diff --git a/pages/mall/fragment/index.wxml b/pages/mall/fragment/index.wxml
index a8270d8..4fa06c7 100644
--- a/pages/mall/fragment/index.wxml
+++ b/pages/mall/fragment/index.wxml
@@ -64,7 +64,7 @@
排序
-
@@ -79,15 +79,13 @@
-
-
-
-
-
-
+
+
+
+
-
+
查看更多行情