Merge branch 'dev' of wugg/fivechang into master

application/Admin/controller/Login.php

@@ -44,7 +44,7 @@ class Login
                return error_show(1006,"账户密码错误");
            }
         $token = makeToken($account);
-        $userinfo = Db::name("account_info")->alias("a")->join("fc_rela_account b","b.account_info=a.id")->where(["b.accountid"=>$account['id']])->field("a.*")->find();
+        $userinfo = ["username"=>$account['username'],"nickname"=>$account['nickname'],"mobile"=>$account['mobile'],"role_id"=>$account['role_id']];
         $userinfo['token'] = $token;
         write_log("账户{$account['username']}登录系统","","login","",0);
         return app_show(0,"登录成功",$userinfo);

application/Admin/controller/Stock2.php

@@ -218,6 +218,7 @@ class Stock2 extends Base
         if($video_img==""){
             return error_show(1004,"视频图片不能为空");
         }
+        $remark = isset($this->post['remark']) && $this->post['remark'] !== "" ? trim($this->post['remark']) : "";
         Db::startTrans();
         try{
             $data=[
@@ -226,7 +227,8 @@ class Stock2 extends Base
                 "video_url"=>$video_url,
                 "video_img"=>$video_img,
                 "updatetime"=>date("Y-m-d H:i:s"),
-                "weight"=>$weight
+                "weight"=>$weight,
+                "remark"=>$remark
            ];
 
             $video_name= Db::name("video")->update($data);