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

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

@@ -86,6 +86,9 @@
 		font-size: 14px;
 		line-height: 26px;
 		margin-right: 15px;
+		display: inline-block;
+		width: 63px;
+		text-align: right;
 	}
 	.rule-main .rule-content .row span,.rule-main .rule-content .row select,.rule-main .rule-content .row input,.rule-main .rule-content .row label{
 		float: left;
@@ -95,7 +98,6 @@
 	}
 	.rule-main .rule-content .row strong{
 		color: #f00;
-		margin-right: 3px;
 	}
 	.rule-main .rule-content .row .form-control{
 		border-radius: 0;
@@ -447,6 +449,9 @@
 		top: -2px;
 		left: 2px;
 	}
+	.rule-main .rule-content .row .choose-box .tree ul li span{
+		width: auto;
+	}
 	.choose-box .hidden {
 		display: none;
 	}
@@ -488,7 +493,7 @@
 						<option value="1302">卖家配送</option>
 						<option value="1303">上门自提</option>
 					</select>
-					<span>优先级排序</span>
+					<span style="width: 70px;">优先级排序</span>
 					<input type="text" class="form-control sort" ng-model="rule.num">
 					<span><strong>*</strong>规则名称</span>
 					<input type="text" class="form-control rule" style="text-align: left;" ng-model="rule.ruleName">
@@ -548,7 +553,7 @@
 					</div>
 					<button ng-click="chooseAddress()">选择地区</button>
 					<!--选择地区 begin-->
-					<div class="choose-box" ng-if="chooseBox">
+					<div class="choose-box" ng-show="chooseBox">
 						<div>
 							<div class="tree">
 								<ul>

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

@@ -255,9 +255,9 @@
 						</td>
 					</tr>
 
-					<tr class="record-num" ng-if="rules.length >0">
+					<tr class="record-num" ng-if="$data">
 						<td colspan="5">
-							<span class="count-tip">显示1-10条,共<em ng-bind="rules.length" style="color: #5078cb">2506</em>条</span>
+							<span class="count-tip">显示 1-10 条,共 <em ng-bind="$data.length" style="color: #5078cb">2506</em> 条</span>
 						</td>
 					</tr>
 					</tbody>