diff --git a/app.js b/app.js index a4be9df..6bb01c5 100644 --- a/app.js +++ b/app.js @@ -3,7 +3,7 @@ App({ //----------------------------------------------globalData-------------------------------------- evn: 0,//0:开发环境,1:测试环境,2:生产环境 tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], - agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], + agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], version: 152, xAppId: '470236309865238528', globalData: { diff --git a/pages/agent/ability-item/index.js b/pages/agent/ability-item/index.js index 8f76e08..9a12b5c 100644 --- a/pages/agent/ability-item/index.js +++ b/pages/agent/ability-item/index.js @@ -43,7 +43,7 @@ Component({ return } if(!this.data.item.isOperations){ - util.showToast('该纸厂已暂停接单,请联系相关负责人!') + util.showToast(this.data.item.manageNotifyMessage) return } if(util.isEmpty(this.data.item.cateIndex)){ diff --git a/pages/agent/agent-item/index.js b/pages/agent/agent-item/index.js index b90cdd8..6d8387b 100644 --- a/pages/agent/agent-item/index.js +++ b/pages/agent/agent-item/index.js @@ -54,7 +54,7 @@ Component({ return } if(!this.data.item.isOperations){ - util.showToast('该纸厂已暂停接单,请联系相关负责人!') + util.showToast(this.data.item.manageNotifyMessage) return } if(util.isEmpty(this.data.cateIndex)){ diff --git a/pages/agent/factory/index.js b/pages/agent/factory/index.js index cd78aa3..ef14cc4 100644 --- a/pages/agent/factory/index.js +++ b/pages/agent/factory/index.js @@ -136,7 +136,7 @@ Page({ return } if(!this.data.factoryDetail.isOperations){ - util.showToast('该纸厂已暂停接单,请联系相关负责人!') + util.showToast(this.data.factoryDetail.manageNotifyMessage) return } var item = this.data.factoryDetail.paperCategoryList[this.data.cateIndex] diff --git a/pages/article/allNewInfo/index.js b/pages/article/allNewInfo/index.js index 3d832d8..6b13ba1 100644 --- a/pages/article/allNewInfo/index.js +++ b/pages/article/allNewInfo/index.js @@ -53,7 +53,7 @@ Page({ return } if(!e.currentTarget.dataset.operations){ - util.showToast('该纸厂已暂停接单,请联系相关负责人!') + util.showToast(e.currentTarget.dataset.msg) return } util.navigateTo('/pages/agent/edit/index?id=' + e.currentTarget.dataset.fcid + '&categoryId=' + e.currentTarget.dataset.paperid) diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml index 722bb61..fc00af0 100644 --- a/pages/article/allNewInfo/index.wxml +++ b/pages/article/allNewInfo/index.wxml @@ -81,7 +81,7 @@ class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}} + data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" data-operations="{{item.isOperations}}" data-msg="{{item.manageNotifyMessage}}" catchtap="toPage"> 代卖 diff --git a/pages/article/newInfo/index.js b/pages/article/newInfo/index.js index fbf7b95..3632770 100644 --- a/pages/article/newInfo/index.js +++ b/pages/article/newInfo/index.js @@ -62,7 +62,7 @@ Component({ return } if(!e.currentTarget.dataset.operations){ - util.showToast('该纸厂已暂停接单,请联系相关负责人!') + util.showToast(e.currentTarget.dataset.msg) return } util.navigateTo('/pages/agent/edit/index?id='+e.currentTarget.dataset.fcid+'&categoryId='+e.currentTarget.dataset.paperid) diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml index 6ce49ef..20e3a34 100644 --- a/pages/article/newInfo/index.wxml +++ b/pages/article/newInfo/index.wxml @@ -111,7 +111,7 @@ style="flex:1;text-align: center" style="flex:1;text-align: center"> {{formate.formateDescripe(cell.curDeductionPoint)}} + data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" data-operations="{{item.isOperations}}" data-msg="{{item.manageNotifyMessage}}" catchtap="toPage"> 代卖