Merge branch 'master' into dev

pages.json

@@ -80,9 +80,9 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#FFF",
-		"backgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
 		/* #ifdef H5 */
-		"navigationStyle": "custom"
+		,"navigationStyle": "custom"
 		/* #endif */
 	}
 	,"condition" : { //模式配置，仅开发期间生效

uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue

@@ -43,26 +43,18 @@
 			},
 			agree: {
 				get() {
-					return this.uniParentComponent.agree
+					return this.getParentComponent().agree
 				},
 				set(agree) {
 					console.log('setAgree', agree);
-					return this.uniParentComponent.agree = agree
+					return this.getParentComponent().agree = agree
 				}
 			}
 		},
 		data() {
-			// #ifndef H5
-			const uniParentComponent = this.$parent;
-			// #endif
 			
-			// #ifdef H5
-			const uniParentComponent = this.$parent.$parent;
-			// #endif
 			
 			return {
-				//父组件对象
-				uniParentComponent,
 				servicesList: [{
 						"id": "username",
 						"text": "账号登录",
@@ -202,6 +194,15 @@
 			
 		},
 		methods: {
+			getParentComponent(){
+				// #ifndef H5
+				return this.$parent;
+				// #endif
+				
+				// #ifdef H5
+				return this.$parent.$parent;
+				// #endif
+			},
 			setUserInfo(e) {
 				console.log('setUserInfo', e);
 			},

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js

@@ -12,7 +12,6 @@ const {
   isUniIdError
 } = require('./common/error')
 const middleware = require('./middleware/index')
-const uniOpenBridge = require('uni-open-bridge-common')
 
 const {
   registerAdmin,
@@ -72,7 +71,7 @@ const {
 } = require('./module/dev/index')
 
 module.exports = {
-  async _before () {
+  async _before() {
     const clientInfo = this.getClientInfo()
     /**
      * 检查clientInfo，无appId和uniPlatform时本云对象无法正常运行
@@ -154,7 +153,11 @@ module.exports = {
 
     // 挂载uni-captcha到this上，方便后续调用
     this.uniCaptcha = uniCaptcha
-    this.uniOpenBridge = uniOpenBridge
+    Object.defineProperty(this, 'uniOpenBridge', {
+      get() {
+        return require('uni-open-bridge-common')
+      }
+    })
 
     // 挂载中间件
     this.middleware = {}
@@ -175,7 +178,7 @@ module.exports = {
     // 通用权限校验模块
     await this.middleware.accessControl()
   },
-  _after (error, result) {
+  _after(error, result) {
     if (error) {
       // 处理中间件内抛出的标准响应对象
       if (error.errCode && getType(error) === 'object') {

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json

@@ -10,8 +10,7 @@
     "lodash.merge": "^4.6.2",
     "uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha",
     "uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
-    "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",
-    "uni-open-bridge-common": "file:../../../../uni-open-bridge/uniCloud/cloudfunctions/common/uni-open-bridge-common"
+    "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common"
   },
   "extensions": {}
 }
\ No newline at end of file