no message

pages/login/index.js

@@ -147,7 +147,11 @@ Page({
       })
     }).catch(err => {
       wx.hideLoading()
-      util.showToast(err)
+      if(err !== null && err instanceof Object) {
+        util.showToast('服务器错误')
+      } else {
+        util.showToast(err)
+      }
       config.header = null
       this.setData({ loging: false})
     })

pages/process/outside-info/index.js

@@ -4,6 +4,7 @@ import Dialog from '../../../components/dialog/dialog'
 import { repeatSideOrder, getSideOrderInfo, printOrder} from "../../../api/saas"
 const event = require('../../../utils/event')
 const util = require('../../../utils/util')
+const math = require('../../../utils/math')
 const app = getApp()
 
 Scene({
@@ -23,12 +24,17 @@ Scene({
       wx.showLoading({ title: '正在获取', mask: true })
       getSideOrderInfo({id: options.id}).then(result => {
         wx.hideLoading()
+        result.data.settleTotalAmount = 0
+        result.data.settleTotalWeight = 0
         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]})
           }
+          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 => {

pages/process/outside-info/index.wxml

@@ -4,7 +4,29 @@
 </cu-custom>
 
 <view wx:if="{{form}}">
-  <van-index-anchor index="订单信息" />
+  <view class="flex flex-justify info_status" wx:if="{{form.orderStatus == 3}}">
+    <view class="flex">
+      <image style="height:42rpx;width:42rpx" src="/assets/image/icon_uncheck.png"></image>
+      <view class="text-white text-sg" style="margin-left:12rpx">待过磅审核</view>
+    </view>
+    <view class="text-white" style="padding: 12rpx 0rpx 12rpx 12rpx" bindtap="checkForm">重新定价</view>
+  </view>
+  <view class="flex flex-center info_status" style="justify-content: flex-start;" wx:elif="{{form.orderStatus == 4}}">
+    <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 == 41}}">
+    <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 == 42}}">
+    <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 == 5}}">
+    <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>
   <van-cell clickable center>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">客户姓名</view>
@@ -36,7 +58,42 @@
     </view>
   </van-cell>
   <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>
+      <view class="text-gray">{{form.offsiteTareWeight || '- -'}}</view>
+    </view>
+  </van-cell>
+  <van-cell>
+    <view slot="title" class="flex flex-justify">
+      <view class="flex flex-center text-black">厂外毛重(公斤)</view>
+      <view class="text-gray">{{form.offsiteGrossWeight || '- -'}}</view>
+    </view>
+  </van-cell>
+  <van-cell>
+    <view slot="title" class="flex flex-justify">
+      <view class="flex flex-center text-black">净重(公斤)</view>
+      <view class="text-gray">{{form.offsiteGrossWeight || '- -'}}</view>
+    </view>
+  </van-cell>
+  <van-cell>
+    <view slot="title" class="flex flex-justify">
+      <view class="flex flex-center text-black">预计总金额(元)</view>
+      <view class="text-gray">{{form.estimatedTotalAmount || '- -'}}</view>
+    </view>
+  </van-cell>
+  <van-cell wx:if="{{form.onsideGrossWeight}}">
+    <view slot="title" class="flex flex-justify">
+      <view class="flex flex-center text-black">厂内毛重(公斤)</view>
+      <view class="text-gray">{{form.onsideGrossWeight || '- -'}}</view>
+    </view>
+  </van-cell>
+  <van-cell wx:if="{{form.onsideAndOffsiteDifferences}}">
+    <view slot="title" class="flex flex-justify">
+      <view class="flex flex-center text-black">厂内厂外毛重差异(公斤)</view>
+      <view class="text-gray">{{form.onsideAndOffsiteDifferences || '- -'}}</view>
+    </view>
+  </van-cell>
   <van-index-anchor index="纸品信息" />
   <view wx:for="{{form.productCategoryInfos}}" wx:key="index">
     <view style="height:16rpx" wx:if="{{index != 0 }}"></view>
@@ -111,31 +168,13 @@
   <van-cell clickable center>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">结算总重量(公斤)</view>
-      <view class="text-gray">{{form.totalNetWeight || '- -'}}</view>
+      <view class="text-gray">{{form.settleTotalWeight || '- -'}}</view>
     </view>
   </van-cell>
   <van-cell clickable center>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">结算总金额(元)</view>
-      <view class="text-gray">{{form.totalSettleWeight || '- -'}}</view>
-    </view>
-  </van-cell>
-  <van-cell wx:if="{{form.onsideGrossWeight}}">
-    <view slot="title" class="flex flex-justify">
-      <view class="flex flex-center text-black">厂内毛重(公斤)</view>
-      <view class="text-gray">{{form.onsideGrossWeight || '- -'}}</view>
-    </view>
-  </van-cell>
-  <van-cell>
-    <view slot="title" class="flex flex-justify">
-      <view class="flex flex-center text-black">厂外皮重(公斤)</view>
-      <view class="text-gray">{{form.offsiteTareWeight || '- -'}}</view>
-    </view>
-  </van-cell>
-  <van-cell>
-    <view slot="title" class="flex flex-justify">
-      <view class="flex flex-center text-black">厂外毛重(公斤)</view>
-      <view class="text-gray">{{form.offsiteGrossWeight || '- -'}}</view>
+      <view class="text-gray">{{form.settleTotalAmount || '- -'}}</view>
     </view>
   </van-cell>
 </view>

pages/process/outside-info/index.wxss

@@ -1,4 +1,10 @@
 /* pages/process/order-check/index.wxss */
+.info_status{
+  background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%);
+  height:90rpx;
+  padding: 0rpx 32rpx;
+}
+
 .cate-list {
   margin: 24rpx 30rpx;
   border: 1rpx solid #dcdcdc;

pages/process/outside-price/index.wxml

@@ -15,6 +15,13 @@
     <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-justify info_status" wx:elif="{{form.orderStatus == 3}}">
+    <view class="flex">
+      <image style="height:42rpx;width:42rpx" src="/assets/image/icon_uncheck.png"></image>
+      <view class="text-white text-sg" style="margin-left:12rpx">待过磅审核</view>
+    </view>
+    <view class="text-white" style="padding: 12rpx 0rpx 12rpx 12rpx" bindtap="repeatForm">重新定价</view>
+  </view>
   <!-- <van-index-anchor index="订单信息" /> -->
   <van-cell clickable center>
     <view slot="title" class="flex flex-justify">
@@ -32,19 +39,19 @@
   <van-cell clickable center>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">司机</view>
-      <view class="{{form.driverName ? 'text-black' : 'text-gray'}}">{{form.driverName || '请选择司机'}}</view>
+      <view class="{{form.driverName ? 'text-black' : 'text-gray'}}">{{form.driverName || '- -'}}</view>
     </view>
   </van-cell>
-  <van-cell clickable center wx:if="{{form.predictDeliveryToFactoryTime}}">
+  <van-cell clickable center wx:if="{{form.operatorName}}">
     <view slot="title" class="flex flex-justify">
       <view class="text-black">操作员</view>
-      <view class="{{form.predictDeliveryToFactoryTime ? 'text-black' : 'text-gray'}}">{{form.predictDeliveryToFactoryTime}}</view>
+      <view class="{{form.operatorName ? 'text-black' : 'text-gray'}}">{{form.operatorName}}</view>
     </view>
   </van-cell>
-  <van-cell clickable center wx:if="{{form.appointDate}}">
+  <van-cell clickable center wx:if="{{form.predictDeliveryToFactoryTime}}">
     <view slot="title" class="flex flex-justify">
       <view class="text-black">预计到厂时间</view>
-      <view class="{{form.appointDate ? 'text-black' : 'text-gray'}}">{{form.appointDate || '请选择预计到厂时间'}}</view>
+      <view class="{{form.predictDeliveryToFactoryTime ? 'text-black' : 'text-gray'}}">{{form.predictDeliveryToFactoryTime || '- -'}}</view>
     </view>
   </van-cell>
   <van-field label="辅助设备" type="textarea" value="{{ form.equipmentRemark }}" disabled input-align="right" placeholder="暂无" autosize