产品导入查看大图样式修复

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

@@ -210,7 +210,7 @@
 		padding-bottom: 20px;
 	}
 	.wanted_list01 .pagination{
-		margin: 15px 0;
+		margin: 0;
 	}
 	.ng-table-pager{
 		padding-bottom: 20px;
@@ -601,7 +601,7 @@
 						<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件，”原厂型号“将会显示为空且不可上架售卖，<br/>
 						如需上架可先点击 【匹配】按钮，若匹配不成功，可前往<a ui-sref="vendor_brand_apply" target="_blank"> 品牌申请/</a><a ui-sref="vendor_component_apply" target="_blank">器件申请</a>，提出申请
 					</div>
-					<div ng-if="currenctMaterial.length != 0">显示{{(param.currentPage - 1) * 10 + 1}}-<!--<span ng-bind="materialAll.size"></span>-->{{ param.currentPage * 10 }}，共：<span ng-bind="materialAll.totalElements" cl style="color: #5078cb;"></span>个</div>
+					<div ng-if="currenctMaterial.length != 0">显示 {{(param.currentPage - 1) * 10 + 1}}-<!--<span ng-bind="materialAll.size"></span>-->{{ param.currentPage * 10 }}， 共： <span ng-bind="materialAll.totalElements" cl style="color: #5078cb;"></span> 个</div>
 				</div>
 				<div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px;" ng-if="materialAll.totalPages>1">
 					<ul class="pagination ng-table-pagination">

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

@@ -138,59 +138,6 @@
     .add_category .sale-label input[type="radio"] {
         display: none;
     }
-
-    #image-box .x-close-wrap {
-        position: fixed;
-        top: 0;
-        right: 0;
-        z-index: 100000;
-        width: 120px;
-        height: 120px;
-        margin: -60px -60px 0 0;
-        border-radius: 100%;
-        background: #000;
-        opacity: .3;
-    }
-
-    #image-box .x-floating-wrap {
-        position: fixed;
-        z-index: 99998;
-        background: #000;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        opacity: 0.5;
-    }
-
-    #image-box .x-floating {
-        position: fixed;
-        z-index: 99999;
-        top: 60px;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        text-align: center;
-        vertical-align: middle;
-    }
-
-    #image-box .x-floating img {
-        margin: auto auto;
-        max-width: 100%;
-        max-height: 80%;
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-    }
-
-    #image-box .x-close-wrap a {
-        position: absolute;
-        left: 25px;
-        bottom: 25px;
-        font-size: 42px;
-        color: #fff;
-    }
     .user_right a.blue-bg{
         color: #fff !important;
     }
@@ -297,15 +244,6 @@
                     <p>第一步，下载Excel模板<i class="icon-angle-up"></i></p>
                     <div class="add_category">
                         <div>下载库存Excel模板，在模板上编辑商品信息，<a ng-click="showImg()" style="color: #e64040">查看表格示例</a></div>
-                        <div id="image-box" style="display: none;">
-                            <div class="x-close-wrap" title="关闭">
-                                <a href="javascript:void(0);">×</a>
-                            </div>
-                            <div class="x-floating-wrap"></div>
-                            <div class="x-floating">
-                                <img src="http://static.ubtoc.com/img/product/excel_releaseByBatch_eg.png">
-                            </div>
-                        </div>
                         <div class="load_tab"><a href="javascript:void(0)" ng-click="download()" class="blue-bg">下载库存模板</a></div>
                     </div>
                 </div>
@@ -434,3 +372,12 @@
         </div>
     </div>
 </div>
+<div id="image-box" style="display: none">
+    <div class="x-floating-wrap"></div>
+    <div class="x-floating">
+        <div id="item-content">
+            <div class="x-close-wrap"><a href="javascript:void(0);">×</a></div>
+            <div class="img"><img src="http://static.ubtoc.com/img/product/excel_releaseByBatch_eg.png"></div>
+        </div>
+    </div>
+</div>