From 03f4130e9e30ebfa7bf7c739d2e1003ab45344a1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 30 Jun 2020 11:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8A=E6=B8=B8=E5=90=88?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/PromoteCompany/lists.html      | 21 ++++++-------------
 Data/update.sql                               |  2 +-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html
index b2bc08fb2..104320b5f 100644
--- a/Application/Admin/View/PromoteCompany/lists.html
+++ b/Application/Admin/View/PromoteCompany/lists.html
@@ -100,8 +100,8 @@
     <div class="cf top_nav_list clearfix" style="margin-top: -15px;clear: both;height: 52px;">
         <div class="fl button_list" style="margin: 0;">
             <div class="tools">
-                <a class="ajax-post" target-form="ids" url="{:U('PromoteCompany/marketingDirectorShow', ['isShow'=>1])}"><span class="button_icon "></span>展示市场总监信息</a>
-                <a class="ajax-post" target-form="ids" url="{:U('PromoteCompany/marketingDirectorShow', ['isShow'=>2])}"><span class="button_icon "></span>隐藏市场总监信息</a>
+                <a class="ajax-post" target-form="ids" url="{:U('PromoteCompany/marketingDirectorShow', ['isShow'=>1])}"><span class="button_icon " style="margin-top: 0;"></span>展示市场总监信息</a>
+                <a class="ajax-post" target-form="ids" url="{:U('PromoteCompany/marketingDirectorShow', ['isShow'=>2])}"><span class="button_icon " style="margin-top: 0;"></span>隐藏市场总监信息</a>
             </div>
         </div>
     </div>
@@ -260,15 +260,6 @@
     <div class="page">
         {$_page|default=''}
     </div>
-		
-		<!-- <div class="common_settings">
-			<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
-			<form class="addShortcutIcon">
-				<input type="hidden" name="title" value="{$meta_title}">
-				<input type="hidden" name="url" value="Partner/lists">
-			</form>
-			<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
-        </div> -->
         <div class="pro_promot" style="display:none">
             <form action="{:U('saveCompanyGame')}" id="ajaxForm" method="post" />
             <input type="hidden" name="promote_id" id="se_promote_id" value="" />
@@ -446,9 +437,9 @@
                     lis.push('<li class="fl pro_promot_game_con" data-short="'+ele.short+'">');
 
 
-                    if(promote_info['game_ids']==''){
-                        lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
-                    }else{
+                    // if(promote_info['game_ids']==''){
+                    //     lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
+                    // }else{
                         if(promote_info['game_ids'].indexOf(ele.id)>-1){
                             lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
                         }else{
@@ -456,7 +447,7 @@
                             lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" id="gameCheck'+index+'" />');
                             checked = '';
                         }
-                    }
+                    // }
 
                     lis.push('<label for="gameCheck'+index+'" class="fl"></label>');
                     lis.push('<span class="fl pro_promot_game_name">'+ele.game_name+'</span>');
diff --git a/Data/update.sql b/Data/update.sql
index 474f85514..98ed05d96 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -2074,4 +2074,4 @@ ADD COLUMN `fax_ratio`  varchar(20) NULL COMMENT '开票税率' AFTER `ali_accou
 
 --20200630 cz
 ALTER TABLE `tab_promote_company`
-ADD COLUMN `game_ids`  varchar(300) NOT NULL DEFAULT '' COMMENT '可申请游戏 空值表示所有' AFTER `marketing_director_show`;
\ No newline at end of file
+ADD COLUMN `game_ids`  varchar(300) NOT NULL DEFAULT '' COMMENT '可申请游戏 空值表示没有' AFTER `marketing_director_show`;
\ No newline at end of file