From c8296c0412d22822f56295329ef60fcbb41748ce Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Tue, 25 Feb 2020 18:22:58 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0info=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/update.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Data/update.sql b/Data/update.sql
index 4ecdaa17f..ab5e14e49 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1357,3 +1357,7 @@ ADD COLUMN `verify_status` tinyint(2) NULL DEFAULT 0 COMMENT '审核状态 0:未
 
 -- 支付类型添加易宝支付
 INSERT INTO `platform`.`tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('yeepay', '易宝支付', '', '', 1, 1, 0);
+
+-- 身份证记录添加info字段
+ALTER TABLE `tab_idcard_log`
+ADD COLUMN `info` varchar(255) DEFAULT '' COMMENT '第三方接口返回信息';
\ No newline at end of file

From c9eecfa9c5b02669cb100a5442f8fced55a2b78b Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 26 Feb 2020 16:10:44 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0=E6=98=93=E5=AE=9D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index 0858173e2..ac2b17e4c 100644
--- a/Application/Admin/Common/extend.php
+++ b/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;
 }
 

From ba96083bb52afa7b94042490ab679a2d3af1c3c9 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Wed, 26 Feb 2020 16:15:25 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/TestOrder/addOrder.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/TestOrder/addOrder.html b/Application/Admin/View/TestOrder/addOrder.html
index d1c160c14..520d94327 100644
--- a/Application/Admin/View/TestOrder/addOrder.html
+++ b/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();//默认甲方只能是我们公司

From dbd1e6f07011b9686b91f1b6b9316e25417fdd2e Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Wed, 26 Feb 2020 17:25:40 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=98=93=E5=AE=9D=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Tool/payset.html | 48 +++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/View/Tool/payset.html b/Application/Admin/View/Tool/payset.html
index 3af6d1f0f..337f835f1 100644
--- a/Application/Admin/View/Tool/payset.html
+++ b/Application/Admin/View/Tool/payset.html
@@ -1373,7 +1373,7 @@
 
                             <input name="config[partner]" type="text" value="{$yeepay['partner']}" class="">
 
-                            <span class="notice-text">双乾商户号</span>
+                            <span class="notice-text">易宝商户号</span>
 
                         </td>
 
@@ -1381,13 +1381,55 @@
 
                     <tr>
 
-                        <td class="l noticeinfo">双乾密钥key</td>
+                        <td class="l noticeinfo">上级商户号</td>
+
+                        <td class="r table_radio">
+
+                            <input name="config[parent_merchant]" type="text" value="{$yeepay['parent_merchant']}" class="">
+
+                            <span class="notice-text">易宝上级商户号</span>
+
+                        </td>
+
+                    </tr>
+
+                    <tr>
+
+                        <td class="l noticeinfo">公钥</td>
+
+                        <td class="r table_radio">
+
+                            <input name="config[yop_public_key]" type="text" value="{$yeepay['yop_public_key']}" class="">
+
+                            <span class="notice-text">易宝公钥</span>
+
+                        </td>
+
+                    </tr>
+
+                    <tr>
+
+                        <td class="l noticeinfo">私钥</td>
+
+                        <td class="r table_radio">
+
+                            <input name="config[private_key]" type="text" value="{$yeepay['private_key']}" class="">
+
+                            <span class="notice-text">易宝私钥</span>
+
+                        </td>
+
+                    </tr>
+
+                    <tr>
+
+                        <td class="l noticeinfo">易宝密钥key</td>
 
                         <td class="r table_radio">
 
                             <input name="config[key]" type="text" value="{$yeepay['key']}" class="">
 
-                            <span class="notice-text">双乾秘钥</span>
+                            <span class="notice-text">易宝密钥key</span>
 
                         </td>
 

From 8aae878cf84d46ccb0083b4638c9f02bca411d35 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 27 Feb 2020 09:27:07 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Finance/gameStatistics.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index 59bbbf751..99bdc9103 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/Application/Admin/View/Finance/gameStatistics.html
@@ -230,7 +230,7 @@
             </tr>
           </volist>
           <tr>
-            <td colspan="3" ><span>总计</span></td>
+            <td colspan="4" ><span>总计</span></td>
             <td ><span><if condition="$sumCash neq ''">{$sumCash}<else/>0</if></span></td>
             <td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
             <td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>