Browse Source

fix: 是否审批用户判定逻辑修改;增加devServer配置

ZhaoJun 2 years ago
parent
commit
53bbd396f9
3 changed files with 74 additions and 77 deletions
  1. 72 72
      manifest.json
  2. 1 4
      pages/audit/detail.vue
  3. 1 1
      pages/audit/list.vue

+ 72 - 72
manifest.json

@@ -1,73 +1,73 @@
 {
-	"name": "BOM",
-	"appid": "__UNI__87B699A",
-	"description": "",
-	"versionName": "2.0.8",
-	"versionCode": 208,
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"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.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.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<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.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			/* ios打包配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"h5": {
-		"devServer": {
-			"https": false,
-			"port": "",
-			"proxy": {
-				"/api": {
-					"target": "http://47.96.12.136:8896", // 后端接口的基础地址
-					"changeOrigin": true // 支持跨域
-				}
-			}
-		},
-		"router": {
-			"base": ""
-		}
-	}
-}
+    "name" : "BOM",
+    "appid" : "__UNI__87B699A",
+    "description" : "",
+    "versionName" : "2.0.8",
+    "versionCode" : 208,
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "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.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.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<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.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "h5" : {
+        "devServer" : {
+            "https" : false,
+            "port" : "",
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://47.96.12.136:8896", // 后端接口的基础地址
+                    "changeOrigin" : true // 支持跨域
+                }
+            }
+        },
+        "router" : {
+            "base" : ""
+        }
+    }
+}

+ 1 - 4
pages/audit/detail.vue

@@ -108,7 +108,7 @@
 				if(!currentUser){
 					return
 				}
-				// http://localhost:8080/#/pages/audit/detail?templateNodeId=3025&versionId=2878&projectId=404&JWT-TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6NDQ4LCJVc2VybmFtZSI6IkdULTI1OC0xIiwiRGVwIjoiMTE3IiwiZXhwIjoxNjkxNjYwMTUxLCJpc3MiOiJnaW4tYmxvZyJ9.eTtec0VDywPFsgG9NZmIpncwS015MbxkP6I4goD20x8
+				uni.setStorageSync("user", currentUser);
 				// var {
 				// 	data: {
 				// 		excel_version_tree: versionList
@@ -237,9 +237,6 @@
 							this.isAuditor = true;
 						}
 					}
-					if (this.options['JWT-TOKEN']) {
-						this.isAuditor = true;
-					}
 				}
 			},
 			toExcelDetail() {

+ 1 - 1
pages/audit/list.vue

@@ -81,7 +81,7 @@
 			},
 			toDetail(item) {
 				uni.navigateTo({
-					url: `./detail?templateNodeId=${item.TemplateNodeInfo.Id}&versionId=${item.id}&projectId=${item.project_id}`
+					url: `./detail?templateNodeId=${item.TemplateNodeInfo.Id}&versionId=${item.version_id}&projectId=${item.project_id}`
 				})
 			}
 		},