From c9cb8c230dc7f3684a9ce3b1cdd16f5381d0c400 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 7 May 2022 11:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/PromoteCoin/offlineOrderInfo.html    |   5 +-
 .../View/default/CoinOrder/order_add.html     | 204 +++++++++---------
 2 files changed, 110 insertions(+), 99 deletions(-)

diff --git a/Application/Admin/View/PromoteCoin/offlineOrderInfo.html b/Application/Admin/View/PromoteCoin/offlineOrderInfo.html
index d7b313fda..147a5cad3 100644
--- a/Application/Admin/View/PromoteCoin/offlineOrderInfo.html
+++ b/Application/Admin/View/PromoteCoin/offlineOrderInfo.html
@@ -129,6 +129,7 @@
     $('#submit').click(function () {
       $('#form').submit();
     });
+    var backurl = "{:U('PromoteCoin/offlineList')}";
     $("#agree").on("click",function(){
         var id  = $(this).parents(".new_submit").data("id");
         var url= "{:U('PromoteCoin/offlineAgree')}"+"&ids[]="+id;
@@ -138,7 +139,7 @@
               icon: 1,
               time: 1000 //2秒关闭（如果不配置，默认是3秒）
             }, function(){
-              window.location.reload()
+              window.location.href = backurl;
             }); 
           }
         });
@@ -152,7 +153,7 @@
               icon: 1,
               time: 1000 //2秒关闭（如果不配置，默认是3秒）
             }, function(){
-              window.location.reload()
+              window.location.href = backurl;
             }); 
           }
         });
diff --git a/Application/Home/View/default/CoinOrder/order_add.html b/Application/Home/View/default/CoinOrder/order_add.html
index 73b0505ad..ece4928a8 100644
--- a/Application/Home/View/default/CoinOrder/order_add.html
+++ b/Application/Home/View/default/CoinOrder/order_add.html
@@ -29,104 +29,106 @@
           <a href="{:U('order_add')}" class="current">充值</a>
         </div>
       </div>
-      <div class="trunk-list">
-        <form id="payform" action="{:U('agent_pay')}" method="post" enctype="multipart/form-data" style="position: relative;">
-          <div class="remittance" hidden style="width: 300px;height: 450px;position: absolute;left: 600px;top: 0;">
-            <img style="width: 100%;" src="{$config.collection_img_path}" />
-          </div>
-          <table class="table2">
-            <tr>
-              <td class="l">充值方式：</td>
-              <td  class="r form-radio jspayradio">
-                <label><input type="radio" value="1" name="pay_type" checked><i class="current"></i><span>在线转账</span></label>
-                <if condition="$config['is_open'] == 1 ">
-                  <label><input type="radio" value="2" name="pay_type"><i></i><span>线下转账</span><span class="noticetxt">(需上传截图)</span></label>
-                </if>
-              </td>
-            </tr>
-            <tr class="remittance" hidden>
-              <td class="l">请选择游戏</td>
-              <td class="r">
-                <select  class="reselect select_gallery" name="game_id">
-                  <option value="">请选择游戏</option>
-                  <foreach name="config.game" item="vo" >
-                    <option value="{$key}">{$vo}</option>
-                  </foreach>
-                </select>
-                <div id="acountesc"></div>
-              </td>
-            </tr>
-            <tr>
-              <td class="l">充值账号：</td>
-              <td class="r"><span >{$account}</span></td>
-            </tr>
-            <tr>
-              <td class="l">平台币原价：</td>
-              <td class="r">￥1.00/个</td>
-            </tr>
-            <if condition="$config.coin_discount neq 10 ">
+      <if condition="$config['is_open'] == 1 ">
+        <div class="trunk-list">
+          <form id="payform" action="{:U('agent_pay')}" method="post" enctype="multipart/form-data" style="position: relative;">
+            <div class="remittance" hidden style="width: 300px;height: 450px;position: absolute;left: 600px;top: 0;">
+              <img style="width: 100%;" src="{$config.collection_img_path}" />
+            </div>
+            <table class="table2">
+              <tr>
+                <td class="l">充值方式：</td>
+                <td  class="r form-radio jspayradio">
+                  <!-- <label><input type="radio" value="1" name="pay_type" checked><i class="current"></i><span>在线转账</span></label> -->
+                  <if condition="$config['is_open'] == 1 ">
+                    <label><input type="radio" value="2" name="pay_type" checked><i></i><span>线下转账</span><span class="noticetxt">(需上传截图)</span></label>
+                  </if>
+                </td>
+              </tr>
               <tr class="remittance" hidden>
-                <td class="l">平台币限时折扣：</td>
-                <td class="r"><span >{$config.coin_discount}折</span></td>
+                <td class="l">请选择游戏</td>
+                <td class="r">
+                  <select  class="reselect select_gallery" name="game_id">
+                    <option value="">请选择游戏</option>
+                    <foreach name="config.game" item="vo" >
+                      <option value="{$key}">{$vo}</option>
+                    </foreach>
+                  </select>
+                  <div id="acountesc"></div>
+                </td>
               </tr>
-            </if>
-            <tr>
-              <td class="l">购买数量：</td>
-              <td class="r"><input type="text" class="txt" name="coin_num" autocomplete="off" placeholder=""  oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
-                <span class="noticetxt">平台币</span>
-              </td>
-            </tr>
-            <tr>
-              <td class="l">应付金额：</td>
-              <td class="r" id="pay_amount"><span>0.00</span>
-                <input name="discount" value="{$discount}"  type="hidden">
-              </td>
-            </tr>
-            <!-- <tr class="remittance" hidden>
-              <td class="l">汇入银行：</td>
-              <td class="r">
-                <select  class="reselect select_gallery" name="collection_account">
-                  <option value="" title="暂未开放 暂未开放" acountesc="">暂未开放 暂未开放</option>
-                  <volist name="bank_list" id="bank">
-                    <option value="{$bank.bank_account}" title="{$bank.bank}" acountesc="账户名称：{$bank.account_name}<br/>汇入账户：{$bank.bank_account}<br/>开户行：{$bank.bank_name}">{$bank.bank}</option>
-                  </volist>
-                </select>
-                <div id="acountesc"></div>
-              </td>
-            </tr> -->
-            
-            <tr class="remittance" hidden>
-              <td class="l">订单号：</td>
-              <td class="r"><input type="text" class="txt" name="pay_order_number" autocomplete="off" placeholder="请输入订单号"></td>
-            </tr>
-            <tr class="remittance" hidden>
-              <td class="l">支付截图：</td>
-              <td class="r"><div class="fallback" id="myid"><input name="voucher_img" type="file" multiple /></div></td>
-            </tr>
-            <tr class="remittance" hidden>
-              <td class="l">备注：</td>
-              <td class="r">
-                <textarea name="remark"></textarea>
-              </td>
-            </tr>
-            <tr class="remittance" hidden>
-              <td class="l" colspan="2" style="text-align: center;">
-                <span class="noticetxt">(特殊说明：折扣购买的平台币不参与结算)</span>
-              </td>
-            </tr>
-            <tr id="tip">
-              <td class="l" colspan="2">
-                <span class="noticetxt">(手续费说明：每笔交易支付服务商将收取 {$LV}% 手续费，最低收取0.1元，上不封顶)</span>
-              </td>
-            </tr>
-            <tr>
-              <td class="r">
-                <button type="button" class="tjbnt btn" onclick="save_model()" >提交</button>
-              </td>
-            </tr>
-          </table>
-        </form>
-      </div>
+              <tr>
+                <td class="l">充值账号：</td>
+                <td class="r"><span >{$account}</span></td>
+              </tr>
+              <tr>
+                <td class="l">平台币原价：</td>
+                <td class="r">￥1.00/个</td>
+              </tr>
+              <if condition="$config.coin_discount neq 10 ">
+                <tr class="remittance" hidden>
+                  <td class="l">平台币限时折扣：</td>
+                  <td class="r"><span >{$config.coin_discount}折</span></td>
+                </tr>
+              </if>
+              <tr>
+                <td class="l">购买数量：</td>
+                <td class="r"><input type="text" class="txt" name="coin_num" autocomplete="off" placeholder=""  oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+                  <span class="noticetxt">平台币</span>
+                </td>
+              </tr>
+              <tr>
+                <td class="l">应付金额：</td>
+                <td class="r" id="pay_amount"><span>0.00</span>
+                  <input name="discount" value="{$discount}"  type="hidden">
+                </td>
+              </tr>
+              <!-- <tr class="remittance" hidden>
+                <td class="l">汇入银行：</td>
+                <td class="r">
+                  <select  class="reselect select_gallery" name="collection_account">
+                    <option value="" title="暂未开放 暂未开放" acountesc="">暂未开放 暂未开放</option>
+                    <volist name="bank_list" id="bank">
+                      <option value="{$bank.bank_account}" title="{$bank.bank}" acountesc="账户名称：{$bank.account_name}<br/>汇入账户：{$bank.bank_account}<br/>开户行：{$bank.bank_name}">{$bank.bank}</option>
+                    </volist>
+                  </select>
+                  <div id="acountesc"></div>
+                </td>
+              </tr> -->
+              
+              <tr class="remittance" hidden>
+                <td class="l">订单号：</td>
+                <td class="r"><input type="text" class="txt" name="pay_order_number" autocomplete="off" placeholder="请输入订单号"></td>
+              </tr>
+              <tr class="remittance" hidden>
+                <td class="l">支付截图：</td>
+                <td class="r"><div class="fallback" id="myid"><input name="voucher_img" type="file" multiple /></div></td>
+              </tr>
+              <tr class="remittance" hidden>
+                <td class="l">备注：</td>
+                <td class="r">
+                  <textarea name="remark"></textarea>
+                </td>
+              </tr>
+              <tr class="remittance" hidden>
+                <td class="l" colspan="2" style="text-align: center;">
+                  <span class="noticetxt">(特殊说明：折扣购买的平台币不参与结算)</span>
+                </td>
+              </tr>
+              <tr id="tip">
+                <td class="l" colspan="2">
+                  <span class="noticetxt">(手续费说明：每笔交易支付服务商将收取 {$LV}% 手续费，最低收取0.1元，上不封顶)</span>
+                </td>
+              </tr>
+              <tr>
+                <td class="r">
+                  <button type="button" class="tjbnt btn" onclick="save_model()" >提交</button>
+                </td>
+              </tr>
+            </table>
+          </form>
+        </div>
+      </if>
     </div>
   </div>
 </block>
@@ -153,6 +155,13 @@
           calculation_money($("input[name=coin_num]").val());
         }
       });
+      //---begin 直接执行 如需线上取消
+      $(".remittance").show();
+      $("#tip").hide();
+      calculation_money($("input[name=coin_num]").val());
+      $("input[name='pay_type']").siblings('i').addClass('current');
+      //----end
+      
       $("input[name=coin_num]").bind('input propertychange', function () {
         calculation_money($(this).val());
       })
@@ -216,7 +225,8 @@
             }else{
               layer.alert(result.info,function () {
                 parent.layer.closeAll();
-                location.reload();
+                var url = "{:U('CoinOrder/order_list')}";
+                location.href = url;
               });
             }
           }else{