Browse Source

no message

feature/v1.4
xpz2018 5 years ago
parent
commit
7934b046c1
4 changed files with 16 additions and 9 deletions
  1. 1
      components/refresh-view/index.wxml
  2. 8
      pages/agent/index/index.js
  3. 14
      pages/agent/order-detail/item-car-info/index.wxml
  4. 2
      pages/agent/order-item/index.wxml

1
components/refresh-view/index.wxml

@ -15,6 +15,7 @@
<view class="loading" style="border-top:5rpx solid {{color}};border-left:5rpx solid {{color}};border-right:5rpx solid {{color}};" /> <view class="loading" style="border-top:5rpx solid {{color}};border-left:5rpx solid {{color}};border-right:5rpx solid {{color}};" />
</view> </view>
<!-- 刷新内容 --> <!-- 刷新内容 -->
<view style="height:10rpx"></view>
<slot></slot> <slot></slot>
</view> </view>
</scroll-view> </scroll-view>

8
pages/agent/index/index.js

@ -15,10 +15,10 @@ Component({
userInfo: app.userInfo, userInfo: app.userInfo,
height: app.globalData.safeFragmentHeight, height: app.globalData.safeFragmentHeight,
tabList: [ tabList: [
{ status: 1, badge: '', name: '待预约', icon: '/assets/image/icon_pricing.png' },
{ status: 2, badge: '', name: '待送货', icon: '/assets/image/icon_checking.png' },
{ status: 3, badge: '', name: '结算中', icon: '/assets/image/icon_payment.png' },
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
{ status: 50, badge: '', name: '待预约', icon: '/assets/image/icon_pricing.png' },
{ status: 51, badge: '', name: '待送货', icon: '/assets/image/icon_checking.png' },
{ status: 53, badge: '', name: '结算中', icon: '/assets/image/icon_payment.png' },
{ status: 54, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
] ]
}, },
lifetimes: { lifetimes: {

14
pages/agent/order-detail/item-car-info/index.wxml

@ -10,9 +10,9 @@
<view class="text-df text-gray" style="padding-right:16rpx;">进度详情</view> <view class="text-df text-gray" style="padding-right:16rpx;">进度详情</view>
</view> </view>
<view style="padding-top:24rpx"> <view style="padding-top:24rpx">
<van-steps direction="column" step-min-height="120">
<van-steps direction="column" active-index="{{statusStep(item.orderItemTimeList)}}" status="process" step-min-height="128">
<van-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex" <van-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" describe="{{timeItem.time}}">
title="{{timeItem.description}}" describe="{{timeItem.time}}">
</van-step> </van-step>
</van-steps> </van-steps>
</view> </view>
@ -20,8 +20,14 @@
</van-collapse> </van-collapse>
<wxs module="statusStep"> <wxs module="statusStep">
function statusStep(status) {
return status == 1 ? "process" : "wait";
function statusStep(timeList) {
var step = 0
for (var index = 0; index < timeList.length; index++) {
if(timeList[index].status === 1){
step ++
}
}
return step - 1
} }
module.exports = statusStep module.exports = statusStep
</wxs> </wxs>

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

@ -2,7 +2,7 @@
<wxs module="formate" src="../../../pages/formate.wxs"></wxs> <wxs module="formate" src="../../../pages/formate.wxs"></wxs>
<view class="flex flex-justify item-content" style="border-bottom:2rpx solid #f3f3f3" bindtap="lookItem"> <view class="flex flex-justify item-content" style="border-bottom:2rpx solid #f3f3f3" bindtap="lookItem">
<view class="flex flex-center"> <view class="flex flex-center">
<van-image use-loading-slot width="40rpx" height="40rpx" radius="4" lazy-load src="{{item.logoImg}}">
<van-image use-loading-slot width="40rpx" height="40rpx" round lazy-load src="{{item.logoImg}}">
<image class="image-load" slot="loading" src="/assets/image/def_image.png"></image> <image class="image-load" slot="loading" src="/assets/image/def_image.png"></image>
</van-image> </van-image>
<text class="text-sg text-bold" style="margin-left:8rpx">{{item.paperMillName}}</text> <text class="text-sg text-bold" style="margin-left:8rpx">{{item.paperMillName}}</text>

Loading…
Cancel
Save