添加拒绝

src/main/java/com/uas/platform/b2c/common/message/controller/InternalMessageController.java

@@ -9,8 +9,8 @@ import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.HttpUtil;
-import com.uas.sso.support.Page;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
@@ -75,10 +75,11 @@ public class InternalMessageController {
      */
 
     @RequestMapping(value = "/private", method = RequestMethod.GET)
-    public Page<MessageModel> getMessagesPagePrivate(PageParams pageParams, Short isRead, String keyword) throws Exception {
-        Page<MessageModel> messagePage = internalMessageService.getMessagesPagePrivate(pageParams, isRead, keyword);
+    public JSONObject getMessagesPagePrivate(PageParams pageParams, Short isRead, String keyword) throws Exception {
+        JSONObject messagePage = internalMessageService.getMessagesPagePrivate(pageParams, isRead, keyword);
         //设置已读
-        internalMessageService.setRead(messagePage.getContent());
+        internalMessageService.setRead(messagePage.getJSONArray("content"));
+
         return messagePage;
 
     }

src/main/java/com/uas/platform/b2c/common/message/service/InternalMessageService.java

@@ -1,10 +1,11 @@
 package com.uas.platform.b2c.common.message.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.common.message.model.MessageModel;
 import com.uas.platform.b2c.trade.deprecated.model.BasicMessage;
 import com.uas.platform.core.model.PageParams;
-import com.uas.sso.support.Page;
+import org.springframework.data.domain.Page;
 
 import java.util.Date;
 import java.util.List;
@@ -121,7 +122,7 @@ public interface InternalMessageService {
      * @param content
      * @throws Exception
      */
-    void setRead(List<MessageModel> content)throws Exception;
+    void setRead(JSONArray content)throws Exception;
 
     /**
      * 获取当前企业当前用户未读消息数量
@@ -143,7 +144,7 @@ public interface InternalMessageService {
      * @return
      * @throws Exception
      */
-    Page<MessageModel> getMessagesPagePrivate(PageParams pageParams, Short isRead,String keyword) throws Exception;
+    JSONObject getMessagesPagePrivate(PageParams pageParams, Short isRead, String keyword) throws Exception;
 
 
 }

src/main/java/com/uas/platform/b2c/common/message/service/impl/InternalMessageServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.common.message.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.parser.Feature;
@@ -12,18 +13,23 @@ import com.uas.platform.b2c.core.config.MicroServicesConf;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.ContextUtils;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.trade.deprecated.model.BasicMessage;
+import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Type;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import com.uas.sso.support.Page;
+import com.uas.ps.core.util.ObjectUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.collections.map.ListOrderedMap;
 import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.velocity.app.VelocityEngine;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.velocity.VelocityEngineUtils;
@@ -254,11 +260,12 @@ public class InternalMessageServiceImpl implements InternalMessageService {
      * @throws Exception
      */
     @Override
-    public void setRead(List<MessageModel> content)throws Exception {
-        if (!CollectionUtils.isEmpty(content)) {
+    public void setRead(JSONArray content)throws Exception {
+        if (!ObjectUtils.isEmpty(content)) {
             HashMap<String, Object> params = new HashMap<>();
             StringBuilder idString = new StringBuilder();
-            for(MessageModel m :content) {
+            List<MessageModel> models = FastjsonUtils.fromJsonArray( content.toString(), MessageModel.class);
+            for(MessageModel m :models) {
                if (!StringUtils.isEmpty(idString.toString())) {
                    idString.append(",");
                }
@@ -311,7 +318,7 @@ public class InternalMessageServiceImpl implements InternalMessageService {
      */
     @SuppressWarnings("unchecked")
     @Override
-    public Page<MessageModel> getMessagesPagePrivate(PageParams pageParams, Short isRead,String keyword) throws Exception {
+    public JSONObject getMessagesPagePrivate(PageParams pageParams, Short isRead, String keyword) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("receiverUu", SystemSession.getUser().getUserUU());
         params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());
@@ -325,35 +332,32 @@ public class InternalMessageServiceImpl implements InternalMessageService {
             params.put("keyword", keyword);
         }
         HttpUtil.Response res = HttpUtil.sendGetRequest(MESSAGE_PUBLIC_SERVICE_URL + "/messages", params);
+
         if (HttpStatus.OK.value() == res.getStatusCode()) {
             if (null != res.getResponseText()) {
                 System.out.println(res.getResponseText());
-                Page<MessageModel> messageModelPage = JSONObject.parseObject(res.getResponseText(), new TypeReference<Page<MessageModel>>() {
-                }, new Feature[0]);
-                if (messageModelPage != null) {
-                    for (MessageModel messageModel : messageModelPage.getContent()) {
-                        // 拼接公共询价链接
-                        if (INQUIRY_TYPE_MALL.equals(messageModel.getType()) ) {
-                            messageModel.setUrl("/user#/seekPurchase" );
-                        } else if (INQUIRY_DECIDE_TYPE_MALL.equals(messageModel.getType())||INQUIRY_DECIDE_TYPE.equals(messageModel.getType())) {
-                            messageModel.setUrl("/vendor#/vendorPurchaseOffer" );
-                        } else if (INQUIRY_TYPE_SELLER_MALL.equals(messageModel.getType())||INQUIRY_TYPE.equals(messageModel.getType())) {
-                            messageModel.setUrl("/vendor#/seekPurchase" );
+                JSONObject jsonObject = FastjsonUtils.fromJson(res.getResponseText(), JSONObject.class);
+                String content = jsonObject.getString("content");
+                if (!StringUtils.isEmpty(content)) {
+                    List<MessageModel> models = FastjsonUtils.fromJsonArray(content, MessageModel.class);
+                    if (CollectionUtils.isNotEmpty(models)) {
+                        for (MessageModel messageModel : models) {
+                            // 拼接公共询价链接
+                            if (INQUIRY_TYPE_MALL.equals(messageModel.getType()) ) {
+                                messageModel.setUrl("/user#/seekPurchase" );
+                            } else if (INQUIRY_DECIDE_TYPE_MALL.equals(messageModel.getType())||INQUIRY_DECIDE_TYPE.equals(messageModel.getType())) {
+                                messageModel.setUrl("/vendor#/vendorPurchaseOffer" );
+                            } else if (INQUIRY_TYPE_SELLER_MALL.equals(messageModel.getType())||INQUIRY_TYPE.equals(messageModel.getType())) {
+                                messageModel.setUrl("/vendor#/seekPurchase" );
+                            }
                         }
+                       jsonObject.remove("content");
+                        jsonObject.put("content", models);
                     }
                 }
-                return messageModelPage;
-
-                // 拼接访问URL
-              /*  if(messagePage != null){
-                    for(MessageModel messageModel : messagePage.getContent()){
-                        if (INQUIRY_TYPE.equals(messageModel.getType())) {
-                            messageModel.setUrl("#/DECIDE" );
-                        } else if (INQUIRY_DECIDE_TYPE_MALL.equals(messageModel.getType())) {
-                            messageModel.setUrl("#/vendorPurchaseOffer" );
-                        }
-                    }
-                }*/
+
+               return jsonObject;
+
             }
         } else {
             throw new RuntimeException("获取消息失败");

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

@@ -713,10 +713,10 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
     /**
      * 卖家中心头部
      */
-    app.controller('UserCenterHeaderCtrl', ['$scope', 'BaseService', 'InternalMessage', function ($scope, BaseService, InternalMessage) {
+    app.controller('UserCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', function ($scope, $rootScope, BaseService, InternalMessage) {
         $scope.homeUrl = BaseService.getRootPath();
         InternalMessage.getUnread({isRead: 0}, function (data) {
-            $scope.unReadMessCount = data.toRead;
+            $rootScope.unReadMessCount = data.toRead;
         }, function (err) {
             toaster.pop('error', err || '获取未读消息数量失败');
         })

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

@@ -10,8 +10,7 @@ define(['app/app'], function(app) {
             count: 10,
             timeSorting: 'DESC',
             classes: '',
-            recRole: 'BUYER',
-            isRead: 0
+            recRole: 'BUYER'
         };
         $scope.deleteIds = [];
         $scope.isChoosedAll = false;
@@ -318,7 +317,7 @@ define(['app/app'], function(app) {
                 toaster.pop('error', '获取消息失败，请重新刷新界面，');
             });
         };*/
-        $scope.unReadMessCount = 0;
+        $scope.unReadMessCount = $rootScope.unReadMessCount;
         $scope.allReadMessCount = 0;
         var getData = function () {
             InternalMessage.getUnread({}, function (data) {
@@ -336,8 +335,24 @@ define(['app/app'], function(app) {
                     });
                     $scope.params.currentPage = data.number;
                     $scope.acculatePages(data.number, data.totalPages);
+
                     if ($scope.tab == 'no') {
-                        $scope.unReadMessCount = data.totalElements;
+                        // $rootScope.unReadMessCount = data.totalElements;
+                    } else {
+                        var params = {
+                            page: 1,
+                            count: 10,
+                            timeSorting: 'DESC',
+                            classes: '',
+                            recRole: 'SELLER',
+                            isRead: 0
+                        };
+                        InternalMessage.getMessagesPagePrivate(params, function(data) {
+                            InternalMessage.getUnread({isRead: 0}, function (data) {
+                                $rootScope.unReadMessCount = data.toRead;
+                                $scope.unReadMessCount = data.toRead
+                            })
+                        })
                     }
                 }
             }, function(response) {
@@ -393,7 +408,7 @@ define(['app/app'], function(app) {
         };
 
         //tab切换
-        $scope.tab = 'no';
+        $scope.tab = 'all';
         $scope.checkTab = function(str) {
             $scope.tab = str;
             if (str == 'all') {

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

@@ -505,7 +505,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                       method: 'POST',
                       dataType: 'json',
                       url: seekUrl + '/inquiry/buyer/refuse',
-                      params: {id:  $scope.currentRefuseOffer.id, status: -1, refusereason: choice}
+                      params: {id:  $scope.currentRefuseOffer.id, status: 0, refusereason: choice}
                   }).success(function (data) {
                       toaster.pop('refuse', '已拒绝报价');
                       $scope.setShowCurrentRefuseOffer(false);

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

@@ -954,10 +954,10 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	/**
 	 * 卖家中心头部
 	 */
-	app.controller('VendorCenterHeaderCtrl', ['$scope', 'BaseService', 'InternalMessage', function ($scope, BaseService, InternalMessage) {
+	app.controller('VendorCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', function ($scope, $rootScope, BaseService, InternalMessage) {
 		$scope.homeUrl = BaseService.getRootPath();
         InternalMessage.getUnread({isRead: 0}, function (data) {
-            $scope.unReadMessCount = data.toRead;
+            $rootScope.unReadMessCount = data.toRead;
         }, function (err) {
             toaster.pop('error', err || '获取未读消息数量失败');
         })

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

@@ -10,8 +10,7 @@ define(['app/app'], function(app) {
             count: 10,
             timeSorting: 'DESC',
             classes: '',
-            recRole: 'SELLER',
-            isRead: 0
+            recRole: 'SELLER'
         };
         $scope.deleteIds = [];
         $scope.isChoosedAll = false;
@@ -221,7 +220,7 @@ define(['app/app'], function(app) {
             });
         };
 
-        $scope.unReadMessCount = 0;
+        $scope.unReadMessCount = $rootScope.unReadMessCount;
         $scope.isReadMessCount = 0;
         var getData = function () {
             /*InternalMessage.getUnread({isRead: 0}, function (data) {
@@ -244,8 +243,36 @@ define(['app/app'], function(app) {
                    /* if ($scope.tab == 'all') {
                         $scope.isReadMessCount = data.totalElements;
                     }*/
+                    var params = {
+                        page: 1,
+                        count: 10,
+                        timeSorting: 'DESC',
+                        classes: '',
+                        recRole: 'SELLER',
+                        isRead: 0
+                    };
+
                     if ($scope.tab == 'no') {
-                        $scope.unReadMessCount = data.totalElements;
+                        // $scope.unReadMessCount = data.totalElements;
+                        InternalMessage.getUnread({isRead: 0}, function (data) {
+                            $rootScope.unReadMessCount = data.toRead;
+                            $scope.unReadMessCount = data.toRead
+                        })
+                    } else {
+                        var params = {
+                            page: 1,
+                            count: 10,
+                            timeSorting: 'DESC',
+                            classes: '',
+                            recRole: 'SELLER',
+                            isRead: 0
+                        };
+                        InternalMessage.getMessagesPagePrivate(params, function(data) {
+                            InternalMessage.getUnread({isRead: 0}, function (data) {
+                                $rootScope.unReadMessCount = data.toRead;
+                                $scope.unReadMessCount = data.toRead
+                            })
+                        })
                     }
                 }
             }, function(response) {
@@ -291,7 +318,7 @@ define(['app/app'], function(app) {
 
         getData();
         /*$scope.tab = 'all';*/
-        $scope.tab = 'no';
+        $scope.tab = 'all';
         $scope.checkTab = function(str) {
             $scope.tab = str;
             if (str == 'all') {

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

@@ -1,6 +1,6 @@
 <style>
     #massage .ng-table-pagination a {
-        border: none;
+        /*border: none;*/
         font-size: 12px;
         cursor: pointer;
     }
@@ -10,6 +10,8 @@
     }
     #massage div.ng-table-pager {
         margin-right: 0 !important;
+        padding-bottom: 20px;
+        padding-right: 20px;
     }
     #massage div.ng-table-pager .pagination {
         margin: 0;
@@ -52,12 +54,14 @@
         height: 31px;
         margin-top: 20px;
         line-height: 31px;
+        margin-left: 24px
     }
     #massage .ng-table-pager .ng-table-pagination{
         text-align: center;
         max-width: 460px;
     }
     #massage .ng-table-pager .ng-table-pagination a{
+        /*color: #4574E8 !important;*/
         height: 31px;
         line-height: 13px;
     }
@@ -65,6 +69,9 @@
         font-size: 14px;
         text-align: center;
         line-height: 50px;
+        margin: 20px 0;
+        height: auto;
+        padding: 20px 0px;
     }
 
     .oder01:nth-of-type(1) ul li{
@@ -132,7 +139,7 @@
                 <li ng-class="{'active' : tab == 'all'}" ng-click="checkTab('all')"><a href="javascript:void(0)"> 全部(<span ng-bind="allReadMessCount || 0"></span>)</a></li>
                 <li ng-class="{'active' : tab == 'no'}" ng-click="checkTab('no')"><a href="javascript:void(0)"> 未读(<span ng-bind="unReadMessCount || 0"></span>)</a></li>
             </ul>
-            <div class="select">
+           <!-- <div class="select">
                 <select name="" class="select-adder form-control" ng-change="chooseClasses()" ng-model="classes">
                     <option value="">全部</option>
                     <option value="售后信息">售后信息</option>
@@ -144,7 +151,7 @@
                     <option value="提醒发货">提醒发货</option>
                     <option value="缺货预警">缺货预警</option>
                 </select>
-            </div>
+            </div>-->
             <div class="filter-list">
                 <a ng-click="orderTime()">时间<i class="fa fa-long-arrow-up" aria-hidden="true" ng-show="params.timeSorting == 'ASC'"></i><i class="fa fa-long-arrow-down" aria-hidden="true" ng-show="params.timeSorting == 'DESC'"></i></a>
             <!--  <a ng-click="deleteBatch()">删除</a>-->
@@ -168,8 +175,8 @@
                        <!-- <p><span ng-bind="message.messageText.classes"></span><time ng-bind="message.messageText.sendTime | date:'yyyy-MM-dd HH:mm'"></time></p>-->
                         <p class="content-info">
                                 <p><span>{{message.createTime| date:'yyyy-MM-dd HH:mm'}}</span></p>
-                                <a href="{{message.url}}" ng-bind="message.content" ng-if="message.url" title="{{message.content}}" class="link info"></a>
-                                <a ng-bind="message.content" ng-if="!message.url" title="{{message.content}}" class="noLink info"></a>
+                                <a href="{{message.url}}" ng-bind="message.content" ng-if="message.url" title="{{message.content}}" class="link info" target="_blank"></a>
+                                <a ng-bind="message.content" ng-if="!message.url" title="{{message.content}}" class="noLink info" ></a>
                         </p>
                    <!-- </div>
                     <div class="check"><input type="checkbox" id="check01" ng-model="message.isChoosed" ng-click="chooseOne(message)"><label for="check01"></label></div>-->
@@ -200,7 +207,7 @@
                 </div>
             </li>
             <li ng-if="messageCurrent.length == 0" class="text-center no-message">
-                <div>暂无消息记录</div>
+                <img src="static/img/all/empty-cart.png"><span class="f14">暂无消息记录</span>
             </li>
         </ul>
     </div>

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

@@ -1194,9 +1194,9 @@
                                             </div>
 
                                             <img ng-if="of.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
-                                            <img ng-if="of.agreed == -1" src="static/img/seekPurchase/refused.png" alt="" class="ng-scope">
-                                            <span class="seek-btn" ng-if="!seek.agreed && !of.agreed" ng-click="adopt(of.id)">采纳</span>
-                                            <a class="seek-btn" ng-if="!of.agreed" ng-click="setActiveRefuse(of)">拒绝</a>
+                                            <img ng-if="of.agreed == 0" src="static/img/seekPurchase/refused.png" alt="" class="ng-scope">
+                                            <span class="seek-btn" ng-if="!seek.agreed && !of.agreed && of.agreed != 0" ng-click="adopt(of.id)">采纳</span>
+                                            <a class="seek-btn" ng-if="!of.agreed && of.agreed != 0" ng-click="setActiveRefuse(of)">拒绝</a>
                                         </td>
                                     </tr>
                                     </tbody>
@@ -1332,6 +1332,7 @@
             <p><i class="fa fa-exclamation-circle"></i>拒绝报价原因：
                 <select class="select-adder" ng-model="choice">
                     <option value="采购需求变更">采购需求变更</option>
+                    <option value="价格过高">价格过高</option>
                     <option value="需进一步了解原因">需进一步了解原因</option>
                     <option value="已选定合适供应商">已选定合适供应商</option>
                     <option value="交期过长">交期过长</option>

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

@@ -1,6 +1,6 @@
 <style>
     #massage .ng-table-pagination a {
-        border: none;
+        /*border: none;*/
         font-size: 12px;
         cursor: pointer;
     }
@@ -10,6 +10,8 @@
     }
     #massage div.ng-table-pager {
         margin-right: 0 !important;
+        padding-bottom: 20px;
+        padding-right: 20px;
     }
     #massage div.ng-table-pager .pagination {
         margin: 0;
@@ -52,6 +54,7 @@
         height: 31px;
         margin-top: 20px;
         line-height: 31px;
+        margin-left: 24px
     }
     #massage .ng-table-pager .ng-table-pagination{
         text-align: center;
@@ -66,8 +69,22 @@
         font-size: 14px;
         text-align: center;
         line-height: 50px;
+        margin: 20px 0;
+        height: auto;
+        padding: 20px 0px;
+    }
+    #massage .no-message span{
+        margin-left: 10px
+    }
+    .com-massage ul li a .infoRed {
+        position: absolute;
+        border-radius: 50%;
+        width: 8px;
+        height: 8px;
+        top: -4px;
+        left: -4px;
+        background: red
     }
-
     .oder01:nth-of-type(1) ul li{
         margin-left: 0px;
         position: relative;
@@ -102,9 +119,9 @@
         text-overflow: ellipsis;
         overflow: hidden;
     }
-    .com-massage ul li a.link:hover{
+    .com-massage ul li a.info:hover{
         color: #5078cb;
-        text-decoration: underline;
+        text-decoration: underline !important;
     }
     .com-massage ul li a.noLink:hover{
         color: #333;
@@ -114,12 +131,12 @@
 <div class="user_right fr" id="massage">
     <!--订单中心-->
     <div class="oder">
-        <div class="oder01">
+        <div class="oder01" style="margin-bottom: 0px;">
             <ul>
                 <li ng-class="{'active' : tab == 'all'}" ng-click="checkTab('all')"><a href="javascript:void(0)"> 全部(<span ng-bind="allReadMessCount || 0"></span>)</a></li>
                 <li ng-class="{'active' : tab == 'no'}" ng-click="checkTab('no')"><a href="javascript:void(0)"> 未读(<span ng-bind="unReadMessCount || 0"></span>)</a></li>
             </ul>
-            <div class="select">
+           <!-- <div class="select">
                 <select name="" class="select-adder form-control" ng-change="chooseClasses()" ng-model="classes">
                     <option value="">全部</option>
                     <option value="售后信息">售后信息</option>
@@ -131,7 +148,7 @@
                     <option value="提醒发货">提醒发货</option>
                     <option value="缺货预警">缺货预警</option>
                 </select>
-            </div>
+            </div>-->
             <div class="filter-list">
                 <a ng-click="orderTime()">时间<i class="fa fa-long-arrow-up" aria-hidden="true" ng-show="params.timeSorting == 'ASC'"></i><i class="fa fa-long-arrow-down" aria-hidden="true" ng-show="params.timeSorting == 'DESC'"></i></a>
               <!--<a ng-click="deleteBatch()">删除</a>-->
@@ -147,21 +164,21 @@
         <ul>
             <li ng-repeat="message in messageCurrent">
                 <!--<div ng-if="message.classes=='物流信息'" ng-click="readMessage(message)">-->
-                    <a href="#"><div class="icon icon-log"></div></a>
+                    <a href="#"><div class="icon icon-log"></div><div class="infoRed" ng-if="message.isRead < 1"></div></a>
                     <div class="content">
                       <!--  <p><span ng-bind="message.messageText.classes"></span><time ng-bind="message.messageText.sendTime | date:'yyyy-MM-dd HH:mm'"></time></p>-->
 
                             <!-- <p><span ng-bind="message.messageText.classes"></span><time ng-bind="message.messageText.sendTime | date:'yyyy-MM-dd HH:mm'"></time></p>-->
                         <p class="content-info">
                             <p><span>{{message.createTime| date:'yyyy-MM-dd HH:mm'}}</span></p>
-                            <a href="{{message.url}}" ng-bind="message.content" ng-if="message.url" title="{{message.content}}" class="link info"></a>
+                            <a href="{{message.url}}" ng-bind="message.content" ng-if="message.url" title="{{message.content}}" class="link info" target="_blank"></a>
                             <a ng-bind="message.content" ng-if="!message.url" title="{{message.content}}" class="noLink info"></a>
                         </p>
                     <!--</div>
                     <div class="check"><input type="checkbox" id="check01" ng-model="message.isChoosed" ng-click="chooseOne(message)"><label for="check01"></label></div>-->
                 </div>
                 <div ng-if="message.messageText.classes=='售后信息'" ng-click="readMessage(message)">
-                    <a href="#"><div class="icon icon-service"></div></a>
+                    <a href="#"><div class="icon icon-service"></div><div class="infoRed" ng-if="message.isRead < 1"></div></a>
                     <div class="content">
                         <p><span ng-bind="message.messageText.classes"></span><time ng-bind="message.messageText.sendTime | date:'yyyy-MM-dd HH:mm'"></time></p>
                         <p ng-bind-html="message.messageText.content"></p>
@@ -169,7 +186,7 @@
                     <div class="check"><input type="checkbox" id="check02" ng-model="message.isChoosed" ng-click="chooseOne(message)"><label for="check02"></label></div>
                 </div>
                 <div ng-if="message.messageText.classes=='系统通知'" ng-click="readMessage(message)">
-                    <a href="#"><div class="icon icon-system"></div></a>
+                    <a href="#"><div class="icon icon-system"></div><div class="infoRed" ng-if="message.isRead < 1"></div></a>
                     <div class="content">
                         <p><span ng-bind="message.messageText.classes"></span><time ng-bind="message.messageText.sendTime | date:'yyyy-MM-dd HH:mm'"></time></p>
                         <div ng-bind-html="message.messageText.content"></div>
@@ -177,7 +194,7 @@
                     <div class="check"><input type="checkbox" id="check03" ng-model="message.isChoosed" ng-click="chooseOne(message)"><label for="check03"></label></div>
                 </div>
                 <div  ng-if="message.messageText.classes=='卖家留言'" ng-click="readMessage(message)">
-                    <a href="#"><div class="icon icon-massage"></div></a>
+                    <a href="#"><div class="icon icon-massage"></div><div class="infoRed" ng-if="message.isRead < 1"></div></a>
                     <div class="content">
                         <p><span ng-bind="message.messageText.classes"></span><time ng-bind="message.messageText.sendTime | date:'yyyy-MM-dd HH:mm'"></time></p>
                         <p ng-bind-html="message.messageText.content"></p>
@@ -186,7 +203,7 @@
                 </div>
             </li>
             <li ng-if="messageCurrent.length == 0" class="text-center no-message">
-                <div>暂无消息记录</div>
+                <img src="static/img/all/empty-cart.png"><span class="f14">暂无消息记录</span>
             </li>
         </ul>
     </div>

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

@@ -700,7 +700,7 @@
                 <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
                 <td class="operate" ng-switch="seek.agreed">
                     <a ng-click="setLinkBoxIndex($index)">联系买家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                    <div class="is-say-price" ng-if="seek.agreed != 1 &&seek.agreed != -1">已报价 <img src="static/img/seekPurchase/check.png" alt="">
+                    <div class="is-say-price" ng-if="seek.agreed != 1 &&seek.agreed != 0">已报价 <img src="static/img/seekPurchase/check.png" alt="">
                         <div class="say-price-history">
                             <p class="price-title">历史报价</p>
                             <div>
@@ -724,7 +724,7 @@
                         </div>
                     </div>
                     <img ng-if="seek.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="">
-                    <img ng-if="seek.agreed == -1" src="static/img/seekPurchase/refused.png" alt="">
+                    <img ng-if="seek.agreed == 0" src="static/img/seekPurchase/refused.png" alt="">
                 </td>
             </tr>
             <!--