Merge branch 'master' of ssh://git.9026.com:2212/xiansin/sange-bridge

pages/login/login.vue

@@ -75,7 +75,7 @@
             },
             handleLogin(){
                 let _this = this;
-                uni.getUserProfile({
+                wx.getUserProfile({
                     desc: '获取用户信息',
                     success: data =>  {
                         console.log('-->data',data)

pages/my/index.vue

@@ -124,7 +124,7 @@
 			},
 			handleGetInfo(){
 				let _this = this;
-				uni.getUserProfile({
+				wx.getUserProfile({
 					desc: '重新获取用户信息',
 					success: data =>  {
 						let params = {