From 9f15199ffb3de977720759623ae47309e6bcc8f0 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 22 六月 2022 10:48:57 +0800
Subject: [PATCH] #

---
 pages/basics/comb.vue |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pages/basics/comb.vue b/pages/basics/comb.vue
index fd35c02..319f7d1 100644
--- a/pages/basics/comb.vue
+++ b/pages/basics/comb.vue
@@ -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;">
@@ -118,11 +124,12 @@
 					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
 					},
@@ -196,7 +203,6 @@
 				let that = this
 				let barcode = that.code
 				if(barcode.length === 0){
-					console.log(1)
 					that.messageToggle('error')
 					that.messageText = '鎵樼洏鏉$爜涓虹┖'
 					return;
@@ -213,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