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

supplier/pages/gonghuo/detail.vue

@@ -32,6 +32,14 @@
 				<view>批次号</view>
 				<view class="lf-font-bold">{{order.batch_sn}}</view>
 			</view>
+			<view class="lf-row-between list">
+				<view>预计收货时间</view>
+				<view class="lf-font-bold">{{order.deadline_text}}</view>
+			</view>
+			<view class="lf-row-between list" v-if="order.receive_time">
+				<view>实际收货时间</view>
+				<view class="lf-font-bold">{{order.receive_time}}</view>
+			</view>
 			<block v-if="order.car_license">
 				<view class="lf-row-between list">
 					<view>车辆</view>
@@ -275,7 +283,8 @@
 				this.$u.throttle(() => {
 					uni.previewImage({
 						urls: this[list],
-						current: current
+						current: current,
+						indicator: "default"
 					})
 				}, 500);
 			},

supplier/pages/offer/index.vue

@@ -99,7 +99,7 @@
 					label: '含税价',
 					key: 'tax_price'
 				},{
-					label: '非含税价',
+					label: '不含税价',
 					key: 'non_tax_price'
 				},{
 					label: '操作',

supplier/pages/order/detail.vue

@@ -91,7 +91,7 @@
 					label: '含税价',
 					key: 'tax_price'
 				},{
-					label: '非含税价',
+					label: '不含税价',
 					key: 'non_tax_price'
 				}],
 				contents: [],