询价单详情——产品价格详情 样式调整。

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

@@ -3,249 +3,260 @@
 </div>
 <link rel="stylesheet" href="static/css/add.css " />
 <style>
-.com_title {
-	width: 100%;
-	margin: 0px auto;
-	height: 40px;
-	line-height: 40px;
-	font-size: 14px;
-	color: #323232;
-	background: #f5f5f5;
-}
-
-.com_title font {
-	color: #327ebe;
-}
-
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-	background-color: #f5f5f5;
-	background-size: 100% 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
-.com_title01 {
-	height: 50px;
-	line-height: 50x;
-	width: 100%;
-	margin: 0 auto;
-	border-bottom: #5078cb 1px dotted;
-}
-
-.com_title01 span {
-	margin-left: 20px;
-	font-size: 14px;
-	line-height: 50px;
-	color: #555;
-	font-weight: bold;
-}
-
-.com_title01 a {
-	margin-right: 20px;
-	line-height: 50px;
-}
-
-#company .com-text {
-	height: 35px;
-	line-height: 35px;
-}
-#company .com-text .title {
-	font-size: 14px;
-	font-weight: inherit;
-	color: #323232;
-	width: 120px;
-	padding-left: 5px;
-}
-
-#company .com-text .content {
-	font-size: 14px;
-	color: #969595;
-}
-
-#company .logo-load {
-	width: 100px;
-	height: 100px;
-	background: url("static/img/purc/upload.png") no-repeat center;
-	display: inline-block;
-	border: #ccc 1px solid;
-	float: left;
-	margin-left: 0;
-}
-
-#company .logo-load input {
-	width: 100px !important;
-	height: 100px;
-	filter: alpha(opacity = 0);
-	-moz-opacity: 0;
-	opacity: 0;
-}
-
-#company .logo-img {
-	height: 100px;
-}
-
-#company .logo-img .well {
-	float: left;
-	width: 100px;
-	height: 100px;
-	background: #fff;
-}
-
-#company .input-group-addon {
-	display: inline-block;
-	height: 26px;
-	width: 50px;
-	float: left;
-	margin-top: 5px;
-}
-
-#company .content {
-	width: 72%;
-	height: 35px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-#company .form-control {
-	border: #bfbfbf 1px solid;
-	margin-top: 5px;
-	font-size: 14px;
-	border-radius: 3px;
-}
-
-#company .col-xs-4 p {
-	color: #959595;
-}
-
-#company .col-xs-4 .title {
-	padding: 0;
-}
-
-#company .row-sm {
-	border-bottom: #e8e8e8 1px solid;
-	padding-bottom: 20px;
-}
-#company .com-list .row-sm:hover{
-	border: #d32526 2px solid;
-}
-.bule {
-	color: #327ebe;
-	font-size: 14px;
-	padding-left: 20px;
-}
-
-.save-btn {
-	width: 100%;
-	height: 40px;
-}
-
-.save-btn .btn01 {
-	border: 1px;
-	width: 94px;
-	height: 36px;
-	line-height: 36px;
-	font-size: 14px;
-	display: inline-block;
-	text-align: center;
-	float: right;
-	background: #327ebe;
-	color: #fff;
-	margin-right: 20px;
-}
-
-.com_title01 a.color01 {
-	color: #d32526;
-}
-
-.com_title01 a.color02 {
-	color: #3a89d1;
-}
-
-.com-list .row {
-	position: relative;
-}
-
-.com-list .edit-icon {
-	display: none;
-}
-.com-list .row:hover .edit-icon{
-	display: inline-block;
-}
-.com-list .edit-icon {
-	position: absolute;
-	top: 10px;
-	right: 0;
-	width: 100px !important;
-}
-
-.com-list .content span {
-	font-size: 14px;
-}
-
-.com-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;
-}
-
-.com-list .row:hover {
-	border: #d32526 1px solid;
-}
-
-.com-list .edit-icon a:hover {
-	background: #3a89d1;
-}
-
-.com_title01 a {
-	color: #3a89d1;
-	font-size: 14px;
-	float: right;
-}
-
-.addrs-open a.open,.company-open a.open {
-	float: right;
-}
-
-.addrs-open a.open i ,.company-open a.open i{
-	margin-left: 5px;
-}
-
-.com_title01 {
-	border-top: none;
-}
-
-.com-list {
-	height: 186px;
-	width: 100%;
-	overflow: hidden;
-}
-.input-group-xs>.input-group-addon{
-	border: #bfbfbf 1px solid;
-}
-.com_title01 a span{
-	font-weight: normal;
-	color: #5078cb;
-	margin-right: 3px;
-}
-.address.active,.company.active{
-	height: auto !important;
-}
+	.com_title {
+		width: 100%;
+		margin: 0px auto;
+		height: 40px;
+		line-height: 40px;
+		font-size: 14px;
+		color: #323232;
+		background: #f5f5f5;
+	}
+
+	.com_title font {
+		color: #327ebe;
+	}
+
+	.com_head {
+		width: 100%;
+		height: 40px;
+		line-height: 44px;
+		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
+		background-color: #f5f5f5;
+		background-size: 100% 100%;
+	}
+
+	.com_head span {
+		margin-left: 20px;
+		color: #000;
+		font-size: 14px;
+	}
+
+	.com_title01 {
+		height: 50px;
+		line-height: 50x;
+		width: 100%;
+		margin: 0 auto;
+		border-bottom: #5078cb 1px dotted;
+	}
+
+	.com_title01 span {
+		margin-left: 20px;
+		font-size: 14px;
+		line-height: 50px;
+		color: #555;
+		font-weight: bold;
+	}
+
+	.com_title01 a {
+		margin-right: 20px;
+		line-height: 50px;
+	}
+
+	#company .com-text {
+		height: 35px;
+		line-height: 35px;
+	}
+	#company .com-text .title {
+		font-size: 14px;
+		font-weight: inherit;
+		color: #323232;
+		width: 120px;
+		padding-left: 5px;
+	}
+
+	#company .com-text .content {
+		font-size: 14px;
+		color: #969595;
+	}
+
+	#company .logo-load {
+		width: 100px;
+		height: 100px;
+		background: url("static/img/purc/upload.png") no-repeat center;
+		display: inline-block;
+		border: #ccc 1px solid;
+		float: left;
+		margin-left: 0;
+	}
+
+	#company .logo-load input {
+		width: 100px !important;
+		height: 100px;
+		filter: alpha(opacity = 0);
+		-moz-opacity: 0;
+		opacity: 0;
+	}
+
+	#company .logo-img {
+		height: 100px;
+	}
+
+	#company .logo-img .well {
+		float: left;
+		width: 100px;
+		height: 100px;
+		background: #fff;
+	}
+
+	#company .input-group-addon {
+		display: inline-block;
+		height: 26px;
+		width: 50px;
+		float: left;
+		margin-top: 5px;
+	}
+
+	#company .content {
+		width: 72%;
+		height: 35px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	#company .form-control {
+		border: #bfbfbf 1px solid;
+		margin-top: 5px;
+		font-size: 14px;
+		border-radius: 3px;
+	}
+
+	#company .col-xs-4 p {
+		color: #959595;
+	}
+
+	#company .col-xs-4 .title {
+		padding: 0;
+	}
+
+	#company .row-sm {
+		border-bottom: #e8e8e8 1px solid;
+		padding-bottom: 20px;
+	}
+	#company .com-list .row-sm:hover{
+		border: #d32526 2px solid;
+	}
+	.bule {
+		color: #327ebe;
+		font-size: 14px;
+		padding-left: 20px;
+	}
+
+	.save-btn {
+		width: 100%;
+		height: 40px;
+	}
+
+	.save-btn .btn01 {
+		border: 1px;
+		width: 94px;
+		height: 36px;
+		line-height: 36px;
+		font-size: 14px;
+		display: inline-block;
+		text-align: center;
+		float: right;
+		background: #327ebe;
+		color: #fff;
+		margin-right: 20px;
+	}
+
+	.com_title01 a.color01 {
+		color: #d32526;
+	}
+
+	.com_title01 a.color02 {
+		color: #3a89d1;
+	}
+
+	.com-list .row {
+		position: relative;
+	}
+
+	.com-list .edit-icon {
+		display: none;
+	}
+	.com-list .row:hover .edit-icon{
+		display: inline-block;
+	}
+	.com-list .edit-icon {
+		position: absolute;
+		top: 10px;
+		right: 0;
+		width: 100px !important;
+	}
+
+	.com-list .content span {
+		font-size: 14px;
+	}
+
+	.com-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;
+	}
+
+	.com-list .row:hover {
+		border: #d32526 1px solid;
+	}
+
+	.com-list .edit-icon a:hover {
+		background: #3a89d1;
+	}
+
+	.com_title01 a {
+		color: #3a89d1;
+		font-size: 14px;
+		float: right;
+	}
+
+	.addrs-open a.open,.company-open a.open {
+		float: right;
+	}
+
+	.addrs-open a.open i ,.company-open a.open i{
+		margin-left: 5px;
+	}
+
+	.com_title01 {
+		border-top: none;
+	}
+
+	.com-list {
+		height: 186px;
+		width: 100%;
+		overflow: hidden;
+	}
+	.input-group-xs>.input-group-addon{
+		border: #bfbfbf 1px solid;
+	}
+	.com_title01 a span{
+		font-weight: normal;
+		color: #5078cb;
+		margin-right: 3px;
+	}
+	.address.active,.company.active{
+		height: auto !important;
+	}
+	.enterprise-area span{
+		margin-right: 5px;
+		font-size: 14px;
+	}
+	.enterprise-area .form-control{
+		height: 26px;
+		padding: 0 5px;
+		width: 103px;
+		float: left;
+		margin-right: 5px;
+	}
 </style>
 <!--<div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>-->
 <div class="com_head"><span>企业信息</span></div>
@@ -264,15 +275,11 @@
 				</div>
 				<div class="com-text col-xs-6">
 					<span class="title">法定代表人：</span>
-					<div class="content" ng-bind="::enterprise.enArea"></div>
+					<div class="content" ng-bind="::enterprise.enCorporation"></div>
 				</div>
 				<div class="com-text col-xs-6">
 					<span class="title">企业地址：</span>
-					<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>
-					<div class="content" ng-show="connectionEditing" style="width: 320px;">
-						<input ng-model="enterprise.enAddress" placeholder="详细地址"
-							   class="form-control input-xs" type="text" />
-					</div>
+					<div class="content" ng-bind="::enterprise.enArea"></div>
 				</div>
 				<div class="com-text col-xs-6">
 					<span class="title">企业UU号：</span>
@@ -310,7 +317,7 @@
 	</div>
 	<div class="com_title01"><span>详细信息</span>
 		<a ng-show="!connectionEditing" ng-click="connectionEditing = true" class="pull-right text-simple"><i
-			class="fa fa-pencil fa-fw fa-lg"></i>编辑</a>
+				class="fa fa-pencil fa-fw fa-lg"></i>编辑</a>
 		<a ng-show="connectionEditing" ng-click="connectionEditing = false" class="pull-right text-simple color01"><i
 				class="fa fa-reply-all fa-fw"></i>取消</a>
 		<a ng-show="connectionEditing" ng-click="updateDetailInfo()" class="pull-right text-simple  color02"><i
@@ -323,33 +330,29 @@
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
 						<span class="title">联系人：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactMan"></div>
+						<div ng-show="!connectionEditing" class="content" ng-bind="">李亚津</div>
 						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 320px;">
-								<input required="required" ng-model="enterprise.contactMan" type="text" class="form-control input-xs" placeholder="联系人">
-							</div>
+							<input required="required" ng-model="" type="text" class="form-control input-xs" placeholder="联系人" />
 						</div>
 					</div>
 					<div class="com-text col-xs-6">
 						<span class="title">联系电话：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactTel"></div>
+						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enTel"></div>
 						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 320px;">
-								<input required="required" ng-model="enterprise.contactTel" type="text" class="form-control input-xs" placeholder="联系电话">
-							</div>
+							<input required="required" ng-model="enterprise.enTel" type="text" class="form-control input-xs" placeholder="企业电话" />
 						</div>
 					</div>
+				</div>
+				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
 						<span class="title">邮箱：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactEmail"></div>
+						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enEmail"></div>
 						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 320px;">
-								<input required="required" ng-model="enterprise.contactEmail" type="text" class="form-control input-xs" placeholder="邮箱">
-							</div>
+							<input required="required" ng-model="enterprise.enEmail" type="text" class="form-control input-xs" placeholder="邮箱" />
 						</div>
 					</div>
 					<div class="com-text col-xs-6">
-						<span class="title">企业传真：</span>
+						<span class="title">传真：</span>
 						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enFax"></div>
 						<div class="content" ng-show="connectionEditing">
 							<div class="input-group input-group-xs" style="width: 320px;">
@@ -357,12 +360,12 @@
 							</div>
 						</div>
 					</div>
+				</div>
+				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
-						<span class="title">企业官网：</span>
-						<a ng-show="!connectionEditing" class="content"
-						   ng-bind="::enterprise.enUrl" href="http://{{::enterprise.enUrl}}"
-						   target="_blank">
-						</a>
+						<span class="title">官网：</span><a ng-show="!connectionEditing" class="content"
+														 ng-bind="::enterprise.enUrl" href="http://{{::enterprise.enUrl}}"
+														 target="_blank"></a>
 						<div class="content" ng-show="connectionEditing">
 							<div class="input-group input-group-xs" style="width: 320px;">
 								<span class="input-group-addon">http://</span>
@@ -371,76 +374,39 @@
 						</div>
 					</div>
 				</div>
-				<div class="col-xs-12">
-					<div class="com-text col-xs-6">
-						<span class="title">行业：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.profession"></div>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" ng-model="enterprise.profession" type="text" class="form-control input-xs" placeholder="行业" />
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12">
-					<div class="com-text col-xs-12">
-						<span class="title">经营范围标签：</span>
-						<div ng-show="!connectionEditing" class="content" ng-repeat="tag in 'hahaha,hehehe,hjdksf'.split(',')">
-							<div >{{tag}}</div>
-							<!--<i class='glyphicon glyphicon-remove' aria-hidden='true' style='top: -10.5px; color: red; left: 19.5px;'></i>-->
-						</div>
-
-						<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.tags"></div>-->
-						<!--<div class="content" ng-show="connectionEditing">
-							<input required="required" ng-model="enterprise.tags" type="text" class="form-control input-xs" placeholder="行业" />
-						</div>-->
-					</div>
-				</div>
-			<!-- 	<div class="col-xs-12">
-					<div class="com-text col-xs-6">
-						<span class="title">成立时间：</span>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" type="text" class="form-control input-xs" placeholder="成立时间" />
-						</div>
-					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">员工人数：</span>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" type="text" class="form-control input-xs" placeholder="员工人数" />
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12">
-					<div class="com-text col-xs-6">
-						<span class="title">企业电话：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enTel"></div>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" ng-model="enterprise.enTel" type="text" class="form-control input-xs" placeholder="企业电话" />
-						</div>
-					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">开户银行：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enbank"></div>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" type="text" class="form-control input-xs" placeholder="开户银行" ng-model="enterprise.enbank"/>
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12">
-					<div class="com-text col-xs-6">
-						<span class="title">员工人数：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.emcount"></div>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" type="text" class="form-control input-xs" placeholder="员工人数" ng-model="enterprise.emcount"/>
-						</div>
-					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">地址：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>
-						<div class="content" ng-show="connectionEditing" style="width: 320px;">
-							<input ng-model="enterprise.enAddress" placeholder="详细地址"
-								   class="form-control input-xs" type="text" />
-						</div>
-					</div>
-				</div>
+				<!--<div class="col-xs-12">-->
+				<!--<div class="com-text col-xs-6">-->
+				<!--<span class="title">企业电话：</span>-->
+				<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enTel"></div>-->
+				<!--<div class="content" ng-show="connectionEditing">-->
+				<!--<input required="required" ng-model="enterprise.enTel" type="text" class="form-control input-xs" placeholder="企业电话" />-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--<div class="com-text col-xs-6">-->
+				<!--<span class="title">开户银行：</span>-->
+				<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enbank"></div>-->
+				<!--<div class="content" ng-show="connectionEditing">-->
+				<!--<input required="required" type="text" class="form-control input-xs" placeholder="开户银行" ng-model="enterprise.enbank"/>-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--<div class="col-xs-12">-->
+				<!--<div class="com-text col-xs-6">-->
+				<!--<span class="title">员工人数：</span>-->
+				<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.emcount"></div>-->
+				<!--<div class="content" ng-show="connectionEditing">-->
+				<!--<input required="required" type="text" class="form-control input-xs" placeholder="员工人数" ng-model="enterprise.emcount"/>-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--<div class="com-text col-xs-6">-->
+				<!--<span class="title">地址：</span>-->
+				<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>-->
+				<!--<div class="content" ng-show="connectionEditing" style="width: 320px;">-->
+				<!--<input ng-model="enterprise.enAddress" placeholder="详细地址"-->
+				<!--class="form-control input-xs" type="text" />-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--</div>-->
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
 						<span class="title">行业：</span>
@@ -455,7 +421,22 @@
 							</select>
 						</div>
 					</div>
-				</div> -->
+				</div>
+				<div class="col-xs-12">
+					<div class="com-text col-xs-12">
+						<span class="title">经营范围：</span>
+						<div ng-show="!connectionEditing" class="content enterprise-area">
+							<span>企业管理咨询</span>
+							<span>企业管理咨询</span>
+							<span>企业管理咨询</span>
+						</div>
+						<div class="content enterprise-area" ng-show="connectionEditing">
+							<input type="text" value="企业管理咨询" class="form-control" />
+							<input type="text" value="企业管理咨询" class="form-control" />
+							<input type="text" value="企业管理咨询" class="form-control" />
+						</div>
+					</div>
+				</div>
 			</div>
 		</form>
 	</div>
@@ -559,7 +540,7 @@
 		</form>
 	</div>
 
-	<div class="com_title01"><span>企业管理员</span>
+	<div class="com_title01"><span>管理员信息</span>
 		<a href="https://account.ubtob.com/changeAdmin/changeAdmin" class="pull-right text-simple" target="_blank"><i class="fa fa-exchange fa-fw fa-lg"></i>更换管理员</a>
 	</div>
 	<div class="pane-body">
@@ -570,10 +551,10 @@
 						<span class="title">姓名：</span>
 						<div class="content" ng-bind="::enterprise.admin.userName">陈虎</div>
 					</div>
-					<!--<div class="com-text col-xs-6">
-						<span class="title">性别：</span>
-						<div class="content">{{enterprise.admin.userSex === 'F' ? '女' : '男'}}</div>
-					</div>-->
+					<!--<div class="com-text col-xs-6">-->
+					<!--<span class="title">性别：</span>-->
+					<!--<div class="content">{{enterprise.admin.userSex === 'F' ? '女' : '男'}}</div>-->
+					<!--</div>-->
 				</div>
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
@@ -716,12 +697,12 @@
 			</form>
 		</div>
 	</div>
-	<div class="com_title01"><span>你拥有的服务</span></div>
+	<div class="com_title01"><span>已开通服务</span></div>
 	<div class="pane-body">
 		<div class="row">
-			<div class="col-xs-6"><a href="http://uas.ubtob.com/#/index" class="bule">B2B商务平台</a></div>
-			<div class="col-xs-6"><a href="http://www.usoftmall.com/" class="bule" target="_blank">优软商城</a></div>
-			<div class="col-xs-6"><a href="http://v2.usoftchina.com/uu" class="bule">UU互联</a></div>
+			<div class="col-xs-4"><a href="http://uas.ubtob.com/#/index" class="bule" title="B2B商务平台">B2B商务平台</a></div>
+			<div class="col-xs-4"><a href="http://www.usoftmall.com/" class="bule" target="_blank" title="优软商城">优软商城</a></div>
+			<div class="col-xs-4"><a href="http://v2.usoftchina.com/uu" class="bule" target="_blank" title="UU互联">UU互联</a></div>
 		</div>
 	</div>
 	<div class="save-btn">
@@ -729,80 +710,80 @@
 	</div>
 </div>
 <div class="bomb-box" style="display: none" id="ship">
-    <form class="box04 box" name="shipAddress" id="shipAddress">
-        <i class="off"><img src="static/img/purc/close.png" alt="" /></i>
-        <p>收货人资料</p>
-        <ul>
-            <li class="line01">
-                <div class="fl">
-                    <span class="fl"><em>*</em>收货人：</span>
-                    <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true"/></span>
-                </div>
-                <div class="fr">
-                    <span class="fl"><em>*</em>手机：</span>
-                    <span class="fr"><input type="text" ng-model="ship.usertel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
-                </div>
-            </li>
-            <li class="line01">
-                <div class="fl">
-                    <span class="fl">固定电话<em></em>：</span>
-                    <span class="fr"><input type="text" ng-model="ship.phone"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></span>
-                </div>
-                <div class="fr">
-                    <span class="fl">邮箱：</span>
-                    <span class="fr emaill"><input type="text" ng-model="ship.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
-                </div>
-            </li>
-            <li class="line02 margin-top40">
-                <div class="fl"><em>*</em>所在地址：</div>
-                <!--<div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address" required="true"/><i class="fa fa-angle-down"></i></div>-->
-				 <div class="select fr">
-                    <select required="" class="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
-                            ng-change="ship.city='';ship.district='';" required="true">  
-                        <option value="">省</option>  
-                    </select>
-                    <select class="area-select" ng-model="ship.city" ng-options="key as key for (key,value) in provinces[ship.province]"
-                            ng-change="ship.district='';" required="true">  
-                        <option value="">市</option>  
-                    </select>
-                    <select class="area-select" ng-model="ship.district" ng-options="value as value for value in provinces[ship.province][ship.city]" required="true">
-                        <option value="">区</option>  
-                    </select>  
+	<form class="box04 box" name="shipAddress" id="shipAddress">
+		<i class="off"><img src="static/img/purc/close.png" alt="" /></i>
+		<p>收货人资料</p>
+		<ul>
+			<li class="line01">
+				<div class="fl">
+					<span class="fl"><em>*</em>收货人：</span>
+					<span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true"/></span>
+				</div>
+				<div class="fr">
+					<span class="fl"><em>*</em>手机：</span>
+					<span class="fr"><input type="text" ng-model="ship.usertel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
 				</div>
-            </li>
-            <li class="line02">
-                <div class="fl"><em>*</em>详细地址：</div>
-                <div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
-            </li>
-            <li class="line02">
-                <div class="fl">地址别名：</div>
-                <div class="fr address"><input type="text" ng-model="ship.addalias"/><i>建议填写常用名称：家里/父母家/公司</i></div>
-            </li>
-        </ul>
-        <div class="many-file-btn">
-            <button class="btn01" ng-click="saveShipAddress(ship)" ng-disabled="shipAddress.$invalid">保存</button><a class="btn02" ng-click="">取消</a>
-        </div>
-    </form>
+			</li>
+			<li class="line01">
+				<div class="fl">
+					<span class="fl">固定电话<em></em>：</span>
+					<span class="fr"><input type="text" ng-model="ship.phone"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></span>
+				</div>
+				<div class="fr">
+					<span class="fl">邮箱：</span>
+					<span class="fr emaill"><input type="text" ng-model="ship.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
+				</div>
+			</li>
+			<li class="line02 margin-top40">
+				<div class="fl"><em>*</em>所在地址：</div>
+				<!--<div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address" required="true"/><i class="fa fa-angle-down"></i></div>-->
+				<div class="select fr">
+					<select required="" class="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
+							ng-change="ship.city='';ship.district='';" required="true">
+						<option value="">省</option>
+					</select>
+					<select class="area-select" ng-model="ship.city" ng-options="key as key for (key,value) in provinces[ship.province]"
+							ng-change="ship.district='';" required="true">
+						<option value="">市</option>
+					</select>
+					<select class="area-select" ng-model="ship.district" ng-options="value as value for value in provinces[ship.province][ship.city]" required="true">
+						<option value="">区</option>
+					</select>
+				</div>
+			</li>
+			<li class="line02">
+				<div class="fl"><em>*</em>详细地址：</div>
+				<div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
+			</li>
+			<li class="line02">
+				<div class="fl">地址别名：</div>
+				<div class="fr address"><input type="text" ng-model="ship.addalias"/><i>建议填写常用名称：家里/父母家/公司</i></div>
+			</li>
+		</ul>
+		<div class="many-file-btn">
+			<button class="btn01" ng-click="saveShipAddress(ship)" ng-disabled="shipAddress.$invalid">保存</button><a class="btn02" ng-click="">取消</a>
+		</div>
+	</form>
 </div>
 <script src="static/lib/jquery/jquery.min.js"></script>
 <script>
-    $(function(){
-        //新增收货地址
-        $(".com_title01 .add-address").click(function(){
-        	document.getElementById('shipAddress').reset();
-            $("#ship").show();
-        });
-        
-        $("#message .add-address").click(function(){
-        	document.getElementById('shipAddress').reset();
-            $("#ship").show();
-        });
-        
-        $(".bomb-box .box04 .off,.box04 .many-file-btn .btn02").click(function(){
-            $(".bomb-box").hide();
-        })
-         $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
-            $(".bomb-box").hide();
-        })
-    })
+	$(function(){
+		//新增收货地址
+		$(".com_title01 .add-address").click(function(){
+			document.getElementById('shipAddress').reset();
+			$("#ship").show();
+		});
+
+		$("#message .add-address").click(function(){
+			document.getElementById('shipAddress').reset();
+			$("#ship").show();
+		});
+
+		$(".bomb-box .box04 .off,.box04 .many-file-btn .btn02").click(function(){
+			$(".bomb-box").hide();
+		})
+		$(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
+			$(".bomb-box").hide();
+		})
+	})
 </script>