1

src/pages/activity/advmanager.vue

@@ -119,7 +119,7 @@ export default {
                       if(type==0){
                             this.addatas=res.Data.PageData
                         }else{
-                            this.addatas=this.addatas.concat(res.Ddata.PageData)
+                            this.addatas=this.addatas.concat(res.Data.PageData)
                         }
                         this.total=res.Data.Count
                       }

src/pages/activity/makeAd.vue

@@ -611,18 +611,6 @@
       },
       save(imgUrl) {
         this.isLoading = true;
-        // let msg = {
-        //   ID: this.dataId,
-        //   BaseAdvertisingID: this.templateId,
-        //   content: JSON.stringify(this.nodes),
-        //   AdvertisingPicUrl: '',
-        //   SecretKey: '',
-        //   fileName: '',
-        //   fileSize: '',
-        //   TCID: 0,
-        //   IsAssociated: 0,
-        // }
-       
          let msg = {
           ID: this.dataId,
           AdvertisingPicUrl: '',
@@ -630,49 +618,21 @@
           Content:JSON.stringify(this.nodes),
           SecretKey:""
         }
-
         let that = this
-
         let blob = that.base64ToBlob(imgUrl)
-        // let newArr = [];
-        // newArr.push(blob);
-        // var fileName = `${that.uuid(10,10)}.png`
-        // // var path = `/Adv/user/${that.user.EmployeeId}/${fileName}`;
-        // var path = `/Adv/user/template/${fileName}`;
          UploadViittoBlobFile ("Edu",blob,(res)=>{
              this.isLoading = false;
                 console.log(671,res);
                 if(res.Code===1){
-                  
                  msg.AdvertisingPicUrl = res.FileUrl
                 new browserMD5File(blob, function (err, md5) {
                   msg.SecretKey = md5;
                       saveMakeAd(msg).then(res=>{
                         console.log(651,res)
                     })
-
-
-
-
-            // msg.fileName = fileName;
-            // msg.fileSize = blob.size;
-            // that.apipost("Advertising_post_Set", msg, x => {
-            //   that.isLoading = false;
-            //   that.outerVisible = false;
-            //   if (x.data.resultCode == 1) {
-            //     that.$message.success('保存成功!')
-            //     if (msg.ID == 0) {
-            //       that.dataId = x.data.data.result
-            //     }
-            //   } else
-            //     that.$message.success(x.data.message)
-            // }, err => {})
-            
                 })
              }
-              
-          
-         },'ad')
+         })
        
        
       
@@ -742,7 +702,6 @@
             }
              getAdvertisingList(this.adMsg).then(res=>{
                  if(res.Code===1){
-                      console.log(397,res)
                        res.Data.PageData.forEach(x=>{
                           x.src=`${x.SamplePicturesUrl}?x-oss-process=image/resize,w_200`
                           x.id=x.ID
@@ -750,7 +709,7 @@
                       if(type==0){
                             this.addatas=res.Data.PageData
                         }else{
-                            this.addatas=this.addatas.concat(res.Ddata.PageData)
+                            this.addatas=this.addatas.concat(res.Data.PageData)
                         }
                         this.total=res.Data.Count
                          if (res.Data.PageData.length == 0) {

src/pages/activity/myadvert.vue

@@ -91,12 +91,10 @@ export default {
                 if(type==0){
                             this.addatas=res.Data.PageData
                 }else{
-                            this.addatas=this.addatas.concat(res.Ddata.PageData)
+                            this.addatas=this.addatas.concat(res.Data.PageData)
                 }
                 this.total=res.Data.pageCount
                 }
-                console.log(98,res)
-                 
             })
         },
     }