效验

components/x-orderCard.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 订单详情表单 -->
+	<!-- 运单详情表单 -->
 	<view class="card_ordercard">
 		<view class="title_detail"><span>姓名:</span>{{list.name}}</view>
 		<view class="title_detail"><span>联系方式:</span>{{list.phone}}</view>

components/x-orderManagement.vue

@@ -12,7 +12,7 @@
 			<view style="display: flex;margin-top: 15rpx;" v-if="item.status == 1">
 				<view class="btn_printil markd10" v-if="item.status == 1 || item.status == 2 || item.status == 3"
 					@click.stop="modifyOrder(item)">
-					<u-button size="small" type="warning" text="修改订单"></u-button>
+					<u-button size="small" type="warning" text="修改运单"></u-button>
 				</view>
 				<view class="btn_printil markd10" @click.stop="antiDismantle(item)">
 					<u-button size="small" type="primary" text="防拆标签"></u-button>
@@ -33,7 +33,7 @@
 		<u-popup :show="signForShow" mode="center" round="6" closeable :closeOnClickOverlay="false" @close="close">
 			<view class="center_in title_sign">{{signRejection}}</view>
 			<view class="card_sign_for">
-				<view class="img_sign_rejection">订单号: {{orderNumber}}</view>
+				<view class="img_sign_rejection">运单号: {{orderNumber}}</view>
 				<view class="card_image_sign">
 					<view class="img_sign_rejection">{{signRejection}}图片</view>
 					<u-upload :fileList="fileList1" name="1" multiple :maxCount="10" @afterRead="afterRead"
@@ -65,7 +65,7 @@
 	export default {
 		name: 'xOrderManagement',
 		props: {
-			// 订单列表
+			// 运单列表
 			orderList: {
 				type: Array,
 				default: () => [],
@@ -194,7 +194,7 @@
 						...this.goodsModel,
 					}
 					uni.showLoading();
-					// 修改订单
+					// 修改运单
 					this.$api.put('/api/waybill', params).then(res => {
 						if (res.code == 200) {
 							this.antiShow = false
@@ -216,21 +216,21 @@
 					url: '/pages/order/quantum?waybillNo=' + value.waybillNo + '&printType=record'
 				});
 			},
-			// 修改订单
+			// 修改运单
 			modifyOrder(value) {
 				this.$cache.setCache('orderDetails', value)
 				uni.redirectTo({
-					url: '/pages/order/addWaybill?title=修改订单&type=2'
+					url: '/pages/order/addWaybill?title=修改运单&type=2'
 				});
 			},
-			// 订单详情
+			// 运单详情
 			goOrderDetails(value) {
 				this.$cache.setCache('orderDetails', value)
 				uni.navigateTo({
 					url: '/pages/order/orderDetails?type=details'
 				});
 			},
-			// 订单状态
+			// 运单状态
 			orderStatus(value) {
 				if (value == 1) {
 					return '已下单'
@@ -242,7 +242,7 @@
 					return '已拒收'
 				}
 			},
-			// 订单文字颜色
+			// 运单文字颜色
 			getState(value) {
 				if (value == 1) {
 					return '#9ddd54'

components/x-statistics.vue

@@ -85,7 +85,7 @@
 			this.token = token
 		},
 		methods: {
-			// 订单页面
+			// 运单页面
 			goOrder(index) {
 				let num = index
 				num = num + 1

manifest.json

@@ -2,8 +2,8 @@
     "name" : "冷链送药",
     "appid" : "__UNI__49186F9",
     "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.1.1",
+    "versionCode" : 111,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/home/index.vue

@@ -75,7 +75,7 @@
 						});
 					} else if (value.id == 'add') {
 						uni.navigateTo({
-							url: '/pages/order/addWaybill?title=添加订单&type=1'
+							url: '/pages/order/addWaybill?title=添加运单&type=1'
 						});
 					} else if (value.id == 'book') {
 						uni.navigateTo({

pages/indexRouter.vue

@@ -58,7 +58,7 @@
 					}
 				})
 			},
-			// 获取订单统计
+			// 获取运单统计
 			getHomeList() {
 				this.$api.get('/api/waybill/home').then(res => {
 					if (res.code == 200) {

pages/mine/index.vue

@@ -153,7 +153,7 @@
 					url: '/pages/login'
 				});
 			},
-			// 订单页面
+			// 运单页面
 			goOrder(index) {
 				if (this.token) {
 					uni.navigateTo({

pages/order/addWaybill.vue

@@ -207,7 +207,7 @@
 					}
 					uni.showLoading();
 					if (this.type == 1) {
-						// 添加订单
+						// 添加运单
 						this.$api.post('/api/waybill', params).then(res => {
 							if (res.code == 200) {
 								uni.redirectTo({
@@ -221,7 +221,7 @@
 							uni.hideLoading();
 						})
 					} else {
-						// 修改订单
+						// 修改运单
 						this.$api.put('/api/waybill', params).then(res => {
 							if (res.code == 200) {
 								// uni.$u.toast(res.msg)
@@ -421,7 +421,8 @@
 		width: calc(100% - 80rpx);
 		padding: 20rpx;
 		border-radius: 20rpx;
-		box-shadow: 0 2rpx 10rpx 0 rgba(0, 0, 0, .1);
+		// box-shadow: 0 2rpx 10rpx 0 rgba(0, 0, 0, .1);
+		border: 1rpx solid #e7e6e4;
 	}
 
 	.courier_name {

pages/order/delivery.vue

@@ -544,8 +544,9 @@
 		margin: 20rpx 20rpx;
 		width: calc(100% - 80rpx);
 		padding: 20rpx;
-		border-radius: 20rpx;
-		box-shadow: 0 2rpx 10rpx 0 rgba(0, 0, 0, .1);
+		border-radius: 16rpx;
+		border: 1rpx solid #e7e6e4;
+		// box-shadow: 0 2rpx 10rpx 0 rgba(0, 0, 0, .1);
 	}
 
 	.courier_name {
@@ -596,7 +597,7 @@
 	.frame::after {
 		position: absolute;
 		content: '';
-		border: 2rpx solid #e7e6e4;
+		border: 4rpx solid #e7e6e4;
 		border-radius: 16rpx;
 		width: 200%;
 		height: 200%;

pages/order/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 订单页面 -->
+	<!-- 运单页面 -->
 	<view>
 		<u-navbar title="我的运单" autoBack placeholder></u-navbar>
 		<view class="tab_order">
@@ -125,6 +125,10 @@
 				},
 			}
 		},
+		beforeDestroy() {
+			// console.log('页面销毁')
+			this.getempty()
+		},
 		onShow() {
 			let incubator = uni.getStorageSync('incubatorValue')
 			if (incubator) {
@@ -153,7 +157,21 @@
 			this.getList()
 		},
 		methods: {
-			// 获取司机和仓管订单列表
+			getempty() {
+				this.iceList = []
+				this.incubator.id = ''
+				this.incubator.name = ''
+				this.iceNumber = ''
+				uni.removeStorageSync('incubatorValue');
+				this.Pagination = 1
+				this.currentItem = ''
+				this.incubatorValue = ''
+				this.hintTitle = '请选择保温箱'
+				this.sendShow = false
+				this.incubatorMore = true
+				this.thermostatList = []
+			},
+			// 获取司机和仓管运单列表
 			getList() {
 				this.loadingMore = true;
 				this.$api.get('/api/waybill', {
@@ -222,19 +240,13 @@
 			},
 			// 确定派单
 			confirm() {
-				let boxId = null
-				this.thermostatList.forEach((item, index) => {
-					if (item.flag) {
-						boxId = item.id
-					}
-				})
-				if (boxId != null) {
+				if (this.incubator.id) {
 					if (this.iceList.length > 0) {
 						const arr = []
 						arr.push(this.waybillId)
 						this.$api.post('/api/waybill/delivery', {
 							waybillIds: arr,
-							coolerBoxId: boxId,
+							coolerBoxId: this.incubator.id,
 							iceRaftCode: this.iceList,
 						}).then(res => {
 							if (res.code == 200) {
@@ -266,7 +278,7 @@
 					this.getIncubator()
 				}
 			},
-			// tab订单
+			// tab运单
 			tabClick(row) {
 				this.currentPage = 1
 				this.orderList = []
@@ -274,18 +286,10 @@
 					this.status = row.id
 				}
 				this.getList()
+				this.getempty()
 			},
 			close() {
-				this.incubator.id = ''
-				this.incubator.name = ''
-				uni.removeStorageSync('incubatorValue');
-				this.Pagination = 1
-				this.currentItem = ''
-				this.incubatorValue = ''
-				this.hintTitle = '请选择保温箱'
-				this.sendShow = false
-				this.incubatorMore = true
-				this.thermostatList = []
+				this.getempty()
 			},
 			// 搜索保温箱
 			incubatorInput(value) {

pages/order/orderDetails.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 订单详情 -->
+	<!-- 运单详情 -->
 	<view>
 		<u-navbar title="" autoBack placeholder></u-navbar>
 		<view class="card_order_detail">
@@ -131,7 +131,7 @@
 					url: '/pages/order/humiture'
 				});
 			},
-			// 订单状态
+			// 运单状态
 			orderStatus(value) {
 				if (value == 1) {
 					return '已下单'
@@ -143,7 +143,7 @@
 					return '已拒收'
 				}
 			},
-			// 订单文字颜色
+			// 运单文字颜色
 			getState(value) {
 				if (value == 1) {
 					return '#9ddd54'