From f20115dca8b0e35cf5dcb9d96254f7b433675bba Mon Sep 17 00:00:00 2001
From: fuxiaochun <f2e.xiaochun@gmail.com>
Date: Thu, 17 Aug 2023 17:46:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ArticleDetail/index.vue        |   8 +-
 src/router/index.js                           | 138 ++++++++++--------
 .../business/components/CategoryCardList.vue  |   2 +-
 .../components/card-item.vue                  |   0
 src/views/{insights => business}/home.vue     |   4 +-
 src/views/business/index.vue                  |  32 ++--
 .../macroeconomics/components/card-item.vue   |   6 +-
 .../macroeconomics/components/news-item.vue   |   0
 .../macroeconomics/components/title.vue       |   0
 .../macroeconomics/components/trends-item.vue |   0
 src/views/business/macroeconomics/detail.vue  |  18 +++
 .../{ => business}/macroeconomics/index.vue   |   0
 src/views/business/macroeconomics/list.vue    | 133 +++++++++++++++++
 .../{ => business}/macroeconomics/trend.vue   |   0
 src/views/home/index.vue                      |   4 +-
 src/views/insights/index.vue                  |  27 ----
 16 files changed, 258 insertions(+), 114 deletions(-)
 rename src/views/{insights => business}/components/card-item.vue (100%)
 rename src/views/{insights => business}/home.vue (97%)
 rename src/views/{ => business}/macroeconomics/components/card-item.vue (82%)
 rename src/views/{ => business}/macroeconomics/components/news-item.vue (100%)
 rename src/views/{ => business}/macroeconomics/components/title.vue (100%)
 rename src/views/{ => business}/macroeconomics/components/trends-item.vue (100%)
 create mode 100644 src/views/business/macroeconomics/detail.vue
 rename src/views/{ => business}/macroeconomics/index.vue (100%)
 create mode 100644 src/views/business/macroeconomics/list.vue
 rename src/views/{ => business}/macroeconomics/trend.vue (100%)
 delete mode 100644 src/views/insights/index.vue

diff --git a/src/components/ArticleDetail/index.vue b/src/components/ArticleDetail/index.vue
index 3cc8a72..20830d5 100644
--- a/src/components/ArticleDetail/index.vue
+++ b/src/components/ArticleDetail/index.vue
@@ -33,7 +33,10 @@
                 </ul>
             </div>
         </div>
-        <!-- <AiAssistant></AiAssistant> -->
+        <template v-if="detail">
+            <AiAssistantFolat></AiAssistantFolat>
+            <AiAssistant :content="detail.content"></AiAssistant>
+        </template>
     </div>
 </template>
 
@@ -43,7 +46,8 @@ import http from '@/io/http';
 import { showToast } from 'vant';
 import { useRouter, useRoute } from 'vue-router';
 import { DateFormat } from '@/utils/format.js';
-// import AiAssistant from '@/views/chat/components/ai-assistant.vue';
+import AiAssistantFolat from '@/views/chat/components/ai-assistant-float.vue';
+import AiAssistant from '@/views/chat/components/ai-assistant.vue'
 
 const props = defineProps({
     id: {type: [Number, String], required: true },
diff --git a/src/router/index.js b/src/router/index.js
index b5d659e..575542a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,7 +24,6 @@ const router = createRouter({
                     name: "ChatLayout",
                     meta: {
                         title: "AI助理布局",
-                        
                     },
                     redirect :'/chat',
                     component:ChatLayout,
@@ -38,67 +37,6 @@ const router = createRouter({
                         }
                     }]
                 },
-                {
-                    path: "insights",
-                    name: "Insights",
-                    meta: {
-                        title: "AI商情",
-                    },
-                    component: () => import("@/views/insights/home.vue"),
-                },
-                {
-                    path: "macroeconomics",
-                    name: "Macroeconomics",
-                    meta: {
-                        title: "AI商情-宏观政经",
-                    },
-                    component: () => import("@/views/macroeconomics/index.vue"),
-                },
-                {
-                    path: "trend",
-                    name: "Trend",
-                    meta: {
-                        title: "AI商情-洞见趋势详情",
-                    },
-                    component: () => import("@/views/macroeconomics/trend.vue"),
-                },
-                {
-                    path: "vip",
-                    name: "Vip",
-                    meta: {
-                      title: "会员专区",
-                    },
-                    component: () => import("@/views/vip/index.vue"),
-                },
-                {
-                    path: "ucenter",
-                    name: "ucenter",
-                    meta: {
-                        title: "个人中心",
-                        group: 'ucenter'
-                    },
-                    component: () => import("@/views/ucenter/index.vue"),
-                    children: [
-                        {
-                            path: 'userinfo',
-                            name: 'userInfo',
-                            meta: {
-                                title: '个人信息',
-                                group: 'ucenter'
-                            },
-                            component: () => import("@/views/ucenter/userInfo.vue"),
-                        },
-                        {
-                            path: 'order',
-                            name: 'order',
-                            meta: {
-                                title: '我的订单',
-                                group: 'ucenter'
-                            },
-                            component: () => import("@/views/ucenter/order.vue"),
-                        },
-                    ]
-                },
                 {
                     path: "business",
                     name: "business",
@@ -106,7 +44,43 @@ const router = createRouter({
                         title: "AI商情",
                         group: 'business'
                     },
-                    component: () => import("@/views/business/index.vue"),
+                    component: () => import("@/views/business/home.vue"),
+                },
+                {
+                    path: "/business/macroeconomics",
+                    name: "Macroeconomics",
+                    meta: {
+                        title: "AI商情-宏观政经",
+                        group: 'business'
+                    },
+                    component: () => import("@/views/business/macroeconomics/index.vue"),
+                },
+                {
+                    path: "/business/macroeconomics/list/:pid",
+                    name: "MacroeconomicsList",
+                    meta: {
+                        title: "AI商情-宏观政经内容分类列表",
+                        group: 'business'
+                    },
+                    component: () => import("@/views/business/macroeconomics/list.vue"),
+                },
+                {
+                    path: "/business/macroeconomics/detail/:id",
+                    name: "MacroeconomicsDetail",
+                    meta: {
+                        title: "AI商情-宏观政经内容详情",
+                        group: 'business'
+                    },
+                    component: () => import("@/views/business/macroeconomics/detail.vue"),
+                },
+                {
+                    path: "/business/macroeconomics/trend/:id",
+                    name: "Trend",
+                    meta: {
+                        title: "AI商情-洞见趋势详情",
+                        group: 'business'
+                    },
+                    component: () => import("@/views/business/macroeconomics/trend.vue"),
                 },
                 {
                     path: 'business/insight',
@@ -198,6 +172,44 @@ const router = createRouter({
                     },
                     component: () => import("@/views/business/legal/searchResult.vue"),
                 },
+                {
+                    path: "vip",
+                    name: "Vip",
+                    meta: {
+                      title: "会员专区",
+                    },
+                    component: () => import("@/views/vip/index.vue"),
+                },
+                {
+                    path: "ucenter",
+                    name: "ucenter",
+                    meta: {
+                        title: "个人中心",
+                        group: 'ucenter'
+                    },
+                    component: () => import("@/views/ucenter/index.vue"),
+                    children: [
+                        {
+                            path: 'userinfo',
+                            name: 'userInfo',
+                            meta: {
+                                title: '个人信息',
+                                group: 'ucenter'
+                            },
+                            component: () => import("@/views/ucenter/userInfo.vue"),
+                        },
+                        {
+                            path: 'order',
+                            name: 'order',
+                            meta: {
+                                title: '我的订单',
+                                group: 'ucenter'
+                            },
+                            component: () => import("@/views/ucenter/order.vue"),
+                        },
+                    ]
+                },
+                
             ]
         }
     ],
diff --git a/src/views/business/components/CategoryCardList.vue b/src/views/business/components/CategoryCardList.vue
index 83fbec0..b58f7e9 100644
--- a/src/views/business/components/CategoryCardList.vue
+++ b/src/views/business/components/CategoryCardList.vue
@@ -83,7 +83,7 @@ const loadMore = ()=>{
 
 const goDetail = (id) => {
     let path = {
-        government: `/business/legal/policy/detail/${id}`,  // 宏观正经-内容详情页
+        government: `/business/macroeconomics/detail/${id}`,  // 宏观正经-内容详情页
         business: `/business/insight/detail/${props.cid}/${id}`,  // 行业洞察详情页
         policy: `/business/legal/policy/detail/${id}`,  // 法律法规-政策解读详情页
     };
diff --git a/src/views/insights/components/card-item.vue b/src/views/business/components/card-item.vue
similarity index 100%
rename from src/views/insights/components/card-item.vue
rename to src/views/business/components/card-item.vue
diff --git a/src/views/insights/home.vue b/src/views/business/home.vue
similarity index 97%
rename from src/views/insights/home.vue
rename to src/views/business/home.vue
index 6a4b520..b0ba3d2 100644
--- a/src/views/insights/home.vue
+++ b/src/views/business/home.vue
@@ -41,7 +41,7 @@ const list = [
     icon: '法律法规',
     title: '宏观政经',
     des: '“宏观经济政策”（macroeconomic policy）是指国家或政府有意识有计划地运用一定的政策工具，调节控制宏观经济的运行，以达到一定的政策目标。宏观调控是公共财政的基本职责，所谓公共财政',
-    path: '/macroeconomics',
+    path: '/business/macroeconomics',
     bg: bg01,
   },
   {
@@ -55,7 +55,7 @@ const list = [
     icon: '政治',
     title: '法律法规',
     des: '“宏观经济政策”（macroeconomic policy）是指国家或政府有意识有计划地运用一定的政策工具，',
-    path: '/business/legal/policy',
+    path: '/business/legal',
     bg: bg03,
   },
   {
diff --git a/src/views/business/index.vue b/src/views/business/index.vue
index 2fa6ee8..b1504c5 100644
--- a/src/views/business/index.vue
+++ b/src/views/business/index.vue
@@ -1,16 +1,24 @@
 <template>
-    <div>
-        AI商情首页
-        <div><router-link to="/business/insight">行业洞察</router-link></div>
-        <div><router-link to="/business/legal">法律法规</router-link></div>
-        
-    </div>
+    <Layout path="/business">
+        <div class="h-full flex flex-col justify-center text-white">
+            <TitleComp title="AI商情" :src="TitleSrc">
+                <template #en>
+                    <img class="h-104px w-auto" :src="TitleSrc" alt="" srcset="" />
+                </template>
+            </TitleComp>
+            <div class="mt-36px text-27px font-bold">AI商情预测</div>
+            <div class="text-22px mt-28px text-[#C2C5CA] leading-29px">
+                在AI助理板块，用户可以上传文件给AI翻阅并帮助您解决问题，您可以自己输入关键字或者使用自带的prompt模板在AI助理板块，用户可以上传文件给AI翻阅并帮助您解决问题，您可以自己输入关键字或者使用自带的prompt模
+            </div>
+
+            <div class="mt-61px">
+                <img class="w-658px mx-auto inline-block" src="@/assets/images/ai_busionessinfomation_01.png" />
+            </div>
+        </div>
+    </Layout>
 </template>
-
 <script setup>
-
+import TitleComp from '@/views/home/components/title.vue'
+import TitleSrc from '@/assets/images/AIBUSINESSINFORMATION.png'
+import Layout from '@/views/home/components/layout.vue'
 </script>
-
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/macroeconomics/components/card-item.vue b/src/views/business/macroeconomics/components/card-item.vue
similarity index 82%
rename from src/views/macroeconomics/components/card-item.vue
rename to src/views/business/macroeconomics/components/card-item.vue
index 0b07cd4..a237aea 100644
--- a/src/views/macroeconomics/components/card-item.vue
+++ b/src/views/business/macroeconomics/components/card-item.vue
@@ -4,11 +4,7 @@
     class="h-181px w-full relative bg-gray-500 bg-opacity-10 rounded-2px bg-img"
     @click="
       $router.push({
-        path: '/business/legal/policy',
-        query: {
-          key: data.type_key,
-          id: data.id,
-        },
+        path: `/business/macroeconomics/list/${data.id}`,
       })
     "
   >
diff --git a/src/views/macroeconomics/components/news-item.vue b/src/views/business/macroeconomics/components/news-item.vue
similarity index 100%
rename from src/views/macroeconomics/components/news-item.vue
rename to src/views/business/macroeconomics/components/news-item.vue
diff --git a/src/views/macroeconomics/components/title.vue b/src/views/business/macroeconomics/components/title.vue
similarity index 100%
rename from src/views/macroeconomics/components/title.vue
rename to src/views/business/macroeconomics/components/title.vue
diff --git a/src/views/macroeconomics/components/trends-item.vue b/src/views/business/macroeconomics/components/trends-item.vue
similarity index 100%
rename from src/views/macroeconomics/components/trends-item.vue
rename to src/views/business/macroeconomics/components/trends-item.vue
diff --git a/src/views/business/macroeconomics/detail.vue b/src/views/business/macroeconomics/detail.vue
new file mode 100644
index 0000000..77a2137
--- /dev/null
+++ b/src/views/business/macroeconomics/detail.vue
@@ -0,0 +1,18 @@
+<template>
+    <ArticleDetail :id="id" :breadNav="breadNav" type="government" :isRecommend="false" />
+</template>
+
+<script setup>
+import { ref, onBeforeMount, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import ArticleDetail from '@/components/ArticleDetail/index.vue';
+
+const breadNav = [
+    { path: '/', name: '首页' },
+    { path: '/business', name: 'AI商情' },
+    { path: '/business/macroeconomics', name: '宏观政经' },
+];
+
+const route = useRoute();
+const id = ref(route.params.id);
+</script>
diff --git a/src/views/macroeconomics/index.vue b/src/views/business/macroeconomics/index.vue
similarity index 100%
rename from src/views/macroeconomics/index.vue
rename to src/views/business/macroeconomics/index.vue
diff --git a/src/views/business/macroeconomics/list.vue b/src/views/business/macroeconomics/list.vue
new file mode 100644
index 0000000..04933cd
--- /dev/null
+++ b/src/views/business/macroeconomics/list.vue
@@ -0,0 +1,133 @@
+<template>
+    <div class="pageContainer">
+        <div class="banner" :style="`background-image: url(${banner.picture})`" v-if="banner">
+            <div class="desc">
+                <h2>{{ banner.name }}</h2>
+                <p>{{ banner.description }}</p>
+            </div>
+        </div>
+        <div class="mainBox">
+            <ul class="menu" v-if="categories.length > 0">
+                <li :class="{ active: !cid }" @click="cid = 0">全部</li>
+                <li :class="{ active: cid == item.id }" @click="changeCategory(item.id)" v-for="item in categories">{{
+                    item.name }}</li>
+            </ul>
+            <CardList :key="cid" :cid="cid" :type="type"></CardList>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref, onBeforeMount, onMounted, onUpdated, watch } from 'vue';
+import http from '@/io/http';
+import { showToast } from 'vant';
+import { useRouter, useRoute } from 'vue-router';
+import CardList from '../components/CategoryCardList.vue';
+
+const router = useRouter()
+const route = useRoute()
+const parent_id = ref(route.params.pid);
+const cid = ref(0);
+const banner = ref();
+const categories = ref([]);
+
+const type = ref('government')
+
+onBeforeMount(() => {
+    getBanner();
+    getCategories();
+});
+
+const getBanner = () => {
+    let params = { key: `pc_government` }
+    http('/api/banner', params, 'get').then(res => {
+        banner.value = Array.isArray(res.data) ? res.data[0] : {};
+    }).catch(err => {
+        showToast(err.message);
+    });
+};
+
+const getCategories = () => {
+    let params = { parent_id: parent_id.value }
+    http('/api/keywords', params, 'get').then(res => {
+        categories.value = res.data || [];
+    }).catch(err => {
+        showToast(err.message);
+    });
+};
+
+const changeCategory = (val) => {
+    cid.value = val;
+};
+
+</script>
+
+<style lang="scss" scoped>
+.pageContainer {
+    width: 100%;
+    color: #FFF;
+
+    .banner {
+        width: 100%;
+        height: 216px;
+        background-color: rgba($color: #FFF, $alpha: 0.5);
+        background-repeat: no-repeat;
+        background-size: cover;
+        background-position: center center;
+
+        .desc {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            text-align: center;
+
+            h2 {
+                font-size: 27px;
+            }
+
+            p {
+                width: 460px;
+                font-size: 23px;
+                line-height: 30px;
+                padding: 10px 0;
+            }
+        }
+    }
+
+    .mainBox {
+        width: 100%;
+
+        .menu {
+            width: 100%;
+            height: 90px;
+            overflow-y: hidden;
+            overflow-x: auto;
+            display: flex;
+            padding: 20px;
+            flex-wrap: nowrap;
+            position: relative;
+
+            li {
+                height: 48px;
+                padding: 0 20px;
+                border-radius: 3px;
+                color: #999;
+                line-height: 48px;
+                margin-right: 20px;
+                font-size: 28px;
+                white-space: nowrap;
+
+                &:active,
+                &.active {
+                    background: #3662FE;
+                    color: #FFF;
+                }
+            }
+        }
+
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/macroeconomics/trend.vue b/src/views/business/macroeconomics/trend.vue
similarity index 100%
rename from src/views/macroeconomics/trend.vue
rename to src/views/business/macroeconomics/trend.vue
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index bd9dc39..4c68d3d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -56,7 +56,7 @@
 
 <script setup>
 import Assistant from '@/views/assistant/index.vue'
-import Insights from '@/views/insights/index.vue'
+import Business from '@/views/business/index.vue'
 import Stream from '@/views/stream/index.vue'
 import Course from '@/views/course/index.vue'
 
@@ -75,7 +75,7 @@ const list = [
   }, 
   {
     title: 'AI情商',
-    component: Insights,
+    component: Business,
   },
   {
     title: 'AI传播',
diff --git a/src/views/insights/index.vue b/src/views/insights/index.vue
deleted file mode 100644
index c03f5db..0000000
--- a/src/views/insights/index.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <Layout path="/insights">
-    <div class="h-full flex flex-col justify-center text-white">
-      <TitleComp title="AI商情" :src="TitleSrc">
-        <template #en>
-          <img class="h-104px w-auto" :src="TitleSrc" alt="" srcset="" />
-        </template>
-      </TitleComp>
-      <div class="mt-36px text-27px font-bold">AI商情预测</div>
-      <div class="text-22px mt-28px text-[#C2C5CA] leading-29px">
-        在AI助理板块，用户可以上传文件给AI翻阅并帮助您解决问题，您可以自己输入关键字或者使用自带的prompt模板在AI助理板块，用户可以上传文件给AI翻阅并帮助您解决问题，您可以自己输入关键字或者使用自带的prompt模
-      </div>
-
-      <div class="mt-61px">
-        <img
-          class="w-658px mx-auto inline-block"
-          src="@/assets/images/ai_busionessinfomation_01.png"
-        />
-      </div>
-    </div>
-  </Layout>
-</template>
-<script setup>
-import TitleComp from '@/views/home/components/title.vue'
-import TitleSrc from '@/assets/images/AIBUSINESSINFORMATION.png'
-import Layout from '@/views/home/components/layout.vue'
-</script>