Upd:调整R Service 管理页面样式

src/main/ui/static/incrementalService/templates/partner_incremental_service.html

@@ -46,35 +46,41 @@
     .border-show{
         margin: 4px 0px;
         font-size: 16px;
-    }
-    .service-background:hover{
-        background: #C7CBD0;
-        color: white;
+        border-bottom: 1px solid ;
+        border-bottom-color: #F06101;
+        width: 90%;
+        text-align: center;
+        margin-left: 5%;
     }
     .service-background{
-        cursor:pointer;
-        color: #7C8085;
-        background: #ECF0F5;
         padding-top: 10px ;
-        width: 85%;
-        padding-bottom: 10px;
+        border: 2px solid #F06101;
+        margin: 30px 12%;
         border-radius:10px;
     }
+    .service-info-button{
+        cursor:pointer;
+        height: 35px;
+        line-height: 35px;
+        width: 100% ;
+        text-align: center;
+        color: white;
+    }
 </style>
 <section class="content-header">
-    <h1>Service List</h1>
+    <h1>R Service</h1>
     <ol class="breadcrumb">
-        <li class="active">Service List</li>
+        <li class="active">R Service</li>
     </ol>
 </section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
             <div class="box-solid">
-                <div class="box box-info" ng-style="{'height':windowHeight}">
-                    <div class="box-header">
-                        <div ng-class="{'col-md-3 col-sm-4 col-xs-12 ': serviceAll.length>1, 'col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-2 col-xs-12 ' : serviceAll.length==1}" title="点击查看交易详情" ng-repeat=" service in serviceAll">
-                            <div style="margin:40px 0px 15px 8%" class="service-background" ng-click="queryServiceInfo(service)">
+                <div class="box box-warning" ng-style="{'height':windowHeight}">
+                    <div class="box-header" style="margin-top: 10px">
+                        <div class="col-md-4 col-sm-4 col-xs-12" ng-repeat=" service in serviceAll">
+                            <div class="service-background">
                                 <img class="row img_auto_height_width" ng-src="{{service.logo_url}}">
                                 <div class="row border-show">
                                     <div class="col-md-4 col-sm-4 col-xs-6">
@@ -100,12 +106,18 @@
                                         {{service.incremental_mode==1?service.incremental_rate_value+'%':service.total_incremental_amount}}
                                     </div>
                                 </div>
-                                <div class="row border-show">
+                                <div class="row border-show" style="margin-bottom: 20px;border-bottom: white">
                                     <div class="col-md-4 col-sm-4 col-xs-6">
                                         <label class="label-right ">Status:</label>
                                     </div>
                                     <div class="col-md-8 col-sm-8 col-xs-6">
-                                        <span ng-style="{'color':service.is_valid?'#00A65A':'#DD4B39'}">{{service.is_valid?'启用':'禁用' }}</span>
+                                        <span ng-style="{'color':service.is_valid?'#00A65A':'#DD4B39'}">{{service.is_valid?'已启用':'已禁用' }}</span>
+                                    </div>
+                                </div>
+                                <div class="row border-show" style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
+                                    <div class="col-md-12 col-sm-12 col-xs-12 service-info-button"
+                                         title="点击查看交易详情" ng-click="queryServiceInfo(service)">
+                                       查看详情
                                     </div>
                                 </div>
                             </div>

src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html

@@ -104,13 +104,9 @@
                                         <label>Mode:</label>
                                         <span>{{serviceInfo.incremental_mode==1?'固定手续费':'固定金额扣款' }}</span>
                                     </div>
-                                    <div class="col-sm-3" ng-if="service.incremental_mode==1">
-                                        <label>Rate:</label>
-                                        <span>{{serviceInfo.incremental_rate_value+'%'}}</span>
-                                    </div>
-                                    <div class="col-sm-3" ng-if="service.incremental_mode!=1">
-                                        <label>Total Amount:</label>
-                                        <span>{{serviceInfo.incremental_rate_value}}</span>
+                                    <div class="col-sm-3">
+                                        <label>{{serviceInfo.incremental_mode==1?'Rate':'Amount'}}:</label>
+                                        <span>{{serviceInfo.incremental_mode==1?serviceInfo.incremental_rate_value+'%':serviceInfo.total_incremental_amount}}</span>
                                     </div>
                                     <div class="col-sm-3">
                                         <label>Create Time:</label>
@@ -118,7 +114,7 @@
                                     </div>
                                     <div class="col-sm-3">
                                         <label>Status:</label>
-                                        <span ng-style="{'color':serviceInfo.is_valid?'#00A65A':'#DD4B39'}">{{serviceInfo.is_valid?'启用':'禁用' }}</span>
+                                        <span ng-style="{'color':serviceInfo.is_valid?'#00A65A':'#DD4B39'}">{{serviceInfo.is_valid?'已启用':'已禁用' }}</span>
                                     </div>
                                 </div>
                             </div>

src/main/ui/static/payment/partner/templates/incremental_service.html

@@ -9,7 +9,7 @@
                     <th>Channel</th>
                     <th>Mode</th>
                     <th>Rate Value</th>
-                    <th>Total Amount</th>
+                    <th>Amount</th>
                     <th>Operator</th>
                     <th>Create Time</th>
                     <th>Update Time</th>
@@ -28,7 +28,7 @@
                     <td style="line-height: 80px">{{service.update_time}}</td>
                     <td style="line-height: 80px">
                         <a role="button" ng-click="editServiceChannelDialog(service)" ng-if="'011'|withRole"><i class="fa fa-edit"></i></a> |
-                        <a role="button" ng-click="updateStatus(service)">{{service.is_valid?'Disabled':'Enable'}}</a>
+                        <a role="button" ng-click="updateStatus(service)">{{service.is_valid?'禁用':'启用'}}</a>
                     </td>
                 </tr>
                 </tbody>

src/main/ui/static/payment/partner/templates/partner_detail.html

@@ -296,7 +296,7 @@
                         <a ui-sref=".permission_client">Permissions</a>
                     </li>
                     <li ui-sref-active="active" ng-if="partner.is_valid==1">
-                        <a ui-sref=".incremental_service">Incremental Service</a>
+                        <a ui-sref=".incremental_service">R Service</a>
                     </li>
                 </ul>
                 <div class="tab-content" ui-view>