From 9d5a1efe45146614157f4b6caefd30ff7cccbb32 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 02 七月 2025 18:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/video/VideoList.vue | 11 +++++
buyer/src/config/index.js | 2
manager/src/api/video.js | 8 ++++
buyer/src/vuex/store.js | 2
manager/src/views/goods/goods-info/goodsDetail.vue | 2 +
manager/src/views/kitchen/kitchenVideo.vue | 24 ++++++++++--
manager/package.json | 4 +-
buyer/package.json | 2
manager/src/config/index.js | 2
seller/package.json | 4 +-
manager/src/views/health/HealthVideoList.vue | 13 ++++++
seller/src/config/index.js | 2
seller/src/views/goods/goods-seller/goodsOperationSec.vue | 2
13 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/buyer/package.json b/buyer/package.json
index b53d6d4..7ca366f 100644
--- a/buyer/package.json
+++ b/buyer/package.json
@@ -1,5 +1,5 @@
{
- "name": "lilishop",
+ "name": "lvmankuang",
"version": "1.0.0",
"private": true,
"scripts": {
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index 2886fc1..3091be5 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -1,7 +1,7 @@
const Cookie = require('js-cookie')
module.exports = {
- title:Cookie.get('siteName') || 'lilishop', //閰嶇疆鏄剧ず鍦ㄦ祻瑙堝櫒鏍囩鐨則itle銆佸簳閮ㄤ俊鎭�侀儴鍒嗕俊鎭睍绀虹殑鍊�
+ title:Cookie.get('siteName') || '缁挎弧绛�', //閰嶇疆鏄剧ず鍦ㄦ祻瑙堝櫒鏍囩鐨則itle銆佸簳閮ㄤ俊鎭�侀儴鍒嗕俊鎭睍绀虹殑鍊�
icpCard: "", // icp璇�
company: {
href: "https://pickmall.cn",
diff --git a/buyer/src/vuex/store.js b/buyer/src/vuex/store.js
index e1e374b..c3300b0 100644
--- a/buyer/src/vuex/store.js
+++ b/buyer/src/vuex/store.js
@@ -12,7 +12,7 @@
navList: [], // 棣栭〉蹇嵎瀵艰埅
cartNum: storage.getItem('cartNum') || 0,
logoImg: storage.getItem('logoImg') || require('@/assets/images/logo2.png'),
- siteName:storage.getItem('siteName')|| 'lilishop',
+ siteName:storage.getItem('siteName')|| '缁挎弧绛�',
hotWordsList: storage.getItem('hotWordsList'),
category: JSON.parse(localStorage.getItem('category'))
},
diff --git a/manager/package.json b/manager/package.json
index 2fc3c99..931785a 100644
--- a/manager/package.json
+++ b/manager/package.json
@@ -1,8 +1,8 @@
{
- "name": "lilishop",
+ "name": "lvmankuang",
"version": "1.0.0",
"private": true,
- "description": "lilishop-ui",
+ "description": "缁挎弧绛�",
"author": "lili-platform",
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/manager/src/api/video.js b/manager/src/api/video.js
index 42693bf..dd4dff0 100644
--- a/manager/src/api/video.js
+++ b/manager/src/api/video.js
@@ -94,3 +94,11 @@
data: data
})
}
+
+// 閲嶆柊鏋勫缓es绱㈠紩
+export const recreateIndex = () => {
+ return service({
+ url: "/lmk/video/recreate/es/index",
+ method: "POST"
+ })
+}
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 628297e..0dfddc0 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -1,5 +1,5 @@
module.exports = {
- title: "lilishop", //閰嶇疆鏄剧ず鍦ㄦ祻瑙堝櫒鏍囩鐨則itle
+ title: "缁挎弧绛�", //閰嶇疆鏄剧ず鍦ㄦ祻瑙堝櫒鏍囩鐨則itle
/**
* 楂樺痉鍦板浘鐢宠閾炬帴
* https://lbs.amap.com/api/javascript-api/guide/abc/prepare
diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
index af66491..2b79c55 100644
--- a/manager/src/views/goods/goods-info/goodsDetail.vue
+++ b/manager/src/views/goods/goods-info/goodsDetail.vue
@@ -78,6 +78,8 @@
controls
class="player"
:src="goods.goodsVideo"
+ width="200"
+ height="180"
/>
</FormItem>
<FormItem label="鍟嗗搧瑙勬牸">
diff --git a/manager/src/views/health/HealthVideoList.vue b/manager/src/views/health/HealthVideoList.vue
index 43ef70c..1ec0739 100644
--- a/manager/src/views/health/HealthVideoList.vue
+++ b/manager/src/views/health/HealthVideoList.vue
@@ -662,6 +662,12 @@
this.detail = {}
this.auditingShow = false
},
+ calculateVideoFit(width, height) {
+ const videoRatio = width / height;
+ // 瑙勫垯2锛氱珫灞忚棰戯紙濡�9:16锛�
+ if (videoRatio < 0.8) return 'cover';
+ return 'contain';
+ },
// 鎵撳紑瀹℃牳寮圭獥
openAuditing(row) {
this.auditingShow = true
@@ -674,6 +680,13 @@
},
getVideoDuration(e){
const duration = this.$refs.healthVideoInfo.duration;
+ const videoWidth = this.$refs.healthVideoInfo.videoWidth;
+ const videoHeight = this.$refs.healthVideoInfo.videoHeight;
+ // 鏍规嵁瀹介珮姣旈�夋嫨瑙嗛濉厖妯″紡
+ const fitType = this.calculateVideoFit(videoWidth, videoHeight)
+ this.uploadVideoForm.videoFit = fitType
+ console.log('------瑙嗛淇℃伅3------------>', videoWidth,videoHeight,fitType)
+
this.uploadVideoForm.videoDuration = Math.floor(duration);
},
// 鎵撳紑缂栬緫寮圭獥
diff --git a/manager/src/views/kitchen/kitchenVideo.vue b/manager/src/views/kitchen/kitchenVideo.vue
index 40e7079..c6b2b7f 100644
--- a/manager/src/views/kitchen/kitchenVideo.vue
+++ b/manager/src/views/kitchen/kitchenVideo.vue
@@ -252,9 +252,12 @@
@on-selection-change="showSelect"
>
<template slot-scope="{ row, index }" slot="typeList">
- <div v-for="(tag, index) in row.typeList" :key="'tag' + index" style="margin-top: 5px">
- <Tag color="red">{{ tag.typeName }}</Tag>
+ <div style="display: flex;flex-wrap: wrap">
+ <div v-for="(tag, index) in row.typeList" :key="'tag' + index" style="margin-top: 5px">
+ <Tag color="red">{{ tag.typeName }}</Tag>
+ </div>
</div>
+
</template>
<template slot-scope="{ row, index }" slot="videoFileKey">
<div class="play-text" @click="playVideo(row.videoFileKey, row.title)">鐐瑰嚮鎾斁</div>
@@ -394,7 +397,7 @@
checkKitchenType: [
{
required: true,
- message: '璇烽�夋嫨鍘ㄧ鏍囩',
+ message: '璇烽�夋嫨鍘ㄧ鏍囩涓斾笉鑳借秴杩�5涓�',
trigger: 'blur',
validator: (rule, value, callback) => {
console.log('楠岃瘉鍊�:-------------->', value, '绫诲瀷:', typeof value);
@@ -462,7 +465,7 @@
{
title: "瑙嗛鍒嗙被",
key: "typeList",
- width: 180,
+ width: 310,
slot: "typeList",
},
{
@@ -521,6 +524,7 @@
slot: "action",
align: "center",
width: 200,
+ fixed: "right",
},
],
data: [], // 琛ㄥ崟鏁版嵁
@@ -581,6 +585,12 @@
this.$set(this.uploadVideoForm, 'showCoverUrl', '');
this.$set(this.uploadVideoForm, 'temp', new Date().getTime());
},
+ calculateVideoFit(width, height) {
+ const videoRatio = width / height;
+ // 瑙勫垯2锛氱珫灞忚棰戯紙濡�9:16锛�
+ if (videoRatio < 0.8) return 'cover';
+ return 'contain';
+ },
//閲嶆柊涓婁紶瑙嗛
clearVideo() {
this.clearCoverImage();
@@ -591,6 +601,12 @@
},
getVideoDuration(e){
const duration = this.$refs.healthVideoInfo.duration;
+ const videoWidth = this.$refs.healthVideoInfo.videoWidth;
+ const videoHeight = this.$refs.healthVideoInfo.videoHeight;
+ // 鏍规嵁瀹介珮姣旈�夋嫨瑙嗛濉厖妯″紡
+ const fitType = this.calculateVideoFit(videoWidth, videoHeight)
+ this.uploadVideoForm.videoFit = fitType
+ console.log('------瑙嗛淇℃伅3------------>', videoWidth,videoHeight,fitType)
this.uploadVideoForm.videoDuration = Math.floor(duration);
},
// 瑙嗛涓婃灦
diff --git a/manager/src/views/video/VideoList.vue b/manager/src/views/video/VideoList.vue
index ad09c4c..e8c0227 100644
--- a/manager/src/views/video/VideoList.vue
+++ b/manager/src/views/video/VideoList.vue
@@ -55,6 +55,10 @@
>
</Form>
+ <Row class="operation padding-row">
+ <Button @click="recreateEsIndex" type="primary">閲嶆柊鏋勫缓es绱㈠紩</Button>
+ </Row>
+
<Modal
v-model="playVideoShow"
:title="playVideoTitle"
@@ -223,7 +227,7 @@
</template>
<script>
-import {getVideos, recommendSet, getVideoById, auditingVideo, up, down} from "@/api/video";
+import {getVideos, recommendSet, getVideoById, auditingVideo, up, down, recreateIndex} from "@/api/video";
import {getVideoTagList} from "@/api/videoTag";
import {getFilePreview} from "@/api/file";
import Editor from '@/components/editor/index.vue'
@@ -398,6 +402,11 @@
this.getTags('')
},
methods: {
+ recreateEsIndex() {
+ recreateIndex().then(res => {
+ this.$Message.success(res.msg)
+ })
+ },
// 绉掕浆x鍒唜绉�
formatSeconds(seconds) {
if (isNaN(seconds) || seconds < 0) return '0绉�';
diff --git a/seller/package.json b/seller/package.json
index fe2ac56..a64320f 100644
--- a/seller/package.json
+++ b/seller/package.json
@@ -1,8 +1,8 @@
{
- "name": "lilishop",
+ "name": "lvmankuang",
"version": "1.0.0",
"private": true,
- "description": "lilishop-ui",
+ "description": "缁挎弧绛�",
"author": "lili-platform",
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index 5bd95c4..7a8643c 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -1,6 +1,6 @@
module.exports = {
- title: "lilishop", //閰嶇疆鏄剧ず鍦ㄦ祻瑙堝櫒鏍囩鐨則itle
+ title: "缁挎弧绛�", //閰嶇疆鏄剧ず鍦ㄦ祻瑙堝櫒鏍囩鐨則itle
/**
* 楂樺痉鍦板浘鐢宠閾炬帴
* https://lbs.amap.com/api/javascript-api/guide/abc/prepare
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index dbbdb51..c78ec8b 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -155,7 +155,7 @@
<div class="goods-video">
<div v-if="baseInfoForm.goodsVideo">
<div>
- <video :src="baseInfoForm.showGoodsVideo" class="video" controls style="max-width: 300px;"/>
+ <video :src="baseInfoForm.showGoodsVideo" class="video" controls style="max-width: 300px;max-height: 400px"/>
</div>
</div>
<Upload ref="upload" action="-" :format="['avi', 'wmv', 'mpeg', 'mp4', 'mov']"
--
Gitblit v1.8.0