fixed

lordlezehaf · lordlezehaf · commit dd7e577b296d · 2018-12-25T17:31:47.000+08:00
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -1979,7 +1979,7 @@ public function setConfig(Request $request)
 
         // 演示环境禁止修改特定配置项
         if (env('APP_DEMO')) {
-            if (in_array($name, ['website_url', 'push_bear_send_key', 'push_bear_qrcode', 'youzan_client_id', 'youzan_client_secret', 'kdt_id', 'is_forbid_china', 'trimepay_appid', 'trimepay_appsecret', 'alipay_partner', 'alipay_key', 'alipay_transport', 'alipay_sign_type', 'alipay_private_key', 'alipay_public_key'])) {
+            if (in_array($name, ['website_url', 'min_rand_score', 'max_rand_score', 'push_bear_send_key', 'push_bear_qrcode', 'youzan_client_id', 'youzan_client_secret', 'kdt_id', 'is_forbid_china', 'trimepay_appid', 'trimepay_appsecret', 'alipay_partner', 'alipay_key', 'alipay_transport', 'alipay_sign_type', 'alipay_private_key', 'alipay_public_key'])) {
                 return Response::json(['status' => 'fail', 'data' => '', 'message' => '演示环境禁止修改该配置']);
             }
         }
diff --git a/resources/views/admin/system.blade.php b/resources/views/admin/system.blade.php
@@ -1843,12 +1843,12 @@ function setAlipayPublicKey() {
             var max_rand_score = $("#max_rand_score").val();
 
             if (parseInt(min_rand_score) < 0) {
-                layer.msg('最小积分小于0', {time:1000});
+                layer.msg('最小积分值不能小于0', {time:1000});
                 return ;
             }
 
             if (parseInt(min_rand_score) >= parseInt(max_rand_score)) {
-                layer.msg('最小积分必须小于最大积分', {time:1000});
+                layer.msg('最小积分值必须小于最大积分值', {time:1000});
                 return ;
             }
 
@@ -1867,12 +1867,12 @@ function setAlipayPublicKey() {
             var max_rand_score = $(this).val();
 
             if (parseInt(max_rand_score) > 99999) {
-                layer.msg('最大积分不能大于99999', {time:1000});
+                layer.msg('最大积分值不能大于99999', {time:1000});
                 return ;
             }
 
             if (parseInt(min_rand_score) >= parseInt(max_rand_score)) {
-                layer.msg('最大积分必须大于最小积分', {time:1000});
+                layer.msg('最大积分值必须大于最小积分值', {time:1000});
                 return ;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1979,7 +1979,7 @@ public function setConfig(Request $request)`
`1979`	`1979`
`1980`	`1980`	`// 演示环境禁止修改特定配置项`
`1981`	`1981`	`if (env('APP_DEMO')) {`
`1982`		`- if (in_array($name, ['website_url', 'push_bear_send_key', 'push_bear_qrcode', 'youzan_client_id', 'youzan_client_secret', 'kdt_id', 'is_forbid_china', 'trimepay_appid', 'trimepay_appsecret', 'alipay_partner', 'alipay_key', 'alipay_transport', 'alipay_sign_type', 'alipay_private_key', 'alipay_public_key'])) {`
	`1982`	`+ if (in_array($name, ['website_url', 'min_rand_score', 'max_rand_score', 'push_bear_send_key', 'push_bear_qrcode', 'youzan_client_id', 'youzan_client_secret', 'kdt_id', 'is_forbid_china', 'trimepay_appid', 'trimepay_appsecret', 'alipay_partner', 'alipay_key', 'alipay_transport', 'alipay_sign_type', 'alipay_private_key', 'alipay_public_key'])) {`
`1983`	`1983`	`return Response::json(['status' => 'fail', 'data' => '', 'message' => '演示环境禁止修改该配置']);`
`1984`	`1984`	`}`
`1985`	`1985`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1843,12 +1843,12 @@ function setAlipayPublicKey() {`
`1843`	`1843`	`var max_rand_score = $("#max_rand_score").val();`
`1844`	`1844`
`1845`	`1845`	`if (parseInt(min_rand_score) < 0) {`
`1846`		`- layer.msg('最小积分小于0', {time:1000});`
	`1846`	`+ layer.msg('最小积分值不能小于0', {time:1000});`
`1847`	`1847`	`return ;`
`1848`	`1848`	`}`
`1849`	`1849`
`1850`	`1850`	`if (parseInt(min_rand_score) >= parseInt(max_rand_score)) {`
`1851`		`- layer.msg('最小积分必须小于最大积分', {time:1000});`
	`1851`	`+ layer.msg('最小积分值必须小于最大积分值', {time:1000});`
`1852`	`1852`	`return ;`
`1853`	`1853`	`}`
`1854`	`1854`
`@@ -1867,12 +1867,12 @@ function setAlipayPublicKey() {`
`1867`	`1867`	`var max_rand_score = $(this).val();`
`1868`	`1868`
`1869`	`1869`	`if (parseInt(max_rand_score) > 99999) {`
`1870`		`- layer.msg('最大积分不能大于99999', {time:1000});`
	`1870`	`+ layer.msg('最大积分值不能大于99999', {time:1000});`
`1871`	`1871`	`return ;`
`1872`	`1872`	`}`
`1873`	`1873`
`1874`	`1874`	`if (parseInt(min_rand_score) >= parseInt(max_rand_score)) {`
`1875`		`- layer.msg('最大积分必须大于最小积分', {time:1000});`
	`1875`	`+ layer.msg('最大积分值必须大于最小积分值', {time:1000});`
`1876`	`1876`	`return ;`
`1877`	`1877`	`}`
`1878`	`1878`