邀请码填写 加入 可选

ZBrettonYe · ZBrettonYe · commit f7fcf238adac · 2018-09-29T15:57:47.000+08:00
diff --git a/resources/views/admin/system.blade.php b/resources/views/admin/system.blade.php
@@ -99,8 +99,12 @@
                                                         <div class="col-md-6">
                                                             <label for="is_invite_register" class="col-md-3 control-label">邀请注册</label>
                                                             <div class="col-md-9">
-                                                                <input type="checkbox" class="make-switch" @if($is_invite_register) checked @endif id="is_invite_register" data-on-color="success" data-off-color="danger" data-on-text="启用" data-off-text="关闭">
-                                                                <span class="help-block"> 启用后必须使用邀请码进行注册 </span>
+                                                              <select id="is_invite_register" class="form-control select2" name="is_invite_register">
+                                                                <option value="0" @if ($is_invite_register == '0') selected @endif>关闭</option>
+                                                                <option value="1" @if ($is_invite_register == '1') selected @endif>可选</option>
+                                                                <option value="2" @if ($is_invite_register == '2') selected @endif>必须</option>
+                                                              </select>
+                                                              <span class="help-block"> 启用后必须使用邀请码进行注册 </span>
                                                             </div>
                                                         </div>
                                                         <div class="col-md-6">
@@ -876,7 +880,7 @@
                 });
             });
         });
-	
+
         // 启用、禁用随机端口
         $('#is_rand_port').on({
             'switchChange.bootstrapSwitch': function(event, state) {
@@ -982,19 +986,17 @@
             }
         });
 
-        // 启用、禁用邀请注册
-        $('#is_invite_register').on({
-            'switchChange.bootstrapSwitch': function(event, state) {
-                var is_invite_register = state ? 1 : 0;
+        // 启用、可选、禁用邀请注册
+        $('#is_invite_register').change(function() {
+            var is_invite_register = $(this).val();
 
                 $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'is_invite_register', value:is_invite_register}, function (ret) {
                     layer.msg(ret.message, {time:1000}, function() {
                         if (ret.status == 'fail') {
                             window.location.reload();
-                        }
-                    });
+                    }
                 });
-            }
+            });
         });
 
         // 启用、禁用用户重置密码
@@ -1251,7 +1253,7 @@
                 });
             }
         });
-	
+
         // 过期封禁是否禁止账号
         $('#is_ban_status').on({
             'switchChange.bootstrapSwitch': function(event, state) {
@@ -1557,7 +1559,7 @@ function setYouzanClientSecret() {
                         window.location.reload();
                     }
                 });
-            }); 
+            });
         });
 
         // 设置注册时默认有效期
diff --git a/resources/views/register.blade.php b/resources/views/register.blade.php
@@ -97,7 +97,7 @@
             @if($is_invite_register)
                 <div class="form-group">
                     <label class="control-label visible-ie8 visible-ie9">{{trans('register.code')}}</label>
-                    <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="{{trans('register.code')}}" name="code" value="{{Request::old('code') ? Request::old('code') : Request::get('code')}}" required />
+                    <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="{{trans('register.code')}}" name="code" value="{{Request::old('code') ? Request::old('code') : Request::get('code')}}" @if($is_invite_register == 2) required @endif />
                 </div>
                 @if($is_free_code)
                     <p class="hint"> <a href="{{url('free')}}" target="_blank">{{trans('register.get_free_code')}}</a> </p>
diff --git a/sql/db.sql b/sql/db.sql
@@ -284,7 +284,7 @@ INSERT INTO `config` VALUES ('1', 'is_rand_port', 0);
 INSERT INTO `config` VALUES ('2', 'is_user_rand_port', 0);
 INSERT INTO `config` VALUES ('3', 'invite_num', 3);
 INSERT INTO `config` VALUES ('4', 'is_register', 1);
-INSERT INTO `config` VALUES ('5', 'is_invite_register', 1);
+INSERT INTO `config` VALUES ('5', 'is_invite_register', 2);
 INSERT INTO `config` VALUES ('6', 'website_name', 'SSRPanel');
 INSERT INTO `config` VALUES ('7', 'is_reset_password', 1);
 INSERT INTO `config` VALUES ('8', 'reset_password_times', 3);
diff --git a/sql/update/20180929.sql b/sql/update/20180929.sql
@@ -0,0 +1,2 @@
+-- 必须邀请注册 重新定义为 新值 2
+UPDATE `config` SET `is_invite_register` = 2 WHERE `is_invite_register` = 1;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- 必须邀请注册重新定义为新值 2`
	`2`	+UPDATE `config` SET `is_invite_register` = 2 WHERE `is_invite_register` = 1;