Merge branch 'dev_zcl' into dev

Application/Home/Controller/CoinOrderController.class.php

@@ -122,7 +122,7 @@ class CoinOrderController extends BaseController
             $data['create_time'] = time();
             $data['discount'] = "0";
             if($pay_type==1){ // 在线转账
-                $free = sprintf("%.2f",$coin_num*(0.6/100));
+                $free = sprintf("%.2f",$coin_num*(0.2/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

@@ -87,7 +87,7 @@
             </tr>
             <tr id="tip">
               <td class="l" colspan="2">
-                <span class="noticetxt">(手续费说明：每笔交易支付服务商将收取 0.60% 手续费，最低收取0.1元，上不封顶)</span>
+                <span class="noticetxt">(手续费说明：每笔交易支付服务商将收取 0.20% 手续费，最低收取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*(0.6/100);
+          var fee = coin_num*(0.2/100);
           if(fee<0.1){
             fee=0.1
           }

Data/update.sql

@@ -492,8 +492,8 @@ CREATE TABLE `tab_device_statistics`  (
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `time`(`time`) USING BTREE
 ) ENGINE = MyISAM AUTO_INCREMENT = 163 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic;
-
 SET FOREIGN_KEY_CHECKS = 1;
+
 ALTER TABLE `platform`.`tab_device_record`
 ADD INDEX `create_time`(`create_time`) USING BTREE,
 ADD INDEX `unique_code`(`unique_code`) USING BTREE,