msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upd:修改排版

Browse Source
master
duLingLing 5 years ago
parent 9372017ff8
commit 7a124c015c
3 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
src/main/ui/index.html
Unescape View File

@ -1040,7 +1040,7 @@ margin-bottom: 10%;"/>
</ul> </ul>
</li> </li>
<li class="has-submenu" ng-if="currentUser.has_incremental_setvice" ui-sref-active="active"> <li class="has-submenu" ui-sref-active="active">
<a ui-sref="partnerIncrementalService"><i class="fa fa-plus-square-o"></i>R Services</a> <a ui-sref="partnerIncrementalService"><i class="fa fa-plus-square-o"></i>R Services</a>
</li> </li>

4
src/main/ui/static/incrementalService/partner-incremental-service.js
Unescape View File

@ -34,7 +34,9 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.serviceAll.forEach(function(service){ $scope.serviceAll.forEach(function(service){
service.logo_url = '/static/images/'+service.channel+'.jpg' 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'})
})
}) })
} }

65
src/main/ui/static/incrementalService/templates/partner_incremental_service.html
Unescape View File

@ -33,8 +33,8 @@
height: 60px; height: 60px;
margin: 30px 0px; margin: 30px 0px;
} }
.label-right{ .label-left{
float: right; float: left;
} }
.border-show{ .border-show{
margin: 4px 0px; margin: 4px 0px;
@ -42,13 +42,13 @@
border-bottom: 1px solid ; border-bottom: 1px solid ;
border-bottom-color: #ffb38c; border-bottom-color: #ffb38c;
width: 90%; width: 90%;
text-align: center; text-align: left;
margin-left: 5%; margin-left: 5%;
} }
.service-background{ .service-background{
padding-top: 10px ; padding-top: 10px;
border: 2px solid #F06101; border: 2px solid #F06101;
margin: 30px 14%; margin: 21px 2%;
border-radius:10px; border-radius:10px;
text-align: center; text-align: center;
} }
@ -73,36 +73,37 @@
<div class="box-solid"> <div class="box-solid">
<div class="box box-warning" ng-style="{'height':windowHeight}"> <div class="box box-warning" ng-style="{'height':windowHeight}">
<div class="box-header" style="margin-top: 10px"> <div class="box-header" style="margin-top: 10px">
<!-- 已开通服务展示 -->
<div class="col-md-3 col-sm-3 col-xs-12" ng-repeat=" service in serviceAll"> <div class="col-md-3 col-sm-3 col-xs-12" ng-repeat=" service in serviceAll">
<div class="service-background"> <div class="service-background">
<img class="row img_auto_height_width" ng-src="{{service.logo_url}}"> <img class="row img_auto_height_width" ng-src="{{service.logo_url}}">
<div class="row border-show"> <div class="row border-show">
<div class="col-md-4 col-sm-4 col-xs-6"> <div class="col-md-4 col-sm-4 col-xs-6">
<label class="label-right">Name:</label> <label class="label-left">Name</label>
</div> </div>
<div class="col-md-8 col-sm-8 col-xs-6"> <div class="col-md-8 col-sm-8 col-xs-6 label-left">
{{service.channel}} {{service.channel}}
</div> </div>
</div> </div>
<div class="row border-show"> <div class="row border-show">
<div class="col-md-4 col-sm-4 col-xs-6"> <div class="col-md-4 col-sm-4 col-xs-6">
<label class="label-right ">Mode:</label> <label class="label-left ">Mode</label>
</div> </div>
<div class="col-md-8 col-sm-8 col-xs-6"> <div class="col-md-8 col-sm-8 col-xs-6 label-left">
{{service.incremental_mode==1?'固定手续费':'固定金额扣款'}} {{service.incremental_mode==1?'固定手续费':'固定金额扣款'}}
</div> </div>
</div> </div>
<div class="row border-show"> <div class="row border-show">
<div class="col-md-4 col-sm-4 col-xs-6"> <div class="col-md-4 col-sm-4 col-xs-6">
<label class="label-right ">{{service.incremental_mode==1?'Rate':'Amount'}}:</label> <label class="label-left ">{{service.incremental_mode==1?'Rate':'Amount'}}</label>
</div> </div>
<div class="col-md-8 col-sm-8 col-xs-6"> <div class="col-md-8 col-sm-8 col-xs-6 label-left">
{{service.incremental_mode==1?service.incremental_rate_value+'%':service.total_incremental_amount}} {{service.incremental_mode==1?service.incremental_rate_value+'%':service.total_incremental_amount}}
</div> </div>
</div> </div>
<div class="row border-show" style="margin-bottom: 20px"> <div class="row border-show" style="margin-bottom: 35px">
<div class="col-md-4 col-sm-4 col-xs-6"> <div class="col-md-4 col-sm-4 col-xs-6 label-left">
<label class="label-right ">Status:</label> <label class="label-left ">Status</label>
</div> </div>
<div class="col-md-8 col-sm-8 col-xs-6"> <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>
@ -116,6 +117,42 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 未开通服务展示 -->
<div class="col-md-3 col-sm-3 col-xs-12" ng-repeat=" channel in channelOptions">
<div class="service-background">
<img class="row img_auto_height_width" ng-src="{{channel.logo_url}}">
<div class="row border-show">
<div class="col-md-4 col-sm-4 col-xs-6">
<label class="label-left">Name</label>
</div>
<div class="col-md-8 col-sm-8 col-xs-6 label-left">
{{channel.name}}
</div>
</div>
<div class="row border-show" style="margin-bottom: 20px">
<div class="col-md-4 col-sm-4 col-xs-6">
<label class="label-left ">Status</label>
</div>
<div class="col-md-8 col-sm-8 col-xs-6 label-left">
<span style="color:#DD4B39">未启用</span>
</div>
</div>
<div class="row border-show" style="height: 68px;margin: -10px 0px 20px 5%;padding-top: -10px" >
<div class="col-md-4 col-sm-4 col-xs-6 label-left">
<label class="label-left">Description</label>
</div>
<div class="col-md-8 col-sm-8 col-xs-6" style="font-size: 10px;line-height: 17px">
<span >一站式跨境进口电商SaaS平台，帮您快速构建自己的品牌自营商城系统，直达10亿+中国消费者，快速实现获客和交易变现。</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" >
<a target="_blank" class="col-md-12 col-sm-12 col-xs-12 service-info-button"
title="申请开通" ng-href="https://mch.royalpay.com.au/">
申请开通
</a>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save