调整library布局
This commit is contained in:
@@ -169,9 +169,8 @@
|
||||
<div class="shortcutKeys_list_item" v-for="item in keysList" :key="item.name">
|
||||
<div class="name">{{ item.name }}</div>
|
||||
<div class="key">
|
||||
<div>{{ item.winDowKey }}</div>
|
||||
<span style="margin: 0 1rem">/</span>
|
||||
<div>{{ item.macKey }}</div>
|
||||
<div v-if="!isWindow">{{ item.macKey }}</div>
|
||||
<div v-else>{{ item.winDowKey }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -186,14 +185,14 @@
|
||||
<div class="exportCanvasBox_center_box exportCanvasBox_left">
|
||||
<div class="exportCanvasBox_left_tool exportCanvasBox_title">
|
||||
<div class="exportCanvasBox_left_tool_item">
|
||||
<i class="icon iconfont icon-chehui" @click="historyState('')"></i>
|
||||
<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')"></i>
|
||||
<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:operation == 'pencil'}"></i>
|
||||
<i class="icon iconfont icon-chehui" @click="historyState('')" :title="isWindow?'Ctrl+Z':'Command+Z'"></i>
|
||||
<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')" :title="isWindow?'Ctrl+Shift+Z':'Command+Ctrl+Z'"></i>
|
||||
<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:operation == 'pencil'}" :title="isWindow?'~':'~'"></i>
|
||||
<i class="icon iconfont icon-caizhi" @click="setOperation('texture')" :class="{active:operation == 'texture'}"></i>
|
||||
<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:operation == 'move'}"></i>
|
||||
<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}"></i>
|
||||
<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:operation == 'move'}" :title="isWindow?'M':'M'"></i>
|
||||
<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}" :title="isWindow?'~':'~'"></i>
|
||||
|
||||
<label class="uploadImage">
|
||||
<label class="uploadImage" :title="isWindow?'Ctrl+O':'Command+O'">
|
||||
<i class="fi fi-br-upload" ></i>
|
||||
<input type="file" @change="uploadImage" accept="image/*">
|
||||
</label>
|
||||
@@ -353,7 +352,7 @@ export default defineComponent({
|
||||
let driver__ = computed(()=>{
|
||||
return store.state.Guide.guide
|
||||
})
|
||||
|
||||
let isWindow = true
|
||||
let showUpgradePlan = ref(false);
|
||||
let canvas = ref({});
|
||||
// let canvasDom = ref()
|
||||
@@ -414,6 +413,12 @@ export default defineComponent({
|
||||
"likeDesignCollectionList",
|
||||
productData.key,
|
||||
];
|
||||
const userAgent = navigator.userAgent.toLowerCase();
|
||||
if (userAgent.indexOf('windows') !== -1) {
|
||||
isWindow = true
|
||||
}else if(userAgent.indexOf('macintosh') !== -1 || userAgent.indexOf('mac os') !== -1) {
|
||||
isWindow = false
|
||||
}
|
||||
createCanvas()
|
||||
}
|
||||
let setCanvasData = async (oldExportCanvas)=>{
|
||||
@@ -1290,16 +1295,20 @@ export default defineComponent({
|
||||
setPencilWidth()
|
||||
}else if(keyDown.indexOf('KeyI') > -1){
|
||||
getColor()//吸色
|
||||
}else if(keyDown.indexOf('KeyM') > -1){
|
||||
setOperation('move')
|
||||
}else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyD') > -1){
|
||||
canvas.discardActiveObject().renderAll();
|
||||
}else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyO') > -1){
|
||||
let input = document.querySelector('.uploadImage input')
|
||||
input.click()
|
||||
}else if(keyDown.indexOf('Backquote') > -1){
|
||||
if(operation.value == 'pencil' || operation.value == 'texture'){
|
||||
oldOperation = operation.value
|
||||
setOperation('eraser')
|
||||
}
|
||||
// if(operation.value == 'pencil' || operation.value == 'texture'){
|
||||
let str = 'pencil'
|
||||
if(operation.value == 'pencil')str = 'eraser'
|
||||
oldOperation = operation.value
|
||||
setOperation(str)
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1323,7 +1332,7 @@ export default defineComponent({
|
||||
return event.code !== item;
|
||||
})
|
||||
if(event.code == 'Backquote' && oldOperation){
|
||||
setOperation(oldOperation)
|
||||
// setOperation(oldOperation)
|
||||
oldOperation = ''
|
||||
}
|
||||
}
|
||||
@@ -2183,6 +2192,7 @@ export default defineComponent({
|
||||
toSvg,
|
||||
t,
|
||||
toSvg,
|
||||
isWindow,//判断是window还是mac
|
||||
showUpgradePlan,//当前弹窗是否打开
|
||||
canvasWH,//画布初始宽高
|
||||
pencilbtnStyle,//笔触按钮
|
||||
@@ -2419,7 +2429,7 @@ export default defineComponent({
|
||||
display: none;
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
width: 45rem;
|
||||
width: 30rem;
|
||||
max-height: 45rem;
|
||||
background: #f7f8fa;
|
||||
border-radius: 2rem;
|
||||
|
||||
@@ -602,21 +602,15 @@ export default defineComponent({
|
||||
},10000)
|
||||
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
|
||||
(rv) => {
|
||||
if(data.isTestUser){
|
||||
if(rv.leftUsageCount >= 1){
|
||||
message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount,str:this.t('collectionModal.Moodboard')}));
|
||||
}else if(rv.leftUsageCount == 0){
|
||||
message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Moodboard')}));
|
||||
this.isGenerate = false
|
||||
return
|
||||
}
|
||||
}
|
||||
// rv.uniqueId.forEach((item:any) => {
|
||||
// let arr:any = {}
|
||||
// arr.taskId = item
|
||||
// arr.status = 'execution'
|
||||
// this.fileList.unshift(arr)
|
||||
// });
|
||||
// if(data.isTestUser){
|
||||
// if(rv.leftUsageCount >= 1){
|
||||
// message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount,str:this.t('collectionModal.Moodboard')}));
|
||||
// }else if(rv.leftUsageCount == 0){
|
||||
// message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Moodboard')}));
|
||||
// this.isGenerate = false
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
this.setGenerate(rv.uniqueId)
|
||||
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<payMethod ref="payMethod" @completePayment="cancelDsign"></payMethod>
|
||||
<payMethod ref="payMethod" @completePayment="cancelDsign" type="credits"></payMethod>
|
||||
|
||||
<!-- <div v-show="stepNum == 1" class="UpgradePlan_payAffirm">
|
||||
<div class="UpgradePlan_payAffirm_title">{{ $t('upgradePlan.payment') }}</div>
|
||||
@@ -207,7 +207,8 @@ export default defineComponent({
|
||||
}
|
||||
},
|
||||
payment(){//付款
|
||||
let url = window.location.href
|
||||
// let url = window.location.href
|
||||
let url = window.location.origin+'/paySucceed'
|
||||
// url = url.replace(/\/[^/]+$/, '') + '/home';
|
||||
// console.log(url);
|
||||
let parsedUrl = new URL(url);
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</a-modal>
|
||||
<payMethod ref="payMethod" @completePayment="cancelDsign"></payMethod>
|
||||
<payMethod ref="payMethod" @completePayment="cancelDsign" type="renew"></payMethod>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
<div class="scaleImage_content_imgBox" :class="{active:isComparison}">
|
||||
<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
|
||||
<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 || scaleImageList[scaleImageIndex]?.url">
|
||||
|
||||
<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>
|
||||
@@ -123,7 +123,7 @@
|
||||
</div>
|
||||
<div class="nav_list" v-mousewheel>
|
||||
<div class="nav_centent">
|
||||
<img v-for="item,index in scaleImageList" @click="setScaleImageIndex(index)" :class="{active:index == scaleImageIndex}" :src="item?.imgUrl" :key="item.id">
|
||||
<img v-for="item,index in scaleImageList" @click="setScaleImageIndex(index)" :class="{active:index == scaleImageIndex}" :src="item?.imgUrl || item?.url" :key="item.id">
|
||||
</div>
|
||||
</div>
|
||||
<div class="nav_right">
|
||||
|
||||
Reference in New Issue
Block a user