Authored by 姜枫

handle merge

<div class="brand-text-box">
<h4>{{productName}}</h4>
<p>{{productDesc}}</p>
<a href="{{url}}">
<a href="{{url}}" target="_blank">
<button>{{btnText}}</button>
</a>
</div>
... ...
... ... @@ -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);
... ...
... ... @@ -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: {
... ...
... ... @@ -18,7 +18,7 @@
img {
float: left;
width: 50%;
width: 298px;
height: 100%;
box-sizing: border-box;
padding: 25px;
... ...
... ... @@ -5,7 +5,7 @@
float: left;
height: 100%;
width: 50%;
width: 275px;
box-sizing: border-box;
padding: 34px 0;
position: relative;
... ...
.home-page {
$sliderHeight: 570px;
$sliderHeight: 600px;
margin: 10px auto 0;
... ...