Merge remote-tracking branch 'origin/release' into release

Application/Admin/Common/extend.php

@@ -1818,6 +1818,7 @@ function all_pay_way_other($type=false)
     /* $pay_way[6]=array('key'=>7,'value'=>"苹果支付");
  */
     $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
+    $pay_way[17]=array('key'=>17,'value'=>"易宝支付");
     return $pay_way;
 }
 

Application/Admin/View/TestOrder/addOrder.html

@@ -166,14 +166,21 @@
 
 <script>
     $(function(){
-        $('#datetimepicker').datetimepicker({
+        /*$('#datetimepicker').datetimepicker({
             format: 'yyyy-mm-dd hh:ii:ss',
             language: "zh-CN",
             minView: 2,
             endDate:new Date(),
             autoclose: true,
             pickerPosition: 'bottom-left'
-        })
+        })*/
+        $('#datetimepicker').datetimepicker({
+            language:"zh-CN",
+            hour: 13,
+            minute: 15,
+            autoclose: true
+        });
+
         EVENT.changeCompany();
         EVENT.createStatement();
         $("#first_partner_id").change();//默认甲方只能是我们公司