Commit 3e51f4ae authored by tyyin lan's avatar tyyin lan

Merge branch 'shirlyn' into 'master'

Merge branch 'shirlyn' into 'master'

See merge request !52
parents 036269a4 5548a61c
...@@ -250,7 +250,7 @@ function handleAddAgentApplications() { ...@@ -250,7 +250,7 @@ function handleAddAgentApplications() {
<div> <div>
<div class="flex justify-between"> <div class="flex justify-between">
<div class="flex"> <div class="flex">
<div class="flex"> <div class="flex items-center">
<Star <Star
theme="two-tone" theme="two-tone"
size="18" size="18"
...@@ -261,7 +261,7 @@ function handleAddAgentApplications() { ...@@ -261,7 +261,7 @@ function handleAddAgentApplications() {
/> />
<span class="ml-[6px] text-[12px] text-[#333]">{{ agentApplicationItem.collectNumber }}</span> <span class="ml-[6px] text-[12px] text-[#333]">{{ agentApplicationItem.collectNumber }}</span>
</div> </div>
<div class="flex"> <div class="flex items-center">
<PreviewOpen theme="outline" size="18" fill="#333" :stroke-width="3" class="ml-[12px]" /> <PreviewOpen theme="outline" size="18" fill="#333" :stroke-width="3" class="ml-[12px]" />
<span class="ml-[6px] text-[12px] text-[#333]">{{ agentApplicationItem.clickNumber }}</span> <span class="ml-[6px] text-[12px] text-[#333]">{{ agentApplicationItem.clickNumber }}</span>
</div> </div>
......
...@@ -184,9 +184,9 @@ function handleSelectAddType() { ...@@ -184,9 +184,9 @@ function handleSelectAddType() {
router.push({ name: 'PersonalAppSetting' }) router.push({ name: 'PersonalAppSetting' })
} }
function handleAnalysisPersonalApp(personalApp: PersonalAppConfigState) { // function handleAnalysisPersonalApp(personalApp: PersonalAppConfigState) {
console.log('分析', personalApp) // console.log('分析', personalApp)
} // }
const handleCardContentScrollDebounce = debounce( const handleCardContentScrollDebounce = debounce(
(event: { target: { scrollTop: number; clientHeight: number; scrollHeight: number } }) => { (event: { target: { scrollTop: number; clientHeight: number; scrollHeight: number } }) => {
...@@ -273,7 +273,7 @@ const handleCardContentScrollDebounce = debounce( ...@@ -273,7 +273,7 @@ const handleCardContentScrollDebounce = debounce(
</div> </div>
</div> </div>
<div> <div>
<div class="flex justify-between"> <div class="flex items-center justify-between">
<div class="text-[12px] leading-[12px] text-[#999999]"> <div class="text-[12px] leading-[12px] text-[#999999]">
{{ t('personal_space_module.agent_module.agent_list_module.modified_time') }} {{ t('personal_space_module.agent_module.agent_list_module.modified_time') }}
{{ formatDateTime(agentAppItem.modifiedTime) }} {{ formatDateTime(agentAppItem.modifiedTime) }}
...@@ -297,13 +297,13 @@ const handleCardContentScrollDebounce = debounce( ...@@ -297,13 +297,13 @@ const handleCardContentScrollDebounce = debounce(
<template #trigger> <template #trigger>
<MoreOne size="16" fill="#333" :stroke-width="3" class="ml-[13px] mt-[1px] cursor-pointer" /> <MoreOne size="16" fill="#333" :stroke-width="3" class="ml-[13px] mt-[1px] cursor-pointer" />
</template> </template>
<div <!-- <div
v-show="agentAppItem.baseInfo.agentPublishStatus !== 'draft'" v-show="agentAppItem.baseInfo.agentPublishStatus !== 'draft'"
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]" 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="handleAnalysisPersonalApp(agentAppItem)" @click="handleAnalysisPersonalApp(agentAppItem)"
> >
{{ t('common_module.data_table_module.analysis') }} {{ t('common_module.data_table_module.analysis') }}
</div> </div> -->
<div v-show="agentAppItem.baseInfo.agentPublishStatus !== 'draft'"> <div v-show="agentAppItem.baseInfo.agentPublishStatus !== 'draft'">
<div v-show="agentAppItem.isSale === 'Y'"> <div v-show="agentAppItem.isSale === 'Y'">
<n-popconfirm <n-popconfirm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment