Authored by 毕凯

更新物料

... ... @@ -26,7 +26,7 @@ function packageSort(argument) {
for (i = 0; i < len; i++) {
k = keys[i];
newObj[k] = encodeURI(argument[k]);
newObj[k] = argument[k];
}
return newObj;
... ...
... ... @@ -2,30 +2,20 @@
* 发送站内信 model
* @author: bikai<kai.bi@yoho.cn>
*/
// var _ = require('lodash');
var API = require('../../library/api');
// var api = new API();
var api = new API('SERVICE_URL');
var api = new API();
exports.sendSingleMessage = (data) => {
// var defaultParam = {
// method: 'app.inbox.setSingleMessage', // 此接口并未发到正式环境
// type: 1,
// verify_key: '',
// send_uid: 0,
// callback: ''
// };
var defaultParam = {
method: 'setSingleMessage', // 此接口并未发到正式环境
method: 'web.inbox.setSingleMessage', // 此接口并未发到正式环境
type: 1,
verify_key: '',
send_uid: 0,
callback: ''
};
return api.get('/inbox/service/v1/inbox', Object.assign(defaultParam, data)); // 所有数据返回一个 Promise,方便 Promise.all 调用
return api.post('/', Object.assign(defaultParam, data)); // 所有数据返回一个 Promise,方便 Promise.all 调用
};
... ...
*,:after,:before{box-sizing:border-box;margin:0;padding:0}body{font-size:12px;font-family:Helvetica,Arial,黑体;background:#3b3b3b;-webkit-tap-highlight-color:rgba(0,0,0,0);overflow-x:hidden}button,input{border:none;outline:none}a{text-decoration:none}.hide{display:none}.main-wrap{width:990px}.header,.main-wrap{margin-left:auto;margin-right:auto}.header{width:940px;height:428px;background:url(../img/wuyifan-491c1d2b2e9f741c.jpg) no-repeat}.coupon{margin:-10px auto 30px;width:990px;height:198px;background:url(../img/coupon-aaacfbb6def28d62.png) no-repeat}.go{display:block;margin:30px auto;width:560px;height:80px;font-size:29px;line-height:80px;color:#fff;background:#e0031e;text-align:center}.go:after{content:'';display:block;width:100%;height:10px;background:#c61127}.arrow{display:inline-block;width:11px;height:20px;background:url(../img/arrow-6ff612dd66b81d4e.png)}.share{width:911px;height:277px;background:url(../img/share-bc9e693bee4cac15.png)}.banner,.share{margin:30px auto}.banner{display:block;width:900px;height:360px;background:#fff}.banner img{width:100%;height:100%}.footer{margin:30px auto;width:199px;height:37px;background:url(../img/yoho-a7fab2b69e927249.png)}.tip{position:fixed;left:50%;top:50%;margin-left:-200px;margin-top:-150px;width:400px;background:#fff;text-align:center;line-height:1.25}.tip .title{margin:20px auto;font-size:30px;font-weight:700}.tip .sub-title{font-size:20px}.tip .desc{font-size:18px;color:#444}.tip .button{display:block;margin:30px auto;width:200px;height:50px;font-size:22px;line-height:56px;text-align:center;color:#fff;background:#000}.tip:before{content:'';display:block;width:100%;height:40px;background:#000}
*,:after,:before{box-sizing:border-box;margin:0;padding:0}body{font-size:12px;font-family:Helvetica,Arial,黑体;background:#fff;-webkit-tap-highlight-color:rgba(0,0,0,0);overflow-x:hidden}button,input{border:none;outline:none}a{text-decoration:none}.hide{display:none}.header,.main-wrap{width:990px;margin-left:auto;margin-right:auto}.header{height:386px;background:url(../img/header-9da604d3eda4624c.jpg) no-repeat}.coupon{margin:0 auto 30px;width:990px;height:253px;background:url(../img/coupon-15d2fd54503b9caa.jpg) no-repeat}.go{display:block;margin:30px auto;width:560px;height:80px;font-size:29px;line-height:80px;color:#fff;background:#de3e00;text-align:center}.go:after{content:'';display:block;width:100%;height:10px;background:#c53800}.arrow{display:inline-block;width:11px;height:20px;background:url(../img/arrow-6ff612dd66b81d4e.png)}.share{width:911px;height:277px;background:url(../img/share-bc9e693bee4cac15.png)}.banner,.share{margin:30px auto}.banner{display:block;width:900px;height:360px;background:#fff}.banner img{width:100%;height:100%}.footer{margin:30px auto;width:199px;height:37px;background:url(../img/yoho-a7fab2b69e927249.png)}.tip{position:fixed;left:50%;top:50%;margin-left:-200px;margin-top:-150px;width:400px;background:#fff;text-align:center;line-height:1.25}.tip .title{margin:20px auto;font-size:30px;font-weight:700}.tip .sub-title{font-size:20px}.tip .desc{font-size:18px;color:#444}.tip .button{display:block;margin:30px auto;width:200px;height:50px;font-size:22px;line-height:46px;text-align:center;color:#fff;background:#df3f01;border-bottom:10px solid #c33900}.tip:before{content:'';display:block;width:100%;height:40px;background:#df3f01}
/*# sourceMappingURL=../map/style.css.map */
... ...
... ... @@ -9,7 +9,7 @@
body {
font-size: 12px;
font-family: Helvetica, Arial, "黑体";
background: #3b3b3b;
background: #fff;
-webkit-tap-highlight-color: rgba(0,0,0,0);
overflow-x: hidden;
}
... ...
... ... @@ -3,16 +3,16 @@
.header {
margin-left: auto;
margin-right: auto;
width: 940px;
height: 428px;
background: url("../img/wuyifan.jpg") no-repeat;
width: 990px;
height: 386px;
background: url("../img/header.jpg") no-repeat;
}
.coupon {
margin: -10px auto 30px;
margin: 0 auto 30px;
width: 990px;
height: 198px;
background: url("../img/coupon.png") no-repeat;
height: 253px;
background: url("../img/coupon.jpg") no-repeat;
}
.go {
... ... @@ -23,7 +23,7 @@
font-size: 29px;
line-height: 80px;
color: #fff;
background: #e0031e;
background: #de3e00;
text-align: center;
&:after {
... ... @@ -31,7 +31,7 @@
display: block;
width: 100%;
height: 10px;
background: #c61127;
background: #c53800;
}
}
... ... @@ -85,7 +85,7 @@
display: block;
width: 100%;
height: 40px;
background: #000;
background: #df3f01;
}
.title {
... ... @@ -109,9 +109,10 @@
width: 200px;
height: 50px;
font-size: 22px;
line-height: 56px;
line-height: 46px;
text-align: center;
color: #fff;
background: #000;
background: #df3f01;
border-bottom: 10px solid #c33900;
}
}
... ...
*,:after,:before{box-sizing:border-box;margin:0;padding:0}body,html{-webkit-tap-highlight-color:rgba(0,0,0,0);overflow-x:hidden}body{font-size:.3rem;font-family:Helvetica,Arial,黑体;background:#fff7e0}button,input{border:none;outline:none}a{text-decoration:none}.hide{display:none}.main-wrap{width:100%;max-width:16rem;margin-left:auto;margin-right:auto}.header{width:100%;height:7.725rem;background:url(../img/header-ee2620c36668c40d.jpg);background-size:100%}.coupon{display:block;margin-top:-.1rem;width:100%;height:10.55rem;background:url(../img/coupon-515c9f9e42b12264.jpg) no-repeat;background-size:100%}.share{margin:.75rem auto;width:14rem;height:2rem;font-size:.725rem;line-height:2rem;color:#fff;background:#de3e00;text-align:center}.share:after{content:'';display:block;width:100%;height:.25rem;background:#c53800}.arrow{display:inline-block;width:.275rem;height:.5rem;background:url(../img/arrow-6ff612dd66b81d4e.png);background-size:100%}.banner{display:block;margin:.75rem auto;width:14rem;height:6rem;background:#fff}.banner img{width:100%;height:100%}.download{margin:.75rem auto;font-size:.6rem;line-height:1.75rem;text-align:center}.download .weixin{width:6rem}.download .app,.download .weixin{display:inline-block;height:1.75rem;color:#fff;background:#000}.download .app{margin-left:.5rem;width:7.5rem}.download .arrow{height:.275rem;background-size:100% 100%}.footer{width:100%;height:2.75rem;background:url(../img/yoho-8d72b40e8e388d31.png) 50% no-repeat;background-color:#000;background-size:13.75rem .825rem}.tip{position:fixed;left:50%;top:50%;width:13.5rem;background:#fff;text-align:center;line-height:1.25;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.tip .title{margin:.5rem auto;font-size:1rem;font-weight:700}.tip .sub-title{font-size:.8rem}.tip .desc{font-size:.6rem;color:#444}.tip .button{display:block;margin:.75rem auto;width:6.75rem;height:1.4rem;font-size:.65rem;line-height:1.4rem;text-align:center;color:#fff;background:#000}.tip:before{content:'';display:block;width:100%;height:1.35rem;background:#000}.mask,.tip-wrap{position:fixed;width:100%;height:100%;left:0;top:0;background:rgba(0,0,0,.6);z-index:1}.mask .pengyouquan{float:right;margin-top:.75rem;margin-right:.75rem;width:14.5rem;height:2.175rem;background:url(../img/pengyouquan-a7bee0f100b58fbf.png) 100% no-repeat;background-size:2.175rem 2.175rem}.mask .arrow{float:right;margin-top:.75rem;margin-right:1.5rem;width:14.5rem;height:6.15rem;background:url(../img/arrow2-60335b059fa6558d.png) 100% no-repeat;background-size:3.3rem 6.15rem}.mask p{width:100%;font-size:1.1rem;line-height:1.5;text-align:center;color:#fff}
*,:after,:before{box-sizing:border-box;margin:0;padding:0}body,html{-webkit-tap-highlight-color:rgba(0,0,0,0);overflow-x:hidden}body{font-size:.3rem;font-family:Helvetica,Arial,黑体;background:#fff7e0}button,input{border:none;outline:none}a{text-decoration:none}.hide{display:none}.main-wrap{width:100%;max-width:16rem;margin-left:auto;margin-right:auto}.header{width:100%;height:7.725rem;background:url(../img/header-ee2620c36668c40d.jpg);background-size:100%}.coupon{display:block;margin-top:-.1rem;width:100%;height:10.55rem;background:url(../img/coupon-515c9f9e42b12264.jpg) no-repeat;background-size:100%}.share{margin:.75rem auto;width:14rem;height:2rem;font-size:.725rem;line-height:2rem;color:#fff;background:#de3e00;text-align:center}.share:after{content:'';display:block;width:100%;height:.25rem;background:#c53800}.arrow{display:inline-block;width:.275rem;height:.5rem;background:url(../img/arrow-6ff612dd66b81d4e.png);background-size:100%}.banner{display:block;margin:.75rem auto;width:14rem;height:6rem;background:#fff}.banner img{width:100%;height:100%}.download{margin:.75rem auto;font-size:.6rem;line-height:1.75rem;text-align:center}.download .weixin{width:6rem}.download .app,.download .weixin{display:inline-block;height:1.75rem;color:#fff;background:#000}.download .app{margin-left:.5rem;width:7.5rem}.download .arrow{height:.275rem;background-size:100% 100%}.footer{width:100%;height:2.75rem;background:url(../img/yoho-8d72b40e8e388d31.png) 50% no-repeat;background-color:#000;background-size:13.75rem .825rem}.tip{position:fixed;left:50%;top:50%;width:13.5rem;background:#fff;text-align:center;line-height:1.25;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.tip .title{margin:.5rem auto;font-size:1rem;font-weight:700}.tip .sub-title{font-size:.8rem}.tip .desc{font-size:.6rem;color:#444}.tip .button{display:block;margin:.75rem auto;width:6.75rem;height:1.4rem;font-size:.65rem;line-height:1.15rem;text-align:center;color:#fff;background:#df3f01;border-bottom:.25rem solid #c33900}.tip:before{content:'';display:block;width:100%;height:1.35rem;background:#df3f01}.mask,.tip-wrap{position:fixed;width:100%;height:100%;left:0;top:0;background:rgba(0,0,0,.6);z-index:1}.mask .pengyouquan{float:right;margin-top:.75rem;margin-right:.75rem;width:14.5rem;height:2.175rem;background:url(../img/pengyouquan-a7bee0f100b58fbf.png) 100% no-repeat;background-size:2.175rem 2.175rem}.mask .arrow{float:right;margin-top:.75rem;margin-right:1.5rem;width:14.5rem;height:6.15rem;background:url(../img/arrow2-60335b059fa6558d.png) 100% no-repeat;background-size:3.3rem 6.15rem}.mask p{width:100%;font-size:1.1rem;line-height:1.5;text-align:center;color:#fff}
/*# sourceMappingURL=../map/style.css.map */
... ...
... ... @@ -108,7 +108,7 @@
display: block;
width: 100%;
height: 54px;
background: #000;
background: #df3f01;
}
.title {
... ... @@ -132,10 +132,11 @@
width: 270px;
height: 56px;
font-size: 26px;
line-height: 56px;
line-height: 46px;
text-align: center;
color: #fff;
background: #000;
background: #df3f01;
border-bottom: 10px solid #c33900;
}
}
... ...
... ... @@ -17,7 +17,8 @@ var conpon = require(`${routes}/coupon`);
var conponSummer = require(`${routes}/coupon/summer`);
var wxLottery = require(`${routes}/wx-lottery/index`);
// var message = require(`${routes}/message`);
var message = require(`${routes}/message`);
// var starClassroom = require(`${routes}/star-classroom`);
app.get('/', index.index); // 主页
... ... @@ -27,7 +28,7 @@ app.get('/user/checkLogin', index.index); // 检查登录 JSONP接口
app.post('/coupon/getSingleCoupon', conpon.getCoupon); // 领券 JSON接口,TODO:可跨域
app.get('/coupon/summer/1', conponSummer.first); // 夏日领券第一波
// app.post('/message/sendSingleMessage', message.sendSingleMessage); // 领券 JSON接口,只测试,不对外公布
app.post('/message/sendSingleMessage', message.sendSingleMessage); // 领券 JSON接口,只测试,不对外公布
app.get('/wx/lottery', wxLottery.index); // 微信抽奖活动
... ...