diff --git a/assets/image/message_black.png b/assets/image/message_black.png
deleted file mode 100644
index 8ea351b..0000000
Binary files a/assets/image/message_black.png and /dev/null differ
diff --git a/assets/image/message_blue.png b/assets/image/message_blue.png
deleted file mode 100644
index 60a34e9..0000000
Binary files a/assets/image/message_blue.png and /dev/null differ
diff --git a/assets/image/prase_black.png b/assets/image/prase_black.png
deleted file mode 100644
index 7effcf7..0000000
Binary files a/assets/image/prase_black.png and /dev/null differ
diff --git a/assets/image/prase_blue.png b/assets/image/prase_blue.png
deleted file mode 100644
index be61430..0000000
Binary files a/assets/image/prase_blue.png and /dev/null differ
diff --git a/assets/info/feedback-white.png b/assets/info/feedback-white.png
deleted file mode 100644
index 4aa3603..0000000
Binary files a/assets/info/feedback-white.png and /dev/null differ
diff --git a/assets/info/feedback.png b/assets/info/feedback.png
deleted file mode 100644
index 967f1a1..0000000
Binary files a/assets/info/feedback.png and /dev/null differ
diff --git a/assets/tabbar/message-blue.png b/assets/tabbar/message-blue.png
deleted file mode 100644
index 357f413..0000000
Binary files a/assets/tabbar/message-blue.png and /dev/null differ
diff --git a/assets/tabbar/message-gray.png b/assets/tabbar/message-gray.png
deleted file mode 100644
index c33a540..0000000
Binary files a/assets/tabbar/message-gray.png and /dev/null differ
diff --git a/pages/agent/factory-detail/index.js b/pages/agent/factory-detail/index.js
index c56d135..d09d2a5 100644
--- a/pages/agent/factory-detail/index.js
+++ b/pages/agent/factory-detail/index.js
@@ -1,7 +1,6 @@
// pages/message/detail/index.js
import Scene from '../../index/scene'
import { getFactoryPriceDetail, userPushFollowMill } from "../../../api/ztb"
-import { getPreferList} from "../../../api/moment"
const event = require('../../../utils/event')
const util = require('../../../utils/util')
const app = getApp()
@@ -108,26 +107,6 @@ Scene({
}
wx.navigateTo({url: `/pages/agent/appointment/index?id=${this.data.factoryDetail.paperMillId}&categoryId=${item.categoryId}`})
},
- //*************************************************momentList************************************************//
- fetchMomentList: function () {
- if (this.data.requesting || this.data.finished) {
- return
- }
- this.setData({ 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), requesting: false, finished })
- } else {
- this.setData({ finished: true, requesting: false })
- }
- }).catch(err => {
- this.setData({ requesting: false })
- })
- },
onAttentionChange: function (e) {
var model = { follow: !this.data.hasFollowed, paperMillId: this.data.id }
wx.showLoading({ title: '处理中', mask: true })
diff --git a/pages/agent/factory-detail/index.json b/pages/agent/factory-detail/index.json
index fc07ba2..97a5b1a 100644
--- a/pages/agent/factory-detail/index.json
+++ b/pages/agent/factory-detail/index.json
@@ -7,7 +7,6 @@
"van-image": "/components/image/index",
"van-button": "/components/button/index",
"submit-layout": "/components/submit-layout/index",
- "article-item": "/pages/moment/article-item/index",
"notification": "/pages/message/notification/index"
}
}
\ No newline at end of file
diff --git a/pages/agent/factory-detail/index.wxml b/pages/agent/factory-detail/index.wxml
index 378be3b..dab213c 100644
--- a/pages/agent/factory-detail/index.wxml
+++ b/pages/agent/factory-detail/index.wxml
@@ -4,7 +4,7 @@
纸厂详情
-
+
@@ -82,25 +82,6 @@
-
diff --git a/pages/moment/article-item/index.js b/pages/moment/article-item/index.js
deleted file mode 100644
index 230ca6c..0000000
--- a/pages/moment/article-item/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// pages/stock/index.js
-import { likeMoment } from "../../../api/moment"
-const util = require('../../../utils/util')
-const app = getApp()
-
-Component({
- options: {
- addGlobalClass: true,
- multipleSlots: true
- },
- properties: {
- item: { type: Object, value: null },
- mclick: { type: Boolean, value: true }
- },
- methods: {
- toMill: function(){
- if(!this.data.mclick){
- return
- }
- util.navigateTo('/pages/agent/factory/index?tabIndex=1&id=' + this.data.item.millPaperId)
- },
- lookItem: function(e){
- util.navigateTo('/pages/article/detail/index?id=' + this.data.item.id)
- },
- likeItem: function(e){
- if(!app.globalData.userInfo){
- wx.navigateTo({ url: '/pages/login/index' })
- return
- }
- if(this.data.item.isLiked){
- util.showToast('请勿重复点赞')
- return
- }
- // /article/like-or-cancel/article/{id}
- likeMoment({articleId: this.data.item.id}).then(result => {
- this.setData({ ['item.likeQuantity']: result.data.likeQuantity, ['item.isLiked']: 1 })
- }).catch(error => {
- util.showToast(error)
- })
- }
- }
-})
\ No newline at end of file
diff --git a/pages/moment/article-item/index.json b/pages/moment/article-item/index.json
deleted file mode 100644
index 3f69f2a..0000000
--- a/pages/moment/article-item/index.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "component": true,
- "usingComponents": {
- "van-image": "/components/image/index",
- "sudoku-image": "/components/sudoku-image/index",
- "fold-text": "/components/fold-text/index",
- "van-tag": "/components/tag/index"
- }
-}
\ No newline at end of file
diff --git a/pages/moment/article-item/index.wxml b/pages/moment/article-item/index.wxml
deleted file mode 100644
index d71a6a0..0000000
--- a/pages/moment/article-item/index.wxml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{item.creatorName || ''}}
- {{moment.formatMTime(item.createTime)}}
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
- #
- {{item.millPaperName}}
-
-
-
-
-
-
-
-
- {{item.likeQuantity}}
-
-
-
- {{item.replyQuantity}}
-
-
-
-
\ No newline at end of file
diff --git a/pages/moment/article-item/index.wxss b/pages/moment/article-item/index.wxss
deleted file mode 100644
index 5580ebb..0000000
--- a/pages/moment/article-item/index.wxss
+++ /dev/null
@@ -1,9 +0,0 @@
-/* pages/main/index.wxss */
-.image-load {
- width: 50px;
- height: 50px;
- display: flex;
- align-items: center;
- justify-content: center;
- border-radius: 50rpx;
-}
\ No newline at end of file
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index 3ff6924..f118ba4 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -44,7 +44,7 @@
- 收货管理
+ 厂内收货
查看全部订单
diff --git a/pages/process/outside-list/index.js b/pages/process/outside-list/index.js
index be664f3..70d1b00 100644
--- a/pages/process/outside-list/index.js
+++ b/pages/process/outside-list/index.js
@@ -91,7 +91,34 @@ Scene({
this.setData({ requesting: true })
}
getFactoryOrderList(this.data.form).then(result => {
- this.handResult(result)
+ if (result.data && result.data.records && result.data.records.length) {
+ var respList = result.data.records
+ // 对返回的消息列表进行处理，将同一天的消息显示在一起
+ for (let i = 0; i < respList.length; i++) {
+ if (util.isEmpty(this.data.lastTime)) {
+ this.data.lastTime = respList[i].createTime
+ if (this.data.lastTime.length > 10) {
+ this.data.lastTime = this.data.lastTime.substring(0, 10)
+ }
+ respList[i].tipsTime = this.data.lastTime
+ } else {
+ var itemTime = respList[i].createTime
+ if (itemTime.length > 10) {
+ itemTime = itemTime.substring(0, 10)
+ }
+ if (this.data.lastTime !== itemTime) {
+ respList[i].tipsTime = itemTime
+ }
+ this.data.lastTime = itemTime
+ }
+ }
+ 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
+ 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)
@@ -100,36 +127,6 @@ Scene({
this.refresh.setRefresh(false)
})
},
- handResult: function(result){
- if (result.data && result.data.records && result.data.records.length) {
- var respList = result.data.records
- // 对返回的消息列表进行处理，将同一天的消息显示在一起
- for (let i = 0; i < respList.length; i++) {
- if (util.isEmpty(this.data.lastTime)) {
- this.data.lastTime = respList[i].createTime
- if (this.data.lastTime.length > 10) {
- this.data.lastTime = this.data.lastTime.substring(0, 10)
- }
- respList[i].tipsTime = this.data.lastTime
- } else {
- var itemTime = respList[i].createTime
- if (itemTime.length > 10) {
- itemTime = itemTime.substring(0, 10)
- }
- if (this.data.lastTime !== itemTime) {
- respList[i].tipsTime = itemTime
- }
- this.data.lastTime = itemTime
- }
- }
- 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
- this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
- } else {
- this.setData({ finished: true, requesting: false, loading: false })
- }
- },
cancelOrder: function(e){
Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => {
wx.showLoading({ title: '正在获取', mask: true })