Compare commits

..

No commits in common. "69b0e17a8570fc2114975206739cf3cdf66539b2" and "227adc0f4bf1354c7c0d7dc72c75a0801b09bc37" have entirely different histories.

6 changed files with 23 additions and 67 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 B

View File

@ -74,11 +74,7 @@
<span v-else> <span v-else>
{{ item.name }} {{ item.name }}
</span> </span>
<div :class="item.name === Cardsname ? 'sanjiao' : ''"></div>
</div> </div>
</div> </div>
<div class="top-content-father" :key="listKey"> <div class="top-content-father" :key="listKey">
<template <template
@ -219,7 +215,6 @@
<span v-else> <span v-else>
{{ item.name }} {{ item.name }}
</span> </span>
<div :class="item.name === Cardsname ? 'sanjiao' : ''"></div>
</div> </div>
</div> </div>
<div class="top-content-father"> <div class="top-content-father">
@ -281,7 +276,6 @@
<span v-else> <span v-else>
{{ item.name }} {{ item.name }}
</span> </span>
<div :class="item.name === Cardsname ? 'sanjiao' : ''"></div>
</div> </div>
</div> </div>
<KnowledgeBase <KnowledgeBase
@ -339,7 +333,6 @@
}" }"
></span> ></span>
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</div> </div>
</div> </div>
<div class="resultListSearchInput-father"> <div class="resultListSearchInput-father">
@ -472,7 +465,6 @@
}" }"
></span> ></span>
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</div> </div>
</div> </div>
<div class="top-content-father"> <div class="top-content-father">
@ -499,7 +491,6 @@
}" }"
></span> ></span>
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</div> </div>
</div> </div>
<div class="resultListSearchInput-father" style="background: unset"> <div class="resultListSearchInput-father" style="background: unset">
@ -2283,32 +2274,18 @@
margin-right: 0.1rem; margin-right: 0.1rem;
} }
div { div {
padding-left: 33px; padding: 0 0.1rem;
width: 220px;
cursor: pointer; cursor: pointer;
// display: flex; display: flex;
align-items: center; align-items: center;
} }
div span{
vertical-align:middle;
}
div:hover { div:hover {
color: #0058e1; color: #0087ff;
} }
.sanjiao{
background: url('~@/assets/home/sanjiao.png');
background-repeat: no-repeat;
height: 10px;
width: 10px;
margin-left: 67px;
position: absolute;
}
.sel { .sel {
color: #000000; font-weight: 600;
border-bottom: 0.03rem solid #0058e1; color: #0087ff;
// background: url('~@/assets/home/sanjiao.png'); border-bottom: 0.02rem solid #0087ff;
// background-repeat: no-repeat;
} }
} }
.top-content-father { .top-content-father {
@ -2324,7 +2301,6 @@
display: flex; display: flex;
margin-top: 0rem; margin-top: 0rem;
span:nth-child(1) { span:nth-child(1) {
font-size: 0.14rem;
display: inline-block; display: inline-block;
position: relative; position: relative;
line-height: 0.3614rem; line-height: 0.3614rem;

View File

@ -744,7 +744,7 @@
height: 60px; height: 60px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: left; justify-content: center;
font-size: 16px; font-size: 16px;
color: #212121; color: #212121;
border-bottom: 1px solid #dddee1; border-bottom: 1px solid #dddee1;
@ -931,7 +931,7 @@
height: 60px; height: 60px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: left; justify-content: center;
font-size: 16px; font-size: 16px;
color: #212121; color: #212121;
border-bottom: 1px solid #dddee1; border-bottom: 1px solid #dddee1;

View File

@ -147,19 +147,19 @@
cursor: pointer; cursor: pointer;
} }
.zskTag { .zskTag {
margin: 20px 20px; margin: 20px 10px;
// display: flex; // display: flex;
// justify-content: center; // justify-content: center;
border-top: 1px solid #dddee1; border-top: 1px solid #eee;
padding-top: 18px; padding-top: 20px;
.type { .type {
padding: 0 10px 0 0; padding: 0 10px 0 0;
font-size: 16px; font-size: 18px;
font-weight: 600; font-weight: 600;
border-right: 1px solid #dddee1; border-right: 1px solid #eee;
} }
.ant-tag { .ant-tag {
font-size: 16px; font-size: 18px;
padding: 5px; padding: 5px;
margin-left: 10px; margin-left: 10px;
} }
@ -170,20 +170,15 @@
} }
.top { .top {
display: flex; display: flex;
padding-top: 10px; justify-content: space-between;
justify-content: space-between; border-top: 1px solid #eee;
border-top: 1px solid #dddee1; margin: 10px 0;
margin: 3px 18px 5px; padding: 30px 10px 0;
font-size: 14px;
span { span {
color: #0058e1; color: #0058e1;
font-weight: 600; font-weight: 600;
font-size:16px;
} }
} }
:deep(.ant-list-lg .ant-list-item){
padding: 18px 17px 12px 49px;
}
:deep(.ant-list-bordered) { :deep(.ant-list-bordered) {
border: none; border: none;
.ant-list-item { .ant-list-item {
@ -197,12 +192,11 @@
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
font-size: 14px;
svg { svg {
margin-right: 5px; margin-right: 5px;
} }
.text { .text {
font-size: 14px; font-size: 16px;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #0087ff; color: #0087ff;

View File

@ -127,7 +127,7 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount, defineProps,watch } from 'vue' import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
import { getUserInfo, getRole } from '@/api/user' import { getUserInfo, getRole } from '@/api/user'
import { recordRoute } from '@/config' import { recordRoute } from '@/config'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
@ -162,19 +162,6 @@
} }
const targetRouter = ref('') const targetRouter = ref('')
const backFlag = ref(false) const backFlag = ref(false)
watch(
() => router.currentRoute.value.path,
(newValue, oldValue) => {
if(newValue=='/apply' || newValue=='/details'){
select.value='DetailsPageconetent'
}else if(newValue=='/demandDetails'){
select.value='demandCenter'
}
},
{ immediate: true }
)
getUserInfo().then((res) => { getUserInfo().then((res) => {
if (res.data.data.superAdmin == '1') { if (res.data.data.superAdmin == '1') {
backFlag.value = true backFlag.value = true
@ -189,6 +176,7 @@
} }
}) })
console.log('navList------------>', navList)
const props = defineProps({ const props = defineProps({
showView: { type: String, default: '' }, showView: { type: String, default: '' },
@ -209,7 +197,7 @@
} }
} }
} }
console.log('3333333------------>', props)
// //
const goToHome = () => { const goToHome = () => {
// 西 // 西
@ -238,7 +226,6 @@
return message.warn('暂无权限') return message.warn('暂无权限')
} }
} }
select.value = item.key select.value = item.key
switch (item.name) { switch (item.name) {
case '个人中心': case '个人中心':

View File

@ -372,7 +372,6 @@
li { li {
width: 90px; width: 90px;
height: 12px; height: 12px;
align-items: right;
position: relative; position: relative;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;