From b28461102d853ca8bb07507a79ec897a7b291560 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Fri, 24 Sep 2021 10:50:19 +0800 Subject: [PATCH] no message --- api/moment.js | 4 +- pages/agent/factory-fragment/index.js | 135 ------------------------ pages/agent/factory-fragment/index.json | 14 --- pages/agent/factory-fragment/index.wxml | 38 ------- pages/agent/factory-fragment/index.wxss | 1 - pages/agent/focus-fragment/index.js | 135 ------------------------ pages/agent/focus-fragment/index.json | 15 --- pages/agent/focus-fragment/index.wxml | 41 ------- pages/agent/focus-fragment/index.wxss | 60 ----------- pages/moment/attention/index.js | 40 ++++++- pages/moment/recommend/index.js | 42 +++++++- pages/moment/recommend/index.wxml | 4 +- pages/moment/theall/index.js | 35 +++++- pages/morder/index/index.js | 4 +- 14 files changed, 115 insertions(+), 453 deletions(-) delete mode 100644 pages/agent/factory-fragment/index.js delete mode 100644 pages/agent/factory-fragment/index.json delete mode 100644 pages/agent/factory-fragment/index.wxml delete mode 100644 pages/agent/factory-fragment/index.wxss delete mode 100644 pages/agent/focus-fragment/index.js delete mode 100644 pages/agent/focus-fragment/index.json delete mode 100644 pages/agent/focus-fragment/index.wxml delete mode 100644 pages/agent/focus-fragment/index.wxss diff --git a/api/moment.js b/api/moment.js index 9df1d96..ce374cb 100644 --- a/api/moment.js +++ b/api/moment.js @@ -39,6 +39,7 @@ const getCategoryList = (params) => mGet(`/information-center/paper-index-catego const getCategoryType = (params) => mGet(`/ztb-market-information-service/get/scrap-paper-main-category`, params, mconfig) const getMomentList = (params) => mGet(`/ztb-market-information-service/get/price-compare-info/by-scrap-paper-main-category`, params, mconfig) +const getInformationList = (params) => mGet(`/ztb-market-information-service/get/market-info/by-query-type`, params, mconfig) export { mconfig, @@ -57,5 +58,6 @@ export { getCategoryPrice, getCategoryList, getCategoryType, - getMomentList + getMomentList, + getInformationList } \ No newline at end of file diff --git a/pages/agent/factory-fragment/index.js b/pages/agent/factory-fragment/index.js deleted file mode 100644 index c860259..0000000 --- a/pages/agent/factory-fragment/index.js +++ /dev/null @@ -1,135 +0,0 @@ -// pages/agent/index/index.js -import { getFactoryPrice, getFactoryCity, hasActivity } from "../../../api/ztb" -const app = getApp() - -Component({ - options: { - addGlobalClass: true, - multipleSlots: true - }, - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight - 90, - CustomBar: app.globalData.CustomBar, - kg: app.globalData.kg, - loading: true, - requesting: false, - finished: false, - tabList: [], - tabIndex: 0, - cateList: [], - scrolled: false, - top: 0, - orderList: [], - form: { - cityId: '', - enableSalesAgent: 1, - pageNum: 1, - pageSize:15, - listType: 0 - }, - triggered: false, - firstShow: false, - hasActivity: false - }, - lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 - attached: function () { - - if(app.globalData.userInfo){ - hasActivity().then(result => { - this.setData({ hasActivity: result.data }) - }) - } - } - }, - methods: { - onRestart: function(){ - if (!this.data.firstShow) { - this.setData({ height: app.globalData.fragmentHeight - 90, kg: app.globalData.kg }) - this.fetchRegionList() - this.fetchPapersList() - } - this.data.firstShow = true - }, - toAbility: function(){ - wx.navigateTo({ url: '/pages/agent/ability/index' }) - }, - fetchRegionList: function () { - getFactoryCity().then(result => { - //成功回调 - this.data.cateList = [{ cityId: '', cityName: '全部' }].concat(result.data) - for (let index = 0; index < this.data.cateList.length; index++) { - this.data.tabList.push(this.data.cateList[index].cityName) - } - this.setData({ tabList: this.data.tabList, scrolled: this.data.cateList.length >= 5 }) - }) - }, - onTabChange: function ({ detail }) { - if (this.data.tabIndex == Number(detail.index)) { - return - } - this.data.tabIndex = Number(detail.index) - this.data.form.cityId = this.data.cateList[this.data.tabIndex].cityId - this.onRefreshList() - }, - // 下拉刷新... - onRefreshList: function () { - if (this.data.requesting) { - return - } - this.setData({ orderList: [], tabIndex: this.data.tabIndex, ['form.pageNum']: 1, loading: true, finished: false }) - this.fetchPapersList() - }, - // 获取特价列表 - fetchPapersList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) - } - getFactoryPrice(this.data.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 - if (this.data.form.pageNum == 1) { - this.setData({ - [nowList]: respList, - total: result.data.total, - ['form.pageNum']: (num + 1), - top: 0, - finished, - requesting: false, - loading: false - }) - } else { - this.setData({ - [nowList]: respList, - total: result.data.total, - ['form.pageNum']: (num + 1), - finished, - requesting: false, - loading: false - }) - } - } else { - this.setData({ requesting: false, finished: true, loading: false, }) - } - }).catch(err => { - //异常回调 - this.setData({ requesting: false, finished: true, loading: false, }) - }) - }, - goattentionIndex: function () { - wx.navigateTo({ url: '/pages/home/attention-paper/index' }) - } - } - -}) \ No newline at end of file diff --git a/pages/agent/factory-fragment/index.json b/pages/agent/factory-fragment/index.json deleted file mode 100644 index 5130038..0000000 --- a/pages/agent/factory-fragment/index.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "component": true, - "usingComponents": { - "wux-skeleton": "/components/skeleton/index", - "wux-skeleton-avatar": "/components/skeleton-avatar/index", - "wux-skeleton-paragraph": "/components/skeleton-paragraph/index", - "wux-button": "/components/button/index", - "refresh-view": "/components/refresher/index", - "wux-tabi": "/components/tabi/index", - "wux-image": "/components/image/index", - "wux-divider": "/components/divider/index", - "agent-item": "/pages/agent/agent-item/index" - } -} \ No newline at end of file diff --git a/pages/agent/factory-fragment/index.wxml b/pages/agent/factory-fragment/index.wxml deleted file mode 100644 index cb67b36..0000000 --- a/pages/agent/factory-fragment/index.wxml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - \ No newline at end of file diff --git a/pages/agent/factory-fragment/index.wxss b/pages/agent/factory-fragment/index.wxss deleted file mode 100644 index 14f8cb0..0000000 --- a/pages/agent/factory-fragment/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/agent/index/index.wxss */ \ No newline at end of file diff --git a/pages/agent/focus-fragment/index.js b/pages/agent/focus-fragment/index.js deleted file mode 100644 index f9925f6..0000000 --- a/pages/agent/focus-fragment/index.js +++ /dev/null @@ -1,135 +0,0 @@ -import util from "../../../utils/util" -// pages/agent/index/index.js -import { getFactoryPrice, getBaseInfo, updateUserInfo } from "../../../api/ztb" -const event = require('../../../utils/event') -const app = getApp() - -Component({ - options: { - addGlobalClass: true, - multipleSlots: true - }, - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight - 90, - CustomBar: app.globalData.CustomBar, - kg: app.globalData.kg, - loading: true, - requesting: false, - finished: false, - tabList: [], - tabIndex: 0, - cateList: [], - scrolled: false, - top: 0, - orderList: [], - form: { - cityId: '', - enableSalesAgent: 1, - pageNum: 1, - listType: 1 - } - }, - lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 - attached: function () { - this.setData({ height: app.globalData.fragmentHeight, kg: app.globalData.kg }) - this.fetchPapersList() - event.on('EventMessage', this, this.onEvent) - }, - detached: function () { - event.remove('EventMessage', this) - } - }, - methods: { - onEvent: function (message) { - if (message.what == 1100 || message.what == 1101 || message.what == 888) { - this.onRefreshList() - } - }, - onRestart: function () { - if(!app.globalData.userInfo){ - return - } - getBaseInfo().then(result => { - if (result.data.isSetProxyTag == false) { - updateUserInfo({ isSetProxyTag: true }).then(result => {}) - this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog') - this.wuxDialog.open({ - resetOnClose: true, - title: '温馨提示', - content: '是否选择关注您常卖的纸厂？', - buttons: [{ - text: '取消' - }, { - text: '确定', - type: 'primary', - onTap(e) { - util.navigateTo('/pages/home/attention-paper/index') - } - }] - }) - } - }) - }, - // 下拉刷新... - onRefreshList: function () { - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - finished: false - }) - this.fetchPapersList() - }, - // 获取特价列表 - fetchPapersList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) - } - getFactoryPrice(this.data.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 - if (this.data.form.pageNum == 1) { - this.setData({ - [nowList]: respList, - total: result.data.total, - ['form.pageNum']: (num + 1), - top: 0, - finished, - requesting: false, - loading: false - }) - } else { - this.setData({ - [nowList]: respList, - total: result.data.total, - ['form.pageNum']: (num + 1), - finished, - requesting: false, - loading: false - }) - } - } else { - this.setData({ requesting: false, finished: true, loading: false }) - } - }).catch(err => { - this.setData({ requesting: false, finished: true, loading: false }) - }) - }, - goattentionIndex: function () { - util.navigateTo('/pages/home/attention-paper/index') - } - } - -}) \ No newline at end of file diff --git a/pages/agent/focus-fragment/index.json b/pages/agent/focus-fragment/index.json deleted file mode 100644 index b634036..0000000 --- a/pages/agent/focus-fragment/index.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "component": true, - "usingComponents": { - "wux-skeleton": "/components/skeleton/index", - "wux-skeleton-avatar": "/components/skeleton-avatar/index", - "wux-skeleton-paragraph": "/components/skeleton-paragraph/index", - "wux-button": "/components/button/index", - "refresh-view": "/components/refresher/index", - "wux-tabi": "/components/tabi/index", - "wux-image": "/components/image/index", - "wux-divider": "/components/divider/index", - "agent-item": "/pages/agent/agent-item/index", - "wux-dialog": "/components/dialog/index" - } -} \ No newline at end of file diff --git a/pages/agent/focus-fragment/index.wxml b/pages/agent/focus-fragment/index.wxml deleted file mode 100644 index 03fb71f..0000000 --- a/pages/agent/focus-fragment/index.wxml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - 暂无关注 - - - 可前往纸厂列表添加关注 - - - 添加关注 - - - - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - - - \ No newline at end of file diff --git a/pages/agent/focus-fragment/index.wxss b/pages/agent/focus-fragment/index.wxss deleted file mode 100644 index cbfb519..0000000 --- a/pages/agent/focus-fragment/index.wxss +++ /dev/null @@ -1,60 +0,0 @@ -/* pages/agent/index/index.wxss */ - -.bgImgView { - width: 100%; - height: 548rpx; - padding: 160rpx 186rpx 94rpx 186rpx; - background-color: white; -} - -.imgsj { - height: 294rpx; - width: 378rpx; -} - -.midText { - width: 100%; - height: 67rpx; - padding: 0rpx 279rpx 0rpx 279rpx; -} - -.midText2 { - font-size: 48rpx; - color: #000000; - letter-spacing: 0; - text-align: left; -} - -.midText3 { - width: 100%; - height: 45px; - padding: 0rpx 199rpx 0rpx 199rpx; - margin-top: 12rpx; -} - -.midText4 { - font-size: 32rpx; - color: rgba(0, 0, 0, 0.75); - letter-spacing: 0; - text-align: left; -} -.bg-blue{ - color: #FFFFFF; - background-color: #008AFF; -} - -.offer-btn { - width: 480rpx; - height: 88rpx; - background: linear-gradient(312deg, rgba(38, 125, 214, 1) 0%, rgba(0, 138, 255, 1) 100%); - box-shadow: 0px 10px 13px -8px rgba(35, 126, 217, 0.53); - border-radius: 10rpx; - color: white; - font-size: 32rpx; - margin-left: 32rpx; -} -.bottomBtn{ - width: 100%; - height: 88rpx; - padding:0rpx 135rpx 0rpx 135rpx; -} \ No newline at end of file diff --git a/pages/moment/attention/index.js b/pages/moment/attention/index.js index 29e3978..1862fb6 100644 --- a/pages/moment/attention/index.js +++ b/pages/moment/attention/index.js @@ -1,4 +1,5 @@ // pages/message/index.js +import { getInformationList } from "../../../api/moment" const util = require('../../../utils/util') const app = getApp() @@ -12,18 +13,51 @@ Component({ item: { type: Object, value: null } }, data: { + form: { + byQueryType: 1, + pageNum: 1, + pageSize: 10 + }, + requesting: false, orderList: [] }, methods: { onRestart: function () { - console.log('attention....start') if(!this.firstShow){ - + var min = new Date() + min.setHours(0, 0, 0) + this.data.form.date = util.formatDate(min, 'Y-M-D') + this.fetchList() } this.firstShow = true }, + onRefreshList: function(){ + if (this.data.requesting) { + return + } + this.setData({ orderList: [], ['form.pageNum']: 1, finished: false }) + this.fetchOrderList() + }, fetchList: function(){ - + if (this.data.requesting) { + return + } + this.data.requesting = true + getInformationList(this.data.form).then(result => { + if (result.data.records.length) { + var respList = result.data.records + let nowList = `orderList[${this.data.orderList.length}]` + var num = this.data.form.pageNum + var finished = this.data.form.pageNum >= result.data.pages + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false }) + } else { + this.setData({ finished: true, requesting: false }) + } + }).catch(err => { + //异常回调 + this.setData({ requesting: false }) + util.showToast(err) + }) } } diff --git a/pages/moment/recommend/index.js b/pages/moment/recommend/index.js index 4fbc97c..0736327 100644 --- a/pages/moment/recommend/index.js +++ b/pages/moment/recommend/index.js @@ -1,4 +1,5 @@ // pages/message/index.js +import { getInformationList } from "../../../api/moment" const util = require('../../../utils/util') const app = getApp() @@ -12,17 +13,52 @@ Component({ item: { type: Object, value: null } }, data: { - orderList: [3] + form: { + byQueryType: 0, + pageNum: 1, + pageSize: 10 + }, + requesting: false, + orderList: [] }, methods: { onRestart: function () { if(!this.firstShow){ - + var min = new Date() + min.setHours(0, 0, 0) + this.data.form.date = util.formatDate(min, 'Y-M-D') + this.data.form.cityId = app.nowCity.cityCode + this.fetchList() } this.firstShow = true }, + onRefreshList: function(){ + if (this.data.requesting) { + return + } + this.setData({ orderList: [], ['form.pageNum']: 1, finished: false }) + this.fetchOrderList() + }, fetchList: function(){ - + if (this.data.requesting) { + return + } + this.data.requesting = true + getInformationList(this.data.form).then(result => { + if (result.data.records.length) { + var respList = result.data.records + let nowList = `orderList[${this.data.orderList2.length}]` + var num = this.data.form.pageNum + var finished = this.data.form.pageNum >= result.data.pages + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false }) + } else { + this.setData({ finished: true, requesting: false }) + } + }).catch(err => { + //异常回调 + this.setData({ requesting: false }) + util.showToast(err) + }) } } diff --git a/pages/moment/recommend/index.wxml b/pages/moment/recommend/index.wxml index 9b44043..7274b8a 100644 --- a/pages/moment/recommend/index.wxml +++ b/pages/moment/recommend/index.wxml @@ -3,10 +3,10 @@ - + - + 纸厂名称 涨跌幅 车辆排队 diff --git a/pages/moment/theall/index.js b/pages/moment/theall/index.js index 855282c..9b37f01 100644 --- a/pages/moment/theall/index.js +++ b/pages/moment/theall/index.js @@ -17,13 +17,19 @@ Component({ proviceList: [], pIndex: 0, form: { - proviceId: '' + proviceId: '', + byQueryType: 2, + pageNum: 1, + pageSize: 10 }, orderList: [] }, methods: { onRestart: function () { if(!this.data.firstShow){ + var min = new Date() + min.setHours(0, 0, 0) + this.data.form.date = util.formatDate(min, 'Y-M-D') setTimeout(() => { this.setData({ tabIndex: 0, firstShow: true, proviceList: this.getProviceListByIndex(this.data.tabIndex) }) }, 100) @@ -54,8 +60,33 @@ Component({ this.data.form.proviceId = area.list[this.data.tabIndex].data[this.data.pIndex].code this.fetchList() }, + onRefreshList: function(){ + if (this.data.requesting) { + return + } + this.setData({ orderList: [], ['form.pageNum']: 1, finished: false }) + this.fetchOrderList() + }, fetchList: function(){ - console.log(this.data.form) + if (this.data.requesting) { + return + } + this.data.requesting = true + getInformationList(this.data.form).then(result => { + if (result.data.records.length) { + var respList = result.data.records + let nowList = `orderList[${this.data.orderList2.length}]` + var num = this.data.form.pageNum + var finished = this.data.form.pageNum >= result.data.pages + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false }) + } else { + this.setData({ finished: true, requesting: false }) + } + }).catch(err => { + //异常回调 + this.setData({ requesting: false }) + util.showToast(err) + }) } } diff --git a/pages/morder/index/index.js b/pages/morder/index/index.js index bc1b788..3bd178f 100644 --- a/pages/morder/index/index.js +++ b/pages/morder/index/index.js @@ -190,9 +190,7 @@ Page({ if (this.data.loading2) { this.data.requesting2 = true } else { - this.setData({ - requesting2: true - }) + this.setData({ requesting2: true }) } getProxyOrderList(this.data.form2).then(result => { if (result.data.records.length) {