订单成功页增加诈骗提示
-
Please register or login to post a comment
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b feature/payEnd origin/feature/payEnd
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout release/5.4 git merge --no-ff feature/payEnd
Step 4. Push the result of the merge to GitLab
git push origin release/5.4
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines
The changes were merged into release/5.4. The source branch has been removed.
return; | ||
} | ||
// 支付失败 | ||
if (req.query.trade_status !== 'TRADE_SUCCESS') { | ||
return res.render('pay/pay-ali', Object.assign(responseData)); | ||
|
}; | ||
if (result && result[0]) { | ||
resu.banner = result[0]; | ||
|
var $ = require('yoho-jquery'), | ||
lazyLoad = require('yoho-jquery-lazyload'); | ||
var prompt = $('.fraud-prompt'), fraudTip, scrollVal, onePageH, diff, MyMar; | ||
|
if ($('#goods-list').length === 0) { | ||
$('.maybe-like').hide(); | ||
} | ||
if ($('.fraud-tip').height() > $('.fraud-prompt').height()) { | ||
|
Status changed to merged