Merge pull request '优化' (#597) from hotfix/video_size_limit into master

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

Application/Admin/View/Game/edit.html

@@ -461,7 +461,7 @@
                           </div>
                       <input type="hidden" id="video_url"  name="flooring_page_video"  value="{$data['flooring_page_video']}"/>
                                             </span>
-                        <span class="notice-text">视频大小不能超过50M，支持格式：mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv</span>
+                        <span class="notice-text">视频大小不能超过20M，支持格式：mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv</span>
                     </td>
                 </tr>
 
@@ -1677,7 +1677,7 @@
             // 选择文件的按钮。可选。
             // 内部根据当前运行是创建，可能是input元素，也可能是flash.
             pick: {id:'#pickerVideo'},
-            fileSingleSizeLimit:50*1024*1024,   //设定单个文件大小
+            fileSingleSizeLimit:20*1024*1024,   //设定单个文件大小
             // dnd: true,
             paste: document.body,
             accept: {
@@ -1751,7 +1751,7 @@
             if (type=="Q_TYPE_DENIED"){
                 layer.msg("不支持该视频格式");
             }else if(type=="F_EXCEED_SIZE"){
-                layer.msg("视频大小不能超过50M");
+                layer.msg("视频大小不能超过20M");
             }
         });
 

Application/Base/Tool/GameResource/LeyouClient.class.php

@@ -179,6 +179,10 @@ class LeyouClient
             121221 => ['ref_id' => 121221, 'name' => '20000元专属充值卡', 'amount' => 20000],
             121265 => ['ref_id' => 121265, 'name' => '化妖30元礼包卡', 'amount' => 30],
             121261 => ['ref_id' => 121261, 'name' => '入魔30元礼包卡', 'amount' => 30],
+            121267 => ['ref_id' => 121267, 'name' => '兄弟团购30元激活卡', 'amount' => 30],
+            121268 => ['ref_id' => 121268, 'name' => '兄弟团购68元激活卡', 'amount' => 68],
+            121269 => ['ref_id' => 121269, 'name' => '兄弟团购98元激活卡', 'amount' => 98],
+            121270 => ['ref_id' => 121270, 'name' => '兄弟团购128元激活卡', 'amount' => 128],
         ];
 
         /* return [