From ada2913cdca7275ef81f18a06659e402d404f006 Mon Sep 17 00:00:00 2001
From: liuweiwen <529520975@qq.com>
Date: Thu, 13 Feb 2020 13:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E7=BD=9A=E8=AE=B0=E5=BD=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A0=B9=E6=8D=AE=E5=85=AC=E5=8F=B8=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Game/edit.html   |   8 ++
 Application/Admin/View/Partner/add.html | 116 +++++++++++++++++++++++-
 Data/update.sql                         |   2 +
 3 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html
index 714f470e7..a6694154e 100644
--- a/Application/Admin/View/Game/edit.html
+++ b/Application/Admin/View/Game/edit.html
@@ -63,6 +63,14 @@
                                 <input type="text" class="txt " name="game_name" value="{$data['game_name']}" placeholder="请输入游戏名称" readonly="true">
                                 <input type="hidden"  name="game_appid" value="{$data['game_appid']}">
                             </td>
+
+                        </tr>
+                        <tr>
+                            <td class="l">游戏原包名称：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="original_package_name" value="{$data['original_package_name']}" placeholder="请输入游戏原包名称">
+                            </td>
+
                         </tr>
                         <tr>
                             <td class="l">游戏类型：</td>
diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html
index 3ec975c91..3639ee384 100644
--- a/Application/Admin/View/Partner/add.html
+++ b/Application/Admin/View/Partner/add.html
@@ -30,12 +30,76 @@
                     <table  border="0" cellspacing="0" cellpadding="0">
                         <tbody>
                         <tr>
-                            <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合作方名称：</td>
+                            <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合同合作方名称：</td>
                             <td class="r" >
                                 <input type="text" class="txt " name="partner" value="" placeholder="请输入合作方名称">
                             </td>
                         </tr>
 
+                        <tr>
+                            <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->对应平台(简称)：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="matche_platform" value="" placeholder="请输入对应平台">
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l">合同期限：</td>
+                            <td class="r">
+                                <input type="text" class="txt time time1" name="contract_start_time" value="" placeholder="请选择开始时间">
+                                -<input type="text" class="txt time time2" name="contract_end_time" value="" placeholder="请选择结束时间">
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->渠道费率：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="channel_rate" value="" placeholder="请输入渠道费率">
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="Invoice_rate" value="" placeholder="请输入开票税点">
+                            </td>
+                        </tr>
+
+
+
+                        <tr>
+                            <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同：</td>
+                            <td class="r">
+                                <select name="is_sign_contract" class="select_gallery">
+                                    <option value="">请选择是否签署合同</option>
+                                    <option value="1" <if condition="$data['is_sign_contract'] eq '1'">  selected="selected"</if>>是</option>
+                                    <option value="0" <if condition="$data['is_sign_contract'] eq '0'">  selected="selected"</if>>否</option>
+                                </select>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>结算方式：</td>
+                            <td class="r">
+                                <select name="settlement_type" class="select_gallery">
+                                    <option value="0">请选择结算方式</option>
+                                    <option value="1" <if condition="$data['settlement_type'] eq '1'">  selected="selected"</if>>周结</option>
+                                    <option value="2" <if condition="$data['settlement_type'] eq '2'">  selected="selected"</if>>月结</option>
+                                </select>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同：</td>
+                            <td class="r">
+                                <select name="has_game_evidence" class="select_gallery">
+                                    <option value="">请选择是否有游戏资质</option>
+                                    <option value="1" <if condition="$data['has_game_evidence'] eq '1'">  selected="selected"</if>>是</option>
+                                    <option value="0" <if condition="$data['has_game_evidence'] eq '0'">  selected="selected"</if>>否</option>
+                                </select>
+                            </td>
+                        </tr>
+
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系人：</td>
                             <td class="r" >
@@ -86,6 +150,20 @@
                             </td>
                         </tr>
 
+                        <tr>
+                            <td class="l">备注：</td>
+                            <td class="r">
+                                <textarea name="remark" class="txt_area">{$data.remark}</textarea>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l">文档管理：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="file_info" value="" placeholder="请输入文档管理">
+                            </td>
+                        </tr>
+
                         <tr>
                             <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>显示状态：</td>
                             <td class="r table_radio">
@@ -126,7 +204,43 @@
 </block>
 
 <block name="script">
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
     <script type="text/javascript">
+        $('.time1').datetimepicker({
+            format: 'yyyy-mm-dd hh:ii',
+            language:"zh-CN",
+            minView:0,startDate:new Date(),
+            autoclose:true
+        }).change(function(){
+            var start = new Date($(this).val()).getTime();
+            var end = new Date($('.time2').val()).getTime();
+
+            if(isNaN(end)) {return false;}
+
+            if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;}
+
+            return false;
+        });
+
+        $('.time2').datetimepicker({
+            format: 'yyyy-mm-dd hh:ii',
+            language:"zh-CN",
+            minView:0,startDate:new Date(),
+            autoclose:true
+        }).change(function(){
+            var end = new Date($(this).val()).getTime();
+            var start = new Date($('.time1').val()).getTime();
+
+            if(isNaN(start)) {return false;}
+
+            if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;}
+
+            return false;
+        });
+
         //导航高亮
         highlight_subnav("{:U('Partner/lists')}");
         $('#submit').click(function(){
diff --git a/Data/update.sql b/Data/update.sql
index e7ba32fdc..38492529b 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1158,6 +1158,8 @@ ADD COLUMN `company_type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '工
 ALTER TABLE `tab_withdraw`
 ADD COLUMN `review_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '审核模式：1-人工审核 2-自动审核';
 
+--2020-02-12 liuweiwen 游戏-游戏有包名称
+ALTER TABLE tab_game ADD COLUMN `original_package_name` varchar(64) DEFAULT NULL COMMENT '游戏原包名称';
 -- 2020-02-12 zyx 推广提现--新增审核模式
 ALTER TABLE `tab_statement`
 MODIFY COLUMN `ext_field` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '扩展字段，如果是下游为提现单号' AFTER `pay_type`;