fgm
/
cankao-h5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: fgm:mini
Branches Tags
fgm:master
fgm:ningboyinhang
fgm:fgm
fgm:H5back
fgm:H5release
fgm:mini
..
compare: fgm:master
Branches Tags
fgm:ningboyinhang
fgm:fgm
fgm:H5back
fgm:H5release
fgm:mini
fgm:master

No commits in common. "mini" and "master" have entirely different histories.
mini ... master

202 changed files with 1203 additions and 4543 deletions
Show Stats Expand all files Collapse all files

2
.env.development
View File

@ -5,7 +5,7 @@ ENV = development
# VITE_API_URL = http://123.60.153.169:8040/apih5 # VITE_API_URL = http://123.60.153.169:8040/apih5
# VITE_API_URL = https://4155gf93ll13.vicp.fun/apih5 # VITE_API_URL = https://4155gf93ll13.vicp.fun/apih5
# VITE_API_URL = http://123.60.79.143:8041/apih5 # VITE_API_URL = http://123.60.79.143:8041/apih5
# VITE_API_URL = http://192.168.3.38:8040/apih5 # VITE_API_URL =http://ukfba3.natappfree.cc/apih5
VITE_API_URL = https://cankao.cs.com.cn/apih5 VITE_API_URL = https://cankao.cs.com.cn/apih5
VITE_API_DATAV_URL = https://cankao.cs.com.cn/zzck_datav VITE_API_DATAV_URL = https://cankao.cs.com.cn/zzck_datav

BIN
caokao-h5.zip Normal file
View File

Binary file not shown.

14
index.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<script> <script>
var coverSupport = var coverSupport =
@ -13,9 +14,6 @@
'" />' '" />'
); );
</script> </script>
<!-- <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> -->
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
<!-- <script <!-- <script
type="text/javascript" type="text/javascript"
src="//res.wx.qq.com/open/js/jweixin-1.6.0.js" src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"
@ -29,12 +27,11 @@
<title></title> <title></title>
<!--preload-links--> <!--preload-links-->
<!--app-context--> <!--app-context-->
</head> </head>
<body> <body>
<div id="app"><!--app-html--></div> <div id="app"><!--app-html--></div>
<script type="module" src="/src/main.ts"></script> <script type="module" src="/src/main.ts"></script>
<!-- <script type="text/javascript"> <!-- <script type="text/javascript">
var link = location.href.split("#")[0]; var link = location.href.split("#")[0];
console.log("🚀 ~ link:", link); console.log("🚀 ~ link:", link);
@ -110,5 +107,6 @@
error: function (error) {}, error: function (error) {},
}); });
</script> --> </script> -->
</body> </body>
</html> </html>

7
package-lock.json generated
View File

@ -28,7 +28,6 @@
"echarts": "^5.6.0", "echarts": "^5.6.0",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"js-md5": "^0.8.3", "js-md5": "^0.8.3",
"jweixin-module": "^1.6.0",
"pinia": "^2.0.36", "pinia": "^2.0.36",
"qs": "^6.11.2", "qs": "^6.11.2",
"vue": "^3.2.45", "vue": "^3.2.45",
@ -9511,12 +9510,6 @@
"graceful-fs": "^4.1.6" "graceful-fs": "^4.1.6"
} }
}, },
"node_modules/jweixin-module": {
"version": "1.6.0",
"resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
"license": "ISC"
},
"node_modules/kleur": { "node_modules/kleur": {
"version": "3.0.3", "version": "3.0.3",
"resolved": "https://registry.npmmirror.com/kleur/-/kleur-3.0.3.tgz", "resolved": "https://registry.npmmirror.com/kleur/-/kleur-3.0.3.tgz",

3
package.json
View File

@ -2,10 +2,10 @@
"name": "uni-preset-vue", "name": "uni-preset-vue",
"version": "0.0.1", "version": "0.0.1",
"scripts": { "scripts": {
"dev:mp-weixin": "uni -p mp-weixin",
"dev:h5": "uni", "dev:h5": "uni",
"build:h5": "uni build", "build:h5": "uni build",
"dev:h5:ssr": "uni --ssr", "dev:h5:ssr": "uni --ssr",
"dev:mp-weixin": "uni -p mp-weixin",
"dev:mp-alipay": "uni -p mp-alipay", "dev:mp-alipay": "uni -p mp-alipay",
"dev:app": "uni -p app", "dev:app": "uni -p app",
"dev:app-android": "uni -p app-android", "dev:app-android": "uni -p app-android",
@ -59,7 +59,6 @@
"echarts": "^5.6.0", "echarts": "^5.6.0",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"js-md5": "^0.8.3", "js-md5": "^0.8.3",
"jweixin-module": "^1.6.0",
"pinia": "^2.0.36", "pinia": "^2.0.36",
"qs": "^6.11.2", "qs": "^6.11.2",
"vue": "^3.2.45", "vue": "^3.2.45",

1
src/App.vue
View File

@ -16,7 +16,6 @@ onHide(() => {
<style lang="scss"> <style lang="scss">
/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */ /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
@import "@/uni_modules/uview-plus/index.scss"; @import "@/uni_modules/uview-plus/index.scss";
#app, #app,
uni-app, uni-app,
uni-page, uni-page,

10
src/api/detail.ts
View File

@ -1,4 +1,4 @@
import request from "@/utils/index"; import request from "@/utils";
/** /**
* 获取文章详情 * 获取文章详情
@ -7,9 +7,10 @@ import request from "@/utils/index";
* @returns * @returns
*/ */
export const fetchArticleDetail = (data: any) => { export const fetchArticleDetail = (data: any) => {
return request.get(`/news/detail/${data.id}?phone=${data?.phone || null}`); return request.get(`/news/detail/${data.id}`);
}; };
/** /**
* 文章点赞 * 文章点赞
* @param data * @param data
@ -32,11 +33,10 @@ export const fetchArticleFavorate = (data: any) => {
// 热门行业 // 热门行业
export const getListByTagIndustry = (data: any) => { export const getListByTagIndustry = (data: any) => {
console.log("🚀 ~ getListByTagIndustry ~ data:", data); return request.get(`/news/list/industry?name=${data.name}`);
return request.get("/news/list/industry", { name: data.name });
}; };
// 概念标签 // 概念标签
export const getListByTag = (data: any) => { export const getListByTag = (data: any) => {
return request.get("/news/list/tag", { name: data.name }); return request.get(`/news/list/tag?name=${data.name}`);
}; };

19
src/api/index.ts
View File

@ -62,22 +62,3 @@ export const searchNews = (data: any) => {
return Request.post("/news/search", data); return Request.post("/news/search", data);
}; };
// 微信授权
export const doWxAuth = (data: any) => {
return Request.post("/common/auth", data);
};
// 微信分享
export const doShare = (data: any) => {
return Request.post("/user/share", data);
};
// 国内资讯列表
export const getDomestic = (data: any) => {
return Request.get("/news/domestic", data);
};
// 国内资讯详情
export const getDomesticDetail = (data: any) => {
return Request.get(`/news/domestic/${data.id}`);
};

8
src/api/newsInfo.ts
View File

@ -17,8 +17,7 @@ export const getConceptCount = (data: any) => {
// 概念标签贴标 // 概念标签贴标
export const getTopNews = (data: any) => { export const getTopNews = (data: any) => {
// return request.get("/top_news_h5_d", data); return request.get("/top_news_h5_d", data);
return request.get("/top_news_release_h5_d", data);
}; };
// 热门行业top10： // 热门行业top10：
@ -35,8 +34,3 @@ export const getTopConcept_d = (data: any) => {
export const getNews_cnt_d = (data: any) => { export const getNews_cnt_d = (data: any) => {
return request.get("/news_cnt_d", data); return request.get("/news_cnt_d", data);
}; };
// 概念标签贴标
export const getTopNewsAll = (data: any) => {
return request.get("/top_news_release_h5_all", data);
};

BIN
src/assets/fonts/SourceHanSansCN-Medium.otf Normal file
View File

Binary file not shown.

BIN
src/assets/fonts/SourceHanSansCN-Regular.otf Normal file
View File

Binary file not shown.

15
src/assets/fonts/font.css Normal file
View File

@ -0,0 +1,15 @@
@font-face {
font-family: "SourceHanSansCN-Regular";
font-style: normal;
src: url("./PingFang_Medium.ttf") format("opentype");
}
@font-face {
font-family: "SourceHanSansCN-Medium";
font-style: normal;
src: url("./SourceHanSansCN-Medium.otf") format("opentype");
}
html,
body {
font-family: "SourceHanSansCN-Regular";
}

BIN
src/assets/images/activeFire.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 480 B

BIN
src/assets/images/arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 989 B

BIN
src/assets/images/article.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/assets/images/avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
src/assets/images/balance.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/assets/images/banner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 233 KiB

BIN
src/assets/images/column.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/assets/images/corporation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 994 B

BIN
src/assets/images/detail_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
src/assets/images/down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 258 B

BIN
src/assets/images/fire.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 646 B

BIN
src/assets/images/flash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 851 B

BIN
src/assets/images/flashLogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/assets/images/flash_sub.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
src/assets/images/headerBg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 KiB

BIN
src/assets/images/icon_calendar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 701 B

BIN
src/assets/images/icon_dot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 234 B

BIN
src/assets/images/icon_know.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/assets/images/icon_more.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 470 B

BIN
src/assets/images/icon_notification.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 707 B

BIN
src/assets/images/icon_tag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 536 B

BIN
src/assets/images/icon_vip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 860 B

BIN
src/assets/images/icon_worldly.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
src/assets/images/industry.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 800 B

BIN
src/assets/images/know_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 KiB

BIN
src/assets/images/like.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 639 B

BIN
src/assets/images/loginBg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 92 KiB

BIN
src/assets/images/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
src/assets/images/logo1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
src/assets/images/newFontBg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/assets/images/new_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
src/assets/images/news.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 B

BIN
src/assets/images/notLogin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
src/assets/images/overlay.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
src/assets/images/overlay_world.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 839 B

BIN
src/assets/images/packUp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 238 B

BIN
src/assets/images/radio.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
src/assets/images/recommended.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 388 B

BIN
src/assets/images/share.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 580 B

BIN
src/assets/images/star.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 735 B

BIN
src/assets/images/swiper_vip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 142 KiB

BIN
src/assets/images/tabtop.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
src/assets/images/taurus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/images/thumbnail2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
src/assets/images/thumbnail3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
src/assets/images/thumbnail4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
src/assets/images/thumbnail5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
src/assets/images/time.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 892 B

BIN
src/assets/images/viewFullText.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
src/assets/images/vip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/assets/images/vipCol.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
src/assets/images/vip_header_content_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 70 KiB

BIN
src/assets/images/vip_header_search_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
src/assets/images/vip_sub.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 62 KiB

BIN
src/assets/images/vip_sub_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

BIN
src/assets/zixun/all_icon_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 466 B

BIN
src/assets/zixun/all_icon_press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 502 B

BIN
src/assets/zixun/banner_pic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 MiB

BIN
src/assets/zixun/banner_title.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 158 KiB

BIN
src/assets/zixun/chose-icon_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

BIN
src/assets/zixun/chose_icon_black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 269 B

BIN
src/assets/zixun/down_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/assets/zixun/home_icon_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/assets/zixun/home_icon_press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/assets/zixun/icon_fanhui.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
src/assets/zixun/ranking_bg_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

BIN
src/assets/zixun/ranking_bg_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 122 KiB

BIN
src/assets/zixun/ranking_bg_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 120 KiB

BIN
src/assets/zixun/ranking_icon_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
src/assets/zixun/ranking_icon_1_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/assets/zixun/ranking_icon_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/assets/zixun/ranking_icon_2_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/assets/zixun/ranking_icon_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
src/assets/zixun/ranking_icon_3_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/assets/zixun/tagicon_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
src/assets/zixun/tagicon_1_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
src/assets/zixun/tagicon_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
src/assets/zixun/tagicon_2_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
src/assets/zixun/title_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
src/assets/zixun/title_text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/assets/zixun/top10_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/assets/zixun/top20_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
src/assets/zixun/up_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

25
src/components/ArticleList.vue
View File

@ -1,6 +1,11 @@
<template> <template>
<view class="list"> <view class="list">
<view v-for="(item, index) in props.data" :key="index" class="item"> <view
v-for="(item, index) in props.data"
:key="index"
class="item"
>
<!-- 标题 start --> <!-- 标题 start -->
<!-- <text class="title" v-html="item.title">{{ item.title }}</text> --> <!-- <text class="title" v-html="item.title">{{ item.title }}</text> -->
<text @click="handleClick(item)" class="title" v-html="item.MarkInRedTitle || item.title"></text> <text @click="handleClick(item)" class="title" v-html="item.MarkInRedTitle || item.title"></text>
@ -8,16 +13,20 @@
<!-- 内容 start --> <!-- 内容 start -->
<view class="r_content"> <view class="r_content">
<image src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/icon_act_lt.png" class="title_icon"> <image src="@/static/icon_act_lt.png" class="title_icon"></image>
</image>
<text @click="handleClick(item)" class="content" v-html="item.MarkInRedContent || item.content"></text> <text @click="handleClick(item)" class="content" v-html="item.MarkInRedContent || item.content"></text>
<!-- <text @click="handleClick(item)" class="content">{{ item.content }}</text> --> <!-- <text @click="handleClick(item)" class="content">{{ item.content }}</text> -->
<!-- 需要付费锁 start --> <!-- 需要付费锁 start -->
<view class="need_login" v-if="item.needpay" @click="handleSubListItem(item)"> <view class="need_login" v-if="item.needpay" @click="handleSubListItem(item)">
<image src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/icon_lock.png" class="need_icon"> <image src="@/static/icon_lock.png" class="need_icon"></image>
</image>
<text>订阅后解锁全文</text> <text>订阅后解锁全文</text>
<u-icon name="arrow-right" color="#fff" size="10" style="margin-left: 10rpx" bold></u-icon> <u-icon
name="arrow-right"
color="#fff"
size="10"
style="margin-left: 10rpx"
bold
></u-icon>
</view> </view>
<!-- 需要付费锁 end --> <!-- 需要付费锁 end -->
</view> </view>
@ -45,11 +54,11 @@ const props = defineProps({
// 列表内容 // 列表内容
data: { data: {
type: Object, type: Object,
default: () => { }, default: () => {},
}, },
}); });
console.log("props.data", props.data) console.log("props.data", props.data)
onBeforeMount(() => { }); onBeforeMount(() => {});
// 点击订阅 // 点击订阅
const handleSubListItem = (item) => { const handleSubListItem = (item) => {

81
src/components/HotIndustryList.vue
View File

@ -1,40 +1,75 @@
<template> <template>
<view class="hot-industry-container"> <view class="hot-industry-container">
<u-skeleton rows="5" title loading style="margin-bottom: 30rpx" v-if="loading"></u-skeleton> <u-skeleton
rows="5"
title
loading
style="margin-bottom: 30rpx"
v-if="loading"
></u-skeleton>
<!-- 行业列表 --> <!-- 行业列表 -->
<view class="industry-list" v-else> <view class="industry-list" v-else>
<view v-for="(item, index) in industryList" :key="index" class="industry-item" :style="getItemBgStyle(index)" <view
@click="goDetail(item, index)"> v-for="(item, index) in industryList"
:key="index"
class="industry-item"
:style="getItemBgStyle(index)"
@click="goDetail(item, index)"
>
<!-- 这里预留图标位置，可自行补充 <image :src="item.icon" class="industry-icon" /> 等 --> <!-- 这里预留图标位置，可自行补充 <image :src="item.icon" class="industry-icon" /> 等 -->
<view style=" <view
style="
position: absolute; position: absolute;
top: 0; top: 0;
z-index: 999; z-index: 999;
display: flex; display: flex;
align-items: center; align-items: center;
height: 100%; height: 100%;
"> "
<img src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/zixun/ranking_icon_1_1.png" class="top3numbk" >
v-if="index < 3 && index == 0" /> <img
<img src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/zixun/ranking_icon_2_2.png" class="top3numbk" src="@/assets/zixun/ranking_icon_1_1.png"
v-else-if="index < 3 && index == 1" /> class="top3numbk"
<img src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/zixun/ranking_icon_3_3.png" class="top3numbk" v-if="index < 3 && index == 0"
v-else-if="index < 3 && index == 2" /> />
<img
src="@/assets/zixun/ranking_icon_2_2.png"
class="top3numbk"
v-else-if="index < 3 && index == 1"
/>
<img
src="@/assets/zixun/ranking_icon_3_3.png"
class="top3numbk"
v-else-if="index < 3 && index == 2"
/>
<text class="rank" v-else>{{ index + 1 }}</text> <text class="rank" v-else>{{ index + 1 }}</text>
<text class="industry-name">{{ item.content }}</text> <text class="industry-name">{{ item.content }}</text>
</view> </view>
<img src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/zixun/ranking_bg_1.png" class="top3bk" <img
v-if="index < 3 && index == 0" /> src="@/assets/zixun/ranking_bg_1.png"
<img src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/zixun/ranking_bg_2.png" class="top3bk" class="top3bk"
v-if="index < 3 && index == 1" /> v-if="index < 3 && index == 0"
<img src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/zixun/ranking_bg_3.png" class="top3bk" />
v-if="index < 3 && index == 2" /> <img
src="@/assets/zixun/ranking_bg_2.png"
class="top3bk"
v-if="index < 3 && index == 1"
/>
<img
src="@/assets/zixun/ranking_bg_3.png"
class="top3bk"
v-if="index < 3 && index == 2"
/>
</view> </view>
</view> </view>
<LoginPopup :show="LoginShow" @handlePopupClose="handlePopupClose" <LoginPopup
@handlePopupSuccessCallback="handlePopupSuccessCallback" @handlePopupErrorCallback="handlePopupErrorCallback" /> :show="LoginShow"
@handlePopupClose="handlePopupClose"
@handlePopupSuccessCallback="handlePopupSuccessCallback"
@handlePopupErrorCallback="handlePopupErrorCallback"
/>
</view> </view>
</template> </template>
@ -147,32 +182,27 @@ const handlePopupErrorCallback = () => {
.hot-industry-container { .hot-industry-container {
padding: 10px; padding: 10px;
} }
.header { .header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
} }
.title { .title {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
} }
.view-all { .view-all {
font-size: 14px; font-size: 14px;
color: #999; color: #999;
text-decoration: underline; text-decoration: underline;
} }
.industry-list { .industry-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 8px; gap: 8px;
} }
.industry-item { .industry-item {
display: flex; display: flex;
align-items: center; align-items: center;
@ -180,13 +210,11 @@ const handlePopupErrorCallback = () => {
position: relative; position: relative;
height: 74rpx; height: 74rpx;
} }
.industry-icon { .industry-icon {
width: 24px; width: 24px;
height: 24px; height: 24px;
margin-right: 8px; margin-right: 8px;
} }
.rank { .rank {
margin-left: 30rpx; margin-left: 30rpx;
@ -199,7 +227,6 @@ const handlePopupErrorCallback = () => {
font-style: normal; font-style: normal;
margin-right: 40rpx; margin-right: 40rpx;
} }
.industry-name { .industry-name {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;

135
src/components/IndexView copy.vue
View File

@ -4,10 +4,8 @@
<view class="homeTopContainer"> <view class="homeTopContainer">
<!-- 搜索框 --> <!-- 搜索框 -->
<view class="sreach"> <view class="sreach">
<image src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/logo_mini.png" class="sreach_icon" <image src="@/static/logo_mini.png" class="sreach_icon" @click="messageShow = true"></image>
@click="messageShow = true"></image> <u-input v-model="keyWord" prefixIcon="search" style="flex: 1" placeholder="搜索资讯" placeholderClass="search_placeholder" class="sreach_input" :border="false" @confirm="goSreach" />
<u-input v-model="keyWord" prefixIcon="search" style="flex: 1" placeholder="搜索资讯"
placeholderClass="search_placeholder" class="sreach_input" :border="false" @confirm="goSreach" />
</view> </view>
<!-- 渐变的背景 --> <!-- 渐变的背景 -->
@ -17,7 +15,7 @@
<view class="headerBanner"> </view> <view class="headerBanner"> </view>
<!-- 搜索框 --> <!-- 搜索框 -->
<!-- <view class="sreach"> <!-- <view class="sreach">
<image src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/logo_mini.png" class="sreach_icon" @click="messageShow = true"></image> <image src="@/static/logo_mini.png" class="sreach_icon" @click="messageShow = true"></image>
<u-input v-model="keyWord" prefixIcon="search" style="flex: 1" placeholder="搜索资讯" placeholderClass="search_placeholder" class="sreach_input" :border="false" @confirm="goSreach" /> <u-input v-model="keyWord" prefixIcon="search" style="flex: 1" placeholder="搜索资讯" placeholderClass="search_placeholder" class="sreach_input" :border="false" @confirm="goSreach" />
</view> --> </view> -->
@ -26,7 +24,7 @@
<!-- <view class="r_tab"> <!-- <view class="r_tab">
<view v-for="(item, index) in colList" :key="item.id" class="tab_item" @click="handleTabsClick(item)"> <view v-for="(item, index) in colList" :key="item.id" class="tab_item" @click="handleTabsClick(item)">
<text :style="{ fontWeight: index == columnIndex ? 'bold' : '' }"> {{ item.name }}</text> <text :style="{ fontWeight: index == columnIndex ? 'bold' : '' }"> {{ item.name }}</text>
<image src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/bk_tab.png" class="bk_tab" v-if="index == columnIndex"></image> <image src="@/static/bk_tab.png" class="bk_tab" v-if="index == columnIndex"></image>
<view class="badge" v-if="isBadeg && index !== 1"> <view class="badge" v-if="isBadeg && index !== 1">
<u-badge value="new"></u-badge> <u-badge value="new"></u-badge>
</view> </view>
@ -68,8 +66,7 @@
</view> </view>
<view class="content"> <view class="content">
<KnowEarlier @handleUpdateData="handleUpdateData" :isNewFlash="isNewFlash" :data="newsFastList" <KnowEarlier @handleUpdateData="handleUpdateData" :isNewFlash="isNewFlash" :data="newsFastList" v-if="columnIndex === 0" />
v-if="columnIndex === 0" />
</view> </view>
</view> </view>
</view> </view>
@ -77,9 +74,7 @@
<u-overlay :show="overlayShow" zIndex="101" @click="overlayShow = false"></u-overlay> <u-overlay :show="overlayShow" zIndex="101" @click="overlayShow = false"></u-overlay>
<!-- <KnowEarlier @handleUpdateData="handleUpdateData" :isNewFlash="isNewFlash" :data="newsFastList" v-if="columnIndex === 0" /> --> <!-- <KnowEarlier @handleUpdateData="handleUpdateData" :isNewFlash="isNewFlash" :data="newsFastList" v-if="columnIndex === 0" /> -->
<WorldlyAffairs @changelockType="changelockType" @handleSub="handleSub" :finish="finish" v-if="columnIndex === 1" <WorldlyAffairs @changelockType="changelockType" @handleSub="handleSub" :finish="finish" v-if="columnIndex === 1" :column="tagsList[columnIndex]" :bannerList="bannerList" :titleCardList="titleCardList" :worldNewsList="worldNewsList" @onload="onload" />
:column="tagsList[columnIndex]" :bannerList="bannerList" :titleCardList="titleCardList"
:worldNewsList="worldNewsList" @onload="onload" />
</view> </view>
</template> </template>
@ -90,7 +85,7 @@ import KnowEarlier from "@/pages/knowEarlier/index.vue";
import WorldlyAffairs from "@/pages/worldlyAffairs/index.vue"; import WorldlyAffairs from "@/pages/worldlyAffairs/index.vue";
import { getNewsFast, checkNews, getNewsColumn, getNewsTag, getNewsList, unlockColumn } from "@/api"; import { getNewsFast, checkNews, getNewsColumn, getNewsTag, getNewsList, unlockColumn } from "@/api";
import { Session } from "@/utils/storage"; import { Session } from "@/utils/storage";
import down from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/down.png"; import down from "@/assets/images/down.png";
import VipHeader from "./vipHeader"; import VipHeader from "./vipHeader";
import { scrollToTop, formatTime } from "@/utils/util.ts"; import { scrollToTop, formatTime } from "@/utils/util.ts";
import { useShareStore } from "@/stores/shareStore"; import { useShareStore } from "@/stores/shareStore";
@ -104,7 +99,7 @@ const props = defineProps({
}, },
columnState: { columnState: {
type: Object, type: Object,
default: () => { }, default: () => {},
}, },
}); });
@ -467,10 +462,8 @@ onUnmounted(() => {
background-color: #f6f6f6; background-color: #f6f6f6;
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto; overflow-y: auto;
.homeTopContainer { .homeTopContainer {
position: relative; position: relative;
.sreach { .sreach {
width: 100%; width: 100%;
display: flex; display: flex;
@ -478,19 +471,17 @@ onUnmounted(() => {
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
gap: 30rpx; gap: 30rpx;
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip_header_search_bg.png); background-image: url(@/assets/images/vip_header_search_bg.png);
background-size: cover; background-size: cover;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
z-index: 2; z-index: 2;
.sreach_icon { .sreach_icon {
width: 78rpx; width: 78rpx;
height: 60rpx; height: 60rpx;
margin-top: 3rpx; margin-top: 3rpx;
} }
.sreach_input { .sreach_input {
background-color: #fff; background-color: #fff;
border-radius: 36rpx; border-radius: 36rpx;
@ -509,7 +500,7 @@ onUnmounted(() => {
top: 0; top: 0;
width: 100%; width: 100%;
height: 366rpx; height: 366rpx;
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip_header_content_bg.png); background-image: url(@/assets/images/vip_header_content_bg.png);
background-size: cover; background-size: cover;
margin-top: 100rpx; margin-top: 100rpx;
} }
@ -530,14 +521,12 @@ onUnmounted(() => {
box-sizing: border-box; box-sizing: border-box;
padding-top: 20rpx; padding-top: 20rpx;
width: 100%; width: 100%;
.tabsList { .tabsList {
display: flex; display: flex;
// background-color: aqua; // background-color: aqua;
background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%); background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%);
border-top-left-radius: 32rpx; border-top-left-radius: 32rpx;
border-top-right-radius: 32rpx; border-top-right-radius: 32rpx;
.tab_item { .tab_item {
width: 52%; width: 52%;
height: 126rpx; height: 126rpx;
@ -546,7 +535,6 @@ onUnmounted(() => {
box-sizing: border-box; box-sizing: border-box;
padding-top: 24rpx; padding-top: 24rpx;
color: #fff; color: #fff;
&.active { &.active {
border-top-left-radius: 32rpx; border-top-left-radius: 32rpx;
border-top-right-radius: 32rpx; border-top-right-radius: 32rpx;
@ -566,7 +554,6 @@ onUnmounted(() => {
top: 0; top: 0;
margin-top: 106rpx; margin-top: 106rpx;
backdrop-filter: blur(60rpx); backdrop-filter: blur(60rpx);
// z-index: ; // z-index: ;
.newsBg { .newsBg {
height: 79.52rpx; height: 79.52rpx;
@ -576,16 +563,14 @@ onUnmounted(() => {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
.newsFontBg { .newsFontBg {
width: 255.78rpx; width: 255.78rpx;
height: 79.52rpx; height: 79.52rpx;
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/newFontBg.png); background-image: url(@/assets/images/newFontBg.png);
background-size: cover; background-size: cover;
} }
} }
.content{
.content {
max-height: calc(100vh - 300rpx); max-height: calc(100vh - 300rpx);
// overflow-y: auto // overflow-y: auto
// height: 100vh; // height: 100vh;
@ -595,7 +580,6 @@ onUnmounted(() => {
} }
} }
} }
// .index-wrap { // .index-wrap {
// min-height: calc(100vh - 130rpx); // min-height: calc(100vh - 130rpx);
// background-color: #f6f6f6; // background-color: #f6f6f6;
@ -654,57 +638,57 @@ onUnmounted(() => {
// } // }
// // 标签栏 // // 标签栏
// .tabsListContainer { // .tabsListContainer {
// box-sizing: border-box; // box-sizing: border-box;
// padding-right: 60rpx; // padding-right: 60rpx;
// padding-bottom: 12rpx; // padding-bottom: 12rpx;
// display: flex; // display: flex;
// overflow-x: auto; // overflow-x: auto;
// position: relative; // position: relative;
// // background-color: red; // // background-color: red;
// margin-top: 30rpx; // margin-top: 30rpx;
// .tabsList { // .tabsList {
// display: flex; // display: flex;
// overflow-x: auto; // overflow-x: auto;
// .tabsItem { // .tabsItem {
// font-size: 12px; // font-size: 12px;
// color: #595959; // color: #595959;
// box-sizing: border-box; // box-sizing: border-box;
// padding: 6rpx 20rpx; // padding: 6rpx 20rpx;
// border: 1px solid #dbdbdb; // border: 1px solid #dbdbdb;
// margin-right: 21rpx; // margin-right: 21rpx;
// border-radius: 99rpx; // border-radius: 99rpx;
// flex-shrink: 0; // flex-shrink: 0;
// &.active { // &.active {
// background-color: rgba(255, 208, 212, 0.4); // background-color: rgba(255, 208, 212, 0.4);
// border-color: rgba(255, 208, 212, 0.4); // border-color: rgba(255, 208, 212, 0.4);
// color: #e7303f; // color: #e7303f;
// } // }
// } // }
// } // }
// .downContainer { // .downContainer {
// position: absolute; // position: absolute;
// right: 0; // right: 0;
// top: 50%; // top: 50%;
// height: 40rpx; // height: 40rpx;
// transform: translateY(-50%); // transform: translateY(-50%);
// background-color: #f6f6f6; // background-color: #f6f6f6;
// padding: 3rpx 15rpx 15rpx 15rpx; // padding: 3rpx 15rpx 15rpx 15rpx;
// display: flex; // display: flex;
// align-items: center; // align-items: center;
// justify-content: center; // justify-content: center;
// background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/overlay_world.png); // background-image: url(@/assets/images/overlay_world.png);
// .downPng { // .downPng {
// width: 30rpx; // width: 30rpx;
// height: 30rpx; // height: 30rpx;
// } // }
// } // }
// } // }
// .tabsPopup { // .tabsPopup {
// width: 100%; // width: 100%;
@ -905,4 +889,5 @@ onUnmounted(() => {
// position: absolute; // position: absolute;
// width: 180rpx; // width: 180rpx;
// height: 48rpx; // height: 48rpx;
// }</style> // }
</style>

122
src/components/IndexView.vue
View File

@ -2,22 +2,32 @@
<view class="index-wrap" @touchmove="handleScroll" @scroll.passive="getScroll($event)"> <view class="index-wrap" @touchmove="handleScroll" @scroll.passive="getScroll($event)">
<!-- 搜索框 --> <!-- 搜索框 -->
<view :class="['sreach', overlayShow && 'searchIncreaseLevel']"> <view :class="['sreach', overlayShow && 'searchIncreaseLevel']">
<image src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/logo_mini.png" class="sreach_icon" <image src="@/static/logo_mini.png" class="sreach_icon" @click="messageShow = true"></image>
@click="messageShow = true"></image> <u-input
<u-input v-model="keyWord" prefixIcon="search" style="flex: 1" placeholder="搜索资讯" v-model="keyWord"
placeholderClass="search_placeholder" class="sreach_input" :border="false" @confirm="goSreach" /> prefixIcon="search"
style="flex: 1"
placeholder="搜索资讯"
placeholderClass="search_placeholder"
class="sreach_input"
:border="false"
@confirm="goSreach"
/>
</view> </view>
<!-- 渐变的背景 --> <!-- 渐变的背景 -->
<view :class="['vipContentBg', overlayShow && 'increaseLevel']"></view> <view :class="['vipContentBg', overlayShow && 'increaseLevel']"></view>
<!-- banner --> <!-- banner -->
<view :class="['headerBanner', overlayShow && 'increaseLevel']" <view :class="['headerBanner', overlayShow && 'increaseLevel']" @click="jumpUrl('https://cankao.cs.com.cn/cankao/')"></view>
@click="jumpUrl('https://cankao.cs.com.cn/cankao/')"></view>
<!-- tabs --> <!-- tabs -->
<u-sticky offset-top="0"> <u-sticky offset-top="0">
<view class="headerTabs"> <view class="headerTabs">
<view class="tabsList"> <view class="tabsList">
<view v-for="(item, index) in colList" :key="item.id" :class="['tab_item', index == columnIndex && 'active']" <view
@click="handleTabsClick(item)"> v-for="(item, index) in colList"
:key="item.id"
:class="['tab_item', index == columnIndex && 'active']"
@click="handleTabsClick(item)"
>
<view :class="['tab_item_icon', `tab_item_${item.id}`]"></view> <view :class="['tab_item_icon', `tab_item_${item.id}`]"></view>
<view> {{ item.name }} </view> <view> {{ item.name }} </view>
</view> </view>
@ -36,9 +46,13 @@
<view class="tabsPopupItem" v-for="item in sortTagsList" :key="item"> <view class="tabsPopupItem" v-for="item in sortTagsList" :key="item">
<view class="title">{{ item.name }}</view> <view class="title">{{ item.name }}</view>
<view class="itemList"> <view class="itemList">
<view v-for="(childItem, index) in item.children" :key="childItem.id" <view
v-for="(childItem, index) in item.children"
:key="childItem.id"
:class="['tabsItem', { active: childItem.id == columnState.subColumn }]" :class="['tabsItem', { active: childItem.id == columnState.subColumn }]"
@click="handleClickSubColumn(childItem.id)">{{ childItem.name }}</view> @click="handleClickSubColumn(childItem.id)"
>{{ childItem.name }}</view
>
</view> </view>
</view> </view>
</view> </view>
@ -48,22 +62,28 @@
<u-sticky offset-top="51" zIndex="101"> <u-sticky offset-top="51" zIndex="101">
<view class="contenttab"> <view class="contenttab">
<view class="tabsList"> <view class="tabsList">
<view v-for="(item, index) in colList" :key="item.id" :class="['tab_item', index == columnIndex && 'active']"> <view v-for="(item, index) in colList" :key="item.id" :class="['tab_item', index == columnIndex && 'active']"></view>
</view>
</view> </view>
</view> </view>
</u-sticky> </u-sticky>
<u-sticky offset-top="52" zIndex="102" v-if="!overlayShow && columnIndex === 1"> <u-sticky offset-top="52" zIndex="102" v-if="!overlayShow && columnIndex === 1">
<view :style="{ <view
:style="{
// backdropFilter: showtabBg ? 'blur(60rpx)' : '', // backdropFilter: showtabBg ? 'blur(60rpx)' : '',
height: showtabBg ? '100rpx' : '50rpx', height: showtabBg ? '100rpx' : '50rpx',
}" :class="['tabtop', showtabBg ? 'showbg' : '']"> }"
:class="['tabtop', showtabBg ? 'showbg' : '']"
>
<view class="tabsListContainer" v-if="!overlayShow && columnIndex === 1"> <view class="tabsListContainer" v-if="!overlayShow && columnIndex === 1">
<view class="tabList"> <view class="tabList">
<view v-for="(item, index) in tagsList" :key="item.id" <view
v-for="(item, index) in tagsList"
:key="item.id"
:class="['tabsItem', { active: item.id == columnState.subColumn }]" :class="['tabsItem', { active: item.id == columnState.subColumn }]"
@click="handleClickSubColumn(item.id)">{{ item.name }}</view> @click="handleClickSubColumn(item.id)"
>{{ item.name }}</view
>
</view> </view>
<view class="downContainer" @click="showTabsPopup" v-if="tagsList.length > 0"> <view class="downContainer" @click="showTabsPopup" v-if="tagsList.length > 0">
<image :src="down" class="downPng" /> <image :src="down" class="downPng" />
@ -90,12 +110,27 @@
<image :src="down" class="downPng" /> <image :src="down" class="downPng" />
</view> </view>
</view> --> </view> -->
<KnowEarlier @handlePopupClose="handlePopupClose" @handleShowPay="handleShowPay" <KnowEarlier
@handleShareTip="handleShareTip" @handleUpdateData="handleUpdateData" :isNewFlash="isNewFlash" @handlePopupClose="handlePopupClose"
:data="newsFastList" v-if="columnIndex === 0" /> @handleShowPay="handleShowPay"
<WorldlyAffairs @handleShowPay="handleShowPay" @changelockType="changelockType" @handleSub="handleSub" @handleShareTip="handleShareTip"
:finish="finish" v-if="columnIndex === 1" :column="tagsList[columnIndex]" :bannerList="bannerList" @handleUpdateData="handleUpdateData"
:titleCardList="titleCardList" :worldNewsList="worldNewsList" @onload="onload" /> :isNewFlash="isNewFlash"
:data="newsFastList"
v-if="columnIndex === 0"
/>
<WorldlyAffairs
@handleShowPay="handleShowPay"
@changelockType="changelockType"
@handleSub="handleSub"
:finish="finish"
v-if="columnIndex === 1"
:column="tagsList[columnIndex]"
:bannerList="bannerList"
:titleCardList="titleCardList"
:worldNewsList="worldNewsList"
@onload="onload"
/>
</view> </view>
</view> </view>
@ -138,11 +173,11 @@ import KnowEarlier from "@/pages/knowEarlier/index.vue";
import WorldlyAffairs from "@/pages/worldlyAffairs/index.vue"; import WorldlyAffairs from "@/pages/worldlyAffairs/index.vue";
import { getNewsFast, checkNews, getNewsTag, getNewsList, unlockColumn } from "@/api"; import { getNewsFast, checkNews, getNewsTag, getNewsList, unlockColumn } from "@/api";
import { Session } from "@/utils/storage"; import { Session } from "@/utils/storage";
import down from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/down.png"; import down from "@/assets/images/down.png";
import { scrollToTop, formatTime, jumpUrl } from "@/utils/util.ts"; import { scrollToTop, formatTime, jumpUrl } from "@/utils/util.ts";
import { useShareStore } from "@/stores/shareStore"; import { useShareStore } from "@/stores/shareStore";
import { useTimerStore } from "@/stores/timerStore"; import { useTimerStore } from "@/stores/timerStore";
import shareImg from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/share-tips-img.png"; import shareImg from "@/static/share-tips-img.png";
import Pay from "@/components/pay/index.vue"; import Pay from "@/components/pay/index.vue";
import LoginPopup from "@/components/loginPopup/index.vue"; import LoginPopup from "@/components/loginPopup/index.vue";
const emit = defineEmits(["onChange"]); const emit = defineEmits(["onChange"]);
@ -153,7 +188,7 @@ const props = defineProps({
}, },
columnState: { columnState: {
type: Object, type: Object,
default: () => { }, default: () => {},
}, },
}); });
const shareShow = ref(false); const shareShow = ref(false);
@ -556,15 +591,12 @@ onUnmounted(() => {
background-color: #f6f6f6; background-color: #f6f6f6;
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto; overflow-y: auto;
.increaseLevel { .increaseLevel {
z-index: 103 !important; z-index: 103 !important;
} }
.searchIncreaseLevel { .searchIncreaseLevel {
z-index: 104 !important; z-index: 104 !important;
} }
// 搜索框 // 搜索框
.sreach { .sreach {
width: 100%; width: 100%;
@ -573,7 +605,7 @@ onUnmounted(() => {
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
gap: 30rpx; gap: 30rpx;
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip_header_search_bg.png); background-image: url(@/assets/images/vip_header_search_bg.png);
background-size: cover; background-size: cover;
position: fixed; position: fixed;
left: 0; left: 0;
@ -585,7 +617,6 @@ onUnmounted(() => {
height: 60rpx; height: 60rpx;
margin-top: 3rpx; margin-top: 3rpx;
} }
.sreach_input { .sreach_input {
background-color: #fff; background-color: #fff;
border-radius: 36rpx; border-radius: 36rpx;
@ -597,7 +628,6 @@ onUnmounted(() => {
color: #717171 !important; color: #717171 !important;
} }
} }
// 渐变的背景 // 渐变的背景
.vipContentBg { .vipContentBg {
position: fixed; position: fixed;
@ -605,12 +635,11 @@ onUnmounted(() => {
top: 0; top: 0;
width: 100%; width: 100%;
height: 366rpx; height: 366rpx;
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip_header_content_bg.png); background-image: url(@/assets/images/vip_header_content_bg.png);
background-size: cover; background-size: cover;
margin-top: 100rpx; margin-top: 100rpx;
z-index: 101; z-index: 101;
} }
// banner // banner
.headerBanner { .headerBanner {
margin: 0rpx 26rpx; margin: 0rpx 26rpx;
@ -620,7 +649,7 @@ onUnmounted(() => {
top: 0; top: 0;
margin-top: 116rpx; margin-top: 116rpx;
z-index: 101; z-index: 101;
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/swiper_vip.png); background-image: url(@/assets/images/swiper_vip.png);
background-size: contain; background-size: contain;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -630,14 +659,12 @@ onUnmounted(() => {
box-sizing: border-box; box-sizing: border-box;
padding-top: 20rpx; padding-top: 20rpx;
width: 100%; width: 100%;
.tabsList { .tabsList {
display: flex; display: flex;
background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%); background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%);
border-top-left-radius: 27rpx; border-top-left-radius: 27rpx;
border-top-right-radius: 27rpx; border-top-right-radius: 27rpx;
position: relative; position: relative;
&::before { &::before {
content: ""; content: "";
display: flex; display: flex;
@ -649,7 +676,6 @@ onUnmounted(() => {
top: 0; top: 0;
z-index: -1; z-index: -1;
} }
.tab_item { .tab_item {
width: 52%; width: 52%;
height: 86rpx; height: 86rpx;
@ -660,21 +686,19 @@ onUnmounted(() => {
// padding-top: 2rpx; // padding-top: 2rpx;
color: #fff; color: #fff;
font-family: "SourceHanSansCN-Medium"; font-family: "SourceHanSansCN-Medium";
&.active { &.active {
border-top-left-radius: 27rpx; border-top-left-radius: 27rpx;
border-top-right-radius: 27rpx; border-top-right-radius: 27rpx;
background: linear-gradient(90deg, #ff5e6a 0%, #e7303f 100%); background: linear-gradient(90deg, #ff5e6a 0%, #e7303f 100%);
box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.3), 0px 0px 3px 0px rgba(143, 15, 25, 0.3); box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.3), 0px 0px 3px 0px rgba(143, 15, 25, 0.3);
position: relative; position: relative;
&::after { &::after {
content: ""; content: "";
display: flex; display: flex;
width: 30rpx; width: 30rpx;
height: 25rpx; height: 25rpx;
// background-color: red; // background-color: red;
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/arrow.png); background-image: url(@/assets/images/arrow.png);
position: absolute; position: absolute;
left: 50%; left: 50%;
bottom: 0; bottom: 0;
@ -685,10 +709,8 @@ onUnmounted(() => {
background-repeat: no-repeat; background-repeat: no-repeat;
z-index: -1; z-index: -1;
} }
// box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.3), 1px 0px 2px 0px rgba(143, 15, 25, 0.3); // box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.3), 1px 0px 2px 0px rgba(143, 15, 25, 0.3);
} }
.tab_item_icon { .tab_item_icon {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
@ -696,13 +718,11 @@ onUnmounted(() => {
background-size: contain; background-size: contain;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
&.tab_item_13 { &.tab_item_13 {
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/icon_know.png); background-image: url(@/assets/images/icon_know.png);
} }
&.tab_item_14 { &.tab_item_14 {
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/icon_worldly.png); background-image: url(@/assets/images/icon_worldly.png);
} }
} }
} }
@ -711,7 +731,6 @@ onUnmounted(() => {
.contenttab { .contenttab {
position: relative; position: relative;
&::before { &::before {
content: ""; content: "";
display: flex; display: flex;
@ -725,12 +744,10 @@ onUnmounted(() => {
z-index: 101; z-index: 101;
backdrop-filter: blur(60rpx); backdrop-filter: blur(60rpx);
} }
.tabsList { .tabsList {
display: flex; display: flex;
background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%); background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%);
position: relative; position: relative;
// z-index: ; // z-index: ;
.tab_item { .tab_item {
width: 52%; width: 52%;
@ -750,7 +767,6 @@ onUnmounted(() => {
.Vipcontent { .Vipcontent {
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
.content { .content {
position: relative; position: relative;
z-index: 101; z-index: 101;
@ -770,7 +786,6 @@ onUnmounted(() => {
padding: 0 30rpx; padding: 0 30rpx;
position: relative; position: relative;
z-index: 101; z-index: 101;
.tabList { .tabList {
display: flex; display: flex;
overflow-x: auto; overflow-x: auto;
@ -805,7 +820,7 @@ onUnmounted(() => {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/overlay_world.png); background-image: url(@/assets/images/overlay_world.png);
.downPng { .downPng {
width: 30rpx; width: 30rpx;
@ -825,11 +840,9 @@ onUnmounted(() => {
top: 0; top: 0;
border-bottom-left-radius: 30rpx; border-bottom-left-radius: 30rpx;
border-bottom-right-radius: 30rpx; border-bottom-right-radius: 30rpx;
.popupContainer { .popupContainer {
height: 300rpx; height: 300rpx;
overflow-y: auto; overflow-y: auto;
.tabsPopupItem { .tabsPopupItem {
.title { .title {
font-size: 32rpx; font-size: 32rpx;
@ -871,7 +884,6 @@ onUnmounted(() => {
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.8); background-color: rgba(0, 0, 0, 0.8);
z-index: 9999; z-index: 9999;
.img { .img {
width: 100%; width: 100%;
height: 350rpx; height: 350rpx;

2
src/components/InfoSummary.vue
View File

@ -2,7 +2,7 @@
<view class="info-summary"> <view class="info-summary">
<view class="left"> <view class="left">
<view style="display: flex; align-items: center; gap: 10rpx"> <view style="display: flex; align-items: center; gap: 10rpx">
<img src="https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/zixun/title_text.png" class="banner_title" /> <img src="@/assets/zixun/title_text.png" class="banner_title" />
<text class="date">({{ dayjs(new Date().getTime()).format("MM/DD") }})</text> <text class="date">({{ dayjs(new Date().getTime()).format("MM/DD") }})</text>
</view> </view>

Some files were not shown because too many files have changed in this diff Show More