floraachy/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2024-11-30 19:08:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

小程序与H5互通

Browse Source
This commit is contained in:
gongfuxiang 2019-06-29 23:55:47 +08:00
parent f107554ee0
commit 4315c44cc5
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/service/UserService.php
View File

@ -42,16 +42,17 @@ class UserService
$user = null;
if(APPLICATION == 'web')
{
// web用户session
$user = session('user');
// token仅小程序浏览器环境和api接口环境中有效
if(!empty($params['token']) && in_array(MiniAppEnv(), ['weixin', 'alipay', 'baidu']))
if(empty($user) && !empty($params['token']) && in_array(MiniAppEnv(), ['weixin', 'alipay', 'baidu']))
{
$user = cache(config('shopxo.cache_user_info').$params['token']);
if(isset($user['id']))
{
self::UserLoginRecord($user['id']);
}
} else {
$user = session('user');
}
} else {
if(!empty($params['token']))

4
public/appmini/old/alipay/pages/web-view/web-view.js
View File

@ -20,8 +20,6 @@ Page({
}
}
this.setData({
web_url: url,
});
this.setData({web_url: url});
}
});

2
public/appmini/old/weixin/app.js
View File

@ -61,7 +61,7 @@ App({
// 请求地址
// request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/',
//request_url: 'https://test.shopxo.net/',
request_url: 'https://test.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

4
public/appmini/old/weixin/pages/web-view/web-view.js
View File

@ -20,8 +20,6 @@ Page({
}
}
this.setData({
web_url: url,
});
this.setData({web_url: url});
}
});