From bd7b8f4252d9af8d26c76f4834f1461212c30f42 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 1 Jul 2021 19:29:40 +0800
Subject: [PATCH] no message

---
 pages/process/order-price/index.js   | 3 +++
 pages/process/order-price/index.wxml | 4 ++--
 pages/process/payment/index.wxml     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js
index 2e8ab36..b7ed9e2 100644
--- a/pages/process/order-price/index.js
+++ b/pages/process/order-price/index.js
@@ -71,6 +71,9 @@ Scene({
     var unitPrice = this.data.nowItem.defaultUnitPrice
     this.setData({ visible: false, ['form.productName']: this.data.nowItem.categoryName, ['form.unitPrice']: unitPrice, cIndex: this.data.cIndex })
   },
+  loop: function(){
+    return false
+  },
   onHide: function(){
     this.setData({ visible: false })
   },
diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml
index bc415bc..44ca593 100644
--- a/pages/process/order-price/index.wxml
+++ b/pages/process/order-price/index.wxml
@@ -136,14 +136,14 @@
 <van-dialog id="van-dialog" />
 <vehicle-keyboard id="wux-keyboard" safeBottom="{{safeBottom}}" triplet="{{1}}" bind:change="onPlatenumber"></vehicle-keyboard>
 <van-popup position="bottom" show="{{ visible }}" bind:close="onHide" z-index="29">
-  <view class="van-picker__toolbar van-hairline--top-bottom toolbar-class">
+  <view class="van-picker__toolbar van-hairline--top-bottom toolbar-class" catchtouchmove="loop">
     <view class="van-picker__cancel" hover-stay-time="70"></view>
     <view class="van-picker__title van-ellipsis">选择纸品</view>
     <view class="van-picker__confirm flex flex-cener" hover-class="van-picker__confirm--hover" hover-stay-time="70" bindtap="onHide">
       <van-icon name="cross" size="24" color="#999999" />
     </view>
   </view>
-  <scroll-view scroll-y="true" style="height:480rpx;padding: 12rpx 0rpx">
+  <scroll-view scroll-y="true" style="height:480rpx;padding: 12rpx 0rpx" catchtouchmove="loop">
     <van-grid column-num="3" border="{{fasle}}">
       <van-grid-item use-slot wx:for="{{ paperList }}" wx:key="index" content-style="padding:12rpx">
         <van-button plain type="{{index == cIndex ? 'info' : 'default'}}" custom-style="height:88rpx;width:208rpx;padding: 0rpx" data-index="{{index}}" bind:click="onConfirm">{{item.categoryName}}</van-button>
diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml
index af63c94..fd99da3 100644
--- a/pages/process/payment/index.wxml
+++ b/pages/process/payment/index.wxml
@@ -56,7 +56,7 @@
     <view style="flex:1;margin-left:16rpx" data-index="{{index}}" catchtap="lookItem">
       <view class="flex flex-justify">
         <view class="text-black text-lg van-ellipsis" style="max-width:320rpx;">{{item.factoryCustomerName}} {{item.factoryCustomerMobile || ''}}</view>
-        <view class="text-sm text-gray">{{item.inspectionTime || item.predictDeliveryToFactoryTime}}</view>
+        <view class="text-sm text-gray">{{item.inspectionTime || item.predictDeliveryToFactoryTime || item.createTime}}</view>
       </view>
       <view class="text-sm text-gray" style="line-height:54rpx">
         <text>品类：{{item.productName}}</text>