no message

pages/process/agent-list/index.js

@@ -96,7 +96,5 @@ Scene({
     } else {
       wx.navigateTo({ url: `/pages/process/outside-info/index?agent=1&id=${item.orderId}&status=${item.status}` })
     }
-    
   }
-
 })

pages/process/order-check/index.js

@@ -45,6 +45,20 @@ Scene({
       })
     }
   },
+  selectCustomer: function(){
+    var that = this
+    wx.navigateTo({ 
+      url: `/pages/home/customer-list/index?type=1`,
+      events: {
+        onCallback: (data) => {
+          if (data.what == 130) {
+            that.data.form.factoryCustomerId = data.detail.id
+            that.setData({ ['form.factoryCustomerName']: data.detail.name })
+          }
+        }
+      }
+    })
+  },
   showPlate: function (e) {
     this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard')
     this.keyboard.show(this.data.form.plateNumber, 0)
@@ -142,7 +156,8 @@ Scene({
     data.productId = this.data.form.productId
     data.deductType = this.data.form.deductType
     data.unitPrice = Number(this.data.form.unitPrice)
-    checkingOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => {
+    var factoryCustomerId = this.data.form.factoryCustomerId
+    checkingOrder({ id: this.data.form.id, factoryCustomerId, editOrderPriceDto: data }).then(result => {
       wx.hideLoading()
       event.emit('OrderMessage', {  what: 12, desc: 'checkingOrder' })
       util.showBackToast('订单审核已通过')

pages/process/order-check/index.wxml

@@ -8,7 +8,7 @@
     <view style="height:30rpx;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>
+  <van-cell clickable center is-link bind:click="selectCustomer">
     <view slot="title" class="flex flex-justify">
       <view class="text-black">客户姓名</view>
       <view class="text-black">{{form.factoryCustomerName}}</view>

pages/process/order-price/index.js

@@ -62,20 +62,20 @@ Scene({
   nextStep: function (e) {
     this.setData({ step: 2 })
   },
-  selectCustomer: function(){
-    var that = this
-    wx.navigateTo({ 
-      url: `/pages/home/customer-list/index?type=1`,
-      events: {
-        onCallback: (data) => {
-          if (data.what == 130) {
-            that.data.form.factoryCustomerId = data.detail.id
-            that.setData({ ['form.factoryCustomerName']: data.detail.name })
-          }
-        }
-      }
-    })
-  },
+  // selectCustomer: function(){
+  //   var that = this
+  //   wx.navigateTo({ 
+  //     url: `/pages/home/customer-list/index?type=1`,
+  //     events: {
+  //       onCallback: (data) => {
+  //         if (data.what == 130) {
+  //           that.data.form.factoryCustomerId = data.detail.id
+  //           that.setData({ ['form.factoryCustomerName']: data.detail.name })
+  //         }
+  //       }
+  //     }
+  //   })
+  // },
   showPlate: function (e) {
     this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard')
     this.keyboard.show(this.data.form.plateNumber, 0)

pages/process/order-price/index.wxml

@@ -4,7 +4,7 @@
 </cu-custom>
 
 <view wx:if="{{form && step == 1}}">
-  <van-cell clickable center is-link bind:click="selectCustomer">
+  <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">客户姓名</view>
       <view class="text-black">{{form.factoryCustomerName}}</view>
@@ -35,7 +35,7 @@
     <view style="height:30rpx;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 is-link bind:click="selectCustomer">
+  <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">客户姓名</view>
       <view class="text-black">{{form.factoryCustomerName}}</view>

pages/setting/vehicle-list/index.js

@@ -52,12 +52,13 @@ Scene({
     this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false })
     this.fetchOrderList()
   },
-  fetchOrderList: function () {
+  fetchOrderList: async function () {
     if (this.data.requesting || this.data.finished) {
       return
     }
     this.data.requesting = true
-    getCarList(this.data.form).then(result => {
+    try {
+      var result = await getCarList(this.data.form)
       if (result.data && result.data.records && result.data.records.length) {
         var respList = result.data.records
         let nowList = `orderList[${this.data.orderList.length}]`
@@ -67,13 +68,12 @@ Scene({
       } else {
         this.setData({ finished: true, requesting: false, loading: false })
       }
-    }).catch(err => {
+    } catch (err) {
       this.setData({ requesting: false, loading: false })
       util.showToast(err)
-    }).then(() => {
-      this.refresh = this.refresh || this.selectComponent('#refresh')
-      this.refresh.setRefresh(false)
-    })
+    }
+    this.refresh = this.refresh || this.selectComponent('#refresh')
+    this.refresh.setRefresh(false)
   },
   lookItem: function (e) {
     if(e.currentTarget.dataset.page >= 0){