diff --git a/weapp/app.js b/weapp/app.js
index d8a5514..5ea2c11 100644
--- a/weapp/app.js
+++ b/weapp/app.js
@@ -1,40 +1,40 @@
// app.js
App({
- onLaunch() { },
- globalData: {
- userInfo: null,
- baseUrl: 'http://10.8.16.221:4900', //api 本地环境
- webUrl: "http://10.8.16.221:5900/", //web 本地环境
- imgUrl: 'http://10.8.16.221:5900/_file-server/', //文件 本地环境
- key: 'ODQBZ-3FZAU-6VIVL-2XXNM-F7CP7-WVFCY' //获取位置信息
- },
- onShow(e) {
- // 检查是否有更新
- const updateManager = wx.getUpdateManager();
- updateManager.onCheckForUpdate(function (res) {
- // 请求完新版本信息的回调
- console.log(res.hasUpdate);
- });
- updateManager.onUpdateReady(function () {
- wx.showModal({
- title: "更新提示",
- content: "新版本已经准备好，是否重启应用？",
- success(res) {
- if (res.confirm) {
- // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
- updateManager.applyUpdate();
- }
- }
- });
- });
+ onLaunch () { },
+ globalData: {
+ userInfo: null,
+ baseUrl: 'http://10.8.30.112:4900', //api 本地环境
+ webUrl: "http://10.8.30.112:5900/", //web 本地环境
+ imgUrl: 'http://10.8.30.112:5900/_file-server/', //文件 本地环境
+ key: 'ODQBZ-3FZAU-6VIVL-2XXNM-F7CP7-WVFCY' //获取位置信息
+ },
+ onShow (e) {
+ // 检查是否有更新
+ const updateManager = wx.getUpdateManager();
+ updateManager.onCheckForUpdate(function (res) {
+ // 请求完新版本信息的回调
+ console.log(res.hasUpdate);
+ });
+ updateManager.onUpdateReady(function () {
+ wx.showModal({
+ title: "更新提示",
+ content: "新版本已经准备好，是否重启应用？",
+ success (res) {
+ if (res.confirm) {
+ // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+ updateManager.applyUpdate();
+ }
+ }
+ });
+ });
- updateManager.onUpdateFailed(function () {
- // 新版本下载失败
- wx.showToast({
- title: "新版本下载失败",
- icon: "none",
- duration: 1000
- });
- });
- }
+ updateManager.onUpdateFailed(function () {
+ // 新版本下载失败
+ wx.showToast({
+ title: "新版本下载失败",
+ icon: "none",
+ duration: 1000
+ });
+ });
+ }
})
diff --git a/weapp/app.json b/weapp/app.json
index a7fab2b..a9321fa 100644
--- a/weapp/app.json
+++ b/weapp/app.json
@@ -5,16 +5,19 @@
"pages/myInfo/myInfo",
"pages/overview/overview"
],
- "subPackages": [{
- "root": "package",
- "pages": [
- "polling/polling",
- "polling/inspectionRecordDetail/inspectionRecordDetail",
- "basic/basic",
- "startInspection/startInspection",
- "inspectionInput/inspectionInput"
- ]
- }],
+ "subPackages": [
+ {
+ "root": "package",
+ "pages": [
+ "polling/polling",
+ "polling/inspectionRecordDetail/inspectionRecordDetail",
+ "basic/basic",
+ "startInspection/startInspection",
+ "inspectionInput/inspectionInput",
+ "troubleshooting/index"
+ ]
+ }
+ ],
"window": {
"backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#1979ff",
@@ -25,12 +28,14 @@
"selectedColor": "#2F54FF",
"borderStyle": "black",
"backgroundColor": "#ffffff",
- "list": [{
+ "list": [
+ {
"pagePath": "pages/index/index",
"iconPath": "images/tabBar/icon_polling.png",
"selectedIconPath": "images/tabBar/icon_polling_active.png",
"text": "巡检总览"
- }, {
+ },
+ {
"pagePath": "pages/overview/overview",
"iconPath": "images/tabBar/icon_menu.png",
"selectedIconPath": "images/tabBar/icon_menu_active.png",
diff --git a/weapp/package/troubleshooting/index.js b/weapp/package/troubleshooting/index.js
new file mode 100644
index 0000000..b51d75d
--- /dev/null
+++ b/weapp/package/troubleshooting/index.js
@@ -0,0 +1,66 @@
+// package/bindTroubleshooting/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/weapp/package/troubleshooting/index.json b/weapp/package/troubleshooting/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/weapp/package/troubleshooting/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/weapp/package/troubleshooting/index.wxml b/weapp/package/troubleshooting/index.wxml
new file mode 100644
index 0000000..6f32331
--- /dev/null
+++ b/weapp/package/troubleshooting/index.wxml
@@ -0,0 +1,2 @@
+
+package/bindTroubleshooting/index.wxml
diff --git a/weapp/package/troubleshooting/index.wxss b/weapp/package/troubleshooting/index.wxss
new file mode 100644
index 0000000..c0f73fc
--- /dev/null
+++ b/weapp/package/troubleshooting/index.wxss
@@ -0,0 +1 @@
+/* package/bindTroubleshooting/index.wxss */
\ No newline at end of file
diff --git a/weapp/pages/overview/overview.js b/weapp/pages/overview/overview.js
index 375a9d0..ca01b03 100644
--- a/weapp/pages/overview/overview.js
+++ b/weapp/pages/overview/overview.js
@@ -15,6 +15,12 @@ Page({
})
},
+ bindTroubleshooting() {
+ wx.navigateTo({
+ url: '/package/troubleshooting/index',
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
diff --git a/weapp/pages/overview/overview.wxml b/weapp/pages/overview/overview.wxml
index 8360bb5..f95e500 100644
--- a/weapp/pages/overview/overview.wxml
+++ b/weapp/pages/overview/overview.wxml
@@ -1,18 +1,18 @@
-
+
-
-
- 巡检
-
-
-
+
+
+ 巡检
+
+
+
+
+ 问题处理
+
+
+
\ No newline at end of file
diff --git a/weapp/project.config.json b/weapp/project.config.json
index faa4199..62fc226 100644
--- a/weapp/project.config.json
+++ b/weapp/project.config.json
@@ -41,7 +41,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.19.4",
- "appid": "wxdd82ae635b22ccdb",
+ "appid": "wx79ff58f03d17f24d",
"projectname": "miniprogram-92",
"condition": {},
"editorSetting": {
diff --git a/weapp/project.private.config.json b/weapp/project.private.config.json
index 5fd81b0..86fa333 100644
--- a/weapp/project.private.config.json
+++ b/weapp/project.private.config.json
@@ -1,6 +1,8 @@
{
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"setting": {
- "urlCheck": false
- }
+ "urlCheck": false,
+ "compileHotReLoad": true
+ },
+ "projectname": "%E8%BF%90%E7%BB%B4%E5%B7%A1%E6%A3%80"
}
\ No newline at end of file