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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/tabbar/video/video.vue

@@ -1,49 +1,73 @@
<template>
  <view class="publish-container">
   <u-popup v-model="fileTypeShow" mode="bottom"  round="20" height="35%">
      <view style="width: 100%;height:100%;display: flex;flex-direction: column;justify-content: center;align-items: center;">
         <view>请选择要发布的类型</view>
         <u-button style="width: 50%;margin-bottom: 30rpx;margin-top: 20rpx;" type="success" @click="chooseVideo">视频</u-button>
         <u-button style="width: 50%;" type="success" @click="chooseImgs">图片</u-button>
      </view>
   </u-popup>
    <!-- 视频上传区域 -->
    <view class="upload-section">
      <view class="upload-btn" @click="chooseVideo" v-if="!videoInfo.url">
      <view class="upload-btn" @click="this.fileTypeShow = true" v-if="!formData.videoFileKey && formData.videoImgs.length < 1">
        <u-icon name="plus" size="40" color="#999"></u-icon>
        <text class="upload-text">点击上传视频</text>
        <text class="upload-tips">支持MP4格式，最长60秒</text>
        <text class="upload-text">点击上传</text>
      </view>
      
      <view class="video-preview" v-else>
        <video 
          :src="videoInfo.url" 

      <view class="video-preview" v-else-if="formData.videoContentType === 'video'">
        <video
          :src="videoInfo.url"
          :object-fit="formData.videoFit"
          class="video-player"
          :poster="videoInfo.cover || ''"
        ></video>
      <view class="progress-box">
         <progress style="width: 100%;" :percent="videoUploadProgress" show-info stroke-width="6" :active="true" active-color="#ff573e" />
         <progress style="width: 100%;" :percent="videoUploadProgress" active-mode="forwards" show-info stroke-width="6" :active="true" active-color="#ff573e" />
      </view>
        <view class="video-actions">
          <u-button type="error" size="mini" @click="reUpload">重新上传</u-button>
          <u-button type="primary" size="mini" @click="chooseCover" v-if="videoInfo.url">选择封面</u-button>
          <u-button type="primary" size="mini" @click="chooseCover" v-if="formData.videoFileKey">{{formData.cover ? '更换封面' : '请选择封面'}}</u-button>
        </view>
      </view>

     <view class="image-list" v-else-if="formData.videoContentType === 'img'">
      <view
        v-for="item in videoPreviewImgs"
        :key="item"
        class="image-item"
        :style="{width: itemWidth + 'px', height: itemWidth + 'px'}"
      >
        <image
         :src="item"
         mode="aspectFill"
         class="image"
        />
      </view>
      <view class="video-actions">
        <u-button type="error" size="mini" @click="reUpload">重新上传</u-button>
      </view>
     </view>
    </view>
    

    <!-- 视频信息表单 -->
    <view class="form-section">
      <u-form :model="formData" ref="formRef" labelWidth="80">
        <!-- 标题输入 -->
        <u-form-item label="标题" prop="title" borderBottom>
          <u-input 
            v-model="formData.title" 
          <u-input
            v-model="formData.title"
            placeholder="请输入视频标题,20字以内"
            maxlength="20"
         show-word-limit
            clearable
          />
        </u-form-item>
        

        <!-- 话题输入 -->
        <u-form-item label="话题" prop="tags" borderBottom>
          <view class="tags-input-container">
            <u-input 
              v-model="tagInput" 
            <u-input
              v-model="tagInput"
              placeholder="输入话题，回车确认"
              clearable
              @confirm="addTag"
@@ -52,12 +76,12 @@
            ></u-input>
            <!-- 已选话题展示 -->
            <view class="tags-display" v-if="formData.tags.length > 0">
              <my-tag 
              <my-tag
                v-for="(tag, index) in formData.tags"
                :key="index"
                :text="tag.tagName"
            :index="index"
            type="error"
            type="success"
                @close="removeTag(index)"
              />
            </view>
@@ -69,59 +93,66 @@
        <view class="hot-topics" v-if="showTopicRecommendations">
          <text class="section-title">{{ tagInput ? '推荐话题' : '热门话题' }}</text>
          <view class="topic-list">
            <my-tag 
            <my-tag
              v-for="(tag, index) in recommendedTags"
              :key="index"
              :text="tag.tagName"
               :index="index"
              type="primary"
              type="success"
             :closeable="false"
              @click="selectTopic(index)"
            />
          </view>
        </view>
        </u-form-item>
		
        


        <!-- 商品链接 -->
        <u-form-item label="商品" prop="goodsId" borderBottom>
          <view class="goods-link-container">
            <u-input  
            <u-input
              placeholder="可选择推荐商品"
              clearable
              v-if="!selectedGoods"
              @click="chooseGoods"
              disabled
            >
              <u-icon 
                slot="right" 
                name="search" 
                size="24" 
              <u-icon
                slot="right"
                name="search"
                size="24"
                @click="chooseGoods"
              ></u-icon>
            </u-input>
            <view class="goods-preview" v-if="selectedGoods">
              <image :src="selectedGoods.image" class="goods-image"></image>
            <view class="goods-preview" @click="chooseGoods" v-for="goods in selectedGoodsList" :key="goods.id">
              <image :src="goods.thumbnail" class="goods-image"></image>
              <view class="goods-info">
                <text class="goods-name">{{ selectedGoods.name }}</text>
                <text class="goods-price">¥{{ selectedGoods.price }}</text>
                <text class="goods-name">{{ goods.goodsName }}</text>
            <view style="display: flex;">
               <view class="goods-price" style="flex: 1;">¥{{ goods.price }}</view>
               <view @click.stop="() => {}" style="flex: 1;display: flex;justify-content: center;align-items: center;">
                  <view style="width: 90rpx">数量：</view>
                  <uni-number-box v-model="goods.goodsNum" :min="0"/>
               </view>
            </view>
              </view>
              <u-icon 
                name="close" 
                size="20" 
                @click="clearGoods"
              <u-icon
            style="position: absolute;right: 8rpx;top: 8rpx"
                name="close"
                size="24"
                @click.stop="clearGoods(goods)"
              ></u-icon>
            </view>
          </view>
        </u-form-item>
      </u-form>
    </view>
    

    <!-- 发布按钮 -->
    <view class="publish-btn">
      <u-button 
        type="primary" 
        shape="circle" 
      <u-button
        type="success"
        shape="circle"
        :loading="loading"
        @click="handlePublish"
        :disabled="!canPublish"
@@ -129,7 +160,7 @@
        {{ loading ? '发布中...' : '立即发布' }}
      </u-button>
    </view>
    

    <!-- 商品选择弹窗 -->
    <u-popup v-model="showGoodsPicker" mode="bottom" round="20" height="70%">
      <view class="goods-picker">
@@ -138,56 +169,65 @@
          <u-icon name="close" size="24" @click="showGoodsPicker = false"></u-icon>
        </view>
        <view class="search-bar">
          <u-search 
            v-model="goodsSearch" 
            placeholder="搜索商品名称" 
          <u-search
            v-model="goodsQuery.keyword"
            placeholder="搜索商品"
            :showAction="false"
         @change="handlerGoodsSearch"
          ></u-search>
        </view>
        <scroll-view class="goods-list" scroll-y>
          <view 
            class="goods-item" 
            v-for="goods in filteredGoods" 
        <scroll-view class="goods-list" @scrolltolower="loadMoreGoods" scroll-y :show-scrollbar="false">
          <view
            class="goods-item"
            v-for="(goods, index) in goodsList"
            :key="goods.id"
            @click="selectGoods(goods)"
            @click="selectGoods(goods, index)"
          >
            <image :src="goods.image" class="goods-image"></image>
            <image :src="goods.thumbnail" class="goods-image"></image>
            <view class="goods-info">
              <text class="goods-name">{{ goods.name }}</text>
              <text class="goods-name">{{ goods.goodsName }}</text>
              <text class="goods-price">¥{{ goods.price }}</text>
<!--              <view>{{ goods.sellingPoint }}</view> -->
            </view>
            <u-icon 
              name="checkmark" 
              size="24" 
              :color="selectedGoods && selectedGoods.id === goods.id ? '#2979ff' : '#ccc'"
            <u-icon
           v-if="goods.selected"
              name="checkmark"
              size="36"
              :color="'#2979ff'"
            ></u-icon>
          </view>
        </scroll-view>
      </view>
    </u-popup>
    

    <custom-tabbar bgColor="#ffffff" selected="video"></custom-tabbar>
  </view>
</template>

<script>
import MyTag from "@/components/my-tag.vue"
import { getSTSToken } from "@/api/common.js";
import '@/components/uview-components/uview-ui';
import MyTag from '@/components/my-tag.vue'

import { getSTSToken, getFilePreviewUrl } from "@/api/common.js";
import { publish } from "@/api/video.js";
import { getRecommendTag3 } from "@/api/video-tag.js";
import { getFileKey } from "@/utils/file.js";
import { getVideoGoodsList } from "@/api/goods.js";

export default {
  components: {MyTag},
  data() {
    return {
     fileTypeShow: false,
     cosClient: null,
     bucket: '',
     region: '',
     endpoint: '',
     videoUploadProgress: 0,
      loading: false,
      showGoodsPicker: false,
      goodsSearch: '',
      tagInput: '',
     videoPreviewImgs: [], // 预览图片地址
      videoInfo: {
        url: '',
        fileKey: '',
@@ -196,55 +236,62 @@
        originalFileName: '',
        cover: ''
     },
     goodsQuery: {
      keyword: '',
      searchFromSelfStore: false, // 是否是查询自家店铺商品
      pageNumber: 1,
      pageSize: 5
     },
      formData: {
      id: '',
        title: '',
      cover: '',
      videoFileKey: '',
      videoDuration: 0,
      videoFit: 'cover',
        goodsId: '',
        videoContentType: 'video',
        videoImgs: [],
        tags: [],
      fileInfo: {}
      },
      selectedGoods: null,
      goodsList: [
        {
          id: '1',
          name: '新款无线蓝牙耳机',
          price: '199.00',
          image: 'https://via.placeholder.com/100'
        },
        {
          id: '2',
          name: '智能手环运动手表',
          price: '299.00',
          image: 'https://via.placeholder.com/100'
        }
      ],
      selectedGoodsList: [],
      goodsList: [],
     noMoreGoods: false, // 没有更多商品了
      recommendedTags: [],
      rules: {
        title: [
          { required: true, message: '请输入视频标题', trigger: 'blur' },
          { min: 1, max: 20, message: '标题长度在1到20个字符', trigger: 'blur' }
        ]
      }
      },
     screenWidth: 375,
     gap: 10 // 图片间距
    };
  },
  computed: {
    canPublish() {
      return this.formData.videoFileKey && this.formData.title;
    },
    filteredGoods() {
      if (!this.goodsSearch) return this.goodsList;
      return this.goodsList.filter(goods => 
        goods.name.toLowerCase().includes(this.goodsSearch.toLowerCase())
      );
      if(this.formData.videoContentType === 'video') {
         return this.formData.videoFileKey && this.formData.title && this.formData.cover;
      } else if(this.formData.videoContentType === 'img') {
         return this.formData.videoImgs.length > 0 && this.formData.title;
      }
    },
    showTopicRecommendations() {
      return (this.tagInput === '' || this.recommendedTags.length > 0) && this.formData.tags.length < 5;
    }
    },
   // 计算每个图片项的宽度（考虑间距）
   itemWidth() {
     return (this.screenWidth - (this.gap * 4) - 20) / 3
   }
  },
  created() {
    
  onLoad() {
    // 获取屏幕宽度
   const systemInfo = uni.getSystemInfoSync()
   this.screenWidth = systemInfo.windowWidth
   this.goodsQuery.pageNumber = 1
   this.goodsQuery.pageSize = 10
   this.getVideoGoodsByEs()
  },
  onShow() {
     this.initCOS()
@@ -252,8 +299,42 @@
   this.getRecommendTags()
  },
  methods: {
     // 加载更多商品
     loadMoreGoods() {
      if(this.noMoreGoods) {
         return
      }
      this.goodsQuery.pageNumber += 1;
      this.goodsQuery.pageSize = 5;
      this.getVideoGoodsByEs()
     },
     // 处理商品搜索值
     handlerGoodsSearch() {
        this.goodsQuery.pageNumber = 1
        this.goodsQuery.pageSize = 10
        this.getVideoGoodsByEs()
     },
     // 获取商品分页
     async getVideoGoodsByEs() {
      getVideoGoodsList(this.goodsQuery).then(res => {
			
         if(this.goodsQuery.pageNumber === 1) {
            this.goodsList = res.data.data
         } else {
            this.goodsList = [
              ...this.goodsList,
              ...res.data.data.filter(
                (newItem) => !this.goodsList.some((oldItem) => oldItem.id === newItem.id)
              ),
            ];
         }
         if(res.data.data.length < this.goodsQuery.pageSize) {
            this.noMoreGoods = true;
         }
      })
     },
     // 获取推荐标签
     getRecommendTags(type) {
     async getRecommendTags(type) {
        const params = {
           tagName: this.tagInput.trim(),
           searchType: type
@@ -264,13 +345,11 @@
     },
     // 初始化腾讯云cos客户端
     initCOS() {
        console.log("执行了");
        // 调用后端获取sts临时访问凭证
        getSTSToken().then(res => {
           console.log(res, "sts结构");
           const COS = require('@/lib/cos-wx-sdk-v5.js'); // 开发时使用
           // const COS = require('./lib/cos-wx-sdk-v5.min.js'); // 上线时使用压缩包
			  

           // console.log(COS.version);  sdk 版本需要不低于 1.7.2
           this.cosClient = new COS({
               SecretId: res.data.data.tmpSecretId, // sts 服务下发的临时 secretId
@@ -282,11 +361,17 @@
            });
            this.bucket = res.data.data.bucket
            this.region = res.data.data.region
            this.endpoint = res.data.data.endpoint
        })
		  

     },
    // 选择视频
    chooseVideo() {
     this.fileTypeShow = false;
     // 清空选择的图片
     this.videoPreviewImgs = [];
     this.formData.videoImgs = [];
     this.formData.videoContentType = 'video'
      uni.chooseVideo({
        sourceType: ['album', 'camera'],
        maxDuration: 60,
@@ -296,29 +381,30 @@
         // 获取文件名
         const tempPath = res.tempFilePath;
         let fileName = tempPath.substring(tempPath.lastIndexOf('/') + 1);
			

         // 处理安卓可能的URI编码
         if(fileName.indexOf('%') > -1) {
            fileName = decodeURIComponent(fileName);
         }
          const fileKey = getFileKey(fileName);
        this.videoInfo = {
         url: res.tempFilePath,
          fileKey: fileKey,
          fileType: fileKey.split('/')[0],
          fileSize: res.size,
          originalFileName: fileName,
          cover: ''
        };
        this.formData.videoFileKey = fileKey;
        // 判断视频的填充模式
        this.formData.videoFit = this.calculateVideoFit(res.width, res.height)
		  
        this.cosClient.uploadFile({
         const fileKey = getFileKey(fileName);
         this.videoInfo = {
          url: res.tempFilePath,
          fileKey: fileKey,
          fileType: fileKey.split('/')[0],
          fileSize: res.size,
          originalFileName: fileName,
          cover: ''
         };
         this.formData.videoFileKey = fileKey;
         this.formData.videoDuration = res.duration;
         // 判断视频的填充模式
         this.formData.videoFit = this.calculateVideoFit(res.width, res.height)

         this.cosClient.uploadFile({
              Bucket: this.bucket,
              Region: this.region,
              Key: fileKey,
              FilePath: res.tempFilePath, 
              FilePath: res.tempFilePath,
              SliceSize: 1024 * 1024 * 5,     /* 触发分块上传的阈值,5M */
              onProgress: (progressData) => {
               console.log(progressData.percent);
@@ -353,27 +439,75 @@
    calculateVideoFit(width, height) {
        const viewportRatio = uni.getSystemInfoSync().windowWidth / uni.getSystemInfoSync().windowHeight;
        const videoRatio = width / height;
        

        // 规则1：超宽视频（如电影21:9）
        if (videoRatio > 2) return 'contain';
        

        // 规则2：竖屏视频（如9:16）
        if (videoRatio < 0.8) return 'cover';
        

        // 规则3：接近屏幕比例的横屏视频
        return Math.abs(videoRatio - viewportRatio) > 0.3 ? 'contain' : 'cover';
    },
    // 重新上传
    reUpload() {
      this.videoInfo = {
        url: '',
        cover: '',
        duration: 0,
        size: 0
           url: '',
           fileKey: '',
           fileType: '',
           fileSize: 0,
           originalFileName: '',
           cover: ''
      };
      this.chooseVideo();
      this.formData.videoFileKey = ''
      this.formData.cover = ''
      this.formData.videoFit = 'cover'
      this.formData.videoDuration = 0
      this.formData.videoImgs = []
      this.formData.fileInfo = {}
      this.formData.videoContentType = 'video'
      this.videoPreviewImgs = []
     this.fileTypeShow = true
    },
    
    // 选择视频图集
    chooseImgs() {
     this.fileTypeShow = false
     // 清空选择的视频
     this.formData.videoFileKey = '';
     this.formData.cover = '';
     this.formData.videoContentType = 'img'
      uni.chooseImage({
        count: 9,
        sizeType: ['compressed'],
        sourceType: ['album'],
        success: (res) => {
        res.tempFilePaths.forEach(tmpImg => {
           let fileName = tmpImg.substring(tmpImg.lastIndexOf('/') + 1);
           // 处理安卓可能的URI编码
           if(fileName.indexOf('%') > -1) {
                        fileName = decodeURIComponent(fileName);
           }
           const fileKey = getFileKey(fileName);
           this.cosClient.uploadFile({
                Bucket: this.bucket,
                Region: this.region,
                Key: fileKey,
                FilePath: tmpImg,
                SliceSize: 1024 * 1024 * 5     /* 触发分块上传的阈值,5M */
            }, (err, data) => {
                if (err) {
                  console.log('上传失败', err);
                } else {
                  // 获取封面的访问地址
                this.videoPreviewImgs.push(this.endpoint + '/' + fileKey);
                this.formData.videoImgs.push(fileKey);
                }
            });
        })

        }
      });
    },
    // 选择封面
    chooseCover() {
      uni.chooseImage({
@@ -381,29 +515,65 @@
        sizeType: ['compressed'],
        sourceType: ['album'],
        success: (res) => {
        let fileName = res.tempFilePaths[0].substring(res.tempFilePaths[0].lastIndexOf('/') + 1);
        // 处理安卓可能的URI编码
        if(fileName.indexOf('%') > -1) {
            fileName = decodeURIComponent(fileName);
        }
        const fileKey = getFileKey(fileName);
          this.videoInfo.cover = res.tempFilePaths[0];
        this.cosClient.uploadFile({
             Bucket: this.bucket,
             Region: this.region,
             Key: fileKey,
             FilePath: res.tempFilePaths[0],
             SliceSize: 1024 * 1024 * 5     /* 触发分块上传的阈值,5M */
         }, (err, data) => {
             if (err) {
               console.log('上传失败', err);
             } else {
               this.videoInfo.cover = this.endpoint + '/' + fileKey
               this.formData.cover = fileKey
             }
         });
        }
      });
    },
    

    // 选择商品
    chooseGoods() {
     if(this.selectedGoodsList.length > 0) {
             const selectedGoodsIds = new Set(this.selectedGoodsList.map(i => i.goodsId));
                console.log(selectedGoodsIds, "mimade");
             this.goodsList?.forEach(goods => {
                 this.$set(goods, 'selected', selectedGoodsIds.has(goods.goodsId));
               });
     }
      this.showGoodsPicker = true;
    },
    

    // 选择具体商品
    selectGoods(goods) {
      this.selectedGoods = goods;
      this.formData.goodsId = goods.id;
      this.showGoodsPicker = false;
    selectGoods(goods, index) {
     if(! this.selectedGoodsList.some(item => item.id === goods.id)) {
      goods["goodsNum"] = 1
      this.selectedGoodsList.push(goods)
      this.goodsList[index].selected = true
     } else {
      this.goodsList[index].selected = false
      this.selectedGoodsList = this.selectedGoodsList.filter(item => item.id !== goods.id);
     }
    },
    

    // 清除商品
    clearGoods() {
      this.selectedGoods = null;
      this.formData.goodsId = '';
    clearGoods(goods) {
      this.selectedGoodsList = this.selectedGoodsList.filter(item => item.id !== goods.id);
     this.goodsList.forEach(item => {
        if(item.id === goods.id) {
           item.selected = false
        }
     })
    },
    

    // 搜索热门话题
    searchTags() {
      if (this.tagInput.trim() !== '') {
@@ -434,7 +604,7 @@
        });
      }
    },
    

    // 选择推荐话题
    selectTopic(index) {
     const tag = this.recommendedTags[index]
@@ -445,7 +615,7 @@
        });
        return;
      }
      

      if (this.formData.tags.filter(item => item.tagName === tag.tagName).length < 1) {
        this.formData.tags.push(tag);
        this.tagInput = '';
@@ -456,19 +626,19 @@
        });
      }
    },
    

    // 移除标签
    removeTag(index) {
      this.formData.tags.splice(index, 1);
    },
    

    // 处理发布
    handlePublish() {
      this.$refs.formRef.validate(valid => {
        if (valid && this.canPublish) {
          this.loading = true;
          this.formData.fileInfo = this.videoInfo;
        console.log(this.formData);
        this.formData["goodsList"] = this.selectedGoodsList.map(item => {return {goodsId: item.goodsId, goodsNum: item.goodsNum}});
          publish(this.formData).then(res => {
           uni.showToast({
             title: '视频已提交审核~',
@@ -476,27 +646,11 @@
           });
           this.loading = false
           // 重置表单
           this.videoInfo = {
                url: '',
                fileKey: '',
                fileType: '',
                fileSize: 0,
                originalFileName: '',
                cover: ''
           };
           this.formData = {
            id: '',
             title: '',
            videoFileKey: '',
            videoFit: 'cover',
             goodsId: '',
             tags: [],
             fileInfo: {}
           };
           this.resetData();
           this.selectedGoods = null;
           this.tagInput = '';
           this.recommendedTags = [];
			  

           // TODO 先跳首页,后面跳我的视频页面
           setTimeout(() => {
             uni.switchTab({
@@ -511,21 +665,46 @@
          });
        }
      });
    }
    },
   resetData() {
      // 重置表单
      this.videoInfo = {
           url: '',
           fileKey: '',
           fileType: '',
           fileSize: 0,
           originalFileName: '',
           cover: ''
      };
      this.formData = {
        id: '',
        title: '',
        videoFileKey: '',
        cover: '',
        videoFit: 'cover',
        videoDuration: 0,
        goodsId: '',
        videoContentType: 'video',
        videoImgs: [],
        tags: [],
        fileInfo: {}
      };
      this.videoPreviewImgs = []
      this.selectedGoodsList = []
   }
  }
};
</script>

<style scoped>
.publish-container {
  padding: 20rpx;
  padding: 10px;
  padding-bottom: 120rpx;
}

.upload-section {
  background-color: #f8f8f8;
  border-radius: 16rpx;
  padding: 40rpx;
  margin-bottom: 30rpx;
  display: flex;
  justify-content: center;
@@ -565,9 +744,11 @@
}

.video-actions {
  width: 100%;
  margin-top: 20rpx;
  display: flex;
  justify-content: center;
  align-items: center;
  gap: 20rpx;
}

@@ -588,6 +769,7 @@
  background-color: #f9f9f9;
  border-radius: 8rpx;
  margin-top: 15rpx;
  position: relative;
}

.goods-preview .goods-image {
@@ -659,10 +841,11 @@
}

.publish-btn {
  position: fixed;
  /* position: fixed;
  bottom: 100rpx;
  left: 20rpx;
  right: 20rpx;
  right: 20rpx; */
  margin-top: 40rpx;
}

.goods-picker {
@@ -733,4 +916,22 @@
    height: 25px;
    margin-top: 10px;
}
</style>

.image-list {
  display: flex;
  flex-wrap: wrap;
  justify-content: flex-start;
}

.image-item {
  margin: 5px;
  overflow: hidden;
  border-radius: 8px;
  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
}

.image {
  width: 100%;
  height: 100%;
}
</style>