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

peng

2025-08-07 5b629d83de981e12855ec1e6f8b3d0d7ad261f14

 manager/src/views/video/VideoList.vue

@@ -402,6 +402,9 @@
          <Button type="primary" size="small" style="margin-right: 5px" v-if="row.status === '99'"
                  @click="openAuditing(row)">审核
          </Button>
<!--          <Button type="primary" size="small" style="margin-right: 5px"-->
<!--                  @click="editVideo(row)">编辑-->
<!--          </Button>-->
          <Button type="error" size="small" style="margin-right: 5px" v-if="row.status === '1'"
                  @click="openVideoDown(row)">下架
          </Button>
@@ -420,7 +423,7 @@
        :mask-closable="false"
      >
        <vue-qr
          text="https://myk.9village.cn/scanpage/recommend?shareType=videoRecommend&videoId=1948284811844190209"
          :text="QRCodeUrl"
          :margin="0"
          colorDark="#000"
          colorLight="#fff"
@@ -428,7 +431,7 @@
        ></vue-qr>
        <div slot="footer">
          <Button type="text" @click="closeGeneralQrCode">关闭</Button>
          <Button type="primary" @click="generalQrCode">确认</Button>
<!--          <Button type="primary" @click="generalQrCode">确认</Button>-->
        </div>
      </Modal>
      <Row type="flex" justify="end" class="mt_10">
@@ -499,6 +502,9 @@
  },
  data() {
    return {
      // https://myk.9village.cn/scanpage/recommend?shareType=videoRecommend&videoId=1948284811844190209
      baseQRCodeUrl: this.QRcodeBaseUrl+ '/scanpage/recommend',
      QRCodeUrl:'',
      showGeneralQrCode:false,
      endpoint: '',
      searchGoods: '',
@@ -701,9 +707,45 @@
    this.getTags('')
  },
  methods: {
    editVideo(row){
      // this.uploadVideoForm = {};
      // this.uploadVideoForm = row;
      // this.showUploadVideoShow = true;
      console.log('------------------->编辑',JSON.stringify(row));
      this.upLoadVideoShow = true;
      this.videoTagList = []
      this.chooseTag = row.tagList
      this.uploadVideoForm = {
        id: '',
        title: '',
        cover: "",
        videoFileKey: "",
        videoDuration: 0,
        videoFit: "cover",
        videoContentType: 'video',
        videoImgs: [],
        showListImages: [],
        tags: [],
        fileInfo: {},
        goodsList: []
      }
      this.uploadVideoForm = row
      recommend({
        searchType: "HOT"
      }).then(res => {
        this.videoTagList = res.data;
      })
      this.searchGoodsList();
    },
    closeGeneralQrCode(){
      this.showGeneralQrCode = false;
      this.QRCodeUrl = '';
    },
    generalQrCode(row){
      this.showGeneralQrCode = true
      console.log('-------------------->',row);
      this.QRCodeUrl = this.baseQRCodeUrl + '?shareType=videoRecommend' + '&videoId='+ row.id;
      console.log(this.QRCodeUrl)
    },
    //todo 保留后续可能会使用
    changeGoodsNum(id,index,goodsNum){