fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit 84dd696e8850bd930abb4943333ddd57596796e0 2 parents 06566e9e 425bde4d

a

Inline Side-by-side
Showing 2 changed files with 17 additions and 1 deletions
@@ -118,9 +118,9 @@ exports.getCommentList4Order = (uid, orderId) => { @@ -118,9 +118,9 @@ exports.getCommentList4Order = (uid, orderId) => {
118 goodsNum: 0, 118 goodsNum: 0,
119 orders: [] 119 orders: []
120 }; 120 };
121 -  
122 // let pagerObj = {}; 121 // let pagerObj = {};
123 122
  123 +
124 // 接口返回成功, 处理数据 124 // 接口返回成功, 处理数据
125 if (result.code === 200 && !_.isEmpty(result.data)) { 125 if (result.code === 200 && !_.isEmpty(result.data)) {
126 _.forEach(result.data, (value) => { 126 _.forEach(result.data, (value) => {
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
42 <a href="{{href}}"><img src="{{thumb}}"></a> 42 <a href="{{href}}"><img src="{{thumb}}"></a>
43 </td> 43 </td>
44 <td> 44 <td>
  45 +<<<<<<< HEAD
45 <a href="{{href}}" class="name">{{name}}</a> 46 <a href="{{href}}" class="name">{{name}}</a>
46 <div>下单时间{{../orderTime}}</div> 47 <div>下单时间{{../orderTime}}</div>
47 </td> 48 </td>
@@ -92,6 +93,21 @@ @@ -92,6 +93,21 @@
92 </div> 93 </div>
93 </td> 94 </td>
94 </tr> 95 </tr>
  96 +=======
  97 + <a href="{{href}}">{{name}}</a>
  98 + <span>下单时间{{../orderTime}}</span>
  99 + </td>
  100 + <td>
  101 + <button class="remark-btn">评价商品</button>
  102 + </td>
  103 + </tr>
  104 + <tr>
  105 + <td colspan="3" class="comment-add">
  106 + <div>* 商品满意度：</div>
  107 + div.
  108 + </td>
  109 + </tr>
  110 +>>>>>>> 425bde4da39a4d12b8a7501437469b785318db73
95 {{#each comments}} 111 {{#each comments}}
96 <tr> 112 <tr>
97 <td>购买评价：</td> 113 <td>购买评价：</td>