Merge pull request '版本更新-new' (#287) from release into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/287

Addons/UploadImages/upload.html

@@ -45,7 +45,7 @@ $('.btn-close-{$name}').click(function(event) {
             'fileTypeExts'    : '*.jpg; *.jpeg; *.png; *.gif;',
             "onUploadSuccess" : uploadPicture{$name},
             'onFallback' : function() {
-                alert('未检测到兼容版本的Flash.');
+                // alert('未检测到兼容版本的Flash.');
             }
         });
     })

Application/Admin/Controller/FileController.class.php

@@ -202,10 +202,11 @@ class FileController extends AdminController
         /* 调用文件上传组件上传文件 */
         $Picture = D('Picture');
         $pic_driver = C('PICTURE_UPLOAD_DRIVER');
+        // dd(I('icon'));
 
         if (I('icon')) {
-            if ($_FILES['file']['size'] > 51200) {
-                $return = array('status' => 1001, 'info' => '图片大小不得超过50k', 'data' => '');
+            if ($_FILES['file']['size'] > 2*1024*1024) {
+                $return = array('status' => 1001, 'info' => '图片大小不得超过2M', 'data' => '');
                 $this->ajaxReturn($return);
             }
         }

Application/Admin/View/Game/add.html

@@ -49,6 +49,14 @@
                                 <input type="hidden"  name="game_appid" value="">
                             </td>
                         </tr>
+                        <tr>
+                            <td class="l">游戏原包名称：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="original_package_name" value="" placeholder="请输入游戏原包名称">
+                            </td>
+
+                        </tr>
+
                         <tr>
                             <td class="l">游戏类型：</td>
                             <td class="r">
@@ -278,7 +286,7 @@
                                                    </div>
                                                </div>
                           </span>
-                                <span class="notice-text">尺寸不得小于512*512px，圆角半径113px，不强制要求，可直接提供512*512方图</span>
+                                <span class="notice-text">尺寸不得小于512*512px，圆角半径113px，不强制要求，可直接提供512*512方图，不得大于2M</span>
                             </td>
                         </tr>
                         <tr class="picbox">
@@ -1468,7 +1476,7 @@
             thumb:true,
             compress:false,
             prepareNextFile: true,
-            formData: function(){return $.extend(true, {}, userInfo);},
+            formData: function(){return $.extend(true, {icon:1}, userInfo);},
             chunked:false,
             duplicate: true
         });      
@@ -1567,6 +1575,11 @@
 
                 return false;
             });
+            if (response.status==1001) {
+                alert('图片大小不得超过2M');
+                $('#icon_thelist').children().last().remove();
+                location.reload()
+            }
         });
         
          function setIconVal()

Application/Admin/View/Game/edit.html

@@ -316,7 +316,7 @@
                                                    </div>
                                                </div>
                                            </span>
-                                <span class="notice-text">尺寸不得小于125*125px，大小不得超过50K</span>
+                                <span class="notice-text">尺寸不得小于512*512px，圆角半径113px，不强制要求，可直接提供512*512方图，不得大于2M</span>
                             </td>
                         </tr>
                         <tr class="picbox">
@@ -2586,7 +2586,7 @@
             });
 
             if (response.status==1001) {
-                alert('图片大小不得超过50k');
+                alert('图片大小不得超过2M');
                 $('#icon_thelist').children().last().remove();
                 location.reload()
             }

Application/Admin/View/Game/relation.html

@@ -534,7 +534,7 @@ $("#upload_picture_icon").uploadify({
     'fileTypeExts'    : '*.jpg; *.jpeg; *.png; *.gif;',
     "onUploadSuccess" : upload_picture_icon{$field.name},
     'onFallback' : function() {
-        alert('未检测到兼容版本的Flash.');
+        // alert('未检测到兼容版本的Flash.');
     }
 });
 function upload_picture_icon{$field.name}(file, data){
@@ -569,7 +569,7 @@ $("#upload_picture_cover").uploadify({
     'fileTypeExts'    : '*.jpg; *.jpeg; *.png; *.gif;',
     "onUploadSuccess" : upload_picture_cover{$field.name},
     'onFallback' : function() {
-        alert('未检测到兼容版本的Flash.');
+        // alert('未检测到兼容版本的Flash.');
     }
 });
 function upload_picture_cover{$field.name}(file, data){
@@ -602,7 +602,7 @@ $("#upload_picture_detail").uploadify({
     'fileTypeExts'    : '*.jpg; *.jpeg; *.png; *.gif;',
     "onUploadSuccess" : upload_picture_detail{$field.name},
     'onFallback' : function() {
-        alert('未检测到兼容版本的Flash.');
+        // alert('未检测到兼容版本的Flash.');
     }
 });
 function upload_picture_detail{$field.name}(file, data){