Browse Source

no message

feature/v1.6
xpz2018 4 years ago
parent
commit
126bd8228b
7 changed files with 33 additions and 10 deletions
  1. 1
      pages/process/order-info/index.json
  2. 7
      pages/process/order-info/index.wxml
  3. 11
      pages/process/outside-check/index.wxml
  4. 1
      pages/process/outside-info/index.json
  5. 14
      pages/process/outside-info/index.wxml
  6. 8
      pages/process/outside-price/index.wxml
  7. 1
      pages/process/payment/index.wxml

1
pages/process/order-info/index.json

@ -1,6 +1,5 @@
{
"usingComponents": {
"van-index-anchor": "/components/index-anchor/index",
"van-cell": "/components/cell/index",
"van-icon": "/components/icon/index",
"van-button": "/components/button/index",

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

@ -128,7 +128,11 @@
<view class="flex" style="margin-top:18rpx;border: 2rpx solid #f3f3f3;padding: 18rpx;">{{form.inspectionRemark}}</view>
</view>
</van-cell>
<van-index-anchor index="订单信息" />
<view style="height:16rpx"></view>
<view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">订单信息</view>
</view>
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">单价(元/公斤)</view>
@ -161,6 +165,7 @@
</van-cell>
</view>
<view style="height:16rpx"></view>
<submit-layout wx:if="{{form && form.status == 3 && !agent }}">
<van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="repeatOrder">重新过皮重</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkOrder">通过审核</van-button>

11
pages/process/outside-check/index.wxml

@ -4,7 +4,10 @@
</cu-custom>
<view wx:if="{{form}}">
<van-index-anchor index="订单信息" />
<view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">订单信息</view>
</view>
<van-cell clickable center>
<view slot="title" class="flex flex-justify">
<view class="text-black">客户姓名</view>
@ -23,7 +26,11 @@
<view class="{{form.driverName ? 'text-black' : 'text-gray'}}">{{form.driverName || '请选择司机'}}</view>
</view>
</van-cell>
<van-index-anchor index="纸品信息" />
<view style="height:16rpx"></view>
<view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">纸品信息</view>
</view>
<view wx:for="{{form.productCategoryInfos}}" wx:key="index">
<outside-check-item form="{{form}}" item="{{item}}" index="{{index}}" list="{{paperList}}" columns="{{columns}}" bind:change="onProductChange"/>
</view>

1
pages/process/outside-info/index.json

@ -1,6 +1,5 @@
{
"usingComponents": {
"van-index-anchor": "/components/index-anchor/index",
"van-cell": "/components/cell/index",
"van-icon": "/components/icon/index",
"van-button": "/components/button/index",

14
pages/process/outside-info/index.wxml

@ -61,7 +61,7 @@
<view class="text-gray">{{form.predictDeliveryToFactoryTime}}</view>
</view>
</van-cell>
<van-field label="辅助设备" type="textarea" disabled input-align="right" value="{{ form.equipmentRemark }}" autosize border="{{ false }}" />
<van-field label="辅助设备" type="textarea" disabled input-align="right" value="{{ form.equipmentRemark }}" autosize border="{{false}}" />
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black">厂外皮重(公斤)</view>
@ -98,7 +98,11 @@
<view class="text-gray">{{form.onsideAndOffsiteDifferences || '- -'}}</view>
</view>
</van-cell>
<van-index-anchor index="纸品信息" />
<view style="height:16rpx"></view>
<view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">纸品信息</view>
</view>
<view wx:for="{{form.productCategoryInfos}}" wx:key="index">
<view style="height:16rpx" wx:if="{{index != 0 }}"></view>
<van-cell clickable center>
@ -168,7 +172,11 @@
</view>
</van-cell>
</view>
<van-index-anchor index="汇总信息" />
<view style="height:16rpx"></view>
<view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">汇总信息</view>
</view>
<van-cell clickable center>
<view slot="title" class="flex flex-justify">
<view class="text-black">结算总重量(公斤)</view>

8
pages/process/outside-price/index.wxml

@ -58,7 +58,7 @@
</view>
</van-cell>
<van-field label="辅助设备" type="textarea" value="{{ form.equipmentRemark }}" disabled input-align="right" placeholder="暂无" autosize
border="{{ false }}" />
border="{{false}}" />
<view style="height:16rpx"></view>
<view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
@ -67,7 +67,11 @@
<view wx:for="{{form.productCategoryInfos}}" wx:key="index">
<outside-item item="{{item}}" index="{{index}}" status="{{form.orderStatus}}" bind:change="onProductChange"></outside-item>
</view>
<van-index-anchor index="汇总信息" />
<view style="height:16rpx"></view>
<view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
<view style="height:24rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
<view class="text-black text-sg text-bold" style="margin-left: 12rpx">汇总信息</view>
</view>
<van-cell clickable center wx:if="{{form.orderStatus > 0}}">
<view slot="title" class="flex flex-justify">
<view class="text-black">结算总重量(公斤)</view>

1
pages/process/payment/index.wxml

@ -67,6 +67,7 @@
</view>
</van-cell>
<view style="height:16rpx" wx:if="{{orderList}}"></view>
<submit-layout wx:if="{{orderList}}">
<van-button type="info" custom-style="height:88rpx;width:686rpx" disabled="{{amount==0}}" bind:click="paymentOrder">{{orderStatus == 42 ? '付款' : '结算'}}
</van-button>

Loading…
Cancel
Save