Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jcy2004x
ShopXO
提交
a9bf0763
ShopXO
项目概览
jcy2004x
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a9bf0763
编写于
6月 28, 2019
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序优化
上级
d9e4cbb3
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
48 addition
and
29 deletion
+48
-29
application/service/UserService.php
application/service/UserService.php
+1
-1
public/appmini/old/alipay/app.js
public/appmini/old/alipay/app.js
+18
-10
public/appmini/old/alipay/pages/cart/cart.js
public/appmini/old/alipay/pages/cart/cart.js
+2
-2
public/appmini/old/alipay/pages/goods-category/goods-category.json
...pmini/old/alipay/pages/goods-category/goods-category.json
+1
-4
public/appmini/old/alipay/pages/index/index.acss
public/appmini/old/alipay/pages/index/index.acss
+2
-2
public/appmini/old/alipay/pages/login/login.js
public/appmini/old/alipay/pages/login/login.js
+5
-2
public/appmini/old/alipay/pages/user/user.js
public/appmini/old/alipay/pages/user/user.js
+1
-2
public/appmini/old/weixin/app.js
public/appmini/old/weixin/app.js
+11
-2
public/appmini/old/weixin/pages/index/index.wxss
public/appmini/old/weixin/pages/index/index.wxss
+2
-2
public/appmini/old/weixin/pages/login/login.js
public/appmini/old/weixin/pages/login/login.js
+5
-2
未找到文件。
application/service/UserService.php
浏览文件 @
a9bf0763
...
...
@@ -1832,7 +1832,7 @@ class UserService
}
}
else
{
$data
[
'upd_time'
]
=
time
();
if
(
Db
::
name
(
'User'
)
->
where
(
$where
)
->
update
(
$data
))
if
(
Db
::
name
(
'User'
)
->
where
(
[
'id'
=>
$temp_user
[
'id'
]]
)
->
update
(
$data
))
{
$user_id
=
$temp_user
[
'id'
];
}
...
...
public/appmini/old/alipay/app.js
浏览文件 @
a9bf0763
...
...
@@ -222,11 +222,7 @@ App({
* auth_data 授权数据
*/
user_login
(
object
,
method
,
auth_data
)
{
// 邀请人参数
var
params
=
my
.
getStorageSync
({
key
:
this
.
data
.
cache_launch_info_key
});
var
referrer
=
(
params
.
data
==
null
)
?
0
:
(
params
.
data
.
referrer
||
0
);
var
$this
=
this
;
// 加载loding
my
.
showLoading
({
content
:
"
授权中...
"
});
...
...
@@ -238,10 +234,7 @@ App({
my
.
request
({
url
:
$this
.
get_request_url
(
"
alipayuserauth
"
,
"
user
"
),
method
:
"
POST
"
,
data
:
{
authcode
:
res
.
authCode
,
referrer
:
referrer
},
data
:
{
authcode
:
res
.
authCode
},
dataType
:
"
json
"
,
headers
:
{
'
content-type
'
:
'
application/x-www-form-urlencoded
'
},
success
:
res
=>
{
...
...
@@ -252,8 +245,18 @@ App({
data
:
res
.
data
.
data
});
my
.
navigateTo
({
url
:
"
/pages/login/login
"
my
.
confirm
({
title
:
'
温馨提示
'
,
content
:
'
授权用户信息
'
,
confirmButtonText
:
'
确认
'
,
cancelButtonText
:
'
暂不
'
,
success
:
(
result
)
=>
{
if
(
result
.
confirm
)
{
my
.
navigateTo
({
url
:
"
/pages/login/login
"
});
}
}
});
}
else
{
my
.
showToast
({
...
...
@@ -309,9 +312,14 @@ App({
* auth_data 授权数据
*/
get_user_login_info
(
object
,
method
,
openid
,
userinfo
)
{
// 邀请人参数
var
params
=
my
.
getStorageSync
({
key
:
this
.
data
.
cache_launch_info_key
});
// 请求数据
my
.
showLoading
({
content
:
"
授权中...
"
});
var
$this
=
this
;
userinfo
[
'
openid
'
]
=
openid
;
userinfo
[
'
referrer
'
]
=
(
params
.
data
==
null
)
?
0
:
(
params
.
data
.
referrer
||
0
);
my
.
request
({
url
:
$this
.
get_request_url
(
'
alipayuserinfo
'
,
'
user
'
),
method
:
'
POST
'
,
...
...
public/appmini/old/alipay/pages/cart/cart.js
100755 → 100644
浏览文件 @
a9bf0763
...
...
@@ -18,13 +18,13 @@ Page({
init
(
e
)
{
var
user
=
app
.
get_user_info
(
this
,
"
init
"
);
console
.
log
(
user
)
if
(
user
!=
false
)
{
// 用户未绑定用户则转到登录页面
var
msg
=
(
user
==
false
)
?
'
授权用户信息
'
:
'
绑定手机号码
'
;
if
(
app
.
user_is_need_login
(
user
))
{
my
.
confirm
({
title
:
'
温馨提示
'
,
content
:
msg
,
content
:
'
绑定手机号码
'
,
confirmButtonText
:
'
确认
'
,
cancelButtonText
:
'
暂不
'
,
success
:
(
result
)
=>
{
...
...
public/appmini/old/alipay/pages/goods-category/goods-category.json
100755 → 100644
浏览文件 @
a9bf0763
{
"usingComponents"
:
{
"vtabs"
:
"mini-antui/es/vtabs/index"
,
"vtab-content"
:
"mini-antui/es/vtabs/vtab-content/index"
}
"pullRefresh"
:
true
}
\ No newline at end of file
public/appmini/old/alipay/pages/index/index.acss
浏览文件 @
a9bf0763
...
...
@@ -34,7 +34,7 @@
position: relative;
}
.floor-list .word {
padding:
2
0rpx 20rpx 0 20rpx;
padding:
3
0rpx 20rpx 0 20rpx;
}
.floor-list .word .vice-name {
color: #fff;
...
...
@@ -45,7 +45,7 @@
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
text-align: center;
padding:
2
0rpx;
padding:
3
0rpx;
}
.floor-list .word .word-icon {
margin: 10rpx;
...
...
public/appmini/old/alipay/pages/login/login.js
浏览文件 @
a9bf0763
...
...
@@ -133,7 +133,10 @@ Page({
* 表单提交
*/
formSubmit
(
e
)
{
{
// 邀请人参数
var
params
=
my
.
getStorageSync
({
key
:
this
.
data
.
cache_launch_info_key
});
// 数据验证
var
validation
=
[
{
fields
:
'
mobile
'
,
msg
:
'
请填写手机号码
'
},
...
...
@@ -146,8 +149,8 @@ Page({
e
.
detail
.
value
[
'
province
'
]
=
this
.
data
.
user
.
province
;
e
.
detail
.
value
[
'
city
'
]
=
this
.
data
.
user
.
city
;
e
.
detail
.
value
[
'
gender
'
]
=
this
.
data
.
user
.
gender
;
e
.
detail
.
value
[
'
referrer
'
]
=
this
.
data
.
user
.
referrer
;
e
.
detail
.
value
[
'
app_type
'
]
=
'
alipay
'
;
e
.
detail
.
value
[
'
referrer
'
]
=
(
params
.
data
==
null
)
?
(
this
.
data
.
user
.
referrer
||
0
)
:
(
params
.
data
.
referrer
||
0
);
if
(
app
.
fields_check
(
e
.
detail
.
value
,
validation
))
{
my
.
showLoading
({
content
:
'
处理中...
'
});
...
...
public/appmini/old/alipay/pages/user/user.js
100755 → 100644
浏览文件 @
a9bf0763
...
...
@@ -56,11 +56,10 @@ Page({
self
=
this
;
if
(
user
!=
false
)
{
// 用户未绑定用户则转到登录页面
var
msg
=
(
user
==
false
)
?
'
授权用户信息
'
:
'
绑定手机号码
'
;
if
(
app
.
user_is_need_login
(
user
))
{
my
.
confirm
({
title
:
'
温馨提示
'
,
content
:
msg
,
content
:
'
绑定手机号码
'
,
confirmButtonText
:
'
确认
'
,
cancelButtonText
:
'
暂不
'
,
success
:
(
result
)
=>
{
...
...
public/appmini/old/weixin/app.js
浏览文件 @
a9bf0763
...
...
@@ -265,12 +265,21 @@ App({
* auth_data 授权数据
*/
get_user_login_info
(
object
,
method
,
openid
,
auth_data
)
{
var
$this
=
this
;
// 邀请人参数
var
params
=
my
.
getStorageSync
(
this
.
data
.
cache_launch_info_key
);
var
referrer
=
(
params
.
data
==
null
)
?
0
:
(
params
.
data
.
referrer
||
0
);
// 远程解密数据
var
$this
=
this
;
wx
.
request
({
url
:
$this
.
get_request_url
(
'
wechatuserinfo
'
,
'
user
'
),
method
:
'
POST
'
,
data
:
{
encrypted_data
:
auth_data
.
encryptedData
,
iv
:
auth_data
.
iv
,
openid
:
openid
},
data
:
{
"
encrypted_data
"
:
auth_data
.
encryptedData
,
"
iv
"
:
auth_data
.
iv
,
"
openid
"
:
openid
,
"
referrer
"
:
referrer
},
dataType
:
'
json
'
,
header
:
{
'
content-type
'
:
'
application/x-www-form-urlencoded
'
},
success
:
(
res
)
=>
{
...
...
public/appmini/old/weixin/pages/index/index.wxss
浏览文件 @
a9bf0763
...
...
@@ -34,7 +34,7 @@
position: relative;
}
.floor-list .word {
padding:
2
0rpx 20rpx 0 20rpx;
padding:
3
0rpx 20rpx 0 20rpx;
}
.floor-list .word .vice-name {
color: #fff;
...
...
@@ -45,7 +45,7 @@
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
text-align: center;
padding:
2
0rpx;
padding:
3
0rpx;
}
.floor-list .word .word-icon {
margin: 10rpx;
...
...
public/appmini/old/weixin/pages/login/login.js
浏览文件 @
a9bf0763
...
...
@@ -133,7 +133,10 @@ Page({
* 表单提交
*/
formSubmit
(
e
)
{
{
// 邀请人参数
var
params
=
my
.
getStorageSync
(
this
.
data
.
cache_launch_info_key
);
// 数据验证
var
validation
=
[
{
fields
:
'
mobile
'
,
msg
:
'
请填写手机号码
'
},
...
...
@@ -146,8 +149,8 @@ Page({
e
.
detail
.
value
[
'
province
'
]
=
this
.
data
.
user
.
province
;
e
.
detail
.
value
[
'
city
'
]
=
this
.
data
.
user
.
city
;
e
.
detail
.
value
[
'
gender
'
]
=
this
.
data
.
user
.
gender
;
e
.
detail
.
value
[
'
referrer
'
]
=
this
.
data
.
user
.
referrer
;
e
.
detail
.
value
[
'
app_type
'
]
=
'
weixin
'
;
e
.
detail
.
value
[
'
referrer
'
]
=
(
params
.
data
==
null
)
?
(
this
.
data
.
user
.
referrer
||
0
)
:
(
params
.
data
.
referrer
||
0
);
if
(
app
.
fields_check
(
e
.
detail
.
value
,
validation
))
{
wx
.
showLoading
({
title
:
'
处理中...
'
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录