+
+
-
+
+
+ 男
+
+
+ 女
+
+
System
Seleves
@@ -121,7 +129,9 @@
-
+
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index 3a4e0b35..d98060cd 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -4,12 +4,27 @@
-
-
- Upload
-
-
- My Library
-
+
+ Upload
+
+
+ Library
+
+
+ Generate
+
@@ -17,7 +32,7 @@
+
+ = {
moodboardFiles:[],
printboardFiles:[],
generatePrintFiles:[],
+ generateFiles:[],
+ MaterialFiles:[],
+ generateList:[],
colorBoards:[],
skecthboardFiles:[],
marketingSketchFiles:[],
@@ -25,7 +32,7 @@ const UploadFilesModule : Module = {
},
mutations:{
setMoodboardFile(state,files){
- state.moodboardFiles = files
+ state.moodboardFiles = files
},
setPrintboardFile(state,files){
state.printboardFiles = files
@@ -33,6 +40,53 @@ const UploadFilesModule : Module = {
setGeneratePrintFile(state,files){
state.generatePrintFiles = files
},
+ addGenerateMaterialFils(state,data){
+ let file
+ let arr = [...state.generateFiles,...state.MaterialFiles,...state.moodboardFiles]
+ if(data.type_ == 'generate'){
+ file = state.generateFiles
+ }else{
+ file = state.MaterialFiles
+ }
+ if(file.length == 0){
+ if(arr.length >= 8){
+ message.error('You can select up to 8 images')
+ }else{
+ data.checked = true
+ file.push(data)
+ }
+ }else{
+ let str = true
+ for (let index = 0; index < file.length; index++) {
+ if(file[index].id_ == data.id_){
+ // data.id_ = GO.id++
+ str = false
+ }
+ }
+ if(str){
+ if(arr.length >= 8){
+ message.error('You can select up to 8 images')
+ }else{
+ data.checked = true
+ file.push(data)
+ }
+ }else{
+ data.checked = false
+ file = file.filter((v:any)=> v.id_ != data.id_)
+ }
+ }
+ if(data.type_ == 'generate'){
+ state.generateFiles = file
+ }else{
+ state.MaterialFiles = file
+ }
+ },
+ getGenerateList(state,list){
+ state.generateList = list
+ },
+ // setGenerateFils(state,files){
+ // state.generateFiles = files
+ // },
setColorboardList(state,colorBoards){
state.colorBoards = colorBoards
},
@@ -47,6 +101,7 @@ const UploadFilesModule : Module = {
moodboardFiles:state.moodboardFiles,
printboardFiles:state.printboardFiles,
generatePrintFiles:state.generatePrintFiles,
+ generateFiles:state.generateFiles,
colorBoards:state.colorBoards,
skecthboardFiles:state.skecthboardFiles,
marketingSketchFiles:state.marketingSketchFiles,
@@ -60,6 +115,8 @@ const UploadFilesModule : Module = {
state.moodboardFiles = []
state.printboardFiles = []
state.generatePrintFiles=[]
+ state.generateFiles = []
+ state.MaterialFiles = []
state.colorBoards = []
state.skecthboardFiles = []
state.marketingSketchFiles = []
diff --git a/src/tool/GO.ts b/src/tool/GO.ts
new file mode 100644
index 00000000..e1269108
--- /dev/null
+++ b/src/tool/GO.ts
@@ -0,0 +1,4 @@
+export default {
+ id : 1,
+ testUrl:'http://192.168.1.5:10086'
+}
\ No newline at end of file
diff --git a/src/tool/https.js b/src/tool/https.js
index deb00a8c..737e6069 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -1,7 +1,6 @@
import axios from 'axios'
// import qs from 'qs'
// import message from '@/components/public/message/src'
-
import router from '@/router/index'
import {getCookie} from '@/tool/cookie'
// import cookie from '@/tools/cookie.js'
@@ -15,11 +14,12 @@ axios.defaults.headers.post['lang'] = 'en'; //配置语言请求头
axios.defaults.withCredentials = true; //跨域携带cookie
import { message } from 'ant-design-vue';
-if(process.env.NODE_ENV == "development"){
- axios.defaults.baseURL = ""; //配置接口地址
-}else{
- axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
-}
+// if(process.env.NODE_ENV == "development"){
+// axios.defaults.baseURL = ""; //配置接口地址
+// }else{
+// axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
+// }
+axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
//POST传参序列化(添加请求拦截器)
axios.interceptors.request.use((config) => {
@@ -99,6 +99,7 @@ export const Https = {
saveOrEditTemplatePoint:'/api/library/saveOrEditTemplatePoint',//保存或者编辑template打点
libraryModelsDot:'/api/library/modelsDot',//Models打点预览
pythonChatStream:'/api/python/chatStream',//机器人助力
+ workspaceDetail:'http://192.168.1.5:10086/api/workspace/detail',//用户习惯详情
},
diff --git a/src/tool/moodb.ts b/src/tool/moodb.ts
new file mode 100644
index 00000000..9bab2560
--- /dev/null
+++ b/src/tool/moodb.ts
@@ -0,0 +1,12 @@
+export default {
+ moodb_ : [
+ [['wh4']],
+ [['wh4','wh4']],
+ [['wh4','w1h2','w1h2'],['w1h2','w1h2','wh4'],['w2h1','w2h1','wh4'],['wh4','w2h1','w2h1']],
+ [['wh1','wh1','w1h2','wh4'],['w1h2','wh1','wh1','wh4'],['wh4','wh1','wh1','w1h2'],['w1h2','w1h2','w1h2','w1h2']],
+ [['wh1','wh1','wh1','wh1','wh4'],['wh1','wh1','wh4','wh1','wh1'],['wh4','wh1','wh1','wh1','wh1'],['w1h2','w1h2','w1h2','wh1','wh1'],['wh1','wh1','w1h2','w1h2','w1h2'],['w1h2','w1h2','wh1','wh1','w1h2'],['w1h2','wh1','wh1','w1h2','w1h2']],
+ [['wh1','wh1','wh1','wh1','w1h2','w1h2'],['wh1','wh1','w1h2','wh1','wh1','w1h2'],['w1h2','w1h2','wh1','wh1','wh1','wh1'],['wh1','wh1','wh1','wh1','w2h1','w2h1'],['wh1','wh1','w2h1','w2h1','wh1','wh1'],['w2h1','w2h1','wh1','wh1','wh1','wh1']],
+ [['wh1','wh1','wh1','wh1','wh1','wh1','w1h2'],['wh1','wh1','wh1','wh1','w1h2','wh1','wh1'],['wh1','wh1','w1h2','wh1','wh1','wh1','wh1'],['w1h2','wh1','wh1','wh1','wh1','wh1','wh1'],['wh1','wh1','wh1','wh1','wh1','wh1','w2h1']],
+ [['wh1','wh1','wh1','wh1','wh1','wh1','wh1','wh1']]
+ ]
+}
\ No newline at end of file
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index b1e8cf2c..15d1972b 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -53,7 +53,7 @@
@click="resDesignCollection()">
Redesign
-
@@ -65,6 +80,8 @@
Maximum 15 images can be uploaded, Maximum 2M per image
@@ -88,7 +105,6 @@
Moodboard
- Printboard
- Colorboard
- Sketchboard
- Markets Sketch
-
-
-
-
-
-
-
-
+
+
+
+
+ Moodboard
+ Printboard
+ Colorboard
+ Sketchboard
+ Markets Sketch
+ select moodboard for your collection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts
index a53f4db9..0af4f41c 100644
--- a/src/store/uploadFile/uploadFile.ts
+++ b/src/store/uploadFile/uploadFile.ts
@@ -1,10 +1,14 @@
import {Module} from 'vuex'
import {RootState} from '../index'
+import { message } from "ant-design-vue";
interface UploadFiles{
moodboardFiles:any,
printboardFiles:any,
generatePrintFiles:any,
+ generateFiles:any,
+ MaterialFiles:any,
+ generateList:any,
colorBoards:any,
skecthboardFiles:any,
marketingSketchFiles:any,
@@ -17,6 +21,9 @@ const UploadFilesModule : Module
+
+
+
+ MoodBoard Design
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1226,3 +1226,18 @@ export default defineComponent({
}
}
+
\ No newline at end of file
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index 7623dbc5..44ca6e60 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -399,8 +399,10 @@ export default defineComponent({
};
// this.loginType = 'email'
// this.emailStap = 2;
-
- Https.axiosPost(Https.httpUrls.preLogin, data).then(
+ let loginTime = true
+ if(loginTime){
+ loginTime = false
+ Https.axiosPost(Https.httpUrls.preLogin, data).then(
(rv: any) => {
// if (rv) {
// this.loginType = 'email'
@@ -415,7 +417,12 @@ export default defineComponent({
this.createTimer();
}
}
- );
+ );
+ setTimeout(() => {
+ loginTime = true
+ }, 1000);
+ }
+
}
},
diff --git a/vue.config.js b/vue.config.js
index d937a20c..0d42afb3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,11 +14,15 @@ module.exports = defineConfig({
: '10086',
proxy: {
- "/api": {
- // target: 'https://www.aida.com.hk', //后端接口地址
- target: process.env.VUE_APP_BASE_URL,
- changeOrigin: true, //是否允许跨越
- }
+ // "/api": {
+ // // target: 'https://www.aida.com.hk', //后端接口地址
+ // target: process.env.VUE_APP_BASE_URL,
+ // changeOrigin: true, //是否允许跨越
+ // }
+ 'http://192.168.1.5:10086/api':{
+ target:'http://18.167.251.121:5567',
+ changeOrigin:true,
+ }
},
},
pluginOptions: {