From 24db75ff3d25124eb911fbcbbf90b716c1a3c452 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 17:01:04 +0800
Subject: [PATCH] #

---
 pages/order/orderComb.vue |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 5e31319..8677d24 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -52,14 +52,14 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
-					<view class="list-left-item">
+					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
 						<view class="left-item">
 							<uni-tag :text="item.weight" type="warning"></uni-tag>
 						</view>
-					</view>
+					</view> -->
 					<view class="list-left-item">
-						<view class="desc">鏁伴噺锛�</view>
+						<view class="desc">鍓╀綑鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
 					</view>
 				</view>
@@ -72,7 +72,7 @@
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
 			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="combConfirm('warn')">涓婃灦</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
 		</view>
 		<!-- 寮圭獥 -->
 		<!-- 淇敼鏁伴噺 -->
@@ -220,6 +220,9 @@
 				let that = this
 				uni.request({
 					url: this.baseUrl + '/order/list/all',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
 					method: 'POST',
 					success(res) {
 						res = res.data
@@ -386,6 +389,7 @@
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
+						orderNo: that.orderNo,
 						barcode: that.barcode,
 						combMats: that.dataList
 					}),
@@ -478,6 +482,7 @@
 			resst() {
 				this.dataList = []
 				this.barcode = ''
+				this.orderNo = ''
 				this.barcodeFocuss()
 			},
 			combClose() {

--
Gitblit v1.9.1