no message

pages/agent/appointment/index.wxml

@@ -94,7 +94,7 @@
   <van-button type="info" loading="{{requesting}}" custom-style="height:88rpx;width:688rpx" bind:click="submitForm">提交订单</van-button>
 </submit-layout>
 
-<vehicle-keyboard id="wux-keyboard" safeBottom="{{safeBottom}}" triplet="{{1}}" bind:change="onPlatenumber"></vehicle-keyboard>
+<vehicle-keyboard id="wux-keyboard" safeBottom="{{safeBottom}}" bind:change="onPlatenumber"></vehicle-keyboard>
 <van-popup position="bottom" show="{{ visible }}" bind:close="onHide" z-index="29">
   <van-picker show-toolbar title="{{toolbar}}" columns="{{ columns }}" bind:cancel="onHide" bind:confirm="onConfirm" />
 </van-popup>

pages/process/order-info/index.js

@@ -29,7 +29,7 @@ Scene({
     event.on('OrderMessage', this, this.onEvent)
   },
   onEvent: function(message){
-    if (message.what == 12) {
+    if (message.what == 12 && message.desc == 'PaymentOrder') {
       wx.navigateBack()
     }
   },
@@ -122,7 +122,7 @@ Scene({
     checkingOrder({ id: this.data.form.id }).then(result => {
       wx.hideLoading()
       util.showBackToast('订单审核已通过')
-      event.emit('OrderMessage', {  what: 12, desc: 'checkingOrder' })
+      event.emit('OrderMessage', { what: 12, desc: 'checkingOrder' })
     }).catch(err => {
       wx.hideLoading()
       util.showToast(err)

pages/process/order-info/index.wxml

@@ -32,6 +32,10 @@
     <image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
     <view class="text-white text-sg" style="margin-left:12rpx">已完成</view>
   </view>
+  <view class="flex flex-center info_status" style="justify-content: flex-start;" wx:elif="{{form.status == 6}}">
+    <image style="height:42rpx;width:42rpx" src="/assets/image/icon_close.png"></image>
+    <view class="text-white text-sg" style="margin-left:12rpx">已取消</view>
+  </view>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">客户姓名</view>

pages/process/outside-add/index.wxml

@@ -92,7 +92,7 @@
 </submit-layout>
 
 <van-dialog id="van-dialog" />
-<vehicle-keyboard id="wux-keyboard" safeBottom="{{safeBottom}}" triplet="{{1}}" bind:change="onPlatenumber"></vehicle-keyboard>
+<vehicle-keyboard id="wux-keyboard" safeBottom="{{safeBottom}}" bind:change="onPlatenumber"></vehicle-keyboard>
 <van-popup position="bottom" show="{{ visible }}" bind:close="onHide" z-index="29">
   <van-picker show-toolbar title="{{cateIndex >= 0 ? '选择纸品' : '选择预估时间'}}" columns="{{ columns }}" bind:cancel="onHide" bind:confirm="onConfirm" />
 </van-popup>

pages/process/outside-info/index.js

@@ -39,16 +39,21 @@ Scene({
       for (let index = 0; index < result.data.productCategoryInfos.length; index++) {
         const element = result.data.productCategoryInfos[index]
         element.fileList = []
-        for (let k = 0; k < element.weightNoteImages.length; k++) {
-          element.fileList.push({url: element.weightNoteImages[k]})
+        if(element.weightNoteImages){
+          for (let k = 0; k < element.weightNoteImages.length; k++) {
+            element.fileList.push({url: element.weightNoteImages[k]})
+          }
+        }
+        if(element.settleUnitPrice && element.settleWeight){
+          element.settlePrice = math.times(element.settleWeight, element.settleUnitPrice)
+          result.data.settleTotalAmount = math.plus(result.data.settleTotalAmount, element.settlePrice)
+          result.data.settleTotalWeight = math.plus(result.data.settleTotalWeight, element.settleWeight)
         }
-        element.settlePrice = math.times(element.settleWeight, element.settleUnitPrice)
-        result.data.settleTotalAmount = math.plus(result.data.settleTotalAmount, element.settlePrice)
-        result.data.settleTotalWeight = math.plus(result.data.settleTotalWeight, element.settleWeight)
       }
       this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 })
     }).catch(err => {
       wx.hideLoading()
+      console.log(err)
       util.showToast(err)
     })
   },

pages/process/outside-info/index.wxml

@@ -27,6 +27,10 @@
     <image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
     <view class="text-white text-sg" style="margin-left:12rpx">已完成</view>
   </view>
+  <view class="flex flex-center info_status" style="justify-content: flex-start;" wx:elif="{{form.orderStatus == 6}}">
+    <!-- <image style="height:42rpx;width:42rpx" src="/assets/image/icon_close.png"></image> -->
+    <view class="text-white text-sg" style="margin-left:12rpx">已取消</view>
+  </view>
   <van-cell clickable center>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">客户姓名</view>
@@ -195,7 +199,7 @@
   <van-button type="info" custom-style="height:88rpx;width:300rpx" bind:click="paymentOrder" wx:if="{{form.orderStatus == 42}}">客户结算</van-button>
 </submit-layout>
 
-<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{form}}">
+<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{form && form.orderStatus != 6}}">
   <van-button round type="info" bind:click="printOrder" custom-style="width: 100rpx;height: 100rpx;">
     <van-icon name="printer" size="30px"/>
   </van-button>

pages/process/outside-list/index.wxml

@@ -38,7 +38,7 @@
           </view>
         </view>
         <view class="flex flex-justify" style="margin-top:12rpx">
-          <view class="text-sm text-gray">车牌号码：{{item.plateNumber}}</view>
+          <view class="text-sm text-gray">车牌号码：{{item.plateNumber || ''}}</view>
           <view class="text-sm text-gray">品类：{{item.productCategoryName}}</view>
           <!-- <view class="text-sm text-gray">金额：{{item.settlePrice}}元</view> -->
         </view>