Commit 8f42f0fd authored by 黄奎's avatar 黄奎

页面修改

parent 74fc3448
...@@ -712,7 +712,6 @@ ...@@ -712,7 +712,6 @@
} }
}, },
created() { created() {
console.log(this.saveObj)
if (this.saveObj.tab) { if (this.saveObj.tab) {
this.tab = (this.saveObj.tab).toString(); this.tab = (this.saveObj.tab).toString();
} }
......
...@@ -1737,7 +1737,6 @@ ...@@ -1737,7 +1737,6 @@
}) })
}, },
studyabroadorderconfirmation(item) { //留学订单确认 studyabroadorderconfirmation(item) { //留学订单确认
console.log(item)
let that = this let that = this
this.$q.dialog({ this.$q.dialog({
title: '提示信息', title: '提示信息',
......
...@@ -230,7 +230,6 @@ ...@@ -230,7 +230,6 @@
CustomerId: this.customerObj.CustomerId CustomerId: this.customerObj.CustomerId
} }
GetCustomer(msg).then(res => { GetCustomer(msg).then(res => {
console.log(res,'数据');
if (res.Code == 1) { if (res.Code == 1) {
let tempData = res.Data; let tempData = res.Data;
this.objOption.CustomerId = tempData.CustomerId; this.objOption.CustomerId = tempData.CustomerId;
......
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
this.getEmployeeList(); this.getEmployeeList();
}, },
mounted() { mounted() {
console.log("this.saveObj",this.saveObj)
if (this.saveObj && this.saveObj.Id > 0) { if (this.saveObj && this.saveObj.Id > 0) {
this.objOption.Id = this.saveObj.Id; this.objOption.Id = this.saveObj.Id;
this.objOption.CreateBy = this.saveObj.CreateBy; this.objOption.CreateBy = this.saveObj.CreateBy;
......
...@@ -142,7 +142,6 @@ export default { ...@@ -142,7 +142,6 @@ export default {
e.TeacherId = e.Teacher_Id; e.TeacherId = e.Teacher_Id;
delete e.Teacher_Id; delete e.Teacher_Id;
}); });
console.log(this.dataList);
setFeedBack(this.dataList) setFeedBack(this.dataList)
.then((res) => { .then((res) => {
this.saveLoading = false; this.saveLoading = false;
...@@ -161,7 +160,6 @@ export default { ...@@ -161,7 +160,6 @@ export default {
}); });
}, },
uploadFile(files, index) { uploadFile(files, index) {
console.log(files, index, this.dataList);
let type = let type =
files.type.indexOf("video") != -1 || files.type.indexOf("image") != -1; files.type.indexOf("video") != -1 || files.type.indexOf("image") != -1;
if (type) { if (type) {
......
...@@ -239,8 +239,7 @@ ...@@ -239,8 +239,7 @@
</div> </div>
<div style="display: flex;align-items: center;margin-left: 10px;"> <div style="display: flex;align-items: center;margin-left: 10px;">
<span>¥:</span> <span>¥:</span>
<span class="sjbox_l_t_x" style="width: 200px" <span class="sjbox_l_t_x" style="width: 200px" :class="[name==1?'':'color_bt']">{{GetDetail.Money}}</span>
:class="[name==1?'':'color_bt']">{{GetDetail.Money}}</span>
</div> </div>
</div> </div>
<div class="sjbox_l_t" style="margin-top: 30px;"> <div class="sjbox_l_t" style="margin-top: 30px;">
...@@ -249,7 +248,8 @@ ...@@ -249,7 +248,8 @@
</div> </div>
</div> </div>
<div style="display: flex;flex-direction: column;align-items: center;width: 20px;line-height: 17px;" v-if="name==1"> <div style="display: flex;flex-direction: column;align-items: center;width: 20px;line-height: 17px;"
v-if="name==1">
<div></div> <div></div>
<div></div> <div></div>
<div></div> <div></div>
...@@ -260,7 +260,8 @@ ...@@ -260,7 +260,8 @@
<div></div> <div></div>
<div></div> <div></div>
</div> </div>
<div style="display: flex;flex-direction: column;align-items: center;width: 20px;line-height: 17px;" v-if="name==2"> <div style="display: flex;flex-direction: column;align-items: center;width: 20px;line-height: 17px;"
v-if="name==2">
<div></div> <div></div>
<div></div> <div></div>
<div></div> <div></div>
...@@ -311,9 +312,22 @@ ...@@ -311,9 +312,22 @@
currentMoney: 0, currentMoney: 0,
benMoney: 0, benMoney: 0,
GetDetail: {}, GetDetail: {},
AuditSteps: [{ Id: 1, Name: '单位盖章' }, { Id: 2, Name: '出纳' }, { Id: 3, Name: '交款方式' }, { Id: 4, Name: '开票人' },], AuditSteps: [{
Id: 1,
Name: '单位盖章'
}, {
Id: 2,
Name: '出纳'
}, {
Id: 3,
Name: '交款方式'
}, {
Id: 4,
Name: '开票人'
}, ],
} }
}, created() { },
created() {
let date = new Date(), let date = new Date(),
y = date.getFullYear(), y = date.getFullYear(),
m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1, m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1,
...@@ -322,7 +336,8 @@ ...@@ -322,7 +336,8 @@
min = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(), min = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
s = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds(); s = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
this.printTime = y + '' + m + '' + d + ' ' + h + ':' + min + ':' + s; this.printTime = y + '' + m + '' + d + ' ' + h + ':' + min + ':' + s;
}, methods: { },
methods: {
sendMsg() { sendMsg() {
this.$emit('helloPP', '1') this.$emit('helloPP', '1')
}, },
...@@ -341,21 +356,22 @@ ...@@ -341,21 +356,22 @@
Financial_post_GetDetail(id) { //获取单据详情 Financial_post_GetDetail(id) { //获取单据详情
if (!id) return; if (!id) return;
this.loading = true; this.loading = true;
getReceiptInfoForFinanceId({ FinanceId: id }).then(res => { getReceiptInfoForFinanceId({
FinanceId: id
}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.loading = false; this.loading = false;
let data = res.Data; let data = res.Data;
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.Money) data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100) data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
this.GetDetail = data; this.GetDetail = data;
console.log(this.GetDetail)
this.$set(this.$data, "GetDetail", data); this.$set(this.$data, "GetDetail", data);
} }
}) })
}, },
}, mounted() { },
mounted() {
const myDate = new Date(); const myDate = new Date();
let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????) let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
let month = myDate.getMonth() + 1; //获取当前月份(0-11,0代表1月) let month = myDate.getMonth() + 1; //获取当前月份(0-11,0代表1月)
...@@ -365,7 +381,8 @@ ...@@ -365,7 +381,8 @@
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID); this.Financial_post_GetDetail(this.ID);
}, watch: { // 监听参数变化 },
watch: { // 监听参数变化
ID: { ID: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
......
...@@ -314,7 +314,6 @@ ...@@ -314,7 +314,6 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.imgcode.src=this.imgUrl; this.$refs.imgcode.src=this.imgUrl;
}) })
console.log(this.imgUrl)
tipLoadding.hide(); tipLoadding.hide();
} else { } else {
tipLoadding.hide(); tipLoadding.hide();
......
...@@ -71,9 +71,11 @@ ...@@ -71,9 +71,11 @@
<el-table-column prop="ContributeType" label="投稿类型"> </el-table-column> <el-table-column prop="ContributeType" label="投稿类型"> </el-table-column>
<el-table-column width='80' prop="ContributeId" label="投稿编码"> <el-table-column width='80' prop="ContributeId" label="投稿编码">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="cursor: pointer;text-decoration: underline;" @click="showXQ(scope.row.ContributeId)">{{scope.row.ContributeId}}</div> <div style="cursor: pointer;text-decoration: underline;" @click="showXQ(scope.row.ContributeId)">
{{scope.row.ContributeId}}</div>
</template> </template>
</el-table-column> <el-table-column width='250' prop="ContributeTitle" label="投稿标题"> </el-table-column> </el-table-column>
<el-table-column width='250' prop="ContributeTitle" label="投稿标题"> </el-table-column>
<el-table-column prop="CommissionMoney" label="提成金额"> </el-table-column> <el-table-column prop="CommissionMoney" label="提成金额"> </el-table-column>
<el-table-column width='90' prop="Periods" label="期数"> </el-table-column> <el-table-column width='90' prop="Periods" label="期数"> </el-table-column>
<el-table-column prop="Remark" width='160' label="备注"> </el-table-column> <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
...@@ -103,7 +105,9 @@ ...@@ -103,7 +105,9 @@
title: "用户提成明细" title: "用户提成明细"
}, },
props: {}, props: {},
components: {contributionXQ}, components: {
contributionXQ
},
data() { data() {
return { return {
loading: false, loading: false,
...@@ -111,7 +115,7 @@ ...@@ -111,7 +115,7 @@
msg: { msg: {
PeriodId: 0, PeriodId: 0,
TeacherId: 0, TeacherId: 0,
TeacherIds:'' TeacherIds: ''
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
...@@ -123,11 +127,11 @@ ...@@ -123,11 +127,11 @@
allClassList: [], allClassList: [],
TeacherList: [], TeacherList: [],
allTeacherList: [], allTeacherList: [],
ContributeId:0, ContributeId: 0,
isDetails:false, isDetails: false,
} }
}, },
created() { }, created() {},
mounted() { mounted() {
if (this.$route.query && this.$route.query.userId) { if (this.$route.query && this.$route.query.userId) {
...@@ -140,7 +144,6 @@ ...@@ -140,7 +144,6 @@
this.msg.TeacherIds = this.$route.query.TeacherIds this.msg.TeacherIds = this.$route.query.TeacherIds
} }
this.getList() this.getList()
// this.setClass()
this.GetTeacherList() this.GetTeacherList()
}, },
methods: { methods: {
...@@ -148,14 +151,12 @@ ...@@ -148,14 +151,12 @@
getList() { getList() {
if (this.msg) if (this.msg)
this.loading = true; this.loading = true;
getTeaConCommissionUserDetailList(this.msg).then(res => { getTeaConCommissionUserDetailList(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.loading = false; this.loading = false;
this.tableData = res.Data this.tableData = res.Data
if (this.tableData.length > 0) { if (this.tableData.length > 0) {
this.getAskfor() this.getAskfor()
} }
} }
}) })
...@@ -171,35 +172,31 @@ ...@@ -171,35 +172,31 @@
}; };
}) })
this.tableData.push(obj) this.tableData.push(obj)
}, },
accAdd(arg1, arg2) { //js 加法精确计算 accAdd(arg1, arg2) { //js 加法精确计算
var r1, r2, m; var r1, r2, m;
try { try {
r1 = arg1.toString().split(".")[1].length; r1 = arg1.toString().split(".")[1].length;
} catch (e) { } catch (e) {
r1 = 0; r1 = 0;
} }
try { try {
r2 = arg2.toString().split(".")[1].length; r2 = arg2.toString().split(".")[1].length;
} catch (e) { } catch (e) {
r2 = 0; r2 = 0;
} }
m = Math.pow(10, Math.max(r1, r2)); m = Math.pow(10, Math.max(r1, r2));
return (arg1 * m + arg2 * m) / m; return (arg1 * m + arg2 * m) / m;
}, },
//获取教师下拉 //获取教师下拉
GetTeacherList() { GetTeacherList() {
getTeacherDropDownList({}).then(res => { getTeacherDropDownList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
var jsonData = res.Data; var jsonData = res.Data;
jsonData.unshift({ TeacherName: '不限', TId: 0 }) jsonData.unshift({
// this.allTeacherList = JSON.parse(JSON.stringify(jsonData));; TeacherName: '不限',
TId: 0
})
this.TeacherList = JSON.parse(JSON.stringify(jsonData)); this.TeacherList = JSON.parse(JSON.stringify(jsonData));
} }
}) })
...@@ -222,7 +219,6 @@ ...@@ -222,7 +219,6 @@
}, },
//筛选老师 //筛选老师
filterFn(val, update) { filterFn(val, update) {
console.log(val)
update(() => { update(() => {
if (val === '') { if (val === '') {
this.TeacherList = JSON.parse(JSON.stringify(this.allTeacherList)) this.TeacherList = JSON.parse(JSON.stringify(this.allTeacherList))
...@@ -233,18 +229,13 @@ ...@@ -233,18 +229,13 @@
this.$forceUpdate(); this.$forceUpdate();
}) })
}, },
goreturn() { goreturn() {
this.$router.go(-1); this.$router.go(-1);
}, },
showXQ(ContributeId){//弹出显示详情 showXQ(ContributeId) { //弹出显示详情
this.ContributeId= ContributeId; this.ContributeId = ContributeId;
this.isDetails = true this.isDetails = true
} }
}, },
} }
</script> </script>
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
} }
.userCommissionDetails .border-bottom { .userCommissionDetails .border-bottom {
/* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
...@@ -83,8 +82,6 @@ ...@@ -83,8 +82,6 @@
<div v-if="scope.row.OrderId" style="cursor: pointer;text-decoration: underline;" @click="goUrlorderList('/sale/orderStatistics',scope.row)"> <div v-if="scope.row.OrderId" style="cursor: pointer;text-decoration: underline;" @click="goUrlorderList('/sale/orderStatistics',scope.row)">
{{scope.row.OrderId}} {{scope.row.OrderId}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CommissionMoney" label="订单提成"></el-table-column> <el-table-column prop="CommissionMoney" label="订单提成"></el-table-column>
...@@ -156,7 +153,6 @@ ...@@ -156,7 +153,6 @@
if (this.$route.query && this.$route.query.OrderId) { if (this.$route.query && this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId this.msg.OrderId = this.$route.query.OrderId
} }
console.log( this.msg.PeriodId)
this.getList() this.getList()
this.getStudyAbroad() this.getStudyAbroad()
}, },
...@@ -318,6 +314,5 @@ ...@@ -318,6 +314,5 @@
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style> </style>
\ No newline at end of file
...@@ -223,7 +223,6 @@ ...@@ -223,7 +223,6 @@
}, },
//选择图片 //选择图片
PageSelect(item) { PageSelect(item) {
console.log(item,'item');
if(this.type!=1){//单选 if(this.type!=1){//单选
this.emitmsg = []; this.emitmsg = [];
this.emitmsg.push(item) this.emitmsg.push(item)
......
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
<q-img v-else :src="imgPath" style="width: 110px;height: 110px;border-radius: 6px;display: flex;"> <q-img v-else :src="imgPath" style="width: 110px;height: 110px;border-radius: 6px;display: flex;">
</q-img> </q-img>
</el-upload> </el-upload>
<q-img v-else :src="imgPath" style="width: 110px;height: 110px;border-radius: 6px;display: flex;" v-if="ismodify"></q-img> <q-img v-else :src="imgPath" style="width: 110px;height: 110px;border-radius: 6px;display: flex;"
v-if="ismodify"></q-img>
<!-- <el-upload class="avatar-uploader materialupload" action="" :before-upload="uploadFile" <!-- <el-upload class="avatar-uploader materialupload" action="" :before-upload="uploadFile"
accept="image/gif,image/jpeg,image/png,image/jpg,image/bmp" :show-file-list="false"> accept="image/gif,image/jpeg,image/png,image/jpg,image/bmp" :show-file-list="false">
<i class="el-icon-plus avatar-uploader-icon" style="font-size: 30px;" v-if="addMsg.Path==''"></i> <i class="el-icon-plus avatar-uploader-icon" style="font-size: 30px;" v-if="addMsg.Path==''"></i>
...@@ -79,7 +80,8 @@ ...@@ -79,7 +80,8 @@
</span> </span>
</q-circular-progress> </q-circular-progress>
<div style="margin-top: 15px;"> <div style="margin-top: 15px;">
<el-upload class="avatar-uploader " action="" :before-upload="uploadFile" :show-file-list="false" v-if="ismodify==false"> <el-upload class="avatar-uploader " action="" :before-upload="uploadFile" :show-file-list="false"
v-if="ismodify==false">
<q-btn color="accent" size="sm" class="q-mr-md" icon="cloud_upload" label="上传" <q-btn color="accent" size="sm" class="q-mr-md" icon="cloud_upload" label="上传"
@click='stopPlayVoice()'> @click='stopPlayVoice()'>
</q-btn> </q-btn>
...@@ -114,11 +116,13 @@ ...@@ -114,11 +116,13 @@
v-model="addMsg.PlatformType" @input="$forceUpdate()" ref="Id" :options="platTypeList" label="平台类型" v-model="addMsg.PlatformType" @input="$forceUpdate()" ref="Id" :options="platTypeList" label="平台类型"
:dense="false" emit-value map-options /> --> :dense="false" emit-value map-options /> -->
<q-input clearable filled v-model="addMsg.MediaName" placeholder="请输入视频名称" class="q-mt-lg" maxlength="20" /> <q-input clearable filled v-model="addMsg.MediaName" placeholder="请输入视频名称" class="q-mt-lg" maxlength="20" />
<q-input clearable filled v-model="addMsg.Description" placeholder="请输入视频介绍" class="q-mt-lg" type="textarea" maxlength="300" counter/> <q-input clearable filled v-model="addMsg.Description" placeholder="请输入视频介绍" class="q-mt-lg" type="textarea"
maxlength="300" counter />
<div style="margin-top: 15px;"> <div style="margin-top: 15px;">
<div style="width:80px">视频封面图:</div> <div style="width:80px">视频封面图:</div>
<div style="margin-top: 15px;"> <div style="margin-top: 15px;">
<div style="width:100px;height:100px;border:1px solid #d1d1d1;text-align:center;line-height:100px;" @click="getImgChoice=true"> <div style="width:100px;height:100px;border:1px solid #d1d1d1;text-align:center;line-height:100px;"
@click="getImgChoice=true">
<i class="el-icon-plus avatar-uploader-icon" style="font-size: 30px;" <i class="el-icon-plus avatar-uploader-icon" style="font-size: 30px;"
v-if="addMsg.VideoWXImage==''"></i> v-if="addMsg.VideoWXImage==''"></i>
<q-img v-else :src="addMsg.VideoWXImage" style="width: 100%;height: 100%;"> <q-img v-else :src="addMsg.VideoWXImage" style="width: 100%;height: 100%;">
...@@ -142,7 +146,8 @@ ...@@ -142,7 +146,8 @@
<source :src="addMsg.Path" type="video/mp4" /> <source :src="addMsg.Path" type="video/mp4" />
</video> </video>
<div style="margin-top: 15px;"> <div style="margin-top: 15px;">
<el-upload class="avatar-uploader " action="" :before-upload="uploadFile" :show-file-list="false" v-if="ismodify==false"> <el-upload class="avatar-uploader " action="" :before-upload="uploadFile" :show-file-list="false"
v-if="ismodify==false">
<q-btn color="accent" size="sm" class="q-mr-md" icon="cloud_upload" label="上传"> <q-btn color="accent" size="sm" class="q-mr-md" icon="cloud_upload" label="上传">
</q-btn> </q-btn>
</el-upload> </el-upload>
...@@ -222,19 +227,19 @@ ...@@ -222,19 +227,19 @@
imgPath: '', imgPath: '',
importFileUrl2: '', importFileUrl2: '',
getImgChoice: false, getImgChoice: false,
ismodify:false,//是否修改 ismodify: false, //是否修改
} }
}, },
created() { created() {
if (this.editobj != null) { if (this.editobj != null) {
this.addMsg = JSON.parse(JSON.stringify(this.editobj)) this.addMsg = JSON.parse(JSON.stringify(this.editobj))
this.ismodify = true this.ismodify = true
if(this.type==1){ if (this.type == 1) {
this.imgPath = this.addMsg.ImageUrl; this.imgPath = this.addMsg.ImageUrl;
} }
} }
let address = process.env.API; let address = process.env.API;
this.importFileUrl2 = address+'/upload/UploadTemporaryFile' this.importFileUrl2 = address + '/upload/UploadTemporaryFile'
}, },
mounted() { mounted() {
this.getPlatForm(); this.getPlatForm();
...@@ -247,7 +252,6 @@ ...@@ -247,7 +252,6 @@
//获取已开放平台 //获取已开放平台
getPlatForm() { getPlatForm() {
GetContributePlatfrom({}).then(res => { GetContributePlatfrom({}).then(res => {
console.log(res, '数据');
if (res.Code == 1) { if (res.Code == 1) {
this.platTypeList = res.Data; this.platTypeList = res.Data;
} }
...@@ -262,7 +266,6 @@ ...@@ -262,7 +266,6 @@
message: res.Message, message: res.Message,
position: 'top' position: 'top'
}) })
//this.gettype()
this.$emit('editsuccess') this.$emit('editsuccess')
}) })
}, },
...@@ -273,7 +276,7 @@ ...@@ -273,7 +276,7 @@
if (file.Code == 1) { if (file.Code == 1) {
let address = process.env.API; let address = process.env.API;
let aOne = address.split('/api')[0]; let aOne = address.split('/api')[0];
this.imgPath =aOne + file.Data.HttpPath; this.imgPath = aOne + file.Data.HttpPath;
this.addMsg.Path = file.Data.Path; this.addMsg.Path = file.Data.Path;
this.addMsg.MediaName = file.Data.Name; this.addMsg.MediaName = file.Data.Name;
} }
...@@ -298,12 +301,7 @@ ...@@ -298,12 +301,7 @@
position: 'top' position: 'top'
}) })
} else { } else {
// UploadSelfFile('wechatcatalogue', files, res => {
//           console.log(res, '数据');
//           if (res.Code == 1) {
// this.addMsg.Path = res.FileUrl;
//           }
//         })
} }
} }
if (this.type == 2) { //音频上传 if (this.type == 2) { //音频上传
...@@ -313,14 +311,6 @@ ...@@ -313,14 +311,6 @@
const isLt2M = files.size / 1024 / 1024 < 2; const isLt2M = files.size / 1024 / 1024 < 2;
let Times = this.getTimes(files) let Times = this.getTimes(files)
const isTime60S = Times >= 60 ? true : false; const isTime60S = Times >= 60 ? true : false;
// 获取时长
// if (!isAudio) {
// this.$q.notify({
// type: 'negative',
// message: `上传文件只能是mp3、wma、wav、amr格式!`,
// position: 'top'
// })
// } else {
if (!isLt2M) { if (!isLt2M) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -350,9 +340,8 @@ ...@@ -350,9 +340,8 @@
} else { } else {
that.$forceUpdate(); that.$forceUpdate();
that.addMsg.Path = res.FileUrl; that.addMsg.Path = res.FileUrl;
that.addMsg.MediaName = res.FileName?res.FileName:''; that.addMsg.MediaName = res.FileName ? res.FileName : '';
that.addMsg.Minutes = parseInt(that.duration.toFixed()); that.addMsg.Minutes = parseInt(that.duration.toFixed());
console.log(that.addMsg.Minutes, 'Minutes');
} }
}).catch((e) => { }).catch((e) => {
...@@ -360,13 +349,11 @@ ...@@ -360,13 +349,11 @@
} }
}) })
} }
// }
} }
} }
if (this.type == 3) { //视频上传 if (this.type == 3) { //视频上传
// 文件类型进行判断 // 文件类型进行判断
const isLt10M = files.size / 1024 / 1024 < 10; const isLt10M = files.size / 1024 / 1024 < 10;
if (['video/mp4'].indexOf(files.type) == -1) { if (['video/mp4'].indexOf(files.type) == -1) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -387,18 +374,15 @@ ...@@ -387,18 +374,15 @@
isCreateCover: 1 isCreateCover: 1
} }
UploadSelfFile('wechatcatalogue', files, res => { UploadSelfFile('wechatcatalogue', files, res => {
console.log(res,'数据');
if (res.Code == 1) { if (res.Code == 1) {
let amr = new BenzAMRRecorder() let amr = new BenzAMRRecorder()
let that = this let that = this
amr.initWithUrl(res.FileUrl).then(function () { amr.initWithUrl(res.FileUrl).then(function () {
that.duration = amr.getDuration(); that.duration = amr.getDuration();
that.addMsg.Path = res.FileUrl; that.addMsg.Path = res.FileUrl;
that.addMsg.MediaName = res.FileName?res.FileName:''; that.addMsg.MediaName = res.FileName ? res.FileName : '';
that.addMsg.Minutes = parseInt(that.duration.toFixed()); that.addMsg.Minutes = parseInt(that.duration.toFixed());
}).catch((e) => { }).catch((e) => {})
})
} }
}) })
} }
...@@ -408,7 +392,6 @@ ...@@ -408,7 +392,6 @@
let audioDuration = 0 let audioDuration = 0
//获取录音时长 //获取录音时长
var url = URL.createObjectURL(content); var url = URL.createObjectURL(content);
console.log(url, '进入url');
//经测试,发现audio也可获取视频的时长 //经测试,发现audio也可获取视频的时长
var audioElement = new Audio(url); var audioElement = new Audio(url);
audioElement.addEventListener("loadedmetadata", function (_event) { audioElement.addEventListener("loadedmetadata", function (_event) {
...@@ -534,7 +517,6 @@ ...@@ -534,7 +517,6 @@
} }
} }
</script> </script>
<style> <style>
...@@ -641,5 +623,4 @@ ...@@ -641,5 +623,4 @@
.fullscreen { .fullscreen {
z-index: 999; z-index: 999;
} }
</style> </style>
\ No newline at end of file
...@@ -7,10 +7,11 @@ ...@@ -7,10 +7,11 @@
@click="goadd()"></q-btn> @click="goadd()"></q-btn>
<q-btn color="accent" style="float:right;" size="sm" class="q-mr-md" icon="delete" label="批量删除" <q-btn color="accent" style="float:right;" size="sm" class="q-mr-md" icon="delete" label="批量删除"
@click="pldelete()"></q-btn> @click="pldelete()"></q-btn>
<q-btn color="accent" style="float:right;" size="sm" class="q-mr-md" icon="edit" label="修改分组" <q-btn color="accent" style="float:right;" size="sm" class="q-mr-md" icon="edit" label="修改分组" @click="plmove()">
@click="plmove()"></q-btn> </q-btn>
</div> </div>
<div style="width: 100%;display: flex;align-items: center;flex-wrap: wrap;padding: 10px 20px;" v-if="dataList.length>0"> <div style="width: 100%;display: flex;align-items: center;flex-wrap: wrap;padding: 10px 20px;"
v-if="dataList.length>0">
<q-card class="imgcard" v-for="(x,y) in dataList" :key='y' <q-card class="imgcard" v-for="(x,y) in dataList" :key='y'
:style="{border:x.check==true?'2px solid #91d5ff':'2px solid #FFF'}" :style="{border:x.check==true?'2px solid #91d5ff':'2px solid #FFF'}"
@click="dataList[y].check = !dataList[y].check,$forceUpdate()"> @click="dataList[y].check = !dataList[y].check,$forceUpdate()">
...@@ -19,8 +20,7 @@ ...@@ -19,8 +20,7 @@
<div>{{x.UpdateTime}}</div> <div>{{x.UpdateTime}}</div>
<div> <div>
<i class="el-icon-edit-outline" style="font-size: 20px;color: #1890ff;" <i class="el-icon-edit-outline" style="font-size: 20px;color: #1890ff;" @click.stop="goedit(x)"></i>
@click.stop="goedit(x)"></i>
</div> </div>
</div> </div>
<video width="260" height="180" :src="x.Path" controls="controls" v-if="x.Path"> <video width="260" height="180" :src="x.Path" controls="controls" v-if="x.Path">
...@@ -29,8 +29,10 @@ ...@@ -29,8 +29,10 @@
<div class="onetext" style="margin-top: 5px;">{{x.MediaName}}</div> <div class="onetext" style="margin-top: 5px;">{{x.MediaName}}</div>
<div style="margin-top: 5px;display: flex;justify-content: space-between;align-items: center;"> <div style="margin-top: 5px;display: flex;justify-content: space-between;align-items: center;">
<span class="onetext" style="width: 50%;"><i class="iconfont icon-ico-64" style="font-size: 12px;color: #1890ff;margin-right: 3px;" ></i>{{x.MediaGroupName}}</span> <span class="onetext" style="width: 50%;"><i class="iconfont icon-ico-64"
<span class="onetext" style="width: 50%;text-align: right;" ><i class="iconfont icon-ren-" style="font-size: 14px;color: #1890ff;margin-right: 3px;" ></i>{{x.UpdateByName}}</span> style="font-size: 12px;color: #1890ff;margin-right: 3px;"></i>{{x.MediaGroupName}}</span>
<span class="onetext" style="width: 50%;text-align: right;"><i class="iconfont icon-ren-"
style="font-size: 14px;color: #1890ff;margin-right: 3px;"></i>{{x.UpdateByName}}</span>
</div> </div>
</q-card-section> </q-card-section>
</q-card> </q-card>
...@@ -40,7 +42,8 @@ ...@@ -40,7 +42,8 @@
</div> </div>
<div v-if="Isadd==true"> <div v-if="Isadd==true">
<alladdsc :allclassifyList="allclassifyList" type='3' @editsuccess="getchildren" :editobj='editobj' @getcancel='Isadd=false'></alladdsc> <alladdsc :allclassifyList="allclassifyList" type='3' @editsuccess="getchildren" :editobj='editobj'
@getcancel='Isadd=false'></alladdsc>
</div> </div>
...@@ -60,7 +63,7 @@ ...@@ -60,7 +63,7 @@
type: Array, type: Array,
default: [], default: [],
}, },
allclassifyList:{ allclassifyList: {
type: Array, type: Array,
default: [], default: [],
} }
...@@ -69,7 +72,7 @@ ...@@ -69,7 +72,7 @@
return { return {
loading: false, loading: false,
Isadd: false, Isadd: false,
editobj:null editobj: null
} }
}, },
created() { created() {
...@@ -78,27 +81,24 @@ ...@@ -78,27 +81,24 @@
methods: { methods: {
goadd() { goadd() {
this.Isadd = true; this.Isadd = true;
this.editobj=null this.editobj = null
}, },
goedit(row){ goedit(row) {
console.log(row,'row'); this.editobj = row
this.editobj= row
this.Isadd = true this.Isadd = true
}, },
getchildren() {
getchildren(){
this.$emit('editsuccess') this.$emit('editsuccess')
this.Isadd = false this.Isadd = false
}, },
pldelete(){ pldelete() {
this.$emit('getdelete') this.$emit('getdelete')
}, },
plmove(){ plmove() {
this.$emit('getmove') this.$emit('getmove')
} }
} }
} }
</script> </script>
<style> <style>
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
} }
}, },
created() { created() {
// console.log(this.$route.query)
if(this.$route.query){ if(this.$route.query){
this.Image = this.$route.query.Image; this.Image = this.$route.query.Image;
this.Name = this.$route.query.Name; this.Name = this.$route.query.Name;
......
...@@ -116,7 +116,8 @@ ...@@ -116,7 +116,8 @@
let html = ''; let html = '';
//s视频 //s视频
fileArray.forEach(item => { fileArray.forEach(item => {
html += "<iframe frameborder='0' width='100%' height='200px' src='https://v.qq.com/iframe/player.html?vid=v326875u4ek' allowfullscreen='true'></iframe>" html +=
"<iframe frameborder='0' width='100%' height='200px' src='https://v.qq.com/iframe/player.html?vid=v326875u4ek' allowfullscreen='true'></iframe>"
}) })
if (html && html != '') { if (html && html != '') {
...@@ -157,24 +158,29 @@ ...@@ -157,24 +158,29 @@
}, },
applet(data) { applet(data) {
let html = ''; let html = '';
if (data.type == 1) {//文字小程序 if (data.type == 1) { //文字小程序
html += `<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" href="">${data.title}</a></p>`; html +=
`<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" href="">${data.title}</a></p>`;
} else if (data.type == 2) {//图片小程序 } else if (data.type == 2) { //图片小程序
html += `<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" href=""><img src="${data.imgUrl}" alt="" data-width="null" ></a></p>` html +=
`<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" href=""><img src="${data.imgUrl}" alt="" data-width="null" ></a></p>`
} else if (data.type == 3) { } else if (data.type == 3) {
let dataTime = Date.parse(new Date()) let dataTime = Date.parse(new Date())
// 给公众号的写法 // 给公众号的写法
html += `<mp-miniprogram data-time="${dataTime}" data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" html +=
`<mp-miniprogram data-time="${dataTime}" data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}"
data-miniprogram-title="${data.title}" data-miniprogram-title="${data.title}"
data-miniprogram-imageurl="${data.imgUrl}" data-miniprogram-imageurl="${data.imgUrl}"
data-miniprogram-type="card" data-miniprogram-servicetype="0"></mp-miniprogram><span data-time="${dataTime}"></span>` data-miniprogram-type="card" data-miniprogram-servicetype="0"></mp-miniprogram><span data-time="${dataTime}"></span>`
//自己看的写法 //自己看的写法
html += '<p><iframe height="320" width="auto" data-time=' + dataTime + ' data-miniprogram-appid=' + data.appletmsg.AppID + ' frameborder="0" allowtransparency="true" ' + html += '<p><iframe height="320" width="auto" data-time=' + dataTime + ' data-miniprogram-appid=' + data
.appletmsg.AppID + ' frameborder="0" allowtransparency="true" ' +
' style="background-color:transparent;border-radius: 3px;overflow: hidden;z-index: 0;" scrolling="no" ' + ' style="background-color:transparent;border-radius: 3px;overflow: hidden;z-index: 0;" scrolling="no" ' +
' src="http://edu.oytour.com/#/teacher/contribution/graphicType?Name=' + data.appletmsg.Name + '&Image=' + ' src="http://edu.oytour.com/#/teacher/contribution/graphicType?Name=' + data.appletmsg.Name + '&Image=' +
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><span data-time=' + dataTime + '></span></p>'; '" class="ans-insertaudio-module" module="_insertaudio">' + ' </iframe><span data-time=' + dataTime +
'></span></p>';
} }
...@@ -254,7 +260,6 @@ ...@@ -254,7 +260,6 @@
}); });
this.ue.addListener('keyup', editor => { this.ue.addListener('keyup', editor => {
this.isInputChange = true; this.isInputChange = true;
// this.$emit('input', this.ue.getContent());
}); });
this.ue.addListener('contentChange', (editor, e) => { this.ue.addListener('contentChange', (editor, e) => {
this.isInputChange = true; this.isInputChange = true;
...@@ -268,7 +273,7 @@ ...@@ -268,7 +273,7 @@
this.$emit('focus'); this.$emit('focus');
}); });
this.ue.addListener('selectionchange', editor => { this.ue.addListener('selectionchange', editor => {
// console.log(this.ue.selection.getStart() )
}) })
this.ue.addListener('click', (editor, a) => { this.ue.addListener('click', (editor, a) => {
...@@ -276,7 +281,6 @@ ...@@ -276,7 +281,6 @@
} }
}, },
} }
</script> </script>
<style scoped> <style scoped>
......
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