diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5823d47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+/unpackage/dist/*
+/unpackage/cache/*
+/unpackage/release/*
+/node_modules/*
+/.idea/*
+/.hbuilderx/
+/.vscode/
diff --git a/api/scan.js b/api/scan.js
index d399274..be0490d 100644
--- a/api/scan.js
+++ b/api/scan.js
@@ -9,3 +9,6 @@ export const getProductFind = sn => http.get('/business/product-manage/find?sn=
//二维码识别
export const getWxScan = data => http.post('/business/wx/scan', data)
+
+// 创建故障报修
+export const createAFaultReport = data => http.post('/business/repair/create', data)
diff --git a/common/config.js b/common/config.js
index 76c46c0..c094a08 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,20 +1,28 @@
module.exports = {
- //后端接口地址
- // baseUrl: 'http://192.168.0.41:48080/admin-api',
- //图片预览地址
- //测试环境
- fileUrl:"https://hdk-aero.ip-server.cn/hdk",
- baseUrl: 'https://hdk-aero.ip-server.cn/admin-api',
- //正式环境
- // fileUrl:"https://qr.hdk-aero.com/hdk",
- // baseUrl: 'https://qr.hdk-aero.com/admin-api',
- // 超时
- timeout: 30000,
- // 禁用 Cookie 等信息
- withCredentials: false,
- header: {
- //租户ID
- 'tenant-id': 1,
- 'Content-Type':'application/json'
- }
-}
+ //开发环境
+ // prefixUrl: "http://123.60.140.65:18180", //仅带前缀,用于拼接维护报修页图片预览地址
+ // fileUrl: "http://123.60.140.65:18180/hdk",
+ // baseUrl: 'http://123.60.140.65:18180/admin-api',
+
+
+
+ //测试环境
+ prefixUrl: "https://hdk-aero.ip-server.cn", //仅带前缀,用于拼接维护报修页图片预览地址
+ fileUrl: "https://hdk-aero.ip-server.cn/hdk",
+ baseUrl: 'https://hdk-aero.ip-server.cn/admin-api',
+
+
+ //正式环境
+ // prefixUrl:"https://qr.hdk-aero.com", //仅带前缀,用于拼接维护报修页图片预览地址
+ // fileUrl:"https://qr.hdk-aero.com/hdk",
+ // baseUrl: 'https://qr.hdk-aero.com/admin-api',
+ // 超时
+ timeout: 30000,
+ // 禁用 Cookie 等信息
+ withCredentials: false,
+ header: {
+ //租户ID
+ 'tenant-id': 1,
+ 'Content-Type': 'application/json'
+ }
+}
\ No newline at end of file
diff --git a/locale/en.json b/locale/en.json
index 22634fd..8064dfe 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -49,5 +49,16 @@
"hdk.AttachmentModel":"AttachmentModel",
"hdk.OrderCode":"OrderCode",
"hdk.AttachmentIsEmpty":"AttachmentIsEmpty",
- "hdk.scan":"scan"
+ "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.Name":"Name",
+ "hdk.ContactInformations":"ContactInformation",
+ "hdk.Email":"Email",
+ "hdk.DetailedAddress":"DetailedAddress(e.g.**Street**)",
+ "hdk.ConfirmAndReport":"ConfirmAndReport",
+ "hdk.Repair":"Repair"
}
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 596abf5..d3e6121 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -49,5 +49,17 @@
"hdk.AttachmentModel":"附件型号",
"hdk.OrderCode":"订货编码",
"hdk.AttachmentIsEmpty":"附件为空",
- "hdk.scan":"扫一扫"
+ "hdk.scan":"扫一扫",
+ "hdk.Required":"(必填)",
+ "hdk.Basicinformation":"基本信息",
+ "hdk.ProblemDescription":"问题描述",
+ "hdk.DescriptionPlaceholder":"请将所遇问题情况和具体位置描述准确,更有利于解决。",
+ "hdk.ContactInformation":"联系方式",
+ "hdk.AirportName":"机场名",
+ "hdk.Name":"姓名",
+ "hdk.ContactInformations":"联系方式",
+ "hdk.Email":"邮箱",
+ "hdk.DetailedAddress":"详细地址(例如**街**号)",
+ "hdk.ConfirmAndReport":"确认并上报",
+ "hdk.Repair":"维护报修"
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0935343..d9f51fd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "hdk-web-query-service",
- "appid" : "__UNI__E90A703",
+ "appid" : "__UNI__BB59251",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : "100",
@@ -71,7 +71,8 @@
"vueVersion" : "2",
"h5" : {
"router" : {
- "mode" : "history"
+ "mode" : "history",
+ "base" : "/hdk-web/"
},
"devServer" : {
"https" : false
diff --git a/mobile/pages/component/AuxiliaryModule.vue b/mobile/pages/component/AuxiliaryModule.vue
index af6a39e..9042af4 100644
--- a/mobile/pages/component/AuxiliaryModule.vue
+++ b/mobile/pages/component/AuxiliaryModule.vue
@@ -1,153 +1,145 @@
-
-
-
-
-
- {{$t('hdk.AttachmentModel')}}:{{item.type}}
-
- currents[index] = e.current"
- :indicatorStyle="{bottom:'20px',right:'5px'}">
-
- {{$t('hdk.OrderCode')}}:{{item.orderCode}}
-
-
-
+
+
+
+
+
+ {{$t('hdk.AttachmentModel')}}:{{item.type}}
+
+ currents[index] = e.current"
+ :indicatorStyle="{bottom:'20px',right:'5px'}">
+
+ {{$t('hdk.OrderCode')}}:{{item.orderCode}}
+
+
+
+
\ No newline at end of file
diff --git a/mobile/pages/component/InformationModule.vue b/mobile/pages/component/InformationModule.vue
index fd5ab9c..bc09ff6 100644
--- a/mobile/pages/component/InformationModule.vue
+++ b/mobile/pages/component/InformationModule.vue
@@ -1,162 +1,196 @@
-
-
-
-
- {{$t('hdk.productInformation')}}
-
-
- {{$t('hdk.SnCode')}}
- {{informationData.sn || ""}}
-
-
- {{$t('hdk.ProductName')}}
- {{informationData.productName || ""}}
-
-
- {{$t('hdk.Model')}}
- {{informationData.type || ""}}
-
-
- {{$t('hdk.DateOfProduction')}}
- {{$u.timeFormat(informationData.productionTime, 'yyyy年mm月dd日') || ""}}
-
-
- {{$t('hdk.ProductionPersonnel')}}
- {{informationData.productionUserName || ""}}
-
-
-
-
- {{$t('hdk.ProductSpecification')}}
-
-
-
-
-
-
- {{$t('hdk.ProductManual')}}
-
-
-
-
+
+
+
+
+ {{$t('hdk.productInformation')}}
+
+
+ {{$t('hdk.SnCode')}}
+ {{informationData.sn || ""}}
+
+
+ {{$t('hdk.ProductName')}}
+ {{informationData.productName || ""}}
+
+
+ {{$t('hdk.Model')}}
+ {{informationData.type || ""}}
+
+
+ {{$t('hdk.DateOfProduction')}}
+ {{$u.timeFormat(informationData.productionTime, 'yyyy年mm月dd日') || ""}}
+
+
+ {{$t('hdk.ProductionPersonnel')}}
+ {{informationData.productionUserName || ""}}
+
+
+
+
+ {{$t('hdk.ProductSpecification')}}
+
+
+
+
+
+
+ {{$t('hdk.ProductManual')}}
+
+
+
+
+
\ No newline at end of file
diff --git a/mobile/pages/component/InspectionModule.vue b/mobile/pages/component/InspectionModule.vue
index c79b557..bcd1352 100644
--- a/mobile/pages/component/InspectionModule.vue
+++ b/mobile/pages/component/InspectionModule.vue
@@ -1,190 +1,225 @@
-
-
-
-
- {{$t('hdk.inspectionInformation')}}
-
-
- {{$t('hdk.SoftwareVersion')}}
- {{inspectionData.softwareVersion || ''}}
-
-
- {{$t('hdk.HardwareVersion')}}
- {{inspectionData.hardwareVersion || ''}}
-
-
- {{$t('hdk.TestDate')}}
- {{$u.timeFormat(inspectionData.checkTime, 'yyyy年mm月dd日') || ''}}
-
-
-
-
-
- {{$t('hdk.ElectricalParameters')}}
-
-
- {{$t('hdk.Power')}}
- {{inspectionData.power || ''}}
-
-
- {{$t('hdk.PowerFactor')}}
- {{inspectionData.powerFactor || ''}}
-
-
-
-
-
- {{$t('hdk.LightIntensityDistribution')}}
-
-
-
-
-
-
-
-
-
- {{$t('hdk.AirTightnessInspectionDocuments')}}
-
-
-
-
-
+
+
+ {{$t('hdk.inspectionInformation')}}
+
+
+ {{$t('hdk.SoftwareVersion')}}
+ {{inspectionData.softwareVersion || ''}}
+
+
+ {{$t('hdk.HardwareVersion')}}
+ {{inspectionData.hardwareVersion || ''}}
+
+
+ {{$t('hdk.TestDate')}}
+ {{$u.timeFormat(inspectionData.checkTime, 'yyyy年mm月dd日') || ''}}
+
+
+
+
+
+ {{$t('hdk.ElectricalParameters')}}
+
+
+ {{$t('hdk.Power')}}
+ {{inspectionData.power || ''}}
+
+
+ {{$t('hdk.PowerFactor')}}
+ {{inspectionData.powerFactor || ''}}
+
+
+
+
+
+ {{$t('hdk.LightIntensityDistribution')}}
+
+
+
+
+
+
+
+
+
+ {{$t('hdk.AirTightnessInspectionDocuments')}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mobile/pages/component/goback.vue b/mobile/pages/component/goback.vue
new file mode 100644
index 0000000..59b6bba
--- /dev/null
+++ b/mobile/pages/component/goback.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mobile/pages/component/topWindow.vue b/mobile/pages/component/topWindow.vue
index 16ebf03..1f98a8b 100644
--- a/mobile/pages/component/topWindow.vue
+++ b/mobile/pages/component/topWindow.vue
@@ -1,7 +1,7 @@
-
+
@@ -13,20 +13,22 @@
-
- {{$t('hdk.productInformation')}}
- {{$t('hdk.inspectionInformation')}}
- {{$t('hdk.attachmentInformation')}}
+
+ {{$t('hdk.productInformation')}}
+ {{$t('hdk.inspectionInformation')}}
+ {{$t('hdk.attachmentInformation')}}
+
+ {{$t('locale.en')}}
+ {{$t('locale.zh-hans')}}
+
-
- {{$t('locale.en')}}
- {{$t('locale.zh-hans')}}
-
+
@@ -50,24 +52,25 @@
mounted() {
var url = window.location.href;
var lang = this.getQueryString('lang');
- console.log("地址携带语种",lang);
- if(lang === "zh"){
+ 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"){
+ } else if (lang === "en") {
this.$i18n.locale = 'en';
uni.setLocale('en');
this.selectedLanguage = `${this.$t('index.language')}:${this.$t('locale.en')}`;
- }else{
+ } else {
let Localelang = uni.getLocale();
- console.log("本地语言",Localelang);
- this.selectedLanguage = Localelang == 'en'?`${this.$t('index.language')}:${this.$t('locale.en')}`:`${this.$t('index.language')}:${this.$t('locale.zh-hans')}`
+ 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));
+ const url = new URL(decodeURIComponent(location.href));
return url.searchParams.get(key);
},
handleClick(item) {
@@ -108,19 +111,20 @@
width: 100vw;
background-color: #00AEAA;
}
- .nav-items{
+
+ .nav-items {
background: #000;
}
-
- .b-navCss{
+
+ .b-navCss {
color: #fff;
}
-
- #nav-collapse{
+
+ #nav-collapse {
height: 100%;
}
- .activeCSS{
+ .activeCSS {
/* background: rgba(255, 255, 255, 0.5); */
/* color: #000 !important; */
diff --git a/mobile/pages/homePage/index.vue b/mobile/pages/homePage/index.vue
index ad8689e..9ff4a55 100644
--- a/mobile/pages/homePage/index.vue
+++ b/mobile/pages/homePage/index.vue
@@ -6,7 +6,7 @@
{{$t('hdk.tips')}}
+ @change="handleChange" v-model="SNcode">
{{$t('hdk.search')}}
diff --git a/mobile/pages/product/index.vue b/mobile/pages/product/index.vue
index 1602e6e..ac1bc3d 100644
--- a/mobile/pages/product/index.vue
+++ b/mobile/pages/product/index.vue
@@ -1,25 +1,35 @@
+
-
-
+
+
+
-
+
-
+
+
+
+ {{$t("hdk.Repair")}}
+
-
+
\ No newline at end of file
diff --git a/mobile/pages/product/repairReport.vue b/mobile/pages/product/repairReport.vue
new file mode 100644
index 0000000..6b5f6d8
--- /dev/null
+++ b/mobile/pages/product/repairReport.vue
@@ -0,0 +1,432 @@
+
+
+
+
+
+
+
+ {{$t('hdk.Basicinformation')}}{{$t('hdk.Required')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('hdk.ProblemDescription')}}{{$t('hdk.Required')}}
+
+
+
+
+
+
+
+
+ {{$t('hdk.ContactInformation')}}{{$t('hdk.Required')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('hdk.ConfirmAndReport')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 42e28c9..98b63d9 100644
--- a/pages.json
+++ b/pages.json
@@ -3,15 +3,15 @@
{
"path": "mobile/pages/homePage/index",
"style": {
- "navigationStyle":"custom"
+ "navigationStyle": "custom"
// "navigationBarTitleText": "%index.title%"
}
- },{
+ }, {
"path": "mobile/pages/product/index",
"style": {
- "navigationStyle":"custom"
+ "navigationStyle": "custom"
}
- },{
+ }, {
"path": "mobile/pages/component/component",
"style": {
"navigationBarTitleText": "%index.component%",
@@ -20,12 +20,17 @@
}, {
"path": "mobile/pages/product/scan",
"style": {
- "navigationStyle":"custom"
+ "navigationStyle": "custom"
}
- },{
+ }, {
"path": "mobile/pages/product/invalidCode",
"style": {
- "navigationStyle":"custom"
+ "navigationStyle": "custom"
+ }
+ }, {
+ "path": "mobile/pages/product/repairReport",
+ "style": {
+ "navigationStyle": "custom"
}
}
],
@@ -56,4 +61,4 @@
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
-}
+}
\ No newline at end of file
diff --git a/postcss.config.js b/postcss.config.js
index 04a7970..02c01b1 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -9,7 +9,7 @@ module.exports = {
fontViewportUnit: 'px', // 字体使用的视口单位
// 需要忽略的CSS选择器,不会转为视口单位,使用原有的px等单位。
// 下面配置表示类名中含有'keep-px'都不会被转换
- selectorBlackList: ['keep-px'],
+ selectorBlackList: ['keep-px','u-modal','u-form-item'],
minPixelValue: 1, // 设置最小的转换数值,如果为1的话,只有大于1的值会被转换
mediaQuery: false, // 媒体查询里的单位是否需要转换单位
replace: true, // 是否直接更换属性值,而不添加备用属性
diff --git a/static/images/icon/back.png b/static/images/icon/back.png
new file mode 100644
index 0000000..1d278ab
Binary files /dev/null and b/static/images/icon/back.png differ
diff --git a/static/images/icon/repair.png b/static/images/icon/repair.png
new file mode 100644
index 0000000..795cae5
Binary files /dev/null and b/static/images/icon/repair.png differ
--
libgit2 0.21.2