瀏覽代碼

卖家中心-配送商样式bug调整

yangc 8 年之前
父節點
當前提交
3d474a6a24

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_distributor.html

@@ -110,7 +110,6 @@
 		display: inline-block;
 		width: 137px;
 		height: 40px;
-		text-align: center;
 		vertical-align: middle;
 		font-size: 14px;
 		background: #f0f6ff;
@@ -126,7 +125,8 @@
 		color: #fff;
 	}
 	.send-item span {
-		max-width: 100px;
+		width: 100px;
+		text-align: center;
 		text-overflow: ellipsis;
 		display: inline-block;
 		overflow: hidden;

+ 101 - 79
src/main/webapp/resources/view/vendor/modal/vendor_distributor_manage.html

@@ -156,7 +156,7 @@
         padding: 0 18px;
     }
     /*.dis-manage-bgwhite {*/
-    /*background: white;*/
+        /*background: white;*/
     /*}*/
     .dis-manage-footer-table tr:nth-child(even){
         background: #f1f1f1;
@@ -229,6 +229,13 @@
     .dis-manage-footer-table-tr-td .check-act input{
         display: none;
     }
+    .dis-manage-footer-table-tr-td >span {
+        float: left;
+        max-width: 68px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
     .dis-manage-footer-table-tr-td .check-act label{
         background-position: -48px 0;
     }
@@ -236,86 +243,86 @@
         background-position: -31px 0;
     }
     /*分页样式*/
-    /* ul.pagination.ng-table-pagination > li > a > span {
-         height: 17px;
-         line-height: 17px;
-     }
-     div.ng-table-pager {
-         margin-right: 42px!important;
-         float: right;
-     }
-     div.ng-table-pager  input.page-number {
-         vertical-align: inherit;
-         display: inline-block;
-         width: 40px;
-         height: 31px;
-         padding: 6px 6px;
-         font-size: 14px;
-         line-height: 1.42857143;
-         color: #9B9792;
-         text-align: center;
-         background-color: #F6F5F4;
-         background-image: none;
-         border: 1px solid #ccc;
-         border-top-left-radius: 4px;
-         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;
-     }
+   /* ul.pagination.ng-table-pagination > li > a > span {
+        height: 17px;
+        line-height: 17px;
+    }
+    div.ng-table-pager {
+        margin-right: 42px!important;
+        float: right;
+    }
+    div.ng-table-pager  input.page-number {
+        vertical-align: inherit;
+        display: inline-block;
+        width: 40px;
+        height: 31px;
+        padding: 6px 6px;
+        font-size: 14px;
+        line-height: 1.42857143;
+        color: #9B9792;
+        text-align: center;
+        background-color: #F6F5F4;
+        background-image: none;
+        border: 1px solid #ccc;
+        border-top-left-radius: 4px;
+        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;
+    }
 
-     div.ng-table-pager a.page-a {
-         color: #fff!important;
-         cursor: pointer;
-         background-color: #4574E8;
-         border-color: #4574E8;
-         padding: 6px 6px;
-         font-size: 14px;
-         border-top-right-radius: 4px;
-         border-bottom-right-radius: 4px;
-         text-decoration: none;
-         height: 31px;
-     }
-     div.ng-table-pager a.page-a:hover{
-         color: #fff!important;
-         background-color: #4574E8!important;
-     }
-     div.ng-table-pager div.page-go-block {
-         float: right;
-         margin-left: 20px;
-         margin-top: 20px;
-         font-size: 0px;
-         height: 31px;
-         line-height: 31px;
-     }
+    div.ng-table-pager a.page-a {
+        color: #fff!important;
+        cursor: pointer;
+        background-color: #4574E8;
+        border-color: #4574E8;
+        padding: 6px 6px;
+        font-size: 14px;
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+        text-decoration: none;
+        height: 31px;
+    }
+    div.ng-table-pager a.page-a:hover{
+        color: #fff!important;
+        background-color: #4574E8!important;
+    }
+    div.ng-table-pager div.page-go-block {
+        float: right;
+        margin-left: 20px;
+        margin-top: 20px;
+        font-size: 0px;
+        height: 31px;
+        line-height: 31px;
+    }
 
-     .seller-contact-info {
-         position: absolute;
-         z-index: 2;
-         height: 210px;<!--506-->
-         border: 1px solid #E7E5E2;
-         opacity: 1;
-         background-color: white;
-         width: 600px;
-         top: 40px;
-         left: -549px;
-         border: 1px solid #E7E5E2;
-         -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
-         box-shadow: 0 5px 15px rgba(0,0,0,.5);
-     }
+    .seller-contact-info {
+        position: absolute;
+        z-index: 2;
+        height: 210px;<!--506-->
+        border: 1px solid #E7E5E2;
+        opacity: 1;
+        background-color: white;
+        width: 600px;
+        top: 40px;
+        left: -549px;
+        border: 1px solid #E7E5E2;
+        -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+        box-shadow: 0 5px 15px rgba(0,0,0,.5);
+    }
 
-     .display-none {
-         display: none;
-     }
+    .display-none {
+        display: none;
+    }
 
-     .ng-table-pager .ng-table-pagination a{
-         color: #4574E8 !important;
-         height: 31px;
-     }
+    .ng-table-pager .ng-table-pagination a{
+        color: #4574E8 !important;
+        height: 31px;
+    }
 
-     .ng-table-pager .ng-table-pagination li.active a {
-         background-color: #4574E8;
-         color: white !important;
-     }*/
+    .ng-table-pager .ng-table-pagination li.active a {
+        background-color: #4574E8;
+        color: white !important;
+    }*/
     .dis-manage-footer .check-act label:hover{
         cursor: pointer;
     }
@@ -378,9 +385,9 @@
         <table class="dis-manage-footer-table" ng-table="distributorTableParams">
             <tr class="dis-manage-footer-table-tr dis-manage-bgwhite" ng-repeat="value in showList">
                 <td class="dis-manage-footer-table-tr-td" ng-repeat="data in value" width="120">
-                    <span ng-bind="data.companyName" style="float: left;max-width: 120px;text-overflow: ellipsis;overflow: hidden; white-space: nowrap;"></span>
+                    <span ng-bind="data.companyName"></span>
                     <label class="check-act" style=" float: right;">
-                        <input type="checkbox" id="{{data.code}}" ng-click="ChooseDistributor(data)" ng-checked="selectFlag[data.code].isChoosed"/>
+                        <input type="checkbox" id="{{data.code}}" ng-click="ChooseDistributor(data)" ng-checked="data.isChoosed"/>
                         <label for="{{data.code}}"></label>
                     </label>
                 </td>
@@ -391,7 +398,22 @@
                 </td>
             </tr>
         </table>
-
+        <!--<div class="ng-cloak ng-table-pager" 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">-->
+                    <!--<a ng-switch-when="prev" ng-click="setPage(page.type, -1)" >&laquo;</a>-->
+                    <!--<a ng-switch-when="first" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>-->
+                    <!--<a ng-switch-when="page" ng-click="setPage(page.type, page.number)" ><span ng-bind="page.number"></span></a>-->
+                    <!--<a ng-switch-when="more" ng-click="setPage(page.type, -1)" >&#8230;</a>-->
+                    <!--<a ng-switch-when="last" ng-click="setPage(page.type, page.number)" ><span ng-bind="page.number"></span></a>-->
+                    <!--<a ng-switch-when="next" ng-click="setPage(page.type, -1)" >&raquo;</a>-->
+                <!--</li>-->
+            <!--</ul>-->
+            <!--<div class="page-go-block">-->
+                <!--<input class="page-number" type="text" ng-model="param.currentPage" ng-keydown="listenEnter()"/>-->
+                <!--<a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>-->
+            <!--</div>-->
+        <!--</div>-->
         <div class="dis-manage-footer-btn">
             <span class="dis-manage-footer-save" ng-click="saveChooseList()">保存</span>
             <span class="dis-manage-footer-cancel" ng-click="cancel()">取消</span>