From d3cfb99c62136a0f5234007a21f336cb81b9bd38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=82=85=E5=85=89=E5=AD=9F?= <fgmfjf@163.com>
Date: Sun, 8 Feb 2026 16:33:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=83=AD=E9=97=A8?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8=E5=92=8C=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 src/api/index.ts                              |  11 +-
 src/pages/macroscopic/index.vue               | 153 ++++++++++-----
 .../index.vue                                 |   0
 src/pages/realtimeInfo/index.vue              |   4 +-
 src/pages/recommend/index.vue                 | 183 +++++++-----------
 6 files changed, 183 insertions(+), 172 deletions(-)
 rename src/pages/realtimeInfo/components/{HotNewsView => IndustryNewsView}/index.vue (100%)

diff --git a/.env.development b/.env.development
index 705b440..da0a3b9 100644
--- a/.env.development
+++ b/.env.development
@@ -2,10 +2,10 @@
 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 = http://4155gf93ll13.vicp.fun/apih5
 # VITE_API_URL = http://123.60.79.143:8041/apih5
 # VITE_API_URL =http://192.168.0.135:8040/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
\ No newline at end of file
diff --git a/src/api/index.ts b/src/api/index.ts
index c43c9ec..95188c7 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -91,7 +91,6 @@ export const fetchEtfDetail = (data: any) => {
   return Request.post("/news/etfList", data);
 };
 
-
 // 海外先机
 export const getForeignList = (data: any) => {
   return Request.get("/news/exclusiveList", data);
@@ -99,5 +98,11 @@ export const getForeignList = (data: any) => {
 
 // 编辑精选
 export const getRecommendList = (data: any) => {
-  return Request.get("/news/curatedList", data);
-};
\ No newline at end of file
+  return Request.get("/news/curatedList", { params: data });
+};
+
+// 宏观知微
+export const getMacroList = (data: any) => {
+  return Request.get("/news/globalMacroList", { params: data });
+};
+
diff --git a/src/pages/macroscopic/index.vue b/src/pages/macroscopic/index.vue
index 214bddd..3354223 100644
--- a/src/pages/macroscopic/index.vue
+++ b/src/pages/macroscopic/index.vue
@@ -16,72 +16,117 @@
     <!-- 标题 end -->
 
     <view class="page-main">
-      <view class="news-list">
-        <view class="news-item">
-          <view class="title">
-            <view class="icon">宏观</view>
-            <view class="name">
-              行业龙头最新财报行业龙头最新财报行业龙头最新财报行业龙头最新财报
+      <u-loading-icon v-if="loading"></u-loading-icon>
+      <view class="news-list" v-else-if="data?.length > 0">
+        <template v-for="(item, index) in data" :key="index">
+          <view
+            :class="['news-item', { mask: !userStore.isLogin }]"
+            v-for="news in item.list"
+            :key="news.id"
+            @click="goDetail(news)"
+          >
+            <view class="title">
+              <view class="icon">宏观</view>
+              <view class="name">
+                {{ news.title }}
+              </view>
+            </view>
+            <view :class="['content', { mask: isMask }]">
+              {{ news.summary }}
+            </view>
+            <view :class="['source', { mask: isMask }]">
+              <view>{{ news.source }}</view>
+              <view>{{ news.timeStr }}</view>
             </view>
           </view>
-          <view class="content">
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-          </view>
-          <view class="source">
-            <view>中国证券报</view>
-            <view>2025-06-23 10:00</view>
-          </view>
-        </view>
-        <view class="news-item">
-          <view class="title">
-            <view class="icon">宏观</view>
-            <view class="name">
-              行业龙头最新财报行业龙头最新财报行业龙头最新财报行业龙头最新财报
-            </view>
-          </view>
-          <view class="content">
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-          </view>
-          <view class="source">
-            <view>中国证券报</view>
-            <view>2025-06-23 10:00</view>
-          </view>
-        </view>
-        <view class="news-item">
-          <view class="title">
-            <view class="icon">宏观</view>
-            <view class="name">
-              行业龙头最新财报行业龙头最新财报行业龙头最新财报行业龙头最新财报
-            </view>
-          </view>
-          <view class="content">
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-            英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-          </view>
-          <view class="source">
-            <view>中国证券报</view>
-            <view>2025-06-23 10:00</view>
-          </view>
-        </view>
+        </template>
       </view>
+      <u-empty v-else />
     </view>
+    <!-- 登录弹窗 start -->
+    <LoginDialog
+      :show="LoginShow"
+      @onSuccess="handleLoginSuccess"
+      @onCancel="handleLoginCancel"
+      @onError="handleLoginError"
+    />
+    <!-- 登录弹窗 end -->
   </view>
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
-
+import { getMacroList } from "@/api";
+import { useUserStore } from "@/stores/user";
+import { computed, onMounted, ref } from "vue";
+import LoginDialog from "@/components/loginPopup/index.vue";
 // 导航栏路由返回
 const handleBack = () => {
   uni.navigateBack({
     delta: 1,
   });
 };
+
+const userStore = useUserStore();
+// 未登录|试用，显示蒙层
+const isMask = computed(() => {
+  return !userStore.isUserType;
+});
+
+const LoginShow = ref(false);
+// 显示弹框
+const handleShowLogin = () => {
+  LoginShow.value = true;
+};
+
+// 关闭弹框
+const handleLoginCancel = () => {
+  LoginShow.value = false;
+};
+// 登录成功之后的回调
+const handleLoginSuccess = () => {
+  LoginShow.value = false;
+};
+// 登录失败之后的回调
+const handleLoginError = () => {
+  console.log("登录失败");
+};
+// 跳转详情
+function goDetail(item: any) {
+  if (!userStore.isLogin) {
+    handleShowLogin();
+    return;
+  }
+
+  // 试用账号
+  if (!userStore.isUserType) {
+    return;
+  }
+
+  uni.navigateTo({
+    url: `/pages/detail/indexNewsInfo?id=${item.id}`,
+  });
+}
+
+const data = ref([]);
+const loading = ref(false);
+const getList = async () => {
+  loading.value = true;
+  const result = await getMacroList({});
+  loading.value = false;
+  if (result.code === 200) {
+    const { list, total } = result.data;
+    data.value = list;
+  } else {
+    data.value = [];
+  }
+};
+
+onMounted(async () => {
+  if (!userStore.isLogin) {
+    handleShowLogin();
+  }
+  getList();
+});
 </script>
 
 <style scoped lang="scss">
@@ -151,6 +196,10 @@ const handleBack = () => {
   overflow: hidden;
   box-sizing: border-box;
 
+  .mask {
+    filter: blur(5px);
+  }
+
   .news-item {
     width: 100%;
     margin-bottom: 30rpx;
diff --git a/src/pages/realtimeInfo/components/HotNewsView/index.vue b/src/pages/realtimeInfo/components/IndustryNewsView/index.vue
similarity index 100%
rename from src/pages/realtimeInfo/components/HotNewsView/index.vue
rename to src/pages/realtimeInfo/components/IndustryNewsView/index.vue
diff --git a/src/pages/realtimeInfo/index.vue b/src/pages/realtimeInfo/index.vue
index 10c207f..c8fae4d 100644
--- a/src/pages/realtimeInfo/index.vue
+++ b/src/pages/realtimeInfo/index.vue
@@ -14,7 +14,7 @@
     <!-- 资讯榜 end -->
 
     <!-- 热门行业 start -->
-    <HotNewsView @on-show="handleShowLogin" />
+    <IndustryNewsView @on-show="handleShowLogin" />
     <!-- 热门行业 end -->
 
     <!-- 风口概念 start -->
@@ -45,7 +45,7 @@ import { ref, onMounted, onUnmounted, reactive } from "vue";
 import HeaderView from "./components/HeaderView/index.vue";
 import BannerNewsView from "./components/BannerNewsView/index.vue";
 import TopNewsView from "./components/TopNewsView/index.vue";
-import HotNewsView from "./components/HotNewsView/index.vue";
+import IndustryNewsView from "./components/IndustryNewsView/index.vue";
 import ConceptNewsView from "./components/ConceptNewsView/index.vue";
 import TodayNewsView from "./components/TodayNewsView/index.vue";
 import FooterView from "./components/FooterView/index.vue";
diff --git a/src/pages/recommend/index.vue b/src/pages/recommend/index.vue
index 6277a34..a7f5756 100644
--- a/src/pages/recommend/index.vue
+++ b/src/pages/recommend/index.vue
@@ -20,7 +20,7 @@
       <!-- 搜索 start -->
       <view class="page-search">
         <u-input
-          v-model="input"
+          v-model="keyword"
           type="text"
           placeholder="搜索资讯"
           prefixIcon="search"
@@ -30,140 +30,76 @@
             borderRadius: '36rpx',
             background: '#F3F5F8',
           }"
+          @confirm="handleSearch"
         />
       </view>
 
       <!-- 时间轴 start -->
       <view class="page-timeline">
-        <view class="timeline">
+        <view
+          :class="['timeline', { mask: !userStore.isLogin }]"
+          v-for="item in data"
+          :key="item.day"
+        >
           <view class="line"></view>
           <view class="content">
-            <view class="date">2025/11/26</view>
+            <view class="date">{{ item.day }}</view>
             <view class="news-list">
-              <view class="news">
+              <view
+                class="news"
+                v-for="news in item.list"
+                :key="news.id"
+                @click="goDetail(news)"
+              >
                 <view class="news-top">
-                  <view class="time">09:30:00</view>
-                  <view class="source">
-                    <view class="star" :style="{ width: `${4 * 20}rpx` }"></view>
+                  <view class="time">{{ news.timeStr }}</view>
+                  <view class="source" v-if="news.source">
+                    <!-- <view class="star" :style="{ width: `${4 * 20}rpx` }"></view> -->
                     <view class="t-1">来自</view>
-                    <view class="t-2">中国证券报</view>
+                    <view class="t-2">{{ news.source }}</view>
                   </view>
                 </view>
                 <view class="news-title">
                   <view class="name">
-                    <text class="text"
-                      >行业龙头最新财报行业龙头最新财报行业龙头最新财报行业龙头最新财报</text
-                    >
+                    <text class="text">{{ news.title }}</text>
                   </view>
                 </view>
-                <view class="news-content">
-                  英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-                  英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-                  英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
+                <view :class="['news-content', { mask: isMask }]">
+                  {{ news.summary }}
                 </view>
-                <view class="tags">
-                  <text class="tag">#苹果产业链</text>
-                  <text class="tag">#苹果产业链</text>
+                <view :class="['tags', { mask: isMask }]">
+                  <text class="tag">{{ news.companyName }}</text>
                 </view>
-                <view class="events-collapse">
+                <view
+                  :class="['events-collapse']"
+                  v-if="news.furtherReadings?.length > 0"
+                >
                   <view class="events-collapse-top active">
                     <view class="t-1">事件梳理</view>
-                    <view class="t-2">收起</view>
-                  </view>
-                  <view v-show="a" class="events-list">
-                    <view class="events-item">
-                      <view class="events-item-line"></view>
-                      <view class="events-item-content">
-                        <view class="events-content-date">11/24</view>
-                        <view class="events-content-text">
-                          特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳
-                        </view>
-                      </view>
-                    </view>
-                    <view class="events-item">
-                      <view class="events-item-line"></view>
-                      <view class="events-item-content">
-                        <view class="events-content-date">11/24</view>
-                        <view class="events-content-text">
-                          特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳
-                        </view>
-                      </view>
-                    </view>
-                    <view class="events-item">
-                      <view class="events-item-line"></view>
-                      <view class="events-item-content">
-                        <view class="events-content-date">11/24</view>
-                        <view class="events-content-text">
-                          特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="timeline">
-          <view class="line"></view>
-          <view class="content">
-            <view class="date">2025/11/26</view>
-            <view class="news-list">
-              <view class="news">
-                <view class="news-top">
-                  <view class="time">09:30:00</view>
-                  <view class="source">
-                    <view class="star" :style="{ width: `${4 * 20}rpx` }"></view>
-                    <view class="t-1">来自</view>
-                    <view class="t-2">中国证券报</view>
-                  </view>
-                </view>
-                <view class="news-title">
-                  <view class="name">
-                    <text class="text"
-                      >行业龙头最新财报行业龙头最新财报行业龙头最新财报行业龙头最新财报</text
+                    <view
+                      v-if="!selectKeys.includes(news.id)"
+                      class="t-2"
+                      @click="handleOpenEvents(news.id)"
+                      >展开</view
+                    >
+                    <view v-else class="t-2" @click="handleCloseEvents(news.id)"
+                      >收起</view
                     >
                   </view>
-                </view>
-                <view class="news-content">
-                  英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-                  英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-                  英伟达发布2026财年三季度业绩及四季度指引，均超市场预期。收入方场预期。收入方面，三亿美元，同…
-                </view>
-                <view class="tags">
-                  <text class="tag">#苹果产业链</text>
-                  <text class="tag">#苹果产业链</text>
-                </view>
-                <view class="events-collapse">
-                  <view class="events-collapse-top">
-                    <view class="t-1">事件梳理</view>
-                    <view class="t-2">展开</view>
-                  </view>
-                  <view v-show="!a" class="events-list">
-                    <view class="events-item">
+                  <view
+                    v-show="selectKeys.includes(news.id)"
+                    :class="['events-list', { mask: isMask }]"
+                  >
+                    <view
+                      class="events-item"
+                      v-for="further in news.furtherReadings"
+                      :key="further.id"
+                    >
                       <view class="events-item-line"></view>
                       <view class="events-item-content">
-                        <view class="events-content-date">11/24</view>
+                        <view class="events-content-date">{{ further.timeStr }}</view>
                         <view class="events-content-text">
-                          特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳
-                        </view>
-                      </view>
-                    </view>
-                    <view class="events-item">
-                      <view class="events-item-line"></view>
-                      <view class="events-item-content">
-                        <view class="events-content-date">11/24</view>
-                        <view class="events-content-text">
-                          特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳
-                        </view>
-                      </view>
-                    </view>
-                    <view class="events-item">
-                      <view class="events-item-line"></view>
-                      <view class="events-item-content">
-                        <view class="events-content-date">11/24</view>
-                        <view class="events-content-text">
-                          特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳特斯拉Optimus行走视频流出，步态稳
+                          {{ further.title }}
                         </view>
                       </view>
                     </view>
@@ -193,7 +129,6 @@ import { getRecommendList } from "@/api";
 import { useUserStore } from "@/stores/user";
 import { computed, onMounted, ref } from "vue";
 import LoginDialog from "@/components/loginPopup/index.vue";
-const input = ref("");
 // 导航栏路由返回
 const handleBack = () => {
   uni.navigateBack({
@@ -201,10 +136,19 @@ const handleBack = () => {
   });
 };
 
+const selectKeys = ref([]);
+const handleOpenEvents = (id: string) => {
+  selectKeys.value.push(id);
+};
+
+const handleCloseEvents = (id: string) => {
+  selectKeys.value = selectKeys.value.filter((item) => item !== id);
+};
+
 const userStore = useUserStore();
 // 未登录|试用，显示蒙层
 const isMask = computed(() => {
-  return !userStore.isLogin || !userStore.isUserType;
+  return !userStore.isUserType;
 });
 
 const LoginShow = ref(false);
@@ -244,7 +188,9 @@ function goDetail(item: any) {
 
 const data = ref([]);
 const getList = async () => {
-  const result = await getRecommendList({});
+  const result = await getRecommendList({
+    keyword: keyword.value,
+  });
   if (result.code === 200) {
     const { list, total } = result.data;
     data.value = list;
@@ -253,6 +199,11 @@ const getList = async () => {
   }
 };
 
+const keyword = ref("");
+const handleSearch = () => {
+  getList();
+};
+
 onMounted(async () => {
   if (!userStore.isLogin) {
     handleShowLogin();
@@ -335,6 +286,7 @@ onMounted(async () => {
 .page-main {
   position: relative;
   width: 100%;
+  min-height: calc(100vh - 400rpx);
   padding: 30rpx 30rpx 0;
   background: #f3f5f8;
   border-radius: 24rpx 24rpx 0px 0px;
@@ -363,9 +315,14 @@ onMounted(async () => {
   position: relative;
   z-index: 3;
 
+  .mask {
+    filter: blur(5px);
+  }
+
   .timeline {
     z-index: 2;
     display: flex;
+
     .line {
       position: relative;
       top: 12rpx;