diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index 5168c00bd..88fa10232 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -2862,7 +2862,10 @@ function getAdminUsernameList(array $ids)
 
 function isMarketLeader()
 {
-    $authGroup = M('sys_auth_group')->where(['title'=>'市场总监'])->find();
+    if(IS_SUBSITE){
+        return false;
+    }
+    $authGroup = M('auth_group','sys_')->where(['title'=>'市场总监'])->find();
     if (!$authGroup) {
         return false;
     }
@@ -2873,6 +2876,9 @@ function isMarketLeader()
 
 function isMarketAdmin()
 {
+    if(IS_SUBSITE){
+        return false;
+    }
     $ids = getMarketGroupIds();
     if (count($ids) == 0) {
         return false;
diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php
index b4a37a725..24751d655 100644
--- a/Application/Admin/Controller/GameController.class.php
+++ b/Application/Admin/Controller/GameController.class.php
@@ -355,6 +355,11 @@ class GameController extends ThinkController
             if ($invalid || $inv == '') {
                 $this->error('关联数据错误');
             }
+
+            if ($_GET['type'] != 2) {
+                $this->assign('show_status', 1);
+            }
+
             $suffix = $inv['sdk_version'] == 1 ? "PGB" : "AZB";
             $inv['short'] = substr($inv['short'], 0, -3) . $suffix;
             $this->assign('data', $inv);
diff --git a/Application/Admin/View/Game/relation.html b/Application/Admin/View/Game/relation.html
index a4922054a..e6e03be02 100644
--- a/Application/Admin/View/Game/relation.html
+++ b/Application/Admin/View/Game/relation.html
@@ -39,10 +39,17 @@
                         <input type="hidden"  name="game_appid" value="{:generate_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']}" readonly = 'true' placeholder="请输入游戏原包名称">
+                    </td>
+
+                </tr>
                 <tr>
                     <td class="l">游戏类型：</td>
                     <td class="r">
-                        <select id="game_type_id" name="game_type_id" disabled="true" style="background:#e7e7e7">
+                        <select id="game_type_id" name="game_type_id">
                             <volist name=":get_game_type_all()" id="vo">
                                 <if condition="$vo[id] eq $data[game_type_id]">
                                     <option value="{$vo.id}" selected>{$vo.type_name}</option>
@@ -173,33 +180,56 @@
                     </td>
                 </tr>
                 <empty name='show_status'>
+                    <tr>
+                        <td class="l" >一句话简介：</td>
+                        <td class="r" colspan="3">
+                            <input type="text" class="txt " name="features" value="{$data['features']}" placeholder="输入一句话简介">
+                        </td>
+                    </tr>
+                    <else/>
+                    <tr>
+                        <td class="l" >一句话简介：</td>
+                        <td class="r" >
+                            <input type="text" class="txt " name="features" value="{$data['features']}" placeholder="输入一句话简介">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="l" >游戏开发商：</td>
+                        <td class="r" >
+                            <input type="text" class="txt " name="dev_name" value="{$data['dev_name']}" placeholder="输入开发商名称">
+                        </td>
+                    </tr>
+                </empty>
+
                 <tr>
-                    <td class="l" >游戏简介：</td>
-                    <td class="r" colspan="3">
-                        <input type="text" class="txt " name="features" value="{$data['features']}" readonly = "readonly" style="background:#e7e7e7">
-                    </td>
-                </tr>    
-                <else/>
-                <tr>
-                    <td class="l" >游戏简介：</td>
+                    <td class="l" >合作方：</td>
                     <td class="r" >
-                        <input type="text" class="txt " name="features" value="{$data['features']}" readonly = "readonly" style="background:#e7e7e7">
+                        <select id="partner_id" name="partner_id">
+                            <option value="">请选择合作方</option>
+                            <volist name=":getPartnerList()" id="vo">
+                                <option value="{$vo.id}"
+                                <eq name="data.partner_id" value="$vo.id"> selected </eq>>{$vo.partner}
+                                </option>
+                            </volist>
+                        </select>
                     </td>
                 </tr>
                 <tr>
-                    <td class="l" >游戏开发商：</td>
-                    <td class="r" >
-                        <input type="text" class="txt " name="dev_name" value="{$data['dev_name']}" readonly = "readonly" style="background:#e7e7e7">
+                    <td class="l">游戏简介：</td>
+                    <td class="r">
+                        <textarea name="introduction" class="txt_area">{$data['introduction']}</textarea>
                     </td>
                 </tr>
-                </empty>
-                
+
                 <tr>
-                    <td class="l">详细介绍：</td>
+                    <td class="l">游戏资料中心：</td>
                     <td class="r">
-                        <textarea name="introduction" class="txt_area" readonly = "readonly" style="background:#e7e7e7"></textarea>
+                        <textarea name="detail_content" class="txt_area">{$data['detail_content']}</textarea>
+                        {:hook('adminArticleEdit', array('name'=>'detail_content','value'=>$field['value']))}
                     </td>
                 </tr>
+                
+               
                 <tr class="picbox">
                     <td class="l noticeinfo" >游戏图标</td>
                     <td class="r">
@@ -264,6 +294,15 @@
                       <span class="notice-text">(尺寸：210*350px)上传游戏的截图信息，此处截图在游戏详情页显示</span>
                     </td>
                 </tr>
+
+                <tr class="picbox">    
+                    <td class="l noticeinfo">落地页图片</td>
+                    <td class="r">
+                      {:hook('UploadImages', array('name'=>'flooring_page_imgs','value'=>$data['flooring_page_imgs']))}
+                      <span class="notice-text">(尺寸：210*350px)上传游戏的截图信息，此处截图在游戏详情页显示</span>
+                    </td>
+                </tr>
+
                 </tbody>
             </table>
         </div>