Commit 55d2c127 authored by tyyin lan's avatar tyyin lan

Merge branch 'shirlyn' into 'master'

Merge branch 'shirlyn' into 'master'

See merge request !62
parents 64e081a0 3551e942
...@@ -204,13 +204,9 @@ function handleAddAgentApplications() { ...@@ -204,13 +204,9 @@ function handleAddAgentApplications() {
</div> </div>
<div <div
v-show="!agentApplicationClassifyIsLoading && agentApplicationList.length !== 0" v-show="!agentApplicationClassifyIsLoading && agentApplicationList.length !== 0"
class="grid-content grid grid-cols-4" class="grid-content grid grid-cols-4 gap-4"
>
<div
v-for="agentApplicationItem in agentApplicationList"
:key="agentApplicationItem.id"
class="mb-[15px] mr-[15px]"
> >
<div v-for="agentApplicationItem in agentApplicationList" :key="agentApplicationItem.id">
<div <div
class="rounded-[10px]! max-w-[392px] bg-[#fff] px-[24px] pb-[20px] pt-[20px] shadow-[0_4px_10px_0px_rgba(103,103,103,.1)]" class="rounded-[10px]! max-w-[392px] bg-[#fff] px-[24px] pb-[20px] pt-[20px] shadow-[0_4px_10px_0px_rgba(103,103,103,.1)]"
> >
...@@ -246,7 +242,7 @@ function handleAddAgentApplications() { ...@@ -246,7 +242,7 @@ function handleAddAgentApplications() {
/> />
</div> </div>
</div> </div>
<n-divider class="mt-0! mb-[14px]!" dashed /> <n-divider class="mt-0! mb-[14px]!" />
<div> <div>
<div class="flex justify-between"> <div class="flex justify-between">
<div class="flex"> <div class="flex">
......
...@@ -171,7 +171,7 @@ function handleGetMallCategoryList() { ...@@ -171,7 +171,7 @@ function handleGetMallCategoryList() {
</template></n-switch </template></n-switch
> >
</div> </div>
<div class=""> <div>
<div class="flex max-h-[490px] justify-center overflow-y-hidden bg-[#f3f4fb]"></div> <div class="flex max-h-[490px] justify-center overflow-y-hidden bg-[#f3f4fb]"></div>
<div class="mt-[24px] flex justify-end"> <div class="mt-[24px] flex justify-end">
......
...@@ -100,7 +100,7 @@ async function handleCreateKnowledgeNextStep(createKnowledgeData: KnowledgeFormD ...@@ -100,7 +100,7 @@ async function handleCreateKnowledgeNextStep(createKnowledgeData: KnowledgeFormD
<li <li
v-for="personalSpaceModuleItem in personalSpaceModuleList" v-for="personalSpaceModuleItem in personalSpaceModuleList"
:key="personalSpaceModuleItem.routeName" :key="personalSpaceModuleItem.routeName"
class="rounded-theme hover:bg-active-color hover:text-font-color ml-2.5 h-8 cursor-pointer select-none px-[14px] leading-8 first:ml-0" class="rounded-theme hover:bg-active-color hover:text-font-color ml-2.5 h-8 cursor-pointer select-none px-[14px] leading-8 transition-colors duration-300 first:ml-0"
:class="[ :class="[
routerNameValue === personalSpaceModuleItem.routeName routerNameValue === personalSpaceModuleItem.routeName
? 'text-font-color bg-active-color' ? 'text-font-color bg-active-color'
......
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