空状态调整

src/main/webapp/resources/view/usercenter/componentStore.html

@@ -294,7 +294,7 @@ td {
 	<div class="no-collect" ng-if="collectInfo.length == 0">
 		<img src="static/img/all/empty-cart.png">
 		<p>
-			<span>暂无店铺关注</span>
+			<span>暂无产品收藏</span>
 			<br>
 			<a href="/">马上去逛一逛</a>
 		</p>

src/main/webapp/resources/view/usercenter/forstore/buyer_invoice.html

@@ -531,7 +531,7 @@
                             </p>
                             <div class="empty-info">
                                 <p class="grey"> 暂无发票信息 </p>
-                                <a href="javascript:history.go(-1)"><i class="fa fa-mail-reply fa-xs"></i>返回上一级</a>
+                                <a href="javascript:history.go(-1)"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
                             </div>
                         </div>
                     </dd>

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -808,12 +808,15 @@
 					<dd class="price"><b>总金额：<em ng-bind="::order.ensurePrice | formateNumber : 2 | currencySysmbol : order.currency"></em></b><b>总共<em ng-bind="::order.batchQty || 0"></em>件产品</b></dd>
 				</div>
 				<div ng-if="currenctOrders.length == 0" class="text-center">
-					<img src="static/img/all/empty-cart.png">
-					<span style="font-size: 14px;color:#999;">暂无订单信息
-						<a href="/" style="margin-left:20px;font-size: 14px;color:#5078cb;"><i class="fa fa-mail-reply"></i>&nbsp;马上去逛一逛</a></span>
+					<div class="col-xs-offset-3 col-xs-2" >
+						<img src="static/img/all/empty-cart.png">
+					</div>
+					<div class="col-xs-3">
+						<p class="grey f16">暂无订单信息，快去下单吧 </p>
+						<a ng-click="reload()">点击重新加载</a>&nbsp;<i class="fa fa-refresh"></i>
+					</div>
 				</div>
-				<!--<p class="height
-				16" style="background: #f5f5f5;" ng-if="currenctOrders.length != 0">&nbsp</p>-->
+				<!--<p class="height16" style="background: #f5f5f5;" ng-if="currenctOrders.length != 0">&nbsp</p>-->
 				<div class="ng-cloak ng-table-pager" ng-if="pages.length" style="float: right;margin-right: 60px;">
 					<ul class="pagination ng-table-pagination">
 						<li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">

src/main/webapp/resources/view/usercenter/forstore/store_focus.html

@@ -324,6 +324,29 @@
 		font-size: 14px;
 		color: #fff;
 	}
+	.no-store{
+		height: 255px;
+		width:100%;
+		display:inline-flex;
+		justify-content: center;
+		align-items: center;
+		background: white;
+	}
+	.no-store p{
+		padding-top:10px;
+		font-size: 14px;
+		color: #999;
+		margin-left:15px;
+		line-height: 28px;
+	}
+	.no-store p a{
+		color: #5078cb;
+		display: block;
+		background: url(static/img/all/icon_nianxian.jpg)no-repeat;
+		background-position: 0px 7px;
+		padding-left: 25px;
+	}
+
 </style>
 <div class="user_right fr">
 	<div class="rt_menu" style="background-color:white">
@@ -353,7 +376,7 @@
 					<div class="img-div" ng-click="setActive(item)" ng-class="{'isSelected-background': isBatch &&item.active}">
 						<a name="imgDetail" href="store/{{item.storeInfo.uuid}}">
 							<img src="{{item.storeInfo.logoUrl}}" class="store-img"/>
-						</a>	
+						</a>
 						<div class="img-background-div" ng-class="{'notSelected': isBatch && !item.active, 'isSelected':  isBatch &&item.active}"></div>
 					</div>
 					<div style="width:760px;">
@@ -386,7 +409,7 @@
 							<div>公司介绍：
 								<span ng-bind="item.storeInfo.description"></span>
 							</div>
-						</div>	
+						</div>
 					</div>
 				</li>
 			</ul>
@@ -409,10 +432,17 @@
 				</div>
 			</div>
 		</div>
+		<!--<div class="no-store" ng-if="store.length == 0">-->
+			<!--<span><i class="fa fa-smile-o fa-lg"></i>  亲！您还没有关注店铺,赶快去关注吧！</span>-->
+		<!--</div>-->
 		<div class="no-store" ng-if="store.length == 0">
-			<span><i class="fa fa-smile-o fa-lg"></i>  亲！您还没有关注店铺,赶快去关注吧！</span>
+			<img src="static/img/all/empty-cart.png">
+			<p>
+				<span>暂无店铺关注</span>
+				<br>
+				<a href="/">马上去逛一逛</a>
+			</p>
 		</div>
-		
 	</div>
 </div>
 <div class="com-del-box" ng-if="deleteDiv">

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

@@ -128,8 +128,8 @@
                     </tr>
 
                     </tbody>
-                    <tbody>
-                        <tr ng-if="!$data">
+                    <tbody ng-if="$data.length == 0">
+                        <tr>
                             <td colspan="12">
                                 <div class="empty">
                                     <p class="empty-img">

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

@@ -102,7 +102,7 @@
                             <td>
                             </td>
                         </tr>
-                        <tr ng-if="!$data">
+                        <tr ng-if="$data.length == 0">
                             <td colspan="12">
                                 <!--<div class="col-xs-offset-3 col-xs-2">-->
                                     <!--<img src="static/img/all/empty-cart.png">-->

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

@@ -215,6 +215,7 @@
 		overflow: hidden;
 		margin: 0!important;
 		width:100%;
+		height:395px;
 		display:inline-flex;
 		justify-content:center;
 		align-items: center;
@@ -275,35 +276,35 @@
 						<th width="120">操作</th>
 					</tr>
 					</thead>
-					<!--<tbody>-->
-					<!--<tr ng-repeat="rule in $data">-->
-						<!--<td ng-bind="rule.num">22</td>-->
-						<!--<td ng-bind="deliveryMethod[rule.shippingMethod]">第三方配送</td>-->
-						<!--<td ng-bind="rule.ruleName">深圳市内满100元包邮，不满1000元邮费20元不满1000元</td>-->
-						<!--<td>-->
-							<!--<p class="switch">-->
-								<!--<span class="checkbox" ng-click="changeActive(rule.id, true)" ng-if="rule.active == 0">-->
-									<!--<span><em></em></span>-->
-								<!--</span>-->
-								<!--<span class="checkbox active" ng-click="changeActive(rule.id, false)" ng-if="rule.active == 1">-->
-										<!--<span><em></em></span>-->
-								<!--</span>-->
-							<!--</p>-->
-						<!--</td>-->
-						<!--<td>-->
-							<!--&lt;!&ndash;ui-sref="vendor_deliveryRule_add({ruleModify:{{turnToJson(rule)}}})"&ndash;&gt;-->
-							<!--<a ng-click="editRule(rule)">修改</a> | <a ng-click="showDeleteFrame(rule)">删除</a>-->
-						<!--</td>-->
-					<!--</tr>-->
+					<tbody>
+				<tr ng-repeat="rule in $data">
+					<td ng-bind="rule.num">22</td>
+					<td ng-bind="deliveryMethod[rule.shippingMethod]">第三方配送</td>
+					<td ng-bind="rule.ruleName">深圳市内满100元包邮，不满1000元邮费20元不满1000元</td>
+					<td>
+						<p class="switch">
+								<span class="checkbox" ng-click="changeActive(rule.id, true)" ng-if="rule.active == 0">
+									<span><em></em></span>
+								</span>
+							<span class="checkbox active" ng-click="changeActive(rule.id, false)" ng-if="rule.active == 1">
+										<span><em></em></span>
+								</span>
+						</p>
+					</td>
+					<td>
+						<!--ui-sref="vendor_deliveryRule_add({ruleModify:{{turnToJson(rule)}}})"-->
+						<a ng-click="editRule(rule)">修改</a> | <a ng-click="showDeleteFrame(rule)">删除</a>
+					</td>
+				</tr>
 
-					<!--<tr class="record-num" ng-if="$data">-->
-						<!--<td colspan="5">-->
-							<!--<span class="count-tip">显示 1-10 条,共 <em ng-bind="$data.length" style="color: #5078cb">2506</em> 条</span>-->
-						<!--</td>-->
-					<!--</tr>-->
-					<!--</tbody>-->
-					<tbody class="no-record-list" >
-						<tr class="height200">
+				<tr class="record-num" ng-if="$data">
+					<td colspan="5">
+						<span class="count-tip">显示 1-10 条,共 <em ng-bind="$data.length" style="color: #5078cb">2506</em> 条</span>
+					</td>
+				</tr>
+				</tbody>
+					<tbody class="no-record-list" ng-if="$data.length == 0">
+						<tr>
 							<td colspan="12">
 								<div class="empty">
 									<p class="empty-img">

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

@@ -613,7 +613,7 @@
 						</td>
 					</tr>
 					</tbody>
-					<tbody ng-if="!currenctMaterial">
+					<tbody ng-if="currenctMaterial.length == 0">
 					<tr>
 						<td colspan="12">
 							<div class="empty">

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

@@ -961,6 +961,31 @@
 	.sellOder .reply-box .vendor-modal-header .modal-first-rate .check-act .rate-radio-label.active {
 		background-position: -12px 3px;
 	}
+
+	/**/
+	#sellOder .oder_list dl.all_oder .no-price{
+		width:100%;
+		height:342px;
+		display:inline-flex;
+		justify-content: center;
+		align-items: center;
+		background: white;
+	}
+	#sellOder .oder_list dl.all_oder .no-price p{
+		padding-top:10px;
+		font-size: 14px;
+		color: #999;
+		margin-left:15px;
+		line-height: 28px;
+		width:200px;
+	}
+	#sellOder .oder_list dl.all_oder .no-price p a{
+		color: #5078cb;
+		display: block;
+		background: url(static/img/all/icon_nianxian.jpg)no-repeat;
+		background-position: 0px 7px;
+		padding-left: 25px;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
@@ -1226,13 +1251,21 @@
 						</div>
 					</div>
 				</div>
-				<div ng-if="purchases.length == 0 || !purchases" class="text-center" style="font-size: 14px;height: 180px;line-height: 50px; padding: 35px 0;">
-					<div class="col-xs-offset-3 col-xs-2">
-						<img src="static/img/all/empty-cart.png">
-					</div>
-					<div class="col-xs-4">
-						<p class="grey f16">暂无订单信息</p>
-					</div>
+				<!--<div ng-if="purchases.length == 0 || !purchases" class="text-center" style="font-size: 14px;height: 180px;line-height: 50px; padding: 35px 0;">-->
+					<!--<div class="col-xs-offset-3 col-xs-2">-->
+						<!--<img src="static/img/all/empty-cart.png">-->
+					<!--</div>-->
+					<!--<div class="col-xs-4">-->
+						<!--<p class="grey f16">暂无订单信息2131</p>-->
+					<!--</div>-->
+				<!--</div>-->
+				<div class="no-price" ng-if="purchases.length == 0 || !purchases">
+					<img src="static/img/all/empty-cart.png">
+					<p>
+						暂无订单信息
+						<br>
+						<a href="/">马上去逛一逛</a>
+					</p>
 				</div>
 				<!--<p class="height16" style="background: #f5f5f5;">&nbsp</p>-->
 				<div class="ng-cloak ng-table-pager" style="float: right;margin-right: 60px;" ng-if="AllOrderInfo.totalPages>1">