From ef2eeb98929c5fa7ba3bc0e5962db89ade377f70 Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Wed, 27 Sep 2023 14:23:00 +0800
Subject: [PATCH] fix: logo图更换高清 响应式按钮大小过渡调整 产品信息隐藏生产人和生成时间字段 扫码增加声音和震动 切换tab调整 正则表达式更换，ios低版本不支持零宽度正向断言

---
 pages/component/InformationModule.vue |   9 +++++++--
 pages/component/InspectionModule.vue  |   2 +-
 pages/component/QrScan.vue            |  21 ++++++++++++++++++---
 pages/component/goback.vue            |  16 ++++++++++++++--
 pages/component/topWindow.vue         |  14 +++++++-------
 pages/homePage/index.vue              |   6 +++---
 pages/product/index.vue               | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 pages/product/repairReport.vue        |  80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
 pages/product/scan.vue                |  26 ++++++++++++++++++++++----
 static/hdk-top-logo.png               | Bin 1323 -> 0 bytes
 static/logo.png                       | Bin 1873 -> 0 bytes
 11 files changed, 217 insertions(+), 58 deletions(-)

diff --git a/pages/component/InformationModule.vue b/pages/component/InformationModule.vue
index 8b2bf4d..c466881 100644
--- a/pages/component/InformationModule.vue
+++ b/pages/component/InformationModule.vue
@@ -21,14 +21,15 @@
 				<text class="leftT">{{$t('hdk.Model')}}</text>
 				<text class="rightT">{{informationData.type || ""}}</text>
 			</view>
-			<view class="flex-between">
+			<!-- 不展示 -->
+			<!-- <view class="flex-between">
 				<text class="leftT">{{$t('hdk.DateOfProduction')}}</text>
 				<text class="rightT">{{$u.timeFormat(informationData.productionTime, 'yyyy-mm-dd') || ""}}</text>
 			</view>
 			<view class="flex-between">
 				<text class="leftT">{{$t('hdk.ProductionPersonnel')}}</text>
 				<text class="rightT">{{informationData.productionUserName || ""}}</text>
-			</view>
+			</view> -->
 		</view>
 		<view class="fileViewingModule">
 			<view class="title">
@@ -102,7 +103,9 @@
 		}
 
 		.swiperCss {
+			margin-top: 20px;
 			width: 95%;
+			height: 200px !important; 
 		}
 
 		.flex-between {
@@ -147,6 +150,8 @@
 
 		.swiperCss {
 			width: 80%;
+			margin-top: 20px;
+			height: 600px !important;
 		}
 
 		.flex-between {
diff --git a/pages/component/InspectionModule.vue b/pages/component/InspectionModule.vue
index 24294ac..4266e34 100644
--- a/pages/component/InspectionModule.vue
+++ b/pages/component/InspectionModule.vue
@@ -17,7 +17,7 @@
 			</view>
 			<view class="flex-between">
 				<text class="leftT">{{$t('hdk.TestDate')}}</text>
-				<text class="rightT">{{$u.timeFormat(inspectionData.checkTime, 'yyyy年mm月dd日') || ''}}</text>
+				<text class="rightT">{{$u.timeFormat(inspectionData.checkTime, 'yyyy-mm-dd') || ''}}</text>
 			</view>
 		</view>
 
diff --git a/pages/component/QrScan.vue b/pages/component/QrScan.vue
index 671c1be..b77e176 100644
--- a/pages/component/QrScan.vue
+++ b/pages/component/QrScan.vue
@@ -9,8 +9,11 @@
 	import {
 		Html5Qrcode
 	} from 'html5-qrcode';
+	const innerAudioContext = uni.createInnerAudioContext();
+	innerAudioContext.autoplay = true;
+	innerAudioContext.src = '/static/audio/scanSound.mp3';
 	export default {
-		created() {
+		mounted() {
 			this.getCameras();
 			navigator.mediaDevices.getUserMedia({
 					video: true
@@ -43,6 +46,7 @@
 					});
 			},
 			start() {
+				let that = this;
 				//environment后置 user前置
 				this.html5QrCode
 					.start({
@@ -57,13 +61,24 @@
 							halfSample: true, //缩小二维码提高识别精度吧
 						},
 						(decodedText) => {
-							this.$emit('ok', decodedText);
+							this.playAudio();
+							navigator.vibrate(500);
+							setTimeout(()=>{
+								that.$emit('ok', decodedText);
+								this.stop();
+							},500)
 						},
 					)
 					.catch((err) => {
 						this.$emit('err', err);
 					});
 			},
+			playAudio() {
+				innerAudioContext.play();
+				innerAudioContext.onPlay(() => {
+					console.log('音频开始播放');
+				});
+			},
 			stop() {
 				this.html5QrCode
 					.stop()
@@ -88,7 +103,7 @@
 		height: 100%;
 		width: 100%;
 		// background: rgba($color: #000000, $alpha: 0.48);
-		background:rgba(0, 0, 0, 1.48);
+		background: rgba(0, 0, 0, 1.48);
 	}
 
 
diff --git a/pages/component/goback.vue b/pages/component/goback.vue
index 8a8f49d..4058752 100644
--- a/pages/component/goback.vue
+++ b/pages/component/goback.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="back" @click="goback" v-if="!$isMobile">
-		<u-image src="/static/images/icon/back.png" mode="witFix" width="100px" height="100px"></u-image>
+		<u-image src="/static/images/icon/back.png" mode="witFix" class="ImageCss"></u-image>
 	</view>
 </template>
 
@@ -34,6 +34,18 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/.u-image__image{
+		width: 50px !important;
+		height: 50px !important;
+	}
+	/deep/.u-image{
+		width: 0 !important;
+		height: 0 !important;
+	}
+	.ImageCss{
+		width: 50px !important;
+		height: 50px !important;
+	}
 	.back {
 		width: 50px;
 		height: 50px;
@@ -43,7 +55,7 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		left:1%;
+		left:10px;
 		top: 10%;
 		bottom: 0;
 	}
diff --git a/pages/component/topWindow.vue b/pages/component/topWindow.vue
index 7f6fce6..976f88e 100644
--- a/pages/component/topWindow.vue
+++ b/pages/component/topWindow.vue
@@ -7,16 +7,16 @@
 			<b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 			<b-collapse id="nav-collapse" is-nav class="collapseR">
 				<b-navbar-nav>
-					<b-nav-item v-show="!isHome" @click="handleClick('productInformation')"
-						:class="{ 'activeCSS': selectedNavItem === 'productInformation' }">
+					<b-nav-item v-show="!isHome && !$isMobile" @click="handleClick(0)"
+						:class="{ 'activeCSS': selectedNavItem === 0 }">
 						{{$t('hdk.productInformation')}}
 					</b-nav-item>
-					<b-nav-item v-show="!isHome" @click="handleClick('inspectionInformation')"
-						:class="{ 'activeCSS': selectedNavItem === 'inspectionInformation' }">
+					<b-nav-item v-show="!isHome && !$isMobile" @click="handleClick(1)"
+						:class="{ 'activeCSS': selectedNavItem === 1 }">
 						{{$t('hdk.inspectionInformation')}}
 					</b-nav-item>
-					<b-nav-item v-show="!isHome" @click="handleClick('attachmentInformation')"
-						:class="{ 'activeCSS': selectedNavItem === 'attachmentInformation' }">
+					<b-nav-item v-show="!isHome && !$isMobile" @click="handleClick(2)"
+						:class="{ 'activeCSS': selectedNavItem === 2 }">
 						{{$t('hdk.attachmentInformation')}}
 					</b-nav-item>
 					<b-nav-item-dropdown :text="selectedLanguage" right>
@@ -41,7 +41,7 @@
 		data() {
 			return {
 				selectedLanguage: this.$t('index.language'),
-				selectedNavItem: 'productInformation'
+				selectedNavItem: 0
 			}
 		},
 		props: {
diff --git a/pages/homePage/index.vue b/pages/homePage/index.vue
index 939e903..321912f 100644
--- a/pages/homePage/index.vue
+++ b/pages/homePage/index.vue
@@ -110,12 +110,12 @@
 		},
 		methods: {
 			getFirstSnFromUrl(url) {
-				// const regex = /sn=([^&]+)/;
-				const regex = /((?<=\?sn=)|(?<=HDKSN:))\w+/;
+				// const regex = /((?<=\?sn=)|(?<=HDKSN:))\w+/;「零宽度正向断言」ios低版本不支持
+				const regex = /(?:\?sn=|HDKSN:)(\w+)/;
 				const match = url.match(regex);
 				console.log(match)
 				if (match && match.length > 1) {
-					const sn = match[0];
+					const sn = match[1];
 					return sn;
 				}
 				return url;
diff --git a/pages/product/index.vue b/pages/product/index.vue
index aea124d..d4a6869 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -1,21 +1,23 @@
 <template>
 	<view class="containers">
-		<topWindow :isHome="false" @item-click="handleItemClick"></topWindow>
+		<topWindow :isHome="false" @item-click="handleItemClick" @lanChange="changeLan"></topWindow>
 		<goback></goback>
+		<u-tabs :list="list" :current="current" lineColor="#00aeaa"
+			:itemStyle="{width:'200px',height:'40px',backgraound:'#000'}" @click="tabChange" v-show="$isMobile"
+			:activeStyle="activeStyle" :inactiveStyle="inactiveStyle"></u-tabs>
 		<view class="ComponentsBody">
-			<view class="productInformation" v-if="current == 'productInformation'">
+			<view class="productInformation" v-if="current == 0">
 				<InformationModule v-if="informationData != null" :informationData="informationData">
 				</InformationModule>
 			</view>
-			<view class="inspectionInformation" v-else-if="current == 'inspectionInformation'">
+			<view class="inspectionInformation" v-else-if="current == 1">
 				<InspectionModule v-if="inspectionData != null" :inspectionData="inspectionData"></InspectionModule>
 			</view>
-			<view class="attachmentInformation" v-else-if="current == 'attachmentInformation'">
+			<view class="attachmentInformation" v-else-if="current == 2">
 				<AuxiliaryModule v-if="auxiliaryData != null" :auxiliaryData="auxiliaryData"></AuxiliaryModule>
 			</view>
 			<view class="repairReportBtnCss" @click="jumpService">
-				<u-image src="/static/images/icon/repair.png" mode="witFix" :width="$isMobile?'100px':'200px'"
-					:height="$isMobile?'100px':'200px'"></u-image>
+				<image src="/static/images/icon/repair.png" class="repairReportImageCss" mode="witFix" ></u-image>
 				<text class="repairReportTextCss">{{$t("hdk.Repair")}}</text>
 			</view>
 		</view>
@@ -49,7 +51,37 @@
 				inspectionData: null,
 				auxiliaryData: null,
 				repairInformation: null,
-				current: "productInformation"
+				// current: "productInformation",
+				current: 0,
+				list: [{
+					name: this.$t('hdk.productInformation'),
+				}, {
+					name: this.$t('hdk.inspectionInformation'),
+				}, {
+					name: this.$t('hdk.attachmentInformation')
+				}],
+				inactiveStyle: {
+					width: '120rpx',
+					height: '38rpx',
+					backgroundColor: 'rgba(255, 255, 255, 0)',
+					boxSizing: 'border-box',
+					fontFamily: "苹方 中等, 苹方, sans-serif",
+					color: '#555555',
+					textAlign: 'left',
+					lineHeight: 'normal',
+					fontSize: '28rpx'
+				},
+				activeStyle: {
+					width: '128rpx',
+					height: '43rpx',
+					backgroundColor: 'rgba(255, 255, 255, 0)',
+					boxSizing: 'border-box',
+					fontFamily: "苹方 中等, 苹方, sans-serif",
+					color: '#00aeaa',
+					textAlign: 'left',
+					lineHeight: 'normal',
+					fontSize: '32rpx'
+				},
 			}
 		},
 		computed: {
@@ -63,6 +95,18 @@
 			this.initData()
 		},
 		methods: {
+			changeLan(lang) {
+				console.log("改变语言", lang);
+				this.list = [];
+				// 重新构建新的 list 数组
+				this.list = [{
+					name: this.$t('hdk.productInformation'),
+				}, {
+					name: this.$t('hdk.inspectionInformation'),
+				}, {
+					name: this.$t('hdk.attachmentInformation')
+				}];
+			},
 			initData() {
 				// uni.showLoading({title: '查询中...'})
 				getProductFind(this.sn).then(res => {
@@ -246,6 +290,16 @@
 				const pictureRegex = /\.(jpg|jpeg|png|gif)$/i;
 				return pictureRegex.test(str);
 			},
+			tabChange(item) {
+				this.current = item.index
+				if (this.current == 0) {
+					// console.log(this.informationData);
+				} else if (this.current == 1) {
+					// console.log(this.inspectionData);
+				} else {
+					// console.log(this.auxiliaryData);
+				}
+			},
 			handleItemClick(item) {
 				this.current = item;
 				console.log('点击的菜单项:', item);
@@ -263,6 +317,7 @@
 	}
 
 	.ComponentsBody {
+		margin-top: 5px;
 		// width:100%;
 		// display: flex;
 		// justify-content: center;
@@ -280,7 +335,8 @@
 	// .attachmentInformation{
 	// 	width: 100%;
 	// }
-
+	
+	//移动端样式
 	@media screen and (max-width: 767px) {
 		.repairReportBtnCss {
 			width: 100px;
@@ -295,6 +351,18 @@
 			bottom: 100px;
 			// background-color: #00aeaa;
 		}
+		
+		
+		
+		// .u-image__image{
+		// 	width: 100px !important;
+		// 	height: 100px !important;
+		// }
+		
+		.repairReportImageCss{
+			width: 100px !important;
+			height: 100px !important;
+		}
 
 		.repairReportTextCss {
 			position: absolute;
@@ -309,9 +377,8 @@
 	// //PC端样式
 	@media screen and (min-width: 768px) {
 		.repairReportBtnCss {
-			width: 100px;
-			height: 100px;
-			border-radius: 100px;
+			width: 200px;
+			height: 200px;
 			position: fixed;
 			display: flex;
 			flex-direction: column;
@@ -322,9 +389,19 @@
 			// background-color: #00aeaa;
 		}
 		
+		// .u-image__image{
+		// 	width: 200px !important;
+		// }
+		
+		
+		.repairReportImageCss{
+			width: 200px !important;
+			height: 200px !important;
+		}
+
 		.repairReportTextCss {
 			position: absolute;
-			bottom: 15px;
+			bottom: 60px;
 			color: #fff;
 		}
 
diff --git a/pages/product/repairReport.vue b/pages/product/repairReport.vue
index 79a4113..192390f 100644
--- a/pages/product/repairReport.vue
+++ b/pages/product/repairReport.vue
@@ -2,7 +2,7 @@
 	<view class="containers">
 		<topWindow @lanChange="changeLan"></topWindow>
 		<goback></goback>
-		<view class="content">
+		<view class="contents">
 			<u-form labelPosition="top" labelAlign="left" :model="modal" :rules="rules" ref="uForm"
 				:labelStyle="{fonSize:'26px',color:'#8B91A4',paddingLeft:'10px'}">
 				<view class="basicInformation">
@@ -169,16 +169,52 @@
 			}
 		},
 		methods: {
+			setRules() {
+				this.rules = {
+					'formInfo.sn': {
+						type: 'string',
+						required: true,
+						message: this.$t('hdk.FillSNCode'),
+						trigger: ['blur', 'change']
+					},
+					'formInfo.productName': {
+						type: 'string',
+						required: true,
+						message: this.$t('hdk.FillProductName'),
+						trigger: ['blur', 'change']
+					},
+					'formInfo.contactPersonName': {
+						type: 'string',
+						required: true,
+						message: this.$t('hdk.FillName'),
+						trigger: ['blur', 'change']
+					},
+					'formInfo.email': {
+						type: 'email',
+						required: true,
+						message: this.$t('hdk.FillEmail'),
+						trigger: ['blur', 'change']
+					},
+					'formInfo.repairDescribe': {
+						type: 'string',
+						required: true,
+						message: this.$t('hdk.FillDescription'),
+						trigger: ['blur', 'change']
+					},
+					'formInfo.airportName': {
+						type: 'string',
+						required: true,
+						message: this.$t('hdk.FillAirportName'),
+						trigger: ['blur', 'change']
+					},
+				}
+			},
 			changeLan(locale) {
 				console.log("切换语言,重新触发提示语", locale);
 				// 清除校验状态
 				this.$refs.uForm.clearValidate();
 				// 重新校验
-				this.$forceUpdate()
-				this.$nextTick(() => {
-					this.$refs.uForm.validate();
-				});
-				
+				this.setRules();
 			},
 			deletePic(event) {
 				this.fileList.splice(event.index, 1)
@@ -350,7 +386,7 @@
 			text-align: left;
 		}
 
-		.content {
+		.contents {
 			width: 100%;
 		}
 
@@ -374,20 +410,19 @@
 		}
 
 		.submitBtn {
-			width: 350px;
+			width: 90%;
 			height: 40px;
-			padding: 2px;
-			margin: 24px;
+			margin: 20px 24px;
 			position: fixed;
-			bottom: 0px;
+			bottom: 0;
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			border-radius: 8px;
 			background-color: #00aeaa;
 			box-sizing: border-box;
-			font-family: '苹方 中等', '苹方', sans-serif;
-			color: #ffffff;
+			font-family: 苹方 中等, 苹方, sans-serif;
+			color: #fff;
 			text-align: center;
 			line-height: normal;
 			z-index: 999;
@@ -417,7 +452,7 @@
 			color: #999999;
 		}
 
-		.content {
+		.contents {
 			width: 80%;
 			position: relative;
 		}
@@ -463,22 +498,19 @@
 		}
 
 		.submitBtn {
-			width: 500px;
-			height: 39px;
-			padding: 2px;
+			width: 80%;
+			height: 40px;
+			margin: 20px 24px;
 			position: fixed;
-			left: 0;
-			right: 0;
-			bottom: 30px;
-			margin: 0 auto;
+			bottom: 0;
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			border-radius: 4px;
+			border-radius: 8px;
 			background-color: #00aeaa;
 			box-sizing: border-box;
-			font-family: '苹方 中等', '苹方', sans-serif;
-			color: #ffffff;
+			font-family: 苹方 中等, 苹方, sans-serif;
+			color: #fff;
 			text-align: center;
 			line-height: normal;
 			z-index: 999;
diff --git a/pages/product/scan.vue b/pages/product/scan.vue
index d425b79..f0e6962 100644
--- a/pages/product/scan.vue
+++ b/pages/product/scan.vue
@@ -40,6 +40,9 @@
 		computed: {
 
 		},
+		onShow() {
+			this.open = true
+		},
 		mounted() {
 			if (browser.versions.webKit || browser.versions.weixin || browser.versions.gecko) {
 				this.open = true;
@@ -51,25 +54,40 @@
 
 		},
 		methods: {
+			playAudio() {
+				const innerAudioContext = uni.createInnerAudioContext();
+				innerAudioContext.autoplay = true;
+				innerAudioContext.src = '/static/audio/scanSound.mp3';
+				innerAudioContext.play();
+				innerAudioContext.onPlay(() => {
+					alert('音频开始播放')
+					console.log('音频开始播放');
+				});
+			},
 			getResult(sn) {
 				console.log(sn);
+				// this.playAudio()
 				this.open = false;
-				const regex = /((?<=\?sn=)|(?<=HDKSN:))\w+/;
+				// const regex = /((?<=\?sn=)|(?<=HDKSN:))\w+/;「零宽度正向断言」ios低版本不支持
+				const regex = /(?:\?sn=|HDKSN:)(\w+)/;
 				const match = regex.exec(sn);
-				const sncode = match ? match[0] : 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) {
 						uni.navigateTo({
-							url: '/pages/product/invalidCode?snCode='+sncode,
+							url: '/pages/product/invalidCode?snCode=' + sncode,
 							success() {
 								this.open = true
 							}
 						});
 					} else {
 						uni.navigateTo({
-							url: "/pages/product/index?sn=" + sncode
+							url: "/pages/product/index?sn=" + sncode,
+							success() {
+								this.open = true
+							}
 						})
 					}
 				})
diff --git a/static/hdk-top-logo.png b/static/hdk-top-logo.png
index cd5499a..db1e432 100644
Binary files a/static/hdk-top-logo.png and b/static/hdk-top-logo.png differ
diff --git a/static/logo.png b/static/logo.png
index 1c7a08e..11c936a 100644
Binary files a/static/logo.png and b/static/logo.png differ
--
libgit2 0.21.2