修改接口

@@ -1418,10 +1418,16 @@ class Create extends Api
         }
         }
 
 
         if(!empty($id)){
         if(!empty($id)){
-            $data = Db::name('savemes')->where('id',$id)->field('id,thumbnail')->find();
+            $info = Db::name('savemes')->where('id',$id)->field('id,type')->find();
+            //生成二维码
+            $page = '/pages/fileDetail/fileDetail?id='.$id.'&'.'type='.$info['type'].'&'.'user_id='.$user_id;
+            $data['thumbnail'] = $this->qrcode($page,$user_id);
         }
         }
         if(!empty($folder_id)){
         if(!empty($folder_id)){
-            $data = Db::name('folder')->where('id',$folder_id)->field('id,thumbnail')->find();
+            $type = 0;
+            //生成二维码
+            $page = '/pages/fileDetail/fileDetail?id='.$folder_id.'&'.'type='.$type.'&'.'user_id='.$user_id;
+            $data['thumbnail'] = $this->qrcode($page,$user_id);
         }
         }
         $this->success('success',$data);
         $this->success('success',$data);
     }
     }

@@ -394,7 +394,8 @@ class Index extends Api
                     }
                     }
                 }
                 }
             }
             }
-            
+
+
             $v['url'] = request()->domain().'/index/index/filedetail/user_id/'.$v['user_id'].'/file_id/'.$v['id'];
             $v['url'] = request()->domain().'/index/index/filedetail/user_id/'.$v['user_id'].'/file_id/'.$v['id'];
             $list = $tree->getChildrenIds($v['id'],true);
             $list = $tree->getChildrenIds($v['id'],true);
             $is_have = Db::name('rotor')
             $is_have = Db::name('rotor')
@@ -577,7 +578,7 @@ class Index extends Api
 
 
 
 
 
 
-        $Info['foleder'] = $data;
+        $Info['foleder'] = $arrs;
         $Info['note'] = $this->sundry($arr);
         $Info['note'] = $this->sundry($arr);
         $Info['pic'] = $this->sundry($arr_pic);
         $Info['pic'] = $this->sundry($arr_pic);
         $Info['video'] = $this->sundry($arr_video);
         $Info['video'] = $this->sundry($arr_video);
@@ -708,6 +709,7 @@ class Index extends Api
      *
      *
      * @ApiHeaders  (name=token, type=string, required=true, description="请求的Token")
      * @ApiHeaders  (name=token, type=string, required=true, description="请求的Token")
      * @ApiParams   (name="folder_id", type="inter", required=true, description="文件夹id")
      * @ApiParams   (name="folder_id", type="inter", required=true, description="文件夹id")
+     * @ApiParams   (name="user_id", type="inter", required=false, description="用户id")
      *
      *
      * @ApiReturn({
      * @ApiReturn({
     "code": 1,
     "code": 1,
@@ -813,8 +815,10 @@ class Index extends Api
      */
      */
     public function filedetail()
     public function filedetail()
     {
     {
+        $qiniu = get_addon_config('qiniu')['cdnurl'];
         $user_id = $this->auth->id;
         $user_id = $this->auth->id;
         $folder_id = $this->request->param('folder_id');
         $folder_id = $this->request->param('folder_id');
+        $other_user_id = $this->request->param('user_id');
         if(empty($folder_id)){
         if(empty($folder_id)){
             $this->error('缺少必要参数');
             $this->error('缺少必要参数');
         }
         }
@@ -1055,6 +1059,16 @@ class Index extends Api
         $gong2 = $this->gong(3,$video,$zhuan_video);
         $gong2 = $this->gong(3,$video,$zhuan_video);
         $data['video'] = $this->sundry($gong2);
         $data['video'] = $this->sundry($gong2);
 
 
+        if(!empty($other_user_id)){
+            $res_userinfo = Db::name('user')->where('id',$other_user_id)->field('username,avatar')->find();
+            $data['username'] = $res_userinfo['username'];
+            if(!empty($res_userinfo['avatar'])){
+                $data['avatar'] = $qiniu.$res_userinfo['avatar'];
+            }else{
+                $data['avatar'] = '';
+            }
+        }
+
         $this->success('success',$data);
         $this->success('success',$data);
     }
     }