tangyi
/
zycp-demo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

master
Lee-1203 2022-03-06 14:16:31 +08:00
parent b3a00f704e
commit 9c52c4c578
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/consultant/list.vue
View File

@ -1,5 +1,4 @@
<template> <template>
<<<<<<< HEAD
<div class="content my-content"> <div class="content my-content">
<!-- 头部 --> <!-- 头部 -->
<div :class="{ header: true, 'scroll white': isScrollTop, white: true }"> <div :class="{ header: true, 'scroll white': isScrollTop, white: true }">
@ -7,13 +6,6 @@
<img src="../../assets/images/home/expert/back.png" alt="" /> <img src="../../assets/images/home/expert/back.png" alt="" />
</div> </div>
<div class="header-title">列表预览</div> <div class="header-title">列表预览</div>
=======
<div class="content">
<!-- 头部 -->
<div :class="{'header':true,'scroll white':isScrollTop,'white':true}">
<div class="back" @click="$router.go(-1)"><img src="../../assets/images/home/expert/back.png" alt=""></div>
<div class="header-title">列表预览</div>
</div>
<!-- 咨询师列表 --> <!-- 咨询师列表 -->
<div class="expert-list-all section"> <div class="expert-list-all section">
<ul class="expert-list"> <ul class="expert-list">
@ -245,15 +237,7 @@ userData:{},
</script> </script>
<style scoped> <style scoped>
<<<<<<< HEAD
.expert-list>li{
}
.my-content{
padding-top: 1rem;
}
=======
.expert-list{ .expert-list{
margin-top: 1.2rem; margin-top: 1.2rem;
} }
>>>>>>> 31ac1df69ae7462dac9a9171cb8e6856291e7c2a
</style> </style>