Merge remote-tracking branch 'origin/feature-wangdy-rate-v1.0' into feature-wangdy-rate-v1.0

# Conflicts:
#	src/main/webapp/resources/view/usercenter/forstore/first_rate.html

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -1330,6 +1330,34 @@ public class Order extends Document implements Serializable {
 		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
 	}
 
+	/**
+	 * Sets status TO_BE_REVIEWED.
+	 *
+	 * @param uu the uu
+	 */
+	public void setStatusToBeReviewed(Long uu) {
+		this.status = Status.TO_BE_REVIEWED.value();
+		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+	}
+	/**
+	 * Sets status TO_BE_AFTERREVIEWED.
+	 *
+	 * @param uu the uu
+	 */
+	public void setStatusToBeAfterReviewed(Long uu) {
+		this.status = Status.TO_BE_AFTERREVIEWED.value();
+		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+	}
+	/**
+	 * Sets status REVIEWED.
+	 *
+	 * @param uu the uu
+	 */
+	public void setStatusReviewed(Long uu) {
+		this.status = Status.REVIEWED.value();
+		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+	}
+
 	/**
 	 * Sets status un available.
 	 *

src/main/java/com/uas/platform/b2c/trade/rate/controller/RateController.java

@@ -3,6 +3,9 @@ package com.uas.platform.b2c.trade.rate.controller;
 
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
+import com.uas.platform.b2c.trade.order.dao.OrderDao;
+import com.uas.platform.b2c.trade.order.model.Order;
+import com.uas.platform.b2c.trade.order.model.OrderDetail;
 import com.uas.platform.b2c.trade.rate.model.RateBuyer;
 import com.uas.platform.b2c.trade.rate.model.RateGoods;
 import com.uas.platform.b2c.trade.rate.model.RateTemplate;
@@ -11,6 +14,7 @@ import com.uas.platform.b2c.trade.rate.service.RateService;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
+import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +32,9 @@ public class RateController {
     @Autowired
     private RateService rateService;
 
+    @Autowired
+    private OrderDao   orderDao;
+
     /**
      * 买家评价卖家店铺
      *
@@ -45,8 +52,7 @@ public class RateController {
             return  new ResultMap(CodeType.ERROR_STATE.code(),"参数有误");
         }
         RateVendor result = rateService.saveRateVendor(rateVendor);
-        //订单状态变更
-        //TODO
+
         return new ResultMap(CodeType.OK.code(), "评价成功", result);
 
     }
@@ -71,6 +77,12 @@ public class RateController {
 
         }
         rateService.saveRateGoods(rateGoodsList);
+        //订单状态变更
+        Order order = orderDao.findByOrderid(orderId);
+        if (order.getStatus().intValue() != Status.COMPLETED.value()) {
+            throw new IllegalOperatorException("当前订单不在已完成状态，不能收货！");
+        }
+        order.setStatusToBeAfterReviewed(SystemSession.getUser().getUserUU());
 
         return new ResultMap(CodeType.OK.code(), "评价成功");
 
@@ -94,6 +106,12 @@ public class RateController {
 
         }
         rateService.saveAfterRateGoods(rateGoodsList);
+        //订单状态变更
+        Order order = orderDao.findByOrderid(orderId);
+        if (order.getStatus().intValue() != Status.TO_BE_AFTERREVIEWED.value()) {
+            throw new IllegalOperatorException("当前订单未完成初评，不能追评！");
+        }
+        order.setStatusReviewed(SystemSession.getUser().getUserUU());
 
         return new ResultMap(CodeType.OK.code(), "追评成功");
 
@@ -209,7 +227,7 @@ public class RateController {
      * @param orderId
      * @return
      */
-    @RequestMapping(value = "/rateGoods/{orderId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/rateGoodsByOrderId/{orderId}", method = RequestMethod.GET)
     public ResultMap getRateGoodsByOrderId(@PathVariable("orderId")String orderId){
         List<RateGoods> result = rateService.getRateGoodsByOrderId(orderId);
         return new ResultMap(CodeType.OK.code(), "查询成功",result);
@@ -219,7 +237,7 @@ public class RateController {
      * @param goodsId
      * @return
      */
-    @RequestMapping(value = "/rateGoods/{goodsId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/rateGoodsByGoodsId/{goodsId}", method = RequestMethod.GET)
     public ResultMap getRateGoodsByGoodsId(@PathVariable("goodsId")Long goodsId){
         RateGoods result = rateService.getRateGoodsByGoodsId(goodsId);
         return new ResultMap(CodeType.OK.code(), "查询成功",result);

src/main/webapp/resources/js/common/query/rate.js

@@ -0,0 +1,72 @@
+define([ 'ngResource' ], function() {
+    angular.module('rateServices', [ 'ngResource' ]).factory('Rate', ['$resource', function($resource) {
+        return $resource('rate/rateBuyer/:orderId', {}, {
+            //查询该订单的卖家评价买家
+            getRateBuyer : {
+                url : 'rate/rateBuyer/:orderId',
+                method : 'GET'
+            },
+            // 查询该订单的买家评价商品(根据goodsId)
+            getRateGoodsByGoodsId : {
+                url : 'rate/rateGoodsByGoodsId/:goodsId',
+                method : 'GET'
+            },
+            // 查询该订单的买家评价商品(根据订单id)
+            getRateGoodsByOrderId : {
+                url : 'rate/rateGoodsByOrderId/:orderId',
+                method : 'GET'
+            },
+            // 查询该订单的买家评价卖家
+            getRateVendor : {
+                url : 'rate/rateVendor/:orderId',
+                method : 'GET'
+            },
+            // 查询该企业下的所有模版信息
+            getRateTemplate : {
+                url : 'rate/rateTemplate/:storeuuid',
+                method : 'POST'
+            },
+
+            // 买家评价卖家店铺
+            saveRateVendor : {
+                url : 'rate/rateVendor/:orderId',
+                method : 'POST'
+            },
+            // 买家评价商品
+            saveRateGoods : {
+                url : 'rate/rateGoods/:orderId',
+                method : 'POST'
+            },
+            //买家追评评价商品
+            saveAfterRateGoods : {
+                url : 'rate/afterRateGoods/:orderId',
+                method : 'POST'
+            },
+            //卖家评价买家
+            saveRateBuyer : {
+                url : 'rate/rateBuyer/:purchaseId',
+                method : 'POST'
+            },
+            //卖家追评价买家
+            saveAfterRateBuyer : {
+                url : 'rate/afterRateBuyer/:purchaseId',
+                method : 'POST'
+            },
+            //保存或修改评价模版
+            saveRateTemplate : {
+                url : 'rate/rateTemplate/:storeuuid',
+                method : 'POST'
+            },
+            //卖家为商品评价添加回复（初评）
+            saveReply : {
+                url : 'rate/rateReply/:orderId',
+                method : 'POST'
+            },
+            //卖家为商品评价添加回复（追评）
+            saveAfterReply : {
+                url : 'rate/afterRateReply/:orderId',
+                method : 'POST'
+            }
+        });
+    }]);
+});

src/main/webapp/resources/js/usercenter/app.js

@@ -1,7 +1,7 @@
 
-define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'common/services', 'common/directives','common/query/kind', 'common/query/brand', 'common/query/component', 'common/query/order', 'common/query/cart', 'common/query/goods', 'common/query/return' ,'angular-toaster', 'common/query/urlencryption', 'ui-jquery', 'common/query/bankTransfer', 'common/query/bankInfo', 'common/query/change', 'common/query/logistics', 'common/query/address' ,'angular-toaster','common/query/collection', 'common/query/proofing', 'common/query/bill', 'common/query/user','file-upload', 'file-upload-shim', 'common/query/bankInfo' , 'common/query/responseLogistics', 'common/query/payment', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/importDeclaration', 'common/query/enterprise', 'common/query/invoice', 'common/query/refund', 'common/query/recommendation', 'common/query/logisticsPort', 'common/query/storeInfo', 'common/query/tradeMessageNotice', 'common/query/tradeBasicProperties', 'common/query/browsingHistory', 'common/query/internalMessage', 'common/module/chat_web_module', 'angular-filter'], function(angularAMD) {
+define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'common/services', 'common/directives','common/query/kind', 'common/query/brand', 'common/query/component', 'common/query/order', 'common/query/cart', 'common/query/goods', 'common/query/return' ,'angular-toaster', 'common/query/urlencryption', 'ui-jquery', 'common/query/bankTransfer', 'common/query/bankInfo', 'common/query/change','common/query/rate', 'common/query/logistics', 'common/query/address' ,'angular-toaster','common/query/collection', 'common/query/proofing', 'common/query/bill', 'common/query/user','file-upload', 'file-upload-shim', 'common/query/bankInfo' , 'common/query/responseLogistics', 'common/query/payment', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/importDeclaration', 'common/query/enterprise', 'common/query/invoice', 'common/query/refund', 'common/query/recommendation', 'common/query/logisticsPort', 'common/query/storeInfo', 'common/query/tradeMessageNotice', 'common/query/tradeBasicProperties', 'common/query/browsingHistory', 'common/query/internalMessage', 'common/module/chat_web_module', 'angular-filter'], function(angularAMD) {
 	'use strict';
-	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ngTable', 'common.services', 'common.directives', 'tool.directives', 'common.query.kind', 'brandServices', 'componentServices', 'orderServices', 'cartServices', 'goodsServices', 'returnServices' , 'toaster', 'urlencryptionServices', 'ui.jquery', 'bankTransfer', 'bankInfo', 'changeServices', 'logisticsServices', 'addressServices', 'toaster','collection','proofingServices', 'billServices', 'common.query.user', 'angularFileUpload', 'bankInfo', 'responseLogisticsService', 'PaymentService', 'afterSaleService', 'messageBoardServices', 'table.directives', 'importDeclaration', 'common.query.enterprise', 'invoiceServices', 'refundModule', 'recommendation','logisticsPortService', 'storeInfoServices', 'tradeMessageNoticeModule', 'tradeBasicPropertiesServices', 'BrowsingHistory', 'internalMessageServices', 'WebChatModule', 'angular.filter']);
+	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ngTable', 'common.services', 'common.directives', 'tool.directives', 'common.query.kind', 'brandServices', 'componentServices', 'orderServices', 'cartServices', 'goodsServices', 'returnServices' , 'toaster', 'urlencryptionServices', 'ui.jquery', 'bankTransfer', 'bankInfo', 'changeServices', 'rateServices', 'logisticsServices', 'addressServices', 'toaster','collection','proofingServices', 'billServices', 'common.query.user', 'angularFileUpload', 'bankInfo', 'responseLogisticsService', 'PaymentService', 'afterSaleService', 'messageBoardServices', 'table.directives', 'importDeclaration', 'common.query.enterprise', 'invoiceServices', 'refundModule', 'recommendation','logisticsPortService', 'storeInfoServices', 'tradeMessageNoticeModule', 'tradeBasicPropertiesServices', 'BrowsingHistory', 'internalMessageServices', 'WebChatModule', 'angular.filter']);
 	app.init = function() {
 		angularAMD.bootstrap(app);
 	};
@@ -379,19 +379,19 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 			controllerUrl : 'app/controllers/forstore/shipping_address_edit_ctrl'
 		})).state('firstRate', angularAMD.route({
 			// 初次评价
-			url : '/rate/firstRate',
+			url : '/rate/firstRate/:orderid',
 			templateUrl : 'static/view/usercenter/forstore/first_rate.html',
 			controller : 'firstRateCtrl',
 			controllerUrl : 'app/controllers/forstore/first_rate_ctrl'
 		})).state('addRate', angularAMD.route({
 			// 追加评价
-			url : '/rate/addRate',
+			url : '/rate/addRate:orderid',
 			templateUrl : 'static/view/usercenter/forstore/add_rate.html',
 			controller : 'addRateCtrl',
 			controllerUrl : 'app/controllers/forstore/add_rate_ctrl'
 		})).state('showRate', angularAMD.route({
 			// 查看评价
-			url : '/rate/showRate',
+			url : '/rate/showRate:orderid',
 			templateUrl : 'static/view/usercenter/forstore/show_rate.html',
 			controller : 'showRateCtrl',
 			controllerUrl : 'app/controllers/forstore/show_rate_ctrl'

src/main/webapp/resources/js/usercenter/controllers/forstore/first_rate_ctrl.js

@@ -1,5 +1,124 @@
 define(['app/app'], function(app) {
-    app.register.controller('firstRateCtrl', ['$scope', '$rootScope', '$stateParams', function ($scope, $rootScope, $stateParams) {
-        $scope.text = 'first rate page';
+    'use strict';
+    app.register.controller('firstRateCtrl', ['$scope', '$rootScope', '$stateParams','$filter','Order', 'toaster', 'Rate', function ($scope, $rootScope, $stateParams , $filter , Order , toaster , Rate) {
+
+        if ($stateParams.orderid && $stateParams.orderid != '') {
+            $scope.orderid = $stateParams.orderid;
+            if(!$scope.orderid) {
+                toaster.pop('warning', '没有传入有效的订单信息');
+            }
+            Order.get({orderid : $scope.orderid}, function (data) {
+                if(data.length != 1) {
+                    toaster.pop('warning', '获取订单信息失败');
+                    return ;
+                }
+                $scope.order = data[0];
+            });
+        }
+        /**
+         * 获取买家评价店铺的信息
+         */
+
+        $scope.saveRateGoods = function () {
+            Rate.saveRateGoods({orderId : $scope.order.orderid},{}, function (data) {
+                if(data.length != 1) {
+                    toaster.pop('warning', '获取订单信息失败');
+                    return ;
+                }
+
+                console.log("$scope.order", $scope.order);
+            }, function() {
+                toaster.pop('warning', '评价失败。');
+            });
+        };
+
+
     }]);
-});
+});
+
+
+/*
+
+define(['app/app', 'calendar'], function(app) {
+    'use strict';
+    app.register.controller('buyerQueryLogisticsCtrl', ['$scope', '$rootScope', 'BaseService', 'KdnLogistics', '$stateParams', '$filter', 'Logistics', "Order", 'toaster', function($scope, $rootScope, BaseService, KdnLogistics, $stateParams, $filter, Logistics, Order, toaster) {
+
+        $rootScope.active = 'buyer_order';
+
+        // 加密过滤器
+        var enIdFilter = $filter('EncryptionFilter');
+
+        /!**
+         *  查询物流信息(接口需要真实运单号)
+         *
+         *  @param  kdnCompanyName	快递公司名称
+         *  @param	logisticsCode	运单号
+         *
+         *!/
+        if ($stateParams.orderid && $stateParams.orderid != '') {
+            $scope.orderid = $stateParams.orderid;
+            if(!$scope.orderid) {
+                toaster.pop('warning', '没有传入有效的订单信息');
+            }
+            Order.get({orderid : $scope.orderid}, function (data) {
+                if(data.length != 1) {
+                    toaster.pop('warning', '获取订单信息失败');
+                    return ;
+                }
+                $scope.order = data[0];
+                $scope.address = JSON.parse($scope.order.jsonAddress);
+                console.log("$scope.order", $scope.order);
+                Logistics.findLogisticsById({lgtid: data[0].lgtId}, function(data){
+                    $scope.logistics = data;
+                    var params = {};
+                    params.companyName = $scope.logistics.companyName;
+                    params.logisticsCode = $scope.logistics.number;
+                    KdnLogistics.kdnQuery(params, {}, function(response){
+                        if(!response.errorInfo) {
+                            $scope.logisticsInfo = eval ("(" + response.traces + ")");
+                            statusOfLogistics($scope.logisticsInfo[$scope.logisticsInfo.length - 1].AcceptStation);
+                            $scope.hasInfo = true;
+                        }
+                    }, function(){
+                        $scope.logisticsInfo = [];
+                        toaster.pop('info', '查询物流信息失败,请核对物流公司和运单号');
+                    });
+                }, function(){
+                    toaster.pop('info', '根据快递ID查询跟订单相关联的物流信息失败');
+                });
+            }, function() {
+                toaster.pop('warning', '获取订单信心失败。');
+            });
+        }
+
+        $scope.status = "tobereceiving";
+        // 判断物流信息状态
+        var statusOfLogistics = function(str) {
+            if(str.indexOf("揽件")!=-1 || str.indexOf("收件")!=-1 || str.indexOf("转运")!=-1||str.indexOf("运输")!=-1||str.indexOf("发往")!=-1||
+                str.indexOf("发出")!=-1||str.indexOf("收入")!=-1||str.indexOf("扫描")!=-1||str.indexOf("到达")!=-1){
+                $scope.status = "transit";
+            }
+            if(str.indexOf("派送")!=-1){
+                $scope.status = "send";
+            }
+            if(str.indexOf("签收")!=-1){
+                $scope.status = "signin";
+            }
+        }
+
+        /!**
+         *  日历组件
+         *
+         *!/
+        $('#date').calendar({
+            width: 270,
+            height: 220
+        });
+
+    }]);
+
+
+
+
+});
+*/

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -736,16 +736,19 @@
 								<a href="user#/order/detail/{{order.orderid | EncryptionFilter}}" class="oder_d action-link" style="display: block;" target="_blank">订单详情</a>
 
 								<a class="action-link" href="user#/buyerQueryLogistics/{{order.orderid | EncryptionFilter}}" ng-if="order.status == 404" style="display: block;" target="_blank">查看物流</a>
-								<a class="action-link" href="user#/rate/showRate" style="display: block;" target="_blank">双方已评</a>
+								<div>双方已评</div>
 							</div>
 						</span>
 						<span class="oder_deal" ng-class="{'order-border-bottom-solid' : $index == order.orderDetails.length -1 || $index==2}">
                             <div ng-if="$index == 0">
-								<a class="operate-height" href="user#/rate/addRate" target="_blank" style="display: block;">
+                                <a ng-if="order.status == 520" class="operate-height" href="user#/rate/firstRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
+                                  <em class="order-operation">评价</em>
+                              	</a>
+								<a ng-if="order.status == 523" class="operate-height" href="user#/rate/addRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   <em class="order-operation">追加评价</em>
                               	</a>
-								<a class="operate-height" href="user#/rate/firstRate" target="_blank" style="display: block;">
-                                  <em class="order-operation">评价</em>
+								<a ng-if="order.status == 522" class="operate-height" href="user#/rate/showRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
+                                  <em class="order-operation">已评价</em>
                               	</a>
                               <a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="(order.status == 503 || order.status == 501) && order.auditPayFailReason == null" style="display: block;">
                                   <em class="order-operation">立即付款</em>

src/main/webapp/resources/view/usercenter/forstore/first_rate.html

@@ -119,7 +119,7 @@
         <span style="width: 27%;">
             <a target="_blank" class="first-rate-company">
                 <img src="static/img/user/images/shop_home.png"/>
-                <em>深圳市优软科技有限公司</em>
+                <em>{{order.sellername}}</em>
             </a>
         </span>
         <span style="position: relative; width: 10%; margin-left: 50px;">
@@ -140,164 +140,20 @@
             </tr>
         </thead>
         <tbody>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
+            <tr ng-repeat="detail in order.orderDetails">
                 <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
-                    <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：mnnnnnk</span></span>
-                    </div>
-                    <div class="first-rate-item-rate">
-                        <div class="rate-item">
-                            <label for="1">
-                                <span>好评</span>
-                                <input type="radio" id="1">
-                            </label>
-                            <label for="2">
-                                <span>中评</span>
-                                <input type="radio" id="2">
-                            </label>
-                            <label for="3">
-                                <span>差评</span>
-                                <input type="radio" id="3">
-                            </label>
-                        </div>
-                        <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img src="static/img/user/images/default.png" alt="">
+                    <a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
+
                     <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：专用处理器</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：445NNSJASDASKDJA</span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：mnnnnnk</span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：<a href="product/kind/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a></span></span>
                     </div>
                     <div class="first-rate-item-rate">
                         <div class="rate-item">
                             <label for="1">
                                 <span>好评</span>
-                                <input type="radio" id="1">
+                                <input type="radio" id="1" checked="checked">
                             </label>
                             <label for="2">
                                 <span>中评</span>
@@ -314,6 +170,7 @@
                     </div>
                 </td>
             </tr>
+
             <tr class="record-num">
                 <td colspan="6">
                     <span class="count-tip">显示<span ng-bind="$$kdnData.start">23</span>-<span ng-bind="$$kdnData.end">10</span>，共：<span ng-bind="$$kdnData.totalElements" style="color: #5078cb;">23</span>个</span>
@@ -323,7 +180,7 @@
     </table>
     <div class="submitBox">
         <label class="check-active">
-            <input ng-model="isSetTop" type="checkbox" id="check-act" checked class="ng-pristine ng-untouched ng-valid">
+            <input ng-model="isSetTop" type="checkbox" id="check-act" class="ng-pristine ng-untouched ng-valid" checked="checked">
             <label for="check-act"></label>
             <span style="font-size: 14px; color: black">匿名评价</span>
         </label>