Commit 7adb1fe9 authored by 黄奎's avatar 黄奎

页面修改

parent 845a6711
...@@ -1054,7 +1054,6 @@ ...@@ -1054,7 +1054,6 @@
this.apipost("/api/Tenant/GetMiniprogramPageListExt", {}, res => { this.apipost("/api/Tenant/GetMiniprogramPageListExt", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.userCenterMsg.MenuList = res.data.data; this.userCenterMsg.MenuList = res.data.data;
console.log(res,'userCenter');
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
getList() { getList() {
this.apipost("/api/Education/GetArticlePageList", this.msg, res => { this.apipost("/api/Education/GetArticlePageList", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'res');
this.total = res.data.data.count; this.total = res.data.data.count;
var tempArray = res.data.data.pageData; var tempArray = res.data.data.pageData;
if (tempArray && tempArray.length > 0) { if (tempArray && tempArray.length > 0) {
......
...@@ -1678,7 +1678,6 @@ ...@@ -1678,7 +1678,6 @@
}) })
}, },
changeCarColorList(val) { changeCarColorList(val) {
console.log(val)
}, },
changeEnumList(val) { changeEnumList(val) {
this.EnumType = val this.EnumType = val
......
...@@ -208,11 +208,12 @@ ...@@ -208,11 +208,12 @@
<template v-if="addMsg.TeacherList.length>0"> <template v-if="addMsg.TeacherList.length>0">
<div> <div>
<div class="Teacher_List" v-for="(item,index) in addMsg.TeacherList" :key="index"> <div class="Teacher_List" v-for="(item,index) in addMsg.TeacherList" :key="index">
<div class="Teacher_tou"> <div class="Teacher_tou">
<img style="width:100%;height:100%;" :src="item.TeacherLogo" alt=""/> <img style="width:100%;height:100%;" :src="item.TeacherLogo" alt="" />
</div> </div>
{{item.Name}} {{item.Name}}
<el-button @click="yichuTeacher(index)" class="edu_edlBtn" type="danger" icon="el-icon-close" circle></el-button> <el-button @click="yichuTeacher(index)" class="edu_edlBtn" type="danger" icon="el-icon-close"
circle></el-button>
</div> </div>
</div> </div>
<!-- <el-tag v-for="(item,index) in addMsg.TeacherList" closable size="small" <!-- <el-tag v-for="(item,index) in addMsg.TeacherList" closable size="small"
...@@ -220,7 +221,8 @@ ...@@ -220,7 +221,8 @@
{{item.Name}} {{item.Name}}
</el-tag> --> </el-tag> -->
</template> </template>
<el-button @click="choosejsDig=true" style="position:relative;top:-4px;" size="mini">选择教师</el-button> <el-button @click="choosejsDig=true" style="position:relative;top:-4px;" size="mini">选择教师
</el-button>
</el-form-item> </el-form-item>
<el-form-item label="标签" size="small"> <el-form-item label="标签" size="small">
<el-tag :key="tag" size="small" v-for="tag in dynamicTags" closable :disable-transitions="false" <el-tag :key="tag" size="small" v-for="tag in dynamicTags" closable :disable-transitions="false"
...@@ -261,9 +263,9 @@ ...@@ -261,9 +263,9 @@
<div style="width:100px;">{{subItem.Sort}}</div> <div style="width:100px;">{{subItem.Sort}}</div>
<div style="width:120px;">{{subItem.SortName}}</div> <div style="width:120px;">{{subItem.SortName}}</div>
<div class="edu_fileName" style="width:300px;"> <div class="edu_fileName" style="width:300px;">
<el-tooltip class="item" effect="dark" :content="subItem.Name" placement="top"> <el-tooltip class="item" effect="dark" :content="subItem.Name" placement="top">
<div style="padding:5px;">{{subItem.Name}}</div> <div style="padding:5px;">{{subItem.Name}}</div>
</el-tooltip> </el-tooltip>
</div> </div>
<div> <div>
<span v-if="subItem.Type==1">视频</span> <span v-if="subItem.Type==1">视频</span>
...@@ -285,12 +287,16 @@ ...@@ -285,12 +287,16 @@
<div class="eduFileDiv"> <div class="eduFileDiv">
<el-tooltip class="item" effect="dark" content="预览文件" placement="top"> <el-tooltip class="item" effect="dark" content="预览文件" placement="top">
<img v-if="getFileType(subItem.FilePath)==1" @click="goUrlVideo(subItem.FilePath)" <img v-if="getFileType(subItem.FilePath)==1" @click="goUrlVideo(subItem.FilePath)"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/z_video.png" alt=""> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/z_video.png"
<img v-if="getFileType(subItem.FilePath)==2" @click="showUpLoadFileT(subItem.FilePath)" alt="">
<img v-if="getFileType(subItem.FilePath)==2"
@click="showUpLoadFileT(subItem.FilePath)"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/WORD.png" alt=""> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/WORD.png" alt="">
<img v-if="getFileType(subItem.FilePath)==3" @click="showUpLoadFileT(subItem.FilePath)" <img v-if="getFileType(subItem.FilePath)==3"
@click="showUpLoadFileT(subItem.FilePath)"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pdf.png" alt=""> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pdf.png" alt="">
<img v-if="getFileType(subItem.FilePath)==4" @click="showUpLoadFileT(subItem.FilePath)" <img v-if="getFileType(subItem.FilePath)==4"
@click="showUpLoadFileT(subItem.FilePath)"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/PPT.png" alt=""> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/PPT.png" alt="">
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -674,9 +680,9 @@ ...@@ -674,9 +680,9 @@
<div> <div>
<el-checkbox-group v-model="ckedTeacher"> <el-checkbox-group v-model="ckedTeacher">
<el-checkbox v-for="(item,index) in teacherList" :label="item.ID" :key="index"> <el-checkbox v-for="(item,index) in teacherList" :label="item.ID" :key="index">
<div class="teacherHead"> <div class="teacherHead">
<img :src="item.TeacherLogo" alt=""/> <img :src="item.TeacherLogo" alt="" />
</div>{{item.Name}} </div>{{item.Name}}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
...@@ -837,7 +843,7 @@ ...@@ -837,7 +843,7 @@
TeacherList: [], //教师 TeacherList: [], //教师
CourseList: [], //课程 CourseList: [], //课程
SalesNum: 0, //已售数量 SalesNum: 0, //已售数量
CourseLableList:[] //标签 CourseLableList: [] //标签
}, },
predefineColors: [ predefineColors: [
'#000000', '#000000',
...@@ -986,7 +992,7 @@ ...@@ -986,7 +992,7 @@
dynamicTags: [], dynamicTags: [],
inputVisible: false, inputVisible: false,
inputValue: '', inputValue: '',
commonTitle:'新增课程', commonTitle: '新增课程',
}; };
}, },
created() { created() {
...@@ -1501,7 +1507,7 @@ ...@@ -1501,7 +1507,7 @@
if (this.addMsg.PresentFXGrade == 0) { if (this.addMsg.PresentFXGrade == 0) {
this.addMsg.PresentFXGrade = '' this.addMsg.PresentFXGrade = ''
} }
if( this.addMsg.CourseLableList&&this.addMsg.CourseLableList.length>0){ if (this.addMsg.CourseLableList && this.addMsg.CourseLableList.length > 0) {
this.dynamicTags = this.addMsg.CourseLableList this.dynamicTags = this.addMsg.CourseLableList
} }
if (this.addMsg.TeacherList.length > 0) { if (this.addMsg.TeacherList.length > 0) {
...@@ -1717,14 +1723,13 @@ ...@@ -1717,14 +1723,13 @@
}, },
getckedTeachArr() { getckedTeachArr() {
this.addMsg.TeacherList = []; this.addMsg.TeacherList = [];
console.log(this.ckedTeacher,'this.ckedTeacher');
this.ckedTeacher.forEach(x => { this.ckedTeacher.forEach(x => {
this.teacherList.forEach(y => { this.teacherList.forEach(y => {
if (x == y.ID) { if (x == y.ID) {
this.addMsg.TeacherList.push({ this.addMsg.TeacherList.push({
TeacherId: y.ID, TeacherId: y.ID,
Name: y.Name, Name: y.Name,
TeacherLogo:y.TeacherLogo TeacherLogo: y.TeacherLogo
}) })
} }
}) })
...@@ -1824,7 +1829,7 @@ ...@@ -1824,7 +1829,7 @@
}, },
//修改课件 //修改课件
updateCourse(subItem, index) { updateCourse(subItem, index) {
this.commonTitle='修改课程'; this.commonTitle = '修改课程';
this.isReplace = index; this.isReplace = index;
this.courseDialog = true; this.courseDialog = true;
this.courseMsg.Id = subItem.Id; this.courseMsg.Id = subItem.Id;
...@@ -1872,9 +1877,6 @@ ...@@ -1872,9 +1877,6 @@
if (Url.substring(Url.lastIndexOf('.') + 1, Url.length).toUpperCase() == 'PDF') { if (Url.substring(Url.lastIndexOf('.') + 1, Url.length).toUpperCase() == 'PDF') {
this.previewPDF(Url) this.previewPDF(Url)
} else { } else {
// let dom = document.querySelector("#groupTourOrder_DownLoad");
// dom.href = Url;
// dom.click();
window.open("https://view.officeapps.live.com/op/view.aspx?src=" + Url) window.open("https://view.officeapps.live.com/op/view.aspx?src=" + Url)
} }
}, },
...@@ -2183,7 +2185,7 @@ ...@@ -2183,7 +2185,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
border: 1px solid #EBEEF5; border: 1px solid #EBEEF5;
border-bottom:0; border-bottom: 0;
} }
.courseHeader { .courseHeader {
...@@ -2280,62 +2282,72 @@ ...@@ -2280,62 +2282,72 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.directorGoodsEdit .input-new-tag { .directorGoodsEdit .input-new-tag {
width: 90px; width: 90px;
margin-left: 10px; margin-left: 10px;
vertical-align: bottom; vertical-align: bottom;
} }
.directorGoodsEdit .el-tag + .el-tag {
.directorGoodsEdit .el-tag+.el-tag {
margin-left: 10px; margin-left: 10px;
} }
.teacherHead{
width:30px; .teacherHead {
height:30px; width: 30px;
height: 30px;
display: inline-block; display: inline-block;
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
top:10px; top: 10px;
margin-right:3px; margin-right: 3px;
} }
.directorGoodsEdit .teacherHead img{
width:100%; .directorGoodsEdit .teacherHead img {
height:100%; width: 100%;
height: 100%;
} }
.directorGoodsEdit .el-checkbox{
margin-bottom:10px; .directorGoodsEdit .el-checkbox {
margin-bottom: 10px;
} }
.Teacher_List{
padding:2px 5px; .Teacher_List {
padding: 2px 5px;
position: relative; position: relative;
margin-right:5px; margin-right: 5px;
border:1px solid #d1d1d1; border: 1px solid #d1d1d1;
border-radius:4px; border-radius: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
line-height: normal; line-height: normal;
font-size: 12px; font-size: 12px;
float: left; float: left;
} }
.Teacher_tou{
width:25px; .Teacher_tou {
height:25px; width: 25px;
height: 25px;
overflow: hidden; overflow: hidden;
margin-right:3px; margin-right: 3px;
border-radius: 50%; border-radius: 50%;
display: inline-block; display: inline-block;
} }
.edu_edlBtn{
.edu_edlBtn {
position: absolute; position: absolute;
right:-8px; right: -8px;
top:-14px; top: -14px;
padding:1px 1px !important; padding: 1px 1px !important;
} }
.edu_fileName{
text-align: left!important; .edu_fileName {
line-height: normal!important; text-align: left !important;
line-height: normal !important;
} }
.edu_fileName>div{
.edu_fileName>div {
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -2344,4 +2356,5 @@ ...@@ -2344,4 +2356,5 @@
line-clamp: 2; line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
</style> </style>
...@@ -215,26 +215,6 @@ ...@@ -215,26 +215,6 @@
TableSelectChange(val) { TableSelectChange(val) {
this.SelectList = val; this.SelectList = val;
}, },
// // 批量回复
// plHf() {
// let that = this;
// if (this.SelectList.length == 0) {
// this.Error("请勾选数据!");
// return;
// }
// let Ids = "";
// let IdList = [];
// this.SelectList.forEach(item => {
// IdList.push(item.OrderDetailId);
// })
// Ids = IdList.join(',');
// this.hfMsg = {
// OrderDetailIds: Ids,
// Type: 1,
// Content: '',
// }
// this.addDig = true;
// },
//改变下拉切换搜索名称或者内容 标题 //改变下拉切换搜索名称或者内容 标题
ChangeId(val) { ChangeId(val) {
let msgVal = this.msgVal; let msgVal = this.msgVal;
...@@ -255,7 +235,6 @@ ...@@ -255,7 +235,6 @@
} }
this.getList(); this.getList();
}, },
//获取数据 //获取数据
getList() { getList() {
if (this.dateList && this.dateList.length > 0) { if (this.dateList && this.dateList.length > 0) {
...@@ -269,7 +248,6 @@ ...@@ -269,7 +248,6 @@
this.apipost("/api/Education/GetArticleCommentPageList", this.msg, res => { this.apipost("/api/Education/GetArticleCommentPageList", this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res, '数据');
this.total = res.data.data.count; this.total = res.data.data.count;
let pageData = res.data.data.pageData; let pageData = res.data.data.pageData;
this.tableData = pageData; this.tableData = pageData;
......
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
}, },
//保存 //保存
saveMsg() { saveMsg() {
if(this.addMsg.LableNameList.length==0){ if (this.addMsg.LableNameList.length == 0) {
this.Error('请选择标签'); this.Error('请选择标签');
return; return;
} }
...@@ -326,7 +326,6 @@ ...@@ -326,7 +326,6 @@
}) })
}, },
changeSupplier(val) {}, changeSupplier(val) {},
//单个删除 //单个删除
Delete(item) { Delete(item) {
let that = this; let that = this;
...@@ -424,17 +423,14 @@ ...@@ -424,17 +423,14 @@
handleClose(tag) { handleClose(tag) {
this.addMsg.LableNameList.splice(this.addMsg.LableNameList.indexOf(tag), 1); this.addMsg.LableNameList.splice(this.addMsg.LableNameList.indexOf(tag), 1);
}, },
showInput() { showInput() {
this.inputVisible = true; this.inputVisible = true;
this.$nextTick(_ => { this.$nextTick(_ => {
this.$refs.saveTagInput.$refs.input.focus(); this.$refs.saveTagInput.$refs.input.focus();
}); });
}, },
handleInputConfirm() { handleInputConfirm() {
let inputValue = this.inputValue; let inputValue = this.inputValue;
console.log(inputValue)
if (inputValue) { if (inputValue) {
this.addMsg.LableNameList.push(inputValue); this.addMsg.LableNameList.push(inputValue);
} }
...@@ -442,7 +438,6 @@ ...@@ -442,7 +438,6 @@
this.inputValue = ''; this.inputValue = '';
}, },
openChangeDig(num) { openChangeDig(num) {
this.changeState = true; this.changeState = true;
this.imgType = num; this.imgType = num;
}, },
...@@ -453,13 +448,11 @@ ...@@ -453,13 +448,11 @@
} }
this.changeState = false; this.changeState = false;
}, },
}, },
mounted() { mounted() {
} }
}; };
</script> </script>
<style> <style>
.informationManage .content .searchInput { .informationManage .content .searchInput {
......
...@@ -262,7 +262,6 @@ ...@@ -262,7 +262,6 @@
this.apipost("/api/Reserve/GetGenderEnumList", {}, res => { this.apipost("/api/Reserve/GetGenderEnumList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.genderList = res.data.data; this.genderList = res.data.data;
console.log(res,'行呗');
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -164,7 +164,6 @@ ...@@ -164,7 +164,6 @@
this.apipost("/api/Reserve/GetServicePersonalPageList", this.msg, res => { this.apipost("/api/Reserve/GetServicePersonalPageList", this.msg, res => {
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'数据');
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
} else { } else {
......
...@@ -491,13 +491,11 @@ ...@@ -491,13 +491,11 @@
}, },
//选择图片 //选择图片
SelectId(msg) { SelectId(msg) {
// this.data.goodsTagPicUrl = msg.url;
this.choicImg = false; this.choicImg = false;
}, },
//选择商品 //选择商品
getGoodsChoice() { getGoodsChoice() {
var ckedArr = this.$refs.choiceGood.getChoicedGoods(); var ckedArr = this.$refs.choiceGood.getChoicedGoods();
console.log(ckedArr,'ckedarrrr');
var myArray = []; var myArray = [];
if (ckedArr && ckedArr.length > 0) { if (ckedArr && ckedArr.length > 0) {
ckedArr.forEach(element => { ckedArr.forEach(element => {
......
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