Merge branch 'master' into enterprise

learnOnline/pages/index/index.js

@@ -4,6 +4,7 @@ const app = getApp()
 const util = require('../../utils/util.js')
 const BindPhone = require('./bindPhone/bindPhone.js')
 const BindAccount = require('./bindAccount/bindAccount.js')
+const md5 = require('../../utils/md5.js')
 
 Page({
   data: {
@@ -74,16 +75,70 @@ Page({
     })
   },
   guestLogin: function () {
-    wx.showModal({
-      title: '提示', content: '本账户只适用于“体验学习”，正式学习请点击“登录”按钮',
-      success: (res) => {
-        if (res.confirm) {
-          wx.setStorageSync('userInfo', { "avatarUrl": "https://wx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTJv5HunMDDhpdaTz7aVXniaeOUxyQxwa9clFnJCm7Y8eP8gbUkF7I9NHSXSDJ1KssdYw9vAKb0v8fQ/132", "nickName": "游客账号" });
-          wx.setStorageSync('userSession', { "sessionKey": "" });
-          this.goOutSite();
+    this.accountConfirms();
+    // return;
+    // wx.showModal({
+    //   title: '提示', content: '本账户只适用于“体验学习”，正式学习请点击“登录”按钮',
+    //   success: (res) => {
+    //     if (res.confirm) {
+    //       wx.setStorageSync('userInfo', { "avatarUrl": "https://wx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTJv5HunMDDhpdaTz7aVXniaeOUxyQxwa9clFnJCm7Y8eP8gbUkF7I9NHSXSDJ1KssdYw9vAKb0v8fQ/132", "nickName": "游客账号" });
+    //       wx.setStorageSync('userSession', { "sessionKey": "" });
+    //       this.goOutSite();
+    //     }
+    //   }
+    // });
+  },
+  //游客登录
+  accountConfirms: function (e) {
+    const _that = this;
+    /* 调用接口 - 使用账号登录 */
+    wx.request({
+      url: util.config.URL_PATH2 + '/user_center/login',
+      data: {
+        login_name:'18519690645@163.com',
+        password: md5('uokoaduw' + '123456'.split('').reverse().join('') + 'auhgniq'),
+        service: 'applet.ezijing.com'
+      }, method: 'POST', header: {
+        'tenant': util.config.tenant,
+        'content-type': 'application/x-www-form-urlencoded',
+        'version': util.config.version,
+        'apikey': 'pP5ECUqRDLDzuh4qRuJro0L1LPgjLP0N'
+      },
+      success: function (res) {
+        if (res.statusCode && res.statusCode != 200) { wx.showToast({ title: res.data.message, icon: 'none' }); return; }
+        wx.hideToast();
+        wx.setStorageSync('userSession', { sessionKey: res.data.ticket });
+
+        let _token = wx.getStorageSync('userSession').sessionKey
+        if (!_token) {
+          wx.reLaunch({ url: '/pages/index/index' })
+          return;
         }
-      }
-    });
+        /* 获取用户信息 */
+        wx.request({
+          url: util.config.URL_PATH1 + '/user/check-access',
+          data: {}, method: 'GET', header: {
+            token: _token,
+            tenant: util.config.tenant,
+            'apikey': 'pP5ECUqRDLDzuh4qRuJro0L1LPgjLP0N',
+            'version': util.config.version,
+            unionid: wx.getStorageSync('union_id')
+          },
+          success: res => {
+            if (res.statusCode != 200 && res.statusCode != 401) { wx.showToast({ title: res.data.message, icon: 'none' }); return; }
+            let _userInfo = {
+              avatarUrl: res.data.avatar  || '无',
+              nickName: res.data.nickname || '游客登录'
+            }
+            wx.setStorageSync('userInfo', _userInfo);
+            _that.setData({ userInfo: _userInfo, hasUserInfo: true })
+            _that.popupClose()
+            _that.goOutSite()
+          }
+        })
+      },
+      fail: function (res) { wx.hideToast(); wx.showToast({ title: res, icon: 'none' }); }
+    })
   },
   /* 手机号绑定 方法 */
   accountLogin: BindPhone.BindPhone.accountLogin,

learnOnline/pages/index/index.wxml

@@ -7,7 +7,7 @@
   <image class='logo' src='./icons/hd-logo.png' mode='aspectFit'></image>
   <view class='text'>清控紫荆课堂</view>
   <button class='btn' open-type='getUserInfo' bindgetuserinfo='getUserInfo'>登录</button>
-  <!-- <view class='test-id' bindtap='guestLogin'>游客登录</view> -->
+  <view wx-if='{{isUseAccountLogin}}' class='test-id' bindtap='guestLogin'>游客登录</view>
   <view class='userinfo'>
     <!--  wx:if='{{!hasUserInfo && canIUse}}' -->
     <!-- <block wx:else>