diff --git a/.DS_Store b/.DS_Store index 0df1bda..0fe9282 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/chat/src/layout/components/Login/Email.vue b/chat/src/layout/components/Login/Email.vue index d4c005a..9044907 100644 --- a/chat/src/layout/components/Login/Email.vue +++ b/chat/src/layout/components/Login/Email.vue @@ -230,10 +230,6 @@ onMounted(() => { -
- 老用户密码统一重置为112233
- 登录后请自行修改密码 -
@@ -199,7 +199,7 @@ watch( v-for="item in menuList" :key="item.menuName" class="flex justify-center flex-col items-center" - :class="isMobile ? 'mt-0' : 'mt-3'" + :class="isMobile ? 'mt-0' : 'mt-2'" @click="handleClickMenu(item)" > + + \ No newline at end of file diff --git a/chat/src/views/chat/components/Message/Text.vue b/chat/src/views/chat/components/Message/Text.vue index d86ae70..ee87a94 100644 --- a/chat/src/views/chat/components/Message/Text.vue +++ b/chat/src/views/chat/components/Message/Text.vue @@ -307,7 +307,7 @@ defineExpose({ textRef }) } .header-1 { - background-color: #f1f3f8 !important; + background-color: #fff !important; border-bottom: 1px solid #e3e8f7 !important; height: 30px !important; position: absolute !important; diff --git a/chat/src/views/chat/components/Message/index.vue b/chat/src/views/chat/components/Message/index.vue index 53c79dd..e174304 100644 --- a/chat/src/views/chat/components/Message/index.vue +++ b/chat/src/views/chat/components/Message/index.vue @@ -121,7 +121,7 @@ function handleRegenerate() {

authStore.userBalance) const dialog = useDialog() /* 当前选用的模型的扣费类型 1: 普通 2: 高级 */ -const activeModelKeyDeductType = computed(() => chatStore?.activeModelKeyDeductType) +const activeModelKeyDeductType = computed( + () => chatStore?.activeModelKeyDeductType +) const activeModelKeyPrice = computed(() => chatStore?.activeModelKeyPrice) const oldUse3Token = ref(0) @@ -32,22 +46,30 @@ const newUse4Token = ref(0) const isSearch = ref(false) const searchRef = ref(null) -watch(() => authStore.userBalance.useModel3Token, (newVal, oldVal) => { - oldUse3Token.value = oldVal || 0 - newUse3Token.value = newVal || 0 - model3AnimationInstRef.value?.play() -}, { - immediate: true, - flush: 'post', -}) -watch(() => authStore.userBalance.useModel4Token, (newVal, oldVal) => { - oldUse4Token.value = oldVal || 0 - newUse4Token.value = newVal || 0 - model4AnimationInstRef.value?.play() -}, { - immediate: true, - flush: 'post', -}) +watch( + () => authStore.userBalance.useModel3Token, + (newVal, oldVal) => { + oldUse3Token.value = oldVal || 0 + newUse3Token.value = newVal || 0 + model3AnimationInstRef.value?.play() + }, + { + immediate: true, + flush: 'post', + } +) +watch( + () => authStore.userBalance.useModel4Token, + (newVal, oldVal) => { + oldUse4Token.value = oldVal || 0 + newUse4Token.value = newVal || 0 + model4AnimationInstRef.value?.play() + }, + { + immediate: true, + flush: 'post', + } +) const { isMobile } = useBasicLayout() const addLoading = ref(false) @@ -55,9 +77,10 @@ const addLoading = ref(false) const collapsed = computed(() => appStore.siderCollapsed) const groupKeyWord = ref('') -function handleInputGroupSearch(val: string) { - groupKeyWord.value = val - chatStore.setGroupKeyWord(val) +function handleInputGroupSearch(event: { target: { value: any } }) { + const val = event.target.value; + groupKeyWord.value = val; + chatStore.setGroupKeyWord(val); } function handleBlurInput() { @@ -76,10 +99,8 @@ async function handleAdd() { await chatStore.queryMyGroup() addLoading.value = false - if (isMobile.value) - appStore.setSiderCollapsed(true) - } - catch (error) { + if (isMobile.value) appStore.setSiderCollapsed(true) + } catch (error) { addLoading.value = false } } @@ -135,7 +156,7 @@ watch( { immediate: true, flush: 'post', - }, + } ) @@ -152,83 +173,174 @@ watch( :style="getMobileClass" @update-collapsed="handleUpdateCollapsed" > -
+
-
- - - -
- +
+ +
+
+ + + + +
-
-
-
- - 新对话 - - -
- - - + +
-
-
- + +
+
+ 普通额度: {{ `${userBalance.sumModel3Count || 0} 积分` }}
-
- 我已使用: Token +
+ + 我已使用: + + Token
-
- 模型费用: {{ `${activeModelKeyPrice || 0}积分 / 次对话` }} +
+ + 模型费用: {{ `${activeModelKeyPrice || 0}积分 / 次对话` }}
-
- 我已使用: Token +
+ 我已使用: + + Token
-
- 高级额度: {{ `${userBalance.sumModel4Count || 0} 积分` }} +
+ 高级额度: {{ `${userBalance.sumModel4Count || 0} 积分` }}
-
- 模型费用: {{ `${activeModelKeyPrice || 0}积分 / 次对话` }} +
+ 模型费用: {{ `${activeModelKeyPrice || 0}积分 / 次对话` }}
- + 公告栏 - + 工作台
- - + + 清空全部非置顶会话
-
- +
diff --git a/service/.DS_Store b/service/.DS_Store index 1a801e0..0d9cd08 100644 Binary files a/service/.DS_Store and b/service/.DS_Store differ diff --git a/service/src/.DS_Store b/service/src/.DS_Store index cdb50cd..c398655 100644 Binary files a/service/src/.DS_Store and b/service/src/.DS_Store differ