空状态第一次验收修改

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

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

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

@@ -61,6 +61,7 @@
 		line-height: 28px;
 		padding-top:30px;
 		margin-left:10px;
+		text-align: left;
 	}
 	.no-record-list .empty-info .grey{
 		color: #999;
@@ -222,7 +223,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="user#/accountManager"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
 							</div>
 						</div>
 					</td>

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

@@ -455,6 +455,7 @@
     .ticket_record .empty-info{
         line-height: 28px;
         width: 143px;
+        text-align: left;
     }
     .ticket_record .empty-info .grey{
         color: #999;
@@ -531,7 +532,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="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
                             </div>
                         </div>
                     </dd>

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

@@ -158,25 +158,27 @@ body div.ng-table-pager a.page-a {
     }
 }
 /**/
-.no-record-list .empty{
+.no-invoice .no-invoice-content .empty{
+    width:100%;
     overflow: hidden;
     margin: 0!important;
     display:inline-flex;
     align-items: center;
 }
-.no-record-list .empty-info{
+.no-invoice .no-invoice-content .empty .empty-info{
     line-height: 28px;
     width: 143px;
+    text-align: left;
 }
-.no-record-list .empty-info .grey{
+.no-invoice .no-invoice-content .empty .empty-info .grey{
     color: #999;
     font-size: 14px;
 }
-.no-record-list .empty .empty-info>a{
+.no-invoice .no-invoice-content .empty .empty-info>a{
     font-size: 14px;
     color: #5078cb;
 }
-.no-record-list .empty .empty-info i{
+.no-invoice .no-invoice-content .empty .empty-info i{
     margin-right:5px;
 }
 </style>
@@ -241,22 +243,16 @@ body div.ng-table-pager a.page-a {
                             </td>
                         </tr>
                     </tbody>
-                    <tbody class="no-record-list" ng-if="orderData.length <= 0 || !orderData">
-                        <tr class="height200">
-                            <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>
+                <div class="empty" ng-if="orderData.length <= 0 || !orderData" style="width:100%;overflow: hidden;margin:0!important;display:inline-flex;align-items: center;justify-content: center;height:200px;">
+                    <p class="empty-img">
+                        <img src="static/img/all/empty-cart.png">
+                    </p>
+                    <div class="empty-info" style="margin-left:10px;">
+                        <p class="grey">暂无可开票订单</p>
+                        <a href="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
+                    </div>
+                </div>
             </div>
             <div class="apply-btn" ng-style="$$kdnData.totalElements>10?'margin-top: 100px':''" ng-if="orderData.length > 0">
                 <button ng-click="applyInvoice()">申请开票</button>

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

@@ -267,7 +267,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="user#/order"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
                                 </div>
                             </div>
                         </div>

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

@@ -160,6 +160,33 @@
         font-size: 14px;
         color: #fff;
     }
+
+
+    /**/
+   #empty{
+        overflow: hidden;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+    }
+    #empty .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+        text-align: left;
+    }
+    #empty .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    #empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    #empty .empty-info i{
+        margin-right:5px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr">
@@ -231,9 +258,20 @@
                             <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>-->
                             <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 id="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#/order/center"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -47,6 +47,7 @@
         line-height: 28px;
         padding-top:10px;
         margin-left:10px;
+        text-align:left;
     }
     .wanted_list01 .empty-info .grey{
         color: #999;
@@ -57,7 +58,13 @@
         color: #5078cb;
     }
     .wanted_list01 .empty .empty-info i{
-        margin-right:5px;
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+        position: relative;
+        top: 7px;
     }
 </style>
 <div class="user_right fr">
@@ -137,7 +144,7 @@
                                     </p>
                                     <div class="empty-info">
                                         <p class="grey"> 暂无品牌申请记录 </p>
-                                        <a href="/vendor#/brand/apply/"><i class="fa fa-upload"></i>马上去上传</a>
+                                        <a href="/vendor#/brand/apply/"><i></i>马上去上传</a>
                                     </div>
                                 </div>
                             </td>

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

@@ -118,7 +118,7 @@
                                     </p>
                                     <div class="empty-info">
                                         <p class="grey"> 暂无器件申请记录 </p>
-                                        <a href="/vendor#/component/apply"><i class="fa fa-upload fa-xs"></i>马上去上传</a>
+                                        <a href="/vendor#/component/apply"><i></i>马上去上传</a>
                                     </div>
                                 </div>
                             </td>
@@ -145,6 +145,7 @@
         line-height: 28px;
         padding-top:10px;
         margin-left:10px;
+        text-align:left;
     }
     .wanted_list01 .empty-info .grey{
         color: #999;
@@ -155,6 +156,12 @@
         color: #5078cb;
     }
     .wanted_list01 .empty .empty-info i{
-        margin-right:5px;
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+        position: relative;
+        top: 7px;
     }
 </style>

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

@@ -224,6 +224,7 @@
 		line-height: 28px;
 		padding-top:10px;
 		margin-left:10px;
+		text-align: left;
 	}
 	.no-record-list .empty-info .grey{
 		color: #999;
@@ -312,7 +313,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="vendor#/index"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
 									</div>
 								</div>
 							</td>

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

@@ -195,13 +195,13 @@
 					<i class="fa fa-minus-circle" ng-if="data.isOpen" ng-click="delete_distributor(data)"></i>
 				</li>
 			</ul>
-			<div class="empty" ng-if="!data_list">
+			<div class="empty" ng-if="data_list.length == 0">
 				<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>-->
+					<a href="javascript:history.go(-1)"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
 				</div>
 			</div>
 		</div>

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

@@ -25,6 +25,7 @@
 		line-height: 28px;
 		padding-top:10px;
 		margin-left:10px;
+		text-align:left;
 	}
 	.logistic-content .empty-info .grey{
 		color: #999;
@@ -79,7 +80,7 @@
 						</td>
 					</tr>
 					</tbody>
-					<tbody ng-if="!addressList">
+					<tbody ng-if="addressList.length == 0">
 					<tr>
 						<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>-->
@@ -89,7 +90,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>
 						</td>

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

@@ -629,7 +629,7 @@
 								</p>
 								<div class="empty-info">
 									<p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
-									<a href="/vendor#/vendor_upload"><i class="fa fa-upload"></i>马上去上传</a>
+									<a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
 								</div>
 							</div>
 						</td>
@@ -686,6 +686,7 @@
 		line-height: 28px;
 		padding-top:10px;
 		margin-left:10px;
+		text-align:left;
 	}
 	.wanted_list01 .empty-info .grey{
 		color: #999;
@@ -696,6 +697,12 @@
 		color: #5078cb;
 	}
 	.wanted_list01 .empty .empty-info i{
-		margin-right:5px;
+		display: inline-block;
+		width: 18px;
+		height: 18px;
+		margin-right: 5px;
+		background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+		position: relative;
+		top: 7px;
 	}
 </style>

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

@@ -802,7 +802,7 @@
                                 </p>
                                 <div class="empty-info">
                                     <p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
-                                    <a href="/vendor#/vendor_upload"><i class="fa fa-upload"></i>马上去上传</a>
+                                    <a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
                                 </div>
                             </div>
                         </td>
@@ -878,6 +878,7 @@
         line-height: 28px;
         padding-top:10px;
         margin-left:10px;
+        text-align:left;
     }
     .wanted_list01 .empty-info .grey{
         color: #999;
@@ -888,6 +889,12 @@
         color: #5078cb;
     }
     .wanted_list01 .empty .empty-info i{
-        margin-right:5px;
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+        position: relative;
+        top: 7px;
     }
 </style>

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

@@ -222,6 +222,7 @@
 		line-height: 28px;
 		padding-top:10px;
 		margin-left:10px;
+		text-align: left;
 	}
 	.takeSelf .empty-info .grey{
 		color: #999;
@@ -290,7 +291,7 @@
 							</td>
 						</tr>
 					</tbody>
-					<tbody ng-if="!$data">
+					<tbody ng-if="$data.length == 0">
 						<tr>
 							<td colspan="12">
 								<div class="empty">
@@ -299,7 +300,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>
 							</td>