农业云H5项目公共配置、公共状态管理配置优化

agrcloud-config/index.config.js

@@ -5,7 +5,8 @@ const CONFIG = {
     baseUrl: '/dev-api', // 后台接口请求地址
     hostUrl: '', // H5地址(前端运行地址)
     websocketUrl: '', // websocket服务端地址
-    weixinAppId: '' // 微信公众号appid
+    weixinAppId: '', // 微信公众号appid
+    amapKey: '7c2a2ee070cfafadcdc8243e6688d5d3' // 高德开放平台web服务key
   },
   // 生产环境配置
   production: {
@@ -13,7 +14,8 @@ const CONFIG = {
     baseUrl: '/prod-api', // 后台接口请求地址
     hostUrl: '', // H5地址(前端运行地址)
     websocketUrl: '', // websocket服务端地址
-    weixinAppId: '' // 微信公众号appid
+    weixinAppId: '', // 微信公众号appid
+    amapKey: '' // 高德开放平台web服务key
   }
 
 };

agrcloud-store/getters.js

@@ -7,9 +7,9 @@ const getters = {
   complaintsDetailsObj: state => state.complaintsDetails.itemData,
   regulationsDetailsObj: state => state.regulationsDetails.itemData,
   expertsModalObj: state => state.expertsModal.itemData,
-  expertsDetailObj: state => state.expertsDetail.itemData,
-  monitoringDetailObj: state => state.monitoringDetail.itemData,
-  noticeDetailObj: state => state.noticeDetail.itemData
+  expertsDetailsObj: state => state.expertsDetails.itemData,
+  monitoringDetailsObj: state => state.monitoringDetails.itemData,
+  noticeDetailsObj: state => state.noticeDetails.itemData
 };
 
 export default getters;

agrcloud-store/index.js

@@ -8,9 +8,9 @@ import Vuex from 'vuex';
 import complaintsDetails from './modules/complaintsdetails';
 import regulationsDetails from './modules/regulationsdetails';
 import expertsModal from './modules/expertsmodal';
-import expertsDetail from './modules/expertsdetail';
-import monitoringDetail from './modules/monitoringdetail';
-import noticeDetail from './modules/noticedetail';
+import expertsDetails from './modules/expertsdetails';
+import monitoringDetails from './modules/monitoringdetails';
+import noticeDetails from './modules/noticedetails';
 import getters from './getters'
 
 Vue.use(Vuex);
@@ -20,9 +20,9 @@ const store = new Vuex.Store({
     complaintsDetails,
     regulationsDetails,
     expertsModal,
-    expertsDetail,
-    monitoringDetail,
-    noticeDetail
+    expertsDetails,
+    monitoringDetails,
+    noticeDetails
   },
   getters
 });

agrcloud-store/modules/expertsdetail.js

@@ -1,40 +0,0 @@
-/**
- * 封装历史投诉列表项数据缓存
- * @author Rockery(1113269755@qq.com)
- */
-
-const expertsDetail = {
-  state: {
-    itemData: {}
-  },
-
-  mutations: {
-    SET_ITEMDATA: (state, itemData) => {
-      state.itemData = itemData;
-    },
-    CLEAR_ITEMDATA: (state, itemData) => {
-      state.itemData = itemData;
-    }
-  },
-
-  actions: {
-    SetExpertsDetail({ commit }, itemData) {
-      return new Promise((resolve, reject) => {
-        if (itemData) {
-          commit('SET_ITEMDATA', itemData);
-          resolve();
-        } else {
-          reject('error');
-        }
-      });
-    },
-    ClearExpertsDetail({ commit }) {
-      return new Promise(resolve => {
-        commit('CLEAR_ITEMDATA', {});
-        resolve()
-      });
-    }
-  }
-}
-
-export default expertsDetail

agrcloud-store/modules/monitoringdetail.js

@@ -1,40 +0,0 @@
-/**
- * 封装历史投诉列表项数据缓存
- * @author Rockery(1113269755@qq.com)
- */
-
-const monitoringDetail = {
-  state: {
-    itemData: {}
-  },
-
-  mutations: {
-    SET_ITEMDATA: (state, itemData) => {
-      state.itemData = itemData;
-    },
-    CLEAR_ITEMDATA: (state, itemData) => {
-      state.itemData = itemData;
-    }
-  },
-
-  actions: {
-    SetMonitoringDetail({ commit }, itemData) {
-      return new Promise((resolve, reject) => {
-        if (itemData) {
-          commit('SET_ITEMDATA', itemData);
-          resolve();
-        } else {
-          reject('error');
-        }
-      });
-    },
-    ClearMonitoringDetail({ commit }) {
-      return new Promise(resolve => {
-        commit('CLEAR_ITEMDATA', {});
-        resolve()
-      });
-    }
-  }
-}
-
-export default monitoringDetail

agrcloud-store/modules/noticedetail.js

@@ -1,40 +0,0 @@
-/**
- * 封装历史投诉列表项数据缓存
- * @author Rockery(1113269755@qq.com)
- */
-
-const noticeDetail = {
-  state: {
-    itemData: {}
-  },
-
-  mutations: {
-    SET_ITEMDATA: (state, itemData) => {
-      state.itemData = itemData;
-    },
-    CLEAR_ITEMDATA: (state, itemData) => {
-      state.itemData = itemData;
-    }
-  },
-
-  actions: {
-    SetNoticeDetail({ commit }, itemData) {
-      return new Promise((resolve, reject) => {
-        if (itemData) {
-          commit('SET_ITEMDATA', itemData);
-          resolve();
-        } else {
-          reject('error');
-        }
-      });
-    },
-    ClearNoticeDetail({ commit }) {
-      return new Promise(resolve => {
-        commit('CLEAR_ITEMDATA', {});
-        resolve()
-      });
-    }
-  }
-}
-
-export default noticeDetail

manifest.json

@@ -1,100 +1,110 @@
 {
-    "name" : "AgriculturalCloud-h5-UI",
-    "appid" : "__UNI__DE5C136",
-    "description" : "修文农业云公共服务系统",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "safearea" : {
-            "bottom" : {
-                "offset" : "none"
-            }
-        },
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
+  "name": "AgriculturalCloud-h5-UI",
+  "appid": "__UNI__DE5C136",
+  "description": "修文农业云公共服务系统",
+  "versionName": "1.0.0",
+  "versionCode": "100",
+  "transformPx": false,
+  /* 5+App特有相关 */
+  "app-plus": {
+    "safearea": {
+      "bottom": {
+        "offset": "none"
+      }
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wxc256e348c4032ebd",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
+    "usingComponents": true,
+    "nvueCompiler": "uni-app",
+    "compilerVersion": 3,
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
     },
-    "mp-alipay" : {
-        "usingComponents" : true
+    /* 模块配置 */
+    "modules": {},
+    /* 应用发布信息 */
+    "distribute": {
+      /* android打包配置 */
+      "android": {
+        "permissions": [
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      /* ios打包配置 */
+      "ios": {}
+    }
+  },
+  /* 快应用特有相关 */
+  "quickapp": {},
+  /* 小程序特有相关 */
+  "mp-weixin": {
+    "appid": "wxc256e348c4032ebd",
+    "setting": {
+      "urlCheck": false
     },
-    "mp-baidu" : {
-        "usingComponents" : true
+    "usingComponents": true,
+    "permission": {
+      "scope.userLocation": {
+        "desc": ""
+      }
+    }
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "h5": {
+    "template": "agrcloud.template.h5.html",
+    "router": {
+      "mode": "history"
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    "sdkConfigs": {
+      "maps": {
+        "qqmap": {
+          "key": "PL4BZ-4ZGKP-FBSDT-VNYHW-IPVEV-HMFTA"
+        }
+      }
     },
-    "h5" : {
-        "template" : "agrcloud.template.h5.html",
-        "router" : {
-            "mode" : "history"
-        },
-        "devServer" : {
-            "proxy" : {
-                "/dev-api" : {
-                    "target" : "http://172.16.90.32:9110",
-                    "changeOrigin" : true,
-                    "secure" : false,
-                    "pathRewrite" : {
-                        "^/dev-api" : "/"
-                    }
-                }
-            },
-            "port" : 8080,
-            "https" : false
+    "devServer": {
+      "proxy": {
+        "/dev-api": {
+          "target": "http://172.16.90.32:9110",
+          "changeOrigin": true,
+          "secure": false,
+          "pathRewrite": {
+            "^/dev-api": "/"
+          }
         }
+      },
+      "port": 8080,
+      "https": false
     }
+  }
 }

pages.json

@@ -19,7 +19,7 @@
     {
       "path": "pages/complaints/details/index",
       "style": {
-        "navigationBarTitleText": "质量安全投诉详情"
+        "navigationBarTitleText": "质量安全投诉"
       }
     },
     {
@@ -52,6 +52,12 @@
         "navigationBarTitleText": "通知公告"
       }
     },
+    {
+      "path": "pages/notice/details/index",
+      "style": {
+        "navigationBarTitleText": "通知公告"
+      }
+    },
     {
       "path": "pages/monitoring/index",
       "style": {
@@ -59,9 +65,9 @@
       }
     },
     {
-      "path": "pages/results/index",
+      "path": "pages/monitoring/details/index",
       "style": {
-        "navigationBarTitleText": "结果页面"
+        "navigationBarTitleText": "监测信息"
       }
     },
     {
@@ -73,7 +79,13 @@
     {
       "path": "pages/experts/modal/details",
       "style": {
-        "navigationBarTitleText": "专家咨询详情"
+        "navigationBarTitleText": "专家咨询"
+      }
+    },
+    {
+      "path": "pages/results/index",
+      "style": {
+        "navigationBarTitleText": "结果页面"
       }
     }
   ],