Browse Source

btn width修改适配

feature/v2.1
xpz2018 4 years ago
parent
commit
a4a6b72d35
6 changed files with 24 additions and 24 deletions
  1. 8
      pages/process/check-list/index.wxml
  2. 12
      pages/process/order-list/index.wxml
  3. 18
      pages/process/outside-list/index.wxml
  4. 2
      pages/process/payment-list/index.wxml
  5. 4
      pages/storage/order-list/index.wxml
  6. 4
      pages/storage/pound-list/index.wxml

8
pages/process/check-list/index.wxml

@ -56,13 +56,13 @@
<view class="text-sm text-black">{{item.settlePrice || '- -'}}</view> <view class="text-sm text-black">{{item.settlePrice || '- -'}}</view>
</view> </view>
<view class="flex" style="justify-content: flex-end;margin-top:16rpx"> <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
<van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
<van-button round plain type="default" custom-style="height:64rpx;" data-id="{{item.id}}"
bind:click="cancelOrder" wx:if="{{item.status == 1}}">取消订单</van-button> bind:click="cancelOrder" wx:if="{{item.status == 1}}">取消订单</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-id="{{item.id}}"
bind:click="priceOrder" wx:if="{{item.status == 1}}">定价</van-button> bind:click="priceOrder" wx:if="{{item.status == 1}}">定价</van-button>
<van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
<van-button round plain type="default" custom-style="height:64rpx;" data-id="{{item.id}}"
bind:click="repriceOrder" wx:if="{{item.status == 3}}">重新定价</van-button> bind:click="repriceOrder" wx:if="{{item.status == 3}}">重新定价</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-id="{{item.id}}"
bind:click="checkOrder" wx:if="{{item.status == 3}}">审核</van-button> bind:click="checkOrder" wx:if="{{item.status == 3}}">审核</van-button>
</view> </view>
</view> </view>

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

@ -64,17 +64,17 @@
<image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.status == 6}}"></image> <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.status == 6}}"></image>
</view> </view>
<view class="flex" style="justify-content: flex-end;margin-top:16rpx"> <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
<van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
<van-button round plain type="default" custom-style="height:64rpx;" data-id="{{item.id}}"
bind:click="cancelOrder" wx:if="{{item.status == 1 || item.status == 2}}">取消订单</van-button> bind:click="cancelOrder" wx:if="{{item.status == 1 || item.status == 2}}">取消订单</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-id="{{item.id}}"
bind:click="priceOrder" wx:if="{{item.status == 1}}">定价</van-button> bind:click="priceOrder" wx:if="{{item.status == 1}}">定价</van-button>
<van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
<van-button round plain type="default" custom-style="height:64rpx;" data-id="{{item.id}}"
bind:click="repriceOrder" wx:if="{{item.status == 3}}">重新定价</van-button> bind:click="repriceOrder" wx:if="{{item.status == 3}}">重新定价</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-id="{{item.id}}"
bind:click="checkOrder" wx:if="{{item.status == 3}}">审核</van-button> bind:click="checkOrder" wx:if="{{item.status == 3}}">审核</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="paymentItem" wx:if="{{item.status == 4 && admin}}">去支付</van-button> bind:click="paymentItem" wx:if="{{item.status == 4 && admin}}">去支付</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="paymentItem" wx:if="{{item.status == 42 && admin}}">去结算</van-button> bind:click="paymentItem" wx:if="{{item.status == 42 && admin}}">去结算</van-button>
</view> </view>
</view> </view>

18
pages/process/outside-list/index.wxml

@ -60,23 +60,23 @@
<image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.orderStatus == 6}}"></image> <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.orderStatus == 6}}"></image>
</view> </view>
<view class="flex" style="justify-content: flex-end;margin-top:16rpx"> <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
<van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.orderId}}"
<van-button round plain type="default" custom-style="height:64rpx;" data-id="{{item.orderId}}"
bind:click="cancelOrder" wx:if="{{item.orderStatus == 0 || item.orderStatus == 1}}">取消订单</van-button> bind:click="cancelOrder" wx:if="{{item.orderStatus == 0 || item.orderStatus == 1}}">取消订单</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:180rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="editItem" wx:if="{{item.orderStatus == 0}}">修改订单</van-button> bind:click="editItem" wx:if="{{item.orderStatus == 0}}">修改订单</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:180rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="lookItem" wx:if="{{item.orderStatus == 0}}">收货</van-button> bind:click="lookItem" wx:if="{{item.orderStatus == 0}}">收货</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:180rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="lookItem" wx:if="{{item.orderStatus == 1}}">确认定价</van-button> bind:click="lookItem" wx:if="{{item.orderStatus == 1}}">确认定价</van-button>
<van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.orderId}}"
<van-button round plain type="default" custom-style="height:64rpx;" data-id="{{item.orderId}}"
bind:click="repriceOrder" wx:if="{{item.orderStatus == 3}}">重新定价</van-button> bind:click="repriceOrder" wx:if="{{item.orderStatus == 3}}">重新定价</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:180rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="lookItem" wx:if="{{item.orderStatus == 3}}">审核订单</van-button> bind:click="lookItem" wx:if="{{item.orderStatus == 3}}">审核订单</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="lookItem" wx:if="{{item.orderStatus == 4 && admin}}">去支付</van-button> bind:click="lookItem" wx:if="{{item.orderStatus == 4 && admin}}">去支付</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="lookItem" wx:if="{{item.orderStatus == 42 && admin}}">去结算</van-button> bind:click="lookItem" wx:if="{{item.orderStatus == 42 && admin}}">去结算</van-button>
<van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.orderId}}"
<van-button round plain type="default" custom-style="height:64rpx;" data-id="{{item.orderId}}"
bind:click="orderLogger" wx:if="{{item.orderStatus == 5 || item.orderStatus == 6}}">查看日志</van-button> bind:click="orderLogger" wx:if="{{item.orderStatus == 5 || item.orderStatus == 6}}">查看日志</van-button>
</view> </view>
</view> </view>

2
pages/process/payment-list/index.wxml

@ -57,7 +57,7 @@
<view class="text-sm text-black">{{item.settlePrice || '- -'}}</view> <view class="text-sm text-black">{{item.settlePrice || '- -'}}</view>
</view> </view>
<view class="flex" style="justify-content: flex-end;margin-top:16rpx"> <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="lookItem" wx:if="{{(item.status == 4 || item.status == 42) && admin}}">去支付</van-button> bind:click="lookItem" wx:if="{{(item.status == 4 || item.status == 42) && admin}}">去支付</van-button>
</view> </view>
</view> </view>

4
pages/storage/order-list/index.wxml

@ -51,9 +51,9 @@
<view class="text-sm text-black">{{item.operaterName || '- -'}}</view> <view class="text-sm text-black">{{item.operaterName || '- -'}}</view>
</view> </view>
<view class="flex" style="justify-content: flex-end;margin-top:16rpx"> <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="lookItem" wx:if="{{item.status == 0}}">去审核</van-button> bind:click="lookItem" wx:if="{{item.status == 0}}">去审核</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
bind:click="lookItem" wx:if="{{item.status == 0}}">去收款</van-button> bind:click="lookItem" wx:if="{{item.status == 0}}">去收款</van-button>
</view> </view>
</view> </view>

4
pages/storage/pound-list/index.wxml

@ -46,9 +46,9 @@
<view class="text-sm text-black">{{item.operaterName}}</view> <view class="text-sm text-black">{{item.operaterName}}</view>
</view> </view>
<view class="flex" style="justify-content: flex-end;margin-top:16rpx"> <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
<van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
<van-button round plain type="default" custom-style="height:64rpx" data-id="{{item.id}}"
bind:click="cancelOrder" wx:if="{{item.status == 0 || item.status == 1}}">取消磅单</van-button> bind:click="cancelOrder" wx:if="{{item.status == 0 || item.status == 1}}">取消磅单</van-button>
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:240rpx" data-id="{{item.id}}"
<van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-id="{{item.id}}"
bind:click="submitForm" wx:if="{{item.status == 1}}">关联出货单</van-button> bind:click="submitForm" wx:if="{{item.status == 1}}">关联出货单</van-button>
</view> </view>
</view> </view>

Loading…
Cancel
Save