web / yoho-live · Commits

Go to a project

Authored by wuxiao
Commit 483e340ab251be0563d1f64edc6d65c5e9ba16bd 2 parents a29ba624 4f260911

Merge branch 'test' into develop

Inline Side-by-side
Showing 2 changed files with 24 additions and 14 deletions
... ... @@ -67,21 +67,31 @@ class ForbiddenController extends BaseController
{
$model = new Forbidden();
if ($posts = Yii::$app->request->post()) {
$model->room_id = $posts['room_id'];
$model->uid = $posts['uid'];
$model->name = $posts['name'];
$model->status = 1;
$model->create_time = time();
if (!$model->save()) {
do {
$model->room_id = $posts['room_id'];
$model->uid = $posts['uid'];
$model->name = $posts['name'];
if (!$model->uid || !$model->name) {
$code = 400;
$msg = '用户id、昵称必填！';
break;
}
$model->status = 1;
$model->create_time = time();
if (!$model->save()) {
// var_dump($model->errors);
$code = 400;
$code_str = 'error';
$msg = '添加失败。'.current($model->getFirstErrors());
} else {
$code = 200;
$code_str = 'success';
$msg = '添加成功。';
$code = 400;
$code_str = 'error';
$msg = '添加失败。'.current($model->getFirstErrors());
} else {
$code = 200;
$code_str = 'success';
$msg = '添加成功。';
}
}
while(false);
if(Yii::$app->request->isAjax){
$this->renderJson($code,$msg);
}else{
... ...
... ... @@ -25,7 +25,7 @@ class LivingController extends BaseController
$key = __CLASS__.__FUNCTION__.'app'.$this->app;
if (!$ret = $this->cache->get($key)){
$ret = Room::find()->with(['master'])->where(['and',['!=','best','0'],['app'=>$this->app]])->limit(2)->orderBy(['best'=>SORT_ASC])->all();
$ret = Room::find()->with(['master'])->where(['and',['!=','best','0'],['app'=>$this->app]])->limit(2)->orderBy(['best'=>SORT_DESC])->all();
foreach ($ret as $k=>$model){
$row = [
... ...