a

@@ -118,9 +118,9 @@ exports.getCommentList4Order = (uid, orderId) => {
             goodsNum: 0,
             goodsNum: 0,
             orders: []
             orders: []
         };
         };
-
         // let pagerObj = {};
         // let pagerObj = {};
 
 
+
         // 接口返回成功, 处理数据
         // 接口返回成功, 处理数据
         if (result.code === 200 && !_.isEmpty(result.data)) {
         if (result.code === 200 && !_.isEmpty(result.data)) {
             _.forEach(result.data, (value) => {
             _.forEach(result.data, (value) => {
@@ -155,7 +155,7 @@ exports.getCommentList4Order = (uid, orderId) => {
 
 
                 order.goods.length && commentList.orders.push(order);
                 order.goods.length && commentList.orders.push(order);
             });
             });
-
+            
             // let total = commentList.orders.length;
             // let total = commentList.orders.length;
 
 
 
 

@@ -42,6 +42,7 @@
                                             <a href="{{href}}"><img src="{{thumb}}"></a>
                                             <a href="{{href}}"><img src="{{thumb}}"></a>
                                         </td>
                                         </td>
                                         <td>
                                         <td>
+<<<<<<< HEAD
                                             <a href="{{href}}" class="name">{{name}}</a>
                                             <a href="{{href}}" class="name">{{name}}</a>
                                             <div>下单时间{{../orderTime}}</div>
                                             <div>下单时间{{../orderTime}}</div>
                                         </td>
                                         </td>
@@ -92,6 +93,21 @@
                                             </div>
                                             </div>
                                         </td>
                                         </td>
                                     </tr>
                                     </tr>
+=======
+                                            <a href="{{href}}">{{name}}</a>
+                                            <span>下单时间{{../orderTime}}</span>
+                                        </td>
+                                        <td>
+                                            <button class="remark-btn">评价商品</button>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="3" class="comment-add">
+                                            <div>* 商品满意度：</div>
+                                            div.
+                                        </td>
+                                    </tr>
+>>>>>>> 425bde4da39a4d12b8a7501437469b785318db73
                                     {{#each comments}}
                                     {{#each comments}}
                                         <tr>
                                         <tr>
                                             <td>购买评价：</td>
                                             <td>购买评价：</td>