diff --git a/caokao-h5.zip b/caokao-h5.zip
deleted file mode 100644
index e840f48..0000000
Binary files a/caokao-h5.zip and /dev/null differ
diff --git a/src/components/ArticleList.vue b/src/components/ArticleList.vue
index 07fbded..8af7d48 100644
--- a/src/components/ArticleList.vue
+++ b/src/components/ArticleList.vue
@@ -1,11 +1,6 @@
-
+
@@ -13,20 +8,16 @@
-
+
+
-
+
+
订阅后解锁全文
-
+
@@ -54,18 +45,18 @@ const props = defineProps({
// 列表内容
data: {
type: Object,
- default: () => {},
+ default: () => { },
},
});
console.log("props.data", props.data)
-onBeforeMount(() => {});
+onBeforeMount(() => { });
// 点击订阅
const handleSubListItem = (item) => {
// props.data.needpay = true;
// return () => {
- // console.log("item ===>", item)
- emit("handleSubListItem", item.id);
+ // console.log("item ===>", item)
+ emit("handleSubListItem", item.id);
// }
};
diff --git a/src/components/IndexView copy.vue b/src/components/IndexView copy.vue
index 684ad8f..65626c0 100644
--- a/src/components/IndexView copy.vue
+++ b/src/components/IndexView copy.vue
@@ -4,7 +4,8 @@
-
+
@@ -16,7 +17,7 @@
@@ -25,7 +26,7 @@
-
+
@@ -141,7 +142,7 @@ import down from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/dow
import { scrollToTop, formatTime, jumpUrl } from "@/utils/util.ts";
import { useShareStore } from "@/stores/shareStore";
import { useTimerStore } from "@/stores/timerStore";
-import shareImg from "@/static/share-tips-img.png";
+import shareImg from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/share-tips-img.png";
import Pay from "@/components/pay/index.vue";
import LoginPopup from "@/components/loginPopup/index.vue";
const emit = defineEmits(["onChange"]);
diff --git a/src/components/Message.vue b/src/components/Message.vue
index e63f9e3..34af96f 100644
--- a/src/components/Message.vue
+++ b/src/components/Message.vue
@@ -1,11 +1,9 @@
-
-
+
+
市场风格切换 大中盘股相关ETF领涨
@@ -108,6 +106,7 @@ const jump = () => {
0% {
top: -200rpx;
}
+
100% {
top: 0;
}
diff --git a/src/components/RankListMini.vue b/src/components/RankListMini.vue
new file mode 100644
index 0000000..d57b325
--- /dev/null
+++ b/src/components/RankListMini.vue
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+ {{ item.title }}
+ {{ item.summary }}
+
+
+ {{ item.source }}
+ {{
+ dayjs(item.publish_time).format("YYYY-MM-DD HH:MM:ss")
+ }}
+
+
+ 资讯评分:
+ {{ item.news_score }}
+
+
+
+
+
+
+ 收起
+ 展开全部
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/article/index.vue b/src/components/article/index.vue
index bbc86e1..980587c 100644
--- a/src/components/article/index.vue
+++ b/src/components/article/index.vue
@@ -24,11 +24,7 @@
-
+
@@ -47,7 +43,7 @@ import articleMock from "@/mock/article.js";
const props = defineProps({
data: {
type: Object,
- default: () => {},
+ default: () => { },
},
});
@@ -124,8 +120,10 @@ const handleSub = () => {
font-size: 20px;
color: #333;
// font-weight: 700;
- white-space: normal; /* 允许换行 */
- overflow-wrap: break-word; /* 在必要时单词内部断行 */
+ white-space: normal;
+ /* 允许换行 */
+ overflow-wrap: break-word;
+ /* 在必要时单词内部断行 */
font-family: "SourceHanSansCN-Medium";
}
@@ -149,6 +147,7 @@ const handleSub = () => {
color: rgba(51, 51, 51, 0.6);
}
}
+
// 摘要
.desc {
padding: 12rpx;
@@ -161,7 +160,9 @@ const handleSub = () => {
font-size: var(--h2-font-size);
text-indent: 0.5em;
white-space: pre-wrap;
- overflow-wrap: break-word; /* 在必要时单词内部断行 */
+ overflow-wrap: break-word;
+
+ /* 在必要时单词内部断行 */
.bill_icon {
width: 28rpx;
height: 28rpx;
@@ -169,7 +170,7 @@ const handleSub = () => {
margin-right: 12rpx;
margin-top: 6rpx;
background-size: contain;
- background-image: url(@/static/icon_act_lt.png);
+ background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/icon_act_lt.png);
}
}
@@ -183,6 +184,7 @@ const handleSub = () => {
.articleDes {
padding: 0 30rpx 30rpx 30rpx;
box-sizing: border-box;
+
::v-deep {
p {
margin: 30rpx 0;
@@ -191,15 +193,19 @@ const handleSub = () => {
color: #333;
text-indent: 2em;
line-height: 48rpx;
- white-space: normal; /* 允许换行 */
- overflow-wrap: break-word; /* 在必要时单词内部断行 */
+ white-space: normal;
+ /* 允许换行 */
+ overflow-wrap: break-word;
+ /* 在必要时单词内部断行 */
}
+
img {
width: 100%;
margin-left: -2em;
// margin: 0 auto;
}
}
+
&.needpay {
height: 730rpx;
overflow: hidden;
diff --git a/src/components/article/indexNewsInfo.vue b/src/components/article/indexNewsInfo.vue
index 2357436..37481e5 100644
--- a/src/components/article/indexNewsInfo.vue
+++ b/src/components/article/indexNewsInfo.vue
@@ -219,7 +219,7 @@ const handleSub = () => {
margin-right: 12rpx;
margin-top: 6rpx;
background-size: contain;
- background-image: url(@/static/icon_act_lt.png);
+ background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/icon_act_lt.png);
}
}
diff --git a/src/components/column/index.vue b/src/components/column/index.vue
index 4293ba5..a590e87 100644
--- a/src/components/column/index.vue
+++ b/src/components/column/index.vue
@@ -8,17 +8,12 @@
全部
-
+
-
+
{{ item.title }}
{{ item.time }}
@@ -63,7 +58,7 @@ const jumpDetail = (item: any) => {
// margin-top: 16rpx;
background-color: #fff;
padding: 0 24rpx 24rpx 24rpx;
-
+
.column-bar {
display: flex;
justify-content: space-between;
@@ -78,15 +73,18 @@ const jumpDetail = (item: any) => {
align-items: center;
justify-content: center;
font-family: "SourceHanSansCN-Medium";
+
.text1 {
// font-size: 32rpx;
font-size: var(--h1-font-size);
color: #e7303f;
}
+
.text2 {
font-size: var(--h1-font-size);
color: #333;
}
+
.line {
width: 4rpx;
height: 28rpx;
@@ -99,6 +97,7 @@ const jumpDetail = (item: any) => {
display: flex;
align-items: center;
justify-content: center;
+
.text {
// font-size: 24rpx;
font-size: var(--h4-font-size);
@@ -114,9 +113,11 @@ const jumpDetail = (item: any) => {
.news-list {
padding-bottom: 20rpx;
+
.news-item {
padding: 10rpx 0 20rpx;
border-bottom: 2rpx solid rgba(51, 51, 51, 0.1);
+
.news-title {
// font-size: 32rpx;
font-size: var(--h1-font-size);
@@ -128,6 +129,7 @@ const jumpDetail = (item: any) => {
text-overflow: ellipsis;
font-family: "SourceHanSansCN-Medium";
}
+
.news-time {
display: flex;
justify-content: space-between;
@@ -135,8 +137,9 @@ const jumpDetail = (item: any) => {
margin-top: 8rpx;
// font-size: 20rpx;
font-size: var(--h6-font-size);
-
+
color: #b9b9b9;
+
.num {
margin-left: 12rpx;
}
diff --git a/src/components/comment/index.vue b/src/components/comment/index.vue
index 75c4e24..cd76f0e 100644
--- a/src/components/comment/index.vue
+++ b/src/components/comment/index.vue
@@ -2,28 +2,26 @@
@@ -12,13 +14,31 @@
import { ref, onMounted, onUnmounted, reactive } from "vue";
import tabbar from "@/components/mini/Tabbar.vue";
import Navbar from '@/components/mini/Navbar.vue'
+import RankListMini from "@/components/RankListMini.vue";
+import {
+ getindustryCount,
+ getConceptCount,
+ getTopNews,
+ getTopIndustry_d,
+ getTopConcept_d,
+ getNews_cnt_d,
+ newsInfoScore,
+} from "@/api/newsInfo";
+
+const newsList = ref([]);
+// 概念标签贴标
+async function getNewsList() {
+ newsList.value = await getTopNews({});
+}
const tabIndex = ref(0);
function tabChange(index) {
tabIndex.value = index;
}
-onMounted(async () => { });
+onMounted(async () => {
+ getNewsList()
+});
diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue
index 129f191..9ff88a2 100644
--- a/src/pages/news/index.vue
+++ b/src/pages/news/index.vue
@@ -182,7 +182,7 @@ const handleSwiperClick = () => {
height: 168rpx;
position: absolute;
// background-color: #f2505d;
- background-image: url(@/static/news_bg.png);
+ background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/static/news_bg.png);
background-size: cover;
top: -2rpx;
left: 0;