diff --git a/.env.dev b/.env.dev index d48a5159..5f371239 100644 --- a/.env.dev +++ b/.env.dev @@ -8,5 +8,5 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # 徐佩 # VUE_APP_BASE_URL = 'http://192.168.31.118:5567' # 海波 -VUE_APP_BASE_URL = 'http://192.168.1.3:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.3:5567' diff --git a/src/component/home/chat/index.vue b/src/component/home/chat/index.vue index ca51a41e..3f1fd4cf 100644 --- a/src/component/home/chat/index.vue +++ b/src/component/home/chat/index.vue @@ -1,6 +1,9 @@ + \ No newline at end of file diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue index 4b7f0fa6..aae93edb 100644 --- a/src/component/home/newProject/workspace.vue +++ b/src/component/home/newProject/workspace.vue @@ -55,7 +55,7 @@ -
+
Category:
@@ -128,9 +128,12 @@ export default defineComponent({ }, setIsShowMark:inject('setIsShowMark') as any, }) - watch(()=>data.selectObject_,(newVal)=>{ - data.selectObject = JSON.parse(JSON.stringify(newVal)) - }) + // watch(()=>data.selectObject_,(newVal)=>{ + // data.selectObject = JSON.parse(JSON.stringify(newVal)) + // }) + const init = (storeData:any)=>{ + data.selectObject = JSON.parse(JSON.stringify(storeData)) + } const dataDom = reactive({ habitSetStyle:null as any, }) @@ -244,6 +247,7 @@ export default defineComponent({ projectList, ...toRefs(dataDom), ...toRefs(data), + init, setStyle, setWorkspaceStyle, setprintModel, @@ -270,7 +274,6 @@ export default defineComponent({ align-items: center; font-weight: 600; font-size: 1.8rem; - border: 1px solid #0000001a; padding: 1.2rem; border-radius: 2.4rem; > .workspaceBox{ diff --git a/src/lang/en.ts b/src/lang/en.ts index 0cafc354..f1f4c4f1 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -693,8 +693,8 @@ export default { title:'Find Your Ideal Plan', Monthly:'Monthly', Yearly:'Yearly', - promotionCode:'Promotion code', - use:'Use', + promotionCode:'Coupon', + use:'Apply', PromoCodeError:'Please check if the promo code is correct or if the date has expired', CreditCard:'Credit Card', Alipay:'Alipay', diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index d83f4c94..01a50bc1 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -41,9 +41,13 @@
-
+ +
+ + Setting
@@ -196,7 +200,7 @@ You can use these features only after becoming a regular user~
- +
@@ -212,6 +216,7 @@ +