Authored by 杨延青

Merge branch 'feature/hideUfo' into 'feature/6.9.12_share'

Feature/hide ufo

废弃ufo调价,提示升级app

See merge request !32
... ... @@ -13,7 +13,7 @@
<div class="item">
<img class="desc" src="//cdn.yoho.cn/20190906/2.jpg?imageView2/2/w/750/format/jpg" alt=""/>
<img class="desc" src="//cdn.yoho.cn/20190912/2.jpg?imageView2/2/w/750/format/jpg" alt=""/>
<!-- <div class="desc"></div> -->
</div>
... ... @@ -38,7 +38,7 @@
</div>
<div class="item">
<img class="tip" src="//cdn.yoho.cn/20190906/3.jpg?imageView2/2/w/750/format/jpg">
<img class="tip" src="//cdn.yoho.cn/20190912/4.jpg?imageView2/2/w/750/format/jpg">
</div>
<div class="item">
... ... @@ -155,7 +155,7 @@ export default {
width: 750px;
height: 314px;
/*margin-top: 45px;*/
background-image: url("//cdn.yoho.cn/20190906/description.jpg?imageView2/2/w/750/format/jpg");
background-image: url("//cdn.yoho.cn/20190909/1.jpg?imageView2/2/w/750/format/jpg");
background-size: cover;
}
... ... @@ -175,9 +175,9 @@ export default {
// margin-top: 30px;
// background-image: url("//cdn.yoho.cn/20190906/2.jpg?imageView2/2/w/750/format/jpg");
// background-size: 100% 100%;
width: 110%;
// width: 110%;
margin-top: 30px;
margin-left: -5%;
// margin-left: -5%;
}
img.tip {
... ...
... ... @@ -67,6 +67,9 @@ module.exports = {
new_price: {type: Number},
old_price: {type: Number},
num: {type: Number}
},
discard: {
msg: '请升级最新APP版本'
}
},
'/api/ufo/sellerOrder/batchDownShelf': {
... ... @@ -79,6 +82,9 @@ module.exports = {
storage_id: {type: Number},
old_price: {type: Number},
num: {type: Number}
},
discard: {
msg: '请升级最新APP版本'
}
},
'/api/ufo/license/save': {
... ...
... ... @@ -45,6 +45,13 @@ module.exports = async(req, res, next) => {
logger.info(`[request access log] ${req.yoho.clientIp} | ${req.url} | uid:${req.user.uid} | User-Agent:${req.get('User-Agent')} | ${new Date()}`);
}
if (apiInfo.discard) {
return res.json({
code: 400,
message: _.get(apiInfo.discard, 'msg') || '获取失败'
});
}
if (apiInfo.checkSign) {
if (!checkSign(Object.assign({}, reqParams), reqParams.s)) {
logger.error(`验签失败!uid: ${_.get(req, 'user.uid', '').toString()}, params: ${JSON.stringify(reqParams)}, ip: ${req.yoho.clientIp}`);
... ...