diff --git a/application/api/controller/User.php b/application/api/controller/User.php index fc0186d5d64387b013c7a546ebd42e02031a1961..de800fd1cfe1024b7cd0d21899a05938980f7583 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -130,7 +130,7 @@ class User extends Common */ public function WechatUserInfo() { - $result = (new \base\Wechat('wxdaafcb5682165b02', 'e6e46d2f4b04078771a2cd78c95d400b'))->DecryptData(R('encrypted_data'), input('iv'), input('openid')); + $result = (new \base\Wechat('wxdaafcb5682165b02', 'e6e46d2f4b04078771a2cd78c95d400b'))->DecryptData(input('encrypted_data'), input('iv'), input('openid')); if(is_array($result)) { diff --git a/public/appmini/old/wechat/app.js b/public/appmini/old/wechat/app.js index 1dd05fa1421b864241b3d7bc0784f2f184afca8c..99562dc2e69ae575803d8376b7695fc62ec45cae 100755 --- a/public/appmini/old/wechat/app.js +++ b/public/appmini/old/wechat/app.js @@ -65,15 +65,6 @@ App({ // 设置设备信息 this.set_system_info(); - // 初始化用户信息、未授权用户唤醒授权操作 - let user = this.GetUserCacheInfo(); - - // // 用户缓存不存在则唤醒用户授权 - if (user == false) { - // 用户信息为空则唤醒授权 - this.UserAuthCode(); - } - // 启动query参数处理 this.startup_query(options); }, @@ -244,10 +235,11 @@ App({ wx.getSetting({ success(res) { console.log('app.js 授权部分'); - wx.navigateTo({ - url: "/pages/login/login" - }); + if (!res.authSetting['scope.userInfo']) { + wx.navigateTo({ + url: "/pages/login/login" + }); // wx.authorize({ // scope: 'scope.userInfo', // success() { diff --git a/public/appmini/old/wechat/app.json b/public/appmini/old/wechat/app.json index 955c7c08953afe5ad4ce3f9bd7a3341de63ca050..f22cf359e2415c0a037e9180c77e02e570cfb2bf 100755 --- a/public/appmini/old/wechat/app.json +++ b/public/appmini/old/wechat/app.json @@ -1,8 +1,8 @@ { - "pages": ["pages/cart/cart", + "pages": [ "pages/index/index", "pages/goods-category/goods-category", - + "pages/cart/cart", "pages/user/user", "pages/web-view/web-view", "pages/login/login", diff --git a/public/appmini/old/wechat/pages/cart/cart.wxml b/public/appmini/old/wechat/pages/cart/cart.wxml index f370ef7e7bad27d18804d1cbeb8b556cd5fea987..41072614ae9f8905e70162f6467d1c7a79c13bc2 100755 --- a/public/appmini/old/wechat/pages/cart/cart.wxml +++ b/public/appmini/old/wechat/pages/cart/cart.wxml @@ -1,5 +1,5 @@ - + diff --git a/public/appmini/old/wechat/pages/login/login.js b/public/appmini/old/wechat/pages/login/login.js index d2a9eddfc10ed224896758591c770a2d195dbf14..fcd23b46e233534e0460faf8eaadf2cc45a7f95a 100755 --- a/public/appmini/old/wechat/pages/login/login.js +++ b/public/appmini/old/wechat/pages/login/login.js @@ -31,7 +31,8 @@ Page({ */ get_user_info_event(e) { console.log(e, e.detail.userInfo) - } + app.user_auth_login(); + }, /** * 输入手机号码事件