Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
姜枫
9 years ago
Commit
6ffc691a701cfca92b7d5f37832487879713f5ec
2 parents
d92242ec
c5f9a855
handle merge
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
13 deletions
apps/channel/views/partial/brand-text-box.hbs
apps/passport/models/login-auth-service.js
config/common.js
public/scss/channel/_ad.css
public/scss/channel/_brand-text-box.css
public/scss/channel/_home.css
apps/channel/views/partial/brand-text-box.hbs
View file @
6ffc691
<div
class=
"brand-text-box"
>
<h4>
{{
productName
}}
</h4>
<p>
{{
productDesc
}}
</p>
<a
href=
"
{{
url
}}
"
>
<a
href=
"
{{
url
}}
"
target=
"_blank"
>
<button>
{{
btnText
}}
</button>
</a>
</div>
...
...
apps/passport/models/login-auth-service.js
View file @
6ffc691
...
...
@@ -127,8 +127,8 @@ passport.use('wechat', new WeixinStrategy({
// sina 登录
passport
.
use
(
'sina'
,
new
SinaStrategy
({
clientID
:
'3739328910'
,
clientSecret
:
'9d44cded26d048e23089e5e975c93df1'
,
clientID
:
config
.
thirdLogin
.
sina
.
appID
,
clientSecret
:
config
.
thirdLogin
.
sina
.
appSecret
,
callbackURL
:
`
$
{
siteUrl
}
/passport/
login
/
sina
/
callback
`
,
requireState
:
false
},
(
accessToken
,
refreshToken
,
profile
,
done
)
=>
{
...
...
@@ -137,8 +137,8 @@ passport.use('sina', new SinaStrategy({
// qq 登录
passport
.
use
(
'qq'
,
new
QQStrategy
({
clientID
:
'100229394'
,
clientSecret
:
'c0af9c29e0900813028c2ccb42021792'
,
clientID
:
config
.
thirdLogin
.
qq
.
appID
,
clientSecret
:
config
.
thirdLogin
.
qq
.
appSecret
,
callbackURL
:
`
$
{
siteUrl
}
/passport/
login
/
qq
/
callback
`
,
requireState
:
false
},
(
accessToken
,
refreshToken
,
profile
,
done
)
=>
{
...
...
@@ -147,8 +147,8 @@ passport.use('qq', new QQStrategy({
// alipay 登录
passport
.
use
(
'alipay'
,
new
AlipayStrategy
({
partner
:
'2088701661478015'
,
key
:
'kcxawi9bb07mzh0aq2wcirsf9znusobw'
,
partner
:
config
.
thirdLogin
.
alipay
.
partnerID
,
key
:
config
.
thirdLogin
.
alipay
.
appSecret
,
return_url
:
`
$
{
siteUrl
}
/passport/
login
/
alipay
/
callback
`
},
(
profile
,
done
)
=>
{
done
(
null
,
profile
);
...
...
config/common.js
View file @
6ffc691
...
...
@@ -61,9 +61,21 @@ module.exports = {
}
},
thirdLogin
:
{
wechat
:
{
appID
:
'wx3ae21dcbb82ad672'
,
appSecret
:
'e78afb2321e6a19085767e1a0f0d52c1'
wechat
:
{
// OK
appID
:
'wx179ea6ff85adc828'
,
appSecret
:
'19533c8674c1382aa9869bf5bc8d2fe7'
},
qq
:
{
// OK
appID
:
'100229394'
,
appSecret
:
'c0af9c29e0900813028c2ccb42021792'
},
alipay
:
{
// OK
partnerID
:
'2088701661478015'
,
appSecret
:
'e3i54meghrac3qhryzhw1h5yzeijik7e'
},
sina
:
{
// 还未申请
appID
:
'3739328910'
,
appSecret
:
'9d44cded26d048e23089e5e975c93df1'
}
},
pay
:
{
...
...
public/scss/channel/_ad.css
View file @
6ffc691
...
...
@@ -18,7 +18,7 @@
img
{
float
:
left
;
width
:
50%
;
width
:
298px
;
height
:
100%
;
box-sizing
:
border-box
;
padding
:
25px
;
...
...
public/scss/channel/_brand-text-box.css
View file @
6ffc691
...
...
@@ -5,7 +5,7 @@
float
:
left
;
height
:
100%
;
width
:
50%
;
width
:
275px
;
box-sizing
:
border-box
;
padding
:
34px
0
;
position
:
relative
;
...
...
public/scss/channel/_home.css
View file @
6ffc691
.home-page
{
$
sliderHeight
:
57
0px
;
$
sliderHeight
:
60
0px
;
margin
:
10px
auto
0
;
...
...
Please
register
or
login
to post a comment