diff --git a/app.json b/app.json index 4d223fb..75c6965 100644 --- a/app.json +++ b/app.json @@ -32,11 +32,9 @@ "pages/article/publish/index", "pages/article/detail/index", "pages/article/price-detail/index", - "pages/article/queue-detail/index", "pages/article/factory/index", "pages/article/feedback/index", "pages/article/list/index", - "pages/article/index/index", "pages/article/attention-factory/index", "pages/article/sucessful/index", "pages/mall/index/index", diff --git a/assets/image/ico_vip1.png b/assets/image/ico_vip1.png deleted file mode 100644 index d2832eb..0000000 Binary files a/assets/image/ico_vip1.png and /dev/null differ diff --git a/assets/image/ico_vip2.png b/assets/image/ico_vip2.png deleted file mode 100644 index 7a5781d..0000000 Binary files a/assets/image/ico_vip2.png and /dev/null differ diff --git a/assets/image/ico_vip3.png b/assets/image/ico_vip3.png deleted file mode 100644 index 6864b7d..0000000 Binary files a/assets/image/ico_vip3.png and /dev/null differ diff --git a/pages/article/hot-index/index.js b/pages/article/hot-index/index.js deleted file mode 100644 index 2070713..0000000 --- a/pages/article/hot-index/index.js +++ /dev/null @@ -1,163 +0,0 @@ -// pages/stock/index.js -import { getPreferList } from "../../../api/moment" -import { getAllFactoryList, getIndexInfoId } from "../../../api/ztb" -const util = require('../../../utils/util') -const storage = require('../../../utils/storage') -const event = require('../../../utils/event.js') -const app = getApp() - -Component({ - options: { - addGlobalClass: true, - multipleSlots: true - }, - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.safeFragmentHeight - 90, - chartList: null, - momentList: [], - requesting: false, - finished: false, - idList: '', - form: { - pageNum: 1, - pageSize:15 - }, - noticeList: [], - loopIndex: 0, - noticeIndex: 0, - loopRequesting: false, - content: '', - factoryList: [] - }, - lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 - attached: function () { - event.on('EventMessage', this, this.onEvent) - }, - detached: function () { - event.remove('EventMessage', this) - } - }, - methods: { - onRestart: function () { - if (!this.data.firstShow) { - this.setData({ height: app.globalData.safeFragmentHeight - 90 }) - this.onRefreshList() - } - if(!this.data.noticeList.length && !this.data.status){ - this.fetchNoticeList() - } - this.data.firstShow = true - }, - onEvent: function (message) { - if (message.what == 570 || message.what == 571 || message.what == 572 || message.what == 573) { - // 帖子发布刷新 - this.onRefreshList() - } - }, - //***********************************参与纸厂讨论*****************************************// - fetchFactoryList: function(){ - if(app.globalData.userInfo){ - var recommendedString = storage.get('recommended' + app.globalData.userInfo.userId) - if(!util.isEmpty(recommendedString)){ - this.setData({ factoryList: JSON.parse(recommendedString) }) - return - } - } - getAllFactoryList().then(result => { - result.data.sort((a, b)=> b.isRecommended - a.isRecommended) - this.setData({ factoryList: result.data.slice(0, 8) }) - }) - }, - toFactoryList: function(){ - wx.navigateTo({ url: '/pages/article/factory/index' }) - }, - toFactory: function(e){ - var item = this.data.factoryList[e.currentTarget.dataset.index] - util.navigateTo('/pages/agent/factory/index?tabIndex=1&id=' + item.paperMillId) - }, - toPaperList: function(){ - wx.navigateTo({ url: '/pages/moment/paper/index' }) - }, - //*************************************************momentList************************************************// - onRefreshList: function () { - if (this.data.requesting) { - return - } - this.setData({ - momentList: [], - factoryList: [], - ['form.pageNum']: 1, - finished: false - }) - this.fetchFactoryList() - this.fetchMomentList() - }, - fetchMomentList: function(){ - if (this.data.requesting || this.data.finished) { - return - } - this.data.requesting = true - getPreferList(this.data.form).then(result => { - if (result.data.records.length) { - var respList = result.data.records - let nowList = `momentList[${this.data.momentList.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 }) - }) - }, - //*************************************************noticeList************************************************// - fetchNoticeList: function(){ - if (this.data.loopRequesting) { - return - } - this.data.loopRequesting = true - getIndexInfoId().then(result => { - this.data.loopRequesting = false - this.data.noticeList = result.data - if(result.data && result.data.length){ - this.data.noticeIndex = 0 - this.data.loopIndex = 0 - this.setData({ content: result.data[0].title}) - } - }).catch(err => { - this.data.loopRequesting = false - }) - }, - onLoop: function(){ - if(!this.data.noticeList.length){ - this.data.loopIndex++ - if(this.data.loopIndex >= 600){ - this.fetchNoticeList() - } - return - } - this.data.noticeIndex++ - if(this.data.noticeIndex >= this.data.noticeList.length){ - this.data.loopIndex++ - this.data.noticeIndex = 0 - } - if(this.data.loopIndex >= 60){ - this.fetchNoticeList() - } - this.setData({ content: this.data.noticeList[this.data.noticeIndex].title }) - }, - onClick: function(){ - wx.navigateTo({ url: '/pages/html/notice/index?id=' + this.data.noticeList[this.data.noticeIndex].id }) - } - } -}) \ No newline at end of file diff --git a/pages/article/hot-index/index.json b/pages/article/hot-index/index.json deleted file mode 100644 index 4fb567e..0000000 --- a/pages/article/hot-index/index.json +++ /dev/null @@ -1,18 +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-row": "/components/row/index", - "wux-col": "/components/col/index", - "wux-grids": "/components/grids/index", - "wux-grid": "/components/grid/index", - "wux-divider": "/components/divider/index", - "wux-image": "/components/image/index", - "refresh-view": "/components/refresher/index", - "wux-button": "/components/button/index", - "wux-tag": "/components/tag/index", - "article-item": "/pages/article/article-item/index" - } -} \ No newline at end of file diff --git a/pages/article/hot-index/index.wxml b/pages/article/hot-index/index.wxml deleted file mode 100644 index 42450a7..0000000 --- a/pages/article/hot-index/index.wxml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - - \ No newline at end of file diff --git a/pages/article/hot-index/index.wxss b/pages/article/hot-index/index.wxss deleted file mode 100644 index 996380e..0000000 --- a/pages/article/hot-index/index.wxss +++ /dev/null @@ -1,98 +0,0 @@ -/* pages/main/index.wxss */ -.container { - display: flex; - flex-direction: column; - box-sizing: border-box; - -webkit-text-size-adjust: none; - -webkit-user-select: none; - font-size: 35rpx; - color: #333; - background-color: white; - font-family: Helvetica, Arial, "Helvetica Neue", "Droid Sans", "Microsoft YaHei", sans-serif; -} - -.canvas { - width: 100%; - height: 200px; -} - -.swiper-image { - height: 150px; - border-radius: 6px; - width: 100%; -} - -.item-host { - width: 200rpx; - padding-right: 20rpx -} - -.case-class { - width: 320rpx; -} - -.case2-class { - width: 160rpx; -} - -.case3-class { - width: 600rpx; -} - -.host-class { - width: 120rpx; - margin-top: 4rpx; -} - -.image-load { - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 50rpx; -} - - -.booking-tool { - width: calc(100% - 20px); - background-color: #008AFF; - position: fixed; - left: 255rpx; - z-index: 39; -} - -.roder-add { - display: flex; - justify-content: center; - align-items: center; - width: 240rpx; - height: 80rpx; - background-color: #008AFF; - border-radius: 50rpx; - position: absolute; - box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); -} - -.cu-tags { - border-radius: 24rpx; - /* border-bottom-right-radius: 24rpx; */ - background-color: #dd514c; - position: absolute; - top: -20rpx; - left: 180rpx; - font-size: 20rpx; - padding: 10rpx 16rpx; - color: var(--white); -} - -.f-tag { - justify-content: center; - padding: 0rpx; - width: 150rpx; -} - -.transform { - transform-origin: 50% 50%; - transform: rotate(180deg); -} \ No newline at end of file diff --git a/pages/article/index/index.js b/pages/article/index/index.js deleted file mode 100644 index 005d535..0000000 --- a/pages/article/index/index.js +++ /dev/null @@ -1,42 +0,0 @@ -// pages/stock/index.js -const util = require('../../../utils/util') -const app = getApp() - -Page({ - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.safeFragmentHeight - 90, - safeBottom: app.globalData.safeBottom, - firstShow: false, - tabList: [ '热门', '纸品价格', '车辆排队', '纸厂扣点' ], - tabIndex: 0 - }, - onLoad:function(){ - this.onRestart() - }, - onRestart: function () { - var fragment = this.selectComponent('#fragment' + this.data.tabIndex) - if (fragment) { - fragment.onRestart() - } - if (!this.data.firstShow) { - this.setData({ height: app.globalData.safeFragmentHeight - 90, tabList: this.data.tabList, safeBottom: app.globalData.safeBottom}) - } - this.data.firstShow = true - }, - onTabChange: function({detail}){ - if(this.data.tabIndex == Number(detail.index)){ - return - } - this.setData({ tabIndex: Number(detail.index) }) - this.onRestart() - }, - stopTouchMove: function(e){ - return false - }, - postMoment: function(){ - util.navigateTo('/pages/article/publish/index') - } -}) \ No newline at end of file diff --git a/pages/article/index/index.json b/pages/article/index/index.json deleted file mode 100644 index f632ea2..0000000 --- a/pages/article/index/index.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "usingComponents": { - "wux-tabi": "/components/tabi/index", - "hot": "/pages/article/hot-index/index", - "price": "/pages/article/price-index/index", - "queue": "/pages/article/queue-index/index", - "point": "/pages/article/point-index/index" - } -} \ No newline at end of file diff --git a/pages/article/index/index.wxml b/pages/article/index/index.wxml deleted file mode 100644 index 65e3279..0000000 --- a/pages/article/index/index.wxml +++ /dev/null @@ -1,21 +0,0 @@ - - - 全部资讯 - - - - - - - - - - - - - - - - - - diff --git a/pages/article/index/index.wxss b/pages/article/index/index.wxss deleted file mode 100644 index 8fac637..0000000 --- a/pages/article/index/index.wxss +++ /dev/null @@ -1,22 +0,0 @@ -/* pages/main/index.wxss */ -.booking-tool { - width: calc(100% - 20px); - background-color: #008AFF; - position: fixed; - left: 25px; -} - -.roder-add { - display: flex; - justify-content: center; - align-items: center; - width: 100rpx; - height: 100rpx; - background-color: #008AFF; - border-radius: 50rpx; - position: absolute; - top: 24px; - right: 24px; - box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); -} - \ No newline at end of file diff --git a/pages/article/point-index/index.js b/pages/article/point-index/index.js deleted file mode 100644 index 9ee13fd..0000000 --- a/pages/article/point-index/index.js +++ /dev/null @@ -1,99 +0,0 @@ -// pages/stock/index.js -import { getPreferList } from "../../../api/moment" -const event = require('../../../utils/event.js') -const app = getApp() - -Component({ - options: { - addGlobalClass: true, - multipleSlots: true - }, - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.safeFragmentHeight - 90, - userInfo: null, - momentList: [], - requesting: false, - finished: false, - form: { - categoryId: 3, - pageNum: 1, - pageSize:15 - } - }, - lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 - attached: function () { - event.on('EventMessage', this, this.onEvent) - }, - detached: function () { - event.remove('EventMessage', this) - } - }, - methods: { - onRestart: function () { - if (!this.data.firstShow) { - this.setData({ height: app.globalData.safeFragmentHeight - 90, userInfo: app.globalData.userInfo }) - } - if (this.data.momentList.length <= 0) { - this.onRefreshList() - } - this.data.firstShow = true - }, - onEvent: function (message) { - if (message.what == 573) { - // 帖子发布刷新 - this.onRefreshList() - } else if(message.what == 200 || message.what == 888){ - // Vip的变化 - this.setData({ userInfo: app.globalData.userInfo }) - this.onRefreshList() - } - }, - //*************************************************momentList************************************************// - onRefreshList: function () { - if(!app.globalData.userInfo || !app.globalData.userInfo.isVIP){ - this.setData({ requesting: false }) - return - } - if (this.data.requesting) { - return - } - this.setData({ momentList: [], ['form.pageNum']: 1, finished: false }) - this.fetchMomentList() - }, - fetchMomentList: function(){ - if (this.data.requesting || this.data.finished) { - return - } - this.data.requesting = true - getPreferList(this.data.form).then(result => { - if (result.data.records.length) { - var respList = result.data.records - let nowList = `momentList[${this.data.momentList.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({ requesting: false }) - } - }).catch(err => { - this.setData({ requesting: false }) - }) - }, - toVip: function(){ - if(!app.globalData.userInfo){ - wx.navigateTo({ url: '/pages/login/index' }) - return - } - wx.navigateTo({ url: '/pages/ztbvip/index' }) - } - } -}) \ No newline at end of file diff --git a/pages/article/point-index/index.json b/pages/article/point-index/index.json deleted file mode 100644 index 3e32d9d..0000000 --- a/pages/article/point-index/index.json +++ /dev/null @@ -1,16 +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-row": "/components/row/index", - "wux-col": "/components/col/index", - "wux-divider": "/components/divider/index", - "wux-image": "/components/image/index", - "refresh-view": "/components/refresher/index", - "wux-button": "/components/button/index", - "wux-tag": "/components/tag/index", - "article-item": "/pages/article/article-item/index" - } -} \ No newline at end of file diff --git a/pages/article/point-index/index.wxml b/pages/article/point-index/index.wxml deleted file mode 100644 index 25717c0..0000000 --- a/pages/article/point-index/index.wxml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - - - - - - 需要开通会员才能查看纸厂扣点信息 - 限时优惠开通会员，获取更多货源、尊享会员权益，买卖更赚钱 - - - 立即开通 - - \ No newline at end of file diff --git a/pages/article/point-index/index.wxss b/pages/article/point-index/index.wxss deleted file mode 100644 index 996380e..0000000 --- a/pages/article/point-index/index.wxss +++ /dev/null @@ -1,98 +0,0 @@ -/* pages/main/index.wxss */ -.container { - display: flex; - flex-direction: column; - box-sizing: border-box; - -webkit-text-size-adjust: none; - -webkit-user-select: none; - font-size: 35rpx; - color: #333; - background-color: white; - font-family: Helvetica, Arial, "Helvetica Neue", "Droid Sans", "Microsoft YaHei", sans-serif; -} - -.canvas { - width: 100%; - height: 200px; -} - -.swiper-image { - height: 150px; - border-radius: 6px; - width: 100%; -} - -.item-host { - width: 200rpx; - padding-right: 20rpx -} - -.case-class { - width: 320rpx; -} - -.case2-class { - width: 160rpx; -} - -.case3-class { - width: 600rpx; -} - -.host-class { - width: 120rpx; - margin-top: 4rpx; -} - -.image-load { - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 50rpx; -} - - -.booking-tool { - width: calc(100% - 20px); - background-color: #008AFF; - position: fixed; - left: 255rpx; - z-index: 39; -} - -.roder-add { - display: flex; - justify-content: center; - align-items: center; - width: 240rpx; - height: 80rpx; - background-color: #008AFF; - border-radius: 50rpx; - position: absolute; - box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); -} - -.cu-tags { - border-radius: 24rpx; - /* border-bottom-right-radius: 24rpx; */ - background-color: #dd514c; - position: absolute; - top: -20rpx; - left: 180rpx; - font-size: 20rpx; - padding: 10rpx 16rpx; - color: var(--white); -} - -.f-tag { - justify-content: center; - padding: 0rpx; - width: 150rpx; -} - -.transform { - transform-origin: 50% 50%; - transform: rotate(180deg); -} \ No newline at end of file diff --git a/pages/article/price-detail/index.js b/pages/article/price-detail/index.js index 5158bf6..a3e29ec 100644 --- a/pages/article/price-detail/index.js +++ b/pages/article/price-detail/index.js @@ -1,113 +1,66 @@ -// pages/moment/price/index.js -import { getFactoryPrice } from "../../../api/ztb" -const event = require('../../../utils/event') -const storage = require('../../../utils/storage') -const app = getApp() - +// pages/article/price-detail/index.js Page({ - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight, - kg: app.globalData.kg, - loading: false, - requesting: false, - finished: false, - top: 0, - orderList: [], - form: { pageNum: 1, - pageSize:15 } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - var ids = storage.get('ztb-paper-price') - if(ids){ - this.data.form.paperMillIdList = ids - this.onRefreshList() - } - event.on('EventMessage', this, this.onEvent) - }, - onEvent: function (message) { - if(message.what == 508){ - this.data.form.paperMillIdList = message.obj - storage.put('ztb-paper-price', message.obj) - this.onRefreshList() - } - }, - // 下拉刷新... - onRefreshList: function () { - if (this.data.requesting) { - return - } - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - kg: app.globalData.kg, - height: app.globalData.fragmentHeight, - 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({ - finished: true, - requesting: false, - loading: false - }) - } - }).catch(err => { - this.setData({ - requesting: false, - finished: true, - loading: false - }) - }) - }, - selectMill: function(){ - wx.navigateTo({ url: '/pages/article/factory/index?type=4&ids=' + this.data.form.paperMillIdList}) - }, - onUnload: function(){ - event.remove('EventMessage', this) - } + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } }) \ No newline at end of file diff --git a/pages/article/price-detail/index.json b/pages/article/price-detail/index.json deleted file mode 100644 index 53ec20d..0000000 --- a/pages/article/price-detail/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "usingComponents": { - "refresh-view": "/components/refresher/index", - "wux-divider": "/components/divider/index", - "wux-button": "/components/button/index" - } -} \ No newline at end of file diff --git a/pages/article/price-detail/index.wxml b/pages/article/price-detail/index.wxml index 0289b3f..c3786c6 100644 --- a/pages/article/price-detail/index.wxml +++ b/pages/article/price-detail/index.wxml @@ -1,58 +1,2 @@ - - - - 纸厂价格 - - - - - - - - - 添加纸厂 - - - - - - - - {{item.name}} - (单位：{{kg? '元/KG' : '元/吨'}}) - - - - 品类信息 - 昨日价格 - 今日价格 - 涨跌 - - - {{cateItem.categoryName}} - {{formate.formatePrice(cateItem.yesterdayUnitPrice, kg)}} - {{formate.formatePrice(cateItem.unitPrice, kg)}} - - - {{formate.formatePrice(cateItem.floatingPrice, kg)}} - - - - {{formate.formatePrice(-cateItem.floatingPrice, kg)}} - - - - - - - - - - - - - - 添加纸厂 - - - \ No newline at end of file + +pages/article/price-detail/index.wxml diff --git a/pages/article/price-detail/index.wxss b/pages/article/price-detail/index.wxss deleted file mode 100644 index ee1665b..0000000 --- a/pages/article/price-detail/index.wxss +++ /dev/null @@ -1,16 +0,0 @@ -/* pages/moment/price/index.wxss */ -.item-content { - background: rgba(255, 255, 255, 1); - padding: 30rpx; -} - -.cateItem{ - border-top: 2rpx solid #f3f3f3; - padding-top: 8rpx; - padding-bottom: 8rpx; -} - -.transform { - transform-origin: 50% 50%; - transform: rotate(180deg); -} diff --git a/pages/article/price-index/index.js b/pages/article/price-index/index.js deleted file mode 100644 index a80475f..0000000 --- a/pages/article/price-index/index.js +++ /dev/null @@ -1,86 +0,0 @@ -// pages/stock/index.js -import { getPreferList } from "../../../api/moment" -const event = require('../../../utils/event.js') -const app = getApp() - -Component({ - options: { - addGlobalClass: true, - multipleSlots: true - }, - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.safeFragmentHeight - 90, - firstShow: false, - momentList: [], - requesting: false, - finished: false, - form: { - categoryId: 1, - pageNum: 1, - pageSize:15 - } - }, - lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 - attached: function () { - event.on('EventMessage', this, this.onEvent) - }, - detached: function () { - event.remove('EventMessage', this) - } - }, - methods: { - onRestart: function () { - if (!this.data.firstShow) { - this.setData({ height: app.globalData.safeFragmentHeight - 90, kg: app.globalData.kg }) - this.onRefreshList() - } - this.data.firstShow = true - }, - onEvent: function (message) { - if (message.what == 571) { - // 帖子发布刷新 - this.onRefreshList() - } - }, - //*************************************************momentList************************************************// - onRefreshList: function () { - if (this.data.requesting) { - return - } - this.setData({ - momentList: [], - ['form.pageNum']: 1, - finished: false - }) - this.fetchMomentList() - }, - fetchMomentList: function(){ - if (this.data.requesting || this.data.finished) { - return - } - this.data.requesting = true - getPreferList(this.data.form).then(result => { - if (result.data.records.length) { - var respList = result.data.records - let nowList = `momentList[${this.data.momentList.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 }) - }) - } - } -}) \ No newline at end of file diff --git a/pages/article/price-index/index.json b/pages/article/price-index/index.json deleted file mode 100644 index 4fb567e..0000000 --- a/pages/article/price-index/index.json +++ /dev/null @@ -1,18 +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-row": "/components/row/index", - "wux-col": "/components/col/index", - "wux-grids": "/components/grids/index", - "wux-grid": "/components/grid/index", - "wux-divider": "/components/divider/index", - "wux-image": "/components/image/index", - "refresh-view": "/components/refresher/index", - "wux-button": "/components/button/index", - "wux-tag": "/components/tag/index", - "article-item": "/pages/article/article-item/index" - } -} \ No newline at end of file diff --git a/pages/article/price-index/index.wxml b/pages/article/price-index/index.wxml deleted file mode 100644 index 9690725..0000000 --- a/pages/article/price-index/index.wxml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - - \ No newline at end of file diff --git a/pages/article/price-index/index.wxss b/pages/article/price-index/index.wxss deleted file mode 100644 index 3c228ca..0000000 --- a/pages/article/price-index/index.wxss +++ /dev/null @@ -1,82 +0,0 @@ -/* pages/main/index.wxss */ -.item-cate { - flex: 5; - padding: 10rpx 30rpx; - border-radius: 10rpx; - border: 2rpx solid #d9d9d9 -} - -.item-host { - width: 200rpx; - padding-right: 20rpx -} - -.case-class { - width: 320rpx; -} - -.case2-class { - width: 160rpx; -} - -.case3-class { - width: 600rpx; -} - -.host-class { - width: 120rpx; - margin-top: 4rpx; -} - -.image-load { - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 50rpx; -} - - -.booking-tool { - width: calc(100% - 20px); - background-color: #008AFF; - position: fixed; - left: 255rpx; - z-index: 39; -} - -.roder-add { - display: flex; - justify-content: center; - align-items: center; - width: 240rpx; - height: 80rpx; - background-color: #008AFF; - border-radius: 50rpx; - position: absolute; - box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); -} - -.cu-tags { - border-radius: 24rpx; - /* border-bottom-right-radius: 24rpx; */ - background-color: #dd514c; - position: absolute; - top: -20rpx; - left: 180rpx; - font-size: 20rpx; - padding: 10rpx 16rpx; - color: var(--white); -} - -.f-tag { - justify-content: center; - padding: 0rpx; - width: 150rpx; -} - -.transform { - transform-origin: 50% 50%; - transform: rotate(180deg); -} \ No newline at end of file diff --git a/pages/article/queue-detail/index.js b/pages/article/queue-detail/index.js deleted file mode 100644 index f459770..0000000 --- a/pages/article/queue-detail/index.js +++ /dev/null @@ -1,82 +0,0 @@ -// pages/moment/price/index.js -import { getFactoryTodayList } from "../../../api/ztb" -const app = getApp() - -Page({ - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight, - loading: true, - requesting: false, - finished: false, - orderList: [], - form: { pageNum: 1, - pageSize:30 } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.onRefreshList() - }, - // 下拉刷新... - onRefreshList: function () { - if (this.data.requesting) { - return - } - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - height: app.globalData.fragmentHeight, - 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 }) - } - getFactoryTodayList(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({ finished: true, requesting: false, loading: false }) - } - }).catch(err => { - this.setData({ requesting: false, finished: true, loading: false }) - }) - } - -}) \ No newline at end of file diff --git a/pages/article/queue-detail/index.json b/pages/article/queue-detail/index.json deleted file mode 100644 index 0832291..0000000 --- a/pages/article/queue-detail/index.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "usingComponents": { - "refresh-view": "/components/refresher/index", - "wux-divider": "/components/divider/index" - } -} \ No newline at end of file diff --git a/pages/article/queue-detail/index.wxml b/pages/article/queue-detail/index.wxml deleted file mode 100644 index f6a76b0..0000000 --- a/pages/article/queue-detail/index.wxml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 车辆排队情况 - - - - - - - - 纸厂名称 - 昨日车辆 - 今日车辆 - - - - {{item.paperMillName}} - {{item.yesterdayTotalQuantity || 0}}辆{{retainedString(item.yesterdayRetainedQuantity)}} - {{item.totalQuantity || 0}}辆{{retainedString(item.retainedQuantity)}} - - - - - - - // 状态。0：生产中，1：已发货，2：已完成 - function retainedString(quatity) { - if(quatity > 0){ - return '压' + quatity + '辆' - } - return '' - } - module.exports = retainedString - \ No newline at end of file diff --git a/pages/article/queue-detail/index.wxss b/pages/article/queue-detail/index.wxss deleted file mode 100644 index 924fc44..0000000 --- a/pages/article/queue-detail/index.wxss +++ /dev/null @@ -1,11 +0,0 @@ -/* pages/moment/price/index.wxss */ -.item-content { - background: rgba(255, 255, 255, 1); - padding: 30rpx; -} - -.cateItem{ - border-top: 2rpx solid #f3f3f3; - padding-top: 8rpx; - padding-bottom: 8rpx; -} diff --git a/pages/article/queue-index/index.js b/pages/article/queue-index/index.js deleted file mode 100644 index 54a0e8a..0000000 --- a/pages/article/queue-index/index.js +++ /dev/null @@ -1,80 +0,0 @@ -// pages/stock/index.js -import { getPreferList } from "../../../api/moment" -const event = require('../../../utils/event') -const app = getApp() - -Component({ - options: { - addGlobalClass: true, - multipleSlots: true - }, - /** - * 页面的初始数据 - */ - data: { - dev: app.globalData.dev, - firstShow: false, - height: app.globalData.safeFragmentHeight - 90, - momentList: [], - requesting: false, - finished: false, - form: { categoryId: 2, pageNum: 1, - pageSize:15 } - }, - lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 - attached: function () { - event.on('EventMessage', this, this.onEvent) - }, - detached: function () { - event.remove('EventMessage', this) - } - }, - methods: { - onRestart: function () { - if (!this.data.firstShow) { - this.setData({ dev: app.globalData.dev, height: app.globalData.safeFragmentHeight - 90 }) - this.onRefreshList() - } - this.data.firstShow = true - }, - onEvent: function (message) { - if (message.what == 572) { - // 帖子发布刷新 - this.onRefreshList() - } - }, - //*************************************************momentList************************************************// - onRefreshList: function () { - if (this.data.requesting) { - return - } - this.setData({ momentList: [], ['form.pageNum']: 1, finished: false }) - this.fetchMomentList() - }, - fetchMomentList: function(){ - if (this.data.requesting || this.data.finished) { - return - } - this.data.requesting = true - getPreferList(this.data.form).then(result => { - if (result.data.records.length) { - var respList = result.data.records - let nowList = `momentList[${this.data.momentList.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 }) - }) - } - } -}) \ No newline at end of file diff --git a/pages/article/queue-index/index.json b/pages/article/queue-index/index.json deleted file mode 100644 index 3e32d9d..0000000 --- a/pages/article/queue-index/index.json +++ /dev/null @@ -1,16 +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-row": "/components/row/index", - "wux-col": "/components/col/index", - "wux-divider": "/components/divider/index", - "wux-image": "/components/image/index", - "refresh-view": "/components/refresher/index", - "wux-button": "/components/button/index", - "wux-tag": "/components/tag/index", - "article-item": "/pages/article/article-item/index" - } -} \ No newline at end of file diff --git a/pages/article/queue-index/index.wxml b/pages/article/queue-index/index.wxml deleted file mode 100644 index 2615c8c..0000000 --- a/pages/article/queue-index/index.wxml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - - \ No newline at end of file diff --git a/pages/article/queue-index/index.wxss b/pages/article/queue-index/index.wxss deleted file mode 100644 index f11ce90..0000000 --- a/pages/article/queue-index/index.wxss +++ /dev/null @@ -1,45 +0,0 @@ -/* pages/main/index.wxss */ - -.canvas { - width: 100%; - height: 200px; -} - -.item-host { - width: 200rpx; - padding-right: 20rpx -} - -.case-class { - width: 320rpx; -} - -.case2-class { - width: 160rpx; -} - -.case3-class { - width: 600rpx; -} - -.host-class { - width: 120rpx; - margin-top: 4rpx; -} - -.image-load { - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 50rpx; -} - -.queue{ - text-align: center; - width:160px; - border:2rpx solid #CCCCCC; - padding:10rpx 0rpx; - border-radius:36px -} \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index de41170..b525f4a 100644 --- a/utils/util.js +++ b/utils/util.js @@ -167,7 +167,6 @@ function checkId(id) { const tokenList = [ 'pages/mall/price-index/index', '/pages/article/price-detail/index', - '/pages/article/queue-detail/index', '/pages/shop/index/index', '/pages/bidding/index/index', '/pages/morder/index/index', @@ -218,8 +217,6 @@ function navigateTarget(redirectInfo){ navigateTo('/pages/mall/price-index/index') } else if(redirectInfo.targetView == 'showFactoryPrice'){ navigateTo('/pages/article/price-detail/index') - } else if(redirectInfo.targetView == 'showFactoryQueue'){ - navigateTo('/pages/article/queue-detail/index') } else if(redirectInfo.targetView == 'showArticleHome'){ event.emit('EventMessage', { what: 250, desc: 'page-article', index: 0 }) } else if(redirectInfo.targetView == 'myArticle'){