企业信息修改

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

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -119,8 +119,6 @@
 .save-btn{
 	width: 100%;
 	height: 40px;
-	margin-top: 20px;
-	margin-bottom: 30px;
 }
 .save-btn .btn01{
 	border: 1px;
@@ -141,6 +139,58 @@
 .com_title01 a.color02{
 	color: #3a89d1;
 }
+#address-list .row{
+	position: relative;
+}
+#address-list .edit-icon{
+	display: none;
+}
+#address-list .edit-icon .content{
+	position: absolute;
+	top: -100px;
+	right: 0;
+	width: 100px !important;
+}
+#address-list .content span{
+	font-size: 14px;
+}
+#address-list .edit-icon a{
+	width: 42px;
+	height: 24px;
+	display: inline-block;
+	background: #8bc6f7;
+	font-size: 12px;
+	color: #fff;
+	margin: 0 0 0 3px;
+	float: left;
+	border-radius: 1px;
+	line-height: 24px;
+	text-align: center;
+}
+#address-list .row:hover{
+	border: #d32526 1px solid;
+}
+#address-list .edit-icon a:hover{
+	background: #3a89d1;
+}
+.com_title01 a{
+	color: #3a89d1;
+	font-size: 14px;
+}
+.com_title01 a.open{
+	float: right;
+}
+.com_title01 a.open i{
+	margin-left: 5px;
+}
+.com_title01{
+	border-top: none;
+}
+#address-list{
+	height: 186px;
+	width: 100%;
+	overflow: hidden;
+}
 </style>
 <div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>
 <div class="com_head"><span>企业信息</span></div>
@@ -322,14 +372,15 @@
 		</form>
 	</div>
 		<div class="com_title01"><span>收货人信息</span>
-		<a ng-show="!connectionEditings"  class="pull-right add-address" ng-click="">+新增收货人信息</a>
+		<a href="javascript:void(0);" class="open">展开<i class="fa fa-angle-down"></i></a>
+		<a ng-show="!connectionEditings"  class="pull-right add-address" ng-click="">+新增收货人</a>
 		<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
 				class="fa fa-reply-all fa-fw"></i>取消</a>
 		<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i
 				class="fa fa-save fa-fw"></i>保存</a>
 	</div>
 	<!--收货人信息-->
-	<div class="pane-body">
+	<div class="pane-body" id="address-list">
 		<form name="detailForm">
 			<div class="row row-sm item" ng-repeat="ship in ships">
 				<div class="col-xs-12">
@@ -381,14 +432,15 @@
 							<span ng-bind="ship.addalias"></span>
 						</div>
 					</div>
-					<div class="com-text col-xs-6">
-						<span class="title"></span>
+					<div class="edit-icon com-text col-xs-6">
+						<span class="title">&nbsp;</span>
 						<div class="content">
 							<a ng-click="editShip(ship)">编辑</a>
 							<a ng-click="removeShip(ship.id, $index)">删除</a>
 						</div>
 					</div>
 				</div>
+
 			</div>
 		</form>
 	</div>
@@ -473,6 +525,20 @@
          $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
             $(".bomb-box").hide();
         })
-        
+		/*鼠标移动上去删除*/
+		$('#address-list .row').hover(function(){
+			$(this).find('.edit-icon').toggle();
+		});
+		/*展开收缩功能*/
+		$('.com_title01 .open').click(function () {
+			$(this).toggleClass("active");
+			if($(this).hasClass("active")){
+				$(this).html("收起<i class='fa fa-angle-up'></i>");
+				$("#address-list").css("height","auto");
+			}else{
+				$(this).html("展开<i class='fa fa-angle-down'></i>");
+				$("#address-list").css("height","186px");
+			}
+		});
     })
 </script>

src/main/webapp/resources/tpl/index/home/right.html

@@ -145,7 +145,7 @@
 			</div>
 			<!-- 轮播（Carousel）指标 -->
 			<ol class="carousel-indicators">
-				<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+				<!--<li data-target="#myCarousel" data-slide-to="0" class="active"></li>-->
 				<!-- <li data-target="#myCarousel" data-slide-to="1"></li>
 				<li data-target="#myCarousel" data-slide-to="2"></li> -->
 			</ol>