diff --git a/application/index/controller/Home.php b/application/index/controller/Home.php
index 0c57d863..cbf882bc 100644
--- a/application/index/controller/Home.php
+++ b/application/index/controller/Home.php
@@ -35,7 +35,7 @@ class Home extends Controller{
'extLimit' => $extLimit,
'policyData' => $policyData,
'groupData' => $groupData,
- 'path' => input("?get.path")?input("get.path"):"",
+ 'path' => empty(input("get.path"))?"/":input("get.path"),
]);
}
@@ -48,39 +48,5 @@ class Home extends Controller{
'groupData' => $groupData,
]);
}
-
- public function Album(){
- $userInfo = $this->userObj->getInfo();
- $list = Db::name("files")->where("upload_user",$this->userObj->uid)
- ->where(function ($query) {
- $query->where('orign_name', "like","%jpg")
- ->whereor('orign_name', "like","%png")
- ->whereor('orign_name', "like","%gif")
- ->whereor('orign_name', "like","%bmp");
- })
- ->order('id DESC')
- ->paginate(9);
- $pageCount = ceil(Db::name("files")->where("upload_user",$this->userObj->uid)
- ->where(function ($query) {
- $query->where('orign_name', "like","%jpg")
- ->whereor('orign_name', "like","%png")
- ->whereor('orign_name', "like","%gif")
- ->whereor('orign_name', "like","%bmp");
- })
- ->order('id DESC')->count()/9);
- $listData = $list->all();
- $pageNow = input("?get.page")?input("get.page"):1;
- if($pageNow>$pageCount){
- $this->error('您当前没有上传任何图片',404,Option::getValues(['basic','group_sell']));
- }
- return view('album', [
- 'options' => Option::getValues(['basic','group_sell']),
- 'userInfo' => $userInfo,
- 'list' => $listData,
- 'listOrigin' => $list,
- 'pageCount' => $pageCount,
- 'page' => $pageNow,
- ]);
- }
}
diff --git a/application/index/controller/Viewer.php b/application/index/controller/Viewer.php
new file mode 100644
index 00000000..352bc96a
--- /dev/null
+++ b/application/index/controller/Viewer.php
@@ -0,0 +1,39 @@
+userObj = new User(cookie('user_id'),cookie('login_key'));
+ // if(!$this->userObj->loginStatus){
+ // $this->redirect(url('/Login','',''));
+ // exit();
+ // }
+ $this->userObj = new User(cookie('user_id'),cookie('login_key'));
+ }
+
+ public function Video(){
+ $path = input("get.path");
+ $pathSplit = explode("/",urldecode($path));
+ $userInfo = $this->userObj->getInfo();
+ $groupData = $this->userObj->getGroupData();
+ return view('video', [
+ 'options' => Option::getValues(['basic']),
+ 'userInfo' => $userInfo,
+ 'groupData' => $groupData,
+ 'url' => "/File/Preview?action=preview&path=".$path,
+ 'fileName' => end($pathSplit),
+ ]);
+ }
+
+
+}
diff --git a/application/index/view/home/home.html b/application/index/view/home/home.html
index 872d4146..00ca69d3 100644
--- a/application/index/view/home/home.html
+++ b/application/index/view/home/home.html
@@ -20,6 +20,7 @@
-->
我的文件 - {$options.siteName}
@@ -67,5 +72,7 @@
To create a production bundle, use `npm run build` or `yarn build`.
-->
-
+
+
+