添加订单图片

manifest.json

@@ -2,8 +2,8 @@
     "name" : "宝智达冷链物流",
     "appid" : "__UNI__92DFF97",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 300,
+    "versionName" : "1.0.4",
+    "versionCode" : 500,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -19,7 +19,9 @@
         /* 模块配置 */
         "modules" : {
             "Maps" : {},
-            "Bluetooth" : {}
+            "Bluetooth" : {},
+            "Camera" : {},
+            "Barcode" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

pages/home/index.vue

@@ -148,7 +148,7 @@
 
 	.company_name {
 		font-size: 36rpx;
-		padding: 30rpx;
+		padding: 50rpx 30rpx 20rpx 30rpx;
 		font-weight: 600;
 	}
 

pages/mine/index.vue

@@ -241,7 +241,7 @@
 	}
 
 	.card_mine {
-		margin-top: 20rpx;
+		margin-top: 30rpx;
 		padding: 0rpx 30rpx;
 		background-color: #fff;
 		border-radius: 20rpx;

pages/order/delivery.vue

@@ -33,11 +33,27 @@
 					</view>
 				</view>
 			</view>
-			<view class="card_sign_in" v-else>
-				<view class="details_title">签收图片 <span class="line_title">*</span></view>
-				<view>
-					<u-upload :fileList="fileList1" name="1" multiple :maxCount="10" @afterRead="afterRead"
-						@delete="deletePic"></u-upload>
+			<view v-else>
+				<view class="card_sign_in">
+					<view class="details_title1">运单签收图片 <span class="line_title">*</span></view>
+					<view>
+						<u-upload :fileList="fileList1" name="1" :maxCount="1" @afterRead="afterRead"
+							@delete="deletePic"></u-upload>
+					</view>
+				</view>
+				<view class="card_sign_in">
+					<view class="details_title1">随货通行单图片 <span class="line_title">*</span></view>
+					<view>
+						<u-upload :fileList="fileList2" name="2" :maxCount="1" @afterRead="afterRead"
+							@delete="deletePic"></u-upload>
+					</view>
+				</view>
+				<view class="card_sign_in">
+					<view class="details_title1">冷链交接单图片 <span class="line_title">*</span></view>
+					<view>
+						<u-upload :fileList="fileList3" name="3" :maxCount="1" @afterRead="afterRead"
+							@delete="deletePic"></u-upload>
+					</view>
 				</view>
 			</view>
 			<view style="width: 100%;height: 120rpx;"></view>
@@ -63,6 +79,8 @@
 				start: Date.now() - 10 * 24 * 3600000,
 				end: Date.now() + 10 * 24 * 3600000,
 				fileList1: [],
+				fileList2: [],
+				fileList3: [],
 			}
 		},
 		onLoad(receive) {
@@ -90,11 +108,11 @@
 							// 扫码下车
 							this.scanCodes('/api/waybill/car-out')
 						} else if (this.selectiveType == 'signfor') {
-							if (this.fileList1.length > 0) {
+							if (this.fileList1.length > 0 && this.fileList2.length > 0 && this.fileList3.length > 0) {
 								// 扫码签收
 								this.scanCodesSignFor('/api/waybill/receipt')
 							} else {
-								uni.$u.toast('请上传签收图片')
+								uni.$u.toast('请完善表单')
 							}
 						}
 					} else {
@@ -131,14 +149,17 @@
 			},
 			// 提交扫码签收列表
 			scanCodesSignFor(url) {
+				const signUrl = this.fileList1[0].url + ',' + this.fileList2[0].url + ',' + this.fileList3[0].url
 				this.$api.post(url, {
 					startTime: this.valueTime,
 					waybillNo: this.frequencyCoding,
-					receiptImg: this.fileList1[0].url,
+					receiptImg: signUrl,
 				}).then(res => {
 					if (res.code == 200) {
 						this.frequencyCoding = ''
 						this.fileList1 = []
+						this.fileList2 = []
+						this.fileList3 = []
 						this.list = []
 						uni.$u.toast(res.msg)
 					} else {
@@ -212,10 +233,15 @@
 					this.fileList1.forEach(item1 => {
 						arr.push(item1.url)
 					})
-				} else {
+				} else if (event.name == '2') {
 					var arr1 = []
 					this.fileList2.forEach(item2 => {
-						arr.push(item2.url)
+						arr1.push(item2.url)
+					})
+				} else if (event.name == '3') {
+					var arr2 = []
+					this.fileList3.forEach(item3 => {
+						arr2.push(item3.url)
 					})
 				}
 			},
@@ -241,7 +267,7 @@
 								if (state.code == 200) {
 									resolve(state.data)
 								}
-							}, 1000)
+							})
 						}
 					});
 				})
@@ -293,6 +319,17 @@
 		margin-right: 15rpx;
 	}
 
+	.details_title1 {
+		width: 140rpx;
+		text-align: center;
+		flex: none;
+		color: #333;
+		font-size: 32rpx;
+		font-weight: 500;
+		margin-bottom: 10rpx;
+		margin-right: 15rpx;
+	}
+
 	.card_time {
 		width: 100%;
 		border: 1rpx solid #dadbde;

pages/order/orderDetails.vue

@@ -29,10 +29,17 @@
 				</view>
 				<view class="title_claim"><span>备注:</span>{{orderList.remark}}</view>
 			</view>
+			<view class="card_humiture1" v-if="orderList.status == 8">
+				<view class="order_iamge_item" v-for="(item,index) in srcList" :key="index">
+					<u-image :showLoading="true" :src="item.url" width="80px" height="80px" radius="2"></u-image>
+					<view class="order_item_title">{{item.title}}</view>
+				</view>
+			</view>
 			<view v-if="orderList.status != 1">
 				<view class="line_back" style="margin-top: 40rpx;" @click="logistics">查看物流详情</view>
 				<view class="line_back" @click="goHumiture">查看温湿度</view>
 			</view>
+			<view style="width: 100%;height: 80rpx;"></view>
 		</view>
 		<!-- <view class="btn_print" v-if="type == 'details' && orderList.status == 2 || orderList.status == 3">
 			<u-button type="primary" text="打印条码"></u-button>
@@ -55,7 +62,17 @@
 					phone: '',
 					address: '',
 				},
-				orderList: {}
+				orderList: {},
+				srcList: [{
+					title: '运单签收图片',
+					url: '',
+				}, {
+					title: '随货通行单图片',
+					url: '',
+				}, {
+					title: '冷链交接单图片',
+					url: '',
+				}, ],
 			}
 		},
 		onLoad(value) {
@@ -63,7 +80,6 @@
 		},
 		onShow() {
 			var orderList = this.$cache.getCache('orderDetails')
-			// console.log(orderList,26)
 			this.orderList = orderList
 			this.senderList.name = orderList.senderAddressName
 			this.senderList.phone = orderList.senderAddressPhone
@@ -71,6 +87,12 @@
 			this.consigneeList.name = orderList.consigneeAddressName
 			this.consigneeList.phone = orderList.consigneeAddressPhone
 			this.consigneeList.address = orderList.consigneeAddressDetails
+			if (orderList.status == 8) {
+				const arr = orderList.ReceiptImg.split(',')
+				this.srcList[0].url = arr[0]
+				this.srcList[1].url = arr[1]
+				this.srcList[2].url = arr[2]
+			}
 		},
 		methods: {
 			// 物流详情
@@ -119,6 +141,29 @@
 		background-color: #fff;
 	}
 
+	.card_humiture1 {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		flex-wrap: wrap;
+		margin-top: 10rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		background-color: #fff;
+	}
+
+	.order_iamge_item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.order_item_title {
+		font-weight: 600;
+		margin-top: 10rpx;
+		font-size: 26rpx;
+	}
+
 	.title_claim {
 		display: flex;
 		margin: 20rpx 0rpx;

pages/order/quantum.vue

@@ -404,7 +404,7 @@
 									}
 								})
 							})
-							printerJobs.println()
+							// printerJobs.println()
 						}
 					})
 					printerJobs.println()

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/216a0160-0691-11ef-96b3-0dc2ed25368a
+https://app.liuyingyong.cn/build/download/1210b180-06f1-11ef-ad83-1d7b652050d8