diff --git a/app.js b/app.js
index 6e6b87a..a4be9df 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
//app.js
App({
//----------------------------------------------globalData--------------------------------------
- evn: 2,//0:开发环境，1：测试环境，2：生产环境
+ evn: 0,//0:开发环境，1：测试环境，2：生产环境
tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
version: 152,
diff --git a/pages/agent/ability-item/index.js b/pages/agent/ability-item/index.js
index 3435054..8f76e08 100644
--- a/pages/agent/ability-item/index.js
+++ b/pages/agent/ability-item/index.js
@@ -43,12 +43,7 @@ Component({
return
}
if(!this.data.item.isOperations){
- this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog')
- this.wuxDialog.alert({
- resetOnClose: true,
- title: '温馨提示',
- content: '该纸厂已暂停接单，请联系相关负责人！'
- })
+ util.showToast('该纸厂已暂停接单，请联系相关负责人！')
return
}
if(util.isEmpty(this.data.item.cateIndex)){
diff --git a/pages/agent/ability-item/index.json b/pages/agent/ability-item/index.json
index bb8f424..b452c48 100644
--- a/pages/agent/ability-item/index.json
+++ b/pages/agent/ability-item/index.json
@@ -3,7 +3,6 @@
"usingComponents": {
"wux-button": "/components/button/index",
"wux-image": "/components/image/index",
- "wux-dialog": "/components/dialog/index",
"wux-tag": "/components/tag/index"
}
}
\ No newline at end of file
diff --git a/pages/agent/ability-item/index.wxml b/pages/agent/ability-item/index.wxml
index ca4f43c..29568c5 100644
--- a/pages/agent/ability-item/index.wxml
+++ b/pages/agent/ability-item/index.wxml
@@ -41,6 +41,4 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/agent/agent-item/index.js b/pages/agent/agent-item/index.js
index 5552453..b90cdd8 100644
--- a/pages/agent/agent-item/index.js
+++ b/pages/agent/agent-item/index.js
@@ -54,12 +54,7 @@ Component({
return
}
if(!this.data.item.isOperations){
- this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog')
- this.wuxDialog.alert({
- resetOnClose: true,
- title: '温馨提示',
- content: '该纸厂已暂停接单，请联系相关负责人！'
- })
+ util.showToast('该纸厂已暂停接单，请联系相关负责人！')
return
}
if(util.isEmpty(this.data.cateIndex)){
diff --git a/pages/agent/agent-item/index.json b/pages/agent/agent-item/index.json
index 57c9787..4a8859e 100644
--- a/pages/agent/agent-item/index.json
+++ b/pages/agent/agent-item/index.json
@@ -2,7 +2,6 @@
"component": true,
"usingComponents": {
"wux-button": "/components/button/index",
- "wux-dialog": "/components/dialog/index",
"wux-image": "/components/image/index"
}
}
\ No newline at end of file
diff --git a/pages/agent/agent-item/index.wxml b/pages/agent/agent-item/index.wxml
index 2e5ae19..bfa7954 100644
--- a/pages/agent/agent-item/index.wxml
+++ b/pages/agent/agent-item/index.wxml
@@ -75,8 +75,6 @@
-
-
function priceItem(item, kg) {
if(kg){
diff --git a/pages/agent/factory/index.js b/pages/agent/factory/index.js
index f6e5ada..cd78aa3 100644
--- a/pages/agent/factory/index.js
+++ b/pages/agent/factory/index.js
@@ -136,12 +136,7 @@ Page({
return
}
if(!this.data.factoryDetail.isOperations){
- this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog')
- this.wuxDialog.alert({
- resetOnClose: true,
- title: '温馨提示',
- content: '该纸厂已暂停接单，请联系相关负责人！'
- })
+ util.showToast('该纸厂已暂停接单，请联系相关负责人！')
return
}
var item = this.data.factoryDetail.paperCategoryList[this.data.cateIndex]
diff --git a/pages/agent/factory/index.json b/pages/agent/factory/index.json
index 2af1bd8..82796ef 100644
--- a/pages/agent/factory/index.json
+++ b/pages/agent/factory/index.json
@@ -8,7 +8,6 @@
"wux-sticky": "/components/sticky/index",
"fold-text": "/components/fold-text/index",
"wux-divider": "/components/divider/index",
- "wux-dialog": "/components/dialog/index",
"article-item": "/pages/article/article-item/index"
}
}
\ No newline at end of file
diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml
index 68caa86..6a15980 100644
--- a/pages/agent/factory/index.wxml
+++ b/pages/agent/factory/index.wxml
@@ -178,8 +178,6 @@
-
-
function priceItem(item, kg) {
if(kg){
diff --git a/pages/article/allNewInfo/index.js b/pages/article/allNewInfo/index.js
index 2e35ffa..3d832d8 100644
--- a/pages/article/allNewInfo/index.js
+++ b/pages/article/allNewInfo/index.js
@@ -48,6 +48,14 @@ Page({
util.navigateTo('/pages/agent/factory/index?id=' + e.currentTarget.dataset.factoryid)
}
if (e.currentTarget.id == 'toDmai') {
+ if (!app.globalData.userInfo) {
+ wx.navigateTo({ url: '/pages/login/index' })
+ return
+ }
+ if(!e.currentTarget.dataset.operations){
+ util.showToast('该纸厂已暂停接单，请联系相关负责人！')
+ 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 bb53751..722bb61 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}}" catchtap="toPage">
代卖
diff --git a/pages/article/newInfo/index.js b/pages/article/newInfo/index.js
index d02b176..af4b3f8 100644
--- a/pages/article/newInfo/index.js
+++ b/pages/article/newInfo/index.js
@@ -2,9 +2,8 @@
const util = require('../../../utils/util')
const math = require('../../../utils/math') //导入模块
const app = getApp()
-import {
- getPaperMillOfInformationList,
-} from "../../api/ztb"
+
+import { getPaperMillOfInformationList } from "../../api/ztb"
import { getPreferList } from "../../api/moment"
Component({
options: {
@@ -58,14 +57,19 @@ Component({
util.navigateTo('/pages/agent/factory/index?id='+e.currentTarget.dataset.factoryid)
}
if(e.currentTarget.id == 'toDmai'){
+ if (!app.globalData.userInfo) {
+ wx.navigateTo({ url: '/pages/login/index' })
+ return
+ }
+ if(!e.currentTarget.dataset.operations){
+ util.showToast('该纸厂已暂停接单，请联系相关负责人！')
+ return
+ }
util.navigateTo('/pages/agent/edit/index?id='+e.currentTarget.dataset.fcid+'&categoryId='+e.currentTarget.dataset.paperid)
}
-
-
},
toPageDetails:function(e){
- util.navigateTo('/pages/article/detail/index?id='+e.currentTarget.id)
-
+ util.navigateTo('/pages/article/detail/index?id='+e.currentTarget.id)
},
changeTable: function (e) {
var a = e.currentTarget.id
diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml
index a7cc6e7..6ce49ef 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}}" catchtap="toPage">
代卖