Browse Source

no message

featrue/v4.3
xpz2018 5 years ago
parent
commit
7d727cc2c4
14 changed files with 26 additions and 38 deletions
  1. 2
      app.js
  2. 7
      pages/agent/ability-item/index.js
  3. 1
      pages/agent/ability-item/index.json
  4. 4
      pages/agent/ability-item/index.wxml
  5. 7
      pages/agent/agent-item/index.js
  6. 1
      pages/agent/agent-item/index.json
  7. 2
      pages/agent/agent-item/index.wxml
  8. 7
      pages/agent/factory/index.js
  9. 1
      pages/agent/factory/index.json
  10. 2
      pages/agent/factory/index.wxml
  11. 8
      pages/article/allNewInfo/index.js
  12. 2
      pages/article/allNewInfo/index.wxml
  13. 18
      pages/article/newInfo/index.js
  14. 2
      pages/article/newInfo/index.wxml

2
app.js

@ -1,7 +1,7 @@
//app.js //app.js
App({ App({
//----------------------------------------------globalData-------------------------------------- //----------------------------------------------globalData--------------------------------------
evn: 2,//0:开发环境,1:测试环境,2:生产环境
evn: 0,//0:开发环境,1:测试环境,2:生产环境
tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
version: 152, version: 152,

7
pages/agent/ability-item/index.js

@ -43,12 +43,7 @@ Component({
return return
} }
if(!this.data.item.isOperations){ if(!this.data.item.isOperations){
this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog')
this.wuxDialog.alert({
resetOnClose: true,
title: '温馨提示',
content: '该纸厂已暂停接单,请联系相关负责人!'
})
util.showToast('该纸厂已暂停接单,请联系相关负责人!')
return return
} }
if(util.isEmpty(this.data.item.cateIndex)){ if(util.isEmpty(this.data.item.cateIndex)){

1
pages/agent/ability-item/index.json

@ -3,7 +3,6 @@
"usingComponents": { "usingComponents": {
"wux-button": "/components/button/index", "wux-button": "/components/button/index",
"wux-image": "/components/image/index", "wux-image": "/components/image/index",
"wux-dialog": "/components/dialog/index",
"wux-tag": "/components/tag/index" "wux-tag": "/components/tag/index"
} }
} }

4
pages/agent/ability-item/index.wxml

@ -41,6 +41,4 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<wux-dialog id="wux-dialog" />
</view>

7
pages/agent/agent-item/index.js

@ -54,12 +54,7 @@ Component({
return return
} }
if(!this.data.item.isOperations){ if(!this.data.item.isOperations){
this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog')
this.wuxDialog.alert({
resetOnClose: true,
title: '温馨提示',
content: '该纸厂已暂停接单,请联系相关负责人!'
})
util.showToast('该纸厂已暂停接单,请联系相关负责人!')
return return
} }
if(util.isEmpty(this.data.cateIndex)){ if(util.isEmpty(this.data.cateIndex)){

1
pages/agent/agent-item/index.json

@ -2,7 +2,6 @@
"component": true, "component": true,
"usingComponents": { "usingComponents": {
"wux-button": "/components/button/index", "wux-button": "/components/button/index",
"wux-dialog": "/components/dialog/index",
"wux-image": "/components/image/index" "wux-image": "/components/image/index"
} }
} }

2
pages/agent/agent-item/index.wxml

@ -75,8 +75,6 @@
</view> </view>
</view> </view>
<wux-dialog id="wux-dialog" />
<wxs module="priceItem"> <wxs module="priceItem">
function priceItem(item, kg) { function priceItem(item, kg) {
if(kg){ if(kg){

7
pages/agent/factory/index.js

@ -136,12 +136,7 @@ Page({
return return
} }
if(!this.data.factoryDetail.isOperations){ if(!this.data.factoryDetail.isOperations){
this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog')
this.wuxDialog.alert({
resetOnClose: true,
title: '温馨提示',
content: '该纸厂已暂停接单,请联系相关负责人!'
})
util.showToast('该纸厂已暂停接单,请联系相关负责人!')
return return
} }
var item = this.data.factoryDetail.paperCategoryList[this.data.cateIndex] var item = this.data.factoryDetail.paperCategoryList[this.data.cateIndex]

1
pages/agent/factory/index.json

@ -8,7 +8,6 @@
"wux-sticky": "/components/sticky/index", "wux-sticky": "/components/sticky/index",
"fold-text": "/components/fold-text/index", "fold-text": "/components/fold-text/index",
"wux-divider": "/components/divider/index", "wux-divider": "/components/divider/index",
"wux-dialog": "/components/dialog/index",
"article-item": "/pages/article/article-item/index" "article-item": "/pages/article/article-item/index"
} }
} }

2
pages/agent/factory/index.wxml

@ -178,8 +178,6 @@
</view> </view>
</view> </view>
<wux-dialog id="wux-dialog" />
<wxs module="priceItem"> <wxs module="priceItem">
function priceItem(item, kg) { function priceItem(item, kg) {
if(kg){ if(kg){

8
pages/article/allNewInfo/index.js

@ -48,6 +48,14 @@ Page({
util.navigateTo('/pages/agent/factory/index?id=' + e.currentTarget.dataset.factoryid) util.navigateTo('/pages/agent/factory/index?id=' + e.currentTarget.dataset.factoryid)
} }
if (e.currentTarget.id == 'toDmai') { 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) util.navigateTo('/pages/agent/edit/index?id=' + e.currentTarget.dataset.fcid + '&categoryId=' + e.currentTarget.dataset.paperid)
} }
}, },

2
pages/article/allNewInfo/index.wxml

@ -81,7 +81,7 @@
class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}" class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}"
style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view> style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view>
<view class="text-df text-balck" style="flex:1;text-align: center" id="toDmai" <view class="text-df text-balck" style="flex:1;text-align: center" id="toDmai"
data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" catchtap="toPage">
data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" data-operations="{{item.isOperations}}" catchtap="toPage">
<view class="son-table-btn">代卖</view> <view class="son-table-btn">代卖</view>
</view> </view>
</view> </view>

18
pages/article/newInfo/index.js

@ -2,9 +2,8 @@
const util = require('../../../utils/util') const util = require('../../../utils/util')
const math = require('../../../utils/math') //导入模块 const math = require('../../../utils/math') //导入模块
const app = getApp() const app = getApp()
import {
getPaperMillOfInformationList,
} from "../../api/ztb"
import { getPaperMillOfInformationList } from "../../api/ztb"
import { getPreferList } from "../../api/moment" import { getPreferList } from "../../api/moment"
Component({ Component({
options: { options: {
@ -58,14 +57,19 @@ Component({
util.navigateTo('/pages/agent/factory/index?id='+e.currentTarget.dataset.factoryid) util.navigateTo('/pages/agent/factory/index?id='+e.currentTarget.dataset.factoryid)
} }
if(e.currentTarget.id == 'toDmai'){ 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) util.navigateTo('/pages/agent/edit/index?id='+e.currentTarget.dataset.fcid+'&categoryId='+e.currentTarget.dataset.paperid)
} }
}, },
toPageDetails:function(e){ 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) { changeTable: function (e) {
var a = e.currentTarget.id var a = e.currentTarget.id

2
pages/article/newInfo/index.wxml

@ -111,7 +111,7 @@
style="flex:1;text-align: center" style="flex:1;text-align: center"> style="flex:1;text-align: center" style="flex:1;text-align: center">
{{formate.formateDescripe(cell.curDeductionPoint)}}</view> {{formate.formateDescripe(cell.curDeductionPoint)}}</view>
<view class="text-df text-balck" style="flex:1;text-align: center" id="toDmai" <view class="text-df text-balck" style="flex:1;text-align: center" id="toDmai"
data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" catchtap="toPage">
data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" data-operations="{{item.isOperations}}" catchtap="toPage">
<view class="son-table-btn">代卖</view> <view class="son-table-btn">代卖</view>
</view> </view>
</view> </view>

Loading…
Cancel
Save