123

.gitignore

@@ -3,5 +3,4 @@ unpackage/
 node_modules
 .DS_Store
 uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/config.json
-manifest.json
 pages/grid/banner.json
\ No newline at end of file

App.vue

@@ -9,22 +9,23 @@
 			console.log('App Launch')
 			initApp();
 			// #ifdef APP-PLUS
-				plus.oauth.getServices(oauthServices=>{
-					oauthServices.forEach(({_id},item)=>{
-						if(_id=='provider'){
-							uni.preLogin({
-								provider:item,
-								complete:e=>{
-									console.log(e);
-								}
-							})
-						}
-					})
+			//预加载一键登录
+				// plus.oauth.getServices(oauthServices=>{
+				// 	oauthServices.forEach(({_id},item)=>{
+				// 		if(_id=='provider'){
+				// 			uni.preLogin({
+				// 				provider:item,
+				// 				complete:e=>{
+				// 					console.log(e);
+				// 				}
+				// 			})
+				// 		}
+				// 	})
 					
-					uni.preloadPage({url: "/uni_modules/uni-login-page/pages/index/index"});
-				},err=>{
-					console.error('获取服务供应商失败：' + JSON.stringify(err));
-				})
+				// 	uni.preloadPage({url: "/uni_modules/uni-login-page/pages/index/index"});
+				// },err=>{
+				// 	console.error('获取服务供应商失败：' + JSON.stringify(err));
+				// })
 			// #endif
 		},
 		onShow: function() {

baseapp.config.json

+{
+	"router":{
+		"needLogin":[
+			"/pages/grid/grid"
+		]
+	},
+	""
+}
\ No newline at end of file

common/appInit.js

@@ -35,14 +35,14 @@ function initAppVersion() {
 	// #endif
 }
 
-//用于拦截路由
+//用于拦截路由
+import baseappConfig from '@/baseapp.config.json';
+const {"router":{needLogin}} = baseappConfig //需要登陆的页面
 function setRouter() {
 	let before_action = e => {
 		let res = true
-		//需要登陆的页面
-		let needLoginUrls = ['/pages/grid/grid']
 		let token = uni.getStorageSync('uni-id-token')
-		if (needLoginUrls.includes(e.url) && token == '') {
+		if (needLogin.includes(e.url) && token == '') {
 			res = false
 			console.log('该页面需要登陆，即将跳转到login页面');
 		}

manifest.json

+{
+    "name" : "base-app",
+    "appid" : "__UNI__03B096E",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "OAuth" : {}
+        },
+        /* 应用发布信息 */
+        "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" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "oauth" : {
+                    "univerify" : {},
+                    "weixin" : {
+                        "appid" : "wxffdd8fa6ec4ef2a0",
+                        "appsecret" : "",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "ad" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    }
+}

pages.json

@@ -204,17 +204,17 @@
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
 	},
-	"condition": {
-		"list": [
-			{
-				"path": "uni_modules/uni-login-page/pages/index/index"
-			},
-			{
-				"path": "pages/test/test"
-			}
-		],
-		"current":0
-	},
+	// "condition": {
+	// 	"list": [
+	// 		{
+	// 			"path": "uni_modules/uni-login-page/pages/index/index"
+	// 		},
+	// 		{
+	// 			"path": "pages/test/test"
+	// 		}
+	// 	],
+	// 	"current":0
+	// },
 	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#007AFF",