lmk-shop-web.git

			@@ -23,6 +23,14 @@
			<FormItem label="商品价格" prop="price">
			<Input v-model="baseInfoForm.price" clearable placeholder="商品价格" style="width: 260px" type="text"/>
			</FormItem>

			<FormItem label="抽成比例" prop="commission">
			<!-- <Input v-model="baseInfoForm.commission" max="100" min="0" clearable placeholder="抽成比例" style="width: 260px" type="number"/>-->
			<InputNumber v-model="baseInfoForm.commission" :formatter="value => `${value}%`"
			:parser="value => value.replace('%', '')" :max="100" :min="0" clearable
			placeholder="抽成比例" style="width: 260px" type="number"/>
			</FormItem>

			<FormItem label="商品卖点" prop="sellingPoint">
			<Input v-model="baseInfoForm.sellingPoint" :rows="4" style="width: 260px" type="textarea"/>
			</FormItem>
			@@ -48,13 +56,22 @@
			<RadioGroup v-if="baseInfoForm.goodsType != 'VIRTUAL_GOODS'" v-model="baseInfoForm.salesModel"
			button-style="solid" type="button" @on-change="renderTableData(skuTableData)">
			<Radio label="RETAIL" title="零售型">零售型</Radio>
			<Radio label="WHOLESALE" title="批发型">批发型</Radio>
			<!-- <Radio label="WHOLESALE" title="批发型">批发型</Radio>-->
			<Radio label="PRESALE" title="预售">预售</Radio>
			</RadioGroup>
			<RadioGroup v-else v-model="baseInfoForm.salesModel" button-style="solid" type="button">
			<Radio label="RETAIL" title="零售型">
			<span>虚拟型</span>
			</Radio>
			</RadioGroup>
			</FormItem>
			<FormItem v-if="baseInfoForm.salesModel == 'PRESALE'">
			<div>
			预售时间：
			<DatePicker type="daterange" v-model="baseInfoForm.preSaleTime"
			format="yyyy-MM-dd" placement="bottom-end" placeholder="请选择预售时间" style="width: 200px"
			@on-change="choosePreTime"></DatePicker>
			</div>
			</FormItem>
			<FormItem v-if="baseInfoForm.salesModel == 'WHOLESALE'" class="form-item-view-el" label="销售规则"
			prop="wholesaleRule">
			@@ -541,6 +558,7 @@
			import COS from 'cos-js-sdk-v5';
			import {getFileKey} from "@/utils/file.js";
			import {getFilePreview, getSts} from "@/api/file";
			import {formatDate} from "@/utils/filters";


			export default {
			@@ -677,6 +695,10 @@
			categoryName: [],
			goodsVideo: "",
			showGoodsVideo: "",
			// 预售时间
			preSaleTime:[],
			preSaleBeginDate:'',
			preSaleEndDate:'',
			},
			/** 表格头 */
			skuTableColumn: [],
			@@ -758,6 +780,32 @@
			}
			},
			methods: {
			// 格式化显示值
			formatter(date) {
			return this.formatDate(date, 'yyyy-MM-dd');
			},

			// 日期格式化工具
			formatDate(date, format) {
			const year = date.getFullYear();
			const month = (date.getMonth() + 1).toString().padStart(2, '0');
			const day = date.getDate().toString().padStart(2, '0');

			return format
			.replace('yyyy', year)
			.replace('MM', month)
			.replace('dd', day);
			},
			choosePreTime(e){
			if (this.baseInfoForm.preSaleTime){
			const[begin,end] = this.baseInfoForm.preSaleTime;
			this.baseInfoForm.preSaleBeginDate = this.formatDate(begin,'yyyy-MM-dd');
			this.baseInfoForm.preSaleEndDate = this.formatDate(end,'yyyy-MM-dd');
			console.log('------------------>选择时间',this.baseInfoForm.preSaleBeginDate,this.baseInfoForm.preSaleEndDate)

			}
			console.log('时间选择------------------》',e)
			},
			// 选择图片modal
			handleCLickImg(val, index) {
			console.log('测试输入的值----------------》', val)
			@@ -1185,6 +1233,7 @@
			response.result.recommend
			? (response.result.recommend = 1)
			: (response.result.recommend = 0);
			response.result.preSaleTime = [response.result.preSaleBeginDate, response.result.preSaleEndDate];
			this.baseInfoForm = {...this.baseInfoForm, ...response.result};
			this.baseInfoForm.release = 1; //即使是被放入仓库，修改的时候也会显示会立即发布
			this.categoryId = response.result.categoryPath.split(",")[2];
			@@ -1679,6 +1728,7 @@
			* 渲染table所需要的column 和 data
			*/
			renderTableData(skus) {
			console.log('-------------->销售类型',skus)
			this.skuTableColumn = [];
			let pushData = [];
			// 渲染头部
			@@ -1703,7 +1753,15 @@
			}
			);
			}

			// 预售模式
			if (this.baseInfoForm.salesModel !== "PRESALE") {
			pushData.push(
			{
			title: "预售时间",
			slot: "price",
			}
			);
			}
			if (this.baseInfoForm.salesModel === "WHOLESALE" && this.wholesaleData) {
			this.wholesaleData.forEach((item, index) => {
			pushData.push({

	manager/src/api/video.js	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	manager/src/views/video/VideoList.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	seller/src/views/goods/goods-seller/goods.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	seller/src/views/goods/goods-seller/goodsOperationSec.vue	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -94,3 +94,11 @@
			data: data
			})
			}

			// 重新构建es索引
			export const recreateIndex = () => {
			return service({
			url: "/lmk/video/recreate/es/index",
			method: "POST"
			})
			}

			@@ -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分x秒
			formatSeconds(seconds) {
			if (isNaN(seconds) \|\| seconds < 0) return '0秒';

			@@ -333,6 +333,8 @@
			return h("Tag", { props: { color: "orange" } }, "零售");
			} else if (params.row.salesModel === "WHOLESALE") {
			return h("Tag", { props: { color: "magenta" } }, "批发");
			} else if (params.row.salesModel === "PRESALE") {
			return h("Tag", { props: { color: "magenta" } }, "预售");
			} else {
			return h("Tag", { props: { color: "volcano" } }, "其他类型");
			}