Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/App.vue
This commit is contained in:
yuping
2023-03-09 18:06:07 +08:00
2 changed files with 3 additions and 136 deletions

View File

@@ -10,7 +10,6 @@
<!-- <!--
--> -->
<div id="container"> <div id="container">
<!-- <div id="nav"> <!-- <div id="nav">
<router-link <router-link
v-for="item in routes" v-for="item in routes"
@@ -38,7 +37,7 @@ import {useRoute} from "vue-router/dist/vue-router";
import {USER_INFO} from "@/api/api"; import {USER_INFO} from "@/api/api";
import {IsPhone} from "@/api/utils"; import {IsPhone} from "@/api/utils";
console.log("版本1.2.2------------"); console.log("版本1.2.4------------");
const store = useStore(); const store = useStore();
const { path } = useRoute(); const { path } = useRoute();
onMounted(() => { onMounted(() => {
@@ -51,7 +50,6 @@ onMounted(() => {
} }
} }
}); });
function getUserInfo() { function getUserInfo() {
if (import.meta.env.MODE === "development" || import.meta.env.MODE === "test") { if (import.meta.env.MODE === "development" || import.meta.env.MODE === "test") {
request(USER_INFO, {}).then(res => { request(USER_INFO, {}).then(res => {
@@ -76,22 +74,18 @@ function getUserInfo() {
color: #2c3e50; color: #2c3e50;
height: 100%; height: 100%;
} }
.return { .return {
right: 0 !important; right: 0 !important;
} }
.preNext { .preNext {
right: 115px !important; right: 115px !important;
margin-top: 4px; margin-top: 4px;
} }
#container { #container {
display: flex; display: flex;
width: 100%; width: 100%;
min-height: 100%; min-height: 100%;
background-color: rgba(242, 245, 247, 1); background-color: rgba(242, 245, 247, 1);
// background-color: #ccc; // background-color: #ccc;
#nav { #nav {
width: 220px; width: 220px;
@@ -103,26 +97,22 @@ function getUserInfo() {
box-sizing: border-box; box-sizing: border-box;
background: #f1f1f1; background: #f1f1f1;
box-shadow: 0 5px 15px 8px rgba(1, 22, 54, 0.795); box-shadow: 0 5px 15px 8px rgba(1, 22, 54, 0.795);
.link { .link {
text-decoration: none; text-decoration: none;
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
padding: 10px; padding: 10px;
transition: all 0.4s; transition: all 0.4s;
text-align: center; text-align: center;
&:hover { &:hover {
background: rgba(4, 37, 223, 0.274); background: rgba(4, 37, 223, 0.274);
color: #f1f1f1; color: #f1f1f1;
} }
&.active { &.active {
color: #f1f1f1; color: #f1f1f1;
background: rgba(17, 120, 255, 0.74); background: rgba(17, 120, 255, 0.74);
} }
} }
} }
main { main {
flex: 1; flex: 1;
width: 100%; width: 100%;
@@ -130,4 +120,4 @@ function getUserInfo() {
box-sizing: border-box; box-sizing: border-box;
} }
} }
</style> </style>

View File

@@ -6,8 +6,6 @@
<div>课程列表</div> <div>课程列表</div>
<div style="margin-left: 6px; margin-right: 6px">/</div> <div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700">课程报名</div> <div style="font-weight: 700">课程报名</div>
<div v-if="pName != ''" class="return"> <div v-if="pName != ''" class="return">
<div style="display: flex" @click="returnclick"> <div style="display: flex" @click="returnclick">
<el-button style="color:#0073FB"><img class="img2" style="margin-right:11px;cursor: pointer;" <el-button style="color:#0073FB"><img class="img2" style="margin-right:11px;cursor: pointer;"
@@ -17,7 +15,6 @@
</div> </div>
</div> </div>
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<!-- 基本信息 --> <!-- 基本信息 -->
<div class="bascinfo"> <div class="bascinfo">
<div style="display:flex;"> <div style="display:flex;">
@@ -62,7 +59,6 @@
</div> </div>
</div> </div>
<!-- 基本信息 --> <!-- 基本信息 -->
<!-- 详细信息 --> <!-- 详细信息 -->
<div class="detailinfo"> <div class="detailinfo">
<div class="detail"> <div class="detail">
@@ -117,11 +113,9 @@
</button> </button>
</UploadPostImg> </UploadPostImg>
</div> </div>
<button class="btntwo" @click="submitComment" v-loading="submitLoading">发表评论</button> <button class="btntwo" @click="submitComment" v-loading="submitLoading">发表评论</button>
</div> </div>
</div> </div>
<div class="thinline"></div> <div class="thinline"></div>
<div class="bottom"> <div class="bottom">
<div v-for="(row, i) in commontList" :key="i" style="margin-bottom: 24px;"> <div v-for="(row, i) in commontList" :key="i" style="margin-bottom: 24px;">
@@ -213,7 +207,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 回复分页 --> <!-- 回复分页 -->
<div style="display:flex;justify-content:center;align-items:center;margin-top:36px;margin-bottom:36px;"> <div style="display:flex;justify-content:center;align-items:center;margin-top:36px;margin-bottom:36px;">
<!-- 分页 --> <!-- 分页 -->
@@ -226,7 +219,6 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
/> />
</div> </div>
<div <div
class="discuss clearfix" class="discuss clearfix"
v-if="commontList && commontList.length"> v-if="commontList && commontList.length">
@@ -271,7 +263,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -329,7 +320,6 @@
<!-- 详细信息 --> <!-- 详细信息 -->
</div> </div>
</template> </template>
<script setup> <script setup>
import {computed, reactive, toRefs, watch, onUnmounted, ref} from "vue"; import {computed, reactive, toRefs, watch, onUnmounted, ref} from "vue";
import FileTypeImg from "@/components/FileTypeImg.vue"; import FileTypeImg from "@/components/FileTypeImg.vue";
@@ -337,7 +327,6 @@ import {request, useRequest} from "@/api/request";
import { import {
STU_OFFCOURSE_DETAIL, STU_OFFCOURSE_DETAIL,
FACETEACH_SIGNUP, FACETEACH_SIGNUP,
COMMENT_ADD, COMMENT_ADD,
COMMENT_LIST, COMMENT_LIST,
COMMENT_PRAISE, COMMENT_PRAISE,
@@ -348,7 +337,6 @@ import {useRoute, useRouter} from "vue-router";
import {useUserInfo} from "@/api/utils"; import {useUserInfo} from "@/api/utils";
import {ElMessage, messageConfig} from "element-plus"; import {ElMessage, messageConfig} from "element-plus";
import dayjs from "dayjs"; import dayjs from "dayjs";
const router = useRouter(); const router = useRouter();
const returnclick = () => { const returnclick = () => {
router.back(); router.back();
@@ -356,13 +344,10 @@ const returnclick = () => {
const { const {
query: {courseId, type, id: taskId}, query: {courseId, type, id: taskId},
} = useRoute(); } = useRoute();
const {data = {}} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); const {data = {}} = useRequest(STU_OFFCOURSE_DETAIL, {courseId});
const teacherInfo = useUserInfo( const teacherInfo = useUserInfo(
computed(() => data.value?.planDto?.teacherId) computed(() => data.value?.planDto?.teacherId)
); );
const state = reactive({ const state = reactive({
activeName: "first", activeName: "first",
enclosure: "", enclosure: "",
@@ -380,7 +365,6 @@ const download = (url) => {
const downloads = (url) => { const downloads = (url) => {
ElMessage.warning("未在有效时间范围内,请耐心等待!"); ElMessage.warning("未在有效时间范围内,请耐心等待!");
}; };
//判断能否报名 (TODO-大于面授课截止时间就不能报名了,其余均可以) //判断能否报名 (TODO-大于面授课截止时间就不能报名了,其余均可以)
function isSignClick() { function isSignClick() {
let endTime = new Date(data.value.planDto?.endTime).getTime() let endTime = new Date(data.value.planDto?.endTime).getTime()
@@ -392,16 +376,13 @@ function isSignClick() {
} }
console.log(state.isAllowSign) console.log(state.isAllowSign)
} }
watch(data,()=>{ watch(data,()=>{
isSignClick(); isSignClick();
}) })
// 查看更多-展开回复列表 // 查看更多-展开回复列表
function lookMore(i) { function lookMore(i) {
i == spreadReply.value ? spreadReply.value = -1 : spreadReply.value = i; i == spreadReply.value ? spreadReply.value = -1 : spreadReply.value = i;
} }
// 获取评论数据 // 获取评论数据
const hfPage = ref({ const hfPage = ref({
currentPage: 1, currentPage: 1,
@@ -434,7 +415,6 @@ const getData = () => {
submitReplayLoading.value = false; submitReplayLoading.value = false;
}) })
} }
// 回复分页 // 回复分页
function handleCurrentChange(e, k) { function handleCurrentChange(e, k) {
console.log('分页打印', e, k) console.log('分页打印', e, k)
@@ -442,10 +422,7 @@ function handleCurrentChange(e, k) {
hfPage.value.pageNo = e; hfPage.value.pageNo = e;
getData(); getData();
} }
getData() getData()
const disDetail = ref({}); const disDetail = ref({});
const commontList = ref([]); const commontList = ref([]);
const spreadReply = ref(-1); const spreadReply = ref(-1);
@@ -454,7 +431,6 @@ const replayComment = ref({
content: "", content: "",
pid: "", pid: "",
}); });
// 清空回复及评论输入框 // 清空回复及评论输入框
const clearText = () => { const clearText = () => {
disComment.value.content = ""; disComment.value.content = "";
@@ -462,46 +438,36 @@ const clearText = () => {
fileListCommentRelpay.value = []; fileListCommentRelpay.value = [];
replayComment.value.content = ""; replayComment.value.content = "";
} }
// 评论图片展示数组 // 评论图片展示数组
const fileListComment = ref([]); const fileListComment = ref([]);
// 回复图片展示数组 // 回复图片展示数组
const fileListCommentRelpay = ref([]); const fileListCommentRelpay = ref([]);
// 上传图片成功返回的URL // 上传图片成功返回的URL
const uploadBack = (e) => { const uploadBack = (e) => {
console.log('--------->', e) console.log('--------->', e)
fileListComment.value.push(e) fileListComment.value.push(e)
} }
const uploadReplyBack = (e) => { const uploadReplyBack = (e) => {
console.log('--------->', e) console.log('--------->', e)
fileListCommentRelpay.value.push(e) fileListCommentRelpay.value.push(e)
} }
function removeImg(i) { function removeImg(i) {
fileListCommentRelpay.value.splice(i, 1); fileListCommentRelpay.value.splice(i, 1);
} }
function removeCommentImg(i) { function removeCommentImg(i) {
fileListComment.value.splice(i, 1); fileListComment.value.splice(i, 1);
} }
function commentLike(obj) { function commentLike(obj) {
obj.praised ? (obj.praiseNum = Number(obj.praiseNum) - 1) : (obj.praiseNum = Number(obj.praiseNum) + 1); obj.praised ? (obj.praiseNum = Number(obj.praiseNum) - 1) : (obj.praiseNum = Number(obj.praiseNum) + 1);
obj.praised = !obj.praised; obj.praised = !obj.praised;
request(COMMENT_PRAISE, { targetId: obj.id, type: 1 }); request(COMMENT_PRAISE, { targetId: obj.id, type: 1 });
} }
function commentComment(obj) { function commentComment(obj) {
console.log(obj) console.log(obj)
replayComment.value.placeholder = "@ " + obj.createName; replayComment.value.placeholder = "@ " + obj.createName;
replayComment.value.pid = obj.id; replayComment.value.pid = obj.id;
} }
const submitLoading = ref(false); const submitLoading = ref(false);
// 提交评论 // 提交评论
function submitComment() { function submitComment() {
if(disComment.value.content==""){ if(disComment.value.content==""){
@@ -533,9 +499,7 @@ function submitComment() {
console.log(err) console.log(err)
}); });
} }
const submitReplayLoading = ref(false); const submitReplayLoading = ref(false);
// 回复评论 // 回复评论
function submitReplayComment() { function submitReplayComment() {
if(replayComment.value.content==""){ if(replayComment.value.content==""){
@@ -569,7 +533,6 @@ function submitReplayComment() {
submitReplayLoading.value = false; submitReplayLoading.value = false;
}); });
} }
// 报名 // 报名
function onLineSignUp(isAgain) { function onLineSignUp(isAgain) {
if (!state.isAllowSign) { if (!state.isAllowSign) {
@@ -587,14 +550,12 @@ function onLineSignUp(isAgain) {
data.value.isRefused = false; data.value.isRefused = false;
ElMessage.success(isAgain? "重新报名成功" : "报名成功"); ElMessage.success(isAgain? "重新报名成功" : "报名成功");
} }
function formateArr(strs) { function formateArr(strs) {
let arrs = strs.split(',') let arrs = strs.split(',')
console.log('112233', arrs) console.log('112233', arrs)
return arrs return arrs
} }
</script> </script>
<!-- Add "scoped" attribute to limit CSS to this component only --> <!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss"> <style lang="scss">
.faceteach { .faceteach {
@@ -604,7 +565,6 @@ function formateArr(strs) {
font-size: 14px; font-size: 14px;
line-height: 24px; line-height: 24px;
} }
.bascinfo { .bascinfo {
width: 100%; width: 100%;
height: 310px; height: 310px;
@@ -614,7 +574,6 @@ function formateArr(strs) {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.btn { .btn {
width: 146px; width: 146px;
height: 46px; height: 46px;
@@ -631,7 +590,6 @@ function formateArr(strs) {
cursor: pointer; cursor: pointer;
margin-right: 96px; margin-right: 96px;
} }
.title { .title {
font-size: 20px; font-size: 20px;
font-weight: 800; font-weight: 800;
@@ -639,7 +597,6 @@ function formateArr(strs) {
line-height: 24px; line-height: 24px;
margin-left: -9px; margin-left: -9px;
} }
.time { .time {
font-size: 14px; font-size: 14px;
color: #6e7b84; color: #6e7b84;
@@ -648,11 +605,9 @@ function formateArr(strs) {
align-items: center; align-items: center;
} }
} }
.return { .return {
position: absolute; position: absolute;
right: 10%; right: 10%;
.text { .text {
text-align: center; text-align: center;
display: flex; display: flex;
@@ -660,37 +615,31 @@ function formateArr(strs) {
align-items: center; align-items: center;
} }
} }
.detailinfo { .detailinfo {
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
.detail { .detail {
flex: 1; flex: 1;
margin-right: 20px; margin-right: 20px;
.detailT { .detailT {
min-height: 263px; min-height: 263px;
background: #ffffff; background: #ffffff;
border-radius: 8px; border-radius: 8px;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
.title { .title {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 39px; padding-top: 39px;
position: relative; position: relative;
} }
.title .text { .title .text {
margin-left: 8px; margin-left: 8px;
font-size: 16px; font-size: 16px;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-weight: 800; font-weight: 800;
} }
.title .box { .title .box {
width: 75px; width: 75px;
height: 10px; height: 10px;
@@ -699,7 +648,6 @@ function formateArr(strs) {
left: 23px; left: 23px;
top: 53px; top: 53px;
} }
.content { .content {
margin-left: 8px; margin-left: 8px;
font-size: 14px; font-size: 14px;
@@ -710,30 +658,25 @@ function formateArr(strs) {
padding-bottom: 30px; padding-bottom: 30px;
} }
} }
.detailB { .detailB {
min-height: 363px; min-height: 363px;
background: #ffffff; background: #ffffff;
border-radius: 8px; border-radius: 8px;
margin-top: 20px; margin-top: 20px;
.wenxintishi { .wenxintishi {
display: flex; display: flex;
justify-content: stretch; justify-content: stretch;
padding: 72px; padding: 72px;
} }
.el-tabs__item { .el-tabs__item {
height: 69px; height: 69px;
padding: 25px 7px 0px 52px; padding: 25px 7px 0px 52px;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
} }
.el-tabs__nav-wrap::after { .el-tabs__nav-wrap::after {
background-color: rgba(56, 125, 247, 0.2); background-color: rgba(56, 125, 247, 0.2);
} }
.enclosure { .enclosure {
height: 89px; height: 89px;
margin-left: 51px; margin-left: 51px;
@@ -742,7 +685,6 @@ function formateArr(strs) {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.enclosureL { .enclosureL {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -751,7 +693,6 @@ function formateArr(strs) {
color: #677d86; color: #677d86;
line-height: 24px; line-height: 24px;
} }
.download { .download {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -762,7 +703,6 @@ function formateArr(strs) {
cursor: pointer; cursor: pointer;
} }
} }
.work { .work {
margin-left: 51px; margin-left: 51px;
margin-right: 40px; margin-right: 40px;
@@ -771,14 +711,12 @@ function formateArr(strs) {
align-items: center; align-items: center;
margin-top: 37px; margin-top: 37px;
} }
.work .question { .work .question {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #333330; color: #333330;
line-height: 18px; line-height: 18px;
} }
.work .submit { .work .submit {
width: 126px; width: 126px;
height: 46px; height: 46px;
@@ -796,14 +734,12 @@ function formateArr(strs) {
} }
} }
} }
.teacher { .teacher {
width: 434px; width: 434px;
min-height: 500px; min-height: 500px;
// height: 10%; // height: 10%;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
border-radius: 8px; border-radius: 8px;
.title { .title {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -811,14 +747,12 @@ function formateArr(strs) {
position: relative; position: relative;
margin-left: 48px; margin-left: 48px;
} }
.title .text { .title .text {
margin-left: 8px; margin-left: 8px;
font-size: 16px; font-size: 16px;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-weight: 800; font-weight: 800;
} }
.title .box { .title .box {
width: 75px; width: 75px;
height: 10px; height: 10px;
@@ -827,7 +761,6 @@ function formateArr(strs) {
left: 23px; left: 23px;
top: 53px; top: 53px;
} }
.teacheritem { .teacheritem {
margin-left: 48px; margin-left: 48px;
margin-right: 48px; margin-right: 48px;
@@ -836,23 +769,19 @@ function formateArr(strs) {
padding: 25px 0px; padding: 25px 0px;
display: flex; display: flex;
position: relative; position: relative;
// align-items: center; // align-items: center;
} }
.teacheritem .peopleimg { .teacheritem .peopleimg {
width: 60px; width: 60px;
height: 60px; height: 60px;
border-radius: 30px; border-radius: 30px;
} }
.teacheritem { .teacheritem {
.nameSpan { .nameSpan {
width: 190px; width: 190px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.teacherName { .teacherName {
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
@@ -861,17 +790,13 @@ function formateArr(strs) {
align-items: center; align-items: center;
} }
} }
} }
.teacheritem { .teacheritem {
.nameSpan { .nameSpan {
width: 190px; width: 190px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.teacherName { .teacherName {
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
@@ -880,16 +805,13 @@ function formateArr(strs) {
align-items: center; align-items: center;
} }
} }
} }
.teacheritem .introduce { .teacheritem .introduce {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #394145; color: #394145;
margin-top: 14px; margin-top: 14px;
} }
.teacheritem .follow { .teacheritem .follow {
width: 80px; width: 80px;
height: 30px; height: 30px;
@@ -908,8 +830,6 @@ function formateArr(strs) {
cursor: pointer; cursor: pointer;
} }
} }
} }
} }
.bascinfor { .bascinfor {
@@ -925,7 +845,6 @@ function formateArr(strs) {
// max-height: 110px; // max-height: 110px;
margin-left: 88px; margin-left: 88px;
margin-top: 44px; margin-top: 44px;
.words { .words {
position: absolute; position: absolute;
right: 15px; right: 15px;
@@ -935,7 +854,6 @@ function formateArr(strs) {
font-weight: 500; font-weight: 500;
color: #333330; color: #333330;
} }
.el-textarea__inner { .el-textarea__inner {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
@@ -946,14 +864,12 @@ function formateArr(strs) {
background-color: rgba(245, 246, 247, 1); background-color: rgba(245, 246, 247, 1);
padding: 11px 25px; padding: 11px 25px;
} }
.el-textarea__inner::placeholder { .el-textarea__inner::placeholder {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #666666; color: #666666;
line-height: 24px; line-height: 24px;
} }
// .el-input__inner { // .el-input__inner {
// &::-webkit-input-placeholder { // &::-webkit-input-placeholder {
// /* WebKit browsers 适配谷歌 */ // /* WebKit browsers 适配谷歌 */
@@ -967,7 +883,6 @@ function formateArr(strs) {
.allimg { .allimg {
position: relative; position: relative;
display: flex; display: flex;
.imgone { .imgone {
margin-top: 24px; margin-top: 24px;
width: 55px; width: 55px;
@@ -976,7 +891,6 @@ function formateArr(strs) {
background-image: url(../../assets/image/px.png); background-image: url(../../assets/image/px.png);
background-size: 100%; background-size: 100%;
} }
.cha { .cha {
cursor: pointer; cursor: pointer;
top: 15px; top: 15px;
@@ -990,13 +904,10 @@ function formateArr(strs) {
background-size: 100%; background-size: 100%;
} }
} }
.uploadAnd { .uploadAnd {
margin-top: 21px; margin-top: 21px;
.btwwo { .btwwo {
cursor: pointer; cursor: pointer;
.image { .image {
padding-top: 8px; padding-top: 8px;
width: 18px; width: 18px;
@@ -1004,7 +915,6 @@ function formateArr(strs) {
// margin-top: 10px; // margin-top: 10px;
margin-left: -60px; margin-left: -60px;
} }
.shangchuan { .shangchuan {
position: absolute; position: absolute;
right: 20px; right: 20px;
@@ -1016,18 +926,15 @@ function formateArr(strs) {
color: #2478ff; color: #2478ff;
line-height: 24px; line-height: 24px;
} }
width: 126px; width: 126px;
height: 36px; height: 36px;
border: none; border: none;
background-color: #fff; background-color: #fff;
} }
.btnone { .btnone {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: 140px; right: 140px;
.image { .image {
padding-top: 8px; padding-top: 8px;
width: 18px; width: 18px;
@@ -1035,7 +942,6 @@ function formateArr(strs) {
// margin-top: 10px; // margin-top: 10px;
margin-left: -60px; margin-left: -60px;
} }
.shangchuan { .shangchuan {
position: absolute; position: absolute;
right: 20px; right: 20px;
@@ -1047,14 +953,12 @@ function formateArr(strs) {
color: #2478ff; color: #2478ff;
line-height: 24px; line-height: 24px;
} }
width: 126px; width: 126px;
height: 36px; height: 36px;
border: 1px solid #2478ff; border: 1px solid #2478ff;
border-radius: 4px; border-radius: 4px;
background-color: #fff; background-color: #fff;
} }
.btntwo { .btntwo {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
@@ -1070,7 +974,6 @@ function formateArr(strs) {
} }
} }
} }
.thinline { .thinline {
margin-top: 66px; margin-top: 66px;
// width: 1635px; // width: 1635px;
@@ -1078,7 +981,6 @@ function formateArr(strs) {
margin-left: -50px; margin-left: -50px;
opacity: 0.2; opacity: 0.2;
} }
.bottom { .bottom {
margin-top: 31px; margin-top: 31px;
// width: 100px; // width: 100px;
@@ -1086,7 +988,6 @@ function formateArr(strs) {
// background-color: #bfa; // background-color: #bfa;
.header { .header {
display: flex; display: flex;
.avator { .avator {
width: 41px; width: 41px;
height: 41px; height: 41px;
@@ -1094,7 +995,6 @@ function formateArr(strs) {
// background-image: url(../../assets/image/px.png); // background-image: url(../../assets/image/px.png);
background-size: 100%; background-size: 100%;
} }
.id { .id {
margin-left: 8px; margin-left: 8px;
font-size: 14px; font-size: 14px;
@@ -1103,7 +1003,6 @@ function formateArr(strs) {
color: #333333; color: #333333;
line-height: 41px; line-height: 41px;
} }
.showCareer { .showCareer {
margin-left: 7px; margin-left: 7px;
height: 41px; height: 41px;
@@ -1112,7 +1011,6 @@ function formateArr(strs) {
color: #666666; color: #666666;
line-height: 41px; line-height: 41px;
} }
.idThink { .idThink {
margin-left: 17px; margin-left: 17px;
height: 41px; height: 41px;
@@ -1122,7 +1020,6 @@ function formateArr(strs) {
line-height: 41px; line-height: 41px;
} }
} }
.discuss { .discuss {
margin-left: 48px; margin-left: 48px;
margin-top: 23px; margin-top: 23px;
@@ -1135,7 +1032,6 @@ function formateArr(strs) {
width: 100%; width: 100%;
display: flex; display: flex;
position: relative; position: relative;
.talkmain { .talkmain {
margin-right: 25px; margin-right: 25px;
margin-top: 2px; margin-top: 2px;
@@ -1143,7 +1039,6 @@ function formateArr(strs) {
font-weight: 500; font-weight: 500;
color: #666666; color: #666666;
} }
// .talk { // .talk {
// position: absolute; // position: absolute;
// right: 0; // right: 0;
@@ -1153,33 +1048,27 @@ function formateArr(strs) {
// background-size: 100%; // background-size: 100%;
// } // }
} }
.intime { .intime {
margin-top: 11px; margin-top: 11px;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
} }
.likeYou { .likeYou {
margin-top: 15px; margin-top: 15px;
display: flex; display: flex;
.same { .same {
width: 14px; width: 14px;
height: 14px; height: 14px;
} }
.pinglun { .pinglun {
background-image: url(../../assets/image/pinglun.png); background-image: url(../../assets/image/pinglun.png);
background-size: 100%; background-size: 100%;
} }
.dianzan { .dianzan {
background-image: url(../../assets/image/dianzan2.png); background-image: url(../../assets/image/dianzan2.png);
background-size: 100%; background-size: 100%;
} }
.count { .count {
margin-left: 7px; margin-left: 7px;
margin-top: -1px; margin-top: -1px;
@@ -1188,7 +1077,6 @@ function formateArr(strs) {
color: #b3bdc4; color: #b3bdc4;
} }
} }
.reply { .reply {
display: flex; display: flex;
margin-top: 32px; margin-top: 32px;
@@ -1200,7 +1088,6 @@ function formateArr(strs) {
height: 29px; height: 29px;
border-radius: 50%; border-radius: 50%;
} }
.sameuser { .sameuser {
margin-left: 14px; margin-left: 14px;
line-height: 29px; line-height: 29px;
@@ -1209,7 +1096,6 @@ function formateArr(strs) {
color: #333333; color: #333333;
font-size: 14px; font-size: 14px;
} }
.centerreply { .centerreply {
height: 29px; height: 29px;
font-size: 14px; font-size: 14px;
@@ -1219,17 +1105,14 @@ function formateArr(strs) {
margin-left: 23px; margin-left: 23px;
margin-right: 17px; margin-right: 17px;
} }
.avaone { .avaone {
// background-image: url(../../assets/image/px.png); // background-image: url(../../assets/image/px.png);
background-size: 100%; background-size: 100%;
} }
.avatwo { .avatwo {
// background-image: url(../../assets/image/px.png); // background-image: url(../../assets/image/px.png);
background-size: 100%; background-size: 100%;
} }
.replytime { .replytime {
margin-left: 17px; margin-left: 17px;
height: 29px; height: 29px;
@@ -1239,11 +1122,9 @@ function formateArr(strs) {
line-height: 29px; line-height: 29px;
} }
} }
.allreplyimg { .allreplyimg {
display: flex; display: flex;
margin-top: 21px; margin-top: 21px;
.singleimg { .singleimg {
margin-right: 7px; margin-right: 7px;
width: 65px; width: 65px;
@@ -1253,11 +1134,9 @@ function formateArr(strs) {
background-size: 100%; background-size: 100%;
} }
} }
.mainreply { .mainreply {
display: flex; display: flex;
margin-top: 16px; margin-top: 16px;
.replydetail { .replydetail {
height: 23px; height: 23px;
font-size: 14px; font-size: 14px;
@@ -1266,9 +1145,7 @@ function formateArr(strs) {
line-height: 23px; line-height: 23px;
margin-right: 11px; margin-right: 11px;
} }
} }
.inreply { .inreply {
position: relative; position: relative;
margin-top: -22px; margin-top: -22px;
@@ -1278,4 +1155,4 @@ function formateArr(strs) {
} }
} }
} }
</style> </style>