From 203e00636426d36b3b78e0d45c24199e880f548c Mon Sep 17 00:00:00 2001
From: fifththirteen <570205219@qq.com>
Date: Mon, 4 Dec 2023 10:40:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=B8=B8=E4=BA=91=E4=BB=8E?=
 =?UTF-8?q?=E7=A4=BE=20=E6=A5=9A=E5=A4=A9=E7=A4=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/gonggao/daily.less             |  49 +++--
 src/components/gonggao/Daily.vue              |  55 +----
 .../gonggao/daily/SimpleCelebrity.vue         | 188 ++++++++++++++----
 src/service/gonggao.js                        |  18 +-
 src/utils/index.js                            |  48 +++--
 5 files changed, 234 insertions(+), 124 deletions(-)

diff --git a/src/assets/css/gonggao/daily.less b/src/assets/css/gonggao/daily.less
index cb1b56221..6b80384d9 100644
--- a/src/assets/css/gonggao/daily.less
+++ b/src/assets/css/gonggao/daily.less
@@ -16,6 +16,15 @@
             .u-server {
                 font-size: 16px;
             }
+            .flex;
+            justify-content: space-between;
+            align-items: flex-end;
+            span {
+                font-size: 14px;
+                color: #989898;
+                cursor: pointer;
+                margin-right: 10px;
+            }
         }
         .m-daily-content {
             .size(420px, 248px);
@@ -222,52 +231,54 @@
     }
 
     .m-simple-celebrity {
-        .mt(20px);
         .flex;
         flex-direction: column;
-        gap: 20px;
+        gap: 10px;
         .m-celebrity-item {
             flex: none;
             .flex;
             flex-direction: column;
             padding: 10px;
-            gap: 13px;
+            gap: 20px;
             width: 100%;
-            height: 80px;
+            height: 76px;
             box-sizing: border-box;
 
             background: #ffffff;
             color: #000000;
             border-radius: 10px;
+            font-size: 14px;
+            line-height: 18px;
             .u-celebrity-title {
                 .flex;
                 justify-content: space-between;
                 align-items: center;
-                // font-weight: 700;
-                font-size: 16px;
-                line-height: 26px;
-                color: #888;
+                .bold;
+            }
+            .u-celebrity-staged {
+                .flex;
+                justify-content: space-between;
+                align-items: center;
+                .bold;
+                img {
+                    .size(18px);
+                    margin-right: 2px;
+                }
             }
             .u-celebrity-desc {
                 .flex;
                 justify-content: space-between;
                 align-items: center;
-                font-weight: 400;
-                font-size: 15px;
-                line-height: 21px;
-                & > div {
+                .u-map {
                     .flex;
                     align-items: center;
+                    gap: 5px;
                 }
-                img {
-                    .size(21px, 21px);
-                    .mr(2px);
+                .u-desc {
+                    font-size: 12px;
+                    color: rgba(0, 0, 0, 0.5);
                 }
             }
-            &.current-item {
-                // background-color: #ffad31;
-                // color: #fff;
-            }
         }
     }
 
diff --git a/src/components/gonggao/Daily.vue b/src/components/gonggao/Daily.vue
index 16d853d35..f17191680 100644
--- a/src/components/gonggao/Daily.vue
+++ b/src/components/gonggao/Daily.vue
@@ -14,25 +14,12 @@
                 <SimpleDaily class="m-daily-content" :activities="activities"></SimpleDaily>
             </div>
             <div class="m-daily-item">
-                <div class="u-title">楚天社</div>
-                <SimpleCelebrity class="m-daily-content"></SimpleCelebrity>
+                <div class="u-title">
+                    <div>{{ !currentCelebrity ? "楚天社" : "云从社" }}</div>
+                    <span @click="switchCelebrity">切换</span>
+                </div>
+                <SimpleCelebrity :type="currentCelebrity" class="m-daily-content"></SimpleCelebrity>
             </div>
-        </template>
-
-        <!-- <div class="m-daily-item is-disabled"></div> -->
-        <!-- <div class="m-daily-item is-disabled">
-            <div class="u-title">武林通鉴·秘境</div>
-            <SimpleFb :list="fbList"></SimpleFb>
-        </div>
-        <div class="m-daily-item is-disabled">
-            <div class="u-title">武林通鉴·团队秘境</div>
-            <SimpleFb :list="teamFbList"></SimpleFb>
-        </div>
-        <div class="m-daily-item is-disabled">
-            <div class="u-title">门派事件</div>
-            <SimpleMp></SimpleMp>
-        </div> -->
-        <template v-if="!isOrigin">
             <div class="m-daily-item">
                 <div class="u-title">园宅会赛</div>
                 <div class="m-child-item">
@@ -78,34 +65,7 @@ export default {
     },
     data() {
         return {
-            fbList: [
-                {
-                    name: "英雄刀轮海厅(完善中...)",
-                    isDone: true,
-                },
-                {
-                    name: "英雄空雾峰(完善中...)",
-                    isDone: false,
-                },
-                {
-                    name: "英雄毒神殿(完善中...)",
-                    isDone: false,
-                },
-            ],
-            teamFbList: [
-                {
-                    name: "西津渡(完善中...)",
-                    isDone: false,
-                },
-                {
-                    name: "持国天王回忆录(完善中...)",
-                    isDone: true,
-                },
-                {
-                    name: "血战天策(完善中...)",
-                    isDone: false,
-                },
-            ],
+            currentCelebrity: 1, // 楚天社0 云从社1
             currentFurniture: {},
             nextFurniture: {},
             activities: [], // 日常配置列表
@@ -140,6 +100,9 @@ export default {
         },
     },
     methods: {
+        switchCelebrity() {
+            this.currentCelebrity = ~~!this.currentCelebrity;
+        },
         loadDailyNew() {
             const params = {
                 client: this.client,
diff --git a/src/components/gonggao/daily/SimpleCelebrity.vue b/src/components/gonggao/daily/SimpleCelebrity.vue
index a42e7764b..2f535fa92 100644
--- a/src/components/gonggao/daily/SimpleCelebrity.vue
+++ b/src/components/gonggao/daily/SimpleCelebrity.vue
@@ -1,42 +1,51 @@
 <template>
-    <div class="m-simple-celebrity">
-        <el-tooltip v-for="(item, i) in list" :key="i" placement="top" popper-class="m-celebrity-notice-tooltip">
-            <div slot="content">
-                <div>{{ item.desc }}</div>
+    <div class="m-simple-celebrity" v-loading="loading">
+        <div class="m-celebrity-item" v-for="(item, i) in list" :key="i" :class="!i && 'current-item'">
+            <div class="u-celebrity-title">
+                <div>{{ i ? item.timeFormat : "当前" }}</div>
+                <div class="u-celebrity-staged">
+                    <img :src="`${iconPath}/minimap_${item.icon}.png`" />
+                    <span>{{ item.stage }}</span>
+                </div>
             </div>
-            <div class="m-celebrity-item" :class="!i && 'current-item'">
-                <div class="u-celebrity-title">
-                    <div>{{ i ? item.timeFormat : "▶ 当前" }}</div>
-                    <div>{{ item.map }}</div>
+            <div class="u-celebrity-desc">
+                <div class="u-map">
+                    <b>{{ item.map + " · " }}</b>
+                    <span>
+                        <template v-if="type === 1 && item.oldKey === 'y8'"> 特殊事件 · </template>{{ item.site }}
+                    </span>
                 </div>
-                <div class="u-celebrity-desc">
-                    <div>
-                        <span>位置：</span>
-                        <b>{{ item.site }}</b>
-                    </div>
-                    <div>
-                        <span>阶段：</span>
-                        <img :src="require(`@/assets/img/gonggao/minimap_${item.icon || 6}.png`)" />
-                        <span>{{ item.stage }}</span>
-                    </div>
+                <div class="u-desc">
+                    {{ getDesc(item.desc) }}
                 </div>
             </div>
-        </el-tooltip>
+        </div>
     </div>
 </template>
 <script>
 import { getCelebrities } from "@/service/gonggao";
+import dayjs from "@/plugins/day";
+import { sortBy } from "@/utils/index";
+const JX3BOX = require("@jx3box/jx3box-common/data/jx3box.json");
 export default {
     name: "SimpleCelebrity",
+    props: {
+        type: {
+            type: Number,
+            default: 1,
+        },
+    },
     data: function () {
         return {
             loading: false,
             list: [],
+            showNum: 3,
             celebrityList: [],
             currentDate: {
-                h: new Date().getHours(),
-                m: new Date().getMinutes(),
+                h: dayjs.tz().hour(),
+                m: dayjs.tz().minute(),
             },
+            iconPath: JX3BOX.__imgPath + "pve/minimap",
         };
     },
     computed: {
@@ -45,11 +54,19 @@ export default {
         },
     },
     methods: {
+        getDesc(desc) {
+            if (!desc) return "";
+            if (desc.indexOf("公共任务：") > -1) {
+                return desc.split("公共任务：")[1];
+            }
+            return desc;
+        },
         loadData: function () {
             this.loading = true;
-            return getCelebrities()
+            return getCelebrities({ type: this.type })
                 .then((res) => {
-                    this.celebrityList = res.data.map((item) => {
+                    const data = res.data?.data || [];
+                    this.celebrityList = data.map((item) => {
                         item.icon = Number(item.icon);
                         item.time = Number(item.time);
                         return item;
@@ -64,11 +81,15 @@ export default {
                 });
         },
         toFormatTime(h, m) {
-            const hF = h < 0 ? "23" : h < 10 ? "0" + h : h > 23 ? "00" : h;
-            const hM = m < 10 ? "0" + m : m;
-            return hF + ":" + hM;
+            if (h >= 24) {
+                const day = Math.floor(h / 24);
+                h = h - 24 * day;
+            }
+            const formatM = m.toString().padStart(2, "00");
+            return `${h}:${formatM}`.padStart(5, "00:00");
         },
-        getList(date) {
+        // 处理楚天社
+        getChu(date) {
             const currentKey = "c" + (date.h % 2 === 0 ? "0" : "1") + (date.m < 30 ? "0" : "1");
             const isEqualMinute = this.celebrityList.findIndex((item) => {
                 return item.key === currentKey && item.time === date.m;
@@ -83,17 +104,19 @@ export default {
                     return item.key === currentKey && item.time > date.m;
                 });
                 if (nIndex === -1) {
-                    // 最后一个
-                    index = this.celebrityList.length - 1;
+                    // 当前key中最后一个
+                    index = this.celebrityList.findLastIndex((item) => {
+                        return item.key === currentKey;
+                    });
                 } else {
                     index = nIndex - 1;
                 }
             }
             // 13: 57
-            let list = this.celebrityList.slice(index, index + 3);
+            let list = this.celebrityList.slice(index, index + this.showNum);
             let newList = [];
-            if (list.length < 3) {
-                newList = list.concat(this.celebrityList.slice(0, 3 - list.length));
+            if (list.length < this.showNum) {
+                newList = list.concat(this.celebrityList.slice(0, this.showNum - list.length));
             } else {
                 newList = [].concat(list);
             }
@@ -116,6 +139,98 @@ export default {
                 return item;
             });
         },
+        // 处理云从社
+        getYun(date) {
+            // console.log(date.h + ":" + date.m);
+            // 循环事件
+            const circleList = this.celebrityList.filter((item) => item.key !== "y8");
+            const currentKey = "y" + (date.h % 2 === 0 ? "0" : "1");
+            const isEqualMinute = circleList.findIndex((item) => {
+                return item.key === currentKey && item.time === date.m;
+            });
+            let index = 0;
+            if (isEqualMinute !== -1) {
+                // 包含当前时间
+                index = isEqualMinute;
+            } else {
+                // 不包含
+                const nIndex = circleList.findIndex((item) => {
+                    return item.key === currentKey && item.time > date.m;
+                });
+                if (nIndex === -1) {
+                    // 当前key中最后一个
+                    index = circleList.findLastIndex((item) => {
+                        return item.key === currentKey;
+                    });
+                } else {
+                    index = nIndex - 1;
+                }
+            }
+
+            let list = circleList.slice(index, index + this.showNum);
+            let newList = [];
+            if (list.length < this.showNum) {
+                newList = list.concat(circleList.slice(0, this.showNum - list.length));
+            } else {
+                newList = [].concat(list);
+            }
+            const circleNumList = newList.map((item) => {
+                // 当前时间
+                let h = this.currentDate.h;
+                if (currentKey !== item.key) {
+                    h = h + 1;
+                }
+                item.h = h;
+                item.m = item.time;
+                item.timeFormat = this.toFormatTime(h, item.time);
+                return item;
+            });
+
+            // 8小时cd事件
+            const y8List = this.celebrityList.filter((item) => item.key === "y8");
+            const y8FormatList = [];
+            for (let i = 0; i < 24; i += 8) {
+                y8List.forEach((item) => {
+                    const h = item.hour + i < 24 ? item.hour + i : item.hour + i - 24;
+                    const timeFormat = `${h.toString().padStart(2, "00")}:${item.time}`;
+                    y8FormatList.push({
+                        ...item,
+                        id: item.id + "" + item.hour + i,
+                        timeFormat: timeFormat,
+                        hour: h,
+                        h: h,
+                        m: item.time,
+                        oldKey: item.key,
+                        key: "y" + (h % 2 === 0 ? "0" : "1"),
+                    });
+                });
+            }
+            const y8FilterList = y8FormatList.filter((item) => {
+                const num = item.h * 60 + item.m;
+                const firstNum = circleNumList[0].h * 60 + circleNumList[0].m;
+                const lastNum =
+                    circleNumList[circleNumList.length - 1].h * 60 + circleNumList[circleNumList.length - 1].m;
+                return num >= firstNum && num <= lastNum;
+            });
+            let combineList = [];
+            if (y8FilterList.length) {
+                combineList = circleNumList.concat(y8FilterList).sort(sortBy("h", "time"));
+                if (combineList[0].h * 60 + combineList[0].m < date.h * 60 + date.m) {
+                    combineList.splice(0, 1);
+                }
+            } else {
+                combineList = circleNumList;
+            }
+
+            this.list = combineList.slice(0, this.showNum);
+        },
+        getList(date) {
+            if (this.type === 0) {
+                this.getChu(date);
+            } else {
+                this.getYun(date);
+            }
+        },
     },
     watch: {
         currentDate: {
@@ -127,16 +242,19 @@ export default {
                 }
             },
         },
+        type() {
+            this.loadData();
+        },
     },
     created() {
         this.loadData();
     },
     mounted() {
         setInterval(() => {
-            if (this.currentDate.h !== new Date().getHours() || this.currentDate.m !== new Date().getMinutes()) {
+            if (this.currentDate.h !== dayjs.tz().hour() || this.currentDate.m !== dayjs.tz().minute()) {
                 this.currentDate = {
-                    h: new Date().getHours(),
-                    m: new Date().getMinutes(),
+                    h: dayjs.tz().hour(),
+                    m: dayjs.tz().minute(),
                 };
             }
         }, 1000);
diff --git a/src/service/gonggao.js b/src/service/gonggao.js
index 7ce04d915..fe295dba6 100644
--- a/src/service/gonggao.js
+++ b/src/service/gonggao.js
@@ -51,13 +51,21 @@ function getFurniture(params) {
     });
 }
 
-function getCelebrities({ client = "std" } = {}) {
-    return $node().get(`/celebrities`, {
-        params: {
-            client,
-        },
+// function getCelebrities({ client = "std" } = {}) {
+//     return $node().get(`/celebrities`, {
+//         params: {
+//             client,
+//         },
+//     });
+// }
+
+// 名望
+function getCelebrities(params) {
+    return $cms().get(`/api/cms/game/celebrity`, {
+        params,
     });
 }
+
 function getGameReporter(params) {
     return $next().get("/api/game/reporter/horse", {
         params,
diff --git a/src/utils/index.js b/src/utils/index.js
index d655f29e7..b0946a6c3 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,19 +1,29 @@
-export function deleteNull(obj) {
-    if (Object.prototype.toString.call(obj) === "[object Object]") {
-        for (const key in obj) {
-            if ([undefined, null, ""].includes(obj[key])) {
-                delete obj[key];
-            }
-        }
-        return obj;
-    } else {
-        return obj;
-    }
-}
-
-export function isPhone() {
-    let mobile = navigator.userAgent.match(
-        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
-    );
-    return mobile !== null;
-}
+export function deleteNull(obj) {
+    if (Object.prototype.toString.call(obj) === "[object Object]") {
+        for (const key in obj) {
+            if ([undefined, null, ""].includes(obj[key])) {
+                delete obj[key];
+            }
+        }
+        return obj;
+    } else {
+        return obj;
+    }
+}
+
+export function isPhone() {
+    let mobile = navigator.userAgent.match(
+        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+    );
+    return mobile !== null;
+}
+
+// 多字段排序 - 数值
+export function sortBy(filed1, filed2) {
+    return function (a, b) {
+        if (a[filed1] === b[filed1]) {
+            return a[filed2] - b[filed2];
+        }
+        return a[filed1] - b[filed1];
+    };
+}