项目增加配置，及其部分功能完善

agrcloud-api/complaints.js

@@ -1,6 +1,6 @@
 import request from '@/agrcloud-utils/request';
 
-// 我的投诉
+// 发起投诉
 export function complaintsAddData(data) {
   return request({
     url: '/sec/plaint/door',

agrcloud-store/getters.js

@@ -4,6 +4,12 @@
  */
 
 const getters = {
-  complaintsDetailsObj: state => state.complaintsDetails.itemData
-}
-export default 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
+};
+
+export default getters;

agrcloud-store/index.js

@@ -6,13 +6,23 @@
 import Vue from 'vue';
 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 getters from './getters'
 
 Vue.use(Vuex);
 
 const store = new Vuex.Store({
   modules: {
-    complaintsDetails
+    complaintsDetails,
+    regulationsDetails,
+    expertsModal,
+    expertsDetail,
+    monitoringDetail,
+    noticeDetail
   },
   getters
 });

jsconfig.json

@@ -1,9 +1,26 @@
-{ 
+/**
+ * jsconfig.json
+ * @author Rockery(1113269755@qq.com)
+ */
+{
   "compilerOptions": {
-    "baseUrl": "./",
+    // "target": "es6", // 指定要使用的默认库（lib.d.ts）。 值是“es3”，“es5”，“es6”，“es2015”，“es2016”，“es2017”，“es2018”，“esnext”。
+    "checkJs": false, // 启用JavaScript文件的类型检查。默认true
+    "allowSyntheticDefaultImports": true, // 允许从没有默认导出的模块进行默认导入。 这不会影响代码发出，只会影响类型检查。默认true
+    // "baseUrl": "./", // 用于解析非相对模块名称的基目录。
     "paths": {
-        "@/*": ["src/*"]
+      "@/*": [
+        "./*"
+      ]
     }
   },
-  "exclude": ["node_modules", "dist"]
-}
+  "include": [
+    "./*"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "unpackage",
+    "uview-ui"
+  ]
+}

manifest.json

@@ -1,100 +1,100 @@
 {
-  "name": "AgriculturalCloud-h5-UI",
-  "appid": "__UNI__DE5C136",
-  "description": "修文农业云公共服务系统",
-  "versionName": "1.0.0",
-  "versionCode": "100",
-  "transformPx": false,
-  /* 5+App特有相关 */
-  "app-plus": {
-    "safearea": {
-      "bottom": {
-        "offset": "none"
-      }
+    "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" : {}
+        }
     },
-    "usingComponents": true,
-    "nvueCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxc256e348c4032ebd",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "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": {},
-      /* SDK配置 */
-      "sdkConfigs": {}
-    }
-  },
-  /* 快应用特有相关 */
-  "quickapp": {},
-  /* 小程序特有相关 */
-  "mp-weixin": {
-    "appid": "wxc256e348c4032ebd",
-    "setting": {
-      "urlCheck": false
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "usingComponents": true
-  },
-  "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
     },
-    "devServer": {
-      "proxy": {
-        "/dev-api": {
-          "target": "http://172.16.90.32:9110",
-          "changeOrigin": true,
-          "secure": false,
-          "pathRewrite": {
-            "^/dev-api": "/"
-          }
+    "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
         }
-      },
-      "port": 8080,
-      "https": false
     }
-  }
 }

pages.json

@@ -16,6 +16,48 @@
         "navigationBarTitleText": "质量安全投诉"
       }
     },
+    {
+      "path": "pages/complaints/details/index",
+      "style": {
+        "navigationBarTitleText": "质量安全投诉详情"
+      }
+    },
+    {
+      "path": "pages/meteorological/index",
+      "style": {
+        "navigationBarTitleText": "气象服务"
+      }
+    },
+    {
+      "path": "pages/regulations/index",
+      "style": {
+        "navigationBarTitleText": "政策法规"
+      }
+    },
+    {
+      "path": "pages/regulations/details/index",
+      "style": {
+        "navigationBarTitleText": "政策法规"
+      }
+    },
+    {
+      "path": "pages/experts/index",
+      "style": {
+        "navigationBarTitleText": "农技专家"
+      }
+    },
+    {
+      "path": "pages/notice/index",
+      "style": {
+        "navigationBarTitleText": "通知公告"
+      }
+    },
+    {
+      "path": "pages/monitoring/index",
+      "style": {
+        "navigationBarTitleText": "监测信息"
+      }
+    },
     {
       "path": "pages/results/index",
       "style": {
@@ -23,9 +65,15 @@
       }
     },
     {
-      "path": "pages/complaints/details/index",
+      "path": "pages/experts/modal/index",
       "style": {
-        "navigationBarTitleText": "质量安全投诉详情"
+        "navigationBarTitleText": "专家咨询"
+      }
+    },
+    {
+      "path": "pages/experts/modal/details",
+      "style": {
+        "navigationBarTitleText": "专家咨询详情"
       }
     }
   ],

pages/complaints/index.vue

@@ -88,12 +88,15 @@
         <view class="history-complaints">
           <scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="handleScrolltolower">
             <view class="history-complaints-listbody">
+              <!-- 列表无数据 -->
               <template v-if="hisComplaintsObj.list_empty">
                 <view class="history-complaints-nodata">
                   <text class="complaints-nodata">暂无数据</text>
                 </view>
               </template>
-              <template>
+
+              <!-- 列表有数据 -->
+              <template v-else>
                 <u-row gutter="16" class="listbody-row">
                   <u-col
                     span="12"
@@ -124,6 +127,8 @@
                   </u-col>
                 </u-row>
               </template>
+
+              <!-- 加载更多组件 -->
               <uni-load-more
                 :status="hisComplaintsObj.loadStatus"
                 v-if="!hisComplaintsObj.list_empty"
@@ -250,8 +255,7 @@ export default {
       this.hisComplaintsObj = {
         ...this.hisComplaintsObj,
         list_empty: false,
-        loadStatus: 'loading',
-        pageTotal: 0
+        loadStatus: 'loading'
       };
 
       // 请求获取列表数据
@@ -331,7 +335,7 @@ export default {
       this.hisComplaintsObj.loadStatus = 'loading'
       if (this.hisComplaintsObj.pagination.pageNum - 1 >= this.hisComplaintsObj.pageCount) {
         this.hisComplaintsObj.loadStatus = 'noMores';
-        return
+        return;
       } else {
         this.hisComplaintsObj.pagination.pageNum++;
         this.getComplaintsListData();

pages/index/index.vue

@@ -64,11 +64,11 @@
         titleContentList: ['气象预警：修文县气象台2020年x月x日x时x分发布大雾'],
         mainNavigateToObj: {
           QualitySafetyComplaints: '/pages/complaints/index',
-          MeteorologicalServices: '/pages/results/index',
-          AgriculturalTechnologyExpert: '',
-          PoliciesRegulations: '',
-          NoticeAnnouncement: '',
-          MonitoringInformation: ''
+          MeteorologicalServices: '/pages/meteorological/index',
+          PoliciesRegulations: '/pages/regulations/index',
+          AgriculturalTechnologyExpert: '/pages/experts/index',
+          NoticeAnnouncement: '/pages/notice/index',
+          MonitoringInformation: '/pages/monitoring/index'
         },
         flowList: [{
           id: 'QualitySafetyComplaints',

static/agrcloud-css/common.scss

@@ -6,14 +6,15 @@
 /**
  * 基础样式
  */
-html,body{
-  background: #F7F8F9;
+html,
+body {
+  background: #f7f8f9;
 }
-.fl{
+.fl {
   float: left;
 }
 
-.fr{
+.fr {
   float: right;
 }
 
@@ -25,7 +26,6 @@ html,body{
   cursor: pointer;
 }
 
-
 /**
  * padding类样式
  */
@@ -220,47 +220,46 @@ html,body{
   padding-bottom: 40rpx;
 }
 
-
 /**
  * margin类样式
  */
-.cust-mg5{
+.cust-mg5 {
   margin: 5rpx;
 }
-.cust-mg6{
+.cust-mg6 {
   margin: 6rpx;
 }
-.cust-mg7{
+.cust-mg7 {
   margin: 7rpx;
 }
-.cust-mg8{
+.cust-mg8 {
   margin: 8rpx;
 }
-.cust-mg9{
+.cust-mg9 {
   margin: 9rpx;
 }
-.cust-mg10{
+.cust-mg10 {
   margin: 10rpx;
 }
-.cust-mg12{
+.cust-mg12 {
   margin: 12rpx;
 }
-.cust-mg15{
+.cust-mg15 {
   margin: 15rpx;
 }
-.cust-mg20{
+.cust-mg20 {
   margin: 20rpx;
 }
-.cust-mg25{
+.cust-mg25 {
   margin: 25rpx;
 }
-.cust-mg30{
+.cust-mg30 {
   margin: 30rpx;
 }
-.cust-mg35{
+.cust-mg35 {
   margin: 35rpx;
 }
-.cust-mg40{
+.cust-mg40 {
   margin: 40rpx;
 }
 
@@ -424,7 +423,6 @@ html,body{
   margin-bottom: 40rpx;
 }
 
-
 /**
  * 超链接类样式
  */
@@ -449,9 +447,33 @@ html,body{
   justify-content: center;
   padding: 40rpx;
 }
-.page-header{
+.page-header {
   width: 100%;
 }
-.page-main{
+.page-main {
   width: 100%;
 }
+
+.cust-uni-page-head {
+  height: calc(88rpx + env(safe-area-inset-top));
+}
+
+.cust-agrcloud-uni-page-head {
+  background-color: rgb(255, 255, 255) !important;
+  color: rgb(0, 0, 0) !important;
+}
+
+.cust-agrcloud-uni-page-head-hd {
+  padding-left: 34rpx;
+}
+
+.cust-head-icon {
+  width: 36rpx;
+  height: 36rpx;
+}
+
+.cust-head-notice-icon {
+  width: 65rpx;
+  height: 44rpx;
+  margin-right: 54rpx;
+}