From bfcfe9e8227ff2d0d2f54345ca72043b1522f056 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期六, 23 四月 2022 09:04:54 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |   52 +++++-----------------------------------------------
 1 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 9a1e612..b5772b1 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -12,7 +12,6 @@
 						<uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeBarcode()"></uni-icons>
 					</view>
 				</view>
-				<button class="cu-btn bg-blue" @click="scan">鎵爜</button>
 			</view>
 			<view class="pak-seach-box">
 				<view class="box-top">
@@ -52,10 +51,10 @@
 		</scroll-view>
 		<view class="footer flex justify-around">
 			<view>
-				<button class="cu-btn" @click="resst()">閲嶇疆</button>
+				<button class="cu-btn lg" @click="resst()">閲嶇疆</button>
 			</view>
 			<view>
-				<button class="cu-btn pakin-btn bg-blue" @click="comb()">缁勬墭</button>
+				<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">缁勬墭</button>
 			</view>
 		</view>
 	</view>
@@ -72,7 +71,6 @@
 				pick:'hide',
 				matnr:'',
 				matList:[],
-				man:'',
 				result: ''
 			}
 		},
@@ -83,46 +81,6 @@
 			this.basePORT = UPORT
 		},
 		methods: {
-			async scan() {
-				// #ifdef APP-PLUS
-				let status = await this.checkPermission();
-				if (status !== 1) {
-				    return;
-				}
-				// #endif
-				uni.scanCode({
-					success: (res) => {
-						this.matnr = res.result
-						this.findMat(this.matnr)
-					},
-					fail: (err) => {
-						// 闇�瑕佹敞鎰忕殑鏄皬绋嬪簭鎵爜涓嶉渶瑕佺敵璇风浉鏈烘潈闄�
-					}
-				});
-			}
-			// #ifdef APP-PLUS
-			,
-			async checkPermission(code) {
-				let status = permision.isIOS ? await permision.requestIOS('camera') :
-					await permision.requestAndroid('android.permission.CAMERA');
-			
-				if (status === null || status === 1) {
-					status = 1;
-				} else {
-					uni.showModal({
-						content: "闇�瑕佺浉鏈烘潈闄�",
-						confirmText: "璁剧疆",
-						success: function(res) {
-							if (res.confirm) {
-								permision.gotoAppSetting();
-							}
-						}
-					})
-				}
-				return status;
-			}
-			// #endif
-			,
 			resst() {
 				this.matList = []
 				this.barcode = ''
@@ -309,7 +267,7 @@
 	.box-buttom {
 		display: inline-block;
 		background-color: #ededed;
-		width: 70%;
+		width: 65%;
 		height: 60rpx;
 		border-radius: 20rpx;
 		margin: 15rpx 15rpx 0rpx 15rpx;
@@ -343,7 +301,7 @@
 		color: #ffffff;
 		display: inline-block;
 		float: right;
-		width: 150rpx;
+		width: 180rpx;
 		height: 60rpx;
 		margin: 15rpx 15rpx 0rpx 15rpx;
 		line-height: 60rpx;
@@ -406,4 +364,4 @@
 		line-height: 180rpx;
 		margin-right: 10%;
 	}
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.1