From b6f984d4fcc551911af32e410345d77045e71a56 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 2 Jan 2019 02:48:36 +0800
Subject: [PATCH] wechat mini

---
 application/api/controller/User.php            |  2 +-
 public/appmini/old/wechat/app.js               | 16 ++++------------
 public/appmini/old/wechat/app.json             |  4 ++--
 public/appmini/old/wechat/pages/cart/cart.wxml |  2 +-
 public/appmini/old/wechat/pages/login/login.js |  3 ++-
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index fc0186d5d..de800fd1c 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 1dd05fa14..99562dc2e 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 955c7c089..f22cf359e 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 f370ef7e7..41072614a 100755
--- a/public/appmini/old/wechat/pages/cart/cart.wxml
+++ b/public/appmini/old/wechat/pages/cart/cart.wxml
@@ -1,5 +1,5 @@
 <view wx:if="{{data_list.length > 0}}" class="page">
-  <view wx:for="{{data_list}}" wx:key="key" class="goods-item oh bg-white">
+  <view wx:for="{{data_list}}" class="goods-item oh bg-white">
     <!-- 选择 -->
     <view bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
       <image wx:if="{{(item.selected || false)}}" class="icon" src="/images/default-select-active-icon.png" mode="widthFix" />
diff --git a/public/appmini/old/wechat/pages/login/login.js b/public/appmini/old/wechat/pages/login/login.js
index d2a9eddfc..fcd23b46e 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();
+  },
 
   /**
    * 输入手机号码事件
-- 
GitLab