Merge branch 'feature-shenjj-0428' into fearure-inuiry-message-hyy-20180502

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/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', 'common/query/vendor','common/query/seekPurchase', 'common/query/search'], 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', 'common/query/vendor','common/query/seekPurchase', 'common/query/search', 'angular-sanitize'], 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','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', 'vendorServices','seekPurchaseServices', 'searchService']);
+	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', 'vendorServices','seekPurchaseServices', 'searchService', 'ngSanitize']);
 	app.init = function() {
 		angularAMD.bootstrap(app);
 	};
@@ -586,15 +586,15 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 
 	}]);
 
-	app.controller('UserCenterHeaderCtrl', ['$scope', /*'$rootScope', 'InternalMessage', '$q',*/ function ($scope/*, $rootScope, InternalMessage, $q*/) {
+	app.controller('UserCenterHeaderCtrl', ['$scope',  'InternalMessage', /*'$rootScope',, '$q',*/ function ($scope, InternalMessage/*, $rootScope, , $q*/) {
 		$scope.homeUrl = window.location.pathname.replace('/user', '');
 		// 获取未读消息数量
 		//根据用户的信息
-		/*InternalMessage.getUnReadCount({recRole: 'BUYER'}, function (data) {
-			$scope.unReadMessage = data.count;
+		InternalMessage.getUnReadCount({recRole: 'BUYER'}, function (data) {
+			$scope.unReadMessage = data.count || 0;
 		}, function (responge) {
 
-		})*/
+		})
 	}]);
 
 	app.controller('CollectCtrl', ['$scope', 'collectionService', 'toaster', '$rootScope', '$modal', function ($scope, collectionService, toaster, $rootScope, $modal) {

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

@@ -189,7 +189,6 @@ define(['app/app'], function(app) {
                 $scope.middleSegment(currentPage);
             }
         };
-
         // 筛选消息分类
         $scope.chooseClasses = function () {
             $scope.params.classes = $scope.classes;
@@ -220,6 +219,79 @@ define(['app/app'], function(app) {
             });
         };
 
+        // $scope.messageCurrent = [{
+        //   messageText: {
+        //     classes: '物流信息',
+        //     sendTime: '1525228751',
+        //     content: "My name is:"
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '售后信息',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '系统通知',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '卖家留言',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '物流信息',
+        //     sendTime: '1525228751',
+        //     content: "My name is:"
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '售后信息',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '系统通知',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '卖家留言',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '物流信息',
+        //     sendTime: '1525228751',
+        //     content: "My name is:"
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '售后信息',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '系统通知',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // },{
+        //   messageText: {
+        //     classes: '卖家留言',
+        //     sendTime: '1525228751',
+        //     content: "My name is: "
+        //   }
+        // }]
         var getData = function () {
             InternalMessage.getMessagesPagePrivate($scope.params, function(data) {
                 if (data) {
@@ -283,6 +355,13 @@ define(['app/app'], function(app) {
             });
         };
 
+        //tab切换
+        $scope.tab = 'all'
+        $scope.checkTab = function(str) {
+            $scope.tab = str
+
+        }
+
 
         getData();
     }]);

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

@@ -5,5 +5,13 @@ define(['app/app'], function(app) {
     app.register.controller('MessageCtrl', ['$scope', '$rootScope', function($scope, $rootScope) {
         $rootScope.active = 'message';
         $scope.message = {};
+
+      //  $scope.messageCurrent = [{
+      //   messageText: {
+      //     classes: '新闻公告',
+      //     sendTime: '1525228751',
+      //     content: "My name is: <h1>John Doe</h1>"
+      //   }
+      // },{},{}]
     }]);
 });

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

@@ -43,7 +43,6 @@ define(['app/app'], function(app) {
                 $scope.pages.push(page);
             });
         };
-
         //当前页在后端计算方式
         $scope.endSegment = function (currentPage, totalElementPages) {
             if (totalElementPages > 8) {
@@ -235,7 +234,6 @@ define(['app/app'], function(app) {
                 toaster.pop('error', '获取消息失败，请重新刷新界面，');
             });
         };
-
         // 批量删除
         $scope.deleteBatch = function () {
             var hasDelete = false;
@@ -274,5 +272,9 @@ define(['app/app'], function(app) {
         };
 
         getData();
+        $scope.tab = 'all'
+        $scope.checkTab = function(str) {
+            $scope.tab = str
+        }
     }]);
 });

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

@@ -38,7 +38,7 @@
         cursor: pointer;
         background-color: #4574E8;
         border-color: #4574E8;
-        padding: 5.55px 6px;
+        /*padding: 5.55px 6px;*/
         font-size: 12px;
         border-top-right-radius: 4px;
         border-bottom-right-radius: 4px;
@@ -58,7 +58,6 @@
         max-width: 460px;
     }
     #massage .ng-table-pager .ng-table-pagination a{
-        color: #4574E8 !important;
         height: 31px;
         line-height: 13px;
     }
@@ -67,13 +66,41 @@
         text-align: center;
         line-height: 50px;
     }
+
+    .oder01:nth-of-type(1) ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder01:nth-of-type(1) ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff !important;
+    }
+    .oder01:nth-of-type(1) ul li::after{
+        background: url('/static/img/vendor/images/downicon.png');
+        width: 11px;
+        height: 6px;
+        position: absolute;
+        bottom: 0px;
+        left: 50%;
+        content: ' ';
+        margin-left: -5px;
+        display: none;
+    }
+    .oder01 ul li.active::after{
+        display: block;
+    }
+    .oder01:nth-of-type(1) ul li.active:hover a{
+        color: #fff !important;
+    }
 </style>
 <div class="user_right fr" id="massage">
     <!--订单中心-->
     <div class="oder">
         <div class="oder01">
             <ul>
-                <li class="active"><a href="javascript:void(0)"> 全部(<span ng-bind="messageAllData.totalElements || 0"></span>)</a></li>
+                <li class="active" ng-class="{'active' : tab == 'all'}" ng-click="checkTab('all')"><a href="javascript:void(0)"> 全部(<span ng-bind="messageAllData.totalElements || 0"></span>)</a></li>
+                <li class="" ng-class="{'active' : tab == 'no'}" ng-click="checkTab('no')"><a href="javascript:void(0)"> 未读(<span ng-bind="messageAllData.totalElements || 0"></span>)</a></li>
             </ul>
             <div class="select">
                 <select name="" class="select-adder form-control" ng-change="chooseClasses()" ng-model="classes">
@@ -102,7 +129,7 @@
     <div class="com-massage">
         <ul>
             <li ng-repeat="message in messageCurrent">
-                <div ng-if="message.messageText.classes=='新闻公告'" ng-click="readMessage(message)">
+                <div ng-if="message.messageText.classes=='物流信息'" ng-click="readMessage(message)">
                     <a href="#"><div class="icon icon-log"></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>
@@ -110,7 +137,7 @@
                     </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)">
+                <div ng-if="message.messageText.classes=='售后信息'" ng-click="readMessage(message)">
                     <a href="#"><div class="icon icon-service"></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>
@@ -118,7 +145,7 @@
                     </div>
                     <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)">
+                <div ng-if="message.messageText.classes=='系统通知'" ng-click="readMessage(message)">
                     <a href="#"><div class="icon icon-system"></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>
@@ -156,12 +183,12 @@
             <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
         </div>
     </div>
-    <div><a ng-click="sendPublicMessage()">发送消息</a></div>
-    <!--<div class="oder_list" style="margin-top: 0;">
-        <div ng-repeat="me in pageMessages.content">
-            <span ng-bind="me.messageText.content"></span>
-        </div>
-    </div>-->
+    <!--<div><a ng-click="sendPublicMessage()">发送消息</a></div>-->
+    <!--<div class="oder_list" style="margin-top: 0;">-->
+        <!--<div ng-repeat="me in pageMessages.content">-->
+            <!--<span ng-bind="me.messageText.content"></span>-->
+        <!--</div>-->
+    <!--</div>-->
 </div>
 <style>
     .com-del-box{

src/main/webapp/resources/view/usercenter/header.html

@@ -213,7 +213,7 @@
         <div class="nav">
             <ul>
                 <!--<li ng-class="{'active' : active == 'home'}"><a href="#home" class="active">首页</a></li>-->
-                <!--<li ng-class="{'active' : active == 'message'}" ><a ui-sref="messagePersonal">消息（<span ng-bind="unReadMessage"></span>）</a></li>-->
+                <li ng-class="{'active' : active == 'message'}" ><a ui-sref="messagePersonal">消息（<span ng-bind="unReadMessage">0</span>）</a></li>
                 <!--<li ng-class="{'active' : active == 'browsing-history'}" s><a href="#browsing-history">浏览历史</a></li>-->
             </ul>
         </div>

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

@@ -38,7 +38,7 @@
         cursor: pointer;
         background-color: #4574E8;
         border-color: #4574E8;
-        padding: 5.55px 6px;
+        /*padding: 5.55px 6px;*/
         font-size: 12px;
         border-top-right-radius: 4px;
         border-bottom-right-radius: 4px;
@@ -58,7 +58,7 @@
         max-width: 460px;
     }
     #massage .ng-table-pager .ng-table-pagination a{
-        color: #4574E8 !important;
+        /*color: #4574E8 !important;*/
         height: 31px;
         line-height: 13px;
     }
@@ -67,13 +67,41 @@
         text-align: center;
         line-height: 50px;
     }
+
+    .oder01:nth-of-type(1) ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder01:nth-of-type(1) ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff !important;
+    }
+    .oder01:nth-of-type(1) ul li::after{
+        background: url('/static/img/vendor/images/downicon.png');
+        width: 11px;
+        height: 6px;
+        position: absolute;
+        bottom: 0px;
+        left: 50%;
+        content: ' ';
+        margin-left: -5px;
+        display: none;
+    }
+    .oder01 ul li.active::after{
+        display: block;
+    }
+    .oder01:nth-of-type(1) ul li.active:hover a{
+        color: #fff !important;
+    }
 </style>
 <div class="user_right fr" id="massage">
     <!--订单中心-->
     <div class="oder">
         <div class="oder01">
             <ul>
-                <li class="active"><a href="javascript:void(0)"> 全部(<span ng-bind="messageAllData.totalElements || 0"></span>)</a></li>
+                <li class="active" ng-class="{'active' : tab == 'all'}" ng-click="checkTab('all')"><a href="javascript:void(0)"> 全部(<span ng-bind="messageAllData.totalElements || 0"></span>)</a></li>
+                <li class="" ng-class="{'active' : tab == 'no'}" ng-click="checkTab('no')"><a href="javascript:void(0)"> 未读(<span ng-bind="messageAllData.totalElements || 0"></span>)</a></li>
             </ul>
             <div class="select">
                 <select name="" class="select-adder form-control" ng-change="chooseClasses()" ng-model="classes">
@@ -102,7 +130,7 @@
     <div class="com-massage">
         <ul>
             <li ng-repeat="message in messageCurrent">
-                <div ng-if="message.messageText.classes=='新闻公告'" ng-click="readMessage(message)">
+                <div ng-if="message.messageText.classes=='物流信息'" ng-click="readMessage(message)">
                     <a href="#"><div class="icon icon-log"></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>
@@ -110,7 +138,7 @@
                     </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)">
+                <div ng-if="message.messageText.classes=='售后信息'" ng-click="readMessage(message)">
                     <a href="#"><div class="icon icon-service"></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>
@@ -118,7 +146,7 @@
                     </div>
                     <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)">
+                <div ng-if="message.messageText.classes=='系统通知'" ng-click="readMessage(message)">
                     <a href="#"><div class="icon icon-system"></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>

src/main/webapp/resources/view/vendor/header.html

@@ -208,13 +208,13 @@
             <a ng-href="{{homeUrl}}"><img src="static/img/vendor/images/logo.png"/> </a>
             <!--<span>我的商城<a ng-href="{{homeUrl}}">返回商城首页</a> </span>-->
         </div>
-        <!--<div class="nav">
+        <div class="nav">
             <ul>
-                &lt;!&ndash;<li ng-class="{'active' : active == 'index'}"><a href="#index" class="active">首页</a></li>&ndash;&gt;
+                <!--&lt;!&ndash;<li ng-class="{'active' : active == 'index'}"><a href="#index" class="active">首页</a></li>&ndash;&gt;-->
                 <li ng-class="{'active' : active == 'message'}" ><a ui-sref="messagePersonal">消息（<span ng-bind="unReadMessage"></span>）</a></li>
-                &lt;!&ndash;<li ng-class="{'active' : active == 'browsing-history'}"><a href="#browsing-history">浏览历史</a></li>&ndash;&gt;
+                <!--&lt;!&ndash;<li ng-class="{'active' : active == 'browsing-history'}"><a href="#browsing-history">浏览历史</a></li>&ndash;&gt;-->
             </ul>
-        </div>-->
+        </div>
         <div id="mall-search" class="search-right fr" ng-controller="SearchCtrl">
             <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="型号/类目/品牌" />
             <a class="seek" ng-click="search()">搜索</a>