Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote

Application/Home/View/default/Finance/settlementDtl.html

@@ -76,7 +76,7 @@
         <div class="tab normal_tab">
         </div>
         <!--  <form action="{:U('Finance/settlementDtl')}" method="get" enctype="multipart/form-data" class="normal_form"> -->
-        <div class="form-group normal_space">
+        <div class="form-group normal_space" style="margin-left: 0;">
           <input type="text" name="pay_order_number" class="txt normal_txt" placeholder="请输入游戏订单号"
                  value="{:I('pay_order_number','')}">
         </div>
@@ -99,7 +99,7 @@
         <!--  </form> -->
       </div>
       <div class="page-list apply-app_apply-list query-recharge-list">
-        <div class="trunk-content article">
+        <div class="trunk-content article" style="margin-left: 0;margin-right: 0;">
           <div class="tabcon trunk-list">
             <table class="table normal_table">
               <tr class="odd">

Application/Home/View/default/GameDivide/index.html

@@ -120,7 +120,7 @@
         <div class="tab marg_top20" style="clear:both;display: flex;"></div>
         <!--          <form action="{:U('index',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data"-->
         <!--                class="marg_top20" style="float: left;">-->
-        <div class="form-group normal_space fl">
+        <div class="form-group normal_space fl" style="margin-left: 0;">
           <select id="relation_game_id" name="relation_game_id" class="reselect select_gallery" style="min-width:200px;width: 175px;">
             <option value="">请选择游戏</option>
             <volist name=":get_promote_serach_game()" id="vo">