Commit 1e384fd2 authored by 罗超's avatar 罗超

1

parent d250e19b
...@@ -141,7 +141,6 @@ export function UploadBolbFileToSystem(uploadConfig, fileFullPath, fileObj, uplo ...@@ -141,7 +141,6 @@ export function UploadBolbFileToSystem(uploadConfig, fileFullPath, fileObj, uplo
xhr.onload = function () { xhr.onload = function () {
uploadLoadding.hide(); uploadLoadding.hide();
var jsonObj = JSON.parse(xhr.responseText); var jsonObj = JSON.parse(xhr.responseText);
console.log(206, jsonObj, successCall)
if ((jsonObj.StatusCode === 1 || jsonObj.StatusCode === 0) && successCall) { if ((jsonObj.StatusCode === 1 || jsonObj.StatusCode === 0) && successCall) {
var tempArray = []; var tempArray = [];
if (jsonObj.OtherFile && jsonObj.OtherFile.length > 0) { if (jsonObj.OtherFile && jsonObj.OtherFile.length > 0) {
......
...@@ -61,14 +61,14 @@ ...@@ -61,14 +61,14 @@
<div class="row wrap q-mt-lg"> <div class="row wrap q-mt-lg">
<div class="col-12"> <div class="col-12">
<q-uploader :style="{ backgroundImage: 'url(' + addMsg.PictureUrl + ')' }" style="width:auto;height:500px;background-repeat:no-repeat;background-size:cover; border:1px solid #eee" flat <q-uploader :style="{ backgroundImage: 'url(' + addMsg.PictureUrl + ')' }" style="width:auto;height:500px;background-repeat:no-repeat;background-size:cover; border:1px solid #eee" flat
hide-upload-btn max-files="1" label="底图" accept=".jpg, image/*" :factory="uploadFile1" auto-upload> hide-upload-btn max-files="1" label="底图" accept=".jpg, image/*" :factory="uploadFile1" auto-upload no-thumbnails>
</q-uploader> </q-uploader>
</div> </div>
</div> </div>
<div class="row wrap q-mt-lg"> <div class="row wrap q-mt-lg">
<div class="col-12"> <div class="col-12">
<q-uploader :style="{ backgroundImage: 'url(' + addMsg.SamplePicturesUrl + ')' }" style="width:auto;height:500px;background-repeat:no-repeat;background-size:cover; border:1px solid #eee" flat <q-uploader :style="{ backgroundImage: 'url(' + addMsg.SamplePicturesUrl + ')' }" style="width:auto;height:500px;background-repeat:no-repeat;background-size:cover; border:1px solid #eee" flat
hide-upload-btn max-files="1" label="原图" accept=".jpg, image/*" :factory="uploadFile2" auto-upload> hide-upload-btn max-files="1" label="原图" accept=".jpg, image/*" :factory="uploadFile2" auto-upload no-thumbnails>
</q-uploader> </q-uploader>
</div> </div>
</div> </div>
...@@ -180,7 +180,6 @@ import { ...@@ -180,7 +180,6 @@ import {
}, },
//保存信息 //保存信息
saveRule() { saveRule() {
console.log(this.addMsg)
if(this.addMsg.PictureUrl==""){ if(this.addMsg.PictureUrl==""){
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
......
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
if(type==0){ if(type==0){
this.addatas=res.Data.PageData this.addatas=res.Data.PageData
}else{ }else{
this.addatas=this.addatas.concat(resDdata.PageData) this.addatas=this.addatas.concat(res.Ddata.PageData)
} }
this.total=res.Data.Count this.total=res.Data.Count
} }
......
...@@ -481,7 +481,6 @@ ...@@ -481,7 +481,6 @@
if(this.$route.query.id){ if(this.$route.query.id){
this.dataId = this.$route.query.id this.dataId = this.$route.query.id
} }
console.log(479,this.dataId)
// this.user = JSON.parse(window.localStorage.userInfo) // this.user = JSON.parse(window.localStorage.userInfo)
if (this.dataId != 0) { if (this.dataId != 0) {
this.bg = ' ' this.bg = ' '
...@@ -583,7 +582,6 @@ ...@@ -583,7 +582,6 @@
methods: { methods: {
loadObj() { loadObj() {
getMyAdDetail({ID:this.dataId}).then(res=>{ getMyAdDetail({ID:this.dataId}).then(res=>{
console.log('tag', res)
this.isLoading = false this.isLoading = false
if(res.Code===1){ if(res.Code===1){
let data = res.Data let data = res.Data
...@@ -650,7 +648,7 @@ ...@@ -650,7 +648,7 @@
new browserMD5File(blob, function (err, md5) { new browserMD5File(blob, function (err, md5) {
msg.SecretKey = md5; msg.SecretKey = md5;
saveMakeAd(msg).then(res=>{ saveMakeAd(msg).then(res=>{
console.log(res) console.log(651,res)
}) })
...@@ -752,7 +750,7 @@ ...@@ -752,7 +750,7 @@
if(type==0){ if(type==0){
this.addatas=res.Data.PageData this.addatas=res.Data.PageData
}else{ }else{
this.addatas=this.addatas.concat(resDdata.PageData) this.addatas=this.addatas.concat(res.Ddata.PageData)
} }
this.total=res.Data.Count this.total=res.Data.Count
if (res.Data.PageData.length == 0) { if (res.Data.PageData.length == 0) {
...@@ -803,11 +801,9 @@ ...@@ -803,11 +801,9 @@
getFileBase64(type) { getFileBase64(type) {
let that = this let that = this
var cntElem = this.$refs.board; var cntElem = this.$refs.board;
var shareContent = cntElem var shareContent = cntElem
var width = shareContent.offsetWidth var width = shareContent.offsetWidth
var height = shareContent.offsetHeight var height = shareContent.offsetHeight
console.log('canvas', width,height)
var canvas = document.createElement("canvas") var canvas = document.createElement("canvas")
// var scale = window.devicePixelRatio;//显示设备的物理像素分辨率与CSS像素分辨率之比 // var scale = window.devicePixelRatio;//显示设备的物理像素分辨率与CSS像素分辨率之比
var scale=1 var scale=1
...@@ -1202,7 +1198,7 @@ ...@@ -1202,7 +1198,7 @@
nodeId: this.currentMaxId, nodeId: this.currentMaxId,
type: 0, //0文本,1图片 type: 0, //0文本,1图片
width: (36 * 4) + 10, width: (36 * 4) + 10,
height: 36, height: 100,
lineHeight: '1', lineHeight: '1',
bg: null, bg: null,
color: '#000', color: '#000',
...@@ -1241,7 +1237,7 @@ ...@@ -1241,7 +1237,7 @@
nodeId: this.currentMaxId, nodeId: this.currentMaxId,
type: 0, //0文本,1图片 type: 0, //0文本,1图片
width: (16 * 4) + 10, width: (16 * 4) + 10,
height: 16, height: 50,
lineHeight: '1', lineHeight: '1',
bg: null, bg: null,
color: '#000', color: '#000',
......
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
if(type==0){ if(type==0){
this.addatas=res.Data.PageData this.addatas=res.Data.PageData
}else{ }else{
this.addatas=this.addatas.concat(resDdata.PageData) this.addatas=this.addatas.concat(res.Ddata.PageData)
} }
this.total=res.Data.pageCount this.total=res.Data.pageCount
} }
......
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