@@ -1213,10 +1213,10 @@ export default defineComponent({
position: absolute;
top: 0;
right: 0;
- width: 4rem;
+ width: 2.5rem;
background: none;
transform: translate(100%, -100%);
- height: 4rem;
+ height: 2.5rem;
img{
width: 100%;
height: 100%;
diff --git a/src/component/HomePage/UpgradePlan.vue b/src/component/HomePage/UpgradePlan.vue
index beaf7acd..15b5e879 100644
--- a/src/component/HomePage/UpgradePlan.vue
+++ b/src/component/HomePage/UpgradePlan.vue
@@ -77,7 +77,7 @@
@@ -85,24 +85,24 @@
@@ -113,7 +113,7 @@
@@ -472,8 +472,8 @@ export default defineComponent({
display: flex;
flex-direction: column;
margin: 3rem 0;
- height: 20rem;
- overflow-y: auto;
+ // height: 20rem;
+ // overflow-y: auto;
>label{
display: flex;
align-items: center;
@@ -618,7 +618,7 @@ export default defineComponent({
.ant-modal-body{
padding: calc(5rem*1.2) calc(5rem*1.2) !important;
- height: calc(50rem*1.2);
+ height: calc(55rem*1.2);
// height: calc(65rem*1.2);
}
}
diff --git a/src/component/HomePage/scaleVideo.vue b/src/component/HomePage/scaleVideo.vue
index 73b1ee66..647c4832 100644
--- a/src/component/HomePage/scaleVideo.vue
+++ b/src/component/HomePage/scaleVideo.vue
@@ -4,10 +4,8 @@
-
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index d17557da..b6bfe3c0 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -77,10 +77,18 @@ export default {
BuyCredlts:'购买积分',
credits:'积分',
organization:'积分再任意场景都可以使用',
+ CreditCard:'信用卡',
+ Alipay:'支付宝',
+ HongKong:'香港',
+ MainlandChina:'中国大陆',
Continue:'继续',
payment:'选择付款方式',
Cancel:'取消',
Payment:'付款',
+ policy1:'我承认我已阅读并同意',
+ policy2:'条款和条件',
+ policy3:'(包括服务范围)及',
+ policy4:'订购协议',
completed:'是否已完成支付？',
hint:'请保持窗口打开，直到付款完成。如果您无法打开付款窗口，请检查您的浏览器设置，看看弹出窗口是否被阻止。成功付款后，积分可能会延迟发放。请等待1-3分钟，点击积分刷新按钮',
Back:'返回',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index ee4d23ff..edcd4d2b 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -78,10 +78,18 @@ export default {
BuyCredlts:'Buy credits',
credits:'credits',
organization:'All credits are shared within the name organization',
+ CreditCard:'Credit Card',
+ Alipay:'Alipay',
+ HongKong:'Hong Kong',
+ MainlandChina:'Mainland China',
Continue:'Continue',
payment:'Select payment method',
Cancel:'Cancel',
Payment:'Payment',
+ policy1:'I acknowledge that I have read, understand, and agree with the ',
+ policy2:'Terms and Conditions',
+ policy3:' (including the Scope of service) and the ',
+ policy4:'Subscription Agreement',
completed:'Is payment completed',
hint:'Please keep the window open until the payment is completed. If you are unable to open the payment window, please check your browser settings to see if pop-ups are being blocked.Points may be delayed after successful payment. Please wait 1-3 minutes and click the credits refresh button',
Back:'Back',
diff --git a/src/tool/canvasDrawing.js b/src/tool/canvasDrawing.js
index b860c631..c985ac0e 100644
--- a/src/tool/canvasDrawing.js
+++ b/src/tool/canvasDrawing.js
@@ -1,3 +1,4 @@
+import cuowuImg from '@/assets/images/homePage/cuowu.svg'
function multiselectJS(canvas) {//获取整体宽高
canvas.discardActiveObject() // 丢弃当前活动的对象和触发事件。 如果fabric作为鼠标事件的结果调用该函数，则将该事件作为参数传递给自定义事件的fire函数。 当作为一个方法使用时，参数没有任何应用。
const sel = new fabric.ActiveSelection(canvas.getObjects(), {
@@ -269,7 +270,7 @@ async function JSSetTexture(src,){
return img
}
function JSSetRemoveImage(fun){
- const deleteIcon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAACxAAAAsQHGLUmNAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAdBJREFUSImt1r1uU0EQBeDPFh1pgBQEEwFVAg9BROhCAh1FAg1gkMA8DA0oKOEB3IEIRQgF4SEQBIUC6ENSGgPFXaPx+udeSxxppPXOzJnZ8e7MrRmPWdzANZxPv+EbvmILL/G9hGcADayjgz8l0kUb56qSX8dhBeJcDrFSRv44ZRQdt3EPczieZB5NvB1ymta4zCP5J1yucOIFfM6CDJykob8s73GiAnkPJ7Eb/H9iJhpsZJlPQh6D7AWe9Z5iFr+CIpalhjWspnXZ/pXA01FURkv/HxpxK+g2UE+yGfZXM5+doHt4DEtB2R5dAXdD9nfG2LVxNa2XKGreiziXGefZ5rKZbCLmg/4jHIWNqSEZ1fC0IrnE0bM5qqdFGWoV92RBf/P/S3RRVqI3YaOZGd8eQpgHXMt8HgTd67qi5fZwMzOO5XuREmim9ShEji04q78tLwSDSR/aYuD599DgeVDsY3pMhqOQt4pnUXlGf7PbTQ5VcQofgv8BTudGK/rb9Z6it5RhEV+CX1cxYoeiZXDg7OC+4vpNJbmkuC3vMtsuHpVltKzo55OOzINxmeeYxhPVhn5H0ftnhhGNeu49NBSjdBkX9H+27Cvu+Sv8GEXwF9+O3b1zwZqdAAAAAElFTkSuQmCC"
+ const deleteIcon = cuowuImg
// 创建删除图片元素
let deleteImg = document.createElement('img')
deleteImg.src = deleteIcon
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index 60512b51..6ec82f65 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -666,8 +666,10 @@ export default defineComponent({
},
likeFile(item:any,str:string){
let designType = ''
- if(this.selectCode == 'Sketchboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){
+ if(this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){
designType = this.designType
+ }else if(this.selectCode == 'Sketchboard'){
+ designType = item.categoryValue
}
if(str == 'like'){
let data = {
+ 