Browse Source

no message

featrue/v4.3
xpz2018 5 years ago
parent
commit
6fecbb22fb
9 changed files with 34 additions and 46 deletions
  1. 2
      app.js
  2. 1
      components/timeline/index.js
  3. 16
      pages/agent/detail/delivery-info/delivery-info.js
  4. 7
      pages/agent/detail/index.wxml
  5. 3
      pages/agent/detail/item-car-info/item-car-info.json
  6. 39
      pages/agent/detail/item-car-info/item-car-info.wxml
  7. 3
      pages/agent/detail/order-info/order-info.json
  8. 2
      pages/agent/order-item/index.wxml
  9. 7
      pages/bank/create/index.js

2
app.js

@ -1,7 +1,7 @@
//app.js //app.js
App({ App({
//----------------------------------------------globalData-------------------------------------- //----------------------------------------------globalData--------------------------------------
evn: 1,//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,

1
components/timeline/index.js

@ -1,5 +1,4 @@
import baseComponent from '../helpers/baseComponent' import baseComponent from '../helpers/baseComponent'
import classNames from '../helpers/classNames'
baseComponent({ baseComponent({
relations: { relations: {

16
pages/agent/detail/delivery-info/delivery-info.js

@ -10,17 +10,17 @@ Component({
properties: { properties: {
orderInfo: { type: Object, value: null } orderInfo: { type: Object, value: null }
}, },
/**
* 组件的初始数据
*/
data: {
},
/** /**
* 组件的方法列表 * 组件的方法列表
*/ */
methods: { methods: {
clipboard: function () {
wx.setClipboardData({
data: this.data.orderInfo.millDeliveryOrderId,
success: function (res) {
util.showToast('复制成功')
}
})
}
} }
}) })

7
pages/agent/detail/index.wxml

@ -80,10 +80,3 @@
</view> </view>
<wux-dialog id="wux-dialog" /> <wux-dialog id="wux-dialog" />
<wxs module="statusStep">
function statusStep(status) {
return status == 1 ? "process" : "wait";
}
module.exports = statusStep
</wxs>

3
pages/agent/detail/item-car-info/item-car-info.json

@ -1,9 +1,6 @@
{ {
"component": true, "component": true,
"usingComponents": { "usingComponents": {
"wux-dialog": "/components/dialog/index",
"wux-image": "/components/image/index",
"sudoku-image": "/components/sudoku-image/index",
"wux-button": "/components/button/index", "wux-button": "/components/button/index",
"wux-divider": "/components/divider/index", "wux-divider": "/components/divider/index",
"wux-accordion-group": "/components/accordion-group/index", "wux-accordion-group": "/components/accordion-group/index",

39
pages/agent/detail/item-car-info/item-car-info.wxml

@ -1,24 +1,25 @@
<!--pages/agent/detail/item-history-part/item-history-info.wxml--> <!--pages/agent/detail/item-history-part/item-history-info.wxml-->
<!-- 车辆信息 -->
<!-- 车辆信息 -->
<wxs module="agent" src="../../../agent/index.wxs"></wxs> <wxs module="agent" src="../../../agent/index.wxs"></wxs>
<wux-accordion-group>
<wux-accordion>
<view slot="header" class="flex flex-justify" style="width: 100%">
<view class="flex">
<text class="text-sg text-black text-bold">{{item.logisticcsInfo.plateNumber}}</text>
<text class="text-sg text-black text-bold" style="margin-left:8rpx">「{{item.paperCategoryName || orderInfo.paperCategoryName}}」</text>
</view>
<view class="text-df text-gray" style="padding-right:16rpx;">进度详情</view>
</view>
<wux-steps direction="vertical">
<wux-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" content="{{timeItem.time}}"/>
</wux-steps>
</wux-accordion>
</wux-accordion-group>
<wxs module="statusStep">
<wux-accordion-group>
<wux-accordion>
<view slot="header" class="flex flex-justify" style="width: 100%">
<view class="flex">
<text class="text-sg text-black text-bold">{{item.logisticcsInfo.plateNumber}}</text>
<text class="text-sg text-black text-bold"
style="margin-left:8rpx">「{{item.paperCategoryName || orderInfo.paperCategoryName}}」</text>
</view>
<view class="text-df text-gray" style="padding-right:16rpx;">进度详情</view>
</view>
<wux-steps direction="vertical">
<wux-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" content="{{timeItem.time}}" />
</wux-steps>
</wux-accordion>
</wux-accordion-group>
<wxs module="statusStep">
function statusStep(status) { function statusStep(status) {
return status==1?"process":"wait";
return status == 1 ? "process" : "wait";
} }
module.exports = statusStep module.exports = statusStep
</wxs>
</wxs>

3
pages/agent/detail/order-info/order-info.json

@ -9,5 +9,6 @@
"wux-accordion-group": "/components/accordion-group/index", "wux-accordion-group": "/components/accordion-group/index",
"wux-accordion": "/components/accordion/index", "wux-accordion": "/components/accordion/index",
"wux-steps": "/components/steps/index", "wux-steps": "/components/steps/index",
"wux-step": "/components/step/index"}
"wux-step": "/components/step/index"
}
} }

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

@ -64,13 +64,11 @@
} }
return '' return ''
} }
module.exports = orderStatus; module.exports = orderStatus;
</wxs> </wxs>
<wxs module="orderNextStatus"> <wxs module="orderNextStatus">
function orderNextStatus(status,activityOrderAuditPassnum) { function orderNextStatus(status,activityOrderAuditPassnum) {
if (status == 50) { if (status == 50) {
return '待送货' return '待送货'

7
pages/bank/create/index.js

@ -95,10 +95,6 @@ Page({
return '' return ''
}, },
fetchCode: function () { 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)) { if (util.isEmpty(this.data.form.name)) {
util.showToast('请输入持卡人姓名') util.showToast('请输入持卡人姓名')
return return
@ -142,6 +138,9 @@ Page({
}) })
}, },
submitForm: function(){ 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)) { if (util.isEmpty(this.data.form.name)) {
util.showToast('请输入持卡人姓名') util.showToast('请输入持卡人姓名')
return return

Loading…
Cancel
Save