feat: 3.1.9 新增排序方式切换功能.

lkw199711 · Apr 1, 2023 · c6484d5 · c6484d5
1 parent 21646ff
commit c6484d5
Show file tree

Hide file tree

Showing 18 changed files with 1,030 additions and 895 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "smanga",
-  "version": "3.1.8",
+  "version": "3.1.9",
   "private": true,
   "scripts": {
     "serve": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",

diff --git a/php/manga/get.php b/php/manga/get.php
@@ -6,18 +6,39 @@
 	$mediaId = $_POST['mediaId'];
 	$pageSize = $_POST['pageSize'];
 	$recordStart = $_POST['recordStart'];
+	$order = $_POST['order'];
 
 	if ($mediaId) {
-		# 执行查询
-		$sqlRes=dosql(array(
+		$params = array(
 			'table'=>'manga,media',
 			'name'=>['manga.mediaId','mangaId','mangaName','mangaCover','chapterCount','browseType','mangaPath',
-				'manga.chapterCount','manga.updateTime','manga.direction','manga.removeFirst',
+				'manga.chapterCount','manga.updateTime','manga.direction','manga.removeFirst','manga.createTime',
 				'media.direction as mediaDirection','media.removeFirst as mediaRemoveFirst'],
 			'where'=>['manga.mediaId='.$mediaId,'manga.mediaId=media.mediaId'],
 			'limit'=>$pageSize,
 			'start'=>$recordStart,
-		));
+		);
+
+		// 设置排序规则
+		if ($order) {
+			if ($order==='name') {
+				$params['order'] = 'mangaName';
+
+			}elseif ($order==='nameDesc') {
+				$params['order'] = 'mangaName';
+				$params['desc'] = true;
+
+			}elseif ($order==='time') {
+				$params['order'] = 'manga.createTime';
+
+			}elseif ($order==='timeDesc') {
+				$params['order'] = 'manga.createTime';
+				$params['desc'] = true;
+			}
+		}
+
+		# 执行查询
+		$sqlRes=dosql($params);
 
 		$count = dosql(array(
 			'table'=>'manga',

diff --git a/src/api/manga.ts b/src/api/manga.ts
@@ -6,11 +6,11 @@ import {ajax} from "./index";
  * @param recordStart
  * @param pageSize
  */
-export function get_manga(mediaId: number, recordStart: number, pageSize: number) {
+export function get_manga(mediaId: number, recordStart: number, pageSize: number,order='') {
     return ajax({
-        url: 'php/manga/get.php',
-        data: {mediaId, recordStart, pageSize}
-    })
+			url: "php/manga/get.php",
+			data: { mediaId, recordStart, pageSize, order },
+		});
 }
 
 /**

diff --git a/src/assets/icon/demo_index.html b/src/assets/icon/demo_index.html
@@ -54,6 +54,12 @@ <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" targ
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
 
+            <li class="dib">
+              <span class="icon iconfont">&#xe610;</span>
+                <div class="name">排序</div>
+                <div class="code-name">&amp;#xe610;</div>
+              </li>
+
             <li class="dib">
               <span class="icon iconfont">&#xe8dc;</span>
                 <div class="name">253列表视图、菜单</div>
@@ -102,12 +108,12 @@ <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</co
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.eot?t=1680315405078'); /* IE9 */
-  src: url('iconfont.eot?t=1680315405078#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('iconfont.woff2?t=1680315405078') format('woff2'),
-       url('iconfont.woff?t=1680315405078') format('woff'),
-       url('iconfont.ttf?t=1680315405078') format('truetype'),
-       url('iconfont.svg?t=1680315405078#iconfont') format('svg');
+  src: url('iconfont.eot?t=1680361686680'); /* IE9 */
+  src: url('iconfont.eot?t=1680361686680#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('iconfont.woff2?t=1680361686680') format('woff2'),
+       url('iconfont.woff?t=1680361686680') format('woff'),
+       url('iconfont.ttf?t=1680361686680') format('truetype'),
+       url('iconfont.svg?t=1680361686680#iconfont') format('svg');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -133,6 +139,15 @@ <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面
       <div class="content font-class">
         <ul class="icon_lists dib-box">
 
+          <li class="dib">
+            <span class="icon iconfont icon-paixu"></span>
+            <div class="name">
+              排序
+            </div>
+            <div class="code-name">.icon-paixu
+            </div>
+          </li>
+
           <li class="dib">
             <span class="icon iconfont icon-liebiaoshitu"></span>
             <div class="name">
@@ -205,6 +220,14 @@ <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h
       <div class="content symbol">
           <ul class="icon_lists dib-box">
 
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-paixu"></use>
+                </svg>
+                <div class="name">排序</div>
+                <div class="code-name">#icon-paixu</div>
+            </li>
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-liebiaoshitu"></use>

diff --git a/src/assets/icon/iconfont.css b/src/assets/icon/iconfont.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3852924 */
-  src: url('iconfont.eot?t=1680315405078'); /* IE9 */
-  src: url('iconfont.eot?t=1680315405078#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('iconfont.woff2?t=1680315405078') format('woff2'),
-       url('iconfont.woff?t=1680315405078') format('woff'),
-       url('iconfont.ttf?t=1680315405078') format('truetype'),
-       url('iconfont.svg?t=1680315405078#iconfont') format('svg');
+  src: url('iconfont.eot?t=1680361686680'); /* IE9 */
+  src: url('iconfont.eot?t=1680361686680#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('iconfont.woff2?t=1680361686680') format('woff2'),
+       url('iconfont.woff?t=1680361686680') format('woff'),
+       url('iconfont.ttf?t=1680361686680') format('truetype'),
+       url('iconfont.svg?t=1680361686680#iconfont') format('svg');
 }
 
 .iconfont {
@@ -16,6 +16,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-paixu:before {
+  content: "\e610";
+}
+
 .icon-liebiaoshitu:before {
   content: "\e8dc";
 }

diff --git a/src/assets/icon/iconfont.eot b/src/assets/icon/iconfont.eot
diff --git a/src/assets/icon/iconfont.js b/src/assets/icon/iconfont.js
diff --git a/src/assets/icon/iconfont.json b/src/assets/icon/iconfont.json
@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "漫画流媒体库",
   "glyphs": [
+    {
+      "icon_id": "7159324",
+      "name": "排序",
+      "font_class": "paixu",
+      "unicode": "e610",
+      "unicode_decimal": 58896
+    },
     {
       "icon_id": "1727500",
       "name": "253列表视图、菜单",