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 @@ + \ 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 @@ + \ 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 @@ + \ 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 @@