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

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

@@ -418,7 +418,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 			return statusConfig[data];
 		}
 	});
-
 	// 状态码  -> 快递
 	app.filter('logisticsCompany', function(){
 		var logisticsCompanyConfig = {

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

@@ -548,7 +548,12 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 			templateUrl: 'static/view/vendor/forstore/messagePublic.html',
 			controller: 'MessagePublicCtrl',
 			controllerUrl: 'app/controllers/forstore/messagePublicCtrl'
-		}))
+		})).state('showRate', angularAMD.route({
+			url: '/showRate/:orderId',
+			templateUrl: 'static/view/vendor/forstore/showRate.html',
+			controller: 'showRateCtrl',
+			controllerUrl: 'app/controllers/forstore/show_rate_ctrl'
+		}));
 	}]);
 
 	// 状态码  -> 描述

src/main/webapp/resources/js/vendor/controllers/forstore/show_rate_ctrl.js

@@ -0,0 +1,6 @@
+define(['app/app'], function(app) {
+    app.register.controller('showRateCtrl', ['$scope', '$rootScope', '$stateParams', function ($scope, $rootScope, $stateParams) {
+
+        $scope.text = 'show rate page';
+    }]);
+});

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

@@ -34,7 +34,7 @@
     .add-rate table tbody tr {
         border-bottom: 1px dashed rgb( 232, 235, 252 );
     }
-    .add-rate table tbody tr td img{
+    .add-rate table tbody tr td >img{
         width: 73px;
         height: 74px;
         float: left;
@@ -85,9 +85,21 @@
         background: #5078cb;
         color: #fff;
     }
-    .add-rate table thead tr td >span {
+    .add-rate table thead tr.line02 {
+        background: #f5f8fe;
+    }
+    .add-rate table thead tr.line02 .describe-title {
+        color: #5078cb;
+        font-weight: bold;
+        margin-left: 15px;
+    }
+    .add-rate table thead tr.line02 .describe-option {
+        margin-right: 55px;
+    }
+    .add-rate table thead tr.line01 td >span {
         margin-left: 5px;
         float: left;
+        margin-top: 5px;
     }
     .add-rate table thead tr td >div {
         display: inline-block;
@@ -102,6 +114,8 @@
     }
     .add-rate table thead tr td >div >span.add-rate-item02 {
         margin-top: 5px;
+        color: #999;
+        font-size: 12px;
     }
     .add-rate table .buyer-first-rate {
         width: 726px;
@@ -125,10 +139,15 @@
     .add-rate table .buyer-first-rate .buyer-first-rate02 >div {
         display: inline-block;
     }
-    .add-rate table .buyer-first-rate .buyer-first-rate02 >div span {
+    .add-rate table .buyer-first-rate .buyer-first-rate02 >div >span {
         display: block;
         margin-top: 10px;
     }
+    .add-rate table .buyer-first-rate .buyer-first-rate02 >div >span img {
+        margin-right: 3px;
+        position: relative;
+        top: -2px;
+    }
     .add-rate table .buyer-first-rate .comment {
         width: 215px;
         float: right;
@@ -148,7 +167,7 @@
         margin: 5px 0;
     }
     .add-rate table tbody tr td .first-rate-item-textBox textarea {
-        width: 209px;
+        width: 207px;
         height: 60px;
         overflow: scroll;
     }
@@ -171,9 +190,9 @@
     </div>
     <table>
         <thead>
-        <tr>
+        <tr class="line01">
             <td>
-                <span>好评</span>
+                <span><img src="static/img/user/images/rate1.png" alt="">好评</span>
                 <div style="margin-left: 20px;">
                     <span class="add-rate-item01">卖家初评：<span>很爽快的买家</span></span>
                     <span class="add-rate-item02">2017-07-01</span>
@@ -184,6 +203,35 @@
                 </div>
             </td>
         </tr>
+        <tr class="line02">
+            <td>
+                <span class="describe-title describe-option">店铺评价：</span>
+                <span>描述相符：</span>
+                <span class="rate-level describe-option">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                    </span>
+                <span>卖家服务：</span>
+                <span class="rate-level describe-option">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                    </span>
+                <span>物流服务：</span>
+                <span class="rate-level describe-option">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                    </span>
+            </td>
+        </tr>
         </thead>
         <tbody>
         <tr>
@@ -197,15 +245,15 @@
                 <div class="buyer-first-rate">
                     <div class="buyer-first-rate02" style="margin-left: 100px">
                         <div>
-                            <span>买家初评</span>
-                            <span><i></i><span>好评</span></span>
+                            <span>买家初评：</span>
+                            <span><img src="static/img/user/images/rate1.png" alt=""><span>好评</span></span>
                             <span class="rate-date">2017-06-05</span>
                         </div>
                         <div class="comment">
                             <span>谢谢亲阿双方打款付了哈咖啡韩哈见客户</span></div>
                     </div>
                     <div class="buyer-first-rate02" style="background: #fff">
-                        <div style="margin-top: 10px;">买家追评</div>
+                        <div style="margin-top: 10px;">买家追评：</div>
                         <div class="first-rate-item-textBox">
                             <textarea placeholder="请输入您对产品的评价" name="" id="" cols="30" rows="10"></textarea>
                         </div>

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

@@ -34,7 +34,7 @@
     .add-rate table tbody tr {
         border-bottom: 1px dashed rgb( 232, 235, 252 );
     }
-    .add-rate table tbody tr td img{
+    .add-rate table tbody tr td >img{
         width: 73px;
         height: 74px;
         float: left;
@@ -110,6 +110,8 @@
     }
     .add-rate table thead tr td >div >span.add-rate-item02 {
         margin-top: 5px;
+        color: #999;
+        font-size: 12px;
     }
     .add-rate table thead tr.line01 {
         border-bottom: 1px solid rgb( 232, 235, 252 );
@@ -117,9 +119,6 @@
     .add-rate table thead tr.line02 {
         background: #f5f8fe;
     }
-    .add-rate table thead tr.line02  {
-        background: #f5f8fe;
-    }
     .add-rate table thead tr.line02 .describe-title {
         color: #5078cb;
         font-weight: bold;
@@ -144,16 +143,21 @@
     .add-rate table .buyer-first-rate >div >div {
     }
     .add-rate table .buyer-first-rate >div .rate-date {
-        color: #a8a8a8;
+        color: #999;
         margin-top: 10px;
     }
     .add-rate table .buyer-first-rate .buyer-first-rate02 >div {
         display: inline-block;
     }
-    .add-rate table .buyer-first-rate .buyer-first-rate02 >div span {
+    .add-rate table .buyer-first-rate .buyer-first-rate02 >div >span {
         display: block;
         margin-top: 10px;
     }
+    .add-rate table .buyer-first-rate .buyer-first-rate02 >div >span img{
+        margin-right: 3px;
+        position: relative;
+        top: -2px;
+    }
     .add-rate table .buyer-first-rate .comment {
         width: 215px;
         float: right;
@@ -240,7 +244,7 @@
                     <div class="buyer-first-rate02" style="margin-left: 100px">
                         <div>
                             <span>买家初评</span>
-                            <span><i></i><span>好评</span></span>
+                            <span><img src="static/img/user/images/rate1.png" alt=""><span>好评</span></span>
                             <span class="rate-date">2017-06-05</span>
                         </div>
                         <div class="comment">
@@ -249,7 +253,7 @@
                     <div class="buyer-first-rate02">
                         <div>
                             <span>买家初评</span>
-                            <span><i></i><span>好评</span></span>
+                            <span><img src="static/img/user/images/rate2.png" alt=""><span>中评</span></span>
                             <span class="rate-date">2017-06-05</span>
                         </div>
                         <div class="comment">

src/main/webapp/resources/view/vendor/forstore/showRate.html

@@ -0,0 +1,396 @@
+<style>
+    .add-rate {
+        width: 1026px;
+        float: right;
+        background: #fff;
+    }
+    .add-rate .add-rate-head {
+        background: #89affa;
+        color: #fff;
+        padding: 0px 24px;
+        height: 40px;
+        line-height: 40px;
+    }
+    .add-rate .add-rate-head  span a.add-rate-company {
+        font-size: 14px;
+    }
+    .add-rate .add-rate-head  span a em {
+        color: #fff;
+        font-size: 14px;
+    }
+    .add-rate table {
+        margin: 13px;
+    }
+    .add-rate table thead {
+        border-bottom: 1px solid rgb( 232, 235, 252 );
+        background: #fff;
+    }
+    .add-rate table thead tr td {
+        width: 1000px;
+        padding: 14px 11px;
+        font-size: 14px;
+        margin-left: 15px;
+    }
+    .add-rate table tbody tr {
+        border-bottom: 1px dashed rgb( 232, 235, 252 );
+    }
+    .add-rate table tbody tr td >img{
+        width: 73px;
+        height: 74px;
+        float: left;
+        margin-top: 12px;
+    }
+    .add-rate table tbody tr td .add-rate-item-info {
+        display: inline-block;
+        width: 200px;
+        float: left;
+        margin-top: 15px;
+    }
+    .add-rate table tbody tr td .add-rate-item-introduce {
+        display: block;
+        margin: 0px 10px;
+        font-size: 14px;
+    }
+    .add-rate table tbody tr td .add-rate-item-introduce span {
+        float: left;
+    }
+    .add-rate table tbody tr td .add-rate-item-introduce span.add-rate-item-link {
+        max-width: 200px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: inline-block;
+        white-space: nowrap;
+        height: 22px;
+        line-height: 22px;
+    }
+    .add-rate table tbody .record-num {
+        border: none;
+    }
+    .add-rate table tbody .record-num td .count-tip{
+        float: right;
+        margin-right: 10px;
+    }
+    .add-rate .submitBox {
+        text-align: center;
+        margin: 35px auto;
+    }
+    .add-rate .submitBox label {
+        font-size: 14px;
+        font-weight: normal;
+        margin-right: 22px;
+    }
+    .add-rate .submitBox >span.submit-btn {
+        font-size: 14px;
+        padding: 4px 17px;
+        background: #5078cb;
+        color: #fff;
+    }
+    .add-rate table thead tr.line01 td >span {
+        margin-left: 5px;
+        float: left;
+        margin-top: 5px;
+    }
+    .add-rate table thead tr.line01 td >span >img {
+        margin-right: 5px;
+        margin-bottom: 3px;
+    }
+    .add-rate table thead tr.line02 td >span >img {
+        margin-left: -3px;
+    }
+    .add-rate table thead tr td >div {
+        display: inline-block;
+        width: 43%;
+        background: #f9f9f9;
+        padding: 5px 10px;
+    }
+    .add-rate table thead tr td >div >span {
+        display: block;
+    }
+    .add-rate table thead tr td >div >span.add-rate-item01 {
+    }
+    .add-rate table thead tr td >div >span.add-rate-item02 {
+        margin-top: 5px;
+        color: #999;
+        font-size: 12px;
+    }
+    .add-rate table thead tr.line01 {
+        border-bottom: 1px solid rgb( 232, 235, 252 );
+    }
+    .add-rate table thead tr.line02 {
+        background: #f5f8fe;
+    }
+    .add-rate table thead tr.line02 .describe-title {
+        color: #5078cb;
+        font-weight: bold;
+        margin-left: 15px;
+    }
+    .add-rate table thead tr.line02 .describe-option {
+        margin-right: 55px;
+    }
+    .add-rate table .batch-reply {
+        color: #fff;
+        background: #ff8623;
+        border-radius: 3px;
+        padding: 4px 10px;
+        float: right;
+        cursor: pointer;
+    }
+    .add-rate table tbody .single-reply {
+        position: absolute;
+        top: 61px;
+        left: 265px;
+    }
+    .add-rate table .buyer-first-rate {
+        width: 726px;
+        float: right;
+        margin-top: 12px;
+    }
+    .add-rate table .buyer-first-rate >div {
+        width: 311px;
+        display: inline-block;
+        background: #f9f9f9;
+        padding: 0 10px;
+        overflow: hidden;
+        height: 87px;
+        position: relative;
+    }
+    .add-rate table .buyer-first-rate >div >div {
+    }
+    .add-rate table .buyer-first-rate >div .rate-date {
+        color: #999;
+        margin-top: 10px;
+    }
+    .add-rate table .buyer-first-rate .buyer-first-rate02 >div {
+        display: inline-block;
+    }
+    .add-rate table .buyer-first-rate .buyer-first-rate02 >div >span {
+        display: block;
+        margin-top: 10px;
+    }
+    .add-rate table .buyer-first-rate .buyer-first-rate02 >div >span img{
+        margin-right: 3px;
+        position: relative;
+        top: -2px;
+    }
+    .add-rate table .buyer-first-rate .comment {
+        width: 215px;
+        float: right;
+        height: 67px;
+    }
+    .add-rate table .buyer-first-rate .comment span{
+        white-space: normal;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        height: 60px;
+    }
+    .add-rate .reply-box {
+        position: fixed;
+        width: 391px;
+        height: 267px;
+        background: #fff;
+        top: 121px;
+        left: 650px;
+        box-shadow: 2.5px 4.33px 5px 0px rgb( 187, 186, 186 );
+        padding-left: 35px;
+        padding-top: 30px;
+    }
+    .add-rate .reply-box >img {
+        position: absolute;
+        top: 10px;
+        right: 10px;
+        cursor: pointer;
+    }
+    .add-rate .reply-box .modal-select {
+        width: 224px;
+        height: 30px;
+        display: inline-block;
+        margin-left: 42px;
+        cursor: default;
+        background: #fff;
+    }
+    .add-rate .reply-box ul {
+        position: absolute;
+        right:8px;
+    }
+    .add-rate .reply-box ul li {
+        width: 224px;
+        height: 30px;
+        line-height: 30px;
+        background: #fff;
+        padding-left: 12px;
+        cursor: pointer;
+    }
+    .add-rate .reply-box ul li.add-modal {
+        color: #999;
+        font-size: 12px;
+        text-align: center;
+        background: #efedee;
+    }
+    .add-rate .reply-box ul li.add-modal img {
+        margin-right: 8px;
+        margin-bottom: 3px;
+    }
+    .add-rate .reply-box ul li:hover {
+        background: #5079cb;
+        color: #fff;
+    }
+    .add-rate .reply-box .reply-box-text {
+        margin-top: 10px;
+    }
+    .add-rate .reply-box .reply-box-text >textarea {
+        width: 340px;
+        height: 156px;
+        display: block;
+        background: #f9f9f9;
+        font-size: 14px;
+        color: #999;
+        padding-top: 10px;
+        padding-left: 20px;
+        overflow: scroll;
+        border: 1px solid #f9f9f9;
+    }
+
+</style>
+
+<div class="add-rate">
+    <div class="add-rate-head">
+        <span style="width: 27%;">
+            <a target="_blank" class="add-rate-company">
+                <img src="static/img/user/images/shop_home.png"/>
+                <em>深圳市优软科技有限公司</em>
+            </a>
+        </span>
+        <span style="position: relative; width: 10%; margin-left: 50px;">
+            <img src="static/img/common/songguo.png"/>
+            <a href="javascript:void(0)" class="contact_btn">联系卖家</a>
+        </span>
+        <span style="float: right;margin-right: 46px; font-size: 12px;">其他买家需要你的建议喔</span>
+    </div>
+    <table>
+        <thead>
+        <tr class="line01">
+            <td>
+                <span><img src="static/img/user/images/rate1.png" alt="">好评</span>
+                <div style="margin-left: 20px;">
+                    <span class="add-rate-item01">卖家初评：<span>很爽快的买家</span></span>
+                    <span class="add-rate-item02">2017-07-01</span>
+                </div>
+                <div style="margin-left: 40px;">
+                    <span class="add-rate-item01">卖家追评：<span>很好的买家，感谢您的支持！</span></span>
+                    <span class="add-rate-item02">2017-07-01</span>
+                </div>
+            </td>
+        </tr>
+        <tr class="line02">
+            <td>
+                <span class="describe-title describe-option">店铺评价：</span>
+                <span>描述相符：</span>
+                <span class="rate-level describe-option">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                    </span>
+                <span>卖家服务：</span>
+                <span class="rate-level describe-option">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                    </span>
+                <span>物流服务：</span>
+                <span class="rate-level describe-option">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                        <img src="static/img/user/images/rateGood.png" alt="">
+                </span>
+                <span class="batch-reply">批量回复</span>
+            </td>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td>
+                <img src="static/img/user/images/default.png" alt="">
+                <div class="add-rate-item-info">
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：专用处理器</span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：445NNSJASDASKDJA</span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：mnnnnnk</span></span>
+                </div>
+                <div class="buyer-first-rate">
+                    <div class="buyer-first-rate02" style="margin-left: 100px">
+                        <div>
+                            <span>买家初评</span>
+                            <span><img src="static/img/user/images/rate1.png" alt=""><span>好评</span></span>
+                            <span class="rate-date">2017-06-05</span>
+                        </div>
+                        <div class="comment">
+                            <span>谢谢亲阿双方打款付了哈咖啡韩哈见客户</span>
+                        </div>
+                        <span class="batch-reply single-reply">回复</span>
+                    </div>
+                    <div class="buyer-first-rate02">
+                        <div>
+                            <span>买家初评</span>
+                            <span><img src="static/img/user/images/rate2.png" alt=""><span>中评</span></span>
+                            <span class="rate-date">2017-06-05</span>
+                        </div>
+                        <div class="comment">
+                            <span>谢谢亲阿双方打款付了哈咖啡韩哈见客户</span>
+                        </div>
+                        <span class="batch-reply single-reply">回复</span>
+                    </div>
+                </div>
+                <div class="buyer-first-rate">
+                    <div class="buyer-first-rate02" style="margin-left: 100px">
+                        <div>
+                            <span style="color:#6083ce;">卖家回复</span>
+                            <span class="rate-date">2017-06-05</span>
+                        </div>
+                        <div class="comment">
+                            <span>谢谢亲阿双方打款付了哈咖啡韩哈见客户</span></div>
+                    </div>
+                    <div class="buyer-first-rate02">
+                        <div>
+                            <span style="color:#6083ce;">卖家回复</span>
+                            <span class="rate-date">2017-06-05</span>
+                        </div>
+                        <div class="comment">
+                            <span>谢谢亲阿双方打款付了哈咖啡韩哈见客户</span></div>
+                    </div>
+                </div>
+            </td>
+        </tr>
+        <tr class="record-num">
+            <td colspan="6">
+                <span class="count-tip">显示<span ng-bind="$$kdnData.start"></span>-<span ng-bind="$$kdnData.end"></span>，共：<span ng-bind="$$kdnData.totalElements" style="color: #5078cb;"></span>个</span>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+    <div class="reply-box">
+        <img src="static/img/vendor/images/rate-box-del.png" alt="">
+        <div style="position: relative;">
+            <label class="check-active">
+                <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; font-weight: normal">使用模板</span>
+            </label>
+            <input type="search" class="form-control modal-select" readonly>
+            <ul>
+                <li>aaa</li>
+                <li>bbb</li>
+                <li>ccc</li>
+                <li class="add-modal"><img src="static/img/vendor/images/rate-add.png" alt="">新增模板</li>
+            </ul>
+        </div>
+        <div class="reply-box-text">
+            <textarea readonly>谢谢亲的好评</textarea>
+        </div>
+
+    </div>
+</div>

src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -804,6 +804,7 @@
                                 <a href="vendor#/purchase/detail/{{purchase.purchaseid | EncryptionFilter}}" class="oder_d action-link" target="_blank">订单详情</a><br/>
                                 <em ng-if="purchase.buyerNotifyShip && (purchase.status == 502 || purchase.status == 406)" style="display: block;">买家催促发货</em>
                                 <a class="oder_d action-link" href="vendor#/logistics/query/{{purchase.purchaseid | EncryptionFilter}}" ng-if="purchase.status == 404 || purchase.status == 520 || purchase.status == 405 || purchase.status == 503 || purchase.status == 514" target="_blank">查看物流</a>
+                           		<a class="oder_d action-link" target="_blank" href="vendor#/showRate/1" style="display: block;">双方已评</a>
                             </div>
                         </span>
 						<span class="click_shop">