diff --git a/src/assets/icons/CPlay.svg b/src/assets/icons/CPlay.svg
index 4deb03af..a200e02d 100644
--- a/src/assets/icons/CPlay.svg
+++ b/src/assets/icons/CPlay.svg
@@ -1,6 +1 @@
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/component/home/tools/poseTransfer/index.vue b/src/component/home/tools/poseTransfer/index.vue
index e6d60933..daef4f87 100644
--- a/src/component/home/tools/poseTransfer/index.vue
+++ b/src/component/home/tools/poseTransfer/index.vue
@@ -65,6 +65,9 @@
+
{{$t('poseTransfer.Selectpose')}}
@@ -81,6 +84,17 @@
+
@@ -147,11 +161,12 @@ import { getUploadUrl,isMoible,getMinioUrl } from "@/tool/util";
import { getCookie,setCookie } from "@/tool/cookie";
import showViewVideo from "@/tool/mount";
import router from '@/router';
+import promptInput from "./promptInput.vue";
export default defineComponent({
components:{
generalDrag,
- // selectList,
+ promptInput
},
props:{
isDesignPage:{
@@ -202,6 +217,12 @@ export default defineComponent({
generateTime:null as any,
poseList:[],
selectPose:null as any,
+ prompt:[
+ { id: '1', type: 'text', value: '11111' },
+ { id: '2', type: 'input', value: '222', placeholder: '[请输入内容]' },
+ { id: '3', type: 'text', value: '333333' },
+ { id: '4', type: 'input', value: '', placeholder: '[请输入内容]' }
+ ]
})
let speed = reactive({
speedList:[
@@ -228,6 +249,7 @@ export default defineComponent({
generalDragLeft:null as any,
generalDragRight:null as any,
scaleVideo:null as any,
+ promptInput: null as any,
})
const selectImgItem = (item:any,)=>{
if(item.isChecked){
@@ -269,6 +291,9 @@ export default defineComponent({
}
const gifPause = (e:any,item:any)=>{
e.target.src = item.firstFrame//静态图片
+ }
+ const handlePlayMotion = item => {
+
}
const getPoseList = ()=>{
Https.axiosGet(Https.httpUrls.getAllPose).then((rv)=>{
@@ -629,7 +654,7 @@ export default defineComponent({
{immediate: true }
)
- const videoType = ref('1')
+ const videoType = ref('3')
const showMotion = computed(()=> videoType.value === '3' )
const options = ref([
{ vlaue: '1', label: 'First frame' },
@@ -779,6 +804,7 @@ export default defineComponent({
overflow: hidden;
overflow-x: auto;
column-gap: 2.4rem;
+ position: relative;
> .item{
// width: calc(100% / 2 - .5rem);
// height: 25rem;
@@ -875,6 +901,30 @@ export default defineComponent({
> .upload_item{
border: none;
}
+ .control-container{
+ width: 100%;
+ height: 3.3rem;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ background: linear-gradient(180deg, rgba(8, 9, 13, 0) 0%, rgba(8, 9, 13, 0.27) 80.37%);
+ display: flex;
+ align-items: flex-end;
+ justify-content: center;
+ .icon-list{
+ height: 50%;
+ width: calc(100% - 1.6rem);
+ border-top: 1px solid #fff;
+ display: flex;
+ box-sizing: border-box;
+ justify-content: flex-start;
+ align-items: center;
+ .play-icon{
+ width: initial;
+ height: initial;
+ }
+ }
+ }
}
> .head{
color: #000;
diff --git a/src/component/home/tools/poseTransfer/promptInput.vue b/src/component/home/tools/poseTransfer/promptInput.vue
new file mode 100644
index 00000000..63537d09
--- /dev/null
+++ b/src/component/home/tools/poseTransfer/promptInput.vue
@@ -0,0 +1,422 @@
+
+
+
+
+
+ {{
+ item.value }}
+
+
+ handleInputChange(index, e)"
+ @keydown="(e) => handleInputKeydown(e, index)" @blur="() => handleInputBlur(index)">
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/home/tools/toProduct/index.vue b/src/component/home/tools/toProduct/index.vue
index 179c6f68..a9bbc011 100644
--- a/src/component/home/tools/toProduct/index.vue
+++ b/src/component/home/tools/toProduct/index.vue
@@ -720,6 +720,11 @@ export default defineComponent({
let remPrductimgTime: any = null
let prductimgTime: any = null
let getPrductimg = () => {
+ // 未输入prompt时不可生成
+ if (!productImgData.searchName[props.productimgMenu.value]) {
+ message.info(t('ProductImg.noPrompt'))
+ return
+ }
if (productImgData.isProductimg) return
clearInterval(remPrductimgTime)
let selectArr: any = []
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index f8117bff..ff4a1a7c 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -284,7 +284,8 @@ export default {
PromptAssit: '提示词助手',
AssitSubTitle: '您可以复制并使用以下提示词:',
CopySuccess: '已复制到剪贴板',
- CopyFiled: '复制失败'
+ CopyFiled: '复制失败',
+ noPrompt:'请输入提示词'
},
poseTransfer: {
SelectDesign: '产品图',
@@ -1369,7 +1370,7 @@ export default {
liquefactionEnvironment: '准备液化环境',
liquefactionEnvironmentLoading: '正在准备液化环境,请稍候...',
LiqueficationFailed: '液化工具启动失败',
- TextLayer: '文本图层',
+ TextLayer: '文本图层',
DoubleClickText: '双击编辑文本',
LiquidationcuoError: '未选择有效图像或图层不适合液化操作',
ErrorMessage: '错误提示',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 04895c64..6aceb62d 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -294,7 +294,8 @@ export default {
PromptAssit: 'Prompt Assist',
AssitSubTitle: 'You can copy following prompt and try:',
CopySuccess: 'Copied to clipboard',
- CopyFiled: 'Failed to copy'
+ CopyFiled: 'Failed to copy',
+ noPrompt:'Please enter prompt'
},
poseTransfer: {
SelectDesign: 'Product image',