diff --git a/app.js b/app.js index 2e134d6..6b6810c 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ const tdsdk = require('./libs/tdweapp.js') App({ //----------------------------------------------globalData-------------------------------------- - evn: 1,//0:开发环境,1:测试环境,2:生产环境 + evn: 0,//0:开发环境,1:测试环境,2:生产环境 tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], version: 152, diff --git a/pages/agent/detail/item-money-info/money-info.wxml b/pages/agent/detail/item-money-info/money-info.wxml index 7b83a4d..ef8314d 100644 --- a/pages/agent/detail/item-money-info/money-info.wxml +++ b/pages/agent/detail/item-money-info/money-info.wxml @@ -1,5 +1,4 @@ - diff --git a/pages/agent/factory/index.js b/pages/agent/factory/index.js index 920a5a5..49f0040 100644 --- a/pages/agent/factory/index.js +++ b/pages/agent/factory/index.js @@ -130,9 +130,7 @@ Page({ util.showToast('该纸品暂无报价,无法卖货') return } - wx.navigateTo({ - url: '/pages/agent/edit/index?id=' + this.data.factoryDetail.paperMillId + '&categoryId=' + item.categoryId - }) + wx.navigateTo({ url: '/pages/agent/edit/index?id=' + this.data.factoryDetail.paperMillId + '&categoryId=' + item.categoryId }) }, postMoment: function () { util.navigateTo('/pages/article/publish/index?factoryId=' + this.data.factoryDetail.paperMillId + '&name=' + this.data.factoryDetail.name) diff --git a/pages/moment/moment-item/index.js b/pages/moment/moment-item/index.js index 158bb8a..1113b70 100644 --- a/pages/moment/moment-item/index.js +++ b/pages/moment/moment-item/index.js @@ -1,4 +1,3 @@ -// pages/stock/index.js const util = require('../../../utils/util') import { userPushFollowMill } from "../../../api/ztb" import { getMillPaperList } from "../../../api/moment" @@ -22,7 +21,7 @@ Component({ methods: { onFlodTap: function(){ this.setData({ unflod: !this.data.unflod }) - if(!this.data.itemList.length){ + if(!this.data.itemList.length && this.data.unflod){ this.fetchItemList() } }, @@ -50,8 +49,8 @@ Component({ } this.setData({ requesting: true }) getMillPaperList({ paperMillId: this.data.item.paperMillId, date: this.data.item.latestQuoteTime }).then(result => { - if (result.data.records.length) { - this.setData({ requesting: false, orderList: result.data.records }) + if (result.data.length) { + this.setData({ requesting: false, itemList: result.data }) } else { this.setData({ requesting: false }) } @@ -60,7 +59,8 @@ Component({ }) }, agentOrder: function(e){ - + var categoryId = this.data.itemList[e.currentTarget.dataset.index] + util.navigateTo(`/pages/agent/edit/index?id=${this.data.item.paperMillId}&categoryId=${categoryId}`) } } }) \ No newline at end of file diff --git a/pages/moment/moment-item/index.wxml b/pages/moment/moment-item/index.wxml index 4b37bf0..58fdefd 100644 --- a/pages/moment/moment-item/index.wxml +++ b/pages/moment/moment-item/index.wxml @@ -1,8 +1,9 @@ + {{item.tipsTime}} - + - {{item.shortName}} + {{item.shortName}} @@ -13,7 +14,7 @@ {{item.typicalFloatingQuotedPrice}} - 更新时间09-09 + {{item.retainedReceivedQuantity || '- -'}} {{item.startDeductionPoints}} @@ -41,13 +42,13 @@ - 一级纸品 + {{item.categoryName}} - 2560 + {{formate.formatePrice(item.quotedPrice, 1)}} - +20 - -- + {{item.floatingQuotedPrice}} + {{item.averageDeductionPoints || '- -'}} 代卖