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

Application/Admin/Common/extend.php

@@ -261,6 +261,7 @@ function all_pay_way($type=false)
     /* $pay_way[6]=array('key'=>7,'value'=>"苹果支付");
  */
 	$pay_way[7]=array('key'=>8,'value'=>'金猪');
+    $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
     return $pay_way;
 }
 /* //获取支付方式 */
@@ -306,6 +307,9 @@ function get_pay_way($id=null)
         case 10:
         	return "双乾支付-银联";
         	break;
+        case 15:
+            return "双乾支付-快捷";
+            break;
     }
 }
 function get_pay_way_map($id) {
@@ -1442,6 +1446,7 @@ function cash_pay_way()
     /* $pay_way[6]=array('key'=>7,'value'=>"苹果支付");
  */
     $pay_way[7]=array('key'=>8,'value'=>'金猪');
+    $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
     return $pay_way;
 }