diff --git a/css/page/domestic.css b/css/page/domestic.css
index e69de29..3b621e2 100644
--- a/css/page/domestic.css
+++ b/css/page/domestic.css
@@ -0,0 +1,24 @@
+@import "../tool/color.css";
+@import "../tool/size.css";
+@import "../tool/utils.css";
+
+.type_list {
+ li {
+ text-align: center;
+ margin-bottom: var(--f10);
+ width: 25%;
+ a {
+ .text {
+ color: var(--textColor);
+ font-size: var(--f18);
+ margin-bottom: .14rem;
+ }
+ .nums {
+ font-size: var(--f14);
+ color: var(--tipsTextColor);
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/css/page/info.css b/css/page/info.css
index d57f208..d61bb73 100644
--- a/css/page/info.css
+++ b/css/page/info.css
@@ -4,11 +4,7 @@
.header {
- color: var(--textColor);
- font-size: var(--f16);
- .title{
- margin: 0 .16rem;
- }
+
.ilist {
i {
font-size: var(--f22) !important;
diff --git a/css/page/tagListInfo.css b/css/page/tagListInfo.css
new file mode 100644
index 0000000..e69de29
diff --git a/css/tool/clear.css b/css/tool/clear.css
index 0265824..a27e7ff 100644
--- a/css/tool/clear.css
+++ b/css/tool/clear.css
@@ -3,469 +3,519 @@
* Copyright (c) 2020. bmy
*/
- .iconfont {
+.iconfont {
font-size: .32rem;
- }
+}
-p,body,h1,h2,h3,h4,h5,h6,ul,li{
+p,
+body,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+ul,
+li {
margin: 0;
padding: 0;
}
-
- html {
- font-family: sans-serif; /* 1 */
- line-height: 1;
- }
-
- body {
- width: 100%;
- font-size: 0px;
- background-color: #fff;
- color: rgba(0, 0, 0, 0.87);
- }
- ::-webkit-scrollbar {
- width: 0;
- height: 0;
+html {
+ font-family: sans-serif;
+ /* 1 */
+ line-height: 1;
}
-
- li {
- list-style: none;
- }
-
- article,
- aside,
- footer,
- header,
- nav,
- section {
- display: block;
- }
-
- /**
+
+body {
+ width: 100%;
+ font-size: 0px;
+ background-color: #fff;
+ color: rgba(0, 0, 0, 0.87);
+}
+
+::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+}
+
+a {
+ color: #000;
+}
+
+li {
+ list-style: none;
+}
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+ display: block;
+}
+
+/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
-
- h1 {
- font-size: 2em;
- margin: 0.67em 0;
- }
-
- /* Grouping content
+
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0;
+}
+
+/* Grouping content
========================================================================== */
-
- /**
+
+/**
* Add the correct display in IE 9-.
* 1. Add the correct display in IE.
*/
-
- figcaption,
- figure,
- main { /* 1 */
- display: block;
- }
-
- /**
+
+figcaption,
+figure,
+main {
+ /* 1 */
+ display: block;
+}
+
+/**
* Add the correct margin in IE 8.
*/
-
- figure {
- margin: 1em 40px;
- }
-
- /**
+
+figure {
+ margin: 1em 40px;
+}
+
+/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
-
- hr {
- box-sizing: content-box; /* 1 */
- height: 0; /* 1 */
- overflow: visible; /* 2 */
- }
-
- /**
+
+hr {
+ box-sizing: content-box;
+ /* 1 */
+ height: 0;
+ /* 1 */
+ overflow: visible;
+ /* 2 */
+}
+
+/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
-
- pre {
- font-family: monospace, monospace; /* 1 */
- font-size: 1em; /* 2 */
- white-space: pre-wrap;
- word-break: break-all;
- margin: 0;
- }
-
- /* Text-level semantics
+
+pre {
+ font-family: monospace, monospace;
+ /* 1 */
+ font-size: 1em;
+ /* 2 */
+ white-space: pre-wrap;
+ word-break: break-all;
+ margin: 0;
+}
+
+/* Text-level semantics
========================================================================== */
-
- /**
+
+/**
* 1. Remove the gray background on active links in IE 10.
* 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
*/
-
- a {
- text-decoration: none;
- background-color: transparent; /* 1 */
- -webkit-text-decoration-skip: objects; /* 2 */
- user-select: none;
- -webkit-user-select: none;
- }
-
- /**
+
+a {
+ text-decoration: none;
+ background-color: transparent;
+ /* 1 */
+ -webkit-text-decoration-skip: objects;
+ /* 2 */
+ user-select: none;
+ -webkit-user-select: none;
+}
+
+/**
* Remove the outline on focused links when they are also active or hovered
* in all browsers (opinionated).
*/
-
- a:active,
- a:hover {
- outline-width: 0;
- }
-
- /**
+
+a:active,
+a:hover {
+ outline-width: 0;
+}
+
+/**
* 1. Remove the bottom border in Firefox 39-.
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
-
- abbr[title] {
- border-bottom: none; /* 1 */
- text-decoration: underline; /* 2 */
- text-decoration: underline dotted; /* 2 */
- }
-
- /**
+
+abbr[title] {
+ border-bottom: none;
+ /* 1 */
+ text-decoration: underline;
+ /* 2 */
+ text-decoration: underline dotted;
+ /* 2 */
+}
+
+/**
* Prevent the duplicate application of `bolder` by the next rule in Safari 6.
*/
-
- b,
- strong {
- font-weight: inherit;
- }
-
- /**
+
+b,
+strong {
+ font-weight: inherit;
+}
+
+/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
-
- b,
- strong {
- font-weight: bolder;
- }
-
- /**
+
+b,
+strong {
+ font-weight: bolder;
+}
+
+/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
-
- code,
- kbd,
- samp {
- font-family: monospace, monospace; /* 1 */
- font-size: 1em; /* 2 */
- }
-
- /**
+
+code,
+kbd,
+samp {
+ font-family: monospace, monospace;
+ /* 1 */
+ font-size: 1em;
+ /* 2 */
+}
+
+/**
* Add the correct font style in Android 4.3-.
*/
-
- dfn {
- font-style: italic;
- }
-
- /**
+
+dfn {
+ font-style: italic;
+}
+
+/**
* Add the correct background and color in IE 9-.
*/
-
- mark {
- background-color: #ff0;
- color: #000;
- }
-
- /**
+
+mark {
+ background-color: #ff0;
+ color: #000;
+}
+
+/**
* Add the correct font size in all browsers.
*/
-
- small {
- font-size: 80%;
- }
-
- /**
+
+small {
+ font-size: 80%;
+}
+
+/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/
-
- sub,
- sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
- }
-
- sub {
- bottom: -0.25em;
- }
-
- sup {
- top: -0.5em;
- }
-
- /* Embedded content
+
+sub,
+sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+
+sub {
+ bottom: -0.25em;
+}
+
+sup {
+ top: -0.5em;
+}
+
+/* Embedded content
========================================================================== */
-
- /**
+
+/**
* Add the correct display in IE 9-.
*/
-
- audio,
- video {
- display: inline-block;
- }
-
- /**
+
+audio,
+video {
+ display: inline-block;
+}
+
+/**
* Add the correct display in iOS 4-7.
*/
-
- audio:not([controls]) {
- display: none;
- height: 0;
- }
-
- /**
+
+audio:not([controls]) {
+ display: none;
+ height: 0;
+}
+
+/**
* Remove the border on images inside links in IE 10-.
*/
-
- img {
- border-style: none;
- }
-
- /**
+
+img {
+ border-style: none;
+}
+
+/**
* Hide the overflow in IE.
*/
-
- svg:not(:root) {
- overflow: hidden;
- }
-
- /* Forms
+
+svg:not(:root) {
+ overflow: hidden;
+}
+
+/* Forms
========================================================================== */
-
- /**
+
+/**
* 1. Change the font styles in all browsers (opinionated).
* 2. Remove the margin in Firefox and Safari.
*/
-
- button,
- input,
- optgroup,
- select,
- textarea {
- border: none;
- outline: none;
- font-family: sans-serif; /* 1 */
- font-size: 100%; /* 1 */
- line-height: 1.15; /* 1 */
- margin: 0; /* 2 */
- }
-
- /**
+
+button,
+input,
+optgroup,
+select,
+textarea {
+ border: none;
+ outline: none;
+ font-family: sans-serif;
+ /* 1 */
+ font-size: 100%;
+ /* 1 */
+ line-height: 1.15;
+ /* 1 */
+ margin: 0;
+ /* 2 */
+}
+
+/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
-
- button,
- input { /* 1 */
- overflow: visible;
- }
-
- /**
+
+button,
+input {
+ /* 1 */
+ overflow: visible;
+}
+
+/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
-
- button,
- select { /* 1 */
- text-transform: none;
- }
-
- /**
+
+button,
+select {
+ /* 1 */
+ text-transform: none;
+}
+
+/**
* 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
* controls in Android 4.
* 2. Correct the inability to style clickable types in iOS and Safari.
*/
-
- button,
- html [type="button"], /* 1 */
- [type="reset"],
- [type="submit"] {
- -webkit-appearance: button; /* 2 */
- }
-
- /**
+
+button,
+html [type="button"],
+/* 1 */
+[type="reset"],
+[type="submit"] {
+ -webkit-appearance: button;
+ /* 2 */
+}
+
+/**
* Remove the inner border and padding in Firefox.
*/
-
- button::-moz-focus-inner,
- [type="button"]::-moz-focus-inner,
- [type="reset"]::-moz-focus-inner,
- [type="submit"]::-moz-focus-inner {
- border-style: none;
- padding: 0;
- }
-
- /**
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+ border-style: none;
+ padding: 0;
+}
+
+/**
* Restore the focus styles unset by the previous rule.
*/
-
- button:-moz-focusring,
- [type="button"]:-moz-focusring,
- [type="reset"]:-moz-focusring,
- [type="submit"]:-moz-focusring {
- outline: 1px dotted ButtonText;
- }
-
- /**
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+ outline: 1px dotted ButtonText;
+}
+
+/**
* Change the border, margin, and padding in all browsers (opinionated).
*/
-
- fieldset {
- border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
- }
-
- /**
+
+fieldset {
+ border: 1px solid #c0c0c0;
+ margin: 0 2px;
+ padding: 0.35em 0.625em 0.75em;
+}
+
+/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
-
- legend {
- box-sizing: border-box; /* 1 */
- color: inherit; /* 2 */
- display: table; /* 1 */
- max-width: 100%; /* 1 */
- padding: 0; /* 3 */
- white-space: normal; /* 1 */
- }
-
- /**
+
+legend {
+ box-sizing: border-box;
+ /* 1 */
+ color: inherit;
+ /* 2 */
+ display: table;
+ /* 1 */
+ max-width: 100%;
+ /* 1 */
+ padding: 0;
+ /* 3 */
+ white-space: normal;
+ /* 1 */
+}
+
+/**
* 1. Add the correct display in IE 9-.
* 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
-
- progress {
- display: inline-block; /* 1 */
- vertical-align: baseline; /* 2 */
- }
-
- /**
+
+progress {
+ display: inline-block;
+ /* 1 */
+ vertical-align: baseline;
+ /* 2 */
+}
+
+/**
* Remove the default vertical scrollbar in IE.
*/
-
- textarea {
- overflow: auto;
- resize: vertical;
- }
-
- /**
+
+textarea {
+ overflow: auto;
+ resize: vertical;
+}
+
+/**
* 1. Add the correct box sizing in IE 10-.
* 2. Remove the padding in IE 10-.
*/
-
- [type="checkbox"],
- [type="radio"] {
- box-sizing: border-box; /* 1 */
- padding: 0; /* 2 */
- }
-
- /**
+
+[type="checkbox"],
+[type="radio"] {
+ box-sizing: border-box;
+ /* 1 */
+ padding: 0;
+ /* 2 */
+}
+
+/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
-
- [type="number"]::-webkit-inner-spin-button,
- [type="number"]::-webkit-outer-spin-button {
- height: auto;
- }
-
- /**
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+ height: auto;
+}
+
+/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
-
- [type="search"] {
- -webkit-appearance: textfield; /* 1 */
- outline-offset: -2px; /* 2 */
- }
-
- /**
+
+[type="search"] {
+ -webkit-appearance: textfield;
+ /* 1 */
+ outline-offset: -2px;
+ /* 2 */
+}
+
+/**
* Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
*/
-
- [type="search"]::-webkit-search-cancel-button,
- [type="search"]::-webkit-search-decoration {
- -webkit-appearance: none;
- }
-
- /**
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+
+/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
*/
-
- ::-webkit-file-upload-button {
- -webkit-appearance: button; /* 1 */
- font: inherit; /* 2 */
- }
-
- /* Interactive
+
+::-webkit-file-upload-button {
+ -webkit-appearance: button;
+ /* 1 */
+ font: inherit;
+ /* 2 */
+}
+
+/* Interactive
========================================================================== */
-
- /*
+
+/*
* Add the correct display in IE 9-.
* 1. Add the correct display in Edge, IE, and Firefox.
*/
-
- details, /* 1 */
- menu {
- display: block;
- }
-
- /*
+
+details,
+/* 1 */
+menu {
+ display: block;
+}
+
+/*
* Add the correct display in all browsers.
*/
-
- summary {
- display: list-item;
- }
-
- /* Scripting
+
+summary {
+ display: list-item;
+}
+
+/* Scripting
========================================================================== */
-
- /**
+
+/**
* Add the correct display in IE 9-.
*/
-
- canvas {
- display: inline-block;
- }
-
- /**
+
+canvas {
+ display: inline-block;
+}
+
+/**
* Add the correct display in IE.
*/
-
- template {
- display: none;
- }
-
- /* Hidden
+
+template {
+ display: none;
+}
+
+/* Hidden
========================================================================== */
-
- /**
+
+/**
* Add the correct display in IE 10-.
*/
-
- [hidden] {
- display: none;
- }
\ No newline at end of file
+
+[hidden] {
+ display: none;
+}
\ No newline at end of file
diff --git a/css/tool/utils.css b/css/tool/utils.css
index 257c7fd..bcceeae 100644
--- a/css/tool/utils.css
+++ b/css/tool/utils.css
@@ -60,4 +60,10 @@
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
+}
+
+.header_title {
+ color: var(--textColor);
+ font-size: var(--f16);
+ margin: 0 .16rem;
}
\ No newline at end of file
diff --git a/js/config/index.js b/js/config/index.js
index 2fa1569..7648081 100644
--- a/js/config/index.js
+++ b/js/config/index.js
@@ -36,6 +36,7 @@ let config = {
infoList: '/info/list',
tagList: '/tag/list',
tagRecommend: '/tag/recommend',
+ tagInfo: '/tag/info',
searchHot: '/search/hot',
searchKey: '/search/key',
}
diff --git a/js/page/domestic.js b/js/page/domestic.js
index 26914c4..3e43632 100644
--- a/js/page/domestic.js
+++ b/js/page/domestic.js
@@ -1,6 +1,30 @@
class Domestic {
constructor() {
+ util.header(
+ ``,
+ "",
+ ""
+ )
util.footer()
+ this.getTagListData()
+ }
+
+
+ async getTagListData() {
+ let res = await tagServe.tagList()
+
+ $(".type_list").innerHTML = res.maps(v => {
+
+ return `
+
+
+ ${v.title}
+ ${v.count}套
+
+
+ `
+ })
+
}
}
diff --git a/js/page/index.js b/js/page/index.js
index 0c3a1b5..c12087d 100644
--- a/js/page/index.js
+++ b/js/page/index.js
@@ -17,7 +17,7 @@ class Index {
this.getTagRecommend()
this.getHomeHotData()
this.getHomeListData()
- this.initSwiper()
+
this.event()
}
@@ -39,8 +39,8 @@ class Index {
$(".recommend-tag").innerHTML = res.maps(v => {
return `
- ${v.title.substr(0,1)}
- ${v.title}
+ ${v.title.substr(0,1)}
+ ${v.title}
`
})
@@ -56,14 +56,14 @@ class Index {
`
})
+
+ this.initSwiper()
}
initSwiper() {
var mySwiper = new Swiper('.banner', {
- loop: true, // 循环模式选项
-
- // 如果需要分页器
+ loop: true,
pagination: {
el: '.swiper-pagination',
},
diff --git a/js/page/info.js b/js/page/info.js
index 04fa1b7..a636f7d 100644
--- a/js/page/info.js
+++ b/js/page/info.js
@@ -13,7 +13,7 @@ class Info {
.then(() => {
util.header(
- `${this.title}
`,
+ ``,
`
@@ -53,11 +53,15 @@ class Info {
// TODO 找一个合适分享
$(".icon-fenxiang").onclick = async () => {
- await navShare({
- title: this.title,
- text: `我这有个好看的，快来看看 ${this.title}`,
- url: location.href
- })
+ await navigator.clipboard.writeText(`
+我这有个好看的，快来看看 ${this.title}
+${location.href}
+ `)
+ // await navShare({
+ // title: this.title,
+ // text: `我这有个好看的，快来看看 ${this.title}`,
+ // url: location.href
+ // })
}
let sc = $(".icon-wujiaoxing")
diff --git a/js/page/search.js b/js/page/search.js
index cd1b7dc..eb20c14 100644
--- a/js/page/search.js
+++ b/js/page/search.js
@@ -43,6 +43,7 @@ class Search {
let input = $(".header input")
$(".header .button").onclick = async () => {
+ this.page = 1
if (input.value.length != 0) {
this.keyword = input.value
this.totalArr = []
@@ -51,7 +52,13 @@ class Search {
util.hidden(".no-search")
item(".have-search ul", this.totalArr)
util.show(".have-search")
- this.onscroll()
+ onscroll(async () => {
+ this.page += 1
+ if (this.page <= this.totalPage) {
+ await this.getSearchKeyData()
+ item(".have-search ul", this.totalArr)
+ }
+ })
}
}
@@ -75,23 +82,6 @@ class Search {
this.totalPage = totalPage
list.forEach(v => this.totalArr.push(v));
}
-
- // 滚动到底部实现自动加载下一页数据
- onscroll() {
- window.onscroll = async () => {
- var scrollHeight = Math.max(document.documentElement.scrollHeight, document.body.scrollHeight);
- var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
- var clientHeight = window.innerHeight || Math.min(document.documentElement.clientHeight, document.body.clientHeight);
-
- if (clientHeight + Math.ceil(scrollTop) >= scrollHeight) {
- this.page += 1
- if (this.page <= this.totalPage) {
- await this.getSearchKeyData()
- item(".have-search ul", this.totalArr)
- }
- }
- }
- }
}
new Search
\ No newline at end of file
diff --git a/js/page/tagListInfo.js b/js/page/tagListInfo.js
new file mode 100644
index 0000000..55b5d11
--- /dev/null
+++ b/js/page/tagListInfo.js
@@ -0,0 +1,37 @@
+class TagListInfo {
+ page = 1;
+ totalPage = 0;
+ totalArr = []
+
+ constructor() {
+ util.header(
+ ``,
+ "",
+ )
+ this.getTagInfoData()
+ }
+
+ async getTagInfoData() {
+ let { totalPage, list } = await tagServe.tagInfo({
+ url: query("url"),
+ page: this.page
+ });
+
+ this.totalPage = totalPage
+ // list.forEach(v => {
+ // this.totalArr.push(v)
+ // });
+
+ this.totalArr = [ ...this.totalArr, ...list ]
+ item(".default-model ul", this.totalArr)
+ onscroll(async () => {
+ this.page += 1
+ if (this.page <= this.totalPage) {
+ await this.getTagInfoData()
+ // item(".default-model ul", list)
+ }
+ })
+ }
+}
+
+new TagListInfo
\ No newline at end of file
diff --git a/js/serve/tag.js b/js/serve/tag.js
index 218aed5..bf64eac 100644
--- a/js/serve/tag.js
+++ b/js/serve/tag.js
@@ -8,8 +8,17 @@ class TagServe {
// data: data key 和 value 名字一样的时候，可以直接只写一个
data
})
- }
+ }
+ async tagInfo (data = {}) {
+ let http = new Ajax()
+ // suc的返回值（ajax请求到的，后端给我们的数据）
+ return await http.get({
+ url: config.urlList.tagInfo,
+ // data: data key 和 value 名字一样的时候，可以直接只写一个
+ data
+ })
+ }
async tagRecommend (data = {}) {
let http = new Ajax()
diff --git a/js/utils/index.js b/js/utils/index.js
index f4e6bb6..b5b7750 100644
--- a/js/utils/index.js
+++ b/js/utils/index.js
@@ -101,9 +101,6 @@ class Utils {
if (r != null) return decodeURIComponent(r[2]); return null;
}
-
-
-
header(content, action, back = ``) {
this.$("body").insertAdjacentHTML('afterbegin', `