diff --git a/pages/agent/fragment/index.js b/pages/agent/fragment/index.js
index 3fba2f4..945792c 100644
--- a/pages/agent/fragment/index.js
+++ b/pages/agent/fragment/index.js
@@ -76,6 +76,13 @@ Component({
} else if(message.what == 888){
this.setData({ orderList: [], tabIndex: this.data.tabIndex, ['form.pageNum']: 1, loading: true, finished: false })
this.fetchPapersList()
+ if(app.globalData.userInfo){
+ hasActivity().then(result => {
+ this.setData({ hasActivity: result.data })
+ })
+ } else {
+ this.setData({ hasActivity: false })
+ }
}
},
searchList: function(){
@@ -127,7 +134,7 @@ Component({
if (this.data.requesting || this.data.finished) {
return
}
- this.setData({ requesting: true })
+ this.data.requesting = true
getFactoryPrice(this.data.form).then(result => {
if (result.data.records.length) {
var respList = result.data.records
@@ -135,30 +142,14 @@ Component({
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
- })
+ 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
- })
+ 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, })
})
}
diff --git a/pages/agent/fragment/index.json b/pages/agent/fragment/index.json
index 5130038..ab40c90 100644
--- a/pages/agent/fragment/index.json
+++ b/pages/agent/fragment/index.json
@@ -2,7 +2,6 @@
"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",
diff --git a/pages/agent/fragment/index.wxml b/pages/agent/fragment/index.wxml
index 5127831..7360ac0 100644
--- a/pages/agent/fragment/index.wxml
+++ b/pages/agent/fragment/index.wxml
@@ -17,13 +17,21 @@
-
+
+
+
+
+
-
-
-
- {{loading? '正在加载' : '暂无数据'}}
+
+
+
+
+
+
+
+ 暂无数据，点击重新加载
diff --git a/pages/agent/fragment/index.wxss b/pages/agent/fragment/index.wxss
index 1680014..fa7d54f 100644
--- a/pages/agent/fragment/index.wxss
+++ b/pages/agent/fragment/index.wxss
@@ -1,4 +1,8 @@
/* pages/agent/index/index.wxss */
.top-bg{
background-image: linear-gradient(127deg, rgba(0,122,255,0.67) 0%, rgba(13,100,227,0.95) 100%);
+}
+
+.case3-class {
+ width: 680rpx;
}
\ No newline at end of file
diff --git a/pages/moment/moment-item/index.js b/pages/moment/moment-item/index.js
index b49334a..68947d6 100644
--- a/pages/moment/moment-item/index.js
+++ b/pages/moment/moment-item/index.js
@@ -35,8 +35,8 @@ Component({
return
}
this.setData({ loading: true })
- userPushFollowMill({ paperMillId: 1, follow: true }).then(result => {
- this.setData({ loading: false })
+ userPushFollowMill({ paperMillId: this.data.item.paperMillId, follow: !this.data.item.hasFollowed }).then(result => {
+ this.setData({ loading: false, ['item.hasFollowed']: !this.data.item.hasFollowed })
}).catch(err => {
this.setData({ loading: false })
})
diff --git a/pages/moment/moment-item/index.wxml b/pages/moment/moment-item/index.wxml
index 133db66..2b6eedc 100644
--- a/pages/moment/moment-item/index.wxml
+++ b/pages/moment/moment-item/index.wxml
@@ -1,8 +1,8 @@
-明天(2021-09-15)
+{{item.tipsTime}}
- 东莞金洲
+ {{item.shortName}}
@@ -10,13 +10,13 @@
- 2560
+ {{item.typicalFloatingQuotedPrice}}
更新时间09-09
- +20
- +20
+ {{item.retainedReceivedQuantity || '- -'}}
+ {{item.startDeductionPoints}}
diff --git a/pages/moment/recommend/index.js b/pages/moment/recommend/index.js
index 3052a8f..0d57e83 100644
--- a/pages/moment/recommend/index.js
+++ b/pages/moment/recommend/index.js
@@ -71,12 +71,31 @@ Component({
getInformationList(this.data.form).then(result => {
if (result.data && result.data.records.length) {
var respList = result.data.records
+ var lastTime = null
+ // 对返回的消息列表进行处理，将同一天的消息显示在一起
+ for (let i = 0; i < respList.length; i++) {
+ if (util.isEmpty(lastTime)) {
+ lastTime = respList[i].latestQuoteTime
+ if (lastTime.length > 10) {
+ lastTime = lastTime.substring(0, 10)
+ }
+ respList[i].tipsTime = lastTime
+ } else {
+ var itemTime = respList[i].latestQuoteTime
+ if (itemTime.length > 10) {
+ itemTime = itemTime.substring(0, 10)
+ }
+ if (lastTime !== itemTime) {
+ respList[i].tipsTime = itemTime
+ }
+ lastTime = itemTime
+ }
+ }
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, loading: false, token: this.data.token })
} else {
-
this.setData({ finished: true, requesting: false, loading: false, token: this.data.token })
}
}).catch(err => {