diff --git a/src/api/base/message.ts b/src/api/base/message.ts
index aec5a9c..df19b72 100644
--- a/src/api/base/message.ts
+++ b/src/api/base/message.ts
@@ -10,6 +10,7 @@ export async function addMessage(data: {
   title: string
   sort: number
   roleId?: string
+  modelType: ModelTypeEnum
 }) {
   return defHttp.post({
     url: `/open-chat/chat/conversation/save`,
diff --git a/src/components/AppConversationDefault/index.vue b/src/components/AppConversationDefault/index.vue
index 605231a..3cb1a5a 100644
--- a/src/components/AppConversationDefault/index.vue
+++ b/src/components/AppConversationDefault/index.vue
@@ -5,7 +5,6 @@ import DefaultImage from '@/assets/images/conversation/default_img.png'
 import { SvgIcon } from '@/components/SvgIcon'
 import { AppContentDefaultBox } from '@/components/AppContentDefaultBox'
 import { AppDefaultLead } from '@/components/AppDefaultLead'
-import { AppModelSelect } from '@/components/AppModelSelect'
 import { AppTopPicks } from '@/components/AppTopPicks'
 import type { TopPickItem } from '@/components/AppTopPicks/index.d'
 import { AppPicture } from '@/components/AppPicture'
@@ -55,7 +54,6 @@ function handlePick(index: number, item: TopPickItem) {
 
 <template>
   <AppContentDefaultBox class="content-default-style">
-    <AppModelSelect></AppModelSelect>
     <AppDefaultLead
       class="mt-20"
       :title="leadData.title"
diff --git a/src/components/AppMessage/index.vue b/src/components/AppMessage/index.vue
index b436a65..30cb67e 100644
--- a/src/components/AppMessage/index.vue
+++ b/src/components/AppMessage/index.vue
@@ -142,8 +142,8 @@ onMounted(async () => {
           />
           <div v-if="conversationData?.type === MenuTypeEnum.TEXT_TO_IMAGE">
             <Image
-
               :width="200"
+              :height="200"
               :src="item.content"
               fallback="data:image/png;base64,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"
             ></Image>
@@ -199,7 +199,7 @@ onMounted(async () => {
       justify-content: flex-end;
       .content {
         max-width: calc(100% - 110px);
-        padding: 10px 10px;
+        padding: 10px 15px;
         background: #edf3ff;
         border-radius: 10px;
       }
@@ -223,7 +223,7 @@ onMounted(async () => {
         margin-right: 5px;
       }
       .content {
-        padding: 10px 10px;
+        padding: 10px 15px;
         background: #ffffff;
         box-shadow: 0px 2px 10px 0px rgba(128, 135, 152, 0.4);
         border-radius: 10px;
diff --git a/src/components/AppModelSelect/index.d.ts b/src/components/AppModelSelect/index.d.ts
index 7301b9a..bbe564e 100644
--- a/src/components/AppModelSelect/index.d.ts
+++ b/src/components/AppModelSelect/index.d.ts
@@ -1,6 +1,8 @@
+import type { ModelTypeEnum } from '@/enums/messageEnum'
+
 export interface ModelSelect {
   label: string
-  value: string
+  value: ModelTypeEnum
 }
 
 export interface Props {
diff --git a/src/components/AppModelSelect/index.vue b/src/components/AppModelSelect/index.vue
index 6864599..7646a82 100644
--- a/src/components/AppModelSelect/index.vue
+++ b/src/components/AppModelSelect/index.vue
@@ -1,22 +1,25 @@
 <!-- 3.5和4.0模型切换组件 -->
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed } from 'vue'
 import { Dropdown, Menu, MenuItem } from 'ant-design-vue'
 import type { ModelSelect } from './index.d'
 import { SvgIcon } from '@/components/SvgIcon'
 
-const emit = defineEmits(['change'])
-const optionActive = ref(0)
-const options: ModelSelect[] = [
-  {
-    label: '同聪3.5',
-    value: '1',
-  },
-  {
-    label: '同聪4.0',
-    value: '2',
-  },
-]
+interface Props {
+  activeIndex: number
+  options: ModelSelect[]
+}
+const props = withDefaults(defineProps<Props>(), {
+  activeIndex: 0,
+  options: () => [],
+})
+
+const emit = defineEmits(['change', 'update:activeIndex'])
+
+const optionActive = computed({
+  get: () => props.activeIndex,
+  set: value => emit('update:activeIndex', value),
+})
 
 function handelChange(index: number, item: ModelSelect) {
   optionActive.value = index
diff --git a/src/components/AppSubMenuList/index.vue b/src/components/AppSubMenuList/index.vue
index 2b48f16..5d872fd 100644
--- a/src/components/AppSubMenuList/index.vue
+++ b/src/components/AppSubMenuList/index.vue
@@ -5,6 +5,7 @@ import { Input } from 'ant-design-vue'
 import { CheckOutlined, CloseOutlined } from '@ant-design/icons-vue'
 import type { SubMenuItem } from './index.d'
 import { SubMenuActionEnum } from './index.d'
+import { MenuTypeEnum } from '@/enums/menuEnum'
 import { SvgIcon } from '@/components/SvgIcon'
 
 const props = defineProps<{
@@ -85,7 +86,10 @@ function handleBlur(index: number, item: SubMenuItem, inputValue?: string) {
             @click.stop="$emit('handleAction', SubMenuActionEnum.TO_TOP, item, index)"
           >
           </SvgIcon>
+
+          <!-- 角色会话列表不能编辑 -->
           <SvgIcon
+            v-if="item.type !== MenuTypeEnum.ROLE"
             class-name="icon"
             name="edit"
             @click.stop="$emit('handleAction', SubMenuActionEnum.EDIT, item, index)"
diff --git a/src/store/moules/messageStore/index.d.ts b/src/store/moules/messageStore/index.d.ts
index 8390891..d2681ba 100644
--- a/src/store/moules/messageStore/index.d.ts
+++ b/src/store/moules/messageStore/index.d.ts
@@ -19,6 +19,7 @@ export interface ConversationData {
   userId: string
   content: string
   actionType: SubMenuActionEnum
+  modelType: string
 }
 
 export interface MessageStoreType {
diff --git a/src/views/conversation/index.vue b/src/views/conversation/index.vue
index 6fab40c..e30e20d 100644
--- a/src/views/conversation/index.vue
+++ b/src/views/conversation/index.vue
@@ -15,9 +15,11 @@ import { AppTextarea } from '@/components/AppTextarea'
 import { AppMessage } from '@/components/AppMessage'
 import type { MessageItem } from '@/components/AppMessage/index.d'
 import type { TopPickItem } from '@/components/AppTopPicks/index.d'
+import { AppModelSelect } from '@/components/AppModelSelect'
+import type { ModelSelect } from '@/components/AppModelSelect/index.d'
 import { useMessageStore } from '@/store/moules/messageStore/index'
 import { MenuTypeEnum } from '@/enums/menuEnum'
-import { MessageStatusEnum, MessageTypeEnum } from '@/enums/messageEnum'
+import { MessageStatusEnum, MessageTypeEnum, ModelTypeEnum } from '@/enums/messageEnum'
 import { addMessage, conversationList, conversationToTop, historyMessage, removeMessage, sendTextToText, stopMessage, updateMessage } from '@/api/base/message'
 import { getAppList, getRole } from '@/api/base/role'
 import { useMqtt } from '@/hooks/useMqtt'
@@ -28,11 +30,24 @@ const { createConfirm } = useMessage()
 const messageStore = useMessageStore()
 
 const sendBtnLoading = ref(false)
-const subMenuActiveIndex = ref(0) // 当前会话索引
+const subMenuActiveIndex = ref(-1) // 当前会话索引
 const subMenuActionIndex = ref(-1) // 会话操作索引
 const subMenuList = ref<SubMenuItem[]>([])
 const subMenuInputValue = ref<string>('')
 const appMessageRef = ref()
+
+const modelOptions: ModelSelect[] = [
+  {
+    label: '同聪3.5',
+    value: ModelTypeEnum.GPT3,
+  },
+  {
+    label: '同聪4.0',
+    value: ModelTypeEnum.GPT4,
+  },
+]
+const modelIndex = ref(0)
+
 const roleList = ref<PictureType[]>([])
 const applyList = ref<PictureType[]>([])
 const messageList = computed(() => messageStore.getMessageList)
@@ -107,11 +122,20 @@ async function handleSubMenuChange(index: number, item?: SubMenuItem) {
     message.warn('请先结束对话')
     return
   }
+  if (!subMenuList.value.length) {
+    return
+  }
   subMenuActiveIndex.value = index
   historyMessageParams.value.current = 1
   historyMessageParams.value.total = 0
   messageStore.setConversationData(subMenuList.value[subMenuActiveIndex.value])
   messageStore.setMessageClear()
+  const modelIdx = modelOptions.findIndex(v => v.value === Number(subMenuList.value[subMenuActiveIndex.value].modelType))
+  if (modelIdx === -1) {
+    message.warn('未找到该对话下的模型信息')
+    return
+  }
+  modelIndex.value = modelIdx
   useMqtt().end()
   useMqtt().connect()
 
@@ -127,19 +151,20 @@ async function handleSubMenuChange(index: number, item?: SubMenuItem) {
 async function handleSend(value: string) {
   sendBtnLoading.value = true
   conversationDefaultShow.value = false
-  if (!conversationData.value) {
-    return
-  }
 
   if (subMenuActiveIndex.value === -1) {
     try {
       spinning.value = true
       messageStore.setMessageClear()
-      await addMessage({ type: MenuTypeEnum.TEXT_TO_TEXT, title: '新的对话', sort: subMenuList.value.length + 1 })
+      await addMessage({ type: MenuTypeEnum.TEXT_TO_TEXT, title: '新的对话', sort: subMenuList.value.length + 1, modelType: modelOptions[modelIndex.value].value })
       await getConversationList()
       await nextTick()
       subMenuActiveIndex.value = subMenuList.value.length - 1
       await handleSubMenuChange(subMenuActiveIndex.value)
+      if (!conversationData.value) {
+        message.error('对话发送，请稍后重试！')
+        return
+      }
       sendMessage(conversationData.value.id, value)
       spinning.value = false
     }
@@ -148,6 +173,9 @@ async function handleSend(value: string) {
     }
   }
   else {
+    if (!conversationData.value) {
+      return
+    }
     sendMessage(conversationData.value.id, value)
   }
 }
@@ -168,6 +196,8 @@ async function getConversationList() {
  */
 async function getHistoryMessage() {
   if (!conversationData.value) {
+    spinning.value = false
+    conversationDefaultShow.value = true
     return
   }
   spinning.value = true
@@ -195,10 +225,10 @@ async function getHistoryMessage() {
   conversationDefaultShow.value = false
 
   // 因为会话切换时滚动底部有问题，所以重新加载下
-  appMessageShow.value = false
-  setTimeout(() => {
-    appMessageShow.value = true
-  }, 0)
+  // appMessageShow.value = false
+  // setTimeout(() => {
+  //   appMessageShow.value = true
+  // }, 0)
 }
 
 /**
@@ -249,6 +279,7 @@ async function sendMessage(conversationId: string, question: string): Promise<vo
   sendTextToText({
     conversationId,
     question,
+    modelType: modelOptions[modelIndex.value].value,
   }).catch(() => {
     messageStore.getMessageList.splice(-2)
     messageStore.setMessageStatus(MessageStatusEnum.END)
@@ -295,6 +326,13 @@ function handlePick(_index: number, item: TopPickItem) {
   handleSend(item.label)
 }
 
+/**
+ * @description: gpt模型切换
+ */
+function handleModel(index: number) {
+  modelIndex.value = index
+}
+
 // 角色
 function getRoleData() {
   getRole(1).then((res) => {
@@ -327,6 +365,9 @@ function handleSubMenuInputBlur(index: number, item: SubMenuItem, inputValue: st
 
 onMounted(async () => {
   await getConversationList()
+  if (subMenuList.value.length) {
+    subMenuActiveIndex.value = 0
+  }
   await handleSubMenuChange(subMenuActiveIndex.value)
   getHistoryMessage()
   getRoleData()
@@ -377,6 +418,13 @@ onBeforeRouteLeave(() => {
     </template>
     <template #content>
       <Spin :spinning="spinning" wrapper-class-name="app-content-spin">
+        <AppModelSelect
+          v-if="conversationDefaultShow"
+          :active-index="modelIndex"
+          :options="modelOptions"
+          @change="handleModel"
+        >
+        </AppModelSelect>
         <!-- 默认导语 -->
         <AppConversationDefault
           v-if="conversationDefaultShow"
diff --git a/src/views/role/index.vue b/src/views/role/index.vue
index e52493a..1dea5b7 100644
--- a/src/views/role/index.vue
+++ b/src/views/role/index.vue
@@ -12,11 +12,13 @@ import type { SubMenuItem } from '@/components/AppSubMenuList/index.d'
 
 import { AppTextarea } from '@/components/AppTextarea'
 import { AppMessage } from '@/components/AppMessage'
+import { AppModelSelect } from '@/components/AppModelSelect'
+import type { ModelSelect } from '@/components/AppModelSelect/index.d'
 import type { RoleData, RoleInfoAppModel } from '@/components/AppRoleDefault/index.d'
 import type { MessageItem } from '@/components/AppMessage/index.d'
 import { useMessageStore } from '@/store/moules/messageStore/index'
 import { MenuTypeEnum } from '@/enums/menuEnum'
-import { MessageStatusEnum, MessageTypeEnum } from '@/enums/messageEnum'
+import { MessageStatusEnum, MessageTypeEnum, ModelTypeEnum } from '@/enums/messageEnum'
 import { addMessage, conversationList, conversationToTop, historyMessage, removeMessage, sendTextToText, updateMessage } from '@/api/base/message'
 import { getRoleDecs } from '@/api/base/role'
 import { useMqtt } from '@/hooks/useMqtt'
@@ -27,11 +29,24 @@ const { createConfirm } = useMessage()
 const messageStore = useMessageStore()
 
 const sendBtnLoading = ref(false)
-const subMenuActiveIndex = ref(0) // 当前会话索引
+const subMenuActiveIndex = ref(-1) // 当前会话索引
 const subMenuActionIndex = ref(-1) // 会话操作索引
 const subMenuList = ref<SubMenuItem[]>([])
 const subMenuInputValue = ref<string>('')
 const appMessageRef = ref()
+
+const modelOptions: ModelSelect[] = [
+  {
+    label: '同聪3.5',
+    value: ModelTypeEnum.GPT3,
+  },
+  {
+    label: '同聪4.0',
+    value: ModelTypeEnum.GPT4,
+  },
+]
+const modelIndex = ref(0)
+
 const messageList = computed(() => messageStore.getMessageList)
 const messageStatus = computed(() => messageStore.getMessageStatus)
 const conversationData = computed(() => messageStore.getConversationData)
@@ -105,11 +120,20 @@ async function handleSubMenuChange(index: number, item?: SubMenuItem) {
     message.warn('请先结束对话')
     return
   }
+  if (!subMenuList.value.length) {
+    return
+  }
   subMenuActiveIndex.value = index
   historyMessageParams.value.current = 1
   historyMessageParams.value.total = 0
   messageStore.setConversationData(subMenuList.value[subMenuActiveIndex.value])
   messageStore.setMessageClear()
+  const modelIdx = modelOptions.findIndex(v => v.value === Number(subMenuList.value[subMenuActiveIndex.value].modelType))
+  if (modelIdx === -1) {
+    message.warn('未找到该对话下的模型信息')
+    return
+  }
+  modelIndex.value = modelIdx
   useMqtt().end()
   useMqtt().connect()
 
@@ -125,26 +149,11 @@ async function handleSubMenuChange(index: number, item?: SubMenuItem) {
 async function handleSend(value: string) {
   sendBtnLoading.value = true
   conversationDefaultShow.value = false
+
   if (!conversationData.value) {
     return
   }
-
-  if (subMenuActiveIndex.value === -1) {
-    try {
-      spinning.value = true
-      await addMessage({ type: MenuTypeEnum.ROLE, title: '新的对话', roleId: String(conversationData.value.roleId), sort: subMenuList.value.length + 1 })
-      await getConversationList()
-      await nextTick()
-      sendMessage(conversationData.value.id, value)
-      spinning.value = false
-    }
-    catch (error) {
-      message.error('新建对话失败，请稍后重试！')
-    }
-  }
-  else {
-    sendMessage(conversationData.value.id, value)
-  }
+  sendMessage(conversationData.value.id, value)
 }
 
 /**
@@ -164,6 +173,8 @@ async function getConversationList() {
  */
 async function getHistoryMessage() {
   if (!conversationData.value) {
+    spinning.value = false
+    conversationDefaultShow.value = true
     return
   }
   spinning.value = true
@@ -252,6 +263,7 @@ async function sendMessage(conversationId: string, question: string): Promise<vo
   sendTextToText({
     conversationId,
     question,
+    modelType: modelOptions[modelIndex.value].value,
   }).catch(() => {
     messageStore.getMessageList.splice(-2)
     messageStore.setMessageStatus(MessageStatusEnum.END)
@@ -293,7 +305,7 @@ async function handleRole(item: RoleData) {
     getHistoryMessage()
   }
   else {
-    await addMessage({ type: MenuTypeEnum.ROLE, title: item.roleName, roleId: item.id, sort: subMenuList.value.length + 1 })
+    await addMessage({ type: MenuTypeEnum.ROLE, title: item.roleName, roleId: item.id, sort: subMenuList.value.length + 1, modelType: modelOptions[modelIndex.value].value })
     await getConversationList()
     await nextTick()
     const index = subMenuList.value.findIndex(v => String(v.roleId) === item.id)
@@ -314,7 +326,7 @@ async function handleApply(item: RoleInfoAppModel) {
     getHistoryMessage()
   }
   else {
-    await addMessage({ type: MenuTypeEnum.ROLE, title: item.roleName, roleId: String(item.id), sort: subMenuList.value.length + 1 })
+    await addMessage({ type: MenuTypeEnum.ROLE, title: item.roleName, roleId: String(item.id), sort: subMenuList.value.length + 1, modelType: modelOptions[modelIndex.value].value })
     await getConversationList()
     await nextTick()
     const index = subMenuList.value.findIndex(v => v.roleId === item.id)
@@ -324,6 +336,13 @@ async function handleApply(item: RoleInfoAppModel) {
   }
 }
 
+/**
+ * @description: gpt模型切换
+ */
+function handleModel(index: number) {
+  modelIndex.value = index
+}
+
 // 下面是子菜单操作项
 function handleSubMenuInputAffirm(index: number, item: SubMenuItem, inputValue: string) {
   updateMessage({ ...item, title: inputValue }).then(() => {
@@ -342,6 +361,9 @@ function handleSubMenuInputBlur(index: number, item: SubMenuItem, inputValue: st
 
 onMounted(async () => {
   await getConversationList()
+  if (subMenuList.value.length) {
+    subMenuActiveIndex.value = 0
+  }
   await handleSubMenuChange(subMenuActiveIndex.value)
   getHistoryMessage()
 })
@@ -390,6 +412,13 @@ onBeforeRouteLeave(() => {
     </template>
     <template #content>
       <Spin :spinning="spinning" wrapper-class-name="app-content-spin">
+        <AppModelSelect
+          v-if="conversationDefaultShow"
+          :active-index="modelIndex"
+          :options="modelOptions"
+          @change="handleModel"
+        >
+        </AppModelSelect>
         <!-- 默认导语 -->
         <AppRoleDefault
           v-if="conversationDefaultShow"
diff --git a/src/views/textToImage/index.vue b/src/views/textToImage/index.vue
index 155788d..9ea7a11 100644
--- a/src/views/textToImage/index.vue
+++ b/src/views/textToImage/index.vue
@@ -27,7 +27,7 @@ const { createConfirm } = useMessage()
 const messageStore = useMessageStore()
 
 const sendBtnLoading = ref(false)
-const subMenuActiveIndex = ref(0) // 当前会话索引
+const subMenuActiveIndex = ref(-1) // 当前会话索引
 const subMenuActionIndex = ref(-1) // 会话操作索引
 const subMenuList = ref<SubMenuItem[]>([])
 const subMenuInputValue = ref<string>('')
@@ -122,6 +122,9 @@ async function handleSubMenuChange(index: number, item?: SubMenuItem) {
     message.warn('请先结束对话')
     return
   }
+  if (!subMenuList.value.length) {
+    return
+  }
   subMenuActiveIndex.value = index
   historyMessageParams.value.current = 1
   historyMessageParams.value.total = 0
@@ -142,9 +145,6 @@ async function handleSubMenuChange(index: number, item?: SubMenuItem) {
 async function handleSend(value: string) {
   sendBtnLoading.value = true
   conversationDefaultShow.value = false
-  if (!conversationData.value) {
-    return
-  }
 
   if (subMenuActiveIndex.value === -1) {
     try {
@@ -155,6 +155,9 @@ async function handleSend(value: string) {
       await getConversationList()
       subMenuActiveIndex.value = subMenuList.value.length - 1
       await handleSubMenuChange(subMenuActiveIndex.value)
+      if (!conversationData.value) {
+        return
+      }
       sendMessage(conversationData.value.id, value)
       spinning.value = false
     }
@@ -163,6 +166,9 @@ async function handleSend(value: string) {
     }
   }
   else {
+    if (!conversationData.value) {
+      return
+    }
     sendMessage(conversationData.value.id, value)
   }
 }
@@ -184,6 +190,8 @@ async function getConversationList() {
  */
 async function getHistoryMessage() {
   if (!conversationData.value) {
+    spinning.value = false
+    conversationDefaultShow.value = true
     return
   }
   spinning.value = true
@@ -317,6 +325,9 @@ function handleSubMenuInputBlur(index: number, item: SubMenuItem, inputValue: st
 
 onMounted(async () => {
   await getConversationList()
+  if (subMenuList.value.length) {
+    subMenuActiveIndex.value = 0
+  }
   await handleSubMenuChange(subMenuActiveIndex.value)
   getHistoryMessage()
 })