Merge remote-tracking branch 'origin/send_coupon' into send_coupon

zxl

2 天以前 ef70f387ae504f20e15aa7d7a933800b768892fc

 manager/src/views/video/VideoList.vue

@@ -462,7 +462,7 @@
            <Col>
              <FormItem :label-width="70" label="开始时间：" prop="startTime">
                <DatePicker
                  :v-model="commentForm.startTime"
                  v-model="commentForm.startTime"
                  type="datetime"
                  placeholder="选择开始时间"
                  style="width: 120px"
@@ -474,7 +474,7 @@
            <Col>
              <FormItem :label-width="70" label="结束时间：" prop="endTime">
                <DatePicker
                  :v-model="commentForm.endTime"
                  v-model="commentForm.endTime"
                  type="datetime"
                  placeholder="选择结束时间"
                  style="width: 120px"
@@ -487,8 +487,7 @@
        </Form>

      <div slot="footer">
        <Button type="text" @click="closeVideoDown">关闭</Button>
        <Button type="primary" @click="videoDown">确认</Button>
        <Button type="text" @click="closeComment">关闭</Button>
      </div>
          <Table
            :loading="commentLoading"
@@ -517,9 +516,7 @@
            show-sizer
          ></Page>
        </Row>
        <div slot="footer">

        </div>
      </Modal>

      <Modal
@@ -573,6 +570,7 @@
  removeById
} from "@/api/video";
import {getVideoTagList, recommend, videoGoodsEsPage} from "@/api/videoTag";
import {addPrizeNum} from "@/api/activity-prize";
import {getFilePreview, getSts} from "@/api/file";
import Editor from '@/components/editor/index.vue'
import GoodsExpandRow from '@/views/video/GoodsExpandRow'
@@ -879,6 +877,9 @@
    this.getTags('')
  },
  methods: {
    closeComment(){
      this.showVideoComment = false
    },
    commentChangePage(page) {
      this.commentForm.pageNumber = page
      this.commentPage()
@@ -891,8 +892,14 @@
      this.commentPage()
    },
    commentPage(){
      //转换为字符串
      let startTime = this.formatDate(this.commentForm.startTime);
      let endTime = this.formatDate(this.commentForm.endTime);
      let from = {...this.commentForm};
      from.startTime = startTime;
      from.endTime = endTime;
      this.commentLoading = true;
      getCommentPage(this.commentForm).then(res =>{
      getCommentPage(from).then(res =>{
        this.commentLoading = false;
        if (res.code === 200){
          this.commentData = res.data;
@@ -938,6 +945,7 @@
      // this.selectCount = selection.length
    },
    openComment(row){
      this.$refs.commentForm.resetFields();
      console.log(row)
      this.commentForm.videoId = row.id;
      this.showVideoComment = true;
@@ -1399,10 +1407,20 @@
      console.log(this.auditingForm, "sb")
      this.$refs.auditingForm.validate((valid) => {
        if (valid) {
          let currentVideoId = this.auditingForm.id
          auditingVideo(this.auditingForm).then(res => {
            this.$Message.success("审核完成")
            this.closeAuditing()
            this.getDataList()
            let param = {
              addType:"USER_PUBLISH_EXAMINE",
              userId:this.detail.authorId,
              extend:""
            }
            param.extend = JSON.stringify({
              videoId:currentVideoId
            })
            addPrizeNum(param)
          })
        }
      })