Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/Controller/CoinOrderController.class.php

@@ -10,6 +10,7 @@ use QRcode;
  */
 class CoinOrderController extends BaseController
 {
+    const LV = 2;//平台币充值手续费
     public function page_show($model,$map,$p=1)
     {
         if (isset($_REQUEST['row'])) {
@@ -89,7 +90,7 @@ class CoinOrderController extends BaseController
 
     //创建订单
     public function order_add(){
-
+        
         $status = promoteCan(session('promote_auth.pid'), function($level) {
             if ($level == 1) {
                 return true;
@@ -104,7 +105,7 @@ class CoinOrderController extends BaseController
                 $this->error('无权限操作');
             }
         }
-
+        $this->assign("LV",self::LV);
         if(IS_POST){
             SafeFilter($_POST);
             $coin_num = I("coin_num");
@@ -122,7 +123,7 @@ class CoinOrderController extends BaseController
             $data['create_time'] = time();
             $data['discount'] = "0";
             if($pay_type==1){ // 在线转账
-                $free = sprintf("%.2f",$coin_num*(2/100));
+                $free = sprintf("%.2f",$coin_num*(self::LV/100));
                 $free = $free<'0.1' ? '0.1':$free;
                 $data['pay_amount'] = bcadd($coin_num,$free,2);
                 $data['order_status'] = 0;

Application/Home/View/default/CoinOrder/order_add.html

@@ -42,7 +42,7 @@
             </tr>
             <tr>
               <td class="l">购买数量：</td>
-              <td class="r"><input type="text" class="txt" name="coin_num" autocomplete="off" placeholder="">
+              <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>
@@ -87,7 +87,7 @@
             </tr>
             <tr id="tip">
               <td class="l" colspan="2">
-                <span class="noticetxt">(手续费说明：每笔交易支付服务商将收取 2% 手续费，最低收取0.1元，上不封顶)</span>
+                <span class="noticetxt">(手续费说明：每笔交易支付服务商将收取 {$LV}% 手续费，最低收取0.1元，上不封顶)</span>
               </td>
             </tr>
             <tr>
@@ -143,7 +143,7 @@
         var rodio_val = $('.jspayradio input:radio:checked').val();
         coin_num = (discount/100)*coin_num;
         if(rodio_val==1){ //在线转账
-          var fee = coin_num*(2/100);
+          var fee = coin_num*({$LV}/100);
           if(fee<0.1){
             fee=0.1
           }