Authored by 刘传洋

Merge remote-tracking branch 'remotes/origin/feature/commentImgShow' into release/5.2

... ... @@ -75,7 +75,7 @@ exports.getCommentList = (uid, isComment, page, limit) => {
erpSkuId: v.erpSkuId,
orderId: value.orderId,
orderCode: value.orderCode,
orderTime: value.createTime
orderTime: value.createTime ? value.createTime.substr(0, 10) : ''
};
if (v.commentDetailBoDetail && v.commentDetailBoDetail.length > 0) {
... ... @@ -183,7 +183,7 @@ exports.getCommentList4Order = (uid, orderId) => {
orderCode: v.orderCode,
orderId: v.orderId,
orderTime: _.get(v, 'orderCreateTime') ?
moment(_.get(v, 'orderCreateTime') * 1000).format('YYYY-MM-DD HH:mm:ss') : ''
moment(_.get(v, 'orderCreateTime') * 1000).format('YYYY-MM-DD') : ''
};
order.goods.push(good);
... ...
... ... @@ -90,7 +90,7 @@
</span>
</div>
<div class="row textarea" data-role="goodsCommentWrap">
<label for="goodsComment" class="text-tip">晒单有奖,<i>100YOHO</i>等你来拿!</label>
<label for="goodsComment" class="text-tip">晒单有奖,<i>100有货</i>等你来拿!</label>
<label for="goodsComment" class="text-tip-limit">限制200字</label>
<textarea name="goodsComment"></textarea>
</div>
... ...
... ... @@ -9,8 +9,8 @@ var $ = require('yoho-jquery'),
Dialog = require('./dialog').Dialog;
var tpl = '<div class="toolbar">' +
'<a class="preview-route-left" href="javacript:void(0);"><i class="iconfont">&#xe639;</i>向左转</a>' +
'<a class="preview-route-right" href="javacript:void(0);"><i class="iconfont">&#xe63a;</i>向右转</a>' +
'<a class="preview-route-left" href="javascript:void(0);"><i class="iconfont">&#xe639;</i>向左转</a>' +
'<a class="preview-route-right" href="javascript:void(0);"><i class="iconfont">&#xe63a;</i>向右转</a>' +
'</div>' +
'<div class="preview-body"><img /></div>';
... ...