取消订单

pages/process/index/index.js

@@ -24,7 +24,7 @@ Component({
     ],
     tabList1: [
       { status: 0, badge: '', name: '待收货', icon: '/assets/image/icon_pricing.png' },
-      { status: 1, badge: '', name: '待定价', icon: '/assets/image/icon_checking.png' },
+      { status: 1, badge: '', name: '待定价', icon: '/assets/image/icon_pricing.png' },
       { status: 4, badge: '', name: '待付款', icon: '/assets/image/icon_payment.png' },
       { status: 5, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
     ],

pages/process/order-price/index.json

@@ -12,6 +12,7 @@
     "van-field": "/components/field/index",
     "van-switch": "/components/switch/index",
     "vehicle-keyboard": "/components/vehicle-keyboard/index",
+    "submit-layout": "/components/submit-layout/index",
     "notification": "/pages/message/notification/index"
   }
 }

pages/process/order-price/index.wxml

@@ -118,13 +118,11 @@
     </view>
   </van-cell>
 </view>
-<view style="height:{{136 + safeBottom}}rpx;" wx:if="{{form && step == 2}}"></view>
-<view class="cu-bar bg-white foot" style="height:{{120 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;"
-  wx:if="{{form && step == 2}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="priceOrder">提交
-  </van-button>
-</view>
+
+<submit-layout wx:if="{{form && step == 2}}">
+  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消订单</van-button>
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="priceOrder">提交订单</van-button>
+</submit-layout>
 
 <van-dialog id="van-dialog" />
 <vehicle-keyboard id="wux-keyboard" safeBottom="{{safeBottom}}" triplet="{{1}}" bind:change="onPlatenumber"></vehicle-keyboard>

pages/process/outside-add/index.wxml

@@ -84,11 +84,11 @@
 <van-field label="辅助设备" type="textarea" value="{{ form.equipmentRemark }}" input-align="right" bind:change="onChange" placeholder="请输入辅助设备" autosize border="{{ false }}" />
 
 <submit-layout wx:if="{{form.scrapPaperReceiptId}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">保存</van-button>
+  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消订单</van-button>
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">保存订单</van-button>
 </submit-layout>
 <submit-layout wx:else>
-  <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="submitForm">保存</van-button>
+  <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="submitForm">保存订单</van-button>
 </submit-layout>
 
 <van-dialog id="van-dialog" />

pages/process/outside-price/index.wxml

@@ -110,16 +110,16 @@
   </van-cell>
 </view>
 <submit-layout wx:if="{{admin && form && form.orderStatus == 0}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:186rpx" bind:click="cancelForm">取消</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="saveForm">保存</van-button>
+  <van-button plain type="default" custom-style="height:88rpx;width:186rpx" bind:click="cancelForm">取消订单</van-button>
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="saveForm">保存订单</van-button>
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx;" bind:click="submitForm">提交订单</van-button>
 </submit-layout>
 <submit-layout wx:elif="{{form && form.orderStatus == 0}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="saveForm">保存</van-button>
+  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="saveForm">保存订单</van-button>
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">提交订单</van-button>
 </submit-layout>
 <submit-layout wx:if="{{admin && form && form.orderStatus == 1}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelForm">取消</van-button>
+  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelForm">取消订单</van-button>
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="priceForm">确认定价</van-button>
 </submit-layout>
 <submit-layout wx:if="{{admin && form && form.orderStatus == 3}}">