|
|
@ -358,9 +358,10 @@
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<!--status-->
|
|
|
|
<!--status-->
|
|
|
|
<div class="form-group col-sm-12" ng-if="'10'|withRole">
|
|
|
|
<!--商户合规位置转移到合规模块的商户合规模块下-->
|
|
|
|
|
|
|
|
<!--<div class="form-group col-sm-12" ng-if="'10'|withRole">
|
|
|
|
<label class="control-label col-xs-4 col-sm-2">Status</label>
|
|
|
|
<label class="control-label col-xs-4 col-sm-2">Status</label>
|
|
|
|
<!--<div class="col-xs-8 col-sm-4">-->
|
|
|
|
<!–<div class="col-xs-8 col-sm-4">–>
|
|
|
|
<span class="col-xs-8 col-sm-10">
|
|
|
|
<span class="col-xs-8 col-sm-10">
|
|
|
|
<span class="checkbox-inline">
|
|
|
|
<span class="checkbox-inline">
|
|
|
|
<label>
|
|
|
|
<label>
|
|
|
@ -407,14 +408,15 @@
|
|
|
|
</span>
|
|
|
|
</span>
|
|
|
|
|
|
|
|
|
|
|
|
</span>
|
|
|
|
</span>
|
|
|
|
<!--</div>-->
|
|
|
|
<!–</div>–>
|
|
|
|
</div>
|
|
|
|
</div>-->
|
|
|
|
<div class="col-xs-12">
|
|
|
|
<div class="col-xs-12">
|
|
|
|
<button ng-if="!mapFrame" class="btn btn-primary" type="button"
|
|
|
|
<button class="btn btn-primary" type="button"
|
|
|
|
ng-click="loadPartners(1)"><i
|
|
|
|
ng-click="loadPartners(1)"><i
|
|
|
|
class="fa fa-search"></i> Search
|
|
|
|
class="fa fa-search"></i> Search
|
|
|
|
</button>
|
|
|
|
</button>
|
|
|
|
<button ng-if="mapFrame" class="btn btn-primary" type="button"
|
|
|
|
<!-- 商户分布以及商户进件位置转移 -->
|
|
|
|
|
|
|
|
<!--<button ng-if="mapFrame" class="btn btn-primary" type="button"
|
|
|
|
ng-click="loadLocations()"><i
|
|
|
|
ng-click="loadLocations()"><i
|
|
|
|
class="fa fa-search"></i> Search
|
|
|
|
class="fa fa-search"></i> Search
|
|
|
|
</button>
|
|
|
|
</button>
|
|
|
@ -422,7 +424,7 @@
|
|
|
|
ui-sref=".new" title="New Partner">
|
|
|
|
ui-sref=".new" title="New Partner">
|
|
|
|
<i class="fa fa-plus"></i>
|
|
|
|
<i class="fa fa-plus"></i>
|
|
|
|
New Partner
|
|
|
|
New Partner
|
|
|
|
</a>
|
|
|
|
</a>-->
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
@ -434,7 +436,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<ul class="nav nav-tabs">
|
|
|
|
<!--<ul class="nav nav-tabs">
|
|
|
|
<li ng-if="!mapFrame"><a role="button" class="partner_list_style active"
|
|
|
|
<li ng-if="!mapFrame"><a role="button" class="partner_list_style active"
|
|
|
|
ng-click="toogleMerchantSelect()">商户列表</a>
|
|
|
|
ng-click="toogleMerchantSelect()">商户列表</a>
|
|
|
|
|
|
|
|
|
|
|
@ -448,9 +450,9 @@
|
|
|
|
<li ng-if="!mapFrame" style="margin-left: 10px"><a role="button" class="partner_list_style" ng-click="toogleMapSelect()">商户分布</a>
|
|
|
|
<li ng-if="!mapFrame" style="margin-left: 10px"><a role="button" class="partner_list_style" ng-click="toogleMapSelect()">商户分布</a>
|
|
|
|
</li>
|
|
|
|
</li>
|
|
|
|
</ul>
|
|
|
|
</ul>
|
|
|
|
<span id="merchant_locations" hidden>{{locations}}</span>
|
|
|
|
<span id="merchant_locations" hidden>{{locations}}</span>-->
|
|
|
|
|
|
|
|
|
|
|
|
<div class="box box-warning" style="border-top-color:#f06101" ng-if="!mapFrame">
|
|
|
|
<div class="box box-warning" style="border-top-color:#f06101">
|
|
|
|
<div class="box-body no-padding table-responsive">
|
|
|
|
<div class="box-body no-padding table-responsive">
|
|
|
|
<div>
|
|
|
|
<div>
|
|
|
|
<span style="float: right;font-size: 14px;" class="del_client">禁用</span>
|
|
|
|
<span style="float: right;font-size: 14px;" class="del_client">禁用</span>
|
|
|
@ -541,7 +543,8 @@
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="row" ng-if="mapFrame">
|
|
|
|
<!--商户分布位置转移-->
|
|
|
|
|
|
|
|
<!--<div class="row" ng-if="mapFrame">
|
|
|
|
<div class="col-sm-12">
|
|
|
|
<div class="col-sm-12">
|
|
|
|
<div class="box" style="border-top: none">
|
|
|
|
<div class="box" style="border-top: none">
|
|
|
|
<div class="embed-responsive" style="height: 300px;">
|
|
|
|
<div class="embed-responsive" style="height: 300px;">
|
|
|
@ -549,7 +552,7 @@
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>-->
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|