From 3bdac82e0066f97307fc6a7177cecdf89a5ba7e1 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期四, 07 四月 2022 09:23:39 +0800
Subject: [PATCH] #

---
 pages/basics/comb.vue |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/pages/basics/comb.vue b/pages/basics/comb.vue
index 5134fac..319f7d1 100644
--- a/pages/basics/comb.vue
+++ b/pages/basics/comb.vue
@@ -12,7 +12,7 @@
 			<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
 				<uni-tr>
 					<uni-th width="50">鏁伴噺</uni-th>
-					<uni-th width="100">浜у搧浠e彿</uni-th>
+					<uni-th width="100">浜у搧ID</uni-th>
 					<uni-th width="100">浜у搧鍚嶇О</uni-th>
 				</uni-tr>
 				<uni-tr v-for="(item, index) in matData" :key="index" @input="tabRender()">
@@ -23,10 +23,16 @@
 			</uni-table>
 			
 		</view>
-		<view>
-			<button class="cu-btn bg-yellow pda-btn" @click="comb()">缁勬墭</button>
-			<button class="cu-btn bg-grey pda-btn" @click="reset">閲嶇疆</button>
+		<view style="height: 200rpx;">
+			 <!-- 绌虹櫧灞� -->
 		</view>
+		<view class="cu-bar foot">
+			<view class="flex solid-bottom padding justify-start">
+				<button class="cu-btn bg-yellow lg margin-xs" style="width: 250rpx;" @click="comb()">缁� 鎵�</button>
+				<button class="cu-btn bg-grey lg margin-xs" @click="reset">閲� 缃�</button>
+			</view>
+		</view>
+		
 		<view>
 			<!-- 鏅�氬脊绐� -->
 			<uni-popup ref="popup" background-color="#fff" style="width: 500rpx;">
@@ -113,24 +119,22 @@
 			// 鏍规嵁浜у搧浠e彿鏌ヨ浜у搧璇︽儏
 			find(){
 				let that = this
-				console.log(that.matNo)
 				let thatId = that.matNo
 				if(that.matNo.length===0){
-					console.log(1)
 					return;
 				}
 				uni.request({
-					url:that.baseUrl+"/matCode/auth",
+					url: that.baseHttp + that.baseIP + that.baseUrl + "/matCode/auth",
+					
 					header:{
 						'content-type':'application/x-www-form-urlencoded',
-						'token':localStorage.getItem('token'),	
-					},
+						'token':uni.getStorageSync('token')
+						},
 					data:{
 						id:thatId
 					},
 					method:'POST',
 					success:function(res){
-						console.log(res)
 						let data = res.data.data
 						
 						if(res.data.code === 200){
@@ -156,20 +160,17 @@
 					matName:that.matName,
 					count:that.count
 				}
-				that.addTbaleData(data)
+				that.addTableData(data)
 				
 			},
 			// 娣诲姞琛ㄦ牸鏁版嵁
-			addTbaleData(data){
-				console.log(data.matName)
+			addTableData(data){
 				if(data.matName===''){
-					
 					this.messageToggle('error')
 					return
 				}
 				
 				this.$refs.popup.close()
-				console.log(this.matData.length)
 				for(var i=0;i<this.matData.length;i++){	
 					if(data.matNo === this.matData[i].matNo){
 						this.matData[i].count = Number(this.matData[i].count) + Number(data.count);
@@ -202,7 +203,6 @@
 				let that = this
 				let barcode = that.code
 				if(barcode.length === 0){
-					console.log(1)
 					that.messageToggle('error')
 					that.messageText = '鎵樼洏鏉$爜涓虹┖'
 					return;
@@ -219,15 +219,23 @@
 				}
 				uni.request({
 					
-					url:that.baseUrl+"/mobile/comb/auth",
-					header:{'token':localStorage.getItem('token')},
+					url: that.baseHttp + that.baseIP + that.baseUrl + "/mobile/comb/auth",
+					header:{
+						// #ifdef H5
+						'token':uni.getStorageSync('token')
+						// #endif
+						
+						// #ifdef APP-PLUS
+						'token': uni.getStorageSync('token')
+						// Authorization:uni.getStorageSync('token')
+						// #endif
+						},
 					data:{
 						barcode:barcode,
 						combMats:that.matData
 					},
 					method:'POST',
 					success:function(res){
-						console.log(res)
 						if(res.data.code===200){
 							that.reset()
 							that.messageToggle('success')

--
Gitblit v1.9.1