git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@105 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/WEB-INF/views/normal/index.html

@@ -6,7 +6,7 @@
 <meta charset="utf-8">
 <title>优软商务平台</title>
 <meta name="keywords"
-	content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,USOFTCHINA.COM,优软">
+	content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,UBTOB.COM,USOFTCHINA.COM,优软">
 <meta name="description" content="优软商务平台，企业供销信息交流平台。">
 <link href="static/img/icon/u.png" rel="icon" type="image/x-icon" />
 <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
@@ -226,7 +226,8 @@
 	<!-- header End -->
 	<!-- body Start -->
 	<div class="container body">
-		<div class="left pull-left">
+		<div class="left">
+			<!-- 用户信息 Start -->
 			<div class="user">
 				<div class="user-info">
 					<div class="user-image">
@@ -240,33 +241,167 @@
 								class="work_user-arrow"></span></a>
 						</div>
 					</div>
-					<div class="work_user-lv">
-						<ul class="work_user-lv-list">
-							采购等级：
-							<a class="work_user-lv-list-img"
-								href="http://vip.1688.com/club/buyer_growth_intr.htm?tracelog=work_buyers_rank&amp;tracelog=work2015_homepage_left_buyermedal"
-								target="_blank" title="您未获得采购等级"><img
-								src="http://i00.c.aliimg.com/cms/upload/member/club/b_s_0_star.png"></a>
+					<ul class="user-lv list-unstyled">
+						<li>采购等级： <i class="fa fa-star-o"></i>
+						</li>
+						<li>销售等级： <i class="fa fa-star-o"></i>
+						</li>
+					</ul>
+				</div>
+				<ul class="user-count list-unstyled">
+					<li>
+						<div class="count">20</div>
+						<div class="title">
+							<a href="#">客户</a>
+						</div>
+					</li>
+					<li>
+						<div class="count">20</div>
+						<div class="title">
+							<a href="#">供应商</a>
+						</div>
+					</li>
+				</ul>
+			</div>
+			<!-- 用户信息 End -->
+			<!-- 常用操作 Start -->
+			<div class="use">
+				<div class="use-label">
+					常用操作<i></i>
+				</div>
+				<ul class="list-unstyled">
+					<li><a href="#">销售中的产品</a></li>
+					<li><a href="#">已买到的产品</a></li>
+					<li><a href="#">已卖出的产品</a></li>
+				</ul>
+			</div>
+			<div class="use">
+				<div class="use-label">
+					增值服务<i></i>
+				</div>
+				<ul class="list-unstyled">
+					<li><a href="#">SAAS服务</a></li>
+					<li><a href="#">电子元器件市场</a></li>
+					<li><a href="#">商机库</a></li>
+					<li><a href="#">我的物流</a></li>
+				</ul>
+			</div>
+			<div class="use">
+				<div class="use-label">
+					自定义菜单<i></i>
+				</div>
+				<ul class="list-unstyled">
+					<li><a href="#">添加自定义菜单</a><i class="fa fa-plus icon-right"></i></li>
+				</ul>
+			</div>
+			<div class="use">
+				<ul class="list-unstyled">
+					<li><a href="#">问题反馈</a><i class="fa fa-bell-o icon-right"></i></li>
+					<li><a href="#">客服中心</a><i class="fa fa-headphones icon-right"></i></li>
+				</ul>
+			</div>
+			<!-- 常用操作 End -->
+		</div>
+		<div class="right">
+			<!-- 公司信息 Start -->
+			<div class="company">
+				<div class="inner block">
+					<div class="f14">
+						<i class="fa fa-map-marker fa-fw"></i>深圳华商龙科技有限公司
+					</div>
+					<div class="text-small">
+						<span class="text-border-success">优软认证</span>
+					</div>
+					<div class="text-muted">
+						优软商务平台普通会员<a href="#" class="text-default">[升级成为高级会员]</a>
+					</div>
+				</div>
+			</div>
+			<!-- 公司信息 End -->
+			<!-- 交易信息 Start -->
+			<div class="data-wrap">
+				<!-- 待处理统计 Start -->
+				<div class="todo block">
+					<ul class="todo-label list-unstyled">
+						<li>交易前</li>
+						<li>交易中</li>
+						<li>交易后</li>
+					</ul>
+					<div class="todo-content">
+						<ul class="list-unstyled list-inline">
+							<li class="icon">采购</li>
+							<li class="start">
+								<ul class="list-unstyled">
+									<li><a href="#">询价中(0)</a></li>
+									<li><a href="#">招募中(0)</a></li>
+								</ul>
+							</li>
+							<li class="doing">
+								<ul class="list-unstyled">
+									<li><a href="#">待付款(0)</a></li>
+									<li><a href="#">待卖家发货(0)</a></li>
+								</ul>
+							</li>
+							<li class="end">
+								<ul class="list-unstyled">
+									<li><a href="#">待确认收货(0)</a></li>
+									<li><a href="#">退款退货中(0)</a></li>
+								</ul>
+							</li>
+						</ul>
+						<ul class="list-unstyled list-inline">
+							<li class="icon">销售</li>
+							<li class="start">
+								<ul class="list-unstyled">
+									<li><a href="#">待报价(0)</a></li>
+								</ul>
+							</li>
+							<li class="doing">
+								<ul class="list-unstyled">
+									<li><a href="#">待买家付款(0)</a></li>
+									<li><a href="#">待发货(0)</a></li>
+								</ul>
+							</li>
+							<li class="end">
+								<ul class="list-unstyled">
+									<li><a href="#">待买家确认收货(0)</a></li>
+									<li><a href="#">纠纷率(0%)</a></li>
+								</ul>
+							</li>
 						</ul>
-						<ul class="work_user-lv-list">
-							供应等级：
-							<a class="work_user-lv-list-img"
-								href="http://vip.1688.com/club/seller_growth_intr.htm?tracelog=work_supplier_rank&amp;tracelog=work2015_homepage_left_sellermedal"
-								target="_blank" title="您未获得供应等级"><img
-								src="http://i00.c.aliimg.com/cms/upload/member/club/b_s_0_star.png"></a>
+						<ul class="list-unstyled list-inline">
+							<li class="icon">委外</li>
+							<li class="start">
+								<ul class="list-unstyled">
+									<li><a href="#">待报价(0)</a></li>
+								</ul>
+							</li>
+							<li class="doing">
+								<ul class="list-unstyled">
+									<li><a href="#">待买家付款(0)</a></li>
+									<li><a href="#">待发货(0)</a></li>
+								</ul>
+							</li>
+							<li class="end">
+								<ul class="list-unstyled">
+									<li><a href="#">待买家确认收货(0)</a></li>
+									<li><a href="#">纠纷率(0%)</a></li>
+								</ul>
+							</li>
 						</ul>
 					</div>
 				</div>
-				<div class="count">
-					
-				</div>
+				<!-- 待处理统计 End -->
 			</div>
+			<!-- 交易信息 End -->
+			<!-- 动态信息 Start -->
+			<div class="feed-wrap"></div>
+			<!-- 动态信息 End -->
 		</div>
-		<div class="right pull-right"></div>
 	</div>
 	<!-- body End -->
 	<!-- footer Start -->
-	<div class="navbar navbar-fixed-bottom" id="footer">
+	<div class="navbar navbar-static-bottom" id="footer">
 		<!-- footer inner -->
 		<div class="container">
 			<div class="link-group">

src/main/webapp/WEB-INF/views/normal/signin.html

@@ -5,7 +5,7 @@
 <meta name="baidu-site-verification" content="S0kf5fz0uA" />
 <meta charset="utf-8">
 <title>优软商务平台</title>
-<meta name="keywords" content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,USOFTCHINA.COM,优软">
+<meta name="keywords" content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,UBTOB.COM,USOFTCHINA.COM,优软">
 <meta name="description" content="优软商务平台，企业供销信息交流平台。">
 <link href="static/img/icon/u.png" rel="icon" type="image/x-icon" />
 <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />

src/main/webapp/resources/css/index.css

@@ -12,7 +12,29 @@ h1,h2,h3 {
 	font-weight: 400;
 	font-style: normal;
 }
+
+a {
+	color: #333;
+	text-decoration: none;
+}
+
+.block {
+	background-color: #fff;
+	width: 100%;
+}
+
+.f12 {
+	font-size: 12px !important;
+} 
+
+.f14 {
+	font-size: 14px !important;
+}
 /*inverse*/
+.text-default {
+	color: #56a022;
+}
+
 .text-inverse {
 	color: #f40 !important
 }
@@ -24,6 +46,21 @@ h1,h2,h3 {
 .text-simple {
 	color: #aaa;
 }
+
+.text-small {
+	font-size: 9px;
+	font-family: "microsoft yahei";
+	-webkit-transform: scale(0.75);
+	-o-transform: scale(1);
+	transform: scale(0.75);
+}
+
+.text-border-success {
+	border: 1px solid #f40;
+	color: #f40;
+	background-color: #fff;
+	padding: 0 2px;
+}
 /*dropdown*/
 .dropdown>.dropdown-toggle {
 	border-style: solid;
@@ -132,6 +169,7 @@ h1,h2,h3 {
 	line-height: 35px;
 	z-index: 5;
 	font: 12px/23px Tahoma, Arial, "\5B8B\4F53", sans-serif;
+	color: #6c6c6c;
 }
 
 #top.navbar {
@@ -388,16 +426,25 @@ h1,h2,h3 {
 }
 /*body*/
 .body>.left {
-	width: 194px;
-	margin-right: 15px;
+	width: 196px;
+	float: left;
+	margin-right: 14px;
+	background-color: #fff;
+	border-right: 1px solid #ddd;
 }
 
 .body>.right {
-	width: 960px;
+	width: 930px;
+	float: right;
+	font-size: 12px;
+}
+
+.body ul {
+	margin-bottom: 0;
 }
 
 .user {
-	background-color: #fff;
+	font-size: 12px;
 }
 
 .user .user-image {
@@ -422,6 +469,193 @@ h1,h2,h3 {
 	margin-top: 35px;
 	color: #333;
 }
+
+.user .user-lv {
+	padding-left: 20px;
+	clear: both;
+	height: 40px;
+	margin-bottom: 20px;
+}
+
+.user .user-count {
+	display: table;
+	width: 100%;
+	table-layout: fixed;
+	border-collapse: separate;
+	background-color: #fbfbfb;
+	padding: 18px 5px;
+	border-top: 1px solid #e8e8e8;
+	border-bottom: 1px solid #e8e8e8;
+}
+
+.user-count>li {
+	display: table-cell;
+	float: none;
+	width: 1%;
+	height: 50px;
+	text-align: center;
+}
+
+.user-count>li:not(:last-child) {
+	border-right: 1px solid #e8e8e8;
+}
+
+.user-count .count {
+	color: #56a022;
+	font-size: 24px;
+	line-height: 32px;
+	font-family: Arial;
+}
+
+.use .use-label {
+	line-height: 50px;
+	border-bottom: 1px solid #e8e8e8;
+	text-indent: 25px;
+	position: relative;
+}
+
+.use-label>i {
+	position: absolute;
+	left: 30px;
+	bottom: 0;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 0 4px 4px 4px;
+	border-bottom-color: #ddd;
+}
+
+.use>ul {
+	padding: 10px 0;
+	border-bottom: 1px solid #e8e8e8;
+}
+
+.use>ul>li {
+	padding: 8px 25px;
+}
+
+.use>ul>li:hover {
+	background-color: #56a022;
+}
+
+.use>ul>li:hover>* {
+	color: #fff;
+	text-decoration: none
+}
+
+.use .icon-right {
+	float: right;
+	color: #888;
+	line-height: 1.6
+}
+
+.right .company{
+	margin-bottom: 15px;
+	margin-left: -14px;
+}
+
+.company .inner{
+	line-height: 40px;
+	height: 40px;
+	padding-left: 12px;	
+}
+.company .inner>div {
+	float: left;
+	margin-right: 3px;
+}
+
+.right .data-wrap {
+	float: left;
+	width: 685px;
+}
+
+.data-wrap .todo {
+	height: 345px;
+	margin-bottom: 15px;
+}
+
+.todo .todo-label {
+	border-bottom: 1px solid #e8e8e8;
+	height: 39px;
+	line-height: 40px;
+}
+
+.todo .todo-label>li {
+	float: left;
+	margin-left: 140px;
+	text-align: center;
+	background-image: url("../img/all/line.png");
+	background-repeat: no-repeat;
+	background-position: 8px 32px;
+	height: 55px;
+	font-size: 14px;
+}
+
+.todo .todo-content {
+	clear: both;
+}
+
+.todo .todo-content>ul {
+	height: 85px;
+}
+
+.todo .todo-content a {
+	color: #666;
+}
+.todo .todo-content>ul:not(:last-child) {
+	border-bottom: 1px dashed #e8e8e8;
+	margin-bottom: 20px;
+}
+
+.todo-content .icon {
+	margin-left: 20px;
+	float: left;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	text-align: center;
+	margin-top: 5px;
+	color: #56a022;
+	font-size: 16px;
+	border-radius: 50%;
+	border: 1px solid #56a022;
+}
+
+.todo-content .start {
+	float: left;
+	border-right: 1px solid #e8e8e8;
+	height: 50px;
+	width: 150px;
+	margin-left: 20px;
+	margin-top: 12px;
+}
+
+.todo-content .start li,.todo-content .doing li,.todo-content .end li {
+	width: 100px;
+	float: left;
+	margin-left: 20px;
+	margin-bottom: 10px;
+}
+
+.todo-content .doing {
+	float: left;
+	border-right: 1px solid #e8e8e8;
+	height: 50px;
+	width: 200px;
+	margin-top: 12px;
+}
+
+.todo-content .end {
+	width: 240px;
+	float: left;
+	margin-top: 12px;	
+}
+
+.right .feed-wrap {
+	float: right;
+	width: 250px;
+}
 /*footer*/
 #footer {
 	color: #f1f1f1;
@@ -438,7 +672,7 @@ h1,h2,h3 {
 	margin: 0;
 }
 
-#footer .list-inline>li:not (:last-child ):after {
+#footer .list-inline>li:not(:last-child):after {
 	margin-left: 15px;
 	content: "|"
 }