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

页面修改

parent 74fc3448
......@@ -712,7 +712,6 @@
}
},
created() {
console.log(this.saveObj)
if (this.saveObj.tab) {
this.tab = (this.saveObj.tab).toString();
}
......
......@@ -1737,7 +1737,6 @@
})
},
studyabroadorderconfirmation(item) { //留学订单确认
console.log(item)
let that = this
this.$q.dialog({
title: '提示信息',
......
......@@ -230,7 +230,6 @@
CustomerId: this.customerObj.CustomerId
}
GetCustomer(msg).then(res => {
console.log(res,'数据');
if (res.Code == 1) {
let tempData = res.Data;
this.objOption.CustomerId = tempData.CustomerId;
......
......@@ -64,7 +64,6 @@
this.getEmployeeList();
},
mounted() {
console.log("this.saveObj",this.saveObj)
if (this.saveObj && this.saveObj.Id > 0) {
this.objOption.Id = this.saveObj.Id;
this.objOption.CreateBy = this.saveObj.CreateBy;
......
......@@ -142,7 +142,6 @@ export default {
e.TeacherId = e.Teacher_Id;
delete e.Teacher_Id;
});
console.log(this.dataList);
setFeedBack(this.dataList)
.then((res) => {
this.saveLoading = false;
......@@ -161,7 +160,6 @@ export default {
});
},
uploadFile(files, index) {
console.log(files, index, this.dataList);
let type =
files.type.indexOf("video") != -1 || files.type.indexOf("image") != -1;
if (type) {
......
......@@ -314,7 +314,6 @@
this.$nextTick(() => {
this.$refs.imgcode.src=this.imgUrl;
})
console.log(this.imgUrl)
tipLoadding.hide();
} else {
tipLoadding.hide();
......
......@@ -6,7 +6,6 @@
}
.userCommissionDetails .border-bottom {
/* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px;
margin-bottom: 5px;
}
......@@ -83,8 +82,6 @@
<div v-if="scope.row.OrderId" style="cursor: pointer;text-decoration: underline;" @click="goUrlorderList('/sale/orderStatistics',scope.row)">
{{scope.row.OrderId}}
</div>
</template>
</el-table-column>
<el-table-column prop="CommissionMoney" label="订单提成"></el-table-column>
......@@ -156,7 +153,6 @@
if (this.$route.query && this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId
}
console.log( this.msg.PeriodId)
this.getList()
this.getStudyAbroad()
},
......@@ -318,6 +314,5 @@
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
......@@ -223,7 +223,6 @@
},
//选择图片
PageSelect(item) {
console.log(item,'item');
if(this.type!=1){//单选
this.emitmsg = [];
this.emitmsg.push(item)
......
......@@ -29,7 +29,8 @@
<q-img v-else :src="imgPath" style="width: 110px;height: 110px;border-radius: 6px;display: flex;">
</q-img>
</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"
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>
......@@ -79,7 +80,8 @@
</span>
</q-circular-progress>
<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="上传"
@click='stopPlayVoice()'>
</q-btn>
......@@ -114,11 +116,13 @@
v-model="addMsg.PlatformType" @input="$forceUpdate()" ref="Id" :options="platTypeList" label="平台类型"
: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.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="width:80px">视频封面图:</div>
<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;"
v-if="addMsg.VideoWXImage==''"></i>
<q-img v-else :src="addMsg.VideoWXImage" style="width: 100%;height: 100%;">
......@@ -142,7 +146,8 @@
<source :src="addMsg.Path" type="video/mp4" />
</video>
<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>
</el-upload>
......@@ -222,19 +227,19 @@
imgPath: '',
importFileUrl2: '',
getImgChoice: false,
ismodify:false,//是否修改
ismodify: false, //是否修改
}
},
created() {
if (this.editobj != null) {
this.addMsg = JSON.parse(JSON.stringify(this.editobj))
this.addMsg = JSON.parse(JSON.stringify(this.editobj))
this.ismodify = true
if(this.type==1){
if (this.type == 1) {
this.imgPath = this.addMsg.ImageUrl;
}
}
let address = process.env.API;
this.importFileUrl2 = address+'/upload/UploadTemporaryFile'
this.importFileUrl2 = address + '/upload/UploadTemporaryFile'
},
mounted() {
this.getPlatForm();
......@@ -247,7 +252,6 @@
//获取已开放平台
getPlatForm() {
GetContributePlatfrom({}).then(res => {
console.log(res, '数据');
if (res.Code == 1) {
this.platTypeList = res.Data;
}
......@@ -262,7 +266,6 @@
message: res.Message,
position: 'top'
})
//this.gettype()
this.$emit('editsuccess')
})
},
......@@ -273,7 +276,7 @@
if (file.Code == 1) {
let address = process.env.API;
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.MediaName = file.Data.Name;
}
......@@ -298,12 +301,7 @@
position: 'top'
})
} else {
// UploadSelfFile('wechatcatalogue', files, res => {
//           console.log(res, '数据');
//           if (res.Code == 1) {
// this.addMsg.Path = res.FileUrl;
//           }
//         })
}
}
if (this.type == 2) { //音频上传
......@@ -313,14 +311,6 @@
const isLt2M = files.size / 1024 / 1024 < 2;
let Times = this.getTimes(files)
const isTime60S = Times >= 60 ? true : false;
// 获取时长
// if (!isAudio) {
// this.$q.notify({
// type: 'negative',
// message: `上传文件只能是mp3、wma、wav、amr格式!`,
// position: 'top'
// })
// } else {
if (!isLt2M) {
this.$q.notify({
type: 'negative',
......@@ -350,9 +340,8 @@
} else {
that.$forceUpdate();
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());
console.log(that.addMsg.Minutes, 'Minutes');
}
}).catch((e) => {
......@@ -360,13 +349,11 @@
}
})
}
// }
}
}
if (this.type == 3) { //视频上传
// 文件类型进行判断
const isLt10M = files.size / 1024 / 1024 < 10;
if (['video/mp4'].indexOf(files.type) == -1) {
this.$q.notify({
type: 'negative',
......@@ -387,18 +374,15 @@
isCreateCover: 1
}
UploadSelfFile('wechatcatalogue', files, res => {
console.log(res,'数据');
if (res.Code == 1) {
let amr = new BenzAMRRecorder()
let that = this
amr.initWithUrl(res.FileUrl).then(function () {
that.duration = amr.getDuration();
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());
}).catch((e) => {
})
}).catch((e) => {})
}
})
}
......@@ -408,7 +392,6 @@
let audioDuration = 0
//获取录音时长
var url = URL.createObjectURL(content);
console.log(url, '进入url');
//经测试,发现audio也可获取视频的时长
var audioElement = new Audio(url);
audioElement.addEventListener("loadedmetadata", function (_event) {
......@@ -534,7 +517,6 @@
}
}
</script>
<style>
......@@ -641,5 +623,4 @@
.fullscreen {
z-index: 999;
}
</style>
</style>
\ No newline at end of file
......@@ -34,7 +34,6 @@
}
},
created() {
// console.log(this.$route.query)
if(this.$route.query){
this.Image = this.$route.query.Image;
this.Name = this.$route.query.Name;
......
......@@ -116,7 +116,8 @@
let html = '';
//s视频
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 != '') {
......@@ -157,24 +158,29 @@
},
applet(data) {
let html = '';
if (data.type == 1) {//文字小程序
html += `<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" href="">${data.title}</a></p>`;
if (data.type == 1) { //文字小程序
html +=
`<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" href="">${data.title}</a></p>`;
} 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>`
} 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>`
} else if (data.type == 3) {
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-imageurl="${data.imgUrl}"
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" ' +
' src="http://edu.oytour.com/#/teacher/contribution/graphicType?Name=' + data.appletmsg.Name + '&Image=' +
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 @@
});
this.ue.addListener('keyup', editor => {
this.isInputChange = true;
// this.$emit('input', this.ue.getContent());
});
this.ue.addListener('contentChange', (editor, e) => {
this.isInputChange = true;
......@@ -268,7 +273,7 @@
this.$emit('focus');
});
this.ue.addListener('selectionchange', editor => {
// console.log(this.ue.selection.getStart() )
})
this.ue.addListener('click', (editor, a) => {
......@@ -276,7 +281,6 @@
}
},
}
</script>
<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