feat: update image path references to use __imgPath for consistency

Author: Kaviilee

src/components/team/member/joinpop.vue

@@ -92,7 +92,7 @@
 </template>
 
 <script>
-import { __cdn } from "@/utils/config";
+import { __imgPath } from "@/utils/config";
 import { getMyPureRoles, joinTeam } from "@/service/team/member.js";
 import { UserFilled } from "@element-plus/icons-vue";
 
@@ -207,7 +207,7 @@ export default {
             this.isIndeterminate = value.length > 0 && value.length < total;
         },
         showAvatar: function (mount) {
-            return __cdn + "image/school/" + mount + ".png";
+            return __imgPath + "image/school/" + mount + ".png";
         },
     },
     beforeUnmount: function () {

src/components/team/org/team_videos.vue

@@ -71,7 +71,7 @@
 </template>
 
 <script>
-import { __cdn } from "@/utils/config";
+import { __imgPath } from "@/utils/config";
 import { Clock, Delete, Edit, Plus, VideoCamera, VideoPlay, WarningFilled } from "@element-plus/icons-vue";
 export default {
     name: "team_videos",
@@ -127,7 +127,7 @@ export default {
             this.$emit("toEmit", data);
         },
         showVideoCover(aid) {
-            return __cdn + "image/rank/videos/" + aid + ".png";
+            return __imgPath + "image/rank/videos/" + aid + ".png";
         },
         statusText(status) {
             return Number(status) === 2 ? this.$t("team.video.rejected") : this.$t("team.video.pending");

src/components/team/raid/JoinPop.vue

@@ -112,7 +112,7 @@
 <script>
 import { getRoles, getAllMyRoles } from "@/service/team/role.js";
 import xf_map from "@jx3box/jx3box-data/data/xf/xf.json";
-import { __cdn } from "@/utils/config";
+import { __imgPath } from "@/utils/config";
 import User from "@jx3box/jx3box-common/js/user";
 import { showMountIcon } from "@/utils/filters";
 export default {
@@ -245,7 +245,7 @@ export default {
             }
         },
         showAvatar: function (mount, body_type) {
-            return __cdn + "image/school/" + mount + ".png";
+            return __imgPath + "image/school/" + mount + ".png";
         },
         resetForm: function () {
             this.form = {

src/components/team/raid/Raid.vue

@@ -208,15 +208,9 @@ export default {
         },
         /**
          * 候补人员转为替补人员
-         * @param {Object} val 选择的队员
          */
-        handlePending(val) {
-            const subRaid = this.$refs.subRaid;
-            const copy_members = lodash.cloneDeep(subRaid.data);
-
-            copy_members.push(val);
-
-            subRaid.data = copy_members;
+        handlePending() {
+            this.loadMembers();
         },
         loadMembers() {
             // 兼容旧版数据

src/components/team/raid/RaidNormal_v1.vue

@@ -190,7 +190,7 @@ const item_demo = {
 
 export default {
     name: "RaidNormal",
-    props: ["data", "teamId", "leader", "row", "col"],
+    props: ["data", "teamId", "leader", "row", "col", "header"],
     emits: ["updateMembers"],
     components: {
         MemberSetting,
@@ -248,7 +248,7 @@ export default {
             return this.$store.state.canManage;
         },
         canDrag() {
-            return this.canManage && this.routerName !== "view_raid";
+            return this.canManage;
         },
         linkVisible() {
             return this.$store.state.isTeammate;

src/components/team/raid/RaidNormal_v2.vue

@@ -211,7 +211,7 @@ const item_demo = {
 
 export default {
     name: "RaidNormal",
-    props: ["data", "teamId", "leader", "row", "col", "id"],
+    props: ["data", "teamId", "leader", "row", "col", "id", "header"],
     emits: ["update"],
     components: {
         MemberSetting,
@@ -274,7 +274,7 @@ export default {
             return this.$store.state.canManage;
         },
         canDrag() {
-            return this.canManage && this.routerName !== "view_raid";
+            return this.canManage;
         },
         linkVisible() {
             return this.$store.state.isTeammate;

src/components/team/raid/RaidSub.vue

@@ -111,7 +111,7 @@ import { showMountIcon, showMountName } from "@/utils/filters";
 import bus from "@/utils/bus";
 export default {
     name: "RaidSub",
-    props: ["id", "teamId", "isForceMatch", "canAdd", "canReplace"],
+    props: ["id", "teamId", "isForceMatch", "canAdd", "canReplace", "header"],
     emits: ["pass"],
     components: {
         MemberSetting,

src/components/team/raid/RaidTobe.vue

@@ -108,7 +108,7 @@ import { showMountIcon, showMountName } from "@/utils/filters";
 import bus from "@/utils/bus";
 export default {
     name: "RaidTobe",
-    props: ["id", "teamId", "isForceMatch", "canAdd", "canReplace"],
+    props: ["id", "teamId", "isForceMatch", "canAdd", "canReplace", "header"],
     emits: ["pass", "pending"],
     components: {
         RaidRoleDialog,
@@ -223,11 +223,13 @@ export default {
             }
         },
         // 设为替补
-        pending(member, i) {
-            covertTobe2Sub(this.raid_id, member?.id).then(() => {
-                this.$emit("pending", member);
-                this.data.splice(i, 1);
-            });
+        async pending(member) {
+            try {
+                await covertTobe2Sub(this.raid_id, member?.id);
+                this.$emit("pending");
+            } catch (e) {
+                console.error("covertTobe2Sub", e);
+            }
         },
         // 删除候选（拒绝申请）
         reject(member, i) {

src/utils/filters.js

@@ -4,13 +4,14 @@ function showBodyType(val) {
 }
 
 import school_id_map from "@jx3box/jx3box-data/data/xf/schoolid.json";
+import { __imgPath } from "@/utils/config";
 function showSchoolIcon(val) {
     let id = val || 0;
-    return "https://img.jx3box.com/image/school/" + id + ".png";
+    return __imgPath + "image/school/" + id + ".png";
 }
 function showMountIcon(val) {
     let id = val || 0;
-    return "https://img.jx3box.com/image/xf/" + id + ".png";
+    return __imgPath + "image/xf/" + id + ".png";
 }
 
 import xfids from "@jx3box/jx3box-data/data/xf/xfid.json";

src/views/team/apply/ApplyList.vue

@@ -26,7 +26,7 @@
 <script>
 import { getEvents } from "@/service/team/apply.js";
 import { showDate } from "@/utils/filters";
-import { __cdn } from "@/utils/config";
+import { __imgPath } from "@/utils/config";
 import {resolveImagePath} from '@jx3box/jx3box-common/js/utils'
 
 export default {
@@ -40,7 +40,7 @@ export default {
     },
     computed: {
         img() {
-            return __cdn + "image/other/apply.png";
+            return __imgPath + "image/other/apply.png";
         },
     },
     methods: {