Merge branch 'feature-dammyStatas-1106' into dev-mysql

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

@@ -399,6 +399,5 @@
 		color: #5078cb;
 		background: url(static/img/all/icon_nianxian.jpg)no-repeat;
 		padding-left: 25px;
-
 	}
 </style>

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

@@ -49,29 +49,30 @@
 		margin-top: 12px;
 	}
 	/**/
-	.no-record-list .empty{
+	 .empty{
 		width:100%;
 		overflow: hidden;
 		height:100px;
 		margin: 0!important;
 		display:inline-flex;
 		justify-content: center;
+		 align-items: center;
 	}
-	.no-record-list .empty-info{
+	.empty-info{
 		line-height: 28px;
-		padding-top:30px;
+		padding-top:10px;
 		margin-left:10px;
 		text-align: left;
 	}
-	.no-record-list .empty-info .grey{
+	.empty-info .grey{
 		color: #999;
 		font-size: 14px;
 	}
-	.no-record-list .empty .empty-info>a{
+	.empty .empty-info>a{
 		font-size: 14px;
 		color: #5078cb;
 	}
-	.no-record-list .empty .empty-info i{
+	 .empty .empty-info i{
 		margin-right:5px;
 	}
 </style>
@@ -214,22 +215,31 @@
 					</td>
 				</tr>
 				</tbody>
-				<tbody class="no-record-list" ng-if="addressList.length <= 0 || !addressList">
-				<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>
+				<!--<tbody class="no-record-list" ng-if="addressList.length <= 0 || !addressList">-->
+				<!--<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 ng-click="checkTab('base')"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+							<!--</div>-->
+						<!--</div>-->
+					<!--</td>-->
+				<!--</tr>-->
+				<!--</tbody>-->
 			</table>
+			<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="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+				</div>
+			</div>
 		</div>
 	</div>
 </div>

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

@@ -695,14 +695,13 @@
 						</dd>
 					</div>
 				</div>
-				<div class="text-center row"ng-if="cartIsEmpty">
-					<div class="col-xs-offset-3 col-xs-2">
-						<img src="static/img/all/empty-cart.png">
-					</div>
-					<div class="col-xs-5">
-						<p class="grey f16">您的购物车空空如也，请先挑选您想要购买的产品吧！</p>
-						<a href=".">马上去逛一逛</a>&nbsp;<i class="fa fa-arrow-right"></i>
-					</div>
+				<div class="no-store" ng-if="cartIsEmpty">
+					<img src="static/img/all/empty-cart.png">
+					<p>
+						您的购物车空空如也，请先挑选您想要购买的产品吧！
+						<br>
+						<a href="/">马上去逛一逛</a>
+					</p>
 				</div>
 				<p class="height16" ng-if="!cartIsEmpty">&nbsp</p>
 				<dd class="all_price fixed-bottom" ng-if="!cartIsEmpty && countByPage > 4">
@@ -758,6 +757,31 @@
 		</ul>
 	</div>-->
 </div>
+
+<style>
+	.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>
 <script>
 	$(function(){
 		$(window).bind("scroll",function() {

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

@@ -451,11 +451,15 @@
         margin: 0!important;
         display:inline-flex;
         align-items: center;
+        width: 100%;
+        justify-content: center;
+        height: 200px;
     }
     .ticket_record .empty-info{
         line-height: 28px;
         width: 143px;
         text-align: left;
+        margin-left:10px;
     }
     .ticket_record .empty-info .grey{
         color: #999;
@@ -521,22 +525,23 @@
                             <a  ng-click="deleteInvoice(invoice)">删除</a>
                         </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;">
+                    <!--<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>-->
-                        <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="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
-                            </div>
-                        </div>
-                    </dd>
+
+                    <!--</dd>-->
                 </dl>
+                <div class="empty" ng-if="invoices.length == 0 || !invoices">
+                    <p class="empty-img">
+                        <img src="static/img/all/empty-cart.png">
+                    </p>
+                    <div class="empty-info">
+                        <p class="grey"> 暂无发票信息 </p>
+                        <!--<a href="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+                    </div>
+                </div>
             </div>
         </div>
         <!--新增发票 -->

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

@@ -193,7 +193,7 @@
                     </tbody>
                     <tbody class="no-record-list" ng-if="billData.length <= 0 || !billData">
                     <tr class="height200">
-                    <td colspan="9" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span>暂无开票记录</span></td>
+                    <td colspan="9" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span class="f14">暂无开票记录</span></td>
                     </tr>
                     </tbody>
                 </table>

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

@@ -250,7 +250,7 @@ body div.ng-table-pager a.page-a {
                     </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>
+                        <!--<a href="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
                     </div>
                 </div>
             </div>

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

@@ -948,8 +948,8 @@
 						<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>
+						<p class="grey f16" style="font-size: 14px;">暂无订单信息，快去下单吧 </p>
+						<a ng-click="reload()" style="font-size: 14px;">点击重新加载</a>&nbsp;<i class="fa fa-refresh"></i>
 					</div>
 				</div>
 				<!--<p class="height16" style="background: #f5f5f5;" ng-if="currenctOrders.length != 0">&nbsp</p>-->

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="user#/order"><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

@@ -169,6 +169,7 @@
         display:inline-flex;
         justify-content:center;
         align-items: center;
+       height: 135px;
     }
     #empty .empty-info{
         line-height: 28px;
@@ -268,8 +269,8 @@
                                         <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>
+                                        <p class="grey"> 暂时获取不到订单的的物流信息 </p>
+                                        <!--<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-invoice.html

@@ -330,8 +330,8 @@
                     </tr>
                 </tbody>
                 <tbody class="no-record-list" ng-if="!billData || billData.length<=0">
-                <tr class="height200">
-                <td colspan="10" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span>暂无开票申请</span></td>
+                <tr style="height:267px!important;">
+                <td colspan="10" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span class="f14">暂无开票申请</span></td>
                 </tr>
                 </tbody>
             </table>
@@ -391,8 +391,8 @@
                 </tr>
                 </tbody>
                 <tbody class="no-record-list" ng-if="!billData || billData.length<=0">
-                <tr class="height200">
-                <td style="border: #fff 1px solid" colspan="10"><img src="static/img/all/empty-cart.png"><span>暂无开票记录</span></td>
+                <tr style="height:401px!important;">
+                <td style="border: #fff 1px solid" colspan="10"><img src="static/img/all/empty-cart.png"><span class="f14">暂无开票记录</span></td>
                 </tr>
                 </tbody>
             </table>

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

@@ -41,7 +41,7 @@
         display:inline-flex;
         justify-content:center;
         align-items: center;
-        height:420px;
+        height:435px;
     }
     .wanted_list01 .empty-info{
         line-height: 28px;
@@ -133,24 +133,17 @@
                             </div>
                         </td>
                     </tr>
-
-                    </tbody>
-                    <tbody ng-if="$data.length == 0">
-                        <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#/brand/apply/"><i></i>马上去上传</a>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
                     </tbody>
                 </table>
+                <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></i>马上去申请</a>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

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></i>马上去上传</a>
+                                        <a href="/vendor#/component/apply"><i></i>马上去申请</a>
                                     </div>
                                 </div>
                             </td>

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

@@ -95,20 +95,54 @@
                                 <!--</div>-->
                             </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"  style="margin-left: 55px;">
-                                </div>
-                                <div class="col-xs-4">
-                                    <p class="grey f12">您没有申请过标准器件资料</p>
-                                </div>
-                            </td>
-                        </tr>
                         </tbody>
                     </table>
+                    <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></i>马上去申请</a>
+                        </div>
+                    </div>
                 </div>
             </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:360px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+        text-align:left;
+    }
+    .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{
+        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

@@ -317,7 +317,7 @@
 									</p>
 									<div class="empty-info">
 										<p class="grey"> 暂无配送规则,赶快去新增吧 </p>
-										<a href="vendor#/index"><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

@@ -71,7 +71,7 @@
 	.distributor-content {
 		width: 100%;
 		margin: 0 auto;
-		min-height: 489px;
+		min-height: 505px;
 		background: #fff;
 		padding-top: 25px;
 	}
@@ -201,7 +201,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>
 		</div>

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

@@ -87,7 +87,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>
 			</div>

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

@@ -620,22 +620,16 @@
 						</td>
 					</tr>
 					</tbody>
-					<tbody ng-if="currenctMaterial.length == 0">
-					<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></i>马上去上传</a>
-								</div>
-							</div>
-						</td>
-					</tr>
-					</tbody>
 				</table>
+				<div class="empty" ng-if="currenctMaterial.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="/vendor#/vendor_upload"><i></i>马上去上传</a>
+					</div>
+				</div>
 				<div class="record-line text-right" ng-if="currenctMaterial.length != 0">
 					<div class="prompt" ng-show="standard_tab == 'unstandard'">
 						<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件，”原厂型号“将会显示为空且不可上架售卖，<br/>
@@ -680,7 +674,7 @@
 		display:inline-flex;
 		justify-content:center;
 		align-items: center;
-		height:285px;
+		height:305px;
 	}
 	.wanted_list01 .empty-info{
 		line-height: 28px;

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

@@ -216,7 +216,7 @@
 		display:inline-flex;
 		justify-content:center;
 		align-items: center;
-		height:320px;
+		height:370px;
 	}
 	.takeSelf .empty-info{
 		line-height: 28px;
@@ -285,20 +285,20 @@
 								<a ng-click="editTakeSelf(takeSelf)">修改</a>|<a ng-click="showDeleteFrame(takeSelf)">删除</a>
 							</td>
 						</tr>
-						<tr class="record-num">
+						<tr class="record-num" ng-if="$$takeSelf.totalElements != 0">
 							<td colspan="6">
 								<span class="count-tip">显示<span ng-bind="$$takeSelf.start">23</span>-<span ng-bind="$$takeSelf.end">10</span>，共：<span ng-bind="$$takeSelf.totalElements" style="color: #5078cb;">23</span>个</span>
 							</td>
 						</tr>
 					</tbody>
 				</table>
-				<div class="empty" ng-if="$data.length == 0">
+				<div class="empty" ng-if="$$takeSelf.totalElements == 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_undercarriage.html

@@ -706,23 +706,9 @@
                         </td>
                     </tr>
                     </tbody>
-                   <!-- <tbody>
-                    <tr style="height: 252px;" ng-if="!currenctGoods || currenctGoods.length <= 0">
-                        <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" style="line-height: 124px;">
-                                    <p class="grey f16">暂无下架产品信息</p>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    </tbody>-->
                     <tbody class="no-record-list" ng-if="!currenctGoods || currenctGoods.length <= 0">
-                        <tr class="height200">
-                            <td colspan="10"><img src="static/img/all/empty-cart.png"><span>暂无下架产品信息！</span></td>
+                        <tr style="height:378px!important;">
+                            <td colspan="10"><img src="static/img/all/empty-cart.png"><span class="f14">暂无下架产品信息</span></td>
                         </tr>
                     </tbody>
                 </table>

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

@@ -427,7 +427,7 @@
                             </tbody>
                             <tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
                                 <tr class="height200">
-                                    <td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span>暂无产品信息，赶快上传让更多人看到你的产品吧！</span></td>
+                                    <td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span class="f14">暂无产品信息，赶快上传让更多人看到你的产品吧</span></td>
                                 </tr>
                             </tbody>
                         </table>