Jelajahi Sumber

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

suntg 10 tahun lalu
induk
melakukan
b72977510a
1 mengubah file dengan 29 tambahan dan 38 penghapusan
  1. 29 38
      src/main/webapp/WEB-INF/views/normal/serve.html

+ 29 - 38
src/main/webapp/WEB-INF/views/normal/serve.html

@@ -23,10 +23,10 @@
 				<ul class="nav navbar-nav">
 					<li class="brand">您好,</li>
 					<li class="dropdown"><a href="#" role="button"
-						class="dropdown-toggle"><span ng-bind="userInfo.userName"
+						class="dropdown-toggle"><span ng-bind="userInfo.userName || '游客'"
 							class="text-inverse"></span> <i class="fa fa-angle-down fa-fw"></i> </a>
 						<div class="dropdown-menu" style="padding: 15px; width: 180px;">
-							<ul class="list-unstyled">
+							<ul class="list-unstyled" ng-if="userInfo">
 								<li><a href="#"><h6 class="text-info">{{userInfo.enName}}</h6></a></li>
 								<li class="divider" ng-show="userInfo.enName"></li>
 								<li><a href="#"><i class="fa fa-user fa-fw"></i>
@@ -37,34 +37,25 @@
 										class="fa fa-gear fa-fw"></i> 账号管理</a><a
 									class="text-muted pull-right" ng-click="logout()">退出</a></li>
 							</ul>
+							<ul class="list-unstyled" ng-if="!userInfo">
+								<li class="text-center"><a href="signin"><h6 class="text-info">立即登录</h6></a></li>
+							</ul>
 						</div></li>
 					<li class="dropdown"><a href="#" role="button"
 						class="dropdown-toggle">消息(0) <i class="fa fa-angle-down"></i>
 					</a></li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
-					<li class="dropdown"><a href="#/sale/todo/notice"
-						role="button" class="dropdown-toggle"> 待发货(<span
-							class="text-warning">0</span>) <i class="fa fa-angle-down"></i>
-					</a>
-						<div class="dropdown-menu" style="padding: 10px 15px;">
-							<div class="form-actions">
-								<div>
-									<a href="#/sale/todo/notice"
-										class="pull-right btn btn-warning btn-sm">客户送货送货提醒</a>
-								</div>
-							</div>
-						</div></li>
 					<li><a href="" ng-click="addFavorite()" role="button"><i
 							class="fa fa-star fa-fw text-simple"></i> 收藏夹 </a></li>
 					<li class="dropdown"><a href="#" role="button"
 						class="dropdown-toggle"> 客服中心 <i class="fa fa-angle-down"></i>
 					</a>
 						<ul class="dropdown-menu pull-right" role="menu">
-							<li><a href="#">新手上路</a></li>
-							<li><a href="#">买家帮助</a></li>
-							<li><a href="#">卖家帮助</a></li>
-							<li><a href="#">在线咨询</a></li>
+							<li><a href="#/">自助首页</a></li>
+							<li><a href="#/question/">常见问题</a></li>
+							<li><a href="#/contact">联系客服</a></li>
+							<li><a href="#/new/">新手入门</a></li>
 						</ul></li>
 					<li class="dropdown"><a href="#" role="button"
 						class="dropdown-toggle text-inverse"><i class="fa fa-bars fa-fw"></i>
@@ -75,40 +66,40 @@
 								<div class="col-xs-3 ">
 									<h4>账号管理</h4>
 									<ul class="nav nav-pills">
-										<li><a href="#/account/enterprise" title="企业信息">企业信息</a></li>
-										<li><a href="#/account/user" title="用户信息">用户信息</a></li>
-										<li><a href="#/account/log" title="日志记录">日志记录</a></li>
-										<li><a href="#/account/resource" title="系统资源">系统资源</a></li>
-										<li><a href="#/account/authority" title="权限管理">权限管理</a></li>
-										<li><a href="#/account/role" title="角色管理">角色管理</a></li>
+										<li><a href="./#/account/enterprise" title="企业信息">企业信息</a></li>
+										<li><a href="./#/account/user" title="用户信息">用户信息</a></li>
+										<li><a href="./#/account/log" title="日志记录">日志记录</a></li>
+										<li><a href="./#/account/resource" title="系统资源">系统资源</a></li>
+										<li><a href="./#/account/authority" title="权限管理">权限管理</a></li>
+										<li><a href="./#/account/role" title="角色管理">角色管理</a></li>
 									</ul>
 								</div>
 								<div class="col-xs-3">
 									<h4>销售管理</h4>
 									<ul class="nav nav-pills">
-										<li><a href="#" title="客户资料">客户资料</a></li>
-										<li><a href="#/sale/order" title="客户采购订单">客户采购订单</a></li>
-										<li><a href="#/sale/change" title="客户采购变更">客户采购变更</a></li>
-										<li><a href="#/sale/forecast" title="客户采购预测">客户采购预测</a></li>
-										<li><a href="#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
-										<li><a href="#/sale/accept" title="客户验收单">客户验收单</a></li>
-										<li><a href="#/sale/returns" title="客户验退单">客户验退单</a></li>
-										<li><a href="#/sale/sample" title="客户打样申请">客户打样申请</a></li>
-										<li><a href="#/sale/approval" title="客户认定单">客户认定单</a></li>
+										<li><a href="./#/sale/customer" title="客户资料">客户资料</a></li>
+										<li><a href="./#/sale/order" title="客户采购订单">客户采购订单</a></li>
+										<li><a href="./#/sale/change" title="客户采购变更">客户采购变更</a></li>
+										<li><a href="./#/sale/forecast" title="客户采购预测">客户采购预测</a></li>
+										<li><a href="./#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
+										<li><a href="./#/sale/accept" title="客户验收单">客户验收单</a></li>
+										<li><a href="./#/sale/returns" title="客户验退单">客户验退单</a></li>
+										<li><a href="./#/sale/sample" title="客户打样申请">客户打样申请</a></li>
+										<li><a href="./#/sale/approval" title="客户认定单">客户认定单</a></li>
 									</ul>
 								</div>
 								<div class="col-xs-3">
 									<h4>品质管理</h4>
 									<ul class="nav nav-pills">
-										<li><a href="#/qc/badIn" title="客户不良品入库">客户不良品入库</a></li>
-										<li><a href="#/qc/badOut" title="客户不良品出库">客户不良品出库</a></li>
-										<li><a href="#/qc/MRB" title="客户MRB单">客户MRB单</a></li>
+										<li><a href="./#/qc/badIn" title="客户不良品入库">客户不良品入库</a></li>
+										<li><a href="./#/qc/badOut" title="客户不良品出库">客户不良品出库</a></li>
+										<li><a href="./#/qc/MRB" title="客户MRB单">客户MRB单</a></li>
 									</ul>
 								</div>
 								<div class="col-xs-3">
 									<h4>财务对账</h4>
 									<ul class="nav nav-pills">
-										<li><a href="#/fa/apBill" title="客户应付发票">客户应付发票</a></li>
+										<li><a href="./#/fa/apBill" title="客户应付发票">客户应付发票</a></li>
 									</ul>
 								</div>
 							</div>
@@ -132,7 +123,7 @@
 						ui-sref="question.index">常见问题</a></li>
 					<li class="dropdown" ng-class="{'active': routeState == 'contact'}"><a
 						ui-sref="contact">联系客服</a></li>
-					<li ng-class="{'active': routeState == 'sale'}"><a ui-sref="sale">卖家专区</a></li>
+					<!-- <li ng-class="{'active': routeState == 'sale'}"><a ui-sref="sale">卖家专区</a></li> -->
 					<li ng-class="{'active': routeState == 'new'}"><a ui-sref="new.index">新手入门</a></li>
 				</ul>
 			</nav>