diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index b996e433..9fd514d2 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -733,7 +733,6 @@
height: calc(100% - 832rpx);
padding: 12rpx 24rpx;
box-sizing: border-box;
-
.talking-scroll-list {
height: 100%;
}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 43089de3..5628c0cf 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -14,7 +14,7 @@
消息
- 30
+ 30
@@ -32,7 +32,7 @@
消息
-
+
30
@@ -593,15 +593,24 @@
position: absolute;
top: 2rpx;
right: -4rpx;
- padding: 1rpx 1rpx 1rpx 2rpx;
+ padding: 2rpx 3rpx 2rpx 3rpx;
background-color: #ff1926;
border-radius: 10rpx;
- width: 22rpx;
- height: 20rpx;
- font-size: 10rpx;
+ // width: 22rpx;
+ // height: 20rpx;
+ // font-size: 10rpx;
+ // font-size: 30rpx;
color: #ffffff;
}
+ .message_num_font {
+ width: 22rpx;
+ height: 22rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 16rpx;
+ }
}
}
@@ -643,15 +652,23 @@
position: absolute;
top: 2rpx;
right: -4rpx;
- padding: 1rpx 1rpx 1rpx 2rpx;
+ padding: 2rpx 3rpx 2rpx 3rpx;
background-color: #ff1926;
- border-radius: 10rpx;
- width: 22rpx;
- height: 20rpx;
- font-size: 10rpx;
+ border-radius: 20rpx;
+ // width: 22rpx;
+ // height: 20rpx;
+ // font-size: 10rpx;
color: #ffffff;
}
+ .message_num_font {
+ width: 22rpx;
+ height: 22rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 16rpx;
+ }
}
}
@@ -717,7 +734,7 @@
display: flex;
justify-content: space-around;
z-index: 20;
-
+ opacity: .9;
.item {
flex: 1;
// background-color: red;
diff --git a/src/pages/mascot/mascot_select_list.vue b/src/pages/mascot/mascot_select_list.vue
index 8dcb0a55..4ea70951 100644
--- a/src/pages/mascot/mascot_select_list.vue
+++ b/src/pages/mascot/mascot_select_list.vue
@@ -83,8 +83,7 @@
const windowsInfo = uni.getWindowInfo()
const nowWidth = ref(0);
const pages = getCurrentPages();
- const swiperCount = 4; // 总轮播项数量
-
+ const swiperCount = computed(() => mascotList.length)
let swiperIndex = ref(0); // 当前显示第1个(索引0)
const isAnimating = ref(false); // 标记动画是否进行中
@@ -98,7 +97,7 @@
const doct_click = (num) => {
if (isAnimating.value) return; // 1. 如果动画正在进行,直接忽略点击
isAnimating.value = true;
- let newIndex = (swiperIndex.value + num + swiperCount) % swiperCount;
+ let newIndex = (swiperIndex.value + num + swiperCount.value) % swiperCount.value;
swiperIndex.value = newIndex; // 更新当前索引
};
const select_it = () => {
@@ -116,7 +115,6 @@
common.msg('设置成功')
common.setValue('mascotState', false)
setTimeout(() => {
-
if (pages.length >= 2) {
// 页面栈只有一页,没有返回页,那就返回首页
back_state.value = false;
@@ -137,7 +135,6 @@
Object.assign(mascotList, {
...body
})
- console.log(mascotList);
common.hideLoading()
})
})
diff --git a/src/static/images/icon/fawn-3.png b/src/static/images/icon/fawn-3.png
index 2c4691cb..8ab3d349 100644
Binary files a/src/static/images/icon/fawn-3.png and b/src/static/images/icon/fawn-3.png differ
diff --git a/src/static/images/icon/fawn-5.png b/src/static/images/icon/fawn-5.png
new file mode 100644
index 00000000..1b92c79d
Binary files /dev/null and b/src/static/images/icon/fawn-5.png differ