From ba37a90e19a9c606fb3f26563b8d8e6222374740 Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Fri, 22 Sep 2023 17:51:21 +0800
Subject: [PATCH] feat: 样式调整

---
 .hbuilderx/launch.json                       |  11 +++++++++--
 locale/en.json                               |  86 +++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------
 locale/zh-Hans.json                          |  14 +++++++++-----
 main.js                                      |   3 ++-
 manifest.json                                |   4 ++--
 mobile/pages/component/AuxiliaryModule.vue   |   2 +-
 mobile/pages/component/InformationModule.vue |   2 +-
 mobile/pages/component/InspectionModule.vue  |   3 +--
 mobile/pages/component/topWindow.vue         |   2 +-
 mobile/pages/homePage/index.vue              |   6 +++---
 mobile/pages/product/index.vue               |  12 ++++++------
 mobile/pages/product/invalidCode.vue         |   4 ++--
 mobile/pages/product/repairReport.vue        |  97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
 mobile/pages/product/scan.vue                |   8 ++++----
 pages.json                                   |  22 +++++++++++-----------
 pages/api/api.vue                            |  27 +++++++++++++++++++++++++++
 pages/component/AuxiliaryModule.vue          | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/component/InformationModule.vue        | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/component/InspectionModule.vue         | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/component/QrScan.vue                   | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/component/UploadFile.vue               | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/component/component.vue                |  22 ++++++++++++++++++++++
 pages/component/goback.vue                   |  50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/component/topWindow.vue                | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/homePage/index.vue                     | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/product/index.vue                      | 332 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/product/invalidCode.vue                | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/product/repairReport.vue               | 467 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/product/scan.vue                       |  89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 postcss.config.js                            |   2 +-
 30 files changed, 2603 insertions(+), 119 deletions(-)
 create mode 100644 pages/api/api.vue
 create mode 100644 pages/component/AuxiliaryModule.vue
 create mode 100644 pages/component/InformationModule.vue
 create mode 100644 pages/component/InspectionModule.vue
 create mode 100644 pages/component/QrScan.vue
 create mode 100644 pages/component/UploadFile.vue
 create mode 100644 pages/component/component.vue
 create mode 100644 pages/component/goback.vue
 create mode 100644 pages/component/topWindow.vue
 create mode 100644 pages/homePage/index.vue
 create mode 100644 pages/product/index.vue
 create mode 100644 pages/product/invalidCode.vue
 create mode 100644 pages/product/repairReport.vue
 create mode 100644 pages/product/scan.vue

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 665a73c..4576c2e 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,8 +2,15 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "openVueDevtools" : true,
+            "openVueDevtools" : false,
             "type" : "uni-app:h5"
-        }
+        },
+	{
+		"mp-weixin" : 
+		{
+			"launchtype" : "local"
+		},
+		"type" : "uniCloud"
+	}
     ]
 }
diff --git a/locale/en.json b/locale/en.json
index 1abf135..cc9e048 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -6,64 +6,68 @@
   "index.language": "Language",
   "index.language-info": "Settings",
   "index.system-language": "System language",
-  "hdk.productInformation":"ProductInformation",
-  "hdk.inspectionInformation":"InspectionInformation",
-  "hdk.attachmentInformation":"AttachmentInformation",
-  "hdk.placeholder":"Please enter the SN code on the product",
-  "hdk.tips":"Please enter the SN code to query the product",
-  "hdk.sninexistence":"The SN code does not exist. Please enter the correct SN code",
+  "hdk.productInformation":"Products",
+  "hdk.inspectionInformation":"Inspections",
+  "hdk.attachmentInformation":"Accesories",
+  "hdk.placeholder":"SN Code",
+  "hdk.tips":"Search by SN Code",
+  "hdk.sninexistence":"The SN code does not exist, please enter the correct SN code!",
   "hdk.search":"Search",
-  "hdk.gohome":"Click back to Home",
-  "hdk.ProductInformation":"productInformation",
-  "hdk.SnCode":"SNcode",
-  "hdk.ProductName":"ProductName",
+  "hdk.gohome":"Back to Home Page",
+  "hdk.ProductInformation":"Products",
+  "hdk.SnCode":"SN Code",
+  "hdk.ProductName":"Product Name",
   "hdk.Model":"Model",
-  "hdk.DateOfProduction":"DateOfProduction",
-  "hdk.ProductionPersonnel":"ProductionPersonnel",
-  "hdk.ProductSpecification":"ProductSpecification",
-  "hdk.ProductManual":"ProductManual",
-  "hdk.InspectionInformation":"InspectionInformation",
-  "hdk.SoftwareVersion":"SoftwareVersion",
-  "hdk.HardwareVersion":"HardwareVersion",
-  "hdk.TestDate":"TestDate",
-  "hdk.ElectricalParameters":"ElectricalParameters",
+  "hdk.DateOfProduction":"Production Date",
+  "hdk.ProductionPersonnel":"Production Personnel",
+  "hdk.ProductSpecification":"Data Sheet",
+  "hdk.ProductManual":"User Manual",
+  "hdk.InspectionInformation":"Inspections",
+  "hdk.SoftwareVersion":"Software Version",
+  "hdk.HardwareVersion":"Hardware Version",
+  "hdk.TestDate":"Inspection Date",
+  "hdk.ElectricalParameters":"Electric Spec",
   "hdk.Power":"Power",
-  "hdk.PowerFactor":"PowerFactor",
-  "hdk.LightIntensityDistribution":"LightIntensityDistribution",
-  "hdk.AirTightnessInspectionDocuments":"AirTightnessInspectionDocuments",
-  "hdk.AttachmentModel":"AttachmentModel",
-  "hdk.OrderCode":"OrderCode",
-  "hdk.AttachmentIsEmpty":"AttachmentIsEmpty",
-  "hdk.scan":"scan",
-  "hdk.Required":"(Required)",
-  "hdk.Basicinformation":"BasicInformation",
-  "hdk.ProblemDescription":"ProblemDescription",
-  "hdk.DescriptionPlaceholder":"Please describe the situation and location of the problem accurately, which is more conducive to solution",
-  "hdk.AirportName":"AirportName",
+  "hdk.PowerFactor":"Power Factor",
+  "hdk.LightIntensityDistribution":"Light Intensity Distribution",
+  "hdk.AirTightnessInspectionDocuments":"Airtightness Inspection Files",
+  "hdk.AttachmentModel":"Model of Accessories",
+  "hdk.OrderCode":"Order code",
+  "hdk.AttachmentIsEmpty":"No Attachment",
+  "hdk.scan":"Scan",
+  "hdk.Required":"(Mandatory)",
+  "hdk.Basicinformation":"Basic Information",
+  "hdk.ProblemDescription":"Description of Questions",
+  "hdk.DescriptionPlaceholder":"Please describe the circumstance and location of the problem accurately, which is more conducive to solution",
+  "hdk.AirportName":"Airport",
   "hdk.Name":"Name",
-  "hdk.ContactInformations":"ContactInformation",
+  "hdk.ContactInformation":"Contact",
   "hdk.Email":"Email",
-  "hdk.DetailedAddress":"DetailedAddress(e.g.**Street**)",
-  "hdk.ConfirmAndReport":"ConfirmAndReport",
+  "hdk.DetailedAddress":"Detailed Address ( No.xxx，xxx Street）",
+  "hdk.ConfirmAndReport":"Confirm & Report",
   "hdk.Repair":"Repair",
-  "hdk.noFile":"NoFiles",
+  "hdk.noFile":"No Files",
   "hdk.Check":"Check",
-  "hdk.Reminder":"WarmReminder",
+  "hdk.Reminder":"Friendly Tips",
   "hdk.Confirm":"Confirm",
-  "hdk.PromptContent":"Confirm submission of this content",
+  "hdk.PromptContent":"Are you sure to submit this content?",
   "hdk.Cancel":"Cancel",
-  "hdk.QRCodeContent":"Two-dimensional code content",
+  "hdk.QRCodeContent":"Content of QR Code",
   "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.FillSNCode":"Please enter 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.FillEmail":"Please fill in the correct email ",
   "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"
+  "hdk.CheckForUnfilledItems":"Check the blanks",
+  "hdk.networkError":"Network Error",
+  "hdk.fileNotUploaded":"Unuploaded File",
+  "hdk.loading":"loading",
+  "hdk.incorrectImportFormat":"Incorrect import format"
 }
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index a24b8e7..9fb2ff5 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -16,7 +16,7 @@
 	"hdk.gohome":"点击回到主页",
 	"hdk.ProductInformation":"产品信息",
 	"hdk.SnCode":"SN码",
-	"hdk.ProductName":"产品名",
+	"hdk.ProductName":"产品名称",
 	"hdk.Model":"型号",
 	"hdk.DateOfProduction":"出厂日期",
 	"hdk.ProductionPersonnel":"生产人员",
@@ -31,7 +31,7 @@
 	"hdk.PowerFactor":"功率因数",
 	"hdk.LightIntensityDistribution":"光强分布",
 	"hdk.AirTightnessInspectionDocuments":"气密检测文件",
-	"hdk.AttachmentModel":"附件型号",
+	"hdk.AttachmentModel":"型号名称",
 	"hdk.OrderCode":"订货编码",
 	"hdk.AttachmentIsEmpty":"附件为空",
 	"hdk.scan":"扫一扫",
@@ -41,12 +41,12 @@
 	"hdk.DescriptionPlaceholder":"请将所遇问题情况和具体位置描述准确，更有利于解决。",
 	"hdk.AirportName":"机场名",
 	"hdk.Name":"姓名",
-	"hdk.ContactInformations":"联系方式",
+	"hdk.ContactInformation":"联系方式",
 	"hdk.Email":"邮箱",
 	"hdk.DetailedAddress":"详细地址（例如**街**号）",
 	"hdk.ConfirmAndReport":"确认并上报",
 	"hdk.Repair":"维护报修",
-	"hdk.noFile":"无文件",
+	"hdk.noFile":"暂无文件",
 	"hdk.Check":"查看",
 	"hdk.Reminder":"温馨提示",
 	"hdk.Confirm":"确认",
@@ -65,5 +65,9 @@
 	"hdk.Uploading":"上传中",
 	"hdk.SuccessfullyReported":"上报成功",
 	"hdk.CheckSN":"请检查SN码是否正确",
-	"hdk.CheckForUnfilledItems":"检查未填项"
+	"hdk.CheckForUnfilledItems":"检查未填项",
+	"hdk.networkError":"网络错误",
+	"hdk.fileNotUploaded":"未上传文件",
+	"hdk.loading":"加载中",
+	"hdk.incorrectImportFormat":"导入格式有误"
 }
\ No newline at end of file
diff --git a/main.js b/main.js
index 6efe720..20f5f3f 100644
--- a/main.js
+++ b/main.js
@@ -5,7 +5,8 @@ import uView from '@/uni_modules/uview-ui'
 import { deviceMixin } from '@/utils/utils';
 
 let i18nConfig = {
-  locale: uni.getLocale(),
+  // locale: uni.getLocale(),
+  locale: 'en', //默认英文
   messages
 }
 
diff --git a/manifest.json b/manifest.json
index d9f51fd..1620556 100644
--- a/manifest.json
+++ b/manifest.json
@@ -72,10 +72,10 @@
     "h5" : {
         "router" : {
             "mode" : "history",
-            "base" : "/hdk-web/"
+            "base" : "mobile"
         },
         "devServer" : {
-            "https" : false
+            "https" : true
         }
     }
 }
diff --git a/mobile/pages/component/AuxiliaryModule.vue b/mobile/pages/component/AuxiliaryModule.vue
index 9042af4..fb195e3 100644
--- a/mobile/pages/component/AuxiliaryModule.vue
+++ b/mobile/pages/component/AuxiliaryModule.vue
@@ -120,7 +120,7 @@
 
 
 	.photo {
-		margin: 47px 28px 0 28px;
+		margin: 30px;
 	}
 
 
diff --git a/mobile/pages/component/InformationModule.vue b/mobile/pages/component/InformationModule.vue
index b029f04..8b2bf4d 100644
--- a/mobile/pages/component/InformationModule.vue
+++ b/mobile/pages/component/InformationModule.vue
@@ -23,7 +23,7 @@
 			</view>
 			<view class="flex-between">
 				<text class="leftT">{{$t('hdk.DateOfProduction')}}</text>
-				<text class="rightT">{{$u.timeFormat(informationData.productionTime, 'yyyy年mm月dd日') || ""}}</text>
+				<text class="rightT">{{$u.timeFormat(informationData.productionTime, 'yyyy-mm-dd') || ""}}</text>
 			</view>
 			<view class="flex-between">
 				<text class="leftT">{{$t('hdk.ProductionPersonnel')}}</text>
diff --git a/mobile/pages/component/InspectionModule.vue b/mobile/pages/component/InspectionModule.vue
index bcd1352..24294ac 100644
--- a/mobile/pages/component/InspectionModule.vue
+++ b/mobile/pages/component/InspectionModule.vue
@@ -179,7 +179,6 @@
 
 		.fileViewingModule {
 			width: 80%;
-			height: 235px;
 			margin: 20px 24px;
 			padding: 2px 2px 2px 2px;
 			border-radius: 20px;
@@ -201,7 +200,7 @@
 
 
 	.photo {
-		margin: 47px 28px 0 28px;
+		margin: 30px;
 	}
 
 
diff --git a/mobile/pages/component/topWindow.vue b/mobile/pages/component/topWindow.vue
index 58b7265..1cfe6ad 100644
--- a/mobile/pages/component/topWindow.vue
+++ b/mobile/pages/component/topWindow.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<b-navbar toggleable="lg" type="dark" class="b-navbar">
-			<b-navbar-brand :title="$t('hdk.gohome')" href="/hdk-web">
+			<b-navbar-brand :title="$t('hdk.gohome')" href="/mobile">
 				<img src="@/static/hdk-top-logo.png" width="63px" height="32px" style="margin-left: 10px;" alt="Kitten">
 			</b-navbar-brand>
 			<b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
diff --git a/mobile/pages/homePage/index.vue b/mobile/pages/homePage/index.vue
index f2f1581..a13ab95 100644
--- a/mobile/pages/homePage/index.vue
+++ b/mobile/pages/homePage/index.vue
@@ -27,7 +27,7 @@
 	import {
 		getProductFind
 	} from '@/api/scan'
-	import topWindow from "@/mobile/pages/component/topWindow.vue"
+	import topWindow from "@/pages/component/topWindow.vue"
 	export default {
 		data() {
 			return {
@@ -112,7 +112,7 @@
 						console.log("sn查询结果", res)
 						const data = res.data;
 						uni.navigateTo({
-							url: "/mobile/pages/product/index?sn=" + this.SNcode
+							url: "/pages/product/index?sn=" + this.SNcode
 						})
 					} else {
 						this.isError = true
@@ -121,7 +121,7 @@
 			},
 			scanClick() {
 				uni.navigateTo({
-					url: "/mobile/pages/product/scan"
+					url: "/pages/product/scan"
 				})
 			},
 			getResult(res) {
diff --git a/mobile/pages/product/index.vue b/mobile/pages/product/index.vue
index ac1bc3d..66101f3 100644
--- a/mobile/pages/product/index.vue
+++ b/mobile/pages/product/index.vue
@@ -28,11 +28,11 @@
 	import {
 		getProductFind
 	} from '@/api/scan'
-	import topWindow from "@/mobile/pages/component/topWindow.vue"
-	import goback from "@/mobile/pages/component/goback.vue"
-	import InformationModule from '@/mobile/pages/component/InformationModule.vue'
-	import InspectionModule from '@/mobile/pages/component/InspectionModule.vue'
-	import AuxiliaryModule from '@/mobile/pages/component/AuxiliaryModule.vue'
+	import topWindow from "@/pages/component/topWindow.vue"
+	import goback from "@/pages/component/goback.vue"
+	import InformationModule from '@/pages/component/InformationModule.vue'
+	import InspectionModule from '@/pages/component/InspectionModule.vue'
+	import AuxiliaryModule from '@/pages/component/AuxiliaryModule.vue'
 	export default {
 		components: {
 			InformationModule,
@@ -182,7 +182,7 @@
 			jumpService() {
 				console.log(this.repairInformation);
 				uni.navigateTo({
-					url: "/mobile/pages/product/repairReport?repairpObject=" + encodeURIComponent(JSON.stringify(
+					url: "/pages/product/repairReport?repairpObject=" + encodeURIComponent(JSON.stringify(
 						this.repairInformation)),
 				})
 			},
diff --git a/mobile/pages/product/invalidCode.vue b/mobile/pages/product/invalidCode.vue
index 53180d2..f98206a 100644
--- a/mobile/pages/product/invalidCode.vue
+++ b/mobile/pages/product/invalidCode.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-	import topWindow from "@/mobile/pages/component/topWindow.vue"
+	import topWindow from "@/pages/component/topWindow.vue"
 	export default {
 		components: {
 			topWindow
@@ -53,7 +53,7 @@
 		methods: {
 			rescan() {
 				uni.redirectTo({
-					url: '/mobile/pages/product/scan'
+					url: '/pages/product/scan'
 				})
 			},
 			// 判断字符串是否为SN码格式
diff --git a/mobile/pages/product/repairReport.vue b/mobile/pages/product/repairReport.vue
index d3d696a..ac6ada8 100644
--- a/mobile/pages/product/repairReport.vue
+++ b/mobile/pages/product/repairReport.vue
@@ -11,15 +11,15 @@
 					<view class="uform">
 						<u-form-item required :label="$t('hdk.SnCode')" labelWidth="50%" prop="formInfo.sn" borderBottom
 							ref="item1">
-							<u-input v-model="modal.formInfo.sn" border="none"></u-input>
+							<u-input v-model="modal.formInfo.sn" maxlength="10" border="none"></u-input>
 						</u-form-item>
 						<u-form-item required :label="$t('hdk.ProductName')" labelWidth="50%"
 							prop="formInfo.productName" borderBottom ref="item2">
-							<u-input v-model="modal.formInfo.productName" border="none"></u-input>
+							<u-input v-model="modal.formInfo.productName" maxlength="20" border="none"></u-input>
 						</u-form-item>
 						<u-form-item :label="$t('hdk.Model')" labelWidth="50%" prop="formInfo.type" borderBottom
 							ref="item3">
-							<u-input v-model="modal.formInfo.type" border="none"></u-input>
+							<u-input v-model="modal.formInfo.type" maxlength="20" border="none"></u-input>
 						</u-form-item>
 					</view>
 				</view>
@@ -31,7 +31,7 @@
 							:placeholder="$t('hdk.DescriptionPlaceholder')"></u-textarea>
 					</view>
 					<view class="uploadCss">
-						<u-upload upload-icon="plus" :fileList="modal.formInfo.fileList" @afterRead="afterRead"
+						<u-upload upload-icon="plus" :fileList="fileList" @afterRead="afterRead"
 							@delete="deletePic" :previewFullImage="true" name="faultPicture" multiple :maxCount="5"
 							accept="image"></u-upload>
 					</view>
@@ -42,23 +42,23 @@
 					<view class="uform">
 						<u-form-item required :label="$t('hdk.AirportName')" labelWidth="50%"
 							prop="formInfo.airportName" borderBottom ref="item3">
-							<u-input v-model="modal.formInfo.airportName" border="none"></u-input>
+							<u-input v-model="modal.formInfo.airportName" maxlength="20" border="none"></u-input>
 						</u-form-item>
 						<u-form-item required :label="$t('hdk.Name')" labelWidth="50%" prop="formInfo.contactPersonName"
 							borderBottom ref="item4">
-							<u-input v-model="modal.formInfo.contactPersonName" border="none"></u-input>
+							<u-input v-model="modal.formInfo.contactPersonName" maxlength="10" border="none"></u-input>
 						</u-form-item>
-						<u-form-item :label="$t('hdk.ContactInformations')" labelWidth="50%" prop="formInfo.phone"
+						<u-form-item :label="$t('hdk.ContactInformation')" labelWidth="50%" prop="formInfo.phone"
 							borderBottom ref="item5">
-							<u-input v-model="modal.formInfo.contactPersonPhone" border="none"></u-input>
+							<u-input v-model="modal.formInfo.contactPersonPhone" maxlength="20" border="none"></u-input>
 						</u-form-item>
 						<u-form-item required :label="$t('hdk.Email')" labelWidth="50%" prop="formInfo.email"
 							borderBottom ref="item6">
-							<u-input v-model="modal.formInfo.email" border="none"></u-input>
+							<u-input v-model="modal.formInfo.email" maxlength="20" border="none"></u-input>
 						</u-form-item>
 						<u-form-item :label="$t('hdk.DetailedAddress')" labelWidth="100%" prop="formInfo.address"
 							borderBottom ref="item7">
-							<u-input v-model="modal.formInfo.address" border="none"></u-input>
+							<u-input v-model="modal.formInfo.address" maxlength="30" border="none"></u-input>
 						</u-form-item>
 					</view>
 				</view>
@@ -78,8 +78,8 @@
 </template>
 
 <script>
-	import topWindow from "@/mobile/pages/component/topWindow.vue"
-	import goback from "@/mobile/pages/component/goback.vue"
+	import topWindow from "@/pages/component/topWindow.vue"
+	import goback from "@/pages/component/goback.vue"
 	import {
 		createAFaultReport
 	} from "@/api/scan.js"
@@ -100,15 +100,15 @@
 						productName: "",
 						type: "",
 						repairDescribe: "",
-						fileList: [],
 						picPath: "",
 						airportName: "",
 						contactPersonName: "",
 						contactPersonPhone: "",
 						email: "",
 						address: "",
-					}
+					},
 				},
+				fileList: [],
 				confirmModal: false,
 				title: "",
 				content: "",
@@ -169,30 +169,30 @@
 		},
 		methods: {
 			deletePic(event) {
-				this.modal.formInfo.fileList.splice(event.index, 1)
+				this.fileList.splice(event.index, 1)
 			},
 			async afterRead(event) {
 				console.log(event);
+				let that = this;
 				let lists = [].concat(event.file)
-				let data = this.modal.formInfo;
-				let fileListLen = data.fileList.length
+				let fileListLen = that.fileList.length
 				lists.map((item) => {
-					data.fileList.push({
+					that.fileList.push({
 						...item,
 						status: 'uploading',
-						message: this.$t('hdk.Uploading')
+						message: that.$t('hdk.Uploading')
 					})
 				})
 				for (let i = 0; i < lists.length; i++) {
-					const result = await this.uploadFilePromise(lists[i].url)
-					let item = data.fileList[fileListLen]
-					data.fileList.splice(fileListLen, 1, Object.assign(item, {
+					const result = await that.uploadFilePromise(lists[i].url)
+					let item = that.fileList[fileListLen]
+					that.fileList.splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
 						realUrl: result,
 						url: config.prefixUrl + result
 					}))
-					console.log(data.fileList);
+					console.log(that.fileList);
 					fileListLen++
 				}
 			},
@@ -226,16 +226,17 @@
 				})
 			},
 			openModal() {
-				this.title = this.$t('hdk.Reminder');
-				this.content = this.$t('hdk.PromptContent');
-				this.confirmModal = true
+				this.$refs.uForm.validate().then(res => {
+					this.title = this.$t('hdk.Reminder');
+					this.content = this.$t('hdk.PromptContent');
+					this.confirmModal = true
+				})
 			},
 			submit() {
 				console.log(this.modal.formInfo);
 				this.$refs.uForm.validate().then(res => {
 					let ohterValidate = this.checkOtherItems()
 					if (ohterValidate) {
-						// return
 						createAFaultReport(this.modal.formInfo).then(res => {
 							console.log(res);
 							if (res.code === 0) {
@@ -277,11 +278,11 @@
 			},
 			checkOtherItems() {
 				let data = this.modal.formInfo;
-				if (data.repairDescribe === "" && data.fileList.length <= 0) {
+				if (data.repairDescribe === "" && this.fileList.length <= 0) {
 					// uni.$u.toast('描述或图片未上传');
 					return false;
 				}
-				data.picPath = JSON.stringify(data.fileList.map(it => `${it.realUrl}`));
+				data.picPath = JSON.stringify(this.fileList.map(it => `${it.realUrl}`));
 				// delete data.fileList;
 				console.log(data.picPath);
 				return true;
@@ -299,7 +300,9 @@
 		background: #F2F4F3;
 	}
 	
-	
+	/deep/.uni-input-input{
+		padding-left: 10px
+	}
 
 	.uform {
 		margin: 20px;
@@ -325,7 +328,7 @@
 	//移动端样式
 	@media screen and (max-width: 767px) {
 		.title {
-			width: 114px;
+			min-width: 114px;
 			margin: 20px 0 0 15px;
 			font-size: 15px;
 			background-color: rgba(255, 255, 255, 0);
@@ -366,13 +369,19 @@
 			color: #ffffff;
 			text-align: center;
 			line-height: normal;
+			z-index: 999;
+		}
+		
+		.contentTextCss {
+			font-size: 14px;
+			color: #999999;
 		}
 	}
 
 	//PC端样式
 	@media screen and (min-width: 768px) {
 		.title {
-			width: 228px;
+			min-width: 228px;
 			margin: 40px 0 0 30px;
 			font-size: 30px;
 			background-color: rgba(255, 255, 255, 0);
@@ -382,11 +391,29 @@
 			text-align: left;
 		}
 		
+		.contentTextCss {
+			font-size: 20px;
+			color: #999999;
+		}
+		
 		.content{
 			width: 80%;
 			position: relative;
 		}
 		
+		/deep/.u-modal{
+			width: 500px !important;
+		}
+		
+		/deep/.u-modal__title{
+			height: 80px;
+			font-size: 24px
+		}
+		
+		/deep/.u-modal__content{
+			height: 80px;
+		}
+		
 		/deep/.uni-textarea-textarea{
 			font-size: 18px;
 		}
@@ -432,11 +459,9 @@
 			color: #ffffff;
 			text-align: center;
 			line-height: normal;
+			z-index: 999;
 		}
 	}
 
-	.contentTextCss {
-		font-size: 30px;
-		color: #999999;
-	}
+	
 </style>
\ No newline at end of file
diff --git a/mobile/pages/product/scan.vue b/mobile/pages/product/scan.vue
index 3e70b1d..4b56906 100644
--- a/mobile/pages/product/scan.vue
+++ b/mobile/pages/product/scan.vue
@@ -6,8 +6,8 @@
 </template>
 
 <script>
-	import topWindow from "@/mobile/pages/component/topWindow.vue"
-	import QrScan from "@/mobile/pages/component/QrScan.vue"
+	import topWindow from "@/pages/component/topWindow.vue"
+	import QrScan from "@/pages/component/QrScan.vue"
 	import config from '@/common/config.js'
 	import {
 		getProductFind
@@ -62,14 +62,14 @@
 					console.log(res);
 					if (res.code === 1400001001) {
 						uni.navigateTo({
-							url: '/mobile/pages/product/invalidCode?snCode='+sncode,
+							url: '/pages/product/invalidCode?snCode='+sncode,
 							success() {
 								this.open = true
 							}
 						});
 					} else {
 						uni.navigateTo({
-							url: "/mobile/pages/product/index?sn=" + sncode
+							url: "/pages/product/index?sn=" + sncode
 						})
 					}
 				})
diff --git a/pages.json b/pages.json
index 98b63d9..8750953 100644
--- a/pages.json
+++ b/pages.json
@@ -1,34 +1,34 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "mobile/pages/homePage/index",
+			"path": "pages/homePage/index",
 			"style": {
 				"navigationStyle": "custom"
 				// "navigationBarTitleText": "%index.title%"
 			}
 		}, {
-			"path": "mobile/pages/product/index",
+			"path": "pages/product/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path": "mobile/pages/component/component",
+			"path": "pages/component/component",
 			"style": {
 				"navigationBarTitleText": "%index.component%",
 				"enablePullDownRefresh": false
 			}
 		}, {
-			"path": "mobile/pages/product/scan",
+			"path": "pages/product/scan",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path": "mobile/pages/product/invalidCode",
+			"path": "pages/product/invalidCode",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path": "mobile/pages/product/repairReport",
+			"path": "pages/product/repairReport",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -40,24 +40,24 @@
 	// 	"borderStyle": "black",
 	// 	"backgroundColor": "#F8F8F8",
 	// 	"list": [{
-	// 			"pagePath": "mobile/pages/homePage/index",
+	// 			"pagePath": "pages/homePage/index",
 	// 			"text": "%index.home%"
 	// 		},
 	// 		{
-	// 			"pagePath": "mobile/pages/component/component",
+	// 			"pagePath": "pages/component/component",
 	// 			"text": "%index.component%"
 	// 		}, {
-	// 			"pagePath": "mobile/pages/api/api",
+	// 			"pagePath": "pages/api/api",
 	// 			"text": "%index.api%"
 	// 		}, {
-	// 			"pagePath": "mobile/pages/schema/schema",
+	// 			"pagePath": "pages/schema/schema",
 	// 			"text": "%index.schema%"
 	// 		}
 	// 	]
 	// },
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "HDK",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
diff --git a/pages/api/api.vue b/pages/api/api.vue
new file mode 100644
index 0000000..0389bce
--- /dev/null
+++ b/pages/api/api.vue
@@ -0,0 +1,27 @@
+<template>
+  <view class="container">
+    <button @click="showModel">uni.showModal</button>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {}
+    },
+    methods: {
+      showModel() {
+        uni.showModal({
+          content: this.$t('api.message'),
+          success: (res) => {
+            console.log(res);
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/component/AuxiliaryModule.vue b/pages/component/AuxiliaryModule.vue
new file mode 100644
index 0000000..fb195e3
--- /dev/null
+++ b/pages/component/AuxiliaryModule.vue
@@ -0,0 +1,145 @@
+<template>
+	<view class="containers">
+		<view class="empty" v-if="auxiliaryData.length <= 0 || auxiliaryData === null">
+			<u-empty :text="$t('hdk.AttachmentIsEmpty')" mode="data"
+				icon="http://cdn.uviewui.com/uview/empty/data.png"></u-empty>
+		</view>
+		<view class="auxiliaryModule" v-for="(item,index) in auxiliaryData" :key="index" v-else>
+			<view class="title">{{$t('hdk.AttachmentModel')}}：{{item.type}}</view>
+			<view class="photo">
+				<u-swiper @click="previewLargeImage(item.productPicturePath,index)" :current="currents[index]"
+					:list="item.productPicturePath" indicator indicatorMode="dot" circular imgMode="aspectFit"
+					:height="$isMobile?'400rpx':'600px'" indicatorActiveColor="#00aeaa"
+					indicatorInactiveColor="rgba(0, 174, 170, 0.3)" @change=" e => currents[index] = e.current"
+					:indicatorStyle="{bottom:'20px',right:'5px'}"></u-swiper>
+			</view>
+			<view class="title">{{$t('hdk.OrderCode')}}：{{item.orderCode}}</view>
+			<UploadFile :fileType="1" :downloadFileName="item.productManual"
+				:downloadFileNamePath="item.productManualPath" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import UploadFile from './UploadFile.vue'
+	export default {
+		components: {
+			UploadFile
+		},
+		props: {
+			auxiliaryData: {
+				type: Array
+			}
+		},
+		data() {
+			return {
+				currents: []
+			}
+		},
+		computed: {
+
+		},
+		mounted() {
+			this.currents = this.auxiliaryData.map(() => 0)
+		},
+		methods: {
+			previewLargeImage(productPicturePath, index) {
+				console.log("第几组图", index);
+				console.log("图片列表", productPicturePath);
+				console.log("滑块", this.currents[index]);
+				const current = this.currents[index]
+				wx.previewImage({
+					current: productPicturePath[current],
+					urls: productPicturePath
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	}
+
+	@media screen and (max-width: 767px) {
+		.title {
+			font-size: 15px;
+			margin: 19px 0 0 14px;
+		}
+
+		.flex-between {
+			margin: 16.5px;
+			display: flex;
+			justify-content: space-between;
+			font-size: 13px;
+		}
+
+		.auxiliaryModule {
+			width: 95%;
+			margin: 16px 24px 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+	}
+
+	//PC端样式
+	@media screen and (min-width: 768px) {
+		.title {
+			font-size: 30px;
+			margin: 38px 0 0 28px;
+		}
+
+		.flex-between {
+			margin: 33px;
+			display: flex;
+			justify-content: space-between;
+			font-size: 26px;
+		}
+
+		.auxiliaryModule {
+			width: 80%;
+			margin: 16px 24px 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+	}
+
+	.empty {
+		width: 100%;
+		height: 100%;
+	}
+
+
+
+	.photo {
+		margin: 30px;
+	}
+
+
+
+	.leftT {
+		background-color: rgba(255, 255, 255, 0);
+		box-sizing: border-box;
+		font-family: '苹方 中等', '苹方', sans-serif;
+		color: #999db0;
+		text-align: left;
+		line-height: normal;
+	}
+
+	.rightT {
+		background-color: rgba(255, 255, 255, 0);
+		box-sizing: border-box;
+		font-family: '苹方 中等', '苹方', sans-serif;
+		color: #2b3950;
+		text-align: left;
+		line-height: normal;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/component/InformationModule.vue b/pages/component/InformationModule.vue
new file mode 100644
index 0000000..8b2bf4d
--- /dev/null
+++ b/pages/component/InformationModule.vue
@@ -0,0 +1,196 @@
+<template>
+	<view class="containers">
+		<u-swiper class="swiperCss" :list="informationData.lampPath"
+			@click="previewLargeImage(informationData.lampPath,current)" :current="current" indicator
+			indicatorMode="dot" imgMode="aspectFit" circular :height="$isMobile?'400rpx':'600px'"
+			indicatorActiveColor="#00aeaa" indicatorInactiveColor="rgba(0, 174, 170, 0.3)" @change="changeSwiper"
+			:indicatorStyle="{bottom:'20px',right:'5px'}"></u-swiper>
+		<view class="informationModule">
+			<view class="title">
+				{{$t('hdk.productInformation')}}
+			</view>
+			<view class="flex-between">
+				<text class="leftT">{{$t('hdk.SnCode')}}</text>
+				<text class="rightT">{{informationData.sn || ""}}</text>
+			</view>
+			<view class="flex-between">
+				<text class="leftT">{{$t('hdk.ProductName')}}</text>
+				<text class="rightT">{{informationData.productName || ""}}</text>
+			</view>
+			<view class="flex-between">
+				<text class="leftT">{{$t('hdk.Model')}}</text>
+				<text class="rightT">{{informationData.type || ""}}</text>
+			</view>
+			<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 class="fileViewingModule">
+			<view class="title">
+				{{$t('hdk.ProductSpecification')}}
+			</view>
+			<UploadFile :fileType="1" :downloadFileName="informationData.productDatasheet"
+				:downloadFileNamePath="informationData.productDatasheetPath" />
+		</view>
+
+		<view class="fileViewingModule">
+			<view class="title">
+				{{$t('hdk.ProductManual')}}
+			</view>
+			<UploadFile :fileType="1" :downloadFileName="informationData.productManual"
+				:downloadFileNamePath="informationData.productManualPath" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import UploadFile from './UploadFile.vue'
+	export default {
+		components: {
+			UploadFile
+		},
+		props: {
+			informationData: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				current: 0
+			}
+		},
+		computed: {
+
+		},
+		onLoad() {},
+		methods: {
+			changeSwiper(e) {
+				this.current = e.current
+				// console.log("当前滑块", this.current);
+			},
+			previewLargeImage(productPicturePath, current) {
+				console.log("图片列表", productPicturePath);
+				console.log("滑块", current);
+				wx.previewImage({
+					current: productPicturePath[current],
+					urls: productPicturePath
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	}
+
+
+	//移动端样式
+	@media screen and (max-width: 767px) {
+		.title {
+			font-size: 15px;
+			margin: 19px 0 0 14px;
+		}
+
+		.swiperCss {
+			width: 95%;
+		}
+
+		.flex-between {
+			margin: 16.5px;
+			display: flex;
+			justify-content: space-between;
+			font-size: 13px;
+		}
+
+		.pdfTitle {
+			font-size: 13px;
+			margin-left: 8px;
+		}
+
+		.informationModule {
+			width: 95%;
+			margin: 20px 24px;
+			padding: 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+
+		.fileViewingModule {
+			width: 95%;
+			min-height: 100px;
+			margin: 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+
+	}
+
+	//PC端样式
+	@media screen and (min-width: 768px) {
+		.title {
+			font-size: 30px;
+			margin: 38px 0 0 28px;
+		}
+
+		.swiperCss {
+			width: 80%;
+		}
+
+		.flex-between {
+			margin: 33px;
+			display: flex;
+			justify-content: space-between;
+			font-size: 26px;
+		}
+
+		.informationModule {
+			width: 80%;
+			margin: 20px 24px;
+			padding: 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+
+
+		.fileViewingModule {
+			width: 80%;
+			min-height: 100px;
+			margin: 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+	}
+	.leftT {
+		background-color: rgba(255, 255, 255, 0);
+		box-sizing: border-box;
+		font-family: '苹方 中等', '苹方', sans-serif;
+		color: #999db0;
+		text-align: left;
+		line-height: normal;
+	}
+
+	.rightT {
+		background-color: rgba(255, 255, 255, 0);
+		box-sizing: border-box;
+		font-family: '苹方 中等', '苹方', sans-serif;
+		color: #2b3950;
+		text-align: left;
+		line-height: normal;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/component/InspectionModule.vue b/pages/component/InspectionModule.vue
new file mode 100644
index 0000000..24294ac
--- /dev/null
+++ b/pages/component/InspectionModule.vue
@@ -0,0 +1,224 @@
+<template>
+	<view class="containers">
+		<!-- <view class="empty" v-if="inspectionData === null">
+      <u-empty text="附件为空" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"></u-empty>
+    </view> -->
+		<view class="informationModule">
+			<view class="title">
+				{{$t('hdk.inspectionInformation')}}
+			</view>
+			<view class="flex-between">
+				<text class="leftT">{{$t('hdk.SoftwareVersion')}}</text>
+				<text class="rightT">{{inspectionData.softwareVersion || ''}}</text>
+			</view>
+			<view class="flex-between">
+				<text class="leftT">{{$t('hdk.HardwareVersion')}}</text>
+				<text class="rightT">{{inspectionData.hardwareVersion || ''}}</text>
+			</view>
+			<view class="flex-between">
+				<text class="leftT">{{$t('hdk.TestDate')}}</text>
+				<text class="rightT">{{$u.timeFormat(inspectionData.checkTime, 'yyyy年mm月dd日') || ''}}</text>
+			</view>
+		</view>
+
+		<view class="informationModule">
+			<view class="title">
+				{{$t('hdk.ElectricalParameters')}}
+			</view>
+			<view class="flex-between">
+				<text class="leftT">{{$t('hdk.Power')}}</text>
+				<text class="rightT">{{inspectionData.power || ''}}</text>
+			</view>
+			<view class="flex-between">
+				<text class="leftT">{{$t('hdk.PowerFactor')}}</text>
+				<text class="rightT">{{inspectionData.powerFactor || ''}}</text>
+			</view>
+		</view>
+
+		<view class="dataViewingModule">
+			<view class="title">
+				{{$t('hdk.LightIntensityDistribution')}}
+			</view>
+			<view class="photo">
+				<u-swiper :list="inspectionData.lightIntensityPhoto"
+					@click="previewLargeImage(inspectionData.lightIntensityPhoto,current)" :current="current"
+					v-if="inspectionData.lightIntensityPhoto.length > 0" indicator indicatorMode="dot" circular
+					imgMode="aspectFit" :height="$isMobile?'400rpx':'600px'" indicatorActiveColor="#00aeaa"
+					@change="changeSwiper" indicatorInactiveColor="rgba(0, 174, 170, 0.3)"
+					:indicatorStyle="{bottom:'20px',right:'5px'}"></u-swiper>
+			</view>
+			<UploadFile :fileType="2" v-for="(item,index) in inspectionData.lightIntensityFile" :key="index"
+				:downloadFileName="item" :downloadFileNamePath="item" :isCsv="true" />
+		</view>
+
+		<view class="fileViewingModule">
+			<view class="title">
+				{{$t('hdk.AirTightnessInspectionDocuments')}}
+			</view>
+			<UploadFile :fileType="2" :downloadFileName="inspectionData.tightnessCheckFile"
+				:downloadFileNamePath="inspectionData.tightnessCheckFilePath" />
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import UploadFile from './UploadFile.vue'
+	export default {
+		components: {
+			UploadFile
+		},
+		props: {
+			inspectionData: {
+				type: Object
+			}
+		},
+		data() {
+			return {
+				current: 0
+			}
+		},
+		computed: {
+
+		},
+		onLoad() {
+
+		},
+		methods: {
+			changeSwiper(e) {
+				this.current = e.current
+				// console.log("当前滑块",this.current);
+			},
+			previewLargeImage(productPicturePath, current) {
+				console.log("图片列表", productPicturePath);
+				console.log("滑块", current);
+				wx.previewImage({
+					current: productPicturePath[current],
+					urls: productPicturePath
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	}
+
+	//移动端样式
+	@media screen and (max-width: 767px) {
+		.title {
+			font-size: 15px;
+			margin: 19px 0 0 14px;
+		}
+
+		.flex-between {
+			margin: 16.5px;
+			display: flex;
+			justify-content: space-between;
+			font-size: 13px;
+		}
+
+		.informationModule {
+			width: 95%;
+			max-height: 467px;
+			margin: 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+
+		.fileViewingModule {
+			width: 95%;
+			margin: 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+
+
+		.dataViewingModule {
+			width: 95%;
+			margin: 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+	}
+
+	//PC端样式
+	@media screen and (min-width: 768px) {
+		.title {
+			font-size: 30px;
+			margin: 38px 0 0 28px;
+		}
+
+		.flex-between {
+			margin: 33px;
+			display: flex;
+			justify-content: space-between;
+			font-size: 26px;
+		}
+
+		.informationModule {
+			width: 80%;
+			max-height: 467px;
+			margin: 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+
+		.fileViewingModule {
+			width: 80%;
+			margin: 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+
+
+		.dataViewingModule {
+			width: 80%;
+			margin: 20px 24px;
+			padding: 2px 2px 2px 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+		}
+	}
+
+
+
+	.photo {
+		margin: 30px;
+	}
+
+
+	.leftT {
+		background-color: rgba(255, 255, 255, 0);
+		box-sizing: border-box;
+		font-family: '苹方 中等', '苹方', sans-serif;
+		color: #999db0;
+		text-align: left;
+		line-height: normal;
+	}
+
+	.rightT {
+		background-color: rgba(255, 255, 255, 0);
+		box-sizing: border-box;
+		font-family: '苹方 中等', '苹方', sans-serif;
+		color: #2b3950;
+		text-align: left;
+		line-height: normal;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/component/QrScan.vue b/pages/component/QrScan.vue
new file mode 100644
index 0000000..5f9d434
--- /dev/null
+++ b/pages/component/QrScan.vue
@@ -0,0 +1,100 @@
+<template>
+	<div class="qrcode">
+		<div id="reader">
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		Html5Qrcode
+	} from 'html5-qrcode';
+	export default {
+		created() {
+			this.getCameras();
+			navigator.mediaDevices.getUserMedia({
+					video: true
+				})
+				.then(stream => {
+					this.$refs.qrcodeReader.$refs.reader.$refs.video.srcObject = stream
+				})
+				.catch(error => {
+					console.log(error)
+					// alert('Failed to access camera.')
+				})
+		},
+		beforeDestroy() {
+			this.stop();
+		},
+		methods: {
+			getCameras() {
+				Html5Qrcode.getCameras()
+					.then((devices) => {
+						if (devices && devices.length) {
+							this.html5QrCode = new Html5Qrcode('reader');
+							this.start();
+						}
+					})
+					.catch((err) => {
+						// handle err
+						this.html5QrCode = new Html5Qrcode('reader');
+						this.error = 'ERROR: 您需要授予相机访问权限';
+						this.$emit('err', this.error, err);
+					});
+			},
+			start() {
+				//environment后置 user前置
+				this.html5QrCode
+					.start({
+							facingMode: 'environment'
+						}, {
+							fps: 10, // 设置每秒多少帧
+							aspectRatio: 1,
+							qrbox: 250, // 设置取景范围
+							colorDark: '#0000ff', //加深二维码黑色部分的颜色提高识别度
+							colorLight: '#ffffff', //这个应该是提高非黑即白部分的亮度  提高识别度
+							visualFeedback: true, //开启视觉反馈  没有体会到
+							halfSample: true, //缩小二维码提高识别精度吧
+						},
+						(decodedText) => {
+							this.$emit('ok', decodedText);
+						},
+					)
+					.catch((err) => {
+						this.$emit('err', err);
+					});
+			},
+			stop() {
+				this.html5QrCode
+					.stop()
+					.then((ignore) => {
+						// QR Code scanning is stopped.
+						this.$emit('err', ignore);
+						console.log('QR Code scanning stopped.');
+					})
+					.catch((err) => {
+						this.$emit('err', err);
+						// Stop failed, handle it.
+						console.log('Unable to stop scanning.');
+					});
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.qrcode {
+		position: absolute;
+		height: 100%;
+		width: 100%;
+		// background: rgba($color: #000000, $alpha: 0.48);
+		background:rgba(0, 0, 0, 1.48);
+	}
+
+
+	#reader {
+		top: 50%;
+		left: 0;
+		transform: translateY(-50%);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/component/UploadFile.vue b/pages/component/UploadFile.vue
new file mode 100644
index 0000000..53dac04
--- /dev/null
+++ b/pages/component/UploadFile.vue
@@ -0,0 +1,222 @@
+<template>
+	<view>
+		<view class="flex-content">
+			<view class="iconText">
+				<u-icon name="/static/images/icon/pdfIcon.png" size="33px" v-if="fileType == 1"></u-icon>
+				<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) : $t('hdk.noFile')}}</text>
+			</view>
+			<view class="rightText" @click="seeFile('preview')" v-if="downloadFileNamePath != ''">
+				{{$t('hdk.Check')}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		downloadTemplateFile
+	} from '@/api/scan.js'
+	import config from '@/common/config'
+	export default {
+		components: {},
+		props: {
+			fileType: {
+				type: Number,
+				require: true
+			},
+			downloadFileName: {
+				type: String,
+				require: true
+			},
+			downloadFileNamePath: {
+				type: String,
+				require: true
+			},
+			isCsv: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				openIframe:false,
+				documentUrl:""
+			}
+		},
+		computed: {
+
+		},
+		onLoad() {
+			// uni.showShareMenu({
+			// 	withShareTicket: true,
+			// 	menus: ['shareAppMessage'],
+			// 	success: function() {
+			// 		console.log('分享菜单显示成功');
+			// 	},
+			// 	fail: function(res) {
+			// 		console.log('分享菜单显示失败', res);
+			// 	}
+			// });
+		},
+		methods: {
+			seeFile(acceptType) {
+				console.log(acceptType);
+				// if (this.isCsv) {
+				//   return
+				// }
+				console.log('查看文件');
+				uni.showLoading({
+					title: this.$t('hdk.loading')
+				})
+				let that = this;
+
+				if (!this.isCsv) {
+					const count = (this.downloadFileNamePath.match(/;/g) || []).length;
+					console.log(this.downloadFileNamePath, "解析文件有", count, "个")
+					if (count > 1) {
+						uni.showToast({
+							icon: 'none',
+							title: this.$t('hdk.incorrectImportFormat')
+						});
+						return
+					}
+				}
+				//去除分号分割符
+				let downloadName = that.downloadFileNamePath.replace(/;/g, "");
+				console.log("下载名", downloadName);
+				// let query = `/download?bucketName=hdk&file=${downloadName}`
+				// console.log("query", config.baseUrl + query)
+				const parts = downloadName.split(".");
+				// 取数组最后一个元素作为后缀名
+				let fileType = parts[parts.length - 1];
+				console.log("后缀", fileType);
+				let environment = uni.getSystemInfoSync().platform
+				console.log("当前环境", environment);
+				const urls = config.fileUrl + `/${encodeURI(downloadName)}`
+				let fileName = downloadName.substring(downloadName.lastIndexOf('/') + 1);
+				this.checkUrlValidity(urls).then(isExistence => {
+					if (isExistence) {
+						uni.hideLoading()
+						uni.getSystemInfo({
+						  success: function (res) {
+						    var platform = res.platform.toLowerCase();
+						    // 如果是安卓设备
+						    if (platform === 'android' || platform === 'windows') {
+						      window.open(urls, '_blank');
+						    }
+						    // 如果是 iOS 设备
+						    else if (platform === 'ios') {
+								window.open(urls);
+						    }
+						  }
+						});
+					} else {
+						uni.hideLoading()
+						uni.showToast({
+							icon: 'none',
+							title: this.$t('hdk.fileNotUploaded')
+						});
+					}
+				})
+			},
+			//检查是否有效
+			checkUrlValidity(url) {
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url,
+						header: {
+							'tenant-id': 1,
+						},
+						method: 'HEAD',
+						success(res) {
+							console.log("检验地址", res);
+							if (res.statusCode >= 200 && res.statusCode < 400) {
+								resolve(true); // URL有效
+							} else {
+								console.log("地址无效");
+								resolve(false); // URL无效
+							}
+						},
+						fail(err) {
+							reject(err); // 请求失败
+						}
+					});
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@media screen and (max-width: 767px) {
+		.iconTitle {
+			width: 200px;
+			font-size: 13px;
+			margin-left: 8px;
+			white-space: nowrap;
+			/* 防止换行 */
+			overflow: hidden;
+			/* 超出部分隐藏 */
+			text-overflow: ellipsis;
+			/* 显示省略号 */
+		}
+		.rightText {
+			padding: 5px;
+			color: #00aeaa;
+			font-size: 14px;
+		}
+		
+		.flex-content {
+			display: flex;
+			justify-content: space-between;
+			font-size: 26px;
+			align-items: center;
+			margin: 30px;
+		
+			.iconText {
+				display: flex;
+				align-items: center;
+				height: 50px;
+				color: #2b3950;
+			}
+		}
+	}
+
+	//PC端样式
+	@media screen and (min-width: 768px) {
+		.iconTitle {
+			width: 400px;
+			font-size: 26px;
+			margin-left: 16px;
+			white-space: nowrap;
+			/* 防止换行 */
+			overflow: hidden;
+			/* 超出部分隐藏 */
+			text-overflow: ellipsis;
+			/* 显示省略号 */
+		}
+		.rightText {
+			padding: 10px;
+			color: #00aeaa;
+			font-size: 28px;
+		}
+		
+		.flex-content {
+			display: flex;
+			justify-content: space-between;
+			font-size: 26px;
+			align-items: center;
+			margin: 30px;
+		
+			.iconText {
+				display: flex;
+				align-items: center;
+				height: 50px;
+				color: #2b3950;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/component/component.vue b/pages/component/component.vue
new file mode 100644
index 0000000..151b350
--- /dev/null
+++ b/pages/component/component.vue
@@ -0,0 +1,22 @@
+<template>
+  <view class="container">
+    <no-data></no-data>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: this.$t('')
+      }
+    },
+    methods: {
+      
+    }
+  }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/component/goback.vue b/pages/component/goback.vue
new file mode 100644
index 0000000..8a8f49d
--- /dev/null
+++ b/pages/component/goback.vue
@@ -0,0 +1,50 @@
+<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>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		props: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+
+		},
+		onLoad() {
+
+		},
+		methods: {
+			goback() {
+			  if (window.history.length > 1) {
+			    window.history.back();
+			  } else {
+			    window.location.href = '/mobile';
+			  }
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.back {
+		width: 50px;
+		height: 50px;
+		border-radius: 50px;
+		position: fixed;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		left:1%;
+		top: 10%;
+		bottom: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/component/topWindow.vue b/pages/component/topWindow.vue
new file mode 100644
index 0000000..27d0128
--- /dev/null
+++ b/pages/component/topWindow.vue
@@ -0,0 +1,160 @@
+<template>
+	<view>
+		<b-navbar toggleable="lg" type="dark" class="b-navbar">
+			<b-navbar-brand :title="$t('hdk.gohome')" href="/mobile">
+				<img src="@/static/hdk-top-logo.png" width="63px" height="32px" style="margin-left: 10px;" alt="Kitten">
+			</b-navbar-brand>
+			<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' }">
+						{{$t('hdk.productInformation')}}
+					</b-nav-item>
+					<b-nav-item v-show="!isHome" @click="handleClick('inspectionInformation')"
+						:class="{ 'activeCSS': selectedNavItem === 'inspectionInformation' }">
+						{{$t('hdk.inspectionInformation')}}
+					</b-nav-item>
+					<b-nav-item v-show="!isHome" @click="handleClick('attachmentInformation')"
+						:class="{ 'activeCSS': selectedNavItem === 'attachmentInformation' }">
+						{{$t('hdk.attachmentInformation')}}
+					</b-nav-item>
+					<b-nav-item-dropdown :text="selectedLanguage" right>
+						<template #button-content>
+								<img src="@/static/images/icon/language.png" width="17px" height="17px"
+									alt="Kitten" style="margin:2px 2px 5px 2px;">
+								<text>{{selectedLanguage}}</text>
+						</template>
+						<b-dropdown-item href="#" @click="changeLanguage('en')">{{$t('locale.en')}}
+						</b-dropdown-item>
+						<b-dropdown-item href="#" @click="changeLanguage('zh-hans')">{{$t('locale.zh-hans')}}
+						</b-dropdown-item>
+					</b-nav-item-dropdown>
+				</b-navbar-nav>
+			</b-collapse>
+		</b-navbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				selectedLanguage: this.$t('index.language'),
+				selectedNavItem: 'productInformation'
+			}
+		},
+		props: {
+			isHome: {
+				type: Boolean,
+				default: true
+			},
+		},
+		mounted() {
+			var url = window.location.href;
+			var lang = this.getQueryString('lang');
+			console.log("地址携带语种", lang);
+			if (lang === "zh") {
+				this.$i18n.locale = 'zh-Hans';
+				uni.setLocale('zh-Hans');
+				this.selectedLanguage = `${this.$t('index.language')}:${this.$t('locale.zh-hans')}`;
+			} else if (lang === "en") {
+				this.$i18n.locale = 'en';
+				uni.setLocale('en');
+				this.selectedLanguage = `${this.$t('index.language')}:${this.$t('locale.en')}`;
+			} else {
+				let Localelang = 'en';
+				console.log("本地语言", Localelang);
+				this.selectedLanguage = Localelang == 'en' ? `${this.$t('index.language')}:${this.$t('locale.en')}` :
+					`${this.$t('index.language')}:${this.$t('locale.zh-hans')}`
+			}
+		},
+		methods: {
+			getQueryString(key) {
+				const url = new URL(decodeURIComponent(location.href));
+				return url.searchParams.get(key);
+			},
+			handleClick(item) {
+				this.selectedNavItem = item;
+				this.$emit('item-click', item);
+			},
+			changeLanguage(locale) {
+				console.log('切换语言为:', locale);
+				// 更新选择的语言
+				if (locale === 'en') {
+					this.$i18n.locale = 'en';
+					uni.setLocale('en');
+					this.selectedLanguage = `${this.$t('index.language')}:${this.$t('locale.en')}`;
+				} else if (locale === 'zh-hans') {
+					this.$i18n.locale = 'zh-Hans';
+					uni.setLocale('zh-Hans');
+					this.selectedLanguage = `${this.$t('index.language')}:${this.$t('locale.zh-hans')}`;
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.uni-top-window {
+		padding: 0 15px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		border-bottom: 1px solid #e1e1e1;
+		background-color: #00AEAA;
+		color: #333;
+	}
+
+	.b-navbar {
+		width: 100vw;
+		background-color: #00AEAA;
+		display: flex;
+	}
+
+	/* PC端样式 */
+	@media screen and (min-width: 768px) {
+		.b-navbar {
+			padding: 0 10%;
+			height: 50px;
+		}
+
+		.navbar-nav {
+			height: 100%;
+		}
+
+		.nav-item {
+			padding: 0 20px;
+		}
+
+		.collapseR {
+			width: 100%;
+			height: 100%;
+			line-height: 30px !important;
+			justify-content: flex-end;
+		}
+	}
+
+	/* 移动端样式 */
+	@media screen and (max-width: 767px) {
+		.nav-item {
+			padding-left: 10px;
+		}
+	}
+
+	.activeCSS {
+		.nav-link {
+			color: #000;
+		}
+
+		background: #fff;
+	}
+
+
+
+	.b-navCss {
+		color: #fff;
+	}
+</style>
diff --git a/pages/homePage/index.vue b/pages/homePage/index.vue
new file mode 100644
index 0000000..5dbe786
--- /dev/null
+++ b/pages/homePage/index.vue
@@ -0,0 +1,263 @@
+<template>
+	<view class="containers">
+		<topWindow :isHome="true"></topWindow>
+		<view class="content">
+			<image src="@/static/logo.png" style="width: 100px; height: 50px;" mode="aspectFit"></image>
+			<view class="tipsCss">{{$t('hdk.tips')}}</view>
+			<view class="flex-row">
+				<b-input id="input" ref="inputField" class="inputCss" autofocus="autofocus" :placeholder="$t('hdk.placeholder')"
+					@input="handleChange"  @keypress.enter="handleScan" v-model="SNcode"></b-input>
+				<b-button class="SearchBtnCss my-2 my-sm-0" size="sm" @click="search"
+					style="background:#00AEAA;">{{$t('hdk.search')}}</b-button>
+			</view>
+			<view class="errorTipCss" v-if="isError">
+				<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>
+				<text style="margin-left: 10rpx;">{{$t('hdk.scan')}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// window.document.onkeydown = (e) => {
+	// 	console.log(e);
+	// 	let input = document.getElementById('input');
+	// 	input.focus()
+	// 	if (e.keyCode === 20) {
+	// 		console.log(input.value);
+	// 		input.innerHTML = input.value;
+	// 		// input.value = ''
+	// 	}
+	// }
+
+	import {
+		getProductFind
+	} from '@/api/scan'
+	import topWindow from "@/pages/component/topWindow.vue"
+	export default {
+		data() {
+			return {
+				systemLocale: '',
+				applicationLocale: '',
+				isError: false,
+				SNcode: "",
+				open: false,
+				lastTimeLen: null,
+				lastCode: ""
+			}
+		},
+		components: {
+			topWindow,
+		},
+		computed: {
+			locales() {
+				return [{
+						text: this.$t('locale.en'),
+						code: 'en'
+					},
+					{
+						text: this.$t('locale.zh-hans'),
+						code: 'zh-Hans'
+					},
+				]
+			}
+		},
+		mounted() {
+			// const inputElement = this.$refs.inputField.$el.querySelector('input');
+			document.addEventListener('keydown', this.handleKeyDown);
+		},
+		onLoad() {
+			let systemInfo = uni.getSystemInfoSync();
+			this.systemLocale = systemInfo.language;
+			this.applicationLocale = uni.getLocale();
+			this.isAndroid = systemInfo.platform.toLowerCase() === 'android';
+		},
+		methods: {
+			getFirstSnFromUrl(url) {
+				const regex = /sn=([^&]+)/;
+				const match = url.match(regex);
+				if (match && match.length > 1) {
+					const sn = match[1];
+					return sn;
+				}
+				return url;
+			},
+			handleChange(event) {
+				console.log(event);
+				this.SNcode = this.getFirstSnFromUrl(event);
+			},
+			handleScan(event) {
+				// console.log(this.SNcode);
+				// 捕获扫码枪输入的内容
+				// this.isError = false;
+
+			},
+			search() {
+				console.log("查询");
+				if (this.SNcode === "") {
+					return
+				}
+				uni.showLoading({
+					title: '查询中...'
+				})
+				getProductFind(this.SNcode).then(res => {
+					uni.hideLoading()
+					if (res.code == 0) {
+						console.log("sn查询结果", res)
+						const data = res.data;
+						uni.navigateTo({
+							url: "/pages/product/index?sn=" + this.SNcode
+						})
+					} else {
+						this.isError = true
+					}
+				})
+			},
+			scanClick() {
+				uni.navigateTo({
+					url: "/pages/product/scan"
+				})
+			},
+			getResult(res) {
+				console.log(res);
+			},
+			geterror(e) {
+				console.log(e);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		width: 100vw;
+		height: 100vh;
+		background: #1E5866;
+	}
+
+	.content {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 80vh;
+	}
+
+	.flex-row {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	//移动端样式
+	@media screen and (max-width: 767px) {
+		.inputCss {
+			width: 278px;
+			height: 44px;
+		}
+
+		.btnSNscan {
+			width: 100px;
+			height: 38px;
+			margin: 8px;
+			padding: 2px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border-radius: 54px;
+			background-color: rgba(0, 174, 170, 0.25);
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			color: #ffffff;
+			text-align: center;
+		}
+
+		.SearchBtnCss {
+			width: 80px;
+			height: 44px;
+			border-radius: 4px;
+			background-color: #00aeaa;
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			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;
+		}
+
+		.btnSNscan {
+			width: 130px;
+			height: 44px;
+			margin: 20px 0 0 0;
+			padding: 2px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 54px;
+			background-color: rgba(0, 174, 170, 0.25);
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			color: #ffffff;
+			text-align: center;
+		}
+
+		.SearchBtnCss {
+			width: 80px;
+			height: 44px;
+			border-radius: 4px;
+			background-color: #00aeaa;
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			color: #ffffff;
+			text-align: center;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/index.vue b/pages/product/index.vue
new file mode 100644
index 0000000..aea124d
--- /dev/null
+++ b/pages/product/index.vue
@@ -0,0 +1,332 @@
+<template>
+	<view class="containers">
+		<topWindow :isHome="false" @item-click="handleItemClick"></topWindow>
+		<goback></goback>
+		<view class="ComponentsBody">
+			<view class="productInformation" v-if="current == 'productInformation'">
+				<InformationModule v-if="informationData != null" :informationData="informationData">
+				</InformationModule>
+			</view>
+			<view class="inspectionInformation" v-else-if="current == 'inspectionInformation'">
+				<InspectionModule v-if="inspectionData != null" :inspectionData="inspectionData"></InspectionModule>
+			</view>
+			<view class="attachmentInformation" v-else-if="current == 'attachmentInformation'">
+				<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>
+				<text class="repairReportTextCss">{{$t("hdk.Repair")}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import config from '@/common/config.js'
+	import {
+		getProductFind
+	} from '@/api/scan'
+	import topWindow from "@/pages/component/topWindow.vue"
+	import goback from "@/pages/component/goback.vue"
+	import InformationModule from '@/pages/component/InformationModule.vue'
+	import InspectionModule from '@/pages/component/InspectionModule.vue'
+	import AuxiliaryModule from '@/pages/component/AuxiliaryModule.vue'
+	export default {
+		components: {
+			InformationModule,
+			InspectionModule,
+			AuxiliaryModule,
+			topWindow,
+			goback
+		},
+		data() {
+			return {
+				sn: "",
+				productObject: null,
+				informationData: null,
+				inspectionData: null,
+				auxiliaryData: null,
+				repairInformation: null,
+				current: "productInformation"
+			}
+		},
+		computed: {
+
+		},
+		onLoad(data) {
+			console.log(data);
+			if (data) {
+				this.sn = data.sn;
+			}
+			this.initData()
+		},
+		methods: {
+			initData() {
+				// uni.showLoading({title: '查询中...'})
+				getProductFind(this.sn).then(res => {
+					uni.hideLoading()
+					if (res.code == 0) {
+						console.log("sn查询结果", res)
+						this.productObject = res.data
+						this.initializationMethod()
+					} else {
+						uni.showToast({
+							icon: 'error',
+							title: this.$t('hdk.networkError'),
+						})
+					}
+				})
+			},
+			initializationMethod() {
+				//重新组装产品信息数据
+				this.informationData = {
+					lamp: this.productObject.productRespVO?.lamp || null,
+					lampPath: this.productObject.productRespVO?.lampPath || [require('@/static/images/noPhoto.png')],
+					sn: this.productObject.sn,
+					productName: this.productObject.productRespVO?.productName || null,
+					type: this.productObject.productRespVO?.type || null,
+					productionTime: this.productObject.productionTime,
+					productionUserName: this.productObject.productionUserName,
+					productDatasheet: this.productObject.productRespVO?.productDatasheet || null,
+					productDatasheetPath: this.productObject.productRespVO?.productDatasheetPath || [],
+					productManual: this.productObject.productRespVO?.productManual || null,
+					productManualPath: this.productObject.productRespVO?.productManualPath || []
+				};
+				console.log("产品信息", this.informationData);
+
+				this.repairInformation = {
+					sn: this.productObject.sn,
+					productName: this.productObject.productRespVO?.productName || null,
+					type: this.productObject.productRespVO?.type || null
+				}
+
+				//重新组装检验信息数据
+				this.inspectionData = {
+					softwareVersion: this.productObject.softwareVersion,
+					hardwareVersion: this.productObject.hardwareVersion,
+					checkTime: this.productObject.checkTime,
+					type: this.productObject.productRespVO?.type || null,
+					power: this.productObject.power,
+					powerFactor: this.productObject.powerFactor,
+					tightnessCheckFile: this.productObject.tightnessCheckFile,
+					tightnessCheckFilePath: this.productObject.tightnessCheckFilePath,
+					lightIntensityPhoto: [],
+					lightIntensityFile: ''
+				};
+				console.log("检验信息", this.inspectionData);
+				//重新组装附件信息数据
+				this.auxiliaryData = this.productObject.attachmentRespVOList || [];
+
+
+				// console.log("重新组装检验信息", this.inspectionData);
+				if (this.productObject.attachmentRespVOList === null) {
+					this.auxiliaryData = [];
+				} else {
+					this.auxiliaryData = this.productObject.attachmentRespVOList.map(obj => ({
+						...obj,
+						current: 0
+					}));
+				}
+				console.log("附件信息", this.auxiliaryData);
+				//产品数据转图片
+				if (this.productObject && this.productObject.productRespVO) {
+					const productRespVO = this.productObject.productRespVO;
+					// console.log("灯具", productRespVO);
+					// const modifiedManuals = this.generateDownloadUrls(productRespVO.lamp);
+					// this.informationData.lamp = modifiedManuals;
+					this.generateDownloadUrls(productRespVO.lampPath)
+						.then(modifiedManuals => {
+							// console.log("灯具==>", modifiedManuals);
+							this.informationData.lampPath = modifiedManuals;
+						})
+						.catch(error => {
+							console.error(error);
+						});
+				}
+				//光强数据转图片
+				if (this.productObject && this.productObject.lightIntensityPath) {
+					if (this.productObject.lightIntensityPath) {
+						this.generateDownloadUrls(this.productObject.lightIntensityPath)
+							.then(modifiedManuals => {
+								// console.log("光强==>", modifiedManuals);
+								this.inspectionData.lightIntensityPhoto = modifiedManuals.filter(url => this.isPicture(
+									url));
+								this.inspectionData.lightIntensityFile = modifiedManuals.filter(filename => !this
+									.isPicture(filename) && filename.includes('.'));
+								// 在这里可以访问已更新的inspectionData.lightIntensityPhoto和inspectionData.lightIntensityFile的值
+							})
+							.catch(error => {
+								console.error(error);
+							});
+					}
+				}
+				//附件信息转图片
+				if (this.auxiliaryData) {
+					this.auxiliaryData.forEach(attachment => {
+						if (attachment.productPicturePath) {
+							this.generateDownloadUrls(attachment.productPicturePath)
+								.then(modifiedPictures => {
+									// console.log("附件图片==>", modifiedPictures);
+									attachment.productPicturePath = modifiedPictures;
+								})
+								.catch(error => {
+									console.error(error);
+								});
+						}
+					});
+				}
+
+			},
+			jumpService() {
+				console.log(this.repairInformation);
+				uni.navigateTo({
+					url: "/pages/product/repairReport?repairpObject=" + encodeURIComponent(JSON.stringify(
+						this.repairInformation)),
+				})
+			},
+			generateDownloadUrls(filenames) {
+				// console.log("filenames", filenames)
+				if (!filenames || filenames.length === 0) {
+					// 如果 filenames 为空或者null，则执行相应的操作
+					return Promise.resolve(require('@/static/images/noPhoto.png'))
+				}
+				const modifiedFilenames = filenames.replace(/;+$/, '');
+				const modifiedUrls = modifiedFilenames.split(";").map(filename => {
+					const trimmedFilename = filename.trim();
+					if (trimmedFilename.endsWith('.png') || trimmedFilename.endsWith('.jpg')) {
+						// const encodedFilename = Buffer.from(trimmedFilename, 'utf-8').toString('base64');
+						const url = config.fileUrl + `/${trimmedFilename}`;
+						// console.log(url);
+						return this.checkUrlValidity(url).catch(error => {
+							// console.error(error);
+							// console.log("请求失败", trimmedFilename)
+							return Promise.resolve(require('@/static/images/noPhoto.png'));
+						});
+					} else if (trimmedFilename.includes('.')) {
+						return Promise.resolve(trimmedFilename);
+					} else {
+						return Promise.resolve(require('@/static/images/noPhoto.png'));
+					}
+				});
+
+				return Promise.all(modifiedUrls).then(results => {
+					const validUrls = results.filter(url => url !== null);
+					if (validUrls.length > 0) {
+						// console.log("有效地址",validUrls);
+						return validUrls;
+					} else {
+						return [require('@/static/images/noPhoto.png')];
+					}
+				});
+			},
+			checkUrlValidity(url) {
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url,
+						method: 'HEAD',
+						success(res) {
+							// console.log("检验地址",res);
+							if (res.statusCode >= 200 && res.statusCode < 400) {
+								resolve(url); // URL有效
+							} else {
+								// console.log("地址无效");
+								resolve(null); // URL无效
+							}
+						},
+						fail(err) {
+							reject(err); // 请求失败
+						}
+					});
+				});
+			},
+			isPicture(str) {
+				// 正则表达式判断是否为网址类型的字符串
+				const pictureRegex = /\.(jpg|jpeg|png|gif)$/i;
+				return pictureRegex.test(str);
+			},
+			handleItemClick(item) {
+				this.current = item;
+				console.log('点击的菜单项:', item);
+				// 在此处处理被点击的菜单项
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		width: 100%;
+		height: 100%;
+		background: #F9FAF9;
+	}
+
+	.ComponentsBody {
+		// width:100%;
+		// display: flex;
+		// justify-content: center;
+		// align-items: center;
+	}
+
+	// .productInformation{
+	// 	width: 100%;
+	// }
+
+	// .inspectionInformation{
+	// 	width: 100%;
+	// }
+
+	// .attachmentInformation{
+	// 	width: 100%;
+	// }
+
+	@media screen and (max-width: 767px) {
+		.repairReportBtnCss {
+			width: 100px;
+			height: 100px;
+			border-radius: 100px;
+			position: fixed;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			right: 0;
+			bottom: 100px;
+			// background-color: #00aeaa;
+		}
+
+		.repairReportTextCss {
+			position: absolute;
+			bottom: 30px;
+			color: #fff;
+			font-size: 10px;
+		}
+	}
+
+
+
+	// //PC端样式
+	@media screen and (min-width: 768px) {
+		.repairReportBtnCss {
+			width: 100px;
+			height: 100px;
+			border-radius: 100px;
+			position: fixed;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			right: 20px;
+			bottom: 100px;
+			// background-color: #00aeaa;
+		}
+		
+		.repairReportTextCss {
+			position: absolute;
+			bottom: 15px;
+			color: #fff;
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/invalidCode.vue b/pages/product/invalidCode.vue
new file mode 100644
index 0000000..f98206a
--- /dev/null
+++ b/pages/product/invalidCode.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="containers">
+		<topWindow></topWindow>
+		<view class="invalidPhoto">
+			<u-image src="/static/images/icon/invalidPhoto.png" width="400rpx" height="400rpx"></u-image>
+		</view>
+		<view class="flex-column">
+			<view class="snCodeText">{{$t('hdk.QRCodeContent')}}:{{snCode}}</view>
+			<!-- <view class="firstLine">
+        当前SN码不存在
+      </view>
+      <view class="secondLine">
+        请扫描正确的二维码
+      </view> -->
+			<view class="errorBar">
+				<view class="errorIcon">
+					<u-image width="44rpx" height="44rpx" src="/static/images/icon/warning.png"></u-image>
+				</view>
+				<view class="errorText">
+					{{isSNCode(snCode)?error1:error2}}
+				</view>
+			</view>
+		</view>
+		<view class="rescan" @click="rescan">
+			{{$t('hdk.Rescan')}}
+		</view>
+	</view>
+</template>
+
+<script>
+	import topWindow from "@/pages/component/topWindow.vue"
+	export default {
+		components: {
+			topWindow
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				snCode: "",
+				error1: this.$t('hdk.ErrorPrompt1'),
+				error2: this.$t('hdk.ErrorPrompt2')
+			}
+		},
+		computed: {
+
+		},
+		onLoad(data) {
+			console.log("无效参数", data);
+			this.snCode = data.snCode;
+		},
+		methods: {
+			rescan() {
+				uni.redirectTo({
+					url: '/pages/product/scan'
+				})
+			},
+			// 判断字符串是否为SN码格式
+			isSNCode(str) {
+				// SN码的正则表达式
+				const snRegex = /^[a-zA-Z0-9]+$/;
+				return snRegex.test(str);
+			},
+			// 判断字符串是否为其他非SN码格式
+			isNonSNCode(str) {
+				// 非SN码的正则表达式
+				const nonSNRegex = /^[A-Za-z0-9]{6,}$/;
+				return nonSNRegex.test(str);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.invalidPhoto {
+			margin: 80rpx 0 0 0;
+		}
+
+		.flex-column {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			text-align: center;
+			font-size: 28rpx;
+
+			.snCodeText {
+				margin: 20px 0 44px 0;
+				color: #333333;
+			}
+
+			.firstLine {
+				margin: 20px 0;
+				color: #333333;
+			}
+
+			.secondLine {
+				margin: 20px 0;
+				color: #333333;
+			}
+		}
+
+		.errorBar {
+			width: 702px;
+			height: 88px;
+			padding: 2px;
+			border-radius: 4px;
+			background-color: #fef1f1;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+
+			.errorIcon {
+				margin: 22px 20px;
+			}
+
+			.errorText {
+				font-size: 28rpx;
+				color: #6d727a;
+			}
+		}
+
+
+		.rescan {
+			width: 690px;
+			height: 88px;
+			margin: 50px 0 0 0;
+			padding: 2px;
+			background-color: #00aeaa;
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			color: #ffffff;
+			text-align: center;
+			line-height: 88px;
+			font-size: 32px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/repairReport.vue b/pages/product/repairReport.vue
new file mode 100644
index 0000000..ac6ada8
--- /dev/null
+++ b/pages/product/repairReport.vue
@@ -0,0 +1,467 @@
+<template>
+	<view class="containers">
+		<topWindow></topWindow>
+		<goback></goback>
+		<view class="content">
+			<u-form labelPosition="top" labelAlign="left" :model="modal" :rules="rules" ref="uForm"
+				:labelStyle="{fonSize:'26px',color:'#8B91A4',paddingLeft:'10px'}">
+				<view class="basicInformation">
+					<view class="title">{{$t('hdk.Basicinformation')}}<text
+							style="color:#8B91A4;">{{$t('hdk.Required')}}</text></view>
+					<view class="uform">
+						<u-form-item required :label="$t('hdk.SnCode')" labelWidth="50%" prop="formInfo.sn" borderBottom
+							ref="item1">
+							<u-input v-model="modal.formInfo.sn" maxlength="10" border="none"></u-input>
+						</u-form-item>
+						<u-form-item required :label="$t('hdk.ProductName')" labelWidth="50%"
+							prop="formInfo.productName" borderBottom ref="item2">
+							<u-input v-model="modal.formInfo.productName" maxlength="20" border="none"></u-input>
+						</u-form-item>
+						<u-form-item :label="$t('hdk.Model')" labelWidth="50%" prop="formInfo.type" borderBottom
+							ref="item3">
+							<u-input v-model="modal.formInfo.type" maxlength="20" border="none"></u-input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="basicInformation">
+					<view class="title">{{$t('hdk.ProblemDescription')}}<text
+							style="color:#8B91A4;">{{$t('hdk.Required')}}</text></view>
+					<view class="textAreaCss">
+						<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">
+						<u-upload upload-icon="plus" :fileList="fileList" @afterRead="afterRead"
+							@delete="deletePic" :previewFullImage="true" name="faultPicture" multiple :maxCount="5"
+							accept="image"></u-upload>
+					</view>
+				</view>
+				<view class="basicInformation">
+					<view class="title">{{$t('hdk.ContactInformation')}}<text
+							style="color:#8B91A4;">{{$t('hdk.Required')}}</text></view>
+					<view class="uform">
+						<u-form-item required :label="$t('hdk.AirportName')" labelWidth="50%"
+							prop="formInfo.airportName" borderBottom ref="item3">
+							<u-input v-model="modal.formInfo.airportName" maxlength="20" border="none"></u-input>
+						</u-form-item>
+						<u-form-item required :label="$t('hdk.Name')" labelWidth="50%" prop="formInfo.contactPersonName"
+							borderBottom ref="item4">
+							<u-input v-model="modal.formInfo.contactPersonName" maxlength="10" border="none"></u-input>
+						</u-form-item>
+						<u-form-item :label="$t('hdk.ContactInformation')" labelWidth="50%" prop="formInfo.phone"
+							borderBottom ref="item5">
+							<u-input v-model="modal.formInfo.contactPersonPhone" maxlength="20" border="none"></u-input>
+						</u-form-item>
+						<u-form-item required :label="$t('hdk.Email')" labelWidth="50%" prop="formInfo.email"
+							borderBottom ref="item6">
+							<u-input v-model="modal.formInfo.email" maxlength="20" border="none"></u-input>
+						</u-form-item>
+						<u-form-item :label="$t('hdk.DetailedAddress')" labelWidth="100%" prop="formInfo.address"
+							borderBottom ref="item7">
+							<u-input v-model="modal.formInfo.address" maxlength="30" border="none"></u-input>
+						</u-form-item>
+					</view>
+				</view>
+			</u-form>
+			<view class="submitBtn" @click="openModal()">
+				{{$t('hdk.ConfirmAndReport')}}
+			</view>
+			<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>
+				</view>
+			</u-modal>
+			<u-toast ref="uToast"></u-toast>
+		</view>
+	</view>
+</template>
+
+<script>
+	import topWindow from "@/pages/component/topWindow.vue"
+	import goback from "@/pages/component/goback.vue"
+	import {
+		createAFaultReport
+	} from "@/api/scan.js"
+	import config from '@/common/config'
+	export default {
+		components: {
+			topWindow,
+			goback
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				modal: {
+					formInfo: {
+						sn: "",
+						productName: "",
+						type: "",
+						repairDescribe: "",
+						picPath: "",
+						airportName: "",
+						contactPersonName: "",
+						contactPersonPhone: "",
+						email: "",
+						address: "",
+					},
+				},
+				fileList: [],
+				confirmModal: false,
+				title: "",
+				content: "",
+				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']
+					},
+				},
+			}
+		},
+		computed: {
+
+		},
+		onReady() {},
+		onLoad(data) {
+			if (data.repairpObject) {
+				const repairpObject = JSON.parse(decodeURIComponent(data.repairpObject))
+				console.log(repairpObject);
+				this.modal.formInfo = {
+					...this.modal.formInfo,
+					...repairpObject
+				};
+				console.log(this.modal.formInfo);
+			}
+		},
+		methods: {
+			deletePic(event) {
+				this.fileList.splice(event.index, 1)
+			},
+			async afterRead(event) {
+				console.log(event);
+				let that = this;
+				let lists = [].concat(event.file)
+				let fileListLen = that.fileList.length
+				lists.map((item) => {
+					that.fileList.push({
+						...item,
+						status: 'uploading',
+						message: that.$t('hdk.Uploading')
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await that.uploadFilePromise(lists[i].url)
+					let item = that.fileList[fileListLen]
+					that.fileList.splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						realUrl: result,
+						url: config.prefixUrl + result
+					}))
+					console.log(that.fileList);
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				console.log(url);
+				const filename = url.substring(url.indexOf('tmp/') + 4);
+				// return;
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: config.baseUrl + '/upload-file', 
+						header: {
+							'tenant-id': '1',
+							// 'Content-Type': 'multipart/form-data;'
+						},
+						filePath: url,
+						name: "file",
+						
+						success: (res) => {
+							console.log(res);
+							let data = JSON.parse(res.data);
+							console.log(data);
+							if (data.code === 0) {
+								setTimeout(() => {
+									resolve(data.data)
+								}, 500)
+							} else {
+								reject("")
+							}
+						}
+					});
+				})
+			},
+			openModal() {
+				this.$refs.uForm.validate().then(res => {
+					this.title = this.$t('hdk.Reminder');
+					this.content = this.$t('hdk.PromptContent');
+					this.confirmModal = true
+				})
+			},
+			submit() {
+				console.log(this.modal.formInfo);
+				this.$refs.uForm.validate().then(res => {
+					let ohterValidate = this.checkOtherItems()
+					if (ohterValidate) {
+						createAFaultReport(this.modal.formInfo).then(res => {
+							console.log(res);
+							if (res.code === 0) {
+								this.$refs.uToast.show({
+									type: 'success',
+									message: this.$t('hdk.SuccessfullyReported'),
+									iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png',
+									complete() {
+										uni.navigateBack(1)
+									}
+								})
+							} else if (res.code === 1400001001) {
+								this.$refs.uToast.show({
+									type: 'error',
+									icon: false,
+									message: this.$t('hdk.CheckSN'),
+									iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
+								})
+							}
+						})
+					} else {
+						this.$refs.uToast.show({
+							type: 'error',
+							icon: false,
+							message: this.$t('hdk.FillDescription'),
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
+						})
+					}
+				}).catch(errors => {
+					this.$refs.uToast.show({
+						type: 'error',
+						icon: false,
+						message: this.$t('hdk.CheckForUnfilledItems'),
+						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png'
+					})
+					console.log(errors);
+				})
+				this.confirmModal = false;
+			},
+			checkOtherItems() {
+				let data = this.modal.formInfo;
+				if (data.repairDescribe === "" && this.fileList.length <= 0) {
+					// uni.$u.toast('描述或图片未上传');
+					return false;
+				}
+				data.picPath = JSON.stringify(this.fileList.map(it => `${it.realUrl}`));
+				// delete data.fileList;
+				console.log(data.picPath);
+				return true;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background: #F2F4F3;
+	}
+	
+	/deep/.uni-input-input{
+		padding-left: 10px
+	}
+
+	.uform {
+		margin: 20px;
+		position:relative;
+	}
+
+	.textAreaCss {
+		margin: 30px;
+		background-color: #f8f9fd;
+	}
+
+	.uploadCss {
+		margin: 30px;
+	}
+
+	/deep/.u-modal__title {
+		display: flex;
+		justify-content: center;
+	}
+	
+	
+
+	//移动端样式
+	@media screen and (max-width: 767px) {
+		.title {
+			min-width: 114px;
+			margin: 20px 0 0 15px;
+			font-size: 15px;
+			background-color: rgba(255, 255, 255, 0);
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			color: #333333;
+			text-align: left;
+		}
+		.content{
+			width: 100%;
+		}
+
+		.basicInformation {
+			width: 95%;
+			height: auto;
+			padding: 2px;
+			border-radius: 10px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+			margin: 10px 12px;
+			padding-bottom: 80px;
+		}
+
+		.submitBtn {
+			width: 350px;
+			height: 40px;
+			padding: 2px;
+			margin: 24px;
+			position: fixed;
+			bottom: 0px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 8px;
+			background-color: #00aeaa;
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			color: #ffffff;
+			text-align: center;
+			line-height: normal;
+			z-index: 999;
+		}
+		
+		.contentTextCss {
+			font-size: 14px;
+			color: #999999;
+		}
+	}
+
+	//PC端样式
+	@media screen and (min-width: 768px) {
+		.title {
+			min-width: 228px;
+			margin: 40px 0 0 30px;
+			font-size: 30px;
+			background-color: rgba(255, 255, 255, 0);
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			color: #333333;
+			text-align: left;
+		}
+		
+		.contentTextCss {
+			font-size: 20px;
+			color: #999999;
+		}
+		
+		.content{
+			width: 80%;
+			position: relative;
+		}
+		
+		/deep/.u-modal{
+			width: 500px !important;
+		}
+		
+		/deep/.u-modal__title{
+			height: 80px;
+			font-size: 24px
+		}
+		
+		/deep/.u-modal__content{
+			height: 80px;
+		}
+		
+		/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;
+		}
+
+		.basicInformation {
+			width: 100%;
+			height: auto;
+			padding: 2px;
+			border-radius: 20px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+			margin: 20px 24px;
+			padding-bottom: 40px;
+		}
+
+		.submitBtn {
+			width: 500px;
+			height: 39px;
+			padding: 2px;
+			position: fixed;
+			left: 0;right: 0;
+			bottom: 30px;
+			margin: 0 auto;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 4px;
+			background-color: #00aeaa;
+			box-sizing: border-box;
+			font-family: '苹方 中等', '苹方', sans-serif;
+			color: #ffffff;
+			text-align: center;
+			line-height: normal;
+			z-index: 999;
+		}
+	}
+
+	
+</style>
\ No newline at end of file
diff --git a/pages/product/scan.vue b/pages/product/scan.vue
new file mode 100644
index 0000000..4b56906
--- /dev/null
+++ b/pages/product/scan.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="containers">
+		<topWindow></topWindow>
+		<QrScan ref="qrcode" @ok="getResult" @err="geterror" v-if="open" />
+	</view>
+</template>
+
+<script>
+	import topWindow from "@/pages/component/topWindow.vue"
+	import QrScan from "@/pages/component/QrScan.vue"
+	import config from '@/common/config.js'
+	import {
+		getProductFind
+	} from '@/api/scan'
+	var browser = { // 判断浏览器内核
+		versions: (function() {
+			var u = navigator.userAgent;
+			return {
+				trident: u.indexOf('Trident') > -1, //IE内核
+				presto: u.indexOf('Presto') > -1, //opera内核
+				webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核
+				gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核
+				weixin: u.indexOf('MicroMessenger') > -1, //是否微信 （2015-01-22新增）
+			};
+		})(),
+	};
+	export default {
+		components: {
+			QrScan,
+			topWindow
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				open: false
+			}
+		},
+		computed: {
+
+		},
+		mounted() {
+			if (browser.versions.webKit || browser.versions.weixin || browser.versions.gecko) {
+				this.open = true;
+			} else {
+				Toast('Browser not supported');
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			getResult(sn) {
+				console.log(sn);
+				this.open = false;
+				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) {
+						uni.navigateTo({
+							url: '/pages/product/invalidCode?snCode='+sncode,
+							success() {
+								this.open = true
+							}
+						});
+					} else {
+						uni.navigateTo({
+							url: "/pages/product/index?sn=" + sncode
+						})
+					}
+				})
+
+			},
+			geterror(e) {
+				console.log(e);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		width: 100vw;
+	}
+</style>
\ No newline at end of file
diff --git a/postcss.config.js b/postcss.config.js
index 02c01b1..1fe9ea2 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -9,7 +9,7 @@ module.exports = {
      fontViewportUnit: 'px', // 字体使用的视口单位
      // 需要忽略的CSS选择器，不会转为视口单位，使用原有的px等单位。
      // 下面配置表示类名中含有'keep-px'都不会被转换
-     selectorBlackList: ['keep-px','u-modal','u-form-item'], 
+     selectorBlackList: ['keep-px','u-modal','u-form-item','u-upload',"uni-input"], 
      minPixelValue: 1, // 设置最小的转换数值，如果为1的话，只有大于1的值会被转换
      mediaQuery: false, // 媒体查询里的单位是否需要转换单位
      replace: true, //  是否直接更换属性值，而不添加备用属性
--
libgit2 0.21.2