Skip to content

C
confucius
Commit 0db5e8ec authored by Mac's avatar Mac
Browse files
Options

修改

parent 9188b7e5
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 29 deletions
src/pages/teacher/changeClassManager.vue
View file @ 0db5e8ec
...@@ -296,6 +296,10 @@ ...@@ -296,6 +296,10 @@
if (this.$route.query.tab) { if (this.$route.query.tab) {
this.tabCheck = this.$route.query.tab; this.tabCheck = this.$route.query.tab;
} }
if (this.$route.query.ReceiptType) {
this.msg.ReceiptType = this.$route.query.ReceiptType;
}
if (this.$route.query.id) { if (this.$route.query.id) {
this.msg.Id = this.$route.query.id; this.msg.Id = this.$route.query.id;
} }
......
src/pages/teacher/contribution/addimageText.vue
View file @ 0db5e8ec
...@@ -175,19 +175,19 @@ ...@@ -175,19 +175,19 @@
<q-input clearable standout="bg-primary text-white" v-model="SourceUrl" @input="$forceUpdate()" <q-input clearable standout="bg-primary text-white" v-model="SourceUrl" @input="$forceUpdate()"
v-if="addMsg.Type==1" label="原文地址" style="margin-top: 20px;width: 500px;" /> v-if="addMsg.Type==1" label="原文地址" style="margin-top: 20px;width: 500px;" />
<div style="display: flex;align-items: center;margin: 10px 0 ;" v-if="addMsg.Type==1"> <div style="display: flex;align-items: center;margin: 10px 0 ;" v-if="addMsg.Type==1">
显示封面图： 封面图：
<q-radio v-model="IsShowCover" val="1" label="显示" /> <q-radio v-model="IsShowCover" val="1" label="显示" />
<q-radio v-model="IsShowCover" val="0" label="不显示" /> <q-radio v-model="IsShowCover" val="0" label="不显示" />
</div> </div>
<div style="display: flex;align-items: center;margin: 10px 0 ;" <div style="display: flex;align-items: center;margin: 10px 0 ;"
v-if="addMsg.Type==1 || addMsg.Type==5 "> v-if="addMsg.Type==1 || addMsg.Type==5 ">
是否打开评论： 打开评论：
<q-radio v-model="IsOpenComment" val="1" label="打开" /> <q-radio v-model="IsOpenComment" val="1" label="打开" />
<q-radio v-model="IsOpenComment" val="0" label="不打开" /> <q-radio v-model="IsOpenComment" val="0" label="不打开" />
</div> </div>
<div style="display: flex;align-items: center;margin: 10px 0 ;" <div style="display: flex;align-items: center;margin: 10px 0 ;"
v-if="(addMsg.Type==1 || addMsg.Type==5) && IsOpenComment==1"> v-if="(addMsg.Type==1 || addMsg.Type==5) && IsOpenComment==1">
是否粉丝才可评论： 粉丝才可评论：
<q-radio v-model="IsFansCanComment" val="1" label="粉丝" /> <q-radio v-model="IsFansCanComment" val="1" label="粉丝" />
<q-radio v-model="IsFansCanComment" val="0" label="所有人" /> <q-radio v-model="IsFansCanComment" val="0" label="所有人" />
</div> </div>
...@@ -289,7 +289,8 @@ ...@@ -289,7 +289,8 @@
VideoMediumId: 0, VideoMediumId: 0,
ImageList: [], ImageList: [],
Content: '', Content: '',
AuditState: 0 AuditState: 0,
SendContent:'',
}, },
loading: false, loading: false,
iscover: false,//是否选择封面 iscover: false,//是否选择封面
...@@ -300,9 +301,9 @@ ...@@ -300,9 +301,9 @@
IsPreview: 0,//1预览 2群发 0 只保存投稿 不发送 IsPreview: 0,//1预览 2群发 0 只保存投稿 不发送
TagId: '',//预览 =》 微信号（必传）； 群发 =》 标签ID TagId: '',//预览 =》 微信号（必传）； 群发 =》 标签ID
PlatformId: '',//发布的平台 PlatformId: '',//发布的平台
IsShowCover: '0',//是否显示封面，1为显示，0为不显示 （图文） IsShowCover: '1',//是否显示封面，1为显示，0为不显示 （图文）
SourceUrl: '',// 原文地址 （图文） SourceUrl: '',// 原文地址 （图文）
IsOpenComment: '0',//是否打开评论，0不打开，1打开（图文 + 图片） IsOpenComment: '1',//是否打开评论，0不打开，1打开（图文 + 图片）
IsFansCanComment: '0',//是否粉丝才可评论，0所有人可评论，1粉丝才 IsFansCanComment: '0',//是否粉丝才可评论，0所有人可评论，1粉丝才
platTypeList: [],//平台列表 platTypeList: [],//平台列表
} }
...@@ -376,7 +377,6 @@ ...@@ -376,7 +377,6 @@
}, },
//选择图片 //选择图片
SelectId(obj) { SelectId(obj) {
console.log(obj)
if (obj && obj.length > 0) { if (obj && obj.length > 0) {
let data = [] let data = []
obj.forEach((x) => { obj.forEach((x) => {
...@@ -428,9 +428,7 @@ ...@@ -428,9 +428,7 @@
} }
} }
if (this.type == 3) { if (this.type == 3) {
// <iframe class="video_iframe rich_pages" data-vidtype="2" data-cover="https%3A%2F%2Fmmbiz.qlogo.cn%2Fmmbiz_png%2FiamUJ3Ot9utEic7O29tVpba9dnbkYGtYcGTtwdYq8dricg200uSc0BgiadEb399aC6oQfqp59kxBeV0O0w3zUGhJpQ%2F0%3Fwx_fmt%3Dpng" allowfullscreen="" frameborder="0" style=" z-index:1; " data-src="https://v.qq.com/iframe/preview.html?width=500&height=375&auto=0&vid=1007_532d40cde28c4fc3885b9b6d302f194d"></iframe> console.log(b)
let a = { "title": "测试视频文件", "description": "", "down_url": "http:\/\/203.205.136.113\/vweixinp.tc.qq.com\/1007_07ec2b9f113343d1985494ee31688230.f10.mp4?vkey=BFF307E7918FE7E2F5F05186CCF66BE375D1AF3ECD6BB02829646BFEFAD1386EDBDA72CAA1756CF47FD935F6944B9E745DC42BCE97E08B0FB8F0604F23258B28A2196CBF8AF10C356ADDB023820898B88B8219D607378B16&sha=0&save=1", "newcat": "", "newsubcat": "", "tags": [], "cover_url": "", "vid": "1007_07ec2b9f113343d1985494ee31688230" } let a = { "title": "测试视频文件", "description": "", "down_url": "http:\/\/203.205.136.113\/vweixinp.tc.qq.com\/1007_07ec2b9f113343d1985494ee31688230.f10.mp4?vkey=BFF307E7918FE7E2F5F05186CCF66BE375D1AF3ECD6BB02829646BFEFAD1386EDBDA72CAA1756CF47FD935F6944B9E745DC42BCE97E08B0FB8F0604F23258B28A2196CBF8AF10C356ADDB023820898B88B8219D607378B16&sha=0&save=1", "newcat": "", "newsubcat": "", "tags": [], "cover_url": "", "vid": "1007_07ec2b9f113343d1985494ee31688230" }
console.log(a.down_url)
data[0].fileUrl = a.down_url data[0].fileUrl = a.down_url
this.$refs.UE_cb.insertVideo(data) this.$refs.UE_cb.insertVideo(data)
} }
...@@ -441,13 +439,11 @@ ...@@ -441,13 +439,11 @@
this.imgsList.splice(index, 1); this.imgsList.splice(index, 1);
}, },
successUpload(file) { successUpload(file) {
console.log(file, 'file');
if (file.Code == 1) { if (file.Code == 1) {
let data = [{ let data = [{
fileName: file.Data.Name, fileName: file.Data.Name,
fileUrl: this.domainManager().DomainUrl + '' + file.Data.HttpPath fileUrl: this.domainManager().DomainUrl + '' + file.Data.HttpPath
}] }]
console.log(data, 'data');
this.$refs.UE_cb.instertImage(data) this.$refs.UE_cb.instertImage(data)
} }
}, },
...@@ -526,7 +522,6 @@ ...@@ -526,7 +522,6 @@
} else {//预览 和 群发 } else {//预览 和 群发
this.releasedialog = true this.releasedialog = true
this.IsPreview = type this.IsPreview = type
console.log(this.addMsg)
} }
}, },
closeCourseForm() { closeCourseForm() {
...@@ -619,10 +614,9 @@ ...@@ -619,10 +614,9 @@
getcontnet(data, length) { getcontnet(data, length) {
if (this.addMsg.Type == 2) { if (this.addMsg.Type == 2) {
this.addMsg.Description = data.replace(/<\/?p[^>]*>/gi,'') this.addMsg.Description = data.replace(/<\/?p[^>]*>/gi,'')
console.log(this.addMsg.Description)
} else { } else {
this.addMsg.Content = data this.addMsg.Content = data
let temporary = JSON.parse(JSON.stringify(data)) this.addMsg.SendContent = JSON.parse(JSON.stringify(data))
var reg = /data-time="(.*?)"/g; var reg = /data-time="(.*?)"/g;
let _arr = [] let _arr = []
let deleteName = '' let deleteName = ''
...@@ -648,21 +642,17 @@ ...@@ -648,21 +642,17 @@
); );
} }
_newArr.forEach(x=>{ _newArr.forEach(x=>{
console.log(x)
if(x.num==2){ if(x.num==2){
let a = new RegExp(`<mp-miniprogram ${x.name}[^>]*>(.|\n)*<\/mp-miniprogram><span ${x.name}></span>`,'g') let a = new RegExp(`<mp-miniprogram ${x.name}[^>]*>(.|\n)*<\/mp-miniprogram><span ${x.name}></span>`,'g')
temporary = temporary.replace(a,'') this.addMsg.SendContent = this.addMsg.SendContent.replace(a,'')
// this.$refs.UE_cb.getagain(this.addMsg.Content) // this.$refs.UE_cb.getagain(this.addMsg.Content)
} }
}) })
// this.addMsg.Content = temporary
//新增一个存的值 //新增一个存的值
console.log(temporary,'```````````````temporary')
} }
console.log(this.addMsg.Content, '返回数据')
} }
}, },
} }
......
src/pages/teacher/contribution/contributeManage.vue
View file @ 0db5e8ec
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
label="修改" @click="goedit(props.row)" /> label="修改" @click="goedit(props.row)" />
<q-btn flat size="xs" icon="iconfont icon-fabu" style="font-weight:400;color: purple" class="q-mr-xs" <q-btn flat size="xs" icon="iconfont icon-fabu" style="font-weight:400;color: purple" class="q-mr-xs"
label="发布" @click="release(props.row)" /> label="发布" @click="release(props.row)" />
<q-btn flat size="xs" icon="iconfont icon-fabu" style="font-weight:400;color: purple" class="q-mr-xs" <q-btn flat size="xs" icon="iconfont icon-lianluojilu" style="font-weight:400;color: purple" class="q-mr-xs"
label="发布记录" @click="releaserecord(props.row)" > label="发布记录" @click="releaserecord(props.row)" >
<q-popup-proxy transition-show="flip-up" transition-hide="flip-down"> <q-popup-proxy transition-show="flip-up" transition-hide="flip-down">
<div style="padding: 10px;"> <div style="padding: 10px;">
......
src/pages/teacher/contribution/imageTextlist.vue
View file @ 0db5e8ec
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<!-- <q-btn flat size="xs" icon="iconfont icon-view" style="font-weight:400;color: #3FC4FF" <q-btn flat size="xs" icon="iconfont icon-view" style="font-weight:400;color: #3FC4FF" v-if="props.row.AuditState!=0"
class="q-mr-xs" label="详情" @click="viewDetails(props.row)" /> --> class="q-mr-xs" label="查看流程" @click="goliucheng(props.row)" />
<q-btn v-if="props.row.AuditState==0 || props.row.AuditState==3" flat size="xs" icon="edit" style="font-weight:400;color: #3FC4FF" class="q-mr-xs" <q-btn v-if="props.row.AuditState==0 || props.row.AuditState==3" flat size="xs" icon="edit" style="font-weight:400;color: #3FC4FF" class="q-mr-xs"
label="编辑" @click="goedit(props.row)" /> label="编辑" @click="goedit(props.row)" />
...@@ -209,9 +209,6 @@ ...@@ -209,9 +209,6 @@
}).catch(() => { }).catch(() => {
}) })
},
viewDetails() {//详情
}, },
goDetailed(row) {//删除 goDetailed(row) {//删除
this.$q.dialog({ this.$q.dialog({
...@@ -272,6 +269,14 @@ ...@@ -272,6 +269,14 @@
type: type type: type
}); });
}, },
goliucheng(){//查看流程
this.$router.push({
path: '/teacher/change-class-manager',
query: {
ReceiptType: 10
}
});
},
} }
} }
......
src/pages/teacher/contribution/ue/contributionUE.vue
View file @ 0db5e8ec
...@@ -149,7 +149,6 @@ ...@@ -149,7 +149,6 @@
html += html +=
`<p><a class='weapp_text_link' style="color: #576b95;text-decoration: none;" target="_self" href="${item.fileUrl}" data-itemshowtype="0" tab="innerlink" style='text-decoration:none;color: #576b95;' _href="${item.fileUrl}">${item.fileName}</a></p>`; `<p><a class='weapp_text_link' style="color: #576b95;text-decoration: none;" target="_self" href="${item.fileUrl}" data-itemshowtype="0" tab="innerlink" style='text-decoration:none;color: #576b95;' _href="${item.fileUrl}">${item.fileName}</a></p>`;
}) })
console.log(html)
if (html && html != '') { if (html && html != '') {
// html.setAttr('style','display:block;margin:0 auto;'); // html.setAttr('style','display:block;margin:0 auto;');
this.ue.execCommand('inserthtml', html); this.ue.execCommand('inserthtml', html);
...@@ -177,7 +176,6 @@ ...@@ -177,7 +176,6 @@
data.appletmsg.Image + '&title=' + data.title + '&imgUrl=' + data.imgUrl + data.appletmsg.Image + '&title=' + data.title + '&imgUrl=' + data.imgUrl +
'" class="ans-insertaudio-module" module="_insertaudio">' + ' </iframe></p>'; '" class="ans-insertaudio-module" module="_insertaudio">' + ' </iframe></p>';
console.log(html)
} }
if (html && html != '') { if (html && html != '') {
...@@ -274,8 +272,6 @@ ...@@ -274,8 +272,6 @@
}) })
this.ue.addListener('click', (editor, a) => { this.ue.addListener('click', (editor, a) => {
// console.log(editor,a)
// console.log(this.ue.getContent())
}) })
} }
}, },
......
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