fix
This commit is contained in:
BIN
public/image/loading.gif
Normal file
BIN
public/image/loading.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 66 KiB |
@@ -677,7 +677,7 @@ export default defineComponent({
|
|||||||
if (key == "printboardFiles") {
|
if (key == "printboardFiles") {
|
||||||
imgWidth = canvasWH.value.width / 8;
|
imgWidth = canvasWH.value.width / 8;
|
||||||
}
|
}
|
||||||
if (key == "sketchboardFiles"||key == 'moodboardFiles') {
|
if (key == "sketchboardFiles"||key == 'moodboardFiles'||key == 'FinalizeImage') {
|
||||||
imgWidth =
|
imgWidth =
|
||||||
(canvasWH.value.width -
|
(canvasWH.value.width -
|
||||||
(sketchGrouping - 1) * 20) /
|
(sketchGrouping - 1) * 20) /
|
||||||
@@ -781,6 +781,7 @@ export default defineComponent({
|
|||||||
let num = 0;
|
let num = 0;
|
||||||
for (let key in allBoardData.value) {
|
for (let key in allBoardData.value) {
|
||||||
if (key !== "colorBoards" && key !== "moodTemplateId") {
|
if (key !== "colorBoards" && key !== "moodTemplateId") {
|
||||||
|
if(!(allBoardData.value[key] instanceof Array)) continue
|
||||||
for (let item of allBoardData.value[key]) {
|
for (let item of allBoardData.value[key]) {
|
||||||
if (
|
if (
|
||||||
key == "disposeMoodboard" &&
|
key == "disposeMoodboard" &&
|
||||||
|
|||||||
@@ -104,6 +104,7 @@
|
|||||||
<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
|
<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
|
||||||
<generalMiniCanvas v-if="isCanvas" :imgUrl="scaleImageList[scaleImageIndex]?.imgUrl" @submitBase64Data="submitBase64Data"></generalMiniCanvas>
|
<generalMiniCanvas v-if="isCanvas" :imgUrl="scaleImageList[scaleImageIndex]?.imgUrl" @submitBase64Data="submitBase64Data"></generalMiniCanvas>
|
||||||
<img v-else :src="scaleImageList[scaleImageIndex]?.imgUrl">
|
<img v-else :src="scaleImageList[scaleImageIndex]?.imgUrl">
|
||||||
|
|
||||||
<div class="img_operate_block" v-if="isLike">
|
<div class="img_operate_block" v-if="isLike">
|
||||||
<i v-if="!scaleImageList[scaleImageIndex]?.like" class="fi fi-rr-heart operate_icon" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'like')"></i>
|
<i v-if="!scaleImageList[scaleImageIndex]?.like" class="fi fi-rr-heart operate_icon" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'like')"></i>
|
||||||
<i v-else class="fi fi-sr-heart operate_icon" :adminLike="!!scaleImageList[scaleImageIndex]?.like" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'noLike')"></i>
|
<i v-else class="fi fi-sr-heart operate_icon" :adminLike="!!scaleImageList[scaleImageIndex]?.like" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'noLike')"></i>
|
||||||
@@ -133,12 +134,11 @@
|
|||||||
import { defineComponent, h, ref ,toRefs,createVNode,reactive, nextTick} from "vue";
|
import { defineComponent, h, ref ,toRefs,createVNode,reactive, nextTick} from "vue";
|
||||||
import { Https } from "@/tool/https";
|
import { Https } from "@/tool/https";
|
||||||
import { Modal } from "ant-design-vue";
|
import { Modal } from "ant-design-vue";
|
||||||
// import domTurnImg from '@/tool/domTurnImg'
|
|
||||||
import { useStore } from "vuex";
|
|
||||||
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
|
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
|
||||||
import { downloadIamge } from "@/tool/util";
|
import { downloadIamge } from "@/tool/util";
|
||||||
import { getCookie,setCookie } from "@/tool/cookie";
|
import { getCookie,setCookie } from "@/tool/cookie";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
|
import { useStore } from "vuex";
|
||||||
import generalMiniCanvas from "@/component/modules/generalMiniCanvas.vue";
|
import generalMiniCanvas from "@/component/modules/generalMiniCanvas.vue";
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
components:{generalMiniCanvas},
|
components:{generalMiniCanvas},
|
||||||
@@ -222,6 +222,7 @@ export default defineComponent({
|
|||||||
Https.axiosPost(url, data).then(
|
Https.axiosPost(url, data).then(
|
||||||
(rv) => {
|
(rv) => {
|
||||||
isShowMark.value = false
|
isShowMark.value = false
|
||||||
|
scaleImageList.value[scaleImageIndex.value].imgUrl = '/image/loading.gif'
|
||||||
let arr:any = []
|
let arr:any = []
|
||||||
rv.forEach((item:any)=>{
|
rv.forEach((item:any)=>{
|
||||||
arr.push(item.taskId)
|
arr.push(item.taskId)
|
||||||
@@ -401,13 +402,14 @@ export default defineComponent({
|
|||||||
document.removeEventListener('keydown',this.setKeydown)
|
document.removeEventListener('keydown',this.setKeydown)
|
||||||
},
|
},
|
||||||
lastStep(){
|
lastStep(){
|
||||||
|
if(this.productimgIsProductimg) return
|
||||||
if(this.scaleImageIndex <= 0){
|
if(this.scaleImageIndex <= 0){
|
||||||
}else{
|
}else{
|
||||||
this.scaleImageIndex -= 1
|
this.scaleImageIndex -= 1
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
nextStep(){
|
nextStep(){
|
||||||
|
if(this.productimgIsProductimg) return
|
||||||
if(this.scaleImageIndex >= this.scaleImageList.length-1){
|
if(this.scaleImageIndex >= this.scaleImageList.length-1){
|
||||||
}else{
|
}else{
|
||||||
this.scaleImageIndex += 1
|
this.scaleImageIndex += 1
|
||||||
@@ -469,6 +471,7 @@ export default defineComponent({
|
|||||||
img{
|
img{
|
||||||
width: auto;
|
width: auto;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
max-width: 40rem;
|
||||||
}
|
}
|
||||||
&.active{
|
&.active{
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -62,8 +62,8 @@ export default defineComponent({
|
|||||||
// let presentState = ref('paypal');
|
// let presentState = ref('paypal');
|
||||||
let liqufeaction = ref(false);
|
let liqufeaction = ref(false);
|
||||||
let liqufeactionData = reactive({
|
let liqufeactionData = reactive({
|
||||||
routes: 90,//移动框大小
|
routes: 30,//移动框大小
|
||||||
density: 80,//移动大小
|
density: 30,//移动大小
|
||||||
})
|
})
|
||||||
let arrows = ref({
|
let arrows = ref({
|
||||||
show:false,
|
show:false,
|
||||||
|
|||||||
@@ -344,7 +344,7 @@ export default {
|
|||||||
SelectSuccessivelyOnTitle:'连续选色模式开启.',
|
SelectSuccessivelyOnTitle:'连续选色模式开启.',
|
||||||
SelectSuccessivelyOffTitle:'连续选色模式关闭.',
|
SelectSuccessivelyOffTitle:'连续选色模式关闭.',
|
||||||
SelectSeparately:'单选',
|
SelectSeparately:'单选',
|
||||||
ExtractColor:'提取颜色',
|
ExtractColor:'提取',
|
||||||
Single:'单色',
|
Single:'单色',
|
||||||
Gradual:'渐变',
|
Gradual:'渐变',
|
||||||
Alignment:'线性',
|
Alignment:'线性',
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export default {
|
|||||||
CanvasSize:'Canvas Size',
|
CanvasSize:'Canvas Size',
|
||||||
Height:'Height',
|
Height:'Height',
|
||||||
Width:'Width',
|
Width:'Width',
|
||||||
CanvasNav:'Canvas Nav',
|
CanvasNav:'Elements',
|
||||||
CanvasTool:'Canvas Tool',
|
CanvasTool:'Canvas Tool',
|
||||||
Color:'Color',
|
Color:'Color',
|
||||||
Size:'Size',
|
Size:'Size',
|
||||||
@@ -522,7 +522,7 @@ export default {
|
|||||||
},
|
},
|
||||||
works:{
|
works:{
|
||||||
all:'All',
|
all:'All',
|
||||||
FavoriteWorks:'Like The Works',
|
FavoriteWorks:'Like Works',
|
||||||
MyWorks:'My Works',
|
MyWorks:'My Works',
|
||||||
},
|
},
|
||||||
Publish:{
|
Publish:{
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
"tests/**/*.tsx",
|
"tests/**/*.tsx",
|
||||||
"src/**/*.js",
|
"src/**/*.js",
|
||||||
"src/**/*.svg",
|
"src/**/*.svg",
|
||||||
|
"src/**/*.gif",
|
||||||
],
|
],
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"node_modules"
|
"node_modules"
|
||||||
|
|||||||
Reference in New Issue
Block a user