Skip to content

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

1

parent 7cba0660
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 58 deletions
src/components/sale/tougao-form.vue
View file @ dba268ab
......@@ -196,10 +196,23 @@
color: #c94052;
}
.tougao_ImgList{
width: 150px;
height: 150px;
width: 130px;
height: 130px;
margin: 0 5px 10px;
}
.tougaohtml td{
padding: 5px 10px ;
border:1px solid #DDD;
}
.tougaohtml table{
border-collapse: collapse;
}
.left_width{
width: 80px;
}
</style>
<template>
<q-dialog
......@@ -270,26 +283,30 @@
<el-tag>写新图文</el-tag>
</div>
<div style="margin:20px 0;display:flex;">
<div style="flex-shrink:0;">标题：</div>
<div style="flex-shrink:0;" class="left_width">标题：</div>
<div class="backOtherInfo" v-if="setingObj.DataObj">
{{ setingObj.DataObj.Title }}
</div>
</div>
<div>
<span>作者：</span>
<div style="display: flex;">
<div class="left_width">作者：</div>
<span class="backOtherInfo" v-if="setingObj.DataObj">
{{ setingObj.DataObj.Author }}
</span>
</div>
<div style="margin:20px 0;" v-html="setingObj.DataObj.Content"></div>
<div style="display: flex;margin:20px 0;width: 100%;">
<div style="flex-shrink:0" class="left_width">图文内容：</div>
<div class="tougaohtml" style="border:1px solid rgb(235, 235, 235);padding: 10px;flex:1" v-html="setingObj.DataObj.Content"></div>
</div>
<div style="margin-top:20px;display:flex;">
<div style="margin-bottom:10px;">封面图：</div>
<div style="margin-bottom:10px;" class="left_width">封面图：</div>
<div class="tougao_ImgList" style="width: 210px;height: 90px;">
<el-image v-if="setingObj.DataObj.CoverImagePath && setingObj.DataObj.CoverImagePath!=''" style="width: 100%; height: 100%" :src="setingObj.DataObj.CoverImagePath" fit="cover"></el-image>
</div>
</div>
<div style="margin-top:20px;display:flex;">
<div style="margin-bottom:10px;flex-shrink:0;width:60px;">描述：</div>
<div style="margin-bottom:10px;flex-shrink:0;width:60px;" class="left_width">描述：</div>
<div>{{setingObj.DataObj.Description}}</div>
</div>
</template>
......@@ -297,7 +314,11 @@
<div>
<el-tag>文本消息</el-tag>
</div>
<div style="margin-top:20px;" v-html="setingObj.DataObj.Content"></div>
<div style="display: flex;margin-top: 20px;">
<div class="left_width">文本内容:</div>
<div v-html="setingObj.DataObj.Content"></div>
</div>
</template>
<template v-if="setingObj.DataObj.Type==4">
<div>
......@@ -309,9 +330,13 @@
{{ setingObj.DataObj.Title }}
</div>
</div>
<div>
{{setingObj.DataObj.Description}}
<div style="display:flex;">
<div style="flex-shrink:0">推荐语：</div>
<div class="backOtherInfo" v-if="setingObj.DataObj">
{{ setingObj.DataObj.Description }}
</div>
</div>
<div style="margin-top:20px;width:300px;" v-if="setingObj.DataObj.VideoMediumPath">
<audio :src="setingObj.DataObj.VideoMediumPath" controls="controls"></audio>
</div>
......@@ -320,20 +345,25 @@
<div>
<el-tag>图片消息</el-tag>
</div>
<div style="margin:20px 0;">
{{setingObj.DataObj.Description}}
</div>
<div style="display:flex;">
<div class="tougao_ImgList" v-for="(x,y) in setingObj.DataObj.ImageList" :key='y'>
<el-image style="width: 100%; height: 100%" :src="x.ImageUrl" fit="cover"></el-image>
</div>
</div>
<div style="margin-top:20px;display:flex;">
<div style="margin-bottom:10px;">封面图：</div>
<div class="tougao_ImgList">
<el-image style="width: 100%; height: 100%" :src="setingObj.DataObj.CoverImagePath" fit="cover"></el-image>
<div style="margin:20px 0;display:flex;">
<div style="flex-shrink:0" class="left_width">推荐语：</div>
<div class="backOtherInfo" v-if="setingObj.DataObj" style="margin-left: 5px;">
{{ setingObj.DataObj.Description }}
</div>
</div>
<!-- <div style="margin:20px 0;">
{{setingObj.DataObj.Description}}
</div> -->
<div style="display: flex;">
<div style="flex-shrink:0" class="left_width">图片列表：</div>
<div style="display:flex;flex-wrap: wrap;">
<div class="tougao_ImgList" v-for="(x,y) in setingObj.DataObj.ImageList" :key='y'>
<el-image style="width: 100%; height: 100%" :src="x.ImageUrl" fit="cover"></el-image>
</div>
</div>
</div>
</template>
</div>
</div>
......
src/pages/system/platformdeploy.vue
View file @ dba268ab
......@@ -129,15 +129,7 @@
<div v-if="data && data.Id && data.Id>0">
<div class="Period-rules">
<div class="Period_Spreate">
<div class="Period-rule-title">平台类型</div>
<div>
<span>
{{data.Type}}
</span>
</div>
</div>
<div class="Period_Spreate">
<div class="Period-rule-title">
平台名称
......@@ -146,8 +138,6 @@
{{data.Name}}
</div>
</div>
</div>
<div class="Period-rules">
<div class="Period_Spreate">
<div class="Period-rule-title">
AppId
......@@ -157,6 +147,9 @@
</div>
</div>
</div>
<div class="Period-rules">
<div class="Period_Spreate">
<div class="Period-rule-title">
App秘钥
......@@ -166,10 +159,6 @@
</div>
</div>
</div>
<div class="Period-rules">
<div class="Period_Spreate">
<div class="Period-rule-title">
开启状态
......@@ -178,8 +167,12 @@
{{data.Enable==1?'已开启':'未开启'}}
</div>
</div>
</div>
</div>
<div v-else style="width: 100%;height: 100px;line-height: 100px;text-align: center;">
暂无任何配置
......
src/pages/teacher/changeClassManager.vue
View file @ dba268ab
......@@ -274,6 +274,7 @@
EndTime: "", //结束时间
Conditon: 1,
ReceiptType: "", //单据类型
RelationId :0,
},
tabCheck: "1",
pageCount: 0,
......@@ -297,8 +298,12 @@
this.tabCheck = this.$route.query.tab;
}
if (this.$route.query.ReceiptType) {
this.msg.ReceiptType = this.$route.query.ReceiptType;
this.msg.ReceiptType = Number(this.$route.query.ReceiptType);
}
if (this.$route.query.RelationId) {
this.msg.RelationId = this.$route.query.RelationId;
}
if (this.$route.query.id) {
this.msg.Id = this.$route.query.id;
......
src/pages/teacher/contribution/addimageText.vue
View file @ dba268ab
......@@ -96,6 +96,8 @@
<contributionUE :config="config" ref="UE_cb" @input="getcontnet" v-model="addMsg.Content">
</contributionUE>
</div>
<span v-if='addMsg.Type==2' style="font-size: 11px;color: red;">*注:小程序和超链接会额外的占用字符</span>
<div style="display: flex;align-items: flex-start;margin-top: 20px;" v-if="addMsg.Type == 1">
<div v-if=" addMsg.CoverImageId==0"
style="width:210px;height:90px;border:2px dashed #ebebeb;display: flex;align-items: center;justify-content: center;flex-direction: column;"
......@@ -125,8 +127,8 @@
<!-- 图片 -->
<div v-if="addMsg.Type == 5">
<q-input clearable filled v-model="addMsg.Description" label="可以输入140字以内的推荐语(选填)" maxlength="140"
counter type="textarea" bottom-slots style="width: 100%;" />
<div style="display: flex;flex-wrap: wrap;width: 100%;border-bottom: 1px solid #d7d7d7;">
counter type="textarea" bottom-slots style="width: 100%;margin-top: 20px;" />
<div style="display: flex;flex-wrap: wrap;width: 100%;">
<draggable v-model="imgsList" style="display: flex;flex-wrap: wrap;width: 100%;">
<div style="width: 178px;height: 178px;margin: 0 5px 10px;position: relative;cursor: grab"
v-for="(x,y) in imgsList" :key='y'>
......@@ -141,14 +143,14 @@
添加图片
</div>
</div>
<div>封面预览</div>
<!-- <div>封面预览</div>
<div style="margin-top: 20px;display: flex;align-items: flex-start;">
<div style="width:210px;height:90px">
<el-image style="width: 100%; height: 100%" :src="coverimg" fit="cover"></el-image>
</div>
<q-btn color="accent" class="q-mr-md" label="上传封面图" @click="getChoice(0),iscover=true" size="sm"
style="margin-left: 30px;" />
</div>
</div> -->
</div>
<!-- 不是管理端 -->
......@@ -165,7 +167,7 @@
<div style="display: flex;align-items: flex-end;">
<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;" />
<span style="font-size: 11px;color: red;">*注:在图文消息页面点击“阅读原文”后的页面</span>
<span v-if="addMsg.Type==1" style="font-size: 11px;color: red;">*注:在图文消息页面点击“阅读原文”后的页面</span>
</div>
<div style="display: flex;align-items: center;margin: 10px 0 ;" v-if="addMsg.Type==1">
......@@ -653,13 +655,18 @@
_newArr.forEach(x=>{
if(x.num==2){
let a = new RegExp(`<mp-miniprogram ${x.name}[^>]*>(.|\n)*<\/mp-miniprogram><span ${x.name}></span>`,'g')
this.addMsg.SendContent = this.addMsg.SendContent.replace(a,'')
// this.$refs.UE_cb.getagain(this.addMsg.Content)
this.addMsg.SendContent = this.addMsg.SendContent.replace(a,'')
}
// 清楚sengConent 里面不用的iframe
let b = new RegExp(`<iframe[^>]*>(.|\n)*<\/iframe><span ${x.name}></span>`,'g')
this.addMsg.SendContent = this.addMsg.SendContent.replace(b,'')
})
// 清楚sengConent 里面不用的iframe
// this.addMsg.SendContent = this.addMsg.SendContent.replace(/<iframe[^>]*>(.|\n)*<\/iframe>/gi,'')
console.log(this.addMsg.SendContent)
}
}
},
......
src/pages/teacher/contribution/contributeManage.vue
View file @ dba268ab
......@@ -36,8 +36,18 @@
style="width: 200px;height: 80px;display: flex;align-items: center;justify-content: center;background: #f6f7f8;">
<img src="../../../assets/images/Noticen.png" alt="" style="width: 41px;height: 39px;">
</div>
<div style="width: 200px;min-height: 80px;padding: 5px;background: #f6f7f8;display: inline-block;white-space:pre-wrap"
v-if="props.row.Type==2" v-html="props.row.Description"></div>
<!-- <div style="width: 200px;min-height: 80px;padding: 5px;background: #f6f7f8;display: inline-block;white-space:pre-wrap"
v-if="props.row.Type==2" v-html="props.row.Description"></div> -->
</q-td>
</template>
<template v-slot:body-cell-Title="props">
<q-td :props="props">
<span>{{props.row.Title}}</span>
<div style="width: 200px;overflow: hidden ;
display: -webkit-box ;
-webkit-line-clamp: 2 ;
-webkit-box-orient: vertical ;
word-break: break-all ;" v-if="props.row.Type==2" v-html="props.row.Description"></div>
</q-td>
</template>
<template v-slot:body-cell-optioned="props">
......
src/pages/teacher/contribution/imageTextlist.vue
View file @ dba268ab
......@@ -42,7 +42,17 @@
<div v-if="props.row.Type==4" style="width: 200px;height: 80px;display: flex;align-items: center;justify-content: center;background: #f6f7f8;">
<img src="../../../assets/images/Noticen.png" alt="" style="width: 41px;height: 39px;">
</div>
<div style="width: 200px;min-height: 80px;padding: 5px;background: #f6f7f8;display: inline-block;white-space:pre-wrap" v-if="props.row.Type==2" v-html="props.row.Description"></div>
<!-- <div style="width: 200px;min-height: 80px;padding: 5px;background: #f6f7f8;display: inline-block;white-space:pre-wrap" v-if="props.row.Type==2" v-html="props.row.Description"></div> -->
</q-td>
</template>
<template v-slot:body-cell-Title="props">
<q-td :props="props">
<span>{{props.row.Title}}</span>
<div style="width: 200px;overflow: hidden ;
display: -webkit-box ;
-webkit-line-clamp: 2 ;
-webkit-box-orient: vertical ;
word-break: break-all ;" v-if="props.row.Type==2" v-html="props.row.Description"></div>
</q-td>
</template>
<template v-slot:body-cell-optioned="props">
......@@ -269,12 +279,11 @@
type: type
});
},
goliucheng(){//查看流程
this.$router.push({
path: '/teacher/change-class-manager',
query: {
ReceiptType: 10
}
goliucheng(item){//查看流程
this.OpenNewUrl("/teacher/change-class-manager", {
ReceiptType: 10,
RelationId:item.Id
});
},
......
src/pages/teacher/contribution/ue/contributionUE.vue
View file @ dba268ab
......@@ -174,7 +174,7 @@
' style="background-color:transparent;border-radius: 3px;overflow: hidden;z-index: 0;" scrolling="no" ' +
' src="http://localhost:8181/#/teacher/contribution/graphicType?Name=' + data.appletmsg.Name + '&Image=' +
data.appletmsg.Image + '&title=' + data.title + '&imgUrl=' + data.imgUrl +
'" class="ans-insertaudio-module" module="_insertaudio">' + ' </iframe></p>';
'" class="ans-insertaudio-module" module="_insertaudio">' + ' </iframe><span data-time=' + dataTime + '></span></p>';
}
......
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