From b1cb070ce6ca878386bf54b52e24886aa98c5f2c Mon Sep 17 00:00:00 2001
From: "juncheng.li" <juncheng.li@ccwin-in.com>
Date: Fri, 7 Apr 2023 11:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/common/new_style.css                  | 13 +++++++++----
 fe/PDA/common/pdabasic.css                   |  2 +-
 fe/PDA/mycomponents/wincom/winComScan.vue    |  4 ++--
 fe/PDA/mycomponents/wincom/winScanByCode.vue | 12 ++++++------
 fe/PDA/mycomponents/wincom/winScanByPack.vue |  6 +++---
 fe/PDA/pages/login/index.vue                 |  2 +-
 fe/PDA/static/config.json                    |  6 +++---
 7 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/fe/PDA/common/new_style.css b/fe/PDA/common/new_style.css
index fb452bccc..de46b58d0 100644
--- a/fe/PDA/common/new_style.css
+++ b/fe/PDA/common/new_style.css
@@ -405,16 +405,20 @@ uni-page-head .uni-page-head__title {
 }
 
 .popup_box .pop_title {
-	font-size: 1rem;
+	font-size: 0.9rem;
 	font-weight: bold;
 	color: #fff;
-	padding: 30rpx 20rpx;
+	padding: 15rpx 20rpx 5rpx 20rpx;
+	align-items: center;
+	 /* position: absolute; */
+	 /* transform: translateY(-50%); */
+	
 }
 
 .popup_box .pop_title text {
 	font-size: .825rem;
 	font-weight: normal;
-	margin-top: 10rpx;
+	margin-top: 5rpx;
 }
 
 .popup_box .uni-steps {
@@ -455,6 +459,7 @@ uni-page-head .uni-page-head__title {
 	position: relative;
 	margin-bottom: 20rpx;
 	background-color: #fff;
+	border-top-left-radius: 8rpx;
 	border-top-right-radius: 8rpx;
 	border-bottom-left-radius: 8rpx;
 	border-bottom-right-radius: 8rpx;
@@ -505,7 +510,7 @@ uni-page-head .uni-page-head__title {
 }
 
 .popup_box .pop_tab .tab_info textarea {
-	padding-top: 20rpx;
+	padding-top: 10rpx;
 }
 
 .list_wrap {
diff --git a/fe/PDA/common/pdabasic.css b/fe/PDA/common/pdabasic.css
index 491c9481c..1f6f6861c 100644
--- a/fe/PDA/common/pdabasic.css
+++ b/fe/PDA/common/pdabasic.css
@@ -600,7 +600,7 @@ export function getItemTypeStyle(val) {
 } */
 
 .conbox {
-	padding: 10rpx 0;
+	/* padding: 10rpx 0; */
 }
 
 .myinput {
diff --git a/fe/PDA/mycomponents/wincom/winComScan.vue b/fe/PDA/mycomponents/wincom/winComScan.vue
index 0f1929357..6bc0d6c54 100644
--- a/fe/PDA/mycomponents/wincom/winComScan.vue
+++ b/fe/PDA/mycomponents/wincom/winComScan.vue
@@ -2,8 +2,8 @@
 <template>
 	<page-meta root-font-size="18px"></page-meta>
 	<view>
-		<view class="conbox">
-			<textarea v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;" :focus="boxfocus"
+		<view class="conbox" >
+			<textarea  v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 100%;" :focus="boxfocus"
 				:placeholder="placeholderValue" :auto-focus='true' @keydown.enter="handelScanMsg" @focus="getfocus"
 				@blur="losefocus"></textarea>
 			<!-- <input v-model="scanMsg" type="search" @keydown.enter="doSearch" style="{height:100px}"/> -->
diff --git a/fe/PDA/mycomponents/wincom/winScanByCode.vue b/fe/PDA/mycomponents/wincom/winScanByCode.vue
index a822953af..b23d4444a 100644
--- a/fe/PDA/mycomponents/wincom/winScanByCode.vue
+++ b/fe/PDA/mycomponents/wincom/winScanByCode.vue
@@ -1,14 +1,14 @@
 <template>
 	<uni-popup ref="popup" @change="change">
 		<view class="popup_box">
-			<view class="pop_title">
-				扫描信息
+			<view class="pop_title" >
+				扫描{{title}}
 				<text class="fr" @click="closeScanPopup()">关闭</text>
 			</view>
-			<view class="pop_tab">
-				<view class="uni-flex uni-row">
-					<view class="tab_tit tab_tit_active">{{title}}</view>
-				</view>
+			<view class="pop_tab" >
+			<!-- 	<view class="uni-flex uni-row">
+					<view class="tab_tit tab_tit_active">扫描{{title}}</view>
+				</view> -->
 				<view class="tab_info">
 					<win-com-scan ref="scan" @getScanResult="getScanResult" :placeholder='title' :clearResult="false">
 					</win-com-scan>
diff --git a/fe/PDA/mycomponents/wincom/winScanByPack.vue b/fe/PDA/mycomponents/wincom/winScanByPack.vue
index e4c49bf6e..df05c4010 100644
--- a/fe/PDA/mycomponents/wincom/winScanByPack.vue
+++ b/fe/PDA/mycomponents/wincom/winScanByPack.vue
@@ -3,13 +3,13 @@
 		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
 			<view class="popup_box">
 				<view class="pop_title">
-					扫描信息
+					扫描箱标签
 					<text class="fr" @click="closeScanPopup()">关闭</text>
 				</view>
 				<view class="pop_tab">
-					<view class="uni-flex uni-row">
+					<!-- <view class="uni-flex uni-row">
 						<view class="tab_tit tab_tit_active">箱标签</view>
-					</view>
+					</view> -->
 					<view class="tab_info">
 						<win-com-scan ref="comscan" @getScanResult="getScanResult" placeholder="箱标签"
 							:clearResult="true"></win-com-scan>
diff --git a/fe/PDA/pages/login/index.vue b/fe/PDA/pages/login/index.vue
index e705e7ae8..cdd59f6ad 100644
--- a/fe/PDA/pages/login/index.vue
+++ b/fe/PDA/pages/login/index.vue
@@ -90,7 +90,7 @@
 			uni.clearStorage(); //清除缓存
 			if (process.env.NODE_ENV === 'development') {
 				this.username = "admin"
-				this.password = "1234qwer!@#$QWER";
+				this.password = "1q2w3E*";
 			}
 			uni.setNavigationBarColor({
 				frontColor: '#ffffff',
diff --git a/fe/PDA/static/config.json b/fe/PDA/static/config.json
index 47e122b4f..d9e2df70e 100644
--- a/fe/PDA/static/config.json
+++ b/fe/PDA/static/config.json
@@ -8,7 +8,7 @@
 		},
 		{
 			"name": "服务地址",
-			"value": "http://dev.ccwin-in.com:60086"
+			"value": "http://dev.ccwin-in.com:21296"
 		},
 		{
 			"name": "原料报废扫描库位",
@@ -25,9 +25,9 @@
 		"warehouseCode": "T8",
 		"putawayLocationTypes": "1,2,3,4",
 		"putawayInventoryStatus": "2",
-		"dev": "http://dev.ccwin-in.com:60086",
+		"dev": "http://dev.ccwin-in.com:21296",
 		"print_url": "http://dev.ccwin-in.com:59095",
-		"version_update_url": "http://dev.ccwin-in.com:60071",
+		"version_update_url": "http://dev.ccwin-in.com:59081",
 		"isScrapScanToLocation": false,
 		"isReceiptToday": true,
 		"scrapReason": "ScrapReason",