master
yuan 7 years ago
parent 03477c83f0
commit a5a68fff2f

@ -235,11 +235,6 @@ margin-bottom: 10%;"/>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
<a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
<i class="fa fa-sitemap"></i> <span>商户号管理</span>
</a>
</li>
<li ui-sref-active="active" <li ui-sref-active="active"
ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)"> ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
<a ui-sref="partner_application" ui-sref-opts="{reload:true}"> <a ui-sref="partner_application" ui-sref-opts="{reload:true}">
@ -399,6 +394,11 @@ margin-bottom: 10%;"/>
<li class="header nav-header" ng-if="'0100001'|withRole">基础设置|Basic Settings</li> <li class="header nav-header" ng-if="'0100001'|withRole">基础设置|Basic Settings</li>
<li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
<a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
<i class="fa fa-sitemap"></i> <span>商户号管理</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'org'|withModule"> <li ui-sref-active="active" ng-if="'org'|withModule">
<a ui-sref="organizations" ui-sref-opts="{reload:true}"> <a ui-sref="organizations" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>组织管理|Organizations</span> <i class="fa fa-users"></i> <span>组织管理|Organizations</span>

@ -21,11 +21,11 @@
<uib-tab heading="商户号列表"> <uib-tab heading="商户号列表">
<div class="col-sm-12 col-xs-12"> <div class="col-sm-12 col-xs-12">
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<div class="list-group col-sm-6 col-xs-12" ng-repeat="(key,clients) in clientsMap"> <div class="list-group col-sm-12 col-xs-12" ng-repeat="(key,clients) in clientsMap">
<a class="list-group-item active col-sm-12 col-xs-12"> <a class="list-group-item active col-sm-12 col-xs-12">
{{key|choose_merchant_id}} {{key|choose_merchant_id}}
</a> </a>
<a class="list-group-item col-sm-4 col-xs-6 cursor" <a class="list-group-item col-sm-2 col-xs-6 cursor"
ng-repeat="client in clients | orderBy:'client_count':true" ng-repeat="client in clients | orderBy:'client_count':true"
ng--click="showClient(client.sub_merchant_id);"> ng--click="showClient(client.sub_merchant_id);">
<span> <span>
@ -53,12 +53,12 @@
</div> </div>
<div class="col-sm-12 col-xs-12"> <div class="col-sm-12 col-xs-12">
<div> <div>
<div class="list-group col-sm-6 col-xs-12" <div class="list-group col-sm-12 col-xs-12"
ng-repeat="(key,clients) in notTradeClientsMap"> ng-repeat="(key,clients) in notTradeClientsMap">
<a class="list-group-item active col-sm-12 col-xs-12"> <a class="list-group-item active col-sm-12 col-xs-12">
{{key|choose_merchant_id}} {{key|choose_merchant_id}}
</a> </a>
<a class="list-group-item col-sm-4 col-xs-6 cursor" <a class="list-group-item col-sm-2 col-xs-6 cursor"
ng-repeat="client in clients | orderBy:'client_count':true" ng-repeat="client in clients | orderBy:'client_count':true"
ng--click="showNotTradeClient(client.sub_merchant_id)"> ng--click="showNotTradeClient(client.sub_merchant_id)">
<span>{{client.sub_merchant_id}}&nbsp;<i class="fa fa-clock-o text-danger" <span>{{client.sub_merchant_id}}&nbsp;<i class="fa fa-clock-o text-danger"

Loading…
Cancel
Save