fix: 样式调整

郭伟龙
1 parent 1256c82b
Showing 9 changed files with 135 additions and 89 deletions Show diff stats
locale/en.json
locale/zh-Hans.json
mobile/pages/component/QrScan.vue
mobile/pages/component/UploadFile.vue
mobile/pages/component/topWindow.vue
mobile/pages/homePage/index.vue
mobile/pages/product/invalidCode.vue
mobile/pages/product/repairReport.vue
mobile/pages/product/scan.vue
@@ -3,24 +3,9 @@
   "locale.en": "English",
   "locale.zh-hans": "简体中文",
   "locale.zh-hant": "繁体中文",
-  "locale.ja": "日语",
-  "index.title": "Hello i18n",
-  "index.home": "Home",
-  "index.component": "Component",
-  "index.api": "API",
-  "index.schema": "Schema",
-  "index.demo": "uni-app globalization",
-  "index.demo-description": "Include uni-framework, manifest.json, pages.json, tabbar, Page, Component, API, Schema",
-  "index.detail": "Detail",
   "index.language": "Language",
   "index.language-info": "Settings",
   "index.system-language": "System language",
-  "index.application-language": "Application language",
-  "index.language-change-confirm": "Applying this setting will restart the app",
-  "api.message": "Message",
-  "schema.name": "Name",
-  "schema.add": "Add",
-  "schema.add-success": "Add success",
   "hdk.productInformation":"ProductInformation",
   "hdk.inspectionInformation":"InspectionInformation",
   "hdk.attachmentInformation":"AttachmentInformation",
@@ -31,7 +16,7 @@
   "hdk.gohome":"Click back to Home",
   "hdk.ProductInformation":"productInformation",
   "hdk.SnCode":"SNcode",
-  "hdk.ProductName":"productName",
+  "hdk.ProductName":"ProductName",
   "hdk.Model":"Model",
   "hdk.DateOfProduction":"DateOfProduction",
   "hdk.ProductionPersonnel":"ProductionPersonnel",
@@ -60,5 +45,25 @@
   "hdk.Email":"Email",
   "hdk.DetailedAddress":"DetailedAddress(e.g.**Street**)",
   "hdk.ConfirmAndReport":"ConfirmAndReport",
-  "hdk.Repair":"Repair"
+  "hdk.Repair":"Repair",
+  "hdk.noFile":"NoFiles",
+  "hdk.Check":"Check",
+  "hdk.Reminder":"WarmReminder",
+  "hdk.Confirm":"Confirm",
+  "hdk.PromptContent":"Confirm submission of this content",
+  "hdk.Cancel":"Cancel",
+  "hdk.QRCodeContent":"Two-dimensional code content",
+  "hdk.ErrorPrompt1":"The current SN code does not exist, please scan the correct QR code",
+  "hdk.ErrorPrompt2":"The current SN code format is incorrect. Please scan the correct QR code",
+  "hdk.Rescan":"Rescan",
+  "hdk.FillSNCode":"Please enter the SN code",
+  "hdk.FillProductName":"Please fill in the product name",
+  "hdk.FillName":"Please fill in the name",
+  "hdk.FillEmail":"Please fill in the correct email address",
+  "hdk.FillDescription":"Please fill in the description or upload a picture",
+  "hdk.FillAirportName":"Please fill in the airport name",
+  "hdk.Uploading":"Uploading",
+  "hdk.SuccessfullyReported":"Report successfully",
+  "hdk.CheckSN":"Check whether the SN code is correct",
+  "hdk.CheckForUnfilledItems":"Check the blanks"
 }
@@ -3,24 +3,9 @@
 	"locale.en": "English",
 	"locale.zh-hans": "简体中文",
 	"locale.zh-hant": "繁体中文",
-	"locale.ja": "日语",
-	"index.title": "Hello i18n",
-	"index.home": "主页",
-	"index.component": "组件",
-	"index.api": "API",
-	"index.schema": "Schema",
-	"index.demo": "uni-app 国际化演示",
-	"index.demo-description": "包含 uni-framework、manifest.json、pages.json、tabbar、页面、组件、API、Schema",
-	"index.detail": "详情",
 	"index.language": "语言",
 	"index.language-info": "语言信息",
 	"index.system-language": "系统语言",
-	"index.application-language": "应用语言",
-	"index.language-change-confirm": "应用此设置将重启App",
-	"api.message": "提示",
-	"schema.name": "姓名",
-	"schema.add": "新增",
-	"schema.add-success": "新增成功",
 	"hdk.productInformation":"产品信息",
 	"hdk.inspectionInformation":"检验信息",
 	"hdk.attachmentInformation":"附件信息",
@@ -54,12 +39,31 @@
 	"hdk.Basicinformation":"基本信息",
 	"hdk.ProblemDescription":"问题描述",
 	"hdk.DescriptionPlaceholder":"请将所遇问题情况和具体位置描述准确，更有利于解决。",
-	"hdk.ContactInformation":"联系方式",
 	"hdk.AirportName":"机场名",
 	"hdk.Name":"姓名",
 	"hdk.ContactInformations":"联系方式",
 	"hdk.Email":"邮箱",
 	"hdk.DetailedAddress":"详细地址（例如**街**号）",
 	"hdk.ConfirmAndReport":"确认并上报",
-	"hdk.Repair":"维护报修"
+	"hdk.Repair":"维护报修",
+	"hdk.noFile":"无文件",
+	"hdk.Check":"查看",
+	"hdk.Reminder":"温馨提示",
+	"hdk.Confirm":"确认",
+	"hdk.PromptContent":"确定提交此内容",
+	"hdk.Cancel":"取消",
+	"hdk.QRCodeContent":"二维码内容",
+	"hdk.ErrorPrompt1":"当前SN码不存在，请扫描正确的二维码",
+	"hdk.ErrorPrompt2":"当前SN码格式不正确，请扫描正确的二维码",
+	"hdk.Rescan":"重新扫描",
+	"hdk.FillSNCode":"请填写SN码",
+	"hdk.FillProductName":"请填写产品名称",
+	"hdk.FillName":"请填写名称",
+	"hdk.FillEmail":"请填写正确的邮箱",
+	"hdk.FillDescription":"请填写描述或上传图片",
+	"hdk.FillAirportName":"请填写机场名",
+	"hdk.Uploading":"上传中",
+	"hdk.SuccessfullyReported":"上报成功",
+	"hdk.CheckSN":"请检查SN码是否正确",
+	"hdk.CheckForUnfilledItems":"检查未填项"
 }
 \ No newline at end of file
@@ -50,7 +50,11 @@
 						}, {
 							fps: 10, // 设置每秒多少帧
 							aspectRatio: 1,
-							qrbox: 250 // 设置取景范围
+							qrbox: 250, // 设置取景范围
+							colorDark: '#0000ff', //加深二维码黑色部分的颜色提高识别度
+							colorLight: '#ffffff', //这个应该是提高非黑即白部分的亮度  提高识别度
+							visualFeedback: true, //开启视觉反馈  没有体会到
+							halfSample: true, //缩小二维码提高识别精度吧
 						},
 						(decodedText) => {
 							this.$emit('ok', decodedText);
@@ -81,9 +85,10 @@
 <style lang="scss" scoped>
 	.qrcode {
 		position: absolute;
-		height: 100vh;
-		width: 100vw;
-		background: rgba($color: #000000, $alpha: 0.48);
+		height: 100%;
+		width: 100%;
+		// background: rgba($color: #000000, $alpha: 0.48);
+		background:rgba(0, 0, 0, 1.48);
 	}
@@ -6,14 +6,10 @@
 				<u-icon name="/static/images/icon/excelIcon.png" size="33px" v-if="fileType == 2"></u-icon>
 				<u-icon name="/static/images/icon/csvIcon.png" size="33px" v-if="fileType == 3"></u-icon>
 				<text class="iconTitle"
-					@click="seeFile">{{downloadFileName ? downloadFileName.substring(downloadFileName.lastIndexOf('/') + 1) : '暂无文件'}}</text>
+					@click="seeFile">{{downloadFileName ? downloadFileName.substring(downloadFileName.lastIndexOf('/') + 1) : $t('hdk.noFile')}}</text>
 			</view>
-			<!-- <view class="rightText" @click="seeFile('download')" v-if="downloadFileNamePath != ''">
-        下载
-      </view> -->
 			<view class="rightText" @click="seeFile('preview')" v-if="downloadFileNamePath != ''">
-				<!-- {{isCsv?'分享':'查看'}} -->
-				查看
+				{{$t('hdk.Check')}}
 			</view>
 		</view>
 	</view>
@@ -109,6 +109,7 @@
 	}
 	.b-navbar {
+		width: 100vw;
 		background-color: #00AEAA;
 		display: flex;
 	}
@@ -12,9 +12,8 @@
 					style="background:#00AEAA;">{{$t('hdk.search')}}</b-button>
 			</view>
 			<view class="errorTipCss" v-if="isError">
-				<image src="/static/images/icon/warning.png" style="width:16px;height:16px;margin: 2px;" mode="">
-				</image>
-				{{$t('hdk.sninexistence')}}
+				<image class="errorImageCss" src="/static/images/icon/warning.png" style="width:16px;height:16px;margin: 2px;" mode="widthFix" />
+				<text>{{$t('hdk.sninexistence')}}</text>
 			</view>
 			<view class="btnSNscan" @click="scanClick" v-if="$isMobile">
 				<u-icon name="/static/images/icon/scan2.png"></u-icon>
@@ -68,7 +67,7 @@
 		},
 		methods: {
 			getFirstSnFromUrl(url) {
-				const regex = /[?&]sn=([^&#]*)/i;
+				const regex = /sn=([^&]+)/;
 				const match = url.match(regex);
 				if (match && match.length > 1) {
 					const sn = match[1];
@@ -189,10 +188,46 @@
 			color: #ffffff;
 			text-align: center;
 		}
+		
+		.tipsCss {
+			margin: 16px 0 22px 0;
+			font-size: 16px;
+			color: #ffffff;
+		}
+		
+		.errorTipCss {
+		  overflow: hidden;
+		  display: flex;
+		  align-items: flex-start;
+		  margin-top: 16px;
+		  font-size: 16px;
+		  color: red;
+		}
+		.errorImageCss{
+		  margin-top: 4px !important;
+		}
+
 	}
 	//PC端样式
 	@media screen and (min-width: 768px) {
+		
+		.tipsCss {
+			margin: 16px 0 22px 0;
+			font-size: 16px;
+			color: #ffffff;
+		}
+		
+		.errorTipCss {
+		  display: flex;
+		  align-items: center;
+		  overflow: hidden;
+		  margin-top: 16px;
+		  font-size: 16px;
+		  color: red;
+		}
+
+		
 		.inputCss {
 			width: 566px;
 			height: 44px;
@@ -226,18 +261,5 @@
 		}
 	}
-	.tipsCss {
-		margin: 16px 0 22px 0;
-		font-size: 16px;
-		color: #ffffff;
-	}
-
-	.errorTipCss {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-top: 16px;
-		font-size: 16px;
-		color: red;
-	}
+	
 </style>
 \ No newline at end of file
@@ -5,7 +5,7 @@
 			<u-image src="/static/images/icon/invalidPhoto.png" width="400rpx" height="400rpx"></u-image>
 		</view>
 		<view class="flex-column">
-			<view class="snCodeText">二维码内容:{{snCode}}</view>
+			<view class="snCodeText">{{$t('hdk.QRCodeContent')}}:{{snCode}}</view>
 			<!-- <view class="firstLine">
         当前SN码不存在
       </view>
@@ -22,7 +22,7 @@
 			</view>
 		</view>
 		<view class="rescan" @click="rescan">
-			重新扫描
+			{{$t('hdk.Rescan')}}
 		</view>
 	</view>
 </template>
@@ -39,8 +39,8 @@
 		data() {
 			return {
 				snCode: "",
-				error1: '当前SN码不存在，请扫描正确的二维码',
-				error2: '当前SN码格式不正确，请扫描正确的二维码'
+				error1: this.$t('hdk.ErrorPrompt1'),
+				error2: this.$t('hdk.ErrorPrompt2')
 			}
 		},
 		computed: {
@@ -27,7 +27,7 @@
 					<view class="title">{{$t('hdk.ProblemDescription')}}<text
 							style="color:#8B91A4;">{{$t('hdk.Required')}}</text></view>
 					<view class="textAreaCss">
-						<u-textarea v-model="modal.formInfo.repairDescribe" count maxlength="200"
+						<u-textarea :placeholderStyle="!$isMobile?'font-size:18px':''" v-model="modal.formInfo.repairDescribe" count maxlength="200"
 							:placeholder="$t('hdk.DescriptionPlaceholder')"></u-textarea>
 					</view>
 					<view class="uploadCss">
@@ -48,7 +48,7 @@
 							borderBottom ref="item4">
 							<u-input v-model="modal.formInfo.contactPersonName" border="none"></u-input>
 						</u-form-item>
-						<u-form-item :label="$t('hdk.ContactInformation')" labelWidth="50%" prop="formInfo.phone"
+						<u-form-item :label="$t('hdk.ContactInformations')" labelWidth="50%" prop="formInfo.phone"
 							borderBottom ref="item5">
 							<u-input v-model="modal.formInfo.contactPersonPhone" border="none"></u-input>
 						</u-form-item>
@@ -66,7 +66,7 @@
 			<view class="submitBtn" @click="openModal()">
 				{{$t('hdk.ConfirmAndReport')}}
 			</view>
-			<u-modal :show="confirmModal" :title="title" showCancelButton @confirm="submit()"
+			<u-modal :show="confirmModal" :title="title" :confirmText="$t('hdk.Confirm')" :cancelText="$t('hdk.Cancel')" showCancelButton @confirm="submit()"
 				@cancel="confirmModal = false">
 				<view class="slot-content">
 					<rich-text class="contentTextCss" :nodes="content"></rich-text>
@@ -116,37 +116,37 @@
 					'formInfo.sn': {
 						type: 'string',
 						required: true,
-						message: '请填写SN码',
+						message: this.$t('hdk.FillSNCode'),
 						trigger: ['blur', 'change']
 					},
 					'formInfo.productName': {
 						type: 'string',
 						required: true,
-						message: '请填写产品名称',
+						message: this.$t('hdk.FillProductName'),
 						trigger: ['blur', 'change']
 					},
 					'formInfo.contactPersonName': {
 						type: 'string',
 						required: true,
-						message: '请填写名称',
+						message: this.$t('hdk.FillName'),
 						trigger: ['blur', 'change']
 					},
 					'formInfo.email': {
 						type: 'email',
 						required: true,
-						message: '请填写正确的邮箱',
+						message: this.$t('hdk.FillEmail'),
 						trigger: ['blur', 'change']
 					},
 					'formInfo.repairDescribe': {
 						type: 'string',
 						required: true,
-						message: '请填写描述或上传图片/视频',
+						message: this.$t('hdk.FillDescription'),
 						trigger: ['blur', 'change']
 					},
 					'formInfo.airportName': {
 						type: 'string',
 						required: true,
-						message: '请填写机场名',
+						message: this.$t('hdk.FillAirportName'),
 						trigger: ['blur', 'change']
 					},
 				},
@@ -180,7 +180,7 @@
 					data.fileList.push({
 						...item,
 						status: 'uploading',
-						message: '上传中'
+						message: this.$t('hdk.Uploading')
 					})
 				})
 				for (let i = 0; i < lists.length; i++) {
@@ -202,16 +202,14 @@
 				// return;
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: config.baseUrl + '/upload-file', // 仅为示例，非真实的接口地址
+						url: config.baseUrl + '/upload-file', 
 						header: {
 							'tenant-id': '1',
-							'Content-Type': 'multipart/form-data'
+							// 'Content-Type': 'multipart/form-data;'
 						},
 						filePath: url,
 						name: "file",
-						// formData: {
-						//   user: 'test'
-						// },
+						
 						success: (res) => {
 							console.log(res);
 							let data = JSON.parse(res.data);
@@ -228,8 +226,8 @@
 				})
 			},
 			openModal() {
-				this.title = "温馨提示";
-				this.content = "确认提交此内容";
+				this.title = this.$t('hdk.Reminder');
+				this.content = this.$t('hdk.PromptContent');
 				this.confirmModal = true
 			},
 			submit() {
@@ -243,7 +241,7 @@
 							if (res.code === 0) {
 								this.$refs.uToast.show({
 									type: 'success',
-									message: "上报成功",
+									message: this.$t('hdk.SuccessfullyReported'),
 									iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png',
 									complete() {
 										uni.navigateBack(1)
@@ -253,7 +251,7 @@
 								this.$refs.uToast.show({
 									type: 'error',
 									icon: false,
-									message: "请检查SN码是否正确",
+									message: this.$t('hdk.CheckSN'),
 									iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
 								})
 							}
@@ -262,7 +260,7 @@
 						this.$refs.uToast.show({
 							type: 'error',
 							icon: false,
-							message: "请填写描述或上传图片/视频",
+							message: this.$t('hdk.FillDescription'),
 							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
 						})
 					}
@@ -270,7 +268,7 @@
 					this.$refs.uToast.show({
 						type: 'error',
 						icon: false,
-						message: "检查未填项",
+						message: this.$t('hdk.CheckForUnfilledItems'),
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
 					})
 					console.log(errors);
@@ -388,6 +386,18 @@
 			width: 80%;
 			position: relative;
 		}
+		
+		/deep/.uni-textarea-textarea{
+			font-size: 18px;
+		}
+			
+		/deep/.uni-input-input{
+			font-size: 20px !important;
+		}
+		
+		/deep/.u-form-item__body__right__message{
+			font-size: 18px;
+		}
 		/deep/.u-form-item__body__left__content__label {
 			font-size: 22px;
@@ -44,7 +44,7 @@
 			if (browser.versions.webKit || browser.versions.weixin || browser.versions.gecko) {
 				this.open = true;
 			} else {
-				Toast('该浏览器不支持，请打开主流浏览器：谷歌、火狐，或微信内打开');
+				Toast('Browser not supported');
 			}
 		},
 		onLoad() {
@@ -54,7 +54,10 @@
 			getResult(sn) {
 				console.log(sn);
 				this.open = false;
-				let sncode = sn.substring(sn.lastIndexOf(":") + 1);
+				const regex = /sn=([^&]+)/;
+				const match = regex.exec(sn);
+				const sncode = match ? match[1] : sn;
+				// let sncode = sn.substring(sn.lastIndexOf(":") + 1);
 				getProductFind(sncode).then(res => {
 					console.log(res);
 					if (res.code === 1400001001) {
	@@ -109,6 +109,7 @@		@@ -109,6 +109,7 @@
109	}	109	}
110		110
111	.b-navbar {	111	.b-navbar {
		112	+ width: 100vw;
112	background-color: #00AEAA;	113	background-color: #00AEAA;
113	display: flex;	114	display: flex;
114	}	115	}