diff --git a/apps/home/models/comment.js b/apps/home/models/comment.js index 780c194..bf786b9 100644 --- a/apps/home/models/comment.js +++ b/apps/home/models/comment.js @@ -74,7 +74,8 @@ exports.getCommentList = (uid, isComment, page, limit) => { goodsId: v.goodsId, erpSkuId: v.erpSkuId, orderId: value.orderId, - orderCode: value.orderCode + orderCode: value.orderCode, + orderTime: value.createTime }; if (v.commentDetailBoDetail && v.commentDetailBoDetail.length > 0) { @@ -164,7 +165,7 @@ exports.getCommentList4Order = (uid, orderId) => { let order = { // orderNum: value.orderCode, // orderTime: value.createTime, - orderId: orderId, + orderNum: orderId, goods: [] }; @@ -180,7 +181,9 @@ exports.getCommentList4Order = (uid, orderId) => { goodsId: v.goodsId, erpSkuId: v.erpSkuId, orderCode: v.orderCode, - orderId: v.orderId + orderId: v.orderId, + orderTime: _.get(v, 'orderCreateTime') ? + moment(_.get(v, 'orderCreateTime') * 1000).format('YYYY-MM-DD HH:mm:ss') : '' }; order.goods.push(good); diff --git a/apps/home/views/action/comment.hbs b/apps/home/views/action/comment.hbs index bd314b1..1c25bc3 100644 --- a/apps/home/views/action/comment.hbs +++ b/apps/home/views/action/comment.hbs @@ -3,7 +3,7 @@ {{> navigation}} <div class="me-main"> <div class="comment block"> - <h2 class="title"></h2> + <h2 class="title {{#if isFromOrder}}comment-order{{/if}}"></h2> {{#with comment}} <div class="me-comment"> @@ -45,7 +45,7 @@ </td> <td> <a href="{{href}}" class="name">{{name}}</a> - <div>下单时间{{../orderTime}}</div> + <div>下单时间:{{orderTime}}</div> </td> <td style="width:50%" class="center"> <button class="btn active radius" data-role="showCommentForm">评价商品</button> diff --git a/public/img/home/comment-order.jpg b/public/img/home/comment-order.jpg new file mode 100644 index 0000000..4f54b43 Binary files /dev/null and b/public/img/home/comment-order.jpg differ diff --git a/public/js/home/comment.page.js b/public/js/home/comment.page.js index b2feee0..e4c4842 100644 --- a/public/js/home/comment.page.js +++ b/public/js/home/comment.page.js @@ -76,13 +76,13 @@ $('.comment-add').on('click', '.btn-submit', function() { return; } - if (param.height && !/^\d*$/.test(param.height)) { - alert('身高必须为数字'); + if (param.height && !/^\d{0,3}$/.test(param.height)) { + alert('身高必须为最大3位数的数字'); return; } - if (param.weight && !/^\d*$/.test(param.weight)) { - alert('体重必须为数字'); + if (param.weight && !/^\d{0,3}$/.test(param.weight)) { + alert('体重必须为最大3位数的数字'); return; } diff --git a/public/scss/home/_comment.css b/public/scss/home/_comment.css index a2f96fc..32a02f1 100644 --- a/public/scss/home/_comment.css +++ b/public/scss/home/_comment.css @@ -38,6 +38,10 @@ } .comment .title { background-image: resolve("home/comment.png"); + + &.comment-order { + background-image: resolve("home/comment-order.png"); + } } .me-comment {