diff --git a/.env.dev b/.env.dev
index 8727a59f..7d633ff1 100644
--- a/.env.dev
+++ b/.env.dev
@@ -6,7 +6,7 @@ NODE_ENV = 'development'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://www.api.aida.com.hk'
# 佩佩
-VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
+# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# 海波
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css
index 132e5da3..c67fa179 100644
--- a/src/assets/iconfont2/iconfont.css
+++ b/src/assets/iconfont2/iconfont.css
@@ -1,6 +1,8 @@
@font-face {
- font-family: "iconfont"; /* Project id */
- src: url('iconfont.ttf?t=1711431581952') format('truetype');
+ font-family: "iconfont"; /* Project id 4292253 */
+ src: url('iconfont.woff2?t=1727254748810') format('woff2'),
+ url('iconfont.woff?t=1727254748810') format('woff'),
+ url('iconfont.ttf?t=1727254748810') format('truetype');
}
.iconfont {
@@ -11,36 +13,40 @@
-moz-osx-font-smoothing: grayscale;
}
-.icon-a-waitao_changkuanwaitao11x:before {
- content: "\e66c";
+.icon-IC-yehua:before {
+ content: "\e61b";
}
-.icon-fanchehui:before {
- content: "\e626";
+.icon-shangyiceng:before {
+ content: "\e751";
}
-.icon-chehui:before {
- content: "\e609";
+.icon-shangyiceng1:before {
+ content: "\e604";
}
-.icon-yuyan:before {
- content: "\e85f";
+.icon-xiayiceng:before {
+ content: "\e68a";
}
-.icon-biaoqian:before {
- content: "\e603";
+.icon-shangyiceng2:before {
+ content: "\e68b";
}
-.icon-bingji:before {
- content: "\e620";
+.icon-shenpi:before {
+ content: "\e6a1";
}
-.icon-bingji1:before {
- content: "\e668";
+.icon-yonghu:before {
+ content: "\e617";
}
-.icon-dianwei:before {
- content: "\e685";
+.icon-usetime:before {
+ content: "\e601";
+}
+
+.icon-xiala:before {
+ content: "\e634";
}
.icon-bianji:before {
@@ -87,47 +93,35 @@
content: "\e62d";
}
-.icon-shenpi:before {
- content: "\e6a1";
+.icon-dianwei:before {
+ content: "\e685";
}
-.icon-yonghu:before {
- content: "\e617";
+.icon-bingji:before {
+ content: "\e620";
}
-.icon-usetime:before {
- content: "\e601";
+.icon-bingji1:before {
+ content: "\e668";
}
-.icon-xiala:before {
- content: "\e634";
+.icon-biaoqian:before {
+ content: "\e603";
}
-.icon-shangyiceng:before {
- content: "\e751";
+.icon-yuyan:before {
+ content: "\e85f";
}
-.icon-shangyiceng1:before {
- content: "\e604";
+.icon-fanchehui:before {
+ content: "\e626";
}
-.icon-xiayiceng:before {
- content: "\e68a";
+.icon-chehui:before {
+ content: "\e609";
}
-.icon-shangyiceng2:before {
- content: "\e68b";
-}
-
-.icon-renwu:before {
- content: "\e63f";
-}
-
-.icon-caizhi:before {
- content: "\e647";
-}
-
-.icon-shangchuantupian:before {
- content: "\e61e";
+.icon-a-waitao_changkuanwaitao11x:before {
+ content: "\e66c";
}
diff --git a/src/assets/iconfont2/iconfont.ttf b/src/assets/iconfont2/iconfont.ttf
index 25207e73..905838aa 100644
Binary files a/src/assets/iconfont2/iconfont.ttf and b/src/assets/iconfont2/iconfont.ttf differ
diff --git a/src/assets/iconfont2/iconfont.woff b/src/assets/iconfont2/iconfont.woff
index a306b346..79eddb55 100644
Binary files a/src/assets/iconfont2/iconfont.woff and b/src/assets/iconfont2/iconfont.woff differ
diff --git a/src/assets/iconfont2/iconfont.woff2 b/src/assets/iconfont2/iconfont.woff2
index 547b03cf..5fd17c13 100644
Binary files a/src/assets/iconfont2/iconfont.woff2 and b/src/assets/iconfont2/iconfont.woff2 differ
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index ad5171fe..d4580c9c 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -179,7 +179,7 @@
T
- 液化
+
\ No newline at end of file
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 1bc41689..363066f4 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -66,6 +66,8 @@ export default {
requiresCredits:'执行超分的图片需要消耗{data}积分',
Scale:'倍率',
Cancel:'取消',
+ size:'区域',
+ density:'密度',
jsContent1:"您是否已经保存画布内容?如果没有,请再关闭前点击'保存'。",
jsContent2:'我们只支持对印花进行超分',
jsContent3:'您的积分小于一次超分',
@@ -75,6 +77,7 @@ export default {
jsContent7:'保存成功~',
jsContent8:'是否继续编辑',
jsContent9:'是否需要自动裁剪画布多余空间',
+ jsContent10:'请选择一张图片后再次尝试',
},
upgradePlan:{
BuyCredlts:'购买积分',
@@ -562,6 +565,9 @@ export default {
jsContent5:'是否删除当前作品',
jsContent6:'作品被作者删除',
},
+ scaleImage:{
+ overlayOrNot:'是否覆盖当前图片',
+ },
account:{
personCentered:'个人中心',
myInformation:'我的信息',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 907b8471..08665808 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -66,6 +66,8 @@ export default {
requiresCredits:'Performing upscale image requires a {data} credits',
Scale:'Scale',
Cancel:'Cancel',
+ size:'Size',
+ density:'Density',
jsContent1:"Have you saved your canvas content? If not, please click 'Save' before closing.",
jsContent2:'We only provide super-resolution capabilities for printboard images.',
jsContent3:'Your points are less than one SR',
@@ -75,6 +77,7 @@ export default {
jsContent7:'save successfully',
jsContent8:'Whether to continue editing',
jsContent9:'Whether you need to automatically crop your canvas excess space',
+ jsContent10:'Please select a picture and try again',
},
upgradePlan:{
BuyCredlts:'Buy credits',
@@ -519,7 +522,7 @@ export default {
},
works:{
all:'All',
- FavoriteWorks:'Favorite Works',
+ FavoriteWorks:'Like The Works',
MyWorks:'My Works',
},
Publish:{
@@ -562,6 +565,9 @@ export default {
jsContent5:'Whether to delete the current gallery',
jsContent6:'The author deleted the work',
},
+ scaleImage:{
+ overlayOrNot:'Whether to overwrite the current picture',
+ },
account:{
personCentered:'Account',
myInformation:'My Details',
diff --git a/src/router/index.ts b/src/router/index.ts
index a98bc920..d90a7495 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -241,11 +241,21 @@ const routes: Array = [
name: 'feedbackSurveyCN',
component: _import('feedbackSurveyCN'),
},
+ {
+ path: '/emailVerify',
+ name: 'emailVerify',
+ component: _import('emailVerify'),
+ },
{
path: '/404',
name: '404',
component: _import('404')
},
+ {
+ path: "/:catchAll(.*)",
+ redirect: "/404",
+ },
+
]
const router = createRouter({
@@ -308,7 +318,7 @@ let setMurmur = (id:any)=> {
}
router.beforeEach((to:any, from, next) => {
- let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问
+ let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问
// 系统维护
// const toName = to.name === 'upgrade';
@@ -366,30 +376,27 @@ router.beforeEach((to:any, from, next) => {
}
return
}
- if (routeExists) {//检测档期那页面是否存在
- if (isMurmur && murmurStr && token) {
- const toName = to.name === 'login';
- if (toName) {
- next({ name: '/home' });//机房用户
- } else {
- next();
- }
- } else {
- if (routeList.indexOf(to.path) > -1 ) {//指定也买你必须指定用户可以进入
- if(userIdList.indexOf(userInfo.userId) > -1){
- next();
- }else{
- next({ name: '/404' });
- }
- }else{
- next();
- }
- // 如果页面存在,正常跳转
- }
+ if (isMurmur && murmurStr && token) {
+ const toName = to.name === 'login';
+ if (toName) {
+ return next({ name: '/home' });//机房用户
+ }
} else {
- // 如果页面不存在,可以跳转到404页面或者其他页面
- next('/404');
+ if (routeList.indexOf(to.path) > -1 ) {//指定也买你必须指定用户可以进入
+ if(userIdList.indexOf(userInfo.userId) > -1){
+ }else{
+ return next({ name: '/404' });
+ }
+ }
+ // 如果页面存在,正常跳转
}
+ next();
+ // if (routeExists) {//检测档期那页面是否存在
+
+ // } else {
+ // // 如果页面不存在,可以跳转到404页面或者其他页面
+ // next('/404');
+ // }
});
diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts
index ac002510..3f4c4e2b 100644
--- a/src/store/uploadFile/uploadFile.ts
+++ b/src/store/uploadFile/uploadFile.ts
@@ -71,8 +71,6 @@ const UploadFilesModule : Module = {
state.moodboard = [...state.moodboardFiles,...state.moodboardGenerateFiles,...state.moodboardMaterialFiles]
},
addGenerateMaterialFils(state,data:any){
- console.log(data);
-
let file
let arr
let maxImg = 8
diff --git a/src/views/emailVerify.vue b/src/views/emailVerify.vue
new file mode 100644
index 00000000..cd85df7c
--- /dev/null
+++ b/src/views/emailVerify.vue
@@ -0,0 +1,254 @@
+
+
+
+ Welcome
+ Please take the survey
+
+
+
+
+
+
+
+
\ No newline at end of file