Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-supplychain

canteen/pages/purchase/order.vue

@@ -29,12 +29,12 @@
 							<view class="lf-color-gray">发单时间</view>
 							<view class="lf-color-black">{{ item.send_time }}</view>
 						</view>
-						<view class="lf-row-between item" v-if="item.deadline">
-							<view class="lf-color-gray">收货时间</view>
-							<view class="lf-color-black">{{ item.deadline }}</view>
+						<view class="lf-row-between item" v-if="item.deadline_text">
+							<view class="lf-color-gray">预计收货时间</view>
+							<view class="lf-color-black">{{ item.deadline_text }}</view>
 						</view>
 						<view class="lf-row-between item" v-if="item.receive_time">
-							<view class="lf-color-gray">送达时间</view>
+							<view class="lf-color-gray">实际送达时间</view>
 							<view class="lf-color-black">{{ item.receive_time }}</view>
 						</view>
 						<view class="lf-row-between item" v-if="item.cate_number">

supplier/pages/gonghuo/order.vue

@@ -26,7 +26,7 @@
 							<view class="lf-color-black">{{ item.deadline_text }}</view>
 						</view>
 						<view class="lf-row-between item" v-if="item.receive_time">
-							<view class="lf-color-gray">送达时间</view>
+							<view class="lf-color-gray">实际送达时间</view>
 							<view class="lf-color-black">{{ item.receive_time }}</view>
 						</view>
 						<view class="lf-row-between item" v-if="item.cate_number">