From 6024ae342c9a75e74147a6757aa6bea035259215 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 24 Jul 2020 16:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=BA=E5=BA=8F=E5=8F=8A?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PromoteCompanyController.class.php        |  17 +-
 .../Admin/View/PromoteCompany/add.html        | 173 +++++++++---------
 .../Admin/View/PromoteCompany/export.html     |   8 +-
 3 files changed, 102 insertions(+), 96 deletions(-)

diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index c99361938..74f6a7f6f 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -121,17 +121,16 @@ class PromoteCompanyController extends ThinkController
                 $v["develop_type"] = getCompanyRelation($v["develop_type"]);
                 $v['company_type'] = $v['company_type'] == 2 ? '个人' : '公司';
                 $v['is_sign_contact'] = $v['is_sign_contact'] ? '是' : '否';
-
-                $contract_start_time = $v['company_info']['contact_begin'] ?
-                    time_format($v['company_info']['contact_begin'], 'Y/m/d') : '-';
-                $contract_end_time = $v['company_info']['contact_end'] ?
-                    time_format($v['company_info']['contact_end'], 'Y/m/d') : '-';
+                $contract_start_time = $v['contact_begin'] ?
+                    time_format($v['contact_begin'], 'Y/m/d') : '-';
+                $contract_end_time = $v['contact_end'] ?
+                    time_format($v['contact_end'], 'Y/m/d') : '-';
                 $v['contract_time'] = $contract_start_time . '-' . $contract_end_time;
 
-                $validity_start_time = $v['company_info']['validity_start_time'] ?
-                    time_format($v['company_info']['validity_start_time'], 'Y/m/d') : '-';
-                $validity_end_time = $v['company_info']['validity_end_time'] ?
-                    time_format($v['company_info']['validity_end_time'], 'Y/m/d') : '-';
+                $validity_start_time = $v['validity_start_time'] ?
+                    time_format($v['validity_start_time'], 'Y/m/d') : '-';
+                $validity_end_time = $v['validity_end_time'] ?
+                    time_format($v['validity_end_time'], 'Y/m/d') : '-';
                 $v['validity_time'] = $validity_start_time . '-' . $validity_end_time;
                 if(!$is_export){
                     $v['can_del'] = $this->promoteCompanyIsCanDel($v["id"]) ? 1 : 0;
diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html
index e58839daa..e01ba7bae 100644
--- a/Application/Admin/View/PromoteCompany/add.html
+++ b/Application/Admin/View/PromoteCompany/add.html
@@ -97,6 +97,12 @@
                                 <input type="text" class="txt " name="company_name" value="" placeholder="请输入推广公司名称">
                             </td>
                         </tr>
+                        <tr>
+                            <td class="l">推广游戏：</td>
+                            <td class="r" >
+                                <a class="ajax-view">编辑</a>
+                            </td>
+                        </tr>
 
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>团体归属:</td>
@@ -113,53 +119,14 @@
                         </tr>
 
                         <tr>
-                            <td class="l">对应平台(简称):</td>
-                            <td class="r" >
-                                <input type="text" class="txt " name="platform_name" value="" placeholder="请输入对应平台">
-                            </td>
-                        </tr>
-
-                        <tr>
-                            <td class="l">合同期限:</td>
-                            <td class="r" >
-                                <div class="input-list" style="margin:0;">
-                                    <input type="text" readonly id="contact_begin" name="contact_begin" class="" value="{:I('contact_begin')}"
-                                        placeholder="合同开始时间" />
-                                    &nbsp;-&nbsp;
-                                    <div class="input-append date" id="datetimepicker" style="display:inline-block">
-                                        <input type="text" readonly id="contact_end" name="contact_end" class="" value="{:I('contact_end')}"
-                                            placeholder="合同结束时间" />
-                                        <span class="add-on"><i class="icon-th"></i></span>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <tr>
-                            <td class="l">结算生效期限:</td>
-                            <td class="r">
-                                <input type="text" class="txt time time3"  name="validity_start_time" value="" placeholder="生效开始时间">
-                                &nbsp;-&nbsp;<input type="text" class="txt time time4" name="validity_end_time" value="" placeholder="生效结束时间">
-                            </td>
-                        </tr>
-
-                        <tr>
-                            <td class="l">开票税点:</td>
-                            <td class="r" >
-                                <input type="text" class="txt" name="fax_ratio" value="" placeholder="开票税点(最多两位小数)"><span style="margin-left: 3px;padding-top: 5px">%</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="l">渠道费率：</td>
-                            <td class="r" >
-                                <input type="text" class="txt " name="channel_rate" value="" placeholder="渠道费率(最多两位小数)"> <span style="margin-left: 3px;padding-top: 5px">%</span>
-                            </td>
-                            
-                        </tr>
-                        <tr>
-                            <td class="l">税费费率:</td>
+                            <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>开发类型：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="taxation_rate" value="" placeholder="税费费率(最多三位小数)"><span style="margin-left: 3px;padding-top: 5px">%</span>
+                                <select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
+                                    <option value="0">无</option>
+                                    <option value="1">自主开发</option>
+                                    <option value="2">自主开发及维护</option>
+                                    <option value="3">只维护</option>
+                                </select>
                             </td>
                         </tr>
 
@@ -202,99 +169,139 @@
                                 </div>
                             </td>
                         </tr>
+                        <tr>
+                            <td class="l">合同期限:</td>
+                            <td class="r" >
+                                <div class="input-list" style="margin:0;">
+                                    <input type="text" readonly id="contact_begin" name="contact_begin" class="" value="{:I('contact_begin')}"
+                                        placeholder="合同开始时间" />
+                                    &nbsp;-&nbsp;
+                                    <div class="input-append date" id="datetimepicker" style="display:inline-block">
+                                        <input type="text" readonly id="contact_end" name="contact_end" class="" value="{:I('contact_end')}"
+                                            placeholder="合同结束时间" />
+                                        <span class="add-on"><i class="icon-th"></i></span>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l">结算生效期限:</td>
+                            <td class="r">
+                                <input type="text" class="txt time time3"  name="validity_start_time" value="" placeholder="生效开始时间">
+                                &nbsp;-&nbsp;<input type="text" class="txt time time4" name="validity_end_time" value="" placeholder="生效结束时间">
+                            </td>
+                        </tr>
 
                         <tr>
-                            <td class="l">开发类型：</td>
+                            <td class="l">支付宝真实姓名：</td>
                             <td class="r" >
-                                <select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
-                                    <option value="">请选择开发类型</option>
-                                    <option value="1" >自主开发</option>
-                                    <option value="2" >自主开发及维护</option>
-                                    <option value="3" >只维护</option>
-                                </select>
+                                <input type="text" class="txt " name="ali_user" value="" placeholder="请输入支付宝真实姓名">
                             </td>
                         </tr>
-                        
 
                         <tr>
-                            <td class="l">联系人：</td>
+                            <td class="l">支付宝登陆账号：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="settlement_contact" value="" placeholder="请输入结算联系人">
+                                <input type="text" class="txt " name="ali_account" value="" placeholder="可以是手机及邮箱等">
                             </td>
                         </tr>
+
                         <tr>
-                            <td class="l">联系电话：</td>
+                            <td class="l">账户名：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="contact_phone" value="" placeholder="请输入联系电话">
+                                <input type="text" class="txt " name="bank_address" value="" placeholder="请输入账户名">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="l">银行卡号：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="bank_card" value="" placeholder="请输入银行卡号">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="l">收款银行：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="bank_name" value="" placeholder="请输入收款银行">
                             </td>
                         </tr>
 
                         <tr>
-                            <td class="l">注册地址:</td>
+                            <td class="l">联系人：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="reg_address" value="" placeholder="请输入注册地址">
+                                <input type="text" class="txt " name="settlement_contact" value="" placeholder="请输入结算联系人">
                             </td>
                         </tr>
                         <tr>
-                            <td class="l">注册电话:</td>
+                            <td class="l">联系电话：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="reg_phone" value="" placeholder="请输入注册电话">
+                                <input type="text" class="txt " name="contact_phone" value="" placeholder="请输入联系电话">
                             </td>
                         </tr>
 
                         <tr>
-                            <td class="l">邮寄地址：</td>
+                            <td class="l">对应平台(简称):</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="address" value="" placeholder="请输入邮寄地址">
+                                <input type="text" class="txt " name="platform_name" value="" placeholder="请输入对应平台">
                             </td>
                         </tr>
+
+                        
+
                         <tr>
-                            <td class="l">账户名：</td>
+                            <td class="l">开票税点:</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="bank_address" value="" placeholder="请输入账户名">
+                                <input type="text" class="txt" name="fax_ratio" value="" placeholder="开票税点(最多两位小数)"><span style="margin-left: 3px;padding-top: 5px">%</span>
                             </td>
                         </tr>
                         <tr>
-                            <td class="l">银行卡号：</td>
+                            <td class="l">渠道费率：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="bank_card" value="" placeholder="请输入银行卡号">
+                                <input type="text" class="txt " name="channel_rate" value="" placeholder="渠道费率(最多两位小数)"> <span style="margin-left: 3px;padding-top: 5px">%</span>
                             </td>
+                            
                         </tr>
                         <tr>
-                            <td class="l">收款银行：</td>
+                            <td class="l">税费费率:</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="bank_name" value="" placeholder="请输入收款银行">
+                                <input type="text" class="txt " name="taxation_rate" value="" placeholder="税费费率(最多三位小数)"><span style="margin-left: 3px;padding-top: 5px">%</span>
                             </td>
                         </tr>
-                       
+
+                        
 
                         <tr>
-                            <td class="l">支付宝真实姓名：</td>
+                            <td class="l">注册地址:</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="ali_user" value="" placeholder="请输入支付宝真实姓名">
+                                <input type="text" class="txt " name="reg_address" value="" placeholder="请输入注册地址">
                             </td>
                         </tr>
-
                         <tr>
-                            <td class="l">支付宝登陆账号：</td>
+                            <td class="l">注册电话:</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="ali_account" value="" placeholder="可以是手机及邮箱等">
+                                <input type="text" class="txt " name="reg_phone" value="" placeholder="请输入注册电话">
                             </td>
                         </tr>
 
-                        
                         <tr>
-                            <td class="l">备注：</td>
+                            <td class="l">邮寄地址：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="content" value="" placeholder="">
+                                <input type="text" class="txt " name="address" value="" placeholder="请输入邮寄地址">
                             </td>
                         </tr>
+                       
+                       
+
+                        
+
+                        
                         <tr>
-                            <td class="l">推广游戏：</td>
+                            <td class="l">备注：</td>
                             <td class="r" >
-                                <a class="ajax-view">编辑</a>
+                                <input type="text" class="txt " name="content" value="" placeholder="">
                             </td>
                         </tr>
+                        
                         <tr>
                             <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>承担服务费：</td>
                             <td class="r table_radio">
@@ -345,10 +352,10 @@
                             <td class="r table_radio">
                                 <span class="form_radio table_btn">
                                     <label>
-                                        <input type="radio" class="inp_radio" value="1"  name="marketing_director_show" >展示
+                                        <input type="radio" class="inp_radio" value="1"  name="marketing_director_show" checked>展示
                                     </label>
                                     <label>
-                                        <input type="radio" class="inp_radio" value="2"  name="marketing_director_show" checked> 隐藏
+                                        <input type="radio" class="inp_radio" value="2"  name="marketing_director_show"> 隐藏
                                     </label>
                                 </span>
                                 <span class="notice-text"></span>
diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html
index d325c4d86..646f4e284 100644
--- a/Application/Admin/View/PromoteCompany/export.html
+++ b/Application/Admin/View/PromoteCompany/export.html
@@ -148,16 +148,16 @@
                         <td rowspan="{$data.row}">{$data.ali_user|default="--"}</td>
                         <td rowspan="{$data.row}">{$data.ali_account|default="--"}</td>
 
-                        <td rowspan="{$data.row}">{$data.is_sign_contract|default="--"}</td>
-                        <td rowspan="{$data.row}">{$data.contract_time|default="--"}</td>
-                        <td rowspan="{$data.row}">{$data.validity_time|default="--"}</td>
+                        <td rowspan="{$data.row}">{$data.is_sign_contact|default="--"}</td>
+                        <td rowspan="{$data.row}">{$data.contract_time}</td>
+                        <td rowspan="{$data.row}">{$data.validity_time}</td>
 
                         <td rowspan="{$data.row}">{$data.fax_ratio|showPercent}</td>
                         <td rowspan="{$data.row}">{$data.invoice_type|default="--"}</td>
                         <td rowspan="{$data.row}">{$data.taxation_rate|showPercent}</td>
                         <td rowspan="{$data.row}">{$data.channel_rate|showPercent}</td>
                         <td rowspan="{$data.row}">{$data.reg_address|default="--"}</td>
-                        <td rowspan="{$data.row}">{$data.reg_phon|default="--"}</td>
+                        <td rowspan="{$data.row}">{$data.reg_phone|default="--"}</td>
                         <td rowspan="{$data.row}">{$data.settlement_contact|default="--"}</td>
                         <td rowspan="{$data.row}">{$data.contact_phone|default="--"}</td>
                         <td rowspan="{$data.row}">{$data.address|default="--"}</td>