Merge branch 'master' into feature/issue_coin

api/controllers/ClientParamsController.php

@@ -23,6 +23,8 @@ class ClientParamsController extends BaseController
         foreach ($data as &$val) {
             if(strpos( $val['url'], ',') !== false) {
                 $val['url'] = explode(',', $val['url']);
+            } else {
+                $val['url'] = [$val['url']];
             }
         }
 

backend/views/public/error.php

@@ -43,7 +43,7 @@
     <p class="success"><?= is_string($message) ? $message : '' ?></p>
     <p class="detail"></p>
     <p class="jump">
-        <b id="wait"><?= is_numeric($waitSecond) ? $waitSecond : 33 ?></b> 秒后页面将自动跳转
+        <b id="wait"><?= isset($waitSecond) ? (is_numeric($waitSecond) ? $waitSecond : 33 ) : 33 ?></b> 秒后页面将自动跳转
     </p>
     <div>
         <a id="href" id="btn-now" href="<?= isset($jumpUrl) ? $jumpUrl : \yii\helpers\Url::toRoute('/') ?>">立即跳转</a>

backend/views/public/success.php

@@ -43,7 +43,7 @@ body{ background: #30333F; color: #fff; font-size: 16px; }
 <p class="success"><?= is_string($message) ? $message : '' ?></p>
 <p class="detail"></p>
 <p class="jump">
-<b id="wait"><?= is_numeric($waitSecond) ? $waitSecond : 33 ?></b> 秒后页面将自动跳转
+<b id="wait"><?= isset($waitSecond) ? (is_numeric($waitSecond) ? $waitSecond : 33 ) : 33 ?></b> 秒后页面将自动跳转
 </p>
 <div>
     <a id="href" id="btn-now" href="<?= isset($jumpUrl) ? $jumpUrl : \yii\helpers\Url::toRoute('/') ?>">立即跳转</a>