|
@@ -56,14 +56,16 @@ class SurveyController extends Controller {
|
|
|
$type = request()->get('type');
|
|
|
if(empty($type)) $type = 'industry';
|
|
|
|
|
|
- $lists = Config::find()->select(['name','value','extra','description','type'])->where(['group' => $type])->all();
|
|
|
+ $lists = ArrayHelper::toArray(Config::find()->select(['name','value','extra','description','type'])->where(['group' => $type])->all());
|
|
|
|
|
|
foreach ($lists as &$value) {
|
|
|
$value['value'] = explode("\r\n",$value['extra']);
|
|
|
+
|
|
|
foreach($value['value'] as &$val){
|
|
|
$val = trim($val);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
unset($value['extra']);
|
|
|
}
|
|
|
|
|
@@ -210,7 +212,6 @@ class SurveyController extends Controller {
|
|
|
// return ['errcode' => CodeEnum::CODE_ERROR, 'errmsg' => '验证码错误'];
|
|
|
// }
|
|
|
|
|
|
-
|
|
|
$list = [];
|
|
|
foreach ($survey as $key=>$value) {
|
|
|
$filter = json_decode($value['filter'],true);
|