diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html
index 5ec080c69..1575e142f 100644
--- a/Application/Admin/View/Game/add.html
+++ b/Application/Admin/View/Game/add.html
@@ -658,10 +658,20 @@
                                 <span class="notice-text">在微信开放平台申请创建的应用签名（fd0e6a444fd988bf23ce8a1818623b58），若无此项可不填写（待定）</span>
                             </td>
                         </tr>
+                        <tr>
+                            <td class="l noticeinfo">客服QQ类型</td>
+                            <td class="r">
+                                <select name="kefu_qq_type">
+                                    <option value="0">默认跟随系统</option>
+                                    <option value="1">没有客服QQ</option>
+                                    <option value="2">特殊客服QQ</option>
+                                </select>
+                            </td>
+                        </tr>
                         <tr>
                             <td class="l noticeinfo">客服QQ</td>
                             <td class="r">
-                                <input type="text" class="txt" name="ccustom_service_qq" value="" placeholder="游戏客服QQ">
+                                <input type="text" class="txt" name="kefu_qq" value="" placeholder="游戏客服QQ">
                                 <span class="notice-text">在游戏里遇到问题点击联系QQ</span>
 
                             </td>
diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html
index 98396bba9..e36b7e21e 100644
--- a/Application/Admin/View/Game/edit.html
+++ b/Application/Admin/View/Game/edit.html
@@ -874,14 +874,25 @@
 
                     </td>
                 </tr>
+                <tr>
+                    <td class="l noticeinfo">客服QQ类型</td>
+                    <td class="r">
+                        <select name="kefu_qq_type">
+                            <option value="0" <if condition="$data['kefu_qq_type'] eq 0"> selected </if>>默认跟随系统</option>
+                            <option value="1" <if condition="$data['kefu_qq_type'] eq 1"> selected </if>>没有客服QQ</option>
+                            <option value="2" <if condition="$data['kefu_qq_type'] eq 2"> selected </if>>特殊客服QQ</option>
+                        </select>
+                    </td>
+                </tr>
                 <tr>
                     <td class="l noticeinfo">客服QQ</td>
                     <td class="r">
-                        <input type="text" class="txt" name="ccustom_service_qq" value="{$data['ccustom_service_qq']}" placeholder="游戏客服QQ">
+                        <input type="text" class="txt" name="kefu_qq" value="{$data['kefu_qq']}" placeholder="游戏客服QQ">
                         <span class="notice-text">在游戏里遇到问题点击联系QQ</span>
 
                     </td>
                 </tr>
+
                 </tbody>
             </table>
         </div>
@@ -975,7 +986,7 @@
         
 
          <!--推广配置-->
-         <div id="tab6" class="tab-pane tab6 ">
+         <!-- <div id="tab6" class="tab-pane tab6 ">
             <input type="button" id="addpromote" onclick="addPromote()" style="background: #3E96C9;color:white;border:none;outline: none;width:90px;height:30px;border-radius: 3px;" value="添加" />
             <div class="data_list data_game_list" id="addpromoteindex" style="margin-top:20px;">
             <div class="">
@@ -1056,7 +1067,7 @@
             <input type="hidden" name="group_id" id="group_id" value="{$_GET['group_id']}">
             <input type="hidden"  name="promote_data" id="promote_data" value="[]">
             <div id="transfer_promote" class="demo-transfer"  style="margin-left: 100px;margin-top: 35px;display:none"></div>
-        </div>
+        </div> -->
     
         <div class="form-item cf">
             <input type="hidden" name='id' value="{$data['id']}" />
diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html
index da4b146ed..9c6091c88 100644
--- a/Application/Admin/View/PromoteCompany/add.html
+++ b/Application/Admin/View/PromoteCompany/add.html
@@ -24,6 +24,7 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"charset="UTF-8"></script>
     <script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
     <script src="__STATIC__/czinputcheck.js?v=07151710" type="text/javascript"></script>
+    <script type="text/javascript" src="__JS__/uploader.js"></script>
     <style>
         .coin-detail{
             display: block;
@@ -360,6 +361,71 @@
                             </td>
                         </tr>
 
+                        <tr>
+                            <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否定制推广后台：</td>
+                            <td class="r table_radio">
+                                <span class="form_radio table_btn">
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="1"  name="is_site_custom" > 是
+                                    </label>
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="0"  name="is_site_custom" checked> 否
+                                    </label>
+                                </span>
+                                <span class="notice-text"></span>
+                            </td>
+                        </tr>
+
+                        <tr class="site-custom-item" style="display: none;">
+                            <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>推广后台域名前缀：</td>
+                            <td class="r" >
+                                <input type="text" class="txt" style="float: none;" name="site_domain_prefix" value="" placeholder="请输入推广后台域名前缀">
+                                <span class="notice-text" style="float: none;">请确保唯一。完整地址： <span id="site-url-show" style="color: red; font-weight: bold;" data-domain="<?=C('DOMAIN', null, null)?>">无</span></span>
+                            </td>
+                        </tr>
+
+                        <tr class="picbox site-custom-item" style="display: none;">
+                            <td class="l noticeinfo" ><i class="mustmark" style="margin-left:-7px">*</i>推广后台ICON</td>
+                            <td class="r">
+                                <span class="table_btn table_upload table_icon" style="float: none;">
+                                    <div class="upload-wrapper">
+                                        <input type="hidden" id="site-icon" name="site_config[icon]" value="" />
+                                        <div class="btns">
+                                            <div id="icon-uploader">
+                                                <div class="webuploader-pick" style="line-height:13px">上传图标</div>
+                                            </div>
+                                        </div>
+                                        <!--用来存放文件信息-->
+                                        <div class="uploader-list" style="display: flex;">
+
+                                        </div>
+                                    </div>
+                                </span>
+                                <span class="notice-text">尺寸为16*16px，png图片</span>
+                            </td>
+                        </tr>
+
+                        <tr class="picbox site-custom-item" style="display: none;">
+                            <td class="l noticeinfo" ><i class="mustmark" style="margin-left:-7px">*</i>推广后台LOGO</td>
+                            <td class="r">
+                                <span class="table_btn table_upload table_icon" style="float: none;">
+                                    <div class="upload-wrapper">
+                                        <input type="hidden" id="site-logo" name="site_config[logo]" value="" />
+                                        <div class="btns">
+                                            <div id="logo-uploader">
+                                                <div class="webuploader-pick" style="line-height:13px">上传图标</div>
+                                            </div>
+                                        </div>
+                                        <!--用来存放文件信息-->
+                                        <div class="uploader-list" style="display: flex;">
+
+                                        </div>
+                                    </div>
+                                </span>
+                                <span class="notice-text">尺寸为210*60px，透明png图片</span>
+                            </td>
+                        </tr>
+
                         <tr>
                             <td class="l noticeinfo">文档管理</td>
                             <td class="r table_radio">
@@ -393,7 +459,7 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
                                 <td class="r" style="width: 50px;">
                                   <select name="part_a_type" id="part_a_type" class="select_gallery">
-                                      <option  value="1" selected>上游CP公司</option>
+                                      <option  value="1" selected>下游推广公司</option>
                                       <option  value="2">己方公司</option>
                                   </select>
                                   <span class="notice-text"></span>
@@ -401,13 +467,13 @@
                                 <td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
                                 <td class="r">
                                   <select name="part_b_type" id="part_b_type" class="select_gallery" style="">
-                                      <option  value="1" >上游CP公司</option>
+                                      <option  value="1" >下游推广公司</option>
                                       <option  value="2" selected>己方公司</option>
                                   </select>
                                   <span class="notice-text"></span>
                                 </td>
                             </tr>
-                            <!-- 
+                            <!--
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>己方公司:</td>
                                 <td class="r">
@@ -421,14 +487,14 @@
                                   </select>
                                   <span class="notice-text"></span>
                                 </td>
-                            </tr> 
+                            </tr>
                             -->
-                            
+
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="r" style="width: 50px;">
                                   <select name="part_a" id="part_a" class="select_gallery">
-                                      
+
                                   </select>
                                   <span class="notice-text"></span>
                                 </td>
@@ -436,7 +502,7 @@
                                 <td class="r">
                                   <select name="part_b" id="part_b" class="select_gallery" style="">
                                       <?php foreach($selfCompanies as $selfCompany):?>
-                                      <option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
+                                      <option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='福建金菠菜网络科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
                                       <?php endforeach;?>
                                   </select>
                                   <span class="notice-text"></span>
@@ -1316,5 +1382,66 @@
                 $('#deposit-pay-way').val('')
             }
         })
+
+        var uploadUrl = "{:U('File/uploadPicture', ['session_id'=>session_id(), 'flag'=>true])}"
+        var iconUploader = new WmUploader({
+            selector: '#icon-uploader',
+            url: uploadUrl,
+            accept: {
+                title: '图片',
+                extensions: 'png',
+                mimeTypes: 'image/*',
+            },
+            afterSuccess: function(file, response) {
+                if (response.status == 0) {
+                    return layer.msg(response.info)
+                }
+                $('#site-icon').val(response.id)
+            },
+            afterDelete: function(file) {
+                $('#site-icon').val('')
+            }
+        })
+        var logoUploader = new WmUploader({
+            selector: '#logo-uploader',
+            url: uploadUrl,
+            accept: {
+                title: '图片',
+                extensions: 'png',
+                mimeTypes: 'image/*',
+            },
+            afterSuccess: function(file, response) {
+                if (response.status == 0) {
+                    return layer.msg(response.info)
+                }
+                $('#site-logo').val(response.id)
+            },
+            afterDelete: function(file) {
+                $('#site-logo').val('')
+            }
+        })
+
+        $('input[name=is_site_custom]').on({
+            click: function() {
+                var isSiteCustom = $('input[name=is_site_custom]:checked').val()
+                if (isSiteCustom == 1) {
+                    $('.site-custom-item').show()
+                } else {
+                    $('.site-custom-item').hide()
+                }
+            }
+        })
+
+        $('input[name=site_domain_prefix]').on({
+            blur: function() {
+                var domain = $('#site-url-show').attr('data-domain');
+                var prefix = $.trim($(this).val());
+                if (domain != '' && prefix != '') {
+                    $('#site-url-show').html('https://tg-' + prefix + domain)
+                } else {
+                    $('#site-url-show').html('无')
+                }
+            }
+        })
     </script>
 </block>
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index f609b95a1..1d992c738 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -24,6 +24,7 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"charset="UTF-8"></script>
     <script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
     <script src="__STATIC__/czinputcheck.js?v=1.29" type="text/javascript"></script>
+    <script type="text/javascript" src="__JS__/uploader.js"></script>
     <style>
         .coin-detail{
             display: block;
@@ -361,6 +362,93 @@
                                 <span class="notice-text"></span>
                             </td>
                         </tr>
+
+                        <tr>
+                            <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否定制推广后台：</td>
+                            <td class="r table_radio">
+                                <span class="form_radio table_btn">
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="1"  name="is_site_custom" <if condition="$data['is_site_custom'] eq 1">checked</if>> 是
+                                    </label>
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="0"  name="is_site_custom" <if condition="$data['is_site_custom'] eq 0">checked</if>> 否
+                                    </label>
+                                </span>
+                                <span class="notice-text"></span>
+                            </td>
+                        </tr>
+
+                        <tr class="site-custom-item" <?php if($data['is_site_custom'] == 0):?>style="display:none"<?php endif;?>>
+                            <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>推广后台域名前缀：</td>
+                            <td class="r" >
+                                <?php
+                                    $domain = C('DOMAIN', null, null);
+                                    $siteUrl = '无';
+                                    if ($domain && !empty($data['site_domain_prefix'])) {
+                                        $siteUrl = 'https://tg-' . $data['site_domain_prefix'] . $domain;
+                                    }
+                                ?>
+                                <input type="text" class="txt" style="float: none;" name="site_domain_prefix" value="{$data.site_domain_prefix}" placeholder="请输入推广后台域名前缀">
+                                <span class="notice-text" style="float: none;">请确保唯一。完整地址： <span id="site-url-show" style="color: red; font-weight: bold;" data-domain="<?=$domain?>"><?=$siteUrl?></span></span>
+                            </td>
+                        </tr>
+
+                        <tr class="picbox site-custom-item" <?php if($data['is_site_custom'] == 0):?>style="display:none"<?php endif;?>>
+                            <td class="l noticeinfo" ><i class="mustmark" style="margin-left:-7px">*</i>推广后台ICON</td>
+                            <td class="r">
+                                <span class="table_btn table_upload table_icon" style="float: none;">
+                                    <div class="upload-wrapper">
+                                        <input type="hidden" id="site-icon" name="site_config[icon]" value="<?=$siteConfig ? $siteConfig['icon'] : ''?>" />
+                                        <div class="btns">
+                                            <div id="icon-uploader">
+                                                <div class="webuploader-pick" style="line-height:13px">上传图标</div>
+                                            </div>
+                                        </div>
+                                        <!--用来存放文件信息-->
+                                        <div class="uploader-list" style="display: flex;">
+                                            <?php if(!empty($siteConfig['icon'])):?>
+                                            <div id="<?=$siteConfig['icon']?>" class="item flooring_page_img_box" style="margin-right: 10px;">
+                                                <a href="javascript:;"><img src="<?=get_cover($siteConfig['icon'], 'path')?>" style="width: 100px;height: 100px;cursor: move;"></a>
+                                                <h4 class="info" style="text-align: center;">
+                                                    <a href="javascript:;" class="file-delete table_click" style="float:none;display:inline-block;" data-ref-tag="#site-icon">删除</a>
+                                                </h4>
+                                            </div>
+                                            <?php endif;?>
+                                        </div>
+                                    </div>
+                                </span>
+                                <span class="notice-text">尺寸为16*16px，png图片</span>
+                            </td>
+                        </tr>
+
+                        <tr class="picbox site-custom-item" <?php if($data['is_site_custom'] == 0):?>style="display:none"<?php endif;?>>
+                            <td class="l noticeinfo" ><i class="mustmark" style="margin-left:-7px">*</i>推广后台LOGO</td>
+                            <td class="r">
+                                <span class="table_btn table_upload table_icon" style="float: none;">
+                                    <div class="upload-wrapper">
+                                        <input type="hidden" id="site-logo" name="site_config[logo]" value="<?=$siteConfig ? $siteConfig['logo'] : ''?>" />
+                                        <div class="btns">
+                                            <div id="logo-uploader">
+                                                <div class="webuploader-pick" style="line-height:13px">上传图标</div>
+                                            </div>
+                                        </div>
+                                        <!--用来存放文件信息-->
+                                        <div class="uploader-list" style="display: flex;">
+                                            <?php if(!empty($siteConfig['logo'])):?>
+                                            <div id="<?=$siteConfig['logo']?>" class="item flooring_page_img_box" style="margin-right: 10px;">
+                                                <a href="javascript:;"><img src="<?=get_cover($siteConfig['logo'], 'path')?>" style="width: 100px;height: 100px;cursor: move;"></a>
+                                                <h4 class="info" style="text-align: center;">
+                                                    <a href="javascript:;" class="file-delete table_click" style="float:none;display:inline-block;" data-ref-tag="#site-logo">删除</a>
+                                                </h4>
+                                            </div>
+                                            <?php endif;?>
+                                        </div>
+                                    </div>
+                                </span>
+                                <span class="notice-text">尺寸为210*60px，透明png图片</span>
+                            </td>
+                        </tr>
+
                         <tr>
                             <td class="l noticeinfo">文档管理</td>
                             <td class="r table_radio">
@@ -397,7 +485,7 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
                                 <td class="r" style="width: 50px;">
                                     <select name="part_a_type" id="part_a_type" class="select_gallery">
-                                        <option  value="1" selected>上游CP公司</option>
+                                        <option  value="1" selected>下游推广公司</option>
                                         <option  value="2">己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
@@ -405,7 +493,7 @@
                                 <td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
                                 <td class="r">
                                     <select name="part_b_type" id="part_b_type" class="select_gallery" >
-                                        <option  value="1" >上游CP公司</option>
+                                        <option  value="1" >下游推广公司</option>
                                         <option  value="2" selected>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
@@ -1164,6 +1252,71 @@
         if ($('#deposit-pay-type').val() == 3) {
             $('.need-amount').hide();
         }
-        // $('#deposit-pay-type').change()
+        
+        var uploadUrl = "{:U('File/uploadPicture', ['session_id'=>session_id(), 'flag'=>true])}"
+        var iconUploader = new WmUploader({
+            selector: '#icon-uploader',
+            url: uploadUrl,
+            accept: {
+                title: '图片',
+                extensions: 'png,ico',
+                mimeTypes: 'image/*',
+            },
+            afterSuccess: function(file, response) {
+                if (response.status == 0) {
+                    return layer.msg(response.info)
+                }
+                $('#site-icon').val(response.id)
+            },
+            afterDelete: function(file) {
+                $('#site-icon').val('')
+            }
+        })
+        var logoUploader = new WmUploader({
+            selector: '#logo-uploader',
+            url: uploadUrl,
+            accept: {
+                title: '图片',
+                extensions: 'png',
+                mimeTypes: 'image/*',
+            },
+            afterSuccess: function(file, response) {
+                if (response.status == 0) {
+                    return layer.msg(response.info)
+                }
+                $('#site-logo').val(response.id)
+            },
+            afterDelete: function(file) {
+                $('#site-logo').val('')
+            }
+        })
+
+        $('input[name=is_site_custom]').on({
+            click: function() {
+                var isSiteCustom = $('input[name=is_site_custom]:checked').val()
+                if (isSiteCustom == 1) {
+                    $('.site-custom-item').show()
+                } else {
+                    $('.site-custom-item').hide()
+                }
+            }
+        })
+        $('input[name=site_domain_prefix]').on({
+            blur: function() {
+                var domain = $('#site-url-show').attr('data-domain');
+                var prefix = $.trim($(this).val());
+                if (domain != '' && prefix != '') {
+                    $('#site-url-show').html('https://tg-' + prefix + domain)
+                } else {
+                    $('#site-url-show').html('无')
+                }
+            }
+        })
+
+        $('.uploader-list').children().children('h4').children('.file-delete').on('click', function() {
+            var tag = $(this).attr('data-ref-tag');
+            $(this).parent().parent().remove();
+            $(tag).val('')
+        });
     </script>
 </block>