diff --git a/app.js b/app.js index 1b33a91..a4be9df 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ //app.js App({ //----------------------------------------------globalData-------------------------------------- - evn: 1,//0:开发环境,1:测试环境,2:生产环境 + evn: 0,//0:开发环境,1:测试环境,2:生产环境 tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], version: 152, diff --git a/components/timeline/index.js b/components/timeline/index.js index 008355a..b046652 100644 --- a/components/timeline/index.js +++ b/components/timeline/index.js @@ -1,5 +1,4 @@ import baseComponent from '../helpers/baseComponent' -import classNames from '../helpers/classNames' baseComponent({ relations: { diff --git a/pages/agent/detail/delivery-info/delivery-info.js b/pages/agent/detail/delivery-info/delivery-info.js index d087dac..e93d253 100644 --- a/pages/agent/detail/delivery-info/delivery-info.js +++ b/pages/agent/detail/delivery-info/delivery-info.js @@ -10,17 +10,17 @@ Component({ properties: { orderInfo: { type: Object, value: null } }, - /** - * 组件的初始数据 - */ - data: { - - }, - /** * 组件的方法列表 */ methods: { - + clipboard: function () { + wx.setClipboardData({ + data: this.data.orderInfo.millDeliveryOrderId, + success: function (res) { + util.showToast('复制成功') + } + }) + } } }) diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml index 778ff2d..16bcf77 100644 --- a/pages/agent/detail/index.wxml +++ b/pages/agent/detail/index.wxml @@ -80,10 +80,3 @@ - - - function statusStep(status) { - return status == 1 ? "process" : "wait"; - } - module.exports = statusStep - \ No newline at end of file diff --git a/pages/agent/detail/item-car-info/item-car-info.json b/pages/agent/detail/item-car-info/item-car-info.json index 2fa1a90..c058306 100644 --- a/pages/agent/detail/item-car-info/item-car-info.json +++ b/pages/agent/detail/item-car-info/item-car-info.json @@ -1,9 +1,6 @@ { "component": true, "usingComponents": { - "wux-dialog": "/components/dialog/index", - "wux-image": "/components/image/index", - "sudoku-image": "/components/sudoku-image/index", "wux-button": "/components/button/index", "wux-divider": "/components/divider/index", "wux-accordion-group": "/components/accordion-group/index", diff --git a/pages/agent/detail/item-car-info/item-car-info.wxml b/pages/agent/detail/item-car-info/item-car-info.wxml index 19b915a..4e54522 100644 --- a/pages/agent/detail/item-car-info/item-car-info.wxml +++ b/pages/agent/detail/item-car-info/item-car-info.wxml @@ -1,24 +1,25 @@ - + - - - - - {{item.logisticcsInfo.plateNumber}} - 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」 - - 进度详情 - - - - - - - + + + + + {{item.logisticcsInfo.plateNumber}} + 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」 + + 进度详情 + + + + + + + function statusStep(status) { - return status==1?"process":"wait"; + return status == 1 ? "process" : "wait"; } module.exports = statusStep - + \ No newline at end of file diff --git a/pages/agent/detail/order-info/order-info.json b/pages/agent/detail/order-info/order-info.json index 2fa1a90..a741756 100644 --- a/pages/agent/detail/order-info/order-info.json +++ b/pages/agent/detail/order-info/order-info.json @@ -9,5 +9,6 @@ "wux-accordion-group": "/components/accordion-group/index", "wux-accordion": "/components/accordion/index", "wux-steps": "/components/steps/index", - "wux-step": "/components/step/index"} + "wux-step": "/components/step/index" + } } \ No newline at end of file diff --git a/pages/agent/order-item/index.wxml b/pages/agent/order-item/index.wxml index ed7a790..7776d1f 100644 --- a/pages/agent/order-item/index.wxml +++ b/pages/agent/order-item/index.wxml @@ -64,13 +64,11 @@ } return '' } - module.exports = orderStatus; - function orderNextStatus(status,activityOrderAuditPassnum) { if (status == 50) { return '待送货' diff --git a/pages/bank/create/index.js b/pages/bank/create/index.js index 961a4e7..fb288c4 100644 --- a/pages/bank/create/index.js +++ b/pages/bank/create/index.js @@ -95,10 +95,6 @@ Page({ return '' }, fetchCode: function () { - if (util.isEmpty(this.data.bankName) && !util.isEmpty(this.data.form.cardNo)) { - this.checkCardNo(this.data.form.cardNo) - return - } if (util.isEmpty(this.data.form.name)) { util.showToast('请输入持卡人姓名') return @@ -142,6 +138,9 @@ Page({ }) }, submitForm: function(){ + if (util.isEmpty(this.data.bankName) && !util.isEmpty(this.data.form.cardNo)) { + this.checkCardNo(this.data.form.cardNo) + } if (util.isEmpty(this.data.form.name)) { util.showToast('请输入持卡人姓名') return