瓦斯日报修改-提交

api/api.js

@@ -39,6 +39,14 @@ const apiService = {
   getShowColum(params) {
     return http.get("/safety/ventanalyShowColum/show_colum", params);
   },
+  // 获取工作面煤层下拉选项
+  getDictItems(params) {
+    const url = buildURL(
+      "/sys/api/getDictItems",
+      params
+    );
+    return http.get(url);
+  },
   // 按系统查询设备监测信息
   getDeviceMonitor(params) {
     return http.post("/monitor/device", params);

common/router/index.js

@@ -20,7 +20,7 @@ router.beforeEach((to, from, next) => {
 		next()
 	} else {
 		// query如果没有明确要求跳过sso则执行sso登录
-		if (to.query[SKIP_SSO_URL_QUERY.key] !== SKIP_SSO_URL_QUERY.val) {
+		if (to.query[SKIP_SSO_URL_QUERY.key] == SKIP_SSO_URL_QUERY.val) {
 			/**
 			   * 单点登录，返回是否需要跳转到单点登录页
 			*/

uni_modules/uni-load-more/changelog.md

@@ -1,3 +1,7 @@
+## 1.3.5（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.4（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
 ## 1.3.3（2022-01-20）
 - 新增 showText属性 ，是否显示文本
 ## 1.3.2（2022-01-19）

uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue

@@ -37,7 +37,12 @@
 <script>
 	let platform
 	setTimeout(() => {
-		platform = uni.getSystemInfoSync().platform
+		// #ifdef MP-WEIXIN
+		platform = uni.getDeviceInfo().platform
+		// #endif
+		// #ifndef MP-WEIXIN
+		platform = uni.getSystemInfo().platform
+		// #endif
 	}, 16)
 
 	import {

uni_modules/uni-load-more/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-load-more",
   "displayName": "uni-load-more 加载更多",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
   "keywords": [
     "uni-ui",
@@ -16,11 +16,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -37,7 +33,8 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": ["uni-scss"],
@@ -45,7 +42,8 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "n"
       },
       "client": {
         "App": {
@@ -83,4 +81,4 @@
       }
     }
   }
-}
+}