diff --git a/app.json b/app.json index d789c9c..f4bb977 100644 --- a/app.json +++ b/app.json @@ -3,6 +3,7 @@ "pages/login/index", "pages/index/index", "pages/home/mobile/index", + "pages/home/employee/index", "pages/process/order-list/index", "pages/process/order-check/index", "pages/process/order-info/index", diff --git a/pages/api/request.js b/pages/api/request.js index be3c47c..7364b7f 100644 --- a/pages/api/request.js +++ b/pages/api/request.js @@ -10,7 +10,7 @@ const app = getApp() * axios defaults 配置 */ axios.defaults = { - timeout: 60000 + timeout: 15000 } /** diff --git a/pages/enterprise/index/index.js b/pages/enterprise/index/index.js deleted file mode 100644 index b9ce91f..0000000 --- a/pages/enterprise/index/index.js +++ /dev/null @@ -1,17 +0,0 @@ -// pages/enterprise/index/index.js -const app = getApp() - -Page({ - /** - * 页面的初始数据 - */ - data: { - userInfo: null, - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.setData({ userInfo: app.accountInfo }) - } -}) \ No newline at end of file diff --git a/pages/enterprise/index/index.json b/pages/enterprise/index/index.json deleted file mode 100644 index 19fdd72..0000000 --- a/pages/enterprise/index/index.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usingComponents": { - "van-cell": "/components/cell/index" - } -} \ No newline at end of file diff --git a/pages/enterprise/index/index.wxml b/pages/enterprise/index/index.wxml deleted file mode 100644 index 6cd20ea..0000000 --- a/pages/enterprise/index/index.wxml +++ /dev/null @@ -1,16 +0,0 @@ - - - 我的企业 - - - - - {{userInfo.realName}} - 管理员 - - {{userInfo.enterpriseName}} - - - - - \ No newline at end of file diff --git a/pages/enterprise/index/index.wxss b/pages/enterprise/index/index.wxss deleted file mode 100644 index 212b56a..0000000 --- a/pages/enterprise/index/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/enterprise/index/index.wxss */ \ No newline at end of file diff --git a/pages/formate.wxs b/pages/formate.wxs index ceed13d..c3304f2 100644 --- a/pages/formate.wxs +++ b/pages/formate.wxs @@ -27,6 +27,32 @@ function formatTime(time) { } } +function formateDate(datetime) { + if (isEmpty(datetime)) { + return '' + } + var date = getDate(datetime.trim()) + var today = getDate() + var dayCode = 24 * 60 * 60 * 1000 + var week = '' + if (date.getTime() === today.getTime()) { + week = '(今天)' + } else if (date.getTime() === today.getTime() + dayCode) { + week = '(明天)' + } else if (date.getTime() === today.getTime() - dayCode) { + week = '(昨天)' + } else if (date.getTime() === today.getTime() + dayCode * 2) { + week = '(后天)' + } else { + week = ['(周日)', '(周一)', '(周二)', '(周三)', '(周四)', '(周五)', '(周六)'][date.getDay()] + } + if (isEmpty(week)) { + week = '' + } + return datetime + week +} + module.exports = { - formatTime: formatTime + formatTime: formatTime, + formateDate: formateDate } \ No newline at end of file diff --git a/pages/enterprise/employee/index.js b/pages/home/employee/index.js similarity index 100% rename from pages/enterprise/employee/index.js rename to pages/home/employee/index.js diff --git a/pages/enterprise/employee/index.json b/pages/home/employee/index.json similarity index 100% rename from pages/enterprise/employee/index.json rename to pages/home/employee/index.json diff --git a/pages/enterprise/employee/index.wxml b/pages/home/employee/index.wxml similarity index 100% rename from pages/enterprise/employee/index.wxml rename to pages/home/employee/index.wxml diff --git a/pages/enterprise/employee/index.wxss b/pages/home/employee/index.wxss similarity index 100% rename from pages/enterprise/employee/index.wxss rename to pages/home/employee/index.wxss diff --git a/pages/index/index.js b/pages/index/index.js index 985ed14..1acca33 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -9,7 +9,7 @@ Page({ safeBottom: app.globalData.safeBottom, fragment: app.globalData.safeFragmentHeight, tabList: [ - { index: 0, value: 'mall', badge: 0, name: '消息', blue: '/assets/image/tabbar/mall-blue.png', gray: '/assets/image/tabbar/mall-gray.png' }, + { index: 0, value: 'message', badge: 0, name: '消息', blue: '/assets/image/tabbar/mall-blue.png', gray: '/assets/image/tabbar/mall-gray.png' }, { index: 1, value: 'work', badge: 0, name: '工作台', blue: '/assets/image/tabbar/process-blue.png', gray: '/assets/image/tabbar/process-gray.png' }, { index: 2, value: 'home', badge: 0, name: '我的', blue: '/assets/image/tabbar/home-blue.png', gray: '/assets/image/tabbar/home-gray.png' } ], diff --git a/pages/index/index.json b/pages/index/index.json index 176b038..24945e7 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -3,7 +3,7 @@ "van-icon": "/components/icon/index", "van-tabbar": "/components/tabbar/index", "van-tabbar-item": "/components/tabbar-item/index", - "mall": "/pages/mall/index/index", + "message": "/pages/message/index/index", "workbench": "/pages/process/index/index", "home": "/pages/home/index/index", "van-dialog": "/components/dialog/index" diff --git a/pages/index/index.wxml b/pages/index/index.wxml index caadf07..14d3689 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/pages/mall/index.wxs b/pages/mall/index.wxs deleted file mode 100644 index 89eca6e..0000000 --- a/pages/mall/index.wxs +++ /dev/null @@ -1,106 +0,0 @@ -function formatePrice(price) { - return Number(price).toFixed(2) -} - -function formateNumber(price, fixed) { - if(price == null || price == undefined){ - price = 0 - } - return Number(price).toFixed(fixed) -} - -function isEmpty(val) { - return typeof val === 'undefined' || val === '' || val === null -} - -function formateDate(datetime) { - if (isEmpty(datetime)) { - return '' - } - var date = getDate(datetime.trim()) - var today = getDate() - var dayCode = 24 * 60 * 60 * 1000 - var week = '' - if (date.getTime() === today.getTime()) { - week = '(今天)' - } else if (date.getTime() === today.getTime() + dayCode) { - week = '(明天)' - } else if (date.getTime() === today.getTime() - dayCode) { - week = '(昨天)' - } else if (date.getTime() === today.getTime() + dayCode * 2) { - week = '(后天)' - } else { - week = ['(周日)', '(周一)', '(周二)', '(周三)', '(周四)', '(周五)', '(周六)'][date.getDay()] - } - if (isEmpty(week)) { - week = '' - } - return datetime + week -} - -function formateText(text, length) { - if (!text) { - return '' - } - if (text.length <= length) { - return text - } - return text.substring(0, length) + '...' -} - -function isVideoUrl(url){ - if(url && url.indexOf('.mp4') >= 0){ - return true - } - return false -} - -function minNumber(order, num){ - if(order && parseInt(order.minBuyNum) > 0){ - return Number(order.minBuyNum) - } - return num -} - -function getOrderInfo(item) { - var attributes = '' - for (var i = 0; i < item.attributesJSONArray.length; i++) { - var element = item.attributesJSONArray[i] - if(i == 0){ - attributes = element.arriName + ':' + element.arriVal - } else { - attributes += ';' + element.arriName + ':' + element.arriVal - } - } - return attributes -} - -function orderStatus(status){ - if(status == 1 || status == 2){ - return '取消订单' - } else if(status == 3){ - return '确认收货' - } - return '' -} - -function submitPrice(price){ - return Number(price) * 100 -} - -function formateAmount(amount) { - return Number(amount).toFixed(2) -} - -module.exports = { - formatePrice: formatePrice, - formateDate: formateDate, - formateText: formateText, - isVideoUrl: isVideoUrl, - minNumber: minNumber, - orderStatus: orderStatus, - getOrderInfo: getOrderInfo, - submitPrice: submitPrice, - formateAmount: formateAmount, - formateNumber: formateNumber -} \ No newline at end of file diff --git a/pages/mall/index/index.js b/pages/mall/index/index.js deleted file mode 100644 index 748045f..0000000 --- a/pages/mall/index/index.js +++ /dev/null @@ -1,126 +0,0 @@ -// pages/process/supply/index.js -// import { getCategoryList, getProductList } from "../../api/mall" -const event = require('../../../utils/event') -const util = require('../../../utils/util') -const app = getApp() - -Component({ - options: { - addGlobalClass: true, - multipleSlots: true - }, - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.safeFragmentHeight - 190, - CustomBar: app.globalData.CustomBar, - userInfo: null, - firstShow: false, - tabIndex: 0, - tabList: [], - loading: true, - requesting: false, - finished: false, - top: 0, - orderList: [], - form: { categoryId: '', pageNum: 1, pageSize: 10 } - }, - lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 - attached: function () { - event.on('EventMessage', this, this.onEvent) - }, - detached: function () { - event.remove('EventMessage', this) - } - }, - methods: { - onRestart: function () { - if (this.data.firstShow) { - return - } - this.setData({ height: app.globalData.safeFragmentHeight - 190, CustomBar: app.globalData.CustomBar, userInfo: app.accountInfo }) - this.fetchCategoryList() - this.fetchOrderList() - this.data.firstShow = true - }, - onEvent: function (message) { - if (message.what == 888) { - this.setData({ userInfo: app.accountInfo }) - } - }, - fetchCategoryList: function(){ - getCategoryList().then(result => { - this.setData({ tabList: [{id: '', name: '全部'}].concat(result.data) }) - }) - }, - onTabChange: function ({detail}) { - if (this.data.tabIndex == Number(detail.index)) { - return - } - this.setData({ tabIndex: detail.index}) - this.data.form.categoryId = this.data.tabList[this.data.tabIndex].id - this.onRefreshList() - }, - onRefreshList: function () { - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - finished: false - }) - this.fetchOrderList() - }, - fetchOrderList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) - } - getProductList(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 = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total - if(this.data.form.pageNum == 1){ - this.setData({ - [nowList]: respList, - ['form.pageNum']: (num + 1), - top: 0, - finished, - requesting: false, - loading: false - }) - } else { - this.setData({ - [nowList]: respList, - ['form.pageNum']: (num + 1), - finished, - requesting: false, - loading: false - }) - } - } else { - this.setData({ finished: true, requesting: false, loading: false }) - } - }).catch(err => { - //异常回调 - this.setData({ requesting: false, loading: false }) - util.showToast(err) - }) - }, - lookItem: function (e) { - var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] - wx.navigateTo({ url: '/pages/process/purchase-detail/index?id=' + item.id }) - }, - searchList: function(){ - wx.navigateTo({ url: '/pages/mall/search-list/index' }) - } - } -}) \ No newline at end of file diff --git a/pages/mall/index/index.json b/pages/mall/index/index.json deleted file mode 100644 index 81c56b8..0000000 --- a/pages/mall/index/index.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "component": true, - "usingComponents": { - "van-search": "/components/search/index", - "refresh-view": "/components/refresher/index", - "van-tabs": "/components/tabs/index", - "van-tab": "/components/tab/index", - "van-divider": "/components/divider/index", - "van-loading": "/components/loading/index", - "skeleton": "/components/skeleton/index", - "skeleton-avatar": "/components/skeleton-avatar/index", - "skeleton-paragraph": "/components/skeleton-paragraph/index" - } -} \ No newline at end of file diff --git a/pages/mall/index/index.wxml b/pages/mall/index/index.wxml deleted file mode 100644 index 450178f..0000000 --- a/pages/mall/index/index.wxml +++ /dev/null @@ -1,40 +0,0 @@ - - - {{userInfo.enterpriseName}} - 原纸商场 - - - - - - - - - - - - - - - - - - - - - {{loading? '正在加载' : '暂无数据'}} - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - diff --git a/pages/mall/index/index.wxss b/pages/mall/index/index.wxss deleted file mode 100644 index 13a97eb..0000000 --- a/pages/mall/index/index.wxss +++ /dev/null @@ -1,4 +0,0 @@ -/* pages/mall/index/index.wxss */ -.margin-l{ - margin-left: 32rpx; -} \ No newline at end of file diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js deleted file mode 100644 index 7f2653d..0000000 --- a/pages/mall/search-list/index.js +++ /dev/null @@ -1,136 +0,0 @@ -// pages/mall/search-list/index.js -const util = require('../../../utils/util') -const app = getApp() - -Page({ - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight - 100, - loading: false, - finished: false, - requesting: false, - top: 0, - rearchStringList: [], - taskList: [], - form: { - name: '', - pageSize: 10, - pageNum: 1 - }, - focus: true - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.setData({ height: app.globalData.fragmentHeight - 100, CustomBar: app.globalData.CustomBar }) - var that = this - wx.getStorage({ key: 'mall-search', success (res) { - that.setData({ rearchStringList: res.data.split(',') }) - } - }) - }, - onChange(e) { - this.setData({ ['form.name']: e.detail }) - }, - /** - * 生命周期函数--监听页面显示 - */ - onSearch: function (e) { - if(util.isEmpty(this.data.form.name)){ - util.showToast('请输入要搜索的关键字') - return - } - this.setData({ taskList: [], ['form.pageNum']: 1, finished: false }) - this.fetchTaskList() - }, - fetchTaskList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.form.pageNum == 1 && this.data.taskList.length == 0) { - this.setData({ loading: true }) - } - this.data.requesting = true - // /product/list产品列表 - searchProductList(this.data.form).then(result => { - //成功回调 - this.data.requesting = false - if(this.data.form.pageNum == 1){ - this.setData({ focus: false, top: 0 }) - } else { - this.setData({ focus: false }) - } - if (result.data.records.length) { - var respList = result.data.records - let nowList = `taskList[${this.data.taskList.length}]` - var num = this.data.form.pageNum - var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total - var strList = this.data.rearchStringList - if(!util.isEmpty(this.data.form.name) && strList.indexOf(this.data.form.name) < 0){ - strList.splice(0, 0, this.data.form.name) - } - this.setData({ - rearchStringList: strList, - [nowList]: respList, - ['form.pageNum']: (num + 1), - finished, - loading: false - }) - } else { - var strList = this.data.rearchStringList - if(!util.isEmpty(this.data.form.name) && strList.indexOf(this.data.form.name) < 0){ - strList.splice(0, 0, this.data.form.name) - } - this.setData({ - rearchStringList: strList, - focus: false, - finished: true, - loading: false - }) - } - // wx.hideLoading() - }).catch(err => { - //异常回调 - // wx.hideLoading() - this.setData({ loading: false }) - this.data.requesting = false - var strList = this.data.rearchStringList - if(strList.indexOf(this.data.form.name) < 0){ - strList.splice(0, 0, this.data.form.name) - } - this.setData({ - rearchStringList: strList, - focus: false - }) - util.showToast(err) - }); - }, - clearHistory: function (e) { - var that = this - wx.removeStorage({ - key: 'mall-search', - success (res) { - that.setData({ - rearchStringList: [] - }) - } - }) - }, - tagClick: function(e){ - this.setData({ ['form.name']: this.data.rearchStringList[e.currentTarget.dataset.index] }) - this.onSearch(null) - }, - onUnload() { - if(this.data.rearchStringList.length){ - try { - wx.setStorageSync('mall-search', this.data.rearchStringList.toString()) - } catch (e) { - - } - } - } - -}) \ No newline at end of file diff --git a/pages/mall/search-list/index.json b/pages/mall/search-list/index.json deleted file mode 100644 index 59bc8c4..0000000 --- a/pages/mall/search-list/index.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "usingComponents": { - "van-search": "/components/search/index", - "van-divider": "/components/divider/index", - "van-loading": "/components/loading/index" - } -} \ No newline at end of file diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml deleted file mode 100644 index 59d5fe0..0000000 --- a/pages/mall/search-list/index.wxml +++ /dev/null @@ -1,41 +0,0 @@ - - - 原纸商城 - - - - 搜索 - - - - - 搜索历史 - - - - - {{item}} - - - - - - - - 暂无数据 - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - \ No newline at end of file diff --git a/pages/mall/search-list/index.wxss b/pages/mall/search-list/index.wxss deleted file mode 100644 index 188f7a3..0000000 --- a/pages/mall/search-list/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/mall/search-list/index.wxss */ \ No newline at end of file diff --git a/pages/message/index/index.js b/pages/message/index/index.js index 71e5813..748045f 100644 --- a/pages/message/index/index.js +++ b/pages/message/index/index.js @@ -1,190 +1,126 @@ -// pages/bidding/index/index.js +// pages/process/supply/index.js +// import { getCategoryList, getProductList } from "../../api/mall" +const event = require('../../../utils/event') const util = require('../../../utils/util') -const event = require('../../../utils/event.js') const app = getApp() -const urlList = ['/message-center/message/get/message-list', '/message-center/message/get/notification-list'] -Page({ +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, /** * 页面的初始数据 */ data: { - height: app.globalData.fragmentHeight, + height: app.globalData.safeFragmentHeight - 190, + CustomBar: app.globalData.CustomBar, + userInfo: null, + firstShow: false, + tabIndex: 0, + tabList: [], loading: true, requesting: false, finished: false, - tabList: [ - {id: 0, name: '订单', badge: 12}, - {id: 1, name: '系统', badge: 0} - ], - tabIndex: 0, top: 0, - messageList: [], - form: { - pageNum: 1 - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.setData({ - height: app.globalData.fragmentHeight - 90, - CustomBar: app.globalData.CustomBar - }) - event.on('EventMessage', this, this.onEvent) - // this.fetchMessageNumber() - // this.fetchMessageList() + orderList: [], + form: { categoryId: '', pageNum: 1, pageSize: 10 } }, - onEvent: function (message) { - if (message.what == 320) { - this.onRefreshList() + lifetimes: { + // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 + attached: function () { + event.on('EventMessage', this, this.onEvent) + }, + detached: function () { + event.remove('EventMessage', this) } }, - onRefreshList: function () { - this.setData({ - messageList: [], - tabIndex: this.data.tabIndex, - ['form.pageNum']: 1, - loading: true, - finished: false - }) - this.fetchMessageNumber() - this.fetchMessageList() - }, - fetchMessageNumber: function () { - // request.get('/message-center/message/get/unread-number').then(result => { - // this.setData({ ['tabList[0].badge']: result.data.messageNumber, ['tabList[1].badge']: result.data.notificationNumber }) - // }) - }, - fetchMessageList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) - } - // /product/cheapList特价产品列表 - request.get(urlList[this.data.tabIndex], this.data.form).then(result => { - //成功回调 - if (result.data.records.length) { - var respList = result.data.records - let nowList = `messageList[${this.data.messageList.length}]` - var num = this.data.form.pageNum - var finished = this.data.form.pageNum >= 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 - }) + methods: { + onRestart: function () { + if (this.data.firstShow) { + return } - }).catch(err => { - //异常回调 + this.setData({ height: app.globalData.safeFragmentHeight - 190, CustomBar: app.globalData.CustomBar, userInfo: app.accountInfo }) + this.fetchCategoryList() + this.fetchOrderList() + this.data.firstShow = true + }, + onEvent: function (message) { + if (message.what == 888) { + this.setData({ userInfo: app.accountInfo }) + } + }, + fetchCategoryList: function(){ + getCategoryList().then(result => { + this.setData({ tabList: [{id: '', name: '全部'}].concat(result.data) }) + }) + }, + onTabChange: function ({detail}) { + if (this.data.tabIndex == Number(detail.index)) { + return + } + this.setData({ tabIndex: detail.index}) + this.data.form.categoryId = this.data.tabList[this.data.tabIndex].id + this.onRefreshList() + }, + onRefreshList: function () { this.setData({ - requesting: false, - loading: false + orderList: [], + ['form.pageNum']: 1, + loading: true, + finished: false }) - util.showToast(err) - }) - }, - lookItem: function (e) { - var item = this.data.messageList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] - if(item.status == 0){ - request.post('/message-center/message/read', { idList: [item.id] }).then(result => { + this.fetchOrderList() + }, + fetchOrderList: function () { + if (this.data.requesting || this.data.finished) { + return + } + if (this.data.loading) { + this.data.requesting = true + } else { + this.setData({ requesting: true }) + } + getProductList(this.data.form).then(result => { //成功回调 - this.setData({ - ['tabList[' + this.data.tabIndex + '].badge']: this.data.tabList[this.data.tabIndex].badge - 1, - ['messageList[' + e.currentTarget.dataset.page + '][' + e.currentTarget.dataset.index + '].status']: 1 - }) - this.redirectInfo(item.redirectInfo) - }) - } else { - this.redirectInfo(item.redirectInfo) - } - }, - redirectInfo: function(redirect){ - if(!redirect){ - return - } - if(redirect.targetView == 'biddingDetail'){ - // 买家竞价的详情页 - wx.navigateTo({ - url: '/pages/bidding/detail/index?id=' + redirect.params.id - }) - } else if(redirect.targetView == 'buyerOrderDetail'){ - // 买家订单的详情页 - wx.navigateTo({ - url: '/pages/morder/detail/index?orderId=' + redirect.params.id - }) - } else if(redirect.targetView == 'sellerOrderDetail'){ - // 卖家订单的详情页 sellerOrderDetail - wx.navigateTo({ - url: '/pages/morder/detail/index?type=1&orderId=' + redirect.params.id - }) - } else if(redirect.targetView == 'storeIndex'){ - // 店铺首页 storeIndex - wx.navigateTo({ - url: '/pages/shop/detail/index?storeId=' + redirect.params.id - }) - } else if(redirect.targetView == 'personalBillDetail'){ - // 账单详情页 personalBillDetail - wx.navigateTo({ - url: '/pages/bank/bill-detail/index?id=' + redirect.params.id - }) - } else if(redirect.targetView == 'member'){ - // 会员页 member - wx.navigateTo({ - url: '/pages/ztbvip/index' - }) - } else { - wx.navigateTo({ - url: '/pages/message/detail/index?id=' + redirect.params.id + 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 = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total + if(this.data.form.pageNum == 1){ + this.setData({ + [nowList]: respList, + ['form.pageNum']: (num + 1), + top: 0, + finished, + requesting: false, + loading: false + }) + } else { + this.setData({ + [nowList]: respList, + ['form.pageNum']: (num + 1), + finished, + requesting: false, + loading: false + }) + } + } else { + this.setData({ finished: true, requesting: false, loading: false }) + } + }).catch(err => { + //异常回调 + this.setData({ requesting: false, loading: false }) + util.showToast(err) }) + }, + lookItem: function (e) { + var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] + wx.navigateTo({ url: '/pages/process/purchase-detail/index?id=' + item.id }) + }, + searchList: function(){ + wx.navigateTo({ url: '/pages/mall/search-list/index' }) } - }, - onTabChange: function (e) { - if (this.data.tabIndex == Number(e.detail.index)) { - return - } - this.data.tabIndex = Number(e.detail.index) - this.onRefreshList() - }, - readMessage: function(){ - wx.showLoading({ title: '加载中', mask: true }) - request.post('/message-center/message/read').then(result => { - //成功回调 - this.setData({ ['tabList[0].badge']: 0, ['tabList[1].badge']: 0 }) - wx.hideLoading() - }).catch(err => { - //异常回调 - wx.hideLoading() - util.showToast(err) - }) - }, - onUnload: function(){ - event.remove('EventMessage', this) } }) \ No newline at end of file diff --git a/pages/message/index/index.json b/pages/message/index/index.json index fc99fda..81c56b8 100644 --- a/pages/message/index/index.json +++ b/pages/message/index/index.json @@ -1,12 +1,14 @@ { + "component": true, "usingComponents": { + "van-search": "/components/search/index", "refresh-view": "/components/refresher/index", "van-tabs": "/components/tabs/index", "van-tab": "/components/tab/index", - "van-button": "/components/button/index", - "van-cell": "/components/cell/index", - "van-info": "/components/info/index", "van-divider": "/components/divider/index", - "van-loading": "/components/loading/index" + "van-loading": "/components/loading/index", + "skeleton": "/components/skeleton/index", + "skeleton-avatar": "/components/skeleton-avatar/index", + "skeleton-paragraph": "/components/skeleton-paragraph/index" } } \ No newline at end of file diff --git a/pages/message/index/index.wxml b/pages/message/index/index.wxml index 70fbbb3..450178f 100644 --- a/pages/message/index/index.wxml +++ b/pages/message/index/index.wxml @@ -1,77 +1,40 @@ - - - 消息 + + + {{userInfo.enterpriseName}} + 原纸商场 - - - - - - - 全部标识已读 + + + + + + + + + - - - - - - - - - {{loading? '正在加载' : '暂无数据'}} - - - - - - - - [{{item.categoryName}}] - {{util.formateDate(item.createTime)}} - - {{item.content}} - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - + + + + + + + + {{loading? '正在加载' : '暂无数据'}} + + + + + + + + + + + + {{finished?'到底啦～':'加载中...'}} + + - - - function isEmpty(val) { - return typeof val === 'undefined' || val === '' || val === null - } - function formateDate(datetime) { - if (isEmpty(datetime)) { - return '' - } - var dayCode = 24 * 60 * 60 * 1000 - datetime = datetime.replace(getRegExp('/\s/g', 'g'), '') - var date = getDate(datetime.trim()) - var today = getDate() - var yestoday = getDate(getDate().getTime() - dayCode) - var week = '' - if (date.getFullYear() === today.getFullYear() && date.getMonth() === today.getMonth() && date.getDate() === - today.getDate()) { - week = '今天 ' + datetime.substring(10) - } else if (date.getFullYear() === yestoday.getFullYear() && date.getMonth() === yestoday.getMonth() && date.getDate() - === yestoday.getDate()) { - week = '昨天 ' + datetime.substring(10) - } - if (isEmpty(week)) { - return datetime - } - return week - } - module.exports = { - formateDate: formateDate - } - \ No newline at end of file diff --git a/pages/message/index/index.wxss b/pages/message/index/index.wxss index 867151b..13a97eb 100644 --- a/pages/message/index/index.wxss +++ b/pages/message/index/index.wxss @@ -1,8 +1,4 @@ -/* pages/message/index/index.wxss */ -.tab__badge { - width: 100rpx; - height: 80rpx; - line-height: 80rpx; - text-align: center; - font-size: 30rpx; +/* pages/mall/index/index.wxss */ +.margin-l{ + margin-left: 32rpx; } \ No newline at end of file