From bfca340b72eafae338b666d6de835e27f347e859 Mon Sep 17 00:00:00 2001
From: haoyuntao <haoyuntao@qq.com>
Date: Tue, 7 May 2024 17:26:26 +0800
Subject: [PATCH] =?UTF-8?q?AI=E5=AF=B9=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/avatar-upload/avatar-upload.vue     |  5 +++--
 .../chat-scroll-view/chat-scroll-view.vue          |  3 ++-
 src/packages/pages/ai_talk/ai_talk.vue             |  1 -
 .../pages/ai_talk/components/session-item.vue      |  6 ++++++
 .../pages/ai_talk/components/session-popup.vue     | 14 +++++++++-----
 src/packages/pages/user_set/user_set.vue           | 10 +++++++++-
 src/pages/login/login.vue                          |  4 ++--
 7 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/components/avatar-upload/avatar-upload.vue b/src/components/avatar-upload/avatar-upload.vue
index 02d588d..441cd07 100644
--- a/src/components/avatar-upload/avatar-upload.vue
+++ b/src/components/avatar-upload/avatar-upload.vue
@@ -56,6 +56,7 @@ const props = defineProps({
 const emit = defineEmits<{
     (event: 'update:modelValue', value: string): void
     (event: 'upload', value: string): void
+	(event: 'update', value: string): void	
 }>()
 
 const styles = computed<CSSProperties>(() => {
@@ -73,6 +74,7 @@ const styles = computed<CSSProperties>(() => {
 
 const chooseAvatar = async (e: any) => {
 	console.log(props.modelValue)
+	props.modelValue && emit('update', props.modelValue)
     // #ifdef APP-PLUS
     if (client == 6) {
         // const res = await uni.showModal({
@@ -90,13 +92,12 @@ const chooseAvatar = async (e: any) => {
     // #endif
 
     // #ifndef MP-WEIXIN
-	console.log(props)
     router.navigateTo({
         path: '/uni_modules/vk-uview-ui/components/u-avatar-cropper/u-avatar-cropper?destWidth=300&rectWidth=200&fileType=jpg'
     })
     // #endif
     // #ifdef MP-WEIXIN
-	console.log(props)
+	
     const path = e.detail?.avatarUrl
     if (path) {
         uploadImageIng(path)
diff --git a/src/components/chat-scroll-view/chat-scroll-view.vue b/src/components/chat-scroll-view/chat-scroll-view.vue
index b30f0cf..01db046 100644
--- a/src/components/chat-scroll-view/chat-scroll-view.vue
+++ b/src/components/chat-scroll-view/chat-scroll-view.vue
@@ -69,7 +69,7 @@
                     <slot name="empty" />
                 </template>
                 <template #bottom>
-                    <view class="send-area">
+                    <view class="send-area" >
                         <view class="float-btn">
                             <view
                                 v-if="chatList.length && !isReceiving"
@@ -822,6 +822,7 @@ defineExpose({
         position: relative;
         padding: 20rpx 30rpx;
         background-color: #fff;
+		box-shadow: 2px -3px 2px #f1f1f1;
         .float-btn {
             position: absolute;
             left: 50%;
diff --git a/src/packages/pages/ai_talk/ai_talk.vue b/src/packages/pages/ai_talk/ai_talk.vue
index 249f0dd..292fae9 100644
--- a/src/packages/pages/ai_talk/ai_talk.vue
+++ b/src/packages/pages/ai_talk/ai_talk.vue
@@ -137,7 +137,6 @@ const getProblemExample = async () => {
     problem.value = await getSamplesLists()
 }
 const handlerback=()=>{
-	console.log(popup.value,'=====popup.value')
 	popup.value.showPopup()
 }
 const getDecorateFunc = async () => {
diff --git a/src/packages/pages/ai_talk/components/session-item.vue b/src/packages/pages/ai_talk/components/session-item.vue
index 36b4941..71c9d43 100644
--- a/src/packages/pages/ai_talk/components/session-item.vue
+++ b/src/packages/pages/ai_talk/components/session-item.vue
@@ -132,6 +132,12 @@ watch(
 	}
 	.line-clamp-1{
 		font-size:28rpx;
+		width:100%;
+		word-break:break-all;
+		display:-webkit-box;
+		-webkit-line-clamp:1;
+		-webkit-box-orient:vertical;
+		overflow:hidden;	
 	}
 	.border{
 		width:92%;
diff --git a/src/packages/pages/ai_talk/components/session-popup.vue b/src/packages/pages/ai_talk/components/session-popup.vue
index 52a64ef..50aa961 100644
--- a/src/packages/pages/ai_talk/components/session-popup.vue
+++ b/src/packages/pages/ai_talk/components/session-popup.vue
@@ -29,7 +29,7 @@
                 </scroll-view>
             </view>
             <view class="text-xs items-center create" @click="sessionAddTalk">
-              <u-icon name="plus" class="mt-[15rpx]" size="40" />
+              <u-icon name="plus" class="mt-[20rpx]" size="40" />
                 <view class="create-tx">新建</view> 
              </view>           
                <!-- <u-button
@@ -47,7 +47,7 @@ import { useAppStore } from '@/stores/app'
 import { useSessionList } from './useSessionList'
 import { useLockFn } from '@/hooks/useLockFn'
 import SessionItem from './session-item.vue'
-import { watch,defineExpose } from 'vue'
+import { watch } from 'vue'
 const props = defineProps({
     modelValue: {
         type: Boolean
@@ -70,7 +70,8 @@ const {
     sessionEdit,
     sessionDelete,
     sessionClear,
-    sessionActive
+    sessionActive,
+	getSessionLists
 } = useSessionList()
 
 const { lockFn: sessionAddLock, isLock } = useLockFn(async () => {
@@ -83,7 +84,10 @@ const sessionAddTalk=()=>{
 const sessionDetail=(val)=>{
 	emit('update:modelValue', val)
 }
-const showPopup=()=>emit('update:modelValue', true)
+const showPopup=()=>{
+	getSessionLists()
+	emit('update:modelValue', true)
+}
 const appStore = useAppStore()
 watch(
     () => appStore.getChatConfig,
@@ -109,7 +113,7 @@ defineExpose({
 	}
 	.create{
 		position: fixed;
-		bottom:30rpx;
+		bottom:50rpx;
 		right:20rpx;
 		width:130rpx;
 		height:130rpx;
diff --git a/src/packages/pages/user_set/user_set.vue b/src/packages/pages/user_set/user_set.vue
index 871b772..7e89d4d 100644
--- a/src/packages/pages/user_set/user_set.vue
+++ b/src/packages/pages/user_set/user_set.vue
@@ -15,6 +15,7 @@
                         v-model="userInfo.avatar"
                         file-key="url"
                         :round="true"
+						@update="handlerUpdate"
                         @upload="uploadImg"
                     >
                         <template #footer>
@@ -343,7 +344,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, shallowRef } from 'vue'
+import { ref, shallowRef,watch } from 'vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
 import {
     getUserInfo,
@@ -413,6 +414,13 @@ const mobileCode = ref<string>('')
 const codeTips = ref('')
 const uCodeRef = shallowRef()
 
+watch(()=> userInfo.value.avatar,(val,old)=>{
+	 console.log(val,'=========头像',old)
+},{deep: true})
+const handlerUpdate=(val: string)=>{
+	console.log(val,'=========touxiang')
+	userInfo.value.avatar=val
+}
 // 获取用户信息
 const getUser = async (): Promise<void> => {
     userInfo.value = await getUserInfo()
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 5c8a532..5ac2ce1 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -57,7 +57,7 @@
                     />
                     <div class="text-sm mt-[10px]">手机号登录</div>
                 </div>
-                <div
+                <!-- <div
                     class="flex flex-col items-center"
                     v-if="hasMailboxLogin && !isMailboxLogin"
                     @click="changeLoginWay(LoginWayEnum.MAILBOX)"
@@ -67,7 +67,7 @@
                         :size="80"
                     />
                     <div class="text-sm mt-[10px]">邮箱登录</div>
-                </div>
+                </div> -->
             </div>
             <!-- <agreement /> -->
         </view>