Explorar el Código

b2b首页的调整

hangb hace 8 años
padre
commit
de251ecf45

+ 2 - 1
src/main/webapp/resources/js/index/app.js

@@ -1,4 +1,4 @@
-define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives', 'service/Purc', 'service/Make', 'service/Fa', 'service/Account', 'service/Alert', 'service/CheckTel', 'ui.router', 'ui.bootstrap', 'file-upload', 'ngSanitize', 'service/BaseInfo', 'service/Cart', 'service/ApprovalFlow', 'service/DeputyOrder', 'service/Product', 'service/Token', 'service/ProductUsers'], function () {
++define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives', 'service/Purc', 'service/Make', 'service/Fa', 'service/Account', 'service/Alert', 'service/CheckTel', 'ui.router', 'ui.bootstrap', 'file-upload', 'ngSanitize', 'service/BaseInfo', 'service/Cart', 'service/ApprovalFlow', 'service/DeputyOrder', 'service/Product', 'service/Token', 'service/ProductUsers'], function () {
     'use strict';
     var app = angular.module('myApp', ['toaster', 'angularCharts', 'ngTable', 'ui.router', 'common.services', 'common.directives', 'PurcServices', 'MakeServices', 'FaServices', 'AccountServices', 'AlertServices', 'ui.bootstrap', 'angularFileUpload', 'ngSanitize', 'CheckTelModule', 'ProductServices', 'CartServices', 'ApprvoalFlowService', 'DeputyOrderService', 'ProductInfoServices', 'TokenService', 'ProductUserService']);
     app.init = function () {
@@ -1840,6 +1840,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         });
 
         $scope.dateTime = new Date();
+        $scope.time = new Date().getTime();
     }]);
     app.controller('TenderCtrl', ['$scope', 'SnapshotService', function ($scope, SnapshotService) {
         // SnapshotService.getTender(250, function(data){

+ 49 - 5
src/main/webapp/resources/tpl/index/home/left.html

@@ -25,9 +25,39 @@
 	.notice {
 		margin-top: 15px;
 	}
-	.notice .pane-body ul li a{
+	/*公告非当日*/
+	.notice .pane-body ul li.nonday a{
+		color: #000;
+	}
+	/*!*公告当日已读*!*/
+	.notice .pane-body ul li.day-read a{
+		float: left;
+		display: inline-block;
+		width: 149px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: #000;
+	}
+	.notice .pane-body ul li.day-read img{
+		float: left;
+		margin-top: 5px;
+	}
+	/*公告当日未读 */
+	.notice .pane-body ul li.day-unread a{
+		float: left;
+		display: inline-block;
+		width: 149px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
 		color: #d32526;
 	}
+	.notice .pane-body ul li.day-unread img{
+		float: left;
+		margin-top: 5px;
+	}
+
 	.change-ul{
 		display: inline-block;
 		-webkit-padding-start: 0;
@@ -86,14 +116,23 @@
 	.feed-wrap .pane .pane-body li a:hover{
 		cursor: pointer;
 	}
+
 	.feed-wrap .pane .pane-body li a em{
-		max-width: 155px;
 		display: inline-block;
+		color: #d32526;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		font-style: inherit;
 	}
+	/*非当日公共询价*/
+	.feed-wrap .pane .pane-body li.nonday a em{
+		max-width: 190px;
+	}
+	/*当日公共询价已读、未读**/
+	.feed-wrap .pane .pane-body li.day-read a em{
+		max-width: 150px;
+	}
 
 </style>
 <!--<div class="user">-->
@@ -132,7 +171,9 @@
 		<div class="pane-body">
 			<ul class="list-unstyled detail details">
 				<li ng-repeat="notice in notices">
-                    <a ng-click="setReadStatus(notice.id)" href="public#/notice/{{notice.id}}" class="" ng-bind="::notice.title" target="_blank"></a></li>
+                    {{notice.date| date:'yyyy-MM-dd'}} ==  {{dateTime| date:'yyyy-MM-dd'}}
+
+                    <!--<!--<a ng-click="setReadStatus(notice.id)" href="public#/notice/{{notice.id}}" class="" ng-bind="::notice.title" target="_blank"></a><img src="static/img/home/new.png"/>--></li>
 			</ul>
 		</div>
 	</div>
@@ -159,9 +200,12 @@
 		</div>
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
-				<li ng-repeat="msg in message | orderBy : '- inid'">
+				<li ng-repeat="msg in message | orderBy : '- inid'" class="day-unread">
 					<!--<span ng-show="tender.isNew"><img src="static/img/home/newTender.png"></span>-->
-					<a ui-sref="baseInfo.inquiryListDetail({id:msg.inid})"class="text-light"><em style="font-style: normal;">{{msg.pordName}}</em><img src="static/img/home/new.png"/></a>
+					<a ui-sref="baseInfo.inquiryListDetail({id:msg.inid})"class="text-light">
+						<em style="font-style: normal;">{{msg.pordName}}</em>
+						<img src="static/img/home/new.png"/>
+					</a>
 				</li>
 				<li ng-show="message == null || message == ''" class="grey">
 					暂无询价信息!