From 0e85d5033e1d12210bdffaf697515ff250354d66 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 14 十月 2025 14:12:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
manager/src/views/kitchen/kitchenVideo.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/manager/src/views/kitchen/kitchenVideo.vue b/manager/src/views/kitchen/kitchenVideo.vue
index 7af33c0..5d9a7e1 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>
@@ -284,9 +287,30 @@
<Button type="success" size="small" style="margin-right: 5px"
@click="deleteHealthVideo(row)">鍒犻櫎
</Button>
+ <Button type="error" size="small" style="margin-right: 5px" v-if="row.status === '1'"
+ @click="generalQrCode(row)">鐢熸垚浜岀淮鐮�
+ </Button>
</template>
- </Table>
+ </Table>
+ <Modal
+ v-model="showGeneralQrCode"
+ title="浜岀淮鐮�"
+ width="800"
+ :mask-closable="false"
+ >
+ <vue-qr
+ :text="QRCodeUrl"
+ :margin="0"
+ colorDark="#000"
+ colorLight="#fff"
+ :size="150"
+ ></vue-qr>
+ <div slot="footer">
+ <Button type="text" @click="closeGeneralQrCode">鍏抽棴</Button>
+ <!-- <Button type="primary" @click="generalQrCode">纭</Button>-->
+ </div>
+ </Modal>
<Row type="flex" justify="end" class="mt_10">
<Page
:current="searchForm.pageNumber"
@@ -302,6 +326,8 @@
></Page>
</Row>
</Card>
+
+
</div>
</template>
@@ -313,12 +339,17 @@
import COS from 'cos-js-sdk-v5';
import {getFileKey} from "@/utils/file.js";
import {getKitchenTypeAllList} from "@/api/kitchen";
+import vueQr from "vue-qr";
export default {
name: "VideoList",
- components: {Editor},
+ components: {Editor,"vue-qr": vueQr},
data() {
return {
+ showGeneralQrCode:false,
+ codeUrl: this.QRcodeBaseUrl+ '/scanpage/cook',
+ QRCodeUrl:'',
+
videoDownForm: {
id: '',
reason: ''
@@ -462,7 +493,7 @@
{
title: "瑙嗛鍒嗙被",
key: "typeList",
- width: 180,
+ width: 310,
slot: "typeList",
},
{
@@ -521,6 +552,7 @@
slot: "action",
align: "center",
width: 200,
+ fixed: "right",
},
],
data: [], // 琛ㄥ崟鏁版嵁
@@ -550,6 +582,23 @@
this.getTypes('')
},
methods: {
+ closeGeneralQrCode(){
+ this.showGeneralQrCode = false;
+ },
+
+ generalQrCode(row){
+ console.log(row)
+ this.QRCodeUrl = '';
+ this.showGeneralQrCode = true
+ console.log('-------------------->',row);
+ //shareType鍙兘浼氭槸鍔ㄦ�佺殑锛屼細鍔犲垽鏂棰戞潵婧�
+
+ this.QRCodeUrl = this.codeUrl + '?shareType=cook' + '&videoId='+ row.id + '&source=' + 'system';
+ //TODO 鏍规嵁瑙嗛淇℃伅涓殑 锛屼綔鑰卛d鑾峰緱鐢ㄦ埛 鍒ゆ柇 鏉ユ簮 锛岀敤鎴蜂綔鑰呯殑uniid涓簄ull鍒欐槸绯荤粺涓婁紶锛屼笉涓虹┖鍒欐槸鐢ㄦ埛涓婁紶
+ console.log(this.QRCodeUrl)
+ // console.log(this.QRCodeUrl)
+ },
+
// 绉掕浆x鍒唜绉�
formatSeconds(seconds) {
if (isNaN(seconds) || seconds < 0) return '0绉�';
--
Gitblit v1.8.0