Merge remote-tracking branch 'origin/vendor_logistics_v2' into vendor_logistics_v2

# Conflicts:
#	src/main/webapp/resources/view/vendor/forstore/vendor_delivery_rule.html
#	src/main/webapp/resources/view/vendor/forstore/vendor_distributor.html

src/main/webapp/resources/view/vendor/forstore/vendor_delivery_rule.html

@@ -5,7 +5,7 @@
 		display: inline-block;
 	}
 	.delivery-list .content-header{
-		padding-top: 30px;
+		padding-top: 25px;
 		overflow: hidden;
 	}
 	.delivery-list .content-header span{
@@ -15,13 +15,15 @@
 	}
 	.delivery-list .content-header a{
 		float: right;
-		margin-right: 16px;
+		margin-right: 50px;
 		color: #333;
 		font-size: 14px;
 	}
 	.delivery-list .content-header i{
 		color: #32b500;
 		font-size: 16px;
+		position: relative;
+		top: 1px;
 	}
 	.delivery-list .content-body {
 		width: 1000px;
@@ -319,31 +321,31 @@
 			<div class="rule-content">
 				<!--暂时注释，在以后的开发中在释放出来-->
 				<!--<div class="row check-1">-->
-				<!--<span><strong>*</strong>适用类型</span>-->
-				<!--<label class="check-act">-->
-				<!--<input type="checkbox" id="1" ng-model="orderType.normal"/>-->
-				<!--<label for="1"></label>-->
-				<!--普通订单-->
-				<!--</label>-->
-				<!--<label class="check-act">-->
-				<!--<input type="checkbox" id="2" ng-model="orderType.preSale"/>-->
-				<!--<label for="2"></label>-->
-				<!--预售订单-->
-				<!--</label>-->
-				<!--<label class="check-act">-->
-				<!--<input type="checkbox" id="3" ng-modle="orderType.bill"/>-->
-				<!--<label for="3"></label>-->
-				<!--发票-->
-				<!--</label>-->
-				<!--<span>适用用户</span>-->
-				<!--<select class="select-adder form-control for-people" ng-model="modifyRule.userType">-->
-				<!--<option value="1301">所有用户</option>-->
-				<!--</select>-->
+					<!--<span><strong>*</strong>适用类型</span>-->
+					<!--<label class="check-act">-->
+						<!--<input type="checkbox" id="1" ng-model="orderType.normal"/>-->
+						<!--<label for="1"></label>-->
+						<!--普通订单-->
+					<!--</label>-->
+					<!--<label class="check-act">-->
+						<!--<input type="checkbox" id="2" ng-model="orderType.preSale"/>-->
+						<!--<label for="2"></label>-->
+						<!--预售订单-->
+					<!--</label>-->
+					<!--<label class="check-act">-->
+						<!--<input type="checkbox" id="3" ng-modle="orderType.bill"/>-->
+						<!--<label for="3"></label>-->
+						<!--发票-->
+					<!--</label>-->
+					<!--<span>适用用户</span>-->
+					<!--<select class="select-adder form-control for-people" ng-model="modifyRule.userType">-->
+						<!--<option value="1301">所有用户</option>-->
+					<!--</select>-->
 				<!--</div>-->
 				<div class="row" style="position: relative;">
 					<span><strong>*</strong>适用地区</span>
-					<div class="area-content" ng-if="mapArray.length >0">
-						<span ng-repeat="data in mapArray">
+					<div class="area-content" ng-if="mapArray.length >0" style="max-height: 123px; overflow-y: auto;">
+						<span ng-repeat="data in mapArray" ng-click="deleteMapItem($index)">
 							<em ng-if="data.mainland">{{data.mainland}}</em>
 							<em ng-if="data.province">{{data.province}}</em>
 							<em ng-if="data.city">/{{data.city}}</em>
@@ -993,7 +995,7 @@
 		height: 438px;
 		box-shadow: 2px 5px 8px #dee0e2;
 		position: absolute;
-		top: 120%;
+		top: 115%;
 		left: 487px;
 		background: #fff;
 		z-index: 10000;

src/main/webapp/resources/view/vendor/forstore/vendor_distributor.html

@@ -76,40 +76,42 @@
 		padding-top: 25px;
 	}
 	.title-wrap{
-		height: 40px;
+		width: 100%;
+		margin: 0 auto;
+		margin-bottom: 15px;
 	}
 	.content-title{
-		width: 100px;
-		height: 40px;
 		text-align: center;
 		float: left;
-		margin-left: 25px;
+		margin-left: 23px;
 		font-size: 14px;
 	}
 	.add-btn{
 		width: 100px;
-		height: 40px;
 		text-align: center;
 		float: right;
-		margin-right: 25px;
-		font-size: 13px;
+		margin-right: 50px;
+		font-size: 14px;
 	}
 	.add-btn i{
-		background: white;
-		color: green;
-		margin-right: 5px;
+		color: #32b500;
+		font-size: 16px;
+		position: relative;
+		top: 1px;
 	}
 	.add-btn:hover{
 		cursor: pointer;
 	}
 	.send-list{
-		margin-left: 20px;
-		margin-right: 20px;
-		padding-bottom: 20px;
+		width: 1000px;
+		margin: 0 auto;
+		display: inline-block;
+		margin: 15px 0 0 13px;
+        padding-bottom: 20px;
 	}
 	.send-item{
 		display: inline-block;
-		width: 137px;
+		width: 14.28%;
 		height: 40px;
 		vertical-align: middle;
 		font-size: 14px;
@@ -160,7 +162,7 @@
 		<div class="distributor-content">
 			<div class="title-wrap">
 				<span class="content-title">我的配送商</span>
-				<span class="add-btn"  ng-click="addDistributor()"><i class="fa fa-plus-circle"></i>   设置配送商</span>
+				<span class="add-btn"  ng-click="addDistributor()"><i class="fa fa-plus-circle"></i>&nbsp;设置配送商</span>
 			</div>
 			<ul class="send-list">
 				<li ng-repeat="data in data_list track by $index" class="send-item" ng-mouseenter="hover_distributor($index)" ng-mouseleave="leave_distributor($index)">

src/main/webapp/resources/view/vendor/forstore/vendor_logistics.html

@@ -2,6 +2,15 @@
 	.count .count01 {
 		display: block;
 	}
+	.logistic-content .menu-title{
+		font-size: 14px;
+	}
+	.logistic-content .add-log button i{
+		margin: 0;
+		font-size: 16px;
+		position: relative;
+		top: 1px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -17,7 +26,7 @@
 		<!--收货地址-->
 		<div class="logistic-content" ng-if="tab=='logistic'">
 			<div class="menu-title row">现有发货地址<span>&nbsp;已保存<em>{{total}}</em>条，还能新增<em>{{canAddTotal-total}}</em>条地址</span></div>
-			<div class="add-log row" ng-if="total < canAddTotal"><button ng-click="editShippingAddress()"><i class="fa fa-plus-square"></i>新增发货地址</button></div>
+			<div class="add-log row" ng-if="total < canAddTotal"><button ng-click="editShippingAddress()"><i class="fa fa-plus-circle"></i>&nbsp;新增发货地址</button></div>
 			<div class="log-tab">
 				<table class="table">
 					<thead>

src/main/webapp/resources/view/vendor/forstore/vendor_take_self.html

@@ -8,11 +8,11 @@
 		background: #fff;
 	}
 	.takeSelf .content-header{
-		padding-top: 35px;
+		padding-top: 25px;
 		overflow: hidden;
 	}
 	.takeSelf .content-header span{
-		padding-left: 45px;
+		padding-left: 23px;
 		font-size: 14px;
 		color: #333;
 	}
@@ -25,6 +25,8 @@
 	.takeSelf .content-header i{
 		color: #32b500;
 		font-size: 16px;
+		position: relative;
+		top: 1px;
 	}
 	.takeSelf .content-body {
 		width: 1000px;
@@ -33,7 +35,7 @@
 	}
 	.takeSelf .content-body table{
 		box-sizing: border-box;
-		margin-top: 20px;
+		margin-top: 15px;
 	}
 	.takeSelf .content-body thead{
 		height: 40px;