Browse Source

no message

feature/v1.5
xpz2018 4 years ago
parent
commit
2ef1a3e3c7
4 changed files with 10 additions and 14 deletions
  1. 11
      components/refresh-view/scroll.wxs
  2. 10
      pages/process/index/index.wxml
  3. 2
      pages/process/order-info/index.wxml
  4. 1
      pages/process/order-list/index.wxml

11
components/refresh-view/scroll.wxs

@ -30,13 +30,8 @@ var touchMove = function(e, instance) {
newmark = e.touches[0].pageY; newmark = e.touches[0].pageY;
if (newmark < startmark) { if (newmark < startmark) {
// 向上滑动 // 向上滑动
instance.selectComponent('.circle-progress-bar').setStyle({
'transform': 'none'
});
instance.selectComponent('.icon-shuaxin').setStyle({
'transform': 'none',
'opacity': 0
});
instance.selectComponent('.circle-progress-bar').setStyle({ 'transform': 'none' })
instance.selectComponent('.icon-shuaxin').setStyle({ 'transform': 'none', 'opacity': 0 })
} else if (newmark - startmark > maxDistance + circleProgressBarHeight) { } else if (newmark - startmark > maxDistance + circleProgressBarHeight) {
// 达到最大滑动距离 // 达到最大滑动距离
instance.selectComponent('.circle-progress-bar').setStyle({ instance.selectComponent('.circle-progress-bar').setStyle({
@ -64,7 +59,7 @@ var touchMove = function(e, instance) {
}); });
} }
} else { } else {
return;
return
} }
} }

10
pages/process/index/index.wxml

@ -16,21 +16,21 @@
<view style="padding: 0rpx 28rpx;margin-top:24rpx"> <view style="padding: 0rpx 28rpx;margin-top:24rpx">
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx"> <view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx">
<view class="flex flex-justify" style="padding: 0rpx 28rpx 24rpx 28rpx">
<view class="flex flex-justify" style="padding: 0rpx 28rpx">
<view class="text-black text-sg text-bold">收货统计</view> <view class="text-black text-sg text-bold">收货统计</view>
<!-- <view class="flex flex-center" bindtap="showSheet" style="padding: 2rpx 0rpx"> <!-- <view class="flex flex-center" bindtap="showSheet" style="padding: 2rpx 0rpx">
<view class="text-black text-sm" style="margin-right:8rpx">{{vdateString}}</view> <view class="text-black text-sm" style="margin-right:8rpx">{{vdateString}}</view>
</view> --> </view> -->
</view> </view>
<view class="flex" style="padding:0rpx 0rpx 24rpx 0rpx" bindtap="orderList">
<view class="flex" style="padding: 16rpx 0rpx 8rpx 0rpx">
<view style="flex:1;padding:0rpx 32rpx;margin-right:12rpx"> <view style="flex:1;padding:0rpx 32rpx;margin-right:12rpx">
<view class="flex flex-center" style="justify-content: flex-start"> <view class="flex flex-center" style="justify-content: flex-start">
<view style="height:24rpx;width:6rpx;background:#007AFF"></view> <view style="height:24rpx;width:6rpx;background:#007AFF"></view>
<view class="text-black text-sm" style="margin-left: 12rpx">收货重量</view> <view class="text-black text-sm" style="margin-left: 12rpx">收货重量</view>
</view> </view>
<view class="text-xxl text-bold" style="margin:12rpx 0rpx">{{formate.formateWeight(totalInfo.totalWeight || 0)}}吨</view> <view class="text-xxl text-bold" style="margin:12rpx 0rpx">{{formate.formateWeight(totalInfo.totalWeight || 0)}}吨</view>
<view class="text-gray text-sm">查看收货详情</view>
<!-- <view class="text-gray text-sm">查看收货详情</view> -->
</view> </view>
<view style="flex:1;padding:0rpx 32rpx;margin-left:12rpx"> <view style="flex:1;padding:0rpx 32rpx;margin-left:12rpx">
<view class="flex flex-center" style="justify-content: flex-start"> <view class="flex flex-center" style="justify-content: flex-start">
@ -82,14 +82,14 @@
</view> </view>
<view style="padding: 0rpx 28rpx;margin-top:24rpx" bindtap="agentList" wx:else> <view style="padding: 0rpx 28rpx;margin-top:24rpx" bindtap="agentList" wx:else>
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx"> <view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx">
<view class="flex flex-justify" style="padding: 0rpx 28rpx 24rpx 28rpx">
<view class="flex flex-justify" style="padding: 0rpx 28rpx 16rpx 28rpx">
<view class="text-black text-sg text-bold">千鸟代付额度</view> <view class="text-black text-sg text-bold">千鸟代付额度</view>
<view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx"> <view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx">
<view class="text-gray text-sm" style="margin-right:8rpx">查看代付详情</view> <view class="text-gray text-sm" style="margin-right:8rpx">查看代付详情</view>
<van-icon name="arrow" color="#aaa"/> <van-icon name="arrow" color="#aaa"/>
</view> </view>
</view> </view>
<view class="flex" style="padding:0rpx 0rpx 24rpx 0rpx">
<view class="flex" style="padding:0rpx 0rpx 12rpx 0rpx">
<view style="flex:1;padding:0rpx 32rpx;margin-right:12rpx"> <view style="flex:1;padding:0rpx 32rpx;margin-right:12rpx">
<view class="flex flex-center" style="justify-content: flex-start"> <view class="flex flex-center" style="justify-content: flex-start">
<view style="height:24rpx;width:6rpx;background:#007AFF"></view> <view style="height:24rpx;width:6rpx;background:#007AFF"></view>

2
pages/process/order-info/index.wxml

@ -87,7 +87,7 @@
<van-cell> <van-cell>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">定价员</view> <view class="text-black">定价员</view>
<view class="text-gray">{{form.inspectorName || ''}}</view>
<view class="text-gray">{{form.inspectorPerson || ''}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>

1
pages/process/order-list/index.wxml

@ -62,6 +62,7 @@
<view class="text-df" style="color:#028A00" wx:elif="{{item.status == 41}}">代付中</view> <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 41}}">代付中</view>
<view class="text-df" style="color:#028A00" wx:elif="{{item.status == 42}}">待结算</view> <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 42}}">待结算</view>
<view class="text-df" style="color:#028A00" wx:elif="{{item.status == 5}}">已完成</view> <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 5}}">已完成</view>
<view class="text-df text-gray" wx:elif="{{item.status == 6}}">已关闭</view>
</view> </view>
</view> </view>
<view class="flex flex-justify" style="margin-top:12rpx"> <view class="flex flex-justify" style="margin-top:12rpx">

Loading…
Cancel
Save