From 7a124c015c5e1da14c2f7543c02194ef9c2cc50a Mon Sep 17 00:00:00 2001 From: duLingLing Date: Thu, 21 Nov 2019 10:55:11 +0800 Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=AE=E6=94=B9=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/index.html | 2 +- .../partner-incremental-service.js | 4 +- .../partner_incremental_service.html | 65 +++++++++++++++---- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/src/main/ui/index.html b/src/main/ui/index.html index 86826e2da..51dfb9fd3 100644 --- a/src/main/ui/index.html +++ b/src/main/ui/index.html @@ -1040,7 +1040,7 @@ margin-bottom: 10%;"/> -
  • +
  • R Services
    • diff --git a/src/main/ui/static/incrementalService/partner-incremental-service.js b/src/main/ui/static/incrementalService/partner-incremental-service.js index c68338881..5780cdb59 100644 --- a/src/main/ui/static/incrementalService/partner-incremental-service.js +++ b/src/main/ui/static/incrementalService/partner-incremental-service.js @@ -34,7 +34,9 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { $scope.serviceAll.forEach(function(service){ service.logo_url = '/static/images/'+service.channel+'.jpg' }) - $scope.channelOptions = res.data.incremental_channel; + res.data.incremental_channel.forEach(function(channel){ + $scope.channelOptions.push({name:channel,logo_url:'/static/images/'+channel+'.jpg'}) + }) }) } diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html index bc024ecf0..902d02f31 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html @@ -33,8 +33,8 @@ height: 60px; margin: 30px 0px; } - .label-right{ - float: right; + .label-left{ + float: left; } .border-show{ margin: 4px 0px; @@ -42,13 +42,13 @@ border-bottom: 1px solid ; border-bottom-color: #ffb38c; width: 90%; - text-align: center; + text-align: left; margin-left: 5%; } .service-background{ - padding-top: 10px ; + padding-top: 10px; border: 2px solid #F06101; - margin: 30px 14%; + margin: 21px 2%; border-radius:10px; text-align: center; } @@ -73,36 +73,37 @@
    +
    - +
    -
    +
    {{service.channel}}
    - +
    -
    +
    {{service.incremental_mode==1?'固定手续费':'固定金额扣款'}}
    - +
    -
    +
    {{service.incremental_mode==1?service.incremental_rate_value+'%':service.total_incremental_amount}}
    -
    -
    - +
    +
    +
    {{service.is_valid?'已启用':'未启用' }} @@ -116,6 +117,42 @@
    + +
    +
    + +
    +
    + +
    +
    + {{channel.name}} +
    +
    +
    +
    + +
    +
    + 未启用 +
    +
    +
    +
    + +
    +
    + 一站式跨境进口电商SaaS平台，帮您快速构建自己的品牌自营商城系统，直达10亿+中国消费者，快速实现获客和交易变现。 +
    +
    +
    + + 申请开通 + +
    +
    +