@@ -1374,9 +1375,8 @@ export default defineComponent({
vertical-align: middle;
cursor: pointer;
- .icon-huoquduixiang{
+ .fi-br-fill{
margin-right: calc(0.5rem*1.2);
- font-size: calc(2rem*1.2);
color:#343579;
vertical-align: middle;
}
diff --git a/src/component/HomePage/scaleVideo.vue b/src/component/HomePage/scaleVideo.vue
new file mode 100644
index 00000000..2af24d82
--- /dev/null
+++ b/src/component/HomePage/scaleVideo.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue
index 5ab1b3b3..f450466c 100644
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -55,7 +55,7 @@
@{{scaleImageData.userName}}
{{$t('newScaleImage.Original')}}
-
{{$t('newScaleImage.from')}} @{{ scaleImageData.originalUserName }}/{{ scaleImageData.portfolioName }}
+
{{$t('newScaleImage.from')}} @{{ scaleImageData.originalUserName }}/{{ scaleImageData.portfolioName }}
@@ -345,6 +345,9 @@ export default defineComponent({
// },
let getDeatilData = {}
let originalGetDetail = ()=>{
+ if(imgData.scaleImageData.jumpable != 1){
+ return message.info(t('newScaleImage.jsContent6'))
+ }
getDetail({id:imgData.scaleImageData.originalPortfolioId},'')
}
let getDetail = (value:any,str:string)=>{
@@ -765,9 +768,11 @@ export default defineComponent({
}
.scaleImage_chunk_title_intro{
span{
- cursor: pointer;
- color: #39215b;
- text-decoration: underline;
+ &.active{
+ cursor: pointer;
+ color: #39215b;
+ text-decoration: underline;
+ }
}
}
}
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index a9c011cc..5160f733 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -7,6 +7,7 @@ export default {
WORKS:'作品广场',
bindEmail:'绑定邮箱',
logOff:'退出登录',
+ Tutorial:'教程',
language:'中文',
skip:'跳过',
emailContent:'你绑定了的邮箱',
@@ -537,6 +538,7 @@ export default {
jsContent3:'请输入评论内容',
jsContent4:'是否删除当前评论',
jsContent5:'是否删除当前作品',
+ jsContent6:'作品被作者删除',
},
guide:{
guide1:"在
工作空间中，您可以个性化您的设计设置，包括选择适用于男装或女装的设计，以及选择用于创作的人体模型。",
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 5eb38000..fca5966b 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -7,6 +7,7 @@ export default {
WORKS:'GALLERY',
bindEmail:'bind email',
logOff:'log off',
+ Tutorial:'Tutorial',
language:'English',
skip:'skip',
emailContent:'you have binded email',
@@ -539,6 +540,7 @@ export default {
jsContent3:'Please enter a comment',
jsContent4:'Do you need to delete this comment',
jsContent5:'Whether to delete the current gallery',
+ jsContent6:'The author deleted the work',
},
guide:{
guide1:"You can personalize your design settings right here in the
Workspace, including choosing to design for men's or women's wear, as well as selecting the mannequin to use for your creations.",
diff --git a/src/main.ts b/src/main.ts
index 016861a5..ac4f005a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,4 +1,4 @@
-import { createApp,nextTick, } from 'vue'
+import { createApp,defineComponent,h } from 'vue'
import App from './App.vue'
import router from './router'
import store from './store'
@@ -19,6 +19,7 @@ import { Https } from "@/tool/https";
// import "@/tool/fabric.min.js";
const app = createApp(App);
flexible()
+
import { getCookie, setCookie } from "@/tool/cookie";
router.beforeEach((to, from, next) => {
if(to.name == "login"){
diff --git a/src/tool/https.js b/src/tool/https.js
index a7c068de..931be622 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -31,7 +31,7 @@ let httpIp = process.env.NODE_ENV == 'development' ? "" : "";
axios.defaults.baseURL = httpIp; //配置接口地址
// console.log(axios.defaults.baseURL);
-axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
+// axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
// 创建取消令牌
const CancelToken = axios.CancelToken;
diff --git a/src/tool/mount.js b/src/tool/mount.js
new file mode 100644
index 00000000..78282c6c
--- /dev/null
+++ b/src/tool/mount.js
@@ -0,0 +1,18 @@
+import { createApp } from "vue";
+import scaleVideo from "@/component/HomePage/scaleVideo.vue";
+// 使用vue3的createApp,以及mount,unmount方法创建挂载实例
+export default function showViewVideo(options) {
+ // 创建一个节点，并将组件挂载上去
+ const mountNode = document.createElement("div");
+ document.body.appendChild(mountNode);
+ const glearVideo = createApp(scaleVideo, {
+ ...options,
+ visible: true,
+ remove() {
+ glearVideo.unmount(); //创建完后要进行销毁
+ document.body.removeChild(mountNode);
+ },
+ });
+ console.log(glearVideo.mount(mountNode));
+ return glearVideo.mount(mountNode);
+}
\ No newline at end of file
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 8e6cc358..3d82b94d 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -79,6 +79,11 @@
Administrator
+
+
+
+ {{$t('Header.Tutorial')}}
+
{{$t('Header.logOff')}}
@@ -105,8 +110,8 @@
+