Merge branch 'beta' into 'master'

fix: 应用广场的应用点击返回回到应用广场&web端应用开始聊天后剔除应用介绍

See merge request !60

src/views/applications-square/applications-square.vue

@@ -128,7 +128,7 @@ function handleGetMallCategoryList() {
 }
 
 function handleToUseAgentApplication(agentId: string) {
-  router.replace({ name: 'ShareWebApplication', params: { agentId: agentId } })
+  router.push({ name: 'ShareWebApplication', params: { agentId: agentId } })
 }
 function handleAddAgentApplications() {
   router.push({ name: 'PersonalAppSetting' })

src/views/share/components/web-page-header.vue

@@ -17,7 +17,7 @@ const { t } = useI18n()
 defineProps<Props>()
 
 const emit = defineEmits<{
-  backHomePage: []
+  back: []
   toCreateApplication: []
   toLogin: []
 }>()
@@ -28,8 +28,8 @@ const isLogin = computed(() => {
   return userStore.isLogin
 })
 
-function handleBackHomePage() {
-  emit('backHomePage')
+function handleBack() {
+  emit('back')
 }
 
 function handleToCreateApplication() {
@@ -47,7 +47,7 @@ function handleToLogin() {
       <CustomIcon
         icon="weui:back-outlined"
         class="hover:text-theme-color mr-5 cursor-pointer outline-none"
-        @click="handleBackHomePage"
+        @click="handleBack"
       />
       <img :src="agentApplicationConfig.baseInfo.agentAvatar" class="mr-5 h-10 w-10 rounded-md" />
 

src/views/share/share-application-web.vue

@@ -94,10 +94,14 @@ async function handleCreateDialogues() {
   }
 }
 
-function handleBackHomePage() {
-  router.push({
-    name: 'Home',
-  })
+function handleBack() {
+  if (!history.state.back) {
+    router.replace({
+      name: 'Home',
+    })
+  } else {
+    router.back()
+  }
 }
 
 function handleToLoginPage() {
@@ -167,7 +171,7 @@ function handleResetContinueQuestionList() {
       <PageHeader
         :agent-application-config="agentApplicationConfig"
         :agent-member-info="agentMemberInfo"
-        @back-home-page="handleBackHomePage"
+        @back="handleBack"
         @to-login="handleToLoginPage"
         @to-create-application="handleCreateApplicationPage"
       />
@@ -179,7 +183,7 @@ function handleResetContinueQuestionList() {
           </div>
 
           <div v-if="messageList.length > 0" class="flex w-full flex-1 flex-col overflow-hidden">
-            <div class="my-5 ml-16 mr-5 border-b border-[#e8e9eb] py-6">
+            <!-- <div class="my-5 ml-16 mr-5 border-b border-[#e8e9eb] py-6">
               <div class="flex items-start">
                 <img :src="agentApplicationConfig.baseInfo.agentAvatar" class="h-14 w-14 rounded-xl" />
                 <p class="font-500 ml-4 line-clamp-1 h-8 max-w-[90%] break-all text-2xl leading-8 text-[#151b26]">
@@ -192,8 +196,8 @@ function handleResetContinueQuestionList() {
               >
                 {{ agentApplicationConfig.commConfig.preamble }}
               </div>
-            </div>
-            <div class="flex-1 overflow-auto">
+            </div> -->
+            <div class="mt-16 flex-1 overflow-auto">
               <MessageList
                 ref="messageListRef"
                 :agent-application-config="agentApplicationConfig"