验收修改情况处理

src/main/webapp/resources/view/store/default/goodslist.html

@@ -354,17 +354,15 @@
 						</div>
 					</td>
 				</tr>
-				<tr ng-if="$data.length == 0">
-					<td colspan="10">
-						<div class="text-center">
-							<div class="col-xs-offset-3 col-xs-2">
+				<tr ng-if="!$data">
+					<td colspan="12">
+						<div class="empty">
+							<p class="empty-img">
 								<img src="static/img/all/empty-cart.png">
-							</div>
-							<div class="col-xs-4 text-right txt-info">
-								<p class="grey f14" style="line-height: 80px; text-align: left; margin-top: 70px;">
-									暂无器件信息
-									<a href="/" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去逛一逛</a>
-								</p>
+							</p>
+							<div class="empty-info">
+								<p class="grey"> 暂无器件信息 </p>
+								<a href="/"><i class="fa fa-mail-reply fa-xs"></i>马上去逛一逛</a>
 							</div>
 						</div>
 					</td>
@@ -374,3 +372,31 @@
 		</div>
 	</div>
 </div>
+<style>
+	/**/
+	.goodslist .empty{
+		overflow: hidden;
+		margin: 0!important;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		height:200px;
+	}
+	.goodslist .empty-info{
+		line-height: 14px;
+		padding-top:10px;
+		margin-left:10px;
+	}
+	.goodslist .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.goodslist .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.goodslist .empty .empty-info i{
+		margin-right:5px;
+	}
+</style>

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

@@ -138,16 +138,6 @@ td {
 	cursor : pointer!important;
 	color : #5078cb;
 }
-.no-collect{
- 	height: 200px;
-	text-align: center;
-    background: white;  
-}
-.no-collect span{
-	line-height: 200px;
-	font-size: 14px;
-	color:#999;
-}
 .com-del-box{
 	position: fixed;
 	z-index: 2;
@@ -236,6 +226,29 @@ td {
 	background: #fff;
 	padding: 0 5px;
 }
+
+.no-collect{
+	height: 255px;
+	width:100%;
+	display:inline-flex;
+	justify-content: center;
+	align-items: center;
+	background: white;
+}
+.no-collect p{
+	padding-top:10px;
+	font-size: 14px;
+	color: #999;
+	margin-left:15px;
+	line-height: 28px;
+}
+.no-collect 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">
@@ -280,9 +293,11 @@ td {
 	
 	<div class="no-collect" ng-if="collectInfo.length == 0">
 		<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>
+		<p>
+			<span>暂无店铺关注</span>
+			<br>
+			<a href="/">马上去逛一逛</a>
+		</p>
 	</div>
 	
 	<!-- <table ng-table="componentTableParams"

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

@@ -48,6 +48,31 @@
 		border-radius: inherit;
 		margin-top: 12px;
 	}
+	/**/
+	.no-record-list .empty{
+		width:100%;
+		overflow: hidden;
+		height:100px;
+		margin: 0!important;
+		display:inline-flex;
+		justify-content: center;
+	}
+	.no-record-list .empty-info{
+		line-height: 28px;
+		padding-top:30px;
+		margin-left:10px;
+	}
+	.no-record-list .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.no-record-list .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.no-record-list .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="account_manager">
@@ -163,7 +188,7 @@
 		<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="modifyAddress()"><i class="fa fa-plus-square"></i>新增收货地址</button></div>
 		<div class="log-tab">
-			<table class="table">
+			<table class="table" style="table-layout: auto">
 				<thead>
 				<tr>
 					<th class="text-left" width="200">联系人</th>
@@ -189,10 +214,18 @@
 				</tr>
 				</tbody>
 				<tbody class="no-record-list" ng-if="addressList.length <= 0 || !addressList">
-				<tr class="height200">
-					<td colspan="4" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span>暂无收货地址，赶快去新增吧！
-					<a href="user#/accountManager" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;返回上一级</a>
-					</span></td>
+				<tr>
+					<td colspan="12" style="border: #fff 1px solid">
+						<div class="empty">
+							<p class="empty-img">
+								<img src="static/img/all/empty-cart.png">
+							</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>-->
+							</div>
+						</div>
+					</td>
 				</tr>
 				</tbody>
 			</table>

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

@@ -361,19 +361,32 @@
        border-bottom-left-radius: 4px;
        box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
        transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-   }
-    .no-store{
-        background: #fff;
-        height: 60px;
-        text-align: center;
-    }
-   .no-store span{
-       line-height: 60px;
-       font-size: 16px;
    }
     .history-list01 ul li a.delete:hover{
         color : #5078cb;
     }
+   .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="history user_right fr">
     <div class="rt_menu">
@@ -447,9 +460,11 @@
     </div>
     <div class="no-store" ng-if="history.length == 0">
         <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>
+        <p>
+            <span>暂无浏览历史</span>
+            <br>
+            <a href="/">马上去逛一逛</a>
+        </p>
     </div>
    <!-- <p class="height16" style="background: #f5f5f5;">&nbsp</p>-->
    <!-- <div class="history-list02">

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

@@ -446,6 +446,27 @@
         -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
        /* -webkit-box-shadow: 0 0 0px 1000px white inset;*/
     }
+    .ticket_record .empty{
+        overflow: hidden;
+        margin: 0!important;
+        display:inline-flex;
+        align-items: center;
+    }
+    .ticket_record .empty-info{
+        line-height: 28px;
+        width: 143px;
+    }
+    .ticket_record .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .ticket_record .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .ticket_record .empty .empty-info i{
+        margin-right:5px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">
@@ -500,10 +521,19 @@
                         </span>
                     </dd>
                     <dd ng-if="invoices.length == 0 || !invoices" class="text-center invoice-box" style="font-size: 12px;line-height: 200px;height: 200px; border: none!important;">
-                        <img src="static/img/all/empty-cart.png">
-                        <span style="width: auto;float: right;line-height: 200px;color: #999;position: relative;right: 390px;font-size: 12px">暂无开票
-                            <a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;返回上一级</a>
-                        </span>
+                        <!--<img src="static/img/all/empty-cart.png">-->
+                        <!--<span style="width: auto;float: right;line-height: 200px;color: #999;position: relative;right: 390px;font-size: 12px">暂无开票-->
+                            <!--<a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;返回上一级</a>-->
+                        <!--</span>-->
+                        <div class="empty">
+                            <p class="empty-img">
+                                <img src="static/img/all/empty-cart.png">
+                            </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>
+                            </div>
+                        </div>
                     </dd>
                 </dl>
             </div>

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

@@ -152,6 +152,28 @@ body div.ng-table-pager a.page-a {
 .ng-table-pagination .page-a:hover {
     background: #5078cb!important;
 }
+/**/
+.no-record-list .empty{
+    overflow: hidden;
+    margin: 0!important;
+    display:inline-flex;
+    align-items: center;
+}
+.no-record-list .empty-info{
+    line-height: 28px;
+    width: 143px;
+}
+.no-record-list .empty-info .grey{
+    color: #999;
+    font-size: 14px;
+}
+.no-record-list .empty .empty-info>a{
+    font-size: 14px;
+    color: #5078cb;
+}
+.no-record-list .empty .empty-info i{
+    margin-right:5px;
+}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">
@@ -216,7 +238,17 @@ body div.ng-table-pager a.page-a {
                     </tbody>
                     <tbody class="no-record-list" ng-if="orderData.length <= 0 || !orderData">
                         <tr class="height200">
-                            <td colspan="4" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span>暂无可开票订单</span></td>
+                            <td colspan="12">
+                                <div class="empty">
+                                    <p class="empty-img">
+                                        <img src="static/img/all/empty-cart.png">
+                                    </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>
+                                    </div>
+                                </div>
+                            </td>
                         </tr>
                     </tbody>
                 </table>

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

@@ -161,6 +161,31 @@
         font-size: 14px;
         color: #fff;
     }
+    /**/
+    .logistics_list_xq .empty{
+        overflow: hidden;
+        margin: 0!important;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+    }
+    .logistics_list_xq .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+    }
+    .logistics_list_xq .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .logistics_list_xq .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .logistics_list_xq .empty .empty-info i{
+        margin-right:5px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr">
@@ -236,9 +261,14 @@
                             <dl ng-if="logisticsInfo.length != 0">
                                 <dd ng-if="logisticsInfo.length != 0" ng-repeat="info in logisticsInfo"><em ng-class="{ active : $index ==logisticsInfo.length - 1}"></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
                             </dl>
-                            <div class="no-record text-center f14" ng-if="logisticsInfo.length == 0">
-                                暂时获取不到您订单的的物流信息
-                                <a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;"><i class="fa fa-mail-reply"></i>&nbsp;返回上一级</a>
+                            <div class="empty">
+                                <p class="empty-img">
+                                    <img src="static/img/all/empty-cart.png">
+                                </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>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -577,7 +577,7 @@
 		<!--物流信息-->
 		<div class="logistics_list01" ng-if="purchase.status != 602 && purchase.status != 603 && purchase.status != 604 && purchase.status != 605 && purchase.status != 606 && purchase.status != 315">
 			<div class="log_menu">
-				<span>物流信息<em ng-hide="hasInfo" ng-if="purchase.status == 501 || purchase.status == 502 || purchase.status == 504 || purchase.status == 406 || purchase.status == 603" class="color666">（暂无物流信息）</em>
+				<span>物流信息
 					<b ng-if="logistics.companyName">物流公司：{{logistics.companyName || '空'}}&nbsp;&nbsp;&nbsp;物流单号：{{logistics.number || '空'}}</b>
 				</span>
 			</div>
@@ -586,15 +586,19 @@
 					<dd ng-repeat="info in logisticsInfo"><em></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
 				</dl>
 			</div>
-			<!--<div class="logistics_list_xq" ng-if="!hasInfo&&(purchase.status != 501 && purchase.status != 502 && purchase.status != 504 && purchase.status != 406)">-->
-			<div class="logistics_list_xq" ng-if="!hasInfo && !noLogisticInfoArray[purchase.status]">
-				<div ng-if="canShowInfo" style="text-align:center;height: 50px;line-height: 50px;font-size: 14px;">{{purchase.status | noLogisticFilter}}</div>
-				<div ng-if="!canShowInfo" style="text-align:center;height: 50px;line-height: 50px;font-size: 14px; color: #b0b0b0;">系统无法提供此物流信息，请根据物流单号到相应的官网查询。</div>
+			<div class="logistics_list_xq" ng-if="!hasInfo&&(purchase.status != 501 && purchase.status != 502 && purchase.status != 504 && purchase.status != 406)">
+				<div class="logistics_list_xq" ng-if="!hasInfo && !noLogisticInfoArray[purchase.status]">
+					<div ng-if="canShowInfo" style="text-align:center;height: 50px;line-height: 50px;font-size: 14px;">{{purchase.status | noLogisticFilter}}</div>
+					<div ng-if="!canShowInfo" style="text-align:center;height: 50px;line-height: 50px;font-size: 14px; color: #b0b0b0;">系统无法提供此物流信息，请根据物流单号到相应的官网查询。</div>
+				</div>
+			</div>
+			<div style="width:100%;text-align: center;" ng-hide="hasInfo" ng-if="purchase.status == 501 || purchase.status == 502 || purchase.status == 504 || purchase.status == 406 || purchase.status == 603">
+				<em style="font-size: 14px; color:#999;line-height: 70px;">暂无物流信息</em>
 			</div>
 		</div>
 		<!--订单信息-->
 		<div class="logistics_list01">
-			<div class="log_menu"><span>发票信息<em ng-if="purchase.invoicetype==1207" class="color666">（暂不开票）</em></span></div>
+			<div class="log_menu"><span>发票信息</span></div>
 			<div class="oder_xq clearfix" style="padding-bottom: 20px;" ng-if="purchase.invoicetype==1205 || purchase.invoicetype == 1206">
 				<p>
 					<b>发票类型：</b>
@@ -639,6 +643,9 @@
 					<span ng-if="!purchase.invoiceInfo.area">空</span>
 				</p>
 			</div>
+			<div style="width:100%;text-align: center;" ng-if="purchase.invoicetype==1207">
+				<em style="font-size: 14px; color:#999;line-height: 70px;">暂不开票</em>
+			</div>
 		</div>
 	</div>
 </div>

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

@@ -33,6 +33,32 @@
         background: #fff;
         display: inline-block;
     }
+    /**/
+    .wanted_list01 .empty{
+        overflow: hidden;
+        margin: 0!important;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+        height:420px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+    }
+    .wanted_list01 .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .wanted_list01 .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .wanted_list01 .empty .empty-info i{
+        margin-right:5px;
+    }
 </style>
 <div class="user_right fr">
     <div class="brand wanted">
@@ -100,18 +126,22 @@
                             </div>
                         </td>
                     </tr>
-                    <tr ng-if="$data.length == 0">
-                        <td colspan="10" class="text-center"
-                            style="line-height: 40px; font-size: 20px; padding: 59px 0; border-bottom: none">
-                            <div class="col-xs-offset-3 col-xs-2">
-                                <img src="static/img/all/empty-cart.png">
-                            </div>
-                            <div class="col-xs-4 text-right">
-                                <p class="grey f14" style="color:#999;">暂无品牌申请记录
-                                    <a href="vendor#/brand/apply/" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a></p>
-                            </div>
-                        </td>
-                    </tr>
+
+                    </tbody>
+                    <tbody>
+                        <tr ng-if="!$data">
+                            <td colspan="12">
+                                <div class="empty">
+                                    <p class="empty-img">
+                                        <img src="static/img/all/empty-cart.png">
+                                    </p>
+                                    <div class="empty-info">
+                                        <p class="grey"> 暂无品牌申请记录 </p>
+                                        <a href="/vendor#/brand/apply/"><i class="fa fa-upload"></i>马上去上传</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
                     </tbody>
                 </table>
             </div>

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

@@ -102,15 +102,24 @@
                             <td>
                             </td>
                         </tr>
-                        <tr ng-if="$data.length == 0">
-                            <td colspan="10" class="text-center" style="line-height: 180px; border-bottom: none">
-                                <div class="col-xs-offset-3 col-xs-2">
-                                    <img src="static/img/all/empty-cart.png">
-                                </div>
-                                <div class="col-xs-4 text-right">
-                                    <p class="grey f14">暂无器件申请记录
-                                        <a href="vendor#/component/apply" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a></p>
+                        <tr ng-if="!$data">
+                            <td colspan="12">
+                                <!--<div class="col-xs-offset-3 col-xs-2">-->
+                                    <!--<img src="static/img/all/empty-cart.png">-->
+                                <!--</div>-->
+                                <!--<div class="col-xs-4 text-right">-->
+                                    <!--<p class="grey f14">暂无器件申请记录-->
+                                        <!--<a href="vendor#/component/apply" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a></p>-->
+                                    <!--</p>-->
+                                <!--</div>-->
+                                <div class="empty">
+                                    <p class="empty-img">
+                                        <img src="static/img/all/empty-cart.png">
                                     </p>
+                                    <div class="empty-info">
+                                        <p class="grey"> 暂无器件申请记录 </p>
+                                        <a href="/vendor#/component/apply"><i class="fa fa-upload fa-xs"></i>马上去上传</a>
+                                    </div>
                                 </div>
                             </td>
                         </tr>
@@ -120,4 +129,32 @@
             </div>
         </div>
     </div>
-</div>
+</div>
+<style>
+    /**/
+    .wanted_list01 .empty{
+        overflow: hidden;
+        margin: 0!important;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+        height:380px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+    }
+    .wanted_list01 .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .wanted_list01 .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .wanted_list01 .empty .empty-info i{
+        margin-right:5px;
+    }
+</style>

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

@@ -210,6 +210,31 @@
 	.ng-table-pager{
 		margin-right: 0 !important;
 	}
+	/**/
+	.no-record-list .empty{
+		overflow: hidden;
+		margin: 0!important;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+	}
+	.no-record-list .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+	}
+	.no-record-list .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.no-record-list .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.no-record-list .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -250,36 +275,46 @@
 						<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>
-							<!--ui-sref="vendor_deliveryRule_add({ruleModify:{{turnToJson(rule)}}})"-->
-							<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>-->
+							<!--&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>-->
 
-					<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="rules.length == 0">
+					<!--<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">
-							<td colspan="10"><img src="static/img/all/empty-cart.png"><span style="font-size: 14px;color:#999;">暂无配送规则,赶快去新增吧！ <a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;返回上一页</a></span></td>
+							<td colspan="12">
+								<div class="empty">
+									<p class="empty-img">
+										<img src="static/img/all/empty-cart.png">
+									</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>-->
+									</div>
+								</div>
+							</td>
 						</tr>
 					</tbody>
 				</table>

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

@@ -146,6 +146,31 @@
 		position: relative;
 		top: -2px;
 	}
+	/**/
+	.distributor-content .empty{
+		overflow: hidden;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		margin-top:150px;
+	}
+	.distributor-content .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+	}
+	.distributor-content .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.distributor-content .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.distributor-content .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -170,10 +195,14 @@
 					<i class="fa fa-minus-circle" ng-if="data.isOpen" ng-click="delete_distributor(data)"></i>
 				</li>
 			</ul>
-			<div  class="text-center" ng-if="!data_list">
-				<img src="static/img/all/empty-cart.png">
-				<span style="font-size: 14px;color:#999;">暂无配送商,赶快去新增吧！
-					<a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;color:#5078cb;line-height: 200px;"><i class="fa fa-mail-reply"></i>&nbsp;返回上一页</a></span>
+			<div class="empty" ng-if="!data_list">
+				<p class="empty-img">
+					<img src="static/img/all/empty-cart.png">
+				</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>-->
+				</div>
 			</div>
 		</div>
 	</div>

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

@@ -11,6 +11,32 @@
 		position: relative;
 		top: 1px;
 	}
+	/**/
+	.logistic-content .empty{
+		overflow: hidden;
+		margin: 0!important;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		height:320px;
+	}
+	.logistic-content .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+	}
+	.logistic-content .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.logistic-content .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.logistic-content .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -55,7 +81,18 @@
 					</tbody>
 					<tbody ng-if="!addressList">
 					<tr>
-						<td colspan="10"><img src="static/img/all/empty-cart.png"><span style="font-size: 14px;color:#999;">暂无发货地址,赶快去新增吧！ <a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;color:#5078cb;line-height: 200px;"><i class="fa fa-mail-reply"></i>&nbsp;返回上一页</a></span></td>
+						<td colspan="12">
+							<!--<img src="static/img/all/empty-cart.png"><span style="font-size: 14px;color:#999;">暂无发货地址,赶快去新增吧！ <a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;color:#5078cb;line-height: 200px;"><i class="fa fa-mail-reply"></i>&nbsp;返回上一页</a></span>-->
+							<div class="empty">
+								<p class="empty-img">
+									<img src="static/img/all/empty-cart.png">
+								</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>-->
+								</div>
+							</div>
+						</td>
 					</tr>
 					</tbody>
 				</table>

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

@@ -463,7 +463,7 @@
 		<div class="wanted_list01">
 			<!--在售产品-->
 			<div class="tab">
-				<table class="public-tab table">
+				<table class="public-tab table" style="table-layout: auto">
 					<thead>
 					<tr>
 						<th width="80">序号</th>
@@ -613,17 +613,17 @@
 						</td>
 					</tr>
 					</tbody>
-					<tbody ng-if="currenctMaterial.length == 0">
-					<tr style="height: 190px;">
-						<td colspan="7" style="border-bottom: none;">
-							<div class="col-xs-2"  style="margin-left: 34%; margin-top: 65px;">
-								<img src="static/img/all/empty-cart.png">
-							</div>
-							<div class="col-xs-4 text-right">
-								<p class="grey f14" style="line-height: 80px; text-align: left; margin-top: 70px;">
-									暂无产品信息，赶快上传让更多人看到你的产品吧！
-									<a href="vendor#/vendor_upload" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a>
+					<tbody ng-if="!currenctMaterial">
+					<tr>
+						<td colspan="12">
+							<div class="empty">
+								<p class="empty-img">
+									<img src="static/img/all/empty-cart.png">
 								</p>
+								<div class="empty-info">
+									<p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
+									<a href="/vendor#/vendor_upload"><i class="fa fa-upload"></i>马上去上传</a>
+								</div>
 							</div>
 						</td>
 					</tr>
@@ -665,3 +665,30 @@
 		<div><a ng-click="cancleDelete()">取消</a><a ng-click="confirmDelete()">确认</a></div>
 	</div>
 </div>
+<style>
+	/**/
+	.wanted_list01 .empty{
+		overflow: hidden;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		height:285px;
+	}
+	.wanted_list01 .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+	}
+	.wanted_list01 .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.wanted_list01 .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.wanted_list01 .empty .empty-info i{
+		margin-right:5px;
+	}
+</style>

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

@@ -795,19 +795,30 @@
                     </tbody>
                     <tbody ng-if="!currenctGoods || currenctGoods.length <= 0">
                     <tr style="height: 252px;">
-                        <td colspan="10" style="padding: 74px 0;">
-                            <div style="line-height: 106px;">
-                                <div class="col-xs-2" style="margin-left: 35%;">
+                        <td colspan="12">
+                            <div class="empty">
+                                <p class="empty-img">
                                     <img src="static/img/all/empty-cart.png">
-                                </div>
-                                <div class="col-xs-4 text-right" style="line-height: 124px;">
-                                    <p class="grey f14">
-                                        暂无产品信息，赶快上传让更多人看到你的产品吧！
-                                        <a href="vendor#/vendor_upload" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a>
-                                    </p>
+                                </p>
+                                <div class="empty-info">
+                                    <p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
+                                    <a href="/vendor#/vendor_upload"><i class="fa fa-upload"></i>马上去上传</a>
                                 </div>
                             </div>
                         </td>
+                        <!--<td colspan="10" style="padding: 74px 0;">-->
+                            <!--<div style="line-height: 106px;">-->
+                                <!--<div class="col-xs-2" style="margin-left: 35%;">-->
+                                    <!--<img src="static/img/all/empty-cart.png">-->
+                                <!--</div>-->
+                                <!--<div class="col-xs-4 text-right" style="line-height: 124px;">-->
+                                    <!--<p class="grey f14">-->
+                                        <!--暂无产品信息，赶快上传让更多人看到你的产品吧！-->
+                                        <!--<a href="vendor#/vendor_upload" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a>-->
+                                    <!--</p>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                        <!--</td>-->
                     </tr>
                     </tbody>
                 </table>
@@ -852,4 +863,31 @@
             <div class="img"><img/></div>
         </div>
     </div>
-</div>
+</div>
+<style>
+    /**/
+    .wanted_list01 .empty{
+        overflow: hidden;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+        height:360px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+    }
+    .wanted_list01 .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .wanted_list01 .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .wanted_list01 .empty .empty-info i{
+        margin-right:5px;
+    }
+</style>

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

@@ -208,6 +208,32 @@
 		background: #3f7ae3;
 		color: #fff;
 	}
+	/**/
+	.takeSelf .empty{
+		overflow: hidden;
+		margin: 0!important;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		height:355px;
+	}
+	.takeSelf .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+	}
+	.takeSelf .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.takeSelf .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.takeSelf .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -266,7 +292,17 @@
 					</tbody>
 					<tbody ng-if="!$data">
 						<tr>
-							<td colspan="10"><img src="static/img/all/empty-cart.png"><span style="font-size: 14px;color:#999;">暂无自提点,赶快去新增吧！ <a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;color:#5078cb;line-height: 200px;"><i class="fa fa-mail-reply"></i>&nbsp;返回上一页</a></span></td>
+							<td colspan="12">
+								<div class="empty">
+									<p class="empty-img">
+										<img src="static/img/all/empty-cart.png">
+									</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>-->
+									</div>
+								</div>
+							</td>
 						</tr>
 					</tbody>
 				</table>