diff --git a/src/apis.js b/src/apis.js
index d9b0d1c..df6586f 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -18,6 +18,14 @@ function request(method, url, data = {}) {
if (message.indexOf("登录身份已失效") !== -1) {
uni.removeStorageSync("token");
}
+ if (message === "ROOM_FULL") {
+ resolve({ full: true });
+ return;
+ }
+ if (message === "ERROR_ROOM_GAME_START") {
+ resolve({ started: true });
+ return;
+ }
if (url.indexOf("/user/room") !== -1 && method === "GET") {
resolve({});
return;
diff --git a/src/pages/be-vip.vue b/src/pages/be-vip.vue
index 7c7c010..527b5d1 100644
--- a/src/pages/be-vip.vue
+++ b/src/pages/be-vip.vue
@@ -1,5 +1,5 @@
@@ -66,9 +80,18 @@ const toOrderPage = () => {
{{ user.nickName }}
-
- {{ formatTimestamp(user.expiredAt) }}到期
-
+
+
+
+
+
+ {{ formatTimestamp(user.expiredAt) }}到期
+
+
{
.my-orders > view > image {
width: 15px;
}
+.loading {
+ width: 20px;
+ height: 20px;
+ margin-left: 10px;
+ transition: all 0.3s ease;
+ background-blend-mode: darken;
+ animation: rotate 2s linear infinite;
+}
diff --git a/src/pages/friend-battle.vue b/src/pages/friend-battle.vue
index 48283ca..1b9f705 100644
--- a/src/pages/friend-battle.vue
+++ b/src/pages/friend-battle.vue
@@ -31,14 +31,19 @@ const enterRoom = debounce(async () => {
const alreadyIn = room.members.find(
(item) => item.userInfo.id === user.value.id
);
- if (!alreadyIn) await joinRoomAPI(roomNumber.value);
+ if (!alreadyIn) {
+ const result = await joinRoomAPI(roomNumber.value);
+ if (result.full) warnning.value = "房间已满员";
+ showModal.value = true;
+ return;
+ }
roomNumber.value = "";
showModal.value = false;
uni.navigateTo({
url: `/pages/battle-room?roomNumber=${room.number}`,
});
} else {
- warnning.value = "查无此房";
+ warnning.value = room.started ? "该房间对战已开始,无法加入" : "查无此房";
showModal.value = true;
}
}