Merge branch 'shirlyn' into 'master'

Merge branch 'shirlyn' into 'master'

See merge request !79

src/views/personal-space/personal-app/personal-app.vue

@@ -252,14 +252,16 @@ const handleCardContentScrollDebounce = debounce(
         </div>
         <div v-show="!agentAppListLoading" class="mt-[5px]">
           <div v-if="agentAppList.length" class="grid-content grid grid-cols-4">
-            <div v-for="agentAppItem in agentAppList" :key="agentAppItem.baseInfo.agentId" class="mb-[20px] mr-[15px]">
+            <div
+              v-for="agentAppItem in agentAppList"
+              :key="agentAppItem.baseInfo.agentId"
+              class="mb-[20px] mr-[15px] cursor-pointer"
+              @click="handleEditPersonalApp(agentAppItem.baseInfo.agentId)"
+            >
               <div
                 class="rounded-[10px]! ml-[5px] max-w-[380px] pb-[19px] pl-[24px] pr-[27px] pt-[20px] shadow-[0_4px_10px_0px_rgba(103,103,103,.1)]"
               >
-                <div
-                  class="flex cursor-pointer justify-between"
-                  @click="handleEditPersonalApp(agentAppItem.baseInfo.agentId)"
-                >
+                <div class="flex cursor-pointer justify-between">
                   <div class="popover-trigger mb-[19px] mr-[15px] text-[14px]">
                     <div class="agent-desc mb-[58px] h-[23px] w-full max-w-[160px] font-semibold">
                       <n-ellipsis style="max-width: 180px" :line-clamp="1">
@@ -296,15 +298,20 @@ const handleCardContentScrollDebounce = debounce(
                       {{ formatDateTime(agentAppItem.modifiedTime) }}
                     </div>
                     <div class="flex">
-                      <Star
-                        v-show="agentAppItem.baseInfo.agentPublishStatus !== 'draft'"
-                        theme="two-tone"
-                        size="18"
-                        :fill="agentAppItem.isCollect === 'Y' ? ['#ffc06d', '#ffc06d'] : ['#333', '#fff']"
-                        :stroke-width="3"
-                        class="cursor-pointer transition-all delay-150 duration-300 ease-in-out"
-                        @click="handleApplicationsCollect(agentAppItem)"
-                      />
+                      <div
+                        class="rounded-[25px] p-[5px] hover:bg-[rgb(243,243,245)]"
+                        @click.stop="handleApplicationsCollect(agentAppItem)"
+                      >
+                        <Star
+                          v-show="agentAppItem.baseInfo.agentPublishStatus !== 'draft'"
+                          theme="two-tone"
+                          size="18"
+                          :fill="agentAppItem.isCollect === 'Y' ? ['#ffc06d', '#ffc06d'] : ['#333', '#fff']"
+                          :stroke-width="3"
+                          class="cursor-pointer transition-all delay-150 duration-300 ease-in-out"
+                        />
+                      </div>
+
                       <n-popover
                         placement="bottom-end"
                         trigger="hover"
@@ -312,7 +319,12 @@ const handleCardContentScrollDebounce = debounce(
                         class="rounded-[10px]! py-[1px]! mb-[0px]! shadow-[0_4px_10px_0px_rgba(103,103,103,.15)]! px-[12px]! cursor-pointer"
                       >
                         <template #trigger>
-                          <MoreOne size="16" fill="#333" :stroke-width="3" class="ml-[13px] mt-[1px] cursor-pointer" />
+                          <div
+                            class="ml-[5px] cursor-pointer rounded-[25px] p-[5px] hover:bg-[rgb(243,243,245)]"
+                            @click.stop
+                          >
+                            <MoreOne size="18" fill="#333" :stroke-width="3" />
+                          </div>
                         </template>
                         <!-- <div
                           v-show="agentAppItem.baseInfo.agentPublishStatus !== 'draft'"
@@ -332,7 +344,7 @@ const handleCardContentScrollDebounce = debounce(
                             >
                               <template #trigger>
                                 <div
-                                  class="hover:bg-active-color mb-[10px] h-[24px] w-full rounded-[4px] py-[5px] pl-[5px] text-[14px] leading-[14px] text-[#333333]"
+                                  class="hover:bg-active-color mb-[10px] mt-[8px] h-[24px] w-full rounded-[4px] py-[5px] pl-[5px] text-[14px] leading-[14px] text-[#333333]"
                                 >
                                   {{ t('common_module.data_table_module.remove_applications') }}
                                 </div>
@@ -346,7 +358,7 @@ const handleCardContentScrollDebounce = debounce(
                           </div>
                           <div v-show="agentAppItem.isSale === 'N'">
                             <div
-                              class="hover:bg-active-color mb-[10px] h-[24px] w-full rounded-[4px] py-[5px] pl-[5px] text-[14px] leading-[14px] text-[#333333]"
+                              class="hover:bg-active-color mb-[10px] mt-[8px] h-[24px] w-full rounded-[4px] py-[5px] pl-[5px] text-[14px] leading-[14px] text-[#333333]"
                               @click="handleChangeApplicationsSaleStatus(agentAppItem)"
                             >
                               {{ t('common_module.data_table_module.listing_applications') }}