浏览代码

春节备份

asd26269546 2 年之前
父节点
当前提交
d8f48fef55
共有 4 个文件被更改,包括 141 次插入137 次删除
  1. 140 137
      manifest.json
  2. 1 0
      pages/user/login.vue
  3. 0 0
      unpackage/dist/dev/app-plus/app-service.js
  4. 0 0
      unpackage/dist/dev/app-plus/manifest.json

+ 140 - 137
manifest.json

@@ -1,139 +1,142 @@
 {
-    "name" : "GrandStar Textile IoT",
-    "appid" : "__UNI__C76B472",
-    "description" : "GrandStar Textile IoT",
-    "versionName" : "1.0.6",
-    "versionCode" : 106,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "VideoPlayer" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false,
-                "idfa" : false,
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册,以便进行及时通讯",
-                    "NSPhotoLibraryAddUsageDescription" : "该应用需要你的相机,拍摄上传用户信息,以便进行及时通讯",
-                    "NSCameraUsageDescription" : "该应用需要你的摄像头,以便你进行视频实时通讯",
-                    "NSMicrophoneUsageDescription" : "该应用需要使用你的麦克风,以便你进行语音通话"
-                }
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {}
-            },
-            "splashscreen" : {
-                "useOriginalMsgbox" : true
-            },
-            "icons" : {
-                "android" : {
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "hdpi" : "unpackage/res/icons/72x72.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    },
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    }
-                }
-            }
-        },
-        "nativePlugins" : {}
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wxe4a17c2bc0287527",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2",
-    "h5" : {
-        "devServer" : {
-            "port" : 8080,
-            "proxy" : {
-                "/api" : {
-                    "target" : "https://cfm.bytesail.cn",
-                    "pathRewrite" : {
-                        "^/api" : ""
-                    }
-                }
-            }
-        },
-        "unipush" : {
-            "enable" : false
-        }
-    },
-    "fallbackLocale" : "zh-Hans"
+	"name": "GrandStar Textile IoT",
+	"appid": "__UNI__C76B472",
+	"description": "GrandStar Textile IoT",
+	"versionName": "1.0.6",
+	"versionCode": 106,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"compatible": {
+			"ignoreVersion": true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持  
+		},
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"VideoPlayer": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false,
+				"idfa": false,
+				"privacyDescription": {
+					"NSPhotoLibraryUsageDescription": "该应用需要读取你的相册,以便进行及时通讯",
+					"NSPhotoLibraryAddUsageDescription": "该应用需要你的相机,拍摄上传用户信息,以便进行及时通讯",
+					"NSCameraUsageDescription": "该应用需要你的摄像头,以便你进行视频实时通讯",
+					"NSMicrophoneUsageDescription": "该应用需要使用你的麦克风,以便你进行语音通话"
+				}
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"ad": {}
+			},
+			"splashscreen": {
+				"useOriginalMsgbox": true
+			},
+			"icons": {
+				"android": {
+					"xxxhdpi": "unpackage/res/icons/192x192.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"hdpi": "unpackage/res/icons/72x72.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					},
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					}
+				}
+			}
+		},
+		"nativePlugins": {}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wxe4a17c2bc0287527",
+		"setting": {
+			"urlCheck": false,
+			"es6": true
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2",
+	"h5": {
+		"devServer": {
+			"port": 8080,
+			"proxy": {
+				"/api": {
+					"target": "https://cfm.bytesail.cn",
+					"pathRewrite": {
+						"^/api": ""
+					}
+				}
+			}
+		},
+		"unipush": {
+			"enable": false
+		}
+	},
+	"fallbackLocale": "zh-Hans"
 }

+ 1 - 0
pages/user/login.vue

@@ -106,6 +106,7 @@
 				}
 				const loginForm = {...this.loginForm}
 				loginForm.password = this.$w_md5.hex_md5_32(loginForm.password)
+				console.log(loginForm)
 				uni.request({
 					url: 'http://36.134.91.96:10001/api' + '/blade-auth/oauth/token?' + formateObjToParamStr(loginForm),
 					method: 'POST',

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


部分文件因为文件数量过多而无法显示