fix:任务百科 #9

JX3BOX · Jan 6, 2024 · 5a8961a · 5a8961a
1 parent 8cbc190
commit 5a8961a
Show file tree

Hide file tree

Showing 19 changed files with 158 additions and 65 deletions.
diff --git a/src/assets/css/cj/home.less b/src/assets/css/cj/home.less
@@ -144,7 +144,7 @@
 
             .u-desc,
             .u-rank {
-                margin-top: 2px;
+                margin-top: 3px;
                 font-size: 12px;
                 line-height: 16px;
             }

diff --git a/src/assets/css/item/home.less b/src/assets/css/item/home.less
@@ -208,7 +208,7 @@
 
             .u-desc,
             .u-rank {
-                margin-top: 2px;
+                margin-top: 3px;
                 font-size: 12px;
                 line-height: 16px;
             }

diff --git a/src/assets/css/quest/home/quest-carousel.less b/src/assets/css/quest/home/quest-carousel.less
@@ -1,4 +1,4 @@
-.m-carousel {
+.m-quest-carousel {
     .m-carousel-content {
         .flex;
         flex-direction: column;
@@ -14,7 +14,7 @@
 
         .u-desc,
         .u-rank {
-            margin-top: 2px;
+            margin-top: 3px;
             .fz(12px, 16px);
         }
 
@@ -58,7 +58,8 @@
         position: relative;
         .db;
         .w(100%);
-        padding: 5px;
+        padding-left: 15px;
+        padding-right: 10px;
         box-sizing: border-box;
         border: 1px solid #d7dae1;
         border-left: none;
@@ -67,6 +68,11 @@
         color: #3d454d;
         overflow: hidden;
         .h(66px);
+        .m-carousel-content {
+            .u-desc {
+                margin-top: 3px;
+            }
+        }
 
         &:before {
             content: "";

diff --git a/src/components/common/notice.vue → src/components/cj/notice.vue b/src/components/common/notice.vue → src/components/cj/notice.vue
diff --git a/src/components/common/wiki-item.vue b/src/components/common/wiki-item.vue
@@ -6,18 +6,18 @@
             params: getViewParams(),
         }"
     >
-        <div class="u-icon">
+        <div v-if="type !== 'quest'" class="u-icon">
             <img :src="iconUrl(item.IconID)" />
         </div>
         <div class="m-carousel-content">
-            <span class="u-title">
+            <div class="u-title">
                 <i class="el-icon-medal"></i>
-                <span v-text="` ${item.Name}`"></span>
-            </span>
-            <span class="u-desc">
+                <span v-text="` ${type === 'quest' ? item.name : item.Name}`"></span>
+            </div>
+            <div class="u-desc">
                 <i class="el-icon-mic"></i>
-                <span v-html="` ${parseDesc(item.Desc)}`"></span>
-            </span>
+                <span v-html="` ${type === 'quest' ? item.target : parseDesc(item.Desc)}`"></span>
+            </div>
         </div>
     </router-link>
 </template>
@@ -54,6 +54,11 @@ export default {
                     item_id: this.item.id,
                 };
             }
+            if (this.type === "quest") {
+                params = {
+                    quest_id: this.item.id,
+                };
+            }
             return params;
         },
         parseDesc(desc) {
@@ -67,3 +72,10 @@ export default {
     },
 };
 </script>
+<style lang="less">
+.m-carousel-content {
+    .u-desc {
+        margin-top: 3px;
+    }
+}
+</style>
diff --git a/src/components/quest/home/newest-post.vue b/src/components/quest/home/newest-post.vue
@@ -6,7 +6,7 @@
                     <router-link
                         class="u-quest-name"
                         :to="{
-                            name: 'single',
+                            name: 'view',
                             params: {
                                 quest_id: post.source_id,
                                 post_id: post.id,

diff --git a/src/components/quest/home/quest-carousel.vue b/src/components/quest/home/quest-carousel.vue
@@ -9,14 +9,15 @@
             >
                 <el-row :gutter="20">
                     <el-col :md="8" v-for="(item, k) in items" :key="k">
-                        <router-link
+                        <WikiItem type="quest" :class="`u-item-${k}`" :item="item" />
+                        <!-- <router-link
                             class="u-item"
                             :class="{
                                 [`u-item-${k}`]: true,
                                 'u-item-new': !hot,
                             }"
                             :to="{
-                                name: 'single',
+                                name: 'view',
                                 params: { quest_id: item.id },
                             }"
                         >
@@ -38,7 +39,7 @@
                                     <span v-text="`三十天 - ${views[item.id]['30days']}`"></span>
                                 </span>
                             </div>
-                        </router-link>
+                        </router-link> -->
                     </el-col>
                 </el-row>
             </el-carousel-item>
@@ -48,8 +49,12 @@
 
 <script>
 import { chunk } from "lodash";
+import WikiItem from "@/components/common/wiki-item.vue";
 export default {
     name: "QuestCarousel",
+    components: {
+        WikiItem,
+    },
     props: {
         quests: {
             type: Array,

diff --git a/src/components/quest/nav.vue b/src/components/quest/nav.vue
@@ -9,6 +9,7 @@
                 node-key="id"
                 @node-click="clickNode"
                 ref="tree"
+                :indent="42"
             >
                 <template slot-scope="{ node, data }">
                     <span v-if="!node.isLeaf" class="el-tree-node__label">
@@ -64,7 +65,6 @@ export default {
                 const mapObj = res.data?.data || {};
                 const maps = [];
                 for (let key in mapObj) {
-                    console.log(questType[key]);
                     if (questType[key]) {
                         maps.push({
                             id: key,

diff --git a/src/components/quest/result/quest-card.vue b/src/components/quest/result/quest-card.vue
@@ -59,7 +59,7 @@ export default {
     },
     methods: {
         go(id) {
-            this.$router.push({ name: "single", params: { quest_id: id } });
+            this.$router.push({ name: "view", params: { quest_id: id } });
         },
         schoolIcon,
         moneyFormat(price) {

diff --git a/src/components/quest/single/notice.vue b/src/components/quest/single/notice.vue
@@ -0,0 +1,45 @@
+<template>
+    <div class="m-wiki-top">
+        <div class="m-wiki-top__header">
+            <h3 class="u-title"><i class="el-icon-news"></i>公告</h3>
+        </div>
+        <div class="m-wiki-top__content" v-html="data"></div>
+    </div>
+</template>
+
+<script>
+import { getBreadcrumb } from "@/service/quest";
+export default {
+    name: "WikiNotice",
+    data() {
+        return {
+            data: [],
+        };
+    },
+    mounted() {
+        this.loadData();
+    },
+    methods: {
+        loadData() {
+            try {
+                const data = sessionStorage.getItem("wiki_quest_ac");
+
+                if (data) {
+                    this.data = JSON.parse(data);
+                } else {
+                    getBreadcrumb("wiki_quest_ac").then((res) => {
+                        this.data = res;
+                        sessionStorage.setItem("wiki_quest_ac", JSON.stringify(this.data));
+                    });
+                }
+            } catch (e) {
+                this.data = "";
+            }
+        },
+    },
+};
+</script>
+
+<style lang="less">
+@import "~@/assets/css/common/notice.less";
+</style>
diff --git a/src/components/quest/single/quest-chain.vue b/src/components/quest/single/quest-chain.vue
@@ -14,7 +14,7 @@
                         「<router-link
                             class="u-chain-link"
                             :class="{ current: current == b.id }"
-                            :to="{ name: 'single', params: { quest_id: b.id } }"
+                            :to="{ name: 'view', params: { quest_id: b.id } }"
                             >{{ b.name }}</router-link
                         >」
                     </span>
@@ -23,7 +23,7 @@
                     「<router-link
                         class="u-chain-link"
                         :class="{ current: current == item.id }"
-                        :to="{ name: 'single', params: { quest_id: item.id } }"
+                        :to="{ name: 'view', params: { quest_id: item.id } }"
                         >{{ item.name }}</router-link
                     >」
                 </span>
@@ -33,7 +33,7 @@
         <div class="branch" v-if="showBranch">
             <el-divider><i class="el-icon-rank"></i> 任务分支</el-divider>
             <span class="u-chain-name" v-for="item in display_data.branch" :key="item.id">
-                「<router-link class="u-chain-link" :to="{ name: 'single', params: { quest_id: item.id } }">{{
+                「<router-link class="u-chain-link" :to="{ name: 'view', params: { quest_id: item.id } }">{{
                     item.name
                 }}</router-link
                 >」

diff --git a/src/components/quest/single/quest-dialog.vue b/src/components/quest/single/quest-dialog.vue
@@ -61,13 +61,17 @@ export default {
 <style lang="less">
 .m-quest-dialog {
     .u-dialog {
-        margin-bottom: 16px;
+        margin-bottom: 10px;
     }
     .u-dialog-content {
+        padding: 5px 0;
         padding-left: 16px;
     }
     .u-dialog-name {
         color: #8a6d3b;
     }
+    .u-dialog-desc {
+        padding: 5px 0;
+    }
 }
 </style>
diff --git a/src/router/quest.js b/src/router/quest.js
@@ -8,10 +8,10 @@ import Vue from "vue";
 import VueRouter from "vue-router";
 Vue.use(VueRouter);
 
-const VueRouterPush = VueRouter.prototype.push
+const VueRouterPush = VueRouter.prototype.push;
 VueRouter.prototype.push = function push(to) {
-    return VueRouterPush.call(this, to).catch(err => err)
-}
+    return VueRouterPush.call(this, to).catch((err) => err);
+};
 
 const routes = [
     {
@@ -28,7 +28,7 @@ const routes = [
         component: () => import("@/views/quest/search-result.vue"),
     },
     {
-        name: "single",
+        name: "view",
         path: "/view/:quest_id([_\\d]+)/:post_id(\\d+)?",
         component: () => import("@/views/quest/single.vue"),
     },
@@ -41,7 +41,7 @@ const routes = [
         name: "newest",
         path: "/newest",
         component: () => import("@/views/quest/newest.vue"),
-    }
+    },
 ];
 
 const router = new VueRouter({
@@ -51,10 +51,10 @@ const router = new VueRouter({
 });
 
 router.beforeEach((to, from, next) => {
-    if (to.fullPath.includes('/#')) {
-        next(to.fullPath.replace('/#', ''));
+    if (to.fullPath.includes("/#")) {
+        next(to.fullPath.replace("/#", ""));
     }
-    next()
+    next();
 });
 
 export default router;
diff --git a/src/service/quest.js b/src/service/quest.js
@@ -32,3 +32,12 @@ export function getWaiting(params) {
 export function getQuestMaps() {
     return $.get(`/quest/maps`);
 }
+
+// 获取任务公告
+export function getBreadcrumb(key = "wiki_quest_ac") {
+    return $cms()
+        .get(`/api/cms/breadcrumb/${key}`)
+        .then((res) => {
+            return res.data.data.html || "";
+        });
+}