1

package.json

@@ -31,6 +31,7 @@
     "vue-easytable": "^1.7.2",
     "vue-i18n": "^8.0.0",
     "vue-inline-svg": "^2.0.0",
+    "vue-waterfall-easy": "^2.4.4",
     "xlsx": "^0.16.8",
     "xlsx-style": "^0.8.13"
   },

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_006c4joct5c8d.css');
+@import url('//at.alicdn.com/t/font_2077629_g32rddqy4c.css');
 
 html,
 body,

src/api/AD/index.js

+import request from '../../utils/request'
+
+/**
+ * 获取广告图分页列表
+ * @param {JSON参数} data 
+ */
+export function getAdvertisingList(data) {
+    return request({
+        url: '/Advertising/GetAdvertisingList',
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * 新增/修改广告
+ * @param {JSON参数} data 
+ */
+export function SetAdvertising(data) {
+    return request({
+        url: '/Advertising/SetAdvertising',
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * 删除广告图
+ * @param {JSON参数} data 
+ */
+export function delAd(data) {
+    return request({
+        url: '/Advertising/DelAdvertising',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

src/assets/css/advert/advertfont.css

+@font-face{
+    font-family:'katongjian';
+    src:url('../../webfont/katongjian.ttf') format('truetype')
+}
+@font-face{
+    font-family:'YGYXSZITI';
+    src:url('../../webfont/YGYXSZITI2.0.ttf') format('truetype')
+}
+@font-face{
+    font-family:'FZYBXSJW';
+    src:url('../../webfont/FZYBXSJW.ttf') format('truetype')
+}
+
+@font-face{
+    font-family:'fzjzjt';
+    src:url('../../webfont/fzjzjt.ttf') format('truetype')
+}
+@font-face{
+    font-family:'fzmwt';
+    src:url('../../webfont/fzmwt.ttf') format('truetype')
+}
+@font-face{
+    font-family:'fztjlst';
+    src:url('../../webfont/fztjlst.ttf') format('truetype')
+}
+@font-face{
+    font-family:'hyhctj';
+    src:url('../../webfont/hyhctj.ttf') format('truetype')
+}
+@font-face{
+    font-family:'hyqytj';
+    src:url('../../webfont/hyqytj.ttf') format('truetype')
+}
+@font-face{
+    font-family:'hyyltj';
+    src:url('../../webfont/hyyltj.ttf') format('truetype')
+}
+
+@font-face{
+    font-family:'jlx';
+    src:url('../../webfont/jlx.ttf') format('truetype')
+}
+@font-face{
+    font-family:'sszhjt';
+    src:url('../../webfont/sszhjt.ttf') format('truetype')
+}
+
+@font-face{
+    font-family:'hybqt';
+    src:url('../../webfont/hybqt.ttf') format('truetype')
+}
+@font-face{
+    font-family:'hyhht';
+    src:url('../../webfont/hyhht.ttf') format('truetype')
+}
+@font-face{
+    font-family:'hylbt';
+    src:url('../../webfont/hylbt.ttf') format('truetype')
+}
+@font-face{
+    font-family:'hxlbjt';
+    src:url('../../webfont/hxlbjt.ttf') format('truetype')
+}
+@font-face{
+    font-family:'hywwzj';
+    src:url('../../webfont/hywwzj.ttf') format('truetype')
+}
+@font-face{
+    font-family:'pingfang';
+    src:url('../../webfont/pingfang.ttf') format('truetype')
+}
+.adv-box{
+    box-sizing: border-box;
+    position: absolute;
+    /* overflow-y: auto; */
+    padding-bottom: 15px;
+    top:0px;
+    left: 20px;
+    right: 0;
+    bottom: 0;
+    background: #f1f1f1;
+}
+.adv-box .board{
+    width: 470px;
+    position: absolute;
+    left: 0px;
+    z-index: 98;
+    top: 0px;
+    -webkit-user-select: none !important;
+    overflow: hidden;
+}
+
+.adv-box .board .bg{
+    width:470px;
+    z-index: 99;
+    -webkit-user-drag: none;
+}
+.adv-box .board .vdr .text{
+    width:100%;
+    height:100%;
+    cursor: move;
+    overflow: hidden;
+    white-space: pre-line;
+}
+.adv-box .board .vdr .img{
+    max-width:100%;
+    max-height:100%;
+    /* width:100%;
+    height:100%; */
+    cursor: move;
+    -webkit-user-drag:none;
+}
+.adv-box .board .vdr.active{
+    background:rgba(0,0,0,.3)
+}
+.adv-box .tools{
+    width: 32px;
+    position: absolute;
+    left: 480px;
+    top: 0px;
+}
+.adv-box .tools li{
+    height: 21px;
+    width: 32px;
+    text-align: center;
+    background: #e5e5e5;
+    cursor: pointer;
+    border-radius: 2px;
+    margin-bottom: 12px;
+    line-height: 21px;
+}
+.adv-box .tools li:hover{
+    background: #d8d8d8 !important
+}
+.adv-box .tools li.save{
+    color: #fff;
+    background: #4d90fe;
+}
+.adv-box .tools li.save:hover{
+    background: #0362fd !important;
+}
+.adv-box .tools li.down{
+    color: #fff;
+    background: #35aa47;
+}
+.adv-box .tools li.down:hover{
+    background: #1d943b !important;
+}
+.adv-box .tools li.return{
+    color: #fff;
+    background: #d84a38;
+}
+.adv-box .tools li.return:hover{
+    background: #bb2413 !important;
+}
+.adv-box .tools li.source{
+    color: #fff;
+    background: #fc5c65;
+}
+.adv-box .tools li.source:hover{
+    background: #fc5c65 !important;
+}
+.adv-box .tools li i{
+    font-size: 16px;
+    color: #333;
+}
+.adv-box .tools li.save,.adv-box .tools li.down,.adv-box .tools li.return,.adv-box .tools li.source {
+    color: #f0f0f0;
+    font-size: 12px;
+}
+.adv-box .property-box{
+    position: absolute;
+    left: 532px;
+    top: 0px;
+    width: 640px;
+    right: 10px;
+    overflow: hidden;
+}
+.adv-box .property-box label{
+    font-size: 12px;
+}
+.adv-box .property-box label.remark{
+    color: #999;
+}
+.adv-box .property-box .el-button{
+    padding:5px;
+}
+.adv-box .resorece{
+    position: absolute;
+    left: 532px;
+    top: 0px;
+    width: 120px;
+    height: 120px;
+}
+.adv-box .resorece img{
+
+}
+.adv-box .max-resource{
+    width: 470px;
+}
+.adv-box .el-textarea__inner{
+    width: 290px;
+}
+.adv-box .el-slider{
+    width: 290px;
+    padding-left: 9px;
+}
+.adv-box::-webkit-scrollbar{
+    width: 4px;
+    height: 8px;
+}
+.adv-box::-webkit-scrollbar-thumb {
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+    background: #c9c9c9;
+}
+.adv-box::-webkit-scrollbar-thumb {
+    -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+    border-radius: 4px;
+    background: #EDEDED;
+}
+.adv-box .el-input-group__append,.adv-box .el-input-group__prepend{
+    padding: 0 4px;
+    border-radius: 0px;
+}
+.adv-box .el-color-picker__trigger,.adv-box .el-color-picker__color{
+    border-radius: 0px;
+}
+.adv-box .el-color-picker__trigger {
+    height: 34px;
+    width: 34px;
+    margin-top: 4px;
+}
+.adv-box .advmanager-box .content {
+    top: 80px;
+    left: 0px;
+}
+.adv-box .goon{
+    position: fixed;
+    background: rgba(235, 59, 90, .8);
+    font-family: 'PingFangSC-fine';
+    font-size: 14px;
+    width: 50px;
+    height: 50px;
+    border-radius: 100%;
+    color: #f1f1f1;
+    right: 10px;
+    text-align: center;
+    line-height: 50px;
+    top:220px;
+    cursor: pointer;
+}
+.adv-box .el-input--mini .el-input__inner{
+    line-height: normal;
+}
+.adv-box .el-input-number{
+    vertical-align: top;
+}
\ No newline at end of file

src/assets/css/advert/advmanager.css

+ .advmanager-box{
+     
+ }
+ .advmanager-box .content{
+    position: absolute;
+    top:125px;
+    bottom: 0px;
+    left: 20px;
+    right: 20px;
+    overflow-y: auto;
+ }
+ .advmanager-box .content::-webkit-scrollbar, .vue-waterfall-easy-scroll::-webkit-scrollbar{
+    width: 4px;
+    height: 8px;
+}
+.advmanager-box .content::-webkit-scrollbar, .vue-waterfall-easy-scroll::-webkit-scrollbar-thumb {
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+    background: #c9c9c9;
+}
+.advmanager-box .content::-webkit-scrollbar, .vue-waterfall-easy-scroll::-webkit-scrollbar-thumb {
+    -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+    border-radius: 4px;
+    background: #EDEDED;
+}
+.advmanager-box .content ul{
+    display: flex;
+    margin: 0px;
+    padding: 0px;
+    margin: 5px 0;
+    width:100%;
+    flex-wrap: wrap;
+    margin-bottom: -20px;
+}
+.advmanager-box .content ul li{
+    flex: initial;
+    position: relative;
+    margin: 0 20px 20px 0;
+    width: 200px;
+    height: 290px;
+    margin-bottom: 20px;
+}
+.advmanager-box .content ul li:first-child{
+    margin-left: 0px;
+}
+.advmanager-box .content ul li .title{
+    border: 1px dashed #999;
+    display: block;
+    padding: 5px;
+    box-sizing: border-box;
+    line-height: 18px;
+    
+    font-size: 12px;
+    text-align: center;
+}
+.advmanager-box  .nowrap{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.advmanager-box .content ul li .title .h1{
+    margin-bottom: 5px;
+    font-size: 16px;
+    font-weight: 300;
+}
+.advmanager-box .content ul li .title .nowrap .line{
+    background: rgb(1, 130, 255);
+    padding: 2px 3px;
+    color: #f5f5f5;
+    border-radius: 4px;
+}
+.advmanager-box .content ul li .img-box{
+    width: 100%;
+    height: 290px;
+    position: relative;
+    background: #eee;
+    overflow: hidden;
+}
+.advmanager-box .content ul li .img-box img{
+    border-radius: 2px;
+}
+.advmanager-box .content .img-box .zezhao{
+    top: 10px;
+    right: 10px;
+    left: 10px;
+    bottom: 10px;
+    position: absolute;
+    border-radius: 2px;
+    display: none;
+    background: rgba(0, 0, 0, 0.4);
+    text-align: center;
+    z-index: 2;
+    line-height: 10;
+}
+.advmanager-box .content .img-box .zezhao i{
+    font-size: 28px;
+    color:#f1f1f1;
+    cursor: pointer;
+    margin-right: 10px;
+}
+.advmanager-box .content .img-box .zezhao i:last-child{
+    margin-right: 0px;
+}
+.advmanager-box .content .img-box:hover .zezhao{
+    display: block;
+}
+.advmanager-box .content .img-box .money{
+    top: 15px;
+    right: 15px;
+    position: absolute;
+    background: #eb3b5a;
+    color: #f5f5f5;
+    padding: 2px 3px;
+    border-radius: 4px;
+    font-size: 12px;
+}
+.advmanager-box .content .img-box .free{
+    top: 15px;
+    right: 15px;
+    position: absolute;
+    background: #20bf6b;
+    color: #f5f5f5;
+    padding: 2px 3px;
+    border-radius: 4px;
+    font-size: 12px;
+}
+.advmanager-box .query-box ul .el-input{
+    width: 150px;
+}
+.advmanager-box .content .img-box .star-box{
+    top: 15px;
+    left: 15px;
+    position: absolute;
+    background:rgba(0,0,0,.5);
+    color: #f5f5f5;
+    padding:0px 5px;
+    border-radius: 4px;
+    font-size: 12px;
+    display: inline-block;
+}
+.advmanager-box .content .img-box .star-box .star{
+    color: #eb3b5a
+}
+.advmanager-box .el-pagination{
+    position: absolute;
+    left: 20px;
+    bottom: 5px;
+    right: 20px;
+}
+.advmanager-box .showAddBox{
+    bottom: 240px;
+}
+.advmanager-box .add-box{
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+    height: 240px;
+    position: absolute;
+    z-index: 2;
+    border-top: 1px solid #D9d9d9;
+    background: #fff;
+    box-sizing: border-box;
+    padding: 0 20px;
+}
+.advmanager-box .upload-box{
+    height: 150px;
+    margin-top: 10px;
+    width: 440px;
+    display: flex;
+    flex: 1;
+}
+.advmanager-box .upload-box label{
+    height: 100%;
+    vertical-align: top;
+    font-size: 12px;
+    margin-right: 4px;
+    color: #666;
+}
+.advmanager-box .upload-box .upload-box-normal{
+    width:110px;
+    height: 100%;
+    line-height: 150px;
+    flex: 1;
+    vertical-align: top;
+    border:1px dashed #d9d9d9;
+    box-sizing: border-box;
+    text-align: center;
+    margin-right:30px;
+    cursor: pointer;
+}
+.advmanager-box .upload-box .upload-box-normal:hover{
+    border:1px dashed #c9c9c9;
+    
+}
+.advmanager-box .upload-box .upload-box-normal:hover i{
+    color: #c9c9c9;
+}
+.advmanager-box .upload-box .upload-box-normal i{
+    font-size: 48px;
+    color: #d9d9d9;
+}
+.advmanager-box .upload-box .upload-box-img{
+    width:110px;
+    height: 150px;
+    flex: 1;
+    vertical-align: top;
+    box-sizing: border-box;
+    margin-right:30px;
+    cursor: pointer;
+    position: relative;
+}
+.advmanager-box .upload-box .upload-box-img img{
+    width: 100%;
+    height: 100%;
+}
+.advmanager-box .upload-box .upload-box-img .zezhao{
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: rgba(0, 0, 0, 0.5);
+    line-height: 150px;
+    text-align: center;
+    display: none;
+    cursor: default;
+}
+.advmanager-box .upload-box .upload-box-img .zezhao i{
+    font-size: 28px;
+    color:#f1f1f1;
+    cursor: pointer;
+}
+.advmanager-box .upload-box .upload-box-img:hover .zezhao{
+    display: block;
+}
+.opera-btn-box{
+    bottom: 20px;
+    position: absolute;
+    right: 20px;
+}
+.advmanager-box .line-box{
+    position: absolute;
+    top:125px;
+    bottom: 38px;
+    left: 20px;
+    right: 20px;
+    overflow-y: auto;
+}
+.advmanager-box .line-box ul{
+    width: 100%;
+}
+.advmanager-box .line-box ul li{
+    height: 50px;
+    padding: 5px;
+    width: 100%;
+    margin: 5px 0;
+    box-sizing: border-box;
+    border:1px solid #eee;
+    display: flex;
+}
+.advmanager-box .line-box ul li:hover{
+    border:1px solid #e1e1e1;
+}
+.advmanager-box .line-box ul li .pic{
+    width: 20px;
+    height: 40px;
+    margin-right: 10px;
+    flex: inherit;
+    position: relative;
+}
+.advmanager-box .line-box ul li .pic img{
+    width: 100%;
+    height: 100%;
+}
+.advmanager-box .line-box ul li .pic .zezhao{
+    top: 0px;
+    right: 0px;
+    left: 0;
+    bottom: 0;
+    position: absolute;
+    display: none;
+    background: rgba(0, 0, 0, 0.4);
+    text-align: center;
+    z-index: 2;
+    line-height: 40px;
+}
+.advmanager-box .line-box ul li .pic .zezhao i{
+    font-size: 28px;
+    color:#f1f1f1;
+    cursor: pointer;
+}
+.advmanager-box .line-box ul li .pic:hover .zezhao{
+    display: block;
+}
+.advmanager-box .line-box ul li .item{
+    text-align: center;
+    line-height: 40px;
+    font-size: 12px;
+    color: #666;
+    flex:1;
+}
+.advmanager-box .el-input .el-input__inner,.advmanager-box .el-select .el-input{height: auto}
+.advmanager-box .query-box ul .el-select.w240 .el-input{width: auto;}
+.isAssociatTeam{width:600px;}
+.isAssociatTeam .el-switch{margin:20px 0 0 190px;}
\ No newline at end of file

src/components/activity/advmanager-form.vue

+<template>
+  <q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale" class="addactivetype">
+    <q-card style="width: 600px;max-width:800px;">
+      <q-card-section>
+        <div class="text-h6">{{(saveObj&&saveObj.ID>0)?"修改广告图":"新增广告图"}}</div>
+      </q-card-section>
+      <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
+         <div class="row wrap q-mb-lg">
+          <div class="col-12">
+            <q-input  clearable standout="bg-primary text-white" v-model="addMsg.Title" label="标题" stack-label
+             maxlength="20" />
+          </div>
+        </div>
+        <div class="row wrap q-mb-lg">
+          <div class="col-12">
+            <q-select standout="bg-primary text-white" v-model="addMsg.IsFee" :options="statusOpts" stack-label
+                        emit-value map-options label="类型" />
+          </div>
+        </div>
+        <div class="row wrap" v-show='addMsg.IsFee==1'>
+          <div class="col-12">
+            <q-input filled stack-label maxlength="20" :dense="false" v-model="addMsg.ChargeAmount" ref="ChargeAmount" stack-label
+              class="col-12 q-pb-lg" label="收费金额" :rules="[val => !!val || '请填写收费金额']" />
+          </div>
+        </div>
+        <!-- <div class="row wrap">
+          <div class="col-12">
+             <q-uploader :style="{ backgroundImage: 'url(' + addMsg.CoverImage + ')' }" 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="uploadFile" auto-upload>
+            </q-uploader>
+          </div>
+        </div> -->
+        <div class="row wrap">
+           <div class="q-mt-sm q-mb-sm">标签</div>
+          <div class="col-12 q-gutter-sm row">
+            <el-tag :key="index" v-for="(tag,index) in dynamicTags" closable :disable-transitions="false"
+              @close="handleClose(tag)">
+              {{tag}}
+            </el-tag>
+            <el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" ref="saveTagInput" size="small"
+              @keyup.enter.native="handleInputConfirm" @blur="handleInputConfirm">
+            </el-input>
+            <el-button v-else class="button-new-tag" size="small" @click="showInput">+ 标签</el-button>
+          </div>
+        </div>
+        <!-- <div class="row wrap">
+            <div class="q-mt-lg q-mb-sm">简介</div>
+          <div class="col-12">
+             <Ueditor
+                :value="ueditor.value"
+                :config="ueditor.config"
+                @input="setVal"
+                ref="ue"
+               no-margin
+               :isShowInsertImage="false"
+               :isShowAttachment="false"
+                :isShowVoice="false"
+            ></Ueditor>
+          </div>
+        </div> -->
+        <div class="row wrap q-mt-lg">
+          <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
+              hide-upload-btn max-files="1" label="底图" accept=".jpg, image/*" :factory="uploadFile1" auto-upload>
+            </q-uploader>
+          </div>
+        </div>
+        <div class="row wrap q-mt-lg">
+          <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
+              hide-upload-btn max-files="1" label="原图" accept=".jpg, image/*" :factory="uploadFile2" auto-upload>
+            </q-uploader>
+          </div>
+        </div>
+      </q-card-section>
+      <q-card-actions align="right" class="bg-white">
+        <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeRuleForm" />
+        <q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" @click="saveRule" />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+import {
+    UploadSelfFile
+  } from "../../api/common/common";
+  import Ueditor from "../editor/UeEditor";
+  import {SetAdvertising} from '../../api/AD/index.js'
+  export default {
+    props: {
+      saveObj: {
+        type: Object,
+        default: null
+      },
+    },
+    components: { Ueditor },
+    data() {
+      return {
+        addMsg: {
+              ID:0,
+              IsFee:2,
+              ChargeAmount:0,
+              PictureUrl:"",
+              SamplePicturesUrl:"",
+              Title:"",
+              LableList:[]
+        },
+        persistent: true,
+        //标签
+        dynamicTags: [], //标签数组
+        inputVisible: false,
+        inputValue: '',
+        //富文本
+    //     ueditor: {
+    //     value: "",
+    //     config: {
+    //       initialFrameWidth: null,
+    //       initialFrameHeight: 100,
+    //       autoHeightEnabled: true,
+    //       enableContextMenu: false
+    //     },
+        
+    //   },
+      statusOpts:[
+          {
+            label: "收费",
+            value: 0
+          },
+          {
+            label: "免费",
+            value: 2
+          }
+            ],
+      }
+    },
+    mounted() {  
+      if (this.saveObj&&this.saveObj.ID>0) {
+          this.addMsg.ID=this.saveObj.ID
+             this.addMsg.IsFee=this.saveObj.IsFee
+              this.addMsg.ChargeAmount=this.saveObj.ChargeAmount
+               this.addMsg.PictureUrl=this.saveObj.PictureUrl
+                this.addMsg.SamplePicturesUrl=this.saveObj.SamplePicturesUrl
+                 this.addMsg.Title=this.saveObj.Title
+                  this.addMsg.LableList=this.saveObj.LableList
+          if(this.saveObj.LableList){
+              this.dynamicTags=this.saveObj.LableList
+          }
+         
+      }else{
+          this.addMsg={
+              ID:0,
+              IsFee:2,
+              ChargeAmount:0,
+              PictureUrl:"",
+              SamplePicturesUrl:"",
+              Title:"",
+              LableList:[]
+          }
+      }
+         console.log(150, this.addMsg)
+    },
+    methods: {
+       uploadFile1(files) {
+        UploadSelfFile("course", files[0], res => {
+          if (res.Code == 1) {
+                  this.addMsg.PictureUrl = res.FileUrl;
+          }
+        });
+      },
+       uploadFile2(files) {
+        UploadSelfFile("course", files[0], res => {
+          if (res.Code == 1) {
+                  this.addMsg.SamplePicturesUrl = res.FileUrl;
+          }
+        });
+      },
+      //保存信息
+      saveRule() {
+          console.log(this.addMsg)
+          if(this.addMsg.PictureUrl==""){
+               this.$q.notify({
+                    type: 'negative',
+                    position: "top",
+                    message: `请上传底图`
+                })
+              return
+          }
+          if(this.addMsg.SamplePicturesUrl==""){
+              this.$q.notify({
+                    type: 'negative',
+                    position: "top",
+                    message: `请上传原图`
+                })
+              return
+          }
+        // this.$refs.Name.validate();
+        // if (!this.$refs.Name.hasError) {
+            // this.addMsg.LableList = this.dynamicTags;
+            // SetAdvertising(this.addMsg).then(res=>{
+            //     console.log('179',res)
+            // })
+        // }
+      },
+      //关闭窗口
+      closeRuleForm() {
+        this.$emit('close');
+        this.persistent = false
+      },
+    //   标签
+        handleInputConfirm() {
+        let inputValue = this.inputValue;
+        if (inputValue) {
+          this.dynamicTags.push(inputValue);
+        }
+        this.inputVisible = false;
+        this.inputValue = '';
+      },
+      showInput() {
+        this.inputVisible = true;
+        this.$nextTick(_ => {
+          this.$refs.saveTagInput.$refs.input.focus();
+        });
+      },
+      //删除标签
+      handleClose(tag) {
+        this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
+      },
+    },
+  }
+
+</script>
+<style  scoped>
+  .input-new-tag {
+    width: 90px;
+    margin-left: 10px;
+    vertical-align: bottom;
+    margin-right: 5px;
+  }
+
+ .el-tag {
+    margin-right: 5px;
+  }
+ .el-form-item__content {
+    line-height: 0;
+  }
+  .el-button{
+      line-height: 30px;
+      padding-top: 0;
+      padding-bottom: 0;
+      height: 32px;
+      margin-top: 8px;
+  }
+</style>
+

src/pages/activity/advmanager.vue

+<style>
+ @import "../../assets/css/advert/advmanager.css";
+</style>
+<template>
+    <div class="advmanager-box page-body">
+        <div class="page-search row items-center">
+            <div class="col row wrap q-mr-lg q-col-gutter-md">
+                <div class="col-3">
+                   <q-select @input="getaddatas(0)" standout="bg-primary text-white" v-model="adMsg.IsFee" :options="statusOpts"
+                        emit-value map-options label="类型" />
+                </div>
+            </div>
+            <q-btn label="新增" size="sm" color="accent q-px-md" style="font-weight:400 !important" @click="add" />
+        </div>
+        <div class="content"  >
+            <vueWaterfallEasy :imgsArr="addatas" @scrollReachBottom="handleCurrentChange" :maxCols='7' :imgWidth='208' :enablePullDownEvent='true'>
+                <template slot-scope="props">
+                    <span class="money" v-if="props.value.IsFee==1">￥{{props.value.ChargeAmount.toFixed(2)}}</span>
+                    <span class="free" v-else>{{$t('advmanager.v_free')}}</span>
+                    <div class="star-box">
+                        <i class="iconfont icon-star star"></i>&nbsp; {{props.value.AdvertisingCount}}
+                    </div>
+                    <div class="zezhao">
+                        <i class="el-icon-edit" :title="$t('pub.updateMsg')"  @click="update(props.value)"></i>
+                        <i class="el-icon-delete" :title="$t('system.table_delete')"  @click="delAD(props.value.ID)"  ></i>
+                    </div>
+                </template>
+            </vueWaterfallEasy>
+        </div>
+         <!-- 新增修改广告图 -->
+     <AdvmanagerForm v-if="showForm" @close="closeruleset" :save-obj="model" @success="getaddatas(0)">
+     </AdvmanagerForm>
+    </div>
+</template>
+
+<script>
+import vueWaterfallEasy from 'vue-waterfall-easy';
+import AdvmanagerForm from "../../components/activity/advmanager-form"
+import {getAdvertisingList,delAd} from '../../api/AD/index.js'
+export default {
+    data(){
+        return{
+            addatas:[],
+            model:{},
+            statusOpts:[
+                 {
+            label: "全部",
+            value: 0
+          },
+          {
+            label: "收费",
+            value: 1
+          },
+          {
+            label: "免费",
+            value: 2
+          }
+            ],
+            showForm:false,
+            adMsg:{
+                pageIndex:1,
+                pageSize:10,
+                IsFee:0
+            }
+        }
+    },
+    mounted(){
+        this.getaddatas(0)
+    },
+    components: {
+        vueWaterfallEasy,
+        AdvmanagerForm
+    },
+    methods:{
+        //关闭弹窗
+      closeruleset() {
+        this.showForm = false;
+      },
+    //    新增
+      add(){
+          this.showForm=true
+          this.model={
+              ID:0,
+              IsFee:2,
+              ChargeAmount:0,
+              PictureUrl:"",
+              SamplePicturesUrl:"",
+              Title:"",
+              LableList:[]
+          }
+      },
+        update(x){
+            this.showForm=true
+             this.model=x
+        },
+    
+        handleCurrentChange() {
+            this.adMsg.pageIndex++
+            this.getaddatas(1)
+        },
+        //获取广告图列表
+         getaddatas(type){
+             if(type===0){
+                this.adMsg.pageIndex=1
+            }
+             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
+                    })
+                      if(type==0){
+                            this.addatas=res.Data.PageData
+                        }else{
+                            this.addatas=this.addatas.concat(resDdata.PageData)
+                        }
+                        this.total=res.Data.Count
+                      }
+                 
+             })
+           
+        },
+        //删除广告图
+        delAD(id){
+            delAd({BAID:id}).then(res=>{
+                 if(res.Code===1){
+                      this.$message.success('删除成功')
+                      this.getaddatas(0)
+                }else{
+                    this.$message.error(res.message)
+                }
+            })
+        }
+       
+    }
+}
+</script>
+

src/pages/activity/materialMan.vue

@@ -529,7 +529,7 @@
 
         this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
           if (res.resultCode == 1) {
-           
+            this.Success('上传成功')
             if (this.addpageMsg.Type == 2) {
               this.addpageMsg.Image = res.FileUrl;
             }
@@ -544,7 +544,7 @@
         var that = this;
         UploadViittoFile('Edu/Video', file.file, res => {
           console.log("res",res);
-          if (res.resultCode == 1) {
+          if (res.Code == 1) {
              this.Success('上传成功')
             that.addpageMsg.Image = res.VideoCoverImg;
             that.addpageMsg.Path = res.FileUrl;

src/router/routes.js

@@ -680,6 +680,11 @@ const routes = [{
     component: () =>
       import("pages/activity/payment.vue")
   },
+  {
+    path: "/activity/advmanager", //活动 广告图管理
+    component: () =>
+      import("pages/activity/advmanager.vue")
+  },
   {
     path: "/sale/appointManagement", //销售 约课管理
     component: () =>