Merge branch 'feature/ltv' into dev

Application/Admin/Controller/GameController.class.php

@@ -298,8 +298,8 @@ class GameController extends ThinkController
                 $this->error('一句话简介不能超过30个字！');
                 exit;
             }
-            if (!preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $_POST['beta_url'])) {
-                return $this->error("请填写正确的Bata链接");
+            if (!empty($_POST['beta_url']) && !preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $_POST['beta_url'])) {
+                return $this->error("请填写正确的Beta链接");
             }
             /*if($_POST['apply_status']==0&&$_POST['game_status']==1){
                $this->error('游戏未审核不允许显示');//游戏添加完成

Application/Admin/View/Game/edit.html

@@ -430,14 +430,14 @@
                 </tr>
 
                 <tr>
-                    <td class="l" >Bata版本链接：</td>
+                    <td class="l" >Beta版本链接：</td>
                     <td class="r" colspan="3">
                         <input type="text" class="txt " name="beta_url" value="{$data['beta_url']}" placeholder="请输入Bata版本下载链接">
                     </td>
                 </tr>
 
                 <tr>
-                    <td class="l">Bata版本是否开启</td>
+                    <td class="l">Beta版本是否开启</td>
                     <td class="r" >
                         <span class="form_radio table_btn">
                             <label>