Merge remote-tracking branch 'remotes/origin/master' into vue3

Author: zhusha

src/components/pvg/gonggao/Daily.vue

@@ -43,6 +43,7 @@
                 <div class="u-title">抓马播报</div>
                 <SimpleHorse class="m-daily-content"></SimpleHorse>
             </div>
+            <!-- 美人图模块暂不露出
             <div class="m-daily-item">
                 <div class="u-title">
                     <div class="u-mrt-title">
@@ -55,8 +56,9 @@
                 </div>
                 <SimpleMrt class="m-daily-content" :server="currentServer"></SimpleMrt>
             </div>
+            -->
         </template>
-        <MrtDialog :visible="visible" :currentServer="currentServer" @close="visible = false"></MrtDialog>
+        <!-- <MrtDialog :visible="visible" :currentServer="currentServer" @close="visible = false"></MrtDialog> -->
     </div>
 </template>
 
@@ -71,8 +73,8 @@ import SimpleCelebrity from "./daily/SimpleCelebrity.vue";
 // import SimpleReputation from "./daily/SimpleReputation.vue";
 // import SimpleFurniture from "./daily/SimpleFurniture.vue";
 import SimpleHorse from "./daily/SimpleHorse.vue";
-import SimpleMrt from "./daily/SimpleMrt.vue";
-import MrtDialog from "./daily/MrtDialog.vue";
+// import SimpleMrt from "./daily/SimpleMrt.vue";
+// import MrtDialog from "./daily/MrtDialog.vue";
 
 import dailyKeys from "@/assets/data/daily_keys.json";
 import servers_std from "@jx3box/jx3box-data/data/server/server_std.json";
@@ -89,8 +91,8 @@ export default {
         // SimpleWeek,
         // SimpleFurniture,
         SimpleHorse,
-        SimpleMrt,
-        MrtDialog,
+        // SimpleMrt,
+        // MrtDialog,
     },
     data() {
         return {

src/components/pvg/gonggao/calendar/DailySpecial.vue

@@ -3,7 +3,8 @@
         <div class="m-daily-content">
             <lucky-pet :date="date" :client="client"></lucky-pet>
             <furniture v-if="isCurrentWeek" :date="date" :client="client"></furniture>
-            <meirentu :client="client" :today="today"></meirentu>
+            <!-- 美人图模块暂不露出 -->
+            <!-- <meirentu :client="client" :today="today"></meirentu> -->
         </div>
     </div>
 </template>
@@ -12,14 +13,14 @@
 import dayjs from "@/utils/day";
 import luckyPet from "./lucky_pet";
 import furniture from "./furniture";
-import meirentu from "./meirentu.vue";
+// import meirentu from "./meirentu.vue";
 
 export default {
     name: "daily-special",
     components: {
         luckyPet,
         furniture,
-        meirentu,
+        // meirentu,
     },
     props: {
         date: {

src/views/pvg/gonggao/Gonggao.vue

@@ -10,6 +10,10 @@
 <script>
 import { getMyFocusServers, getAllServers } from "@/service/pvg/server.js";
 import CommonToolbar from "@/components/common/toolbar.vue";
+import serverStd from "@jx3box/jx3box-data/data/server/server_std.json";
+import serverOrigin from "@jx3box/jx3box-data/data/server/server_origin.json";
+import serverInternational from "@jx3box/jx3box-data/data/server/server_international.json";
+
 export default {
     name: "Gonggao",
     components: { CommonToolbar },
@@ -64,18 +68,23 @@ export default {
         uid() {
             return this.$store.state.uid;
         },
+        client() {
+            return this.$store.state.client;
+        },
     },
     methods: {
         // 获取服务器列表
         loadAllServers() {
             getAllServers().then((res) => {
-                let mainServerList = res.data?.map((server) => {
-                    return {
-                        ...server,
-                        connect_state_name: this.heatStateArr.find((item) => item.value === server.heat)?.label || "",
-                        connect_state_class: this.heatStateArr.find((item) => item.value === server.heat)?.class || "",
-                    };
-                });
+                let mainServerList = (res.data || [])
+                    .map((server) => {
+                        return {
+                            ...server,
+                            connect_state_name: this.heatStateArr.find((item) => item.value === server.heat)?.label || "",
+                            connect_state_class: this.heatStateArr.find((item) => item.value === server.heat)?.class || "",
+                        };
+                    })
+                    .filter((server) => this.cansee(server));
 
                 this.serverList = mainServerList;
                 this.$store.commit("setServerList", this.serverList);
@@ -86,6 +95,13 @@ export default {
                 }
             });
         },
+        cansee(server) {
+            const zoneName = server?.zone_name || "";
+            const serverName = server?.main_server || server?.server_name || "";
+            const clientType = zoneName === "缘起大区" ? "origin" : "std";
+            const serverList = clientType === "origin" ? serverOrigin : [...serverStd, ...serverInternational];
+            return this.client === clientType && serverList.includes(serverName);
+        },
         //转服务器数据 str转换成obj
         serverFav(data) {
             if (!data) return;