From 575875ec661f18034108f393b136227c13ac4f68 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 12:34:58 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=90=E7=A7=81?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/LoginPage/login/enterprise.vue | 2 +- src/component/LoginPage/login/personal.vue | 2 +- src/component/LoginPage/login/school.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue index f5fd7522..8c582cc9 100644 --- a/src/component/LoginPage/login/enterprise.vue +++ b/src/component/LoginPage/login/enterprise.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue index 20a1f7ae..0278d701 100644 --- a/src/component/LoginPage/login/personal.vue +++ b/src/component/LoginPage/login/personal.vue @@ -88,7 +88,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue index 7435cc00..fb62faec 100644 --- a/src/component/LoginPage/login/school.vue +++ b/src/component/LoginPage/login/school.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. From 80e1d4638f0b6d87097dc0ab399dd1d0107b4918 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 12:35:57 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=90=E7=A7=81?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/LoginPage/login/enterprise.vue | 2 +- src/component/LoginPage/login/personal.vue | 2 +- src/component/LoginPage/login/school.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue index 8c582cc9..a5391b45 100644 --- a/src/component/LoginPage/login/enterprise.vue +++ b/src/component/LoginPage/login/enterprise.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue index 0278d701..8afe7b59 100644 --- a/src/component/LoginPage/login/personal.vue +++ b/src/component/LoginPage/login/personal.vue @@ -88,7 +88,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue index fb62faec..60ca77d5 100644 --- a/src/component/LoginPage/login/school.vue +++ b/src/component/LoginPage/login/school.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. From cd28861f0ca986ac5d422a8ad2106a5aa867afe6 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 13:36:10 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=92=8C=E5=9C=B0=E5=8C=BA=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/cn.ts | 2 +- src/lang/en.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/cn.ts b/src/lang/cn.ts index ded270bc..7e05ad57 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -751,7 +751,7 @@ export default { editUser: "修改个人信息", notModifiable: "没有修改次数", remainingModifications: "本月剩余次数：", - Country: "国家", + Country: "国家或地区", CompanyName: "职业", Status: "状态", Valid: "有效", diff --git a/src/lang/en.ts b/src/lang/en.ts index 0928c6d4..7e59d3b8 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -753,7 +753,7 @@ export default { editUser: "Change Information", notModifiable: "Not modifiable", remainingModifications: "Remaining this month:", - Country: "Country", + Country: "Country or Region", CompanyName: "Occupation", Status: "Status", Valid: "Valid", From 6402ab4b64b350b0d5a277211379b38b3cf26352 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 13:37:49 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=82=AE=E7=AE=B1icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Account/account.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/Account/account.vue b/src/component/Account/account.vue index 57f7a42e..6a9280e5 100644 --- a/src/component/Account/account.vue +++ b/src/component/Account/account.vue @@ -50,10 +50,10 @@
{{ userDetail.email }}
-
+
From 4f5a02bcf3e002514a56ef372a8578ea3dd2b2d0 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 14:01:44 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Account/frontPage/mylnformation.vue | 2 +- src/component/Administrator/SE/recentActiveChart.vue | 4 +++- .../Administrator/Transaction/TransactionTable.vue | 4 ++-- src/component/Administrator/allUser.vue | 4 ++-- src/component/Administrator/recentActiveUser.vue | 4 ++-- src/component/Administrator/recentNewUser.vue | 4 ++-- src/lang/cn.ts | 12 ++++++++++++ src/lang/en.ts | 12 ++++++++++++ src/store/userHabit/userHabit.ts | 2 +- 9 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/component/Account/frontPage/mylnformation.vue b/src/component/Account/frontPage/mylnformation.vue index e5df3e55..80175852 100644 --- a/src/component/Account/frontPage/mylnformation.vue +++ b/src/component/Account/frontPage/mylnformation.vue @@ -28,7 +28,7 @@ optionFilterProp="label" :options="countryList" :field-names="{ label: locale == 'CHINESE_SIMPLIFIED'?'labelCn':'label' }" - placeholder="Please select" + :placeholder="`${$t('account.plaseSelect')} ${$t('account.Country')}`" allowClear show-search > diff --git a/src/component/Administrator/SE/recentActiveChart.vue b/src/component/Administrator/SE/recentActiveChart.vue index d9251b36..fe27f030 100644 --- a/src/component/Administrator/SE/recentActiveChart.vue +++ b/src/component/Administrator/SE/recentActiveChart.vue @@ -77,10 +77,12 @@ import { PieChart } from 'echarts/charts'; import { LabelLayout } from 'echarts/features'; import { useStore } from "vuex"; import { CanvasRenderer } from 'echarts/renderers'; +import { useI18n } from 'vue-i18n' export default defineComponent({ components: { }, setup() { + const {t} = useI18n() const store:any = useStore() let filter:any = reactive({ dataList:computed(()=>{ @@ -115,7 +117,7 @@ export default defineComponent({ let data:any = [] rv.names.forEach((item:any,index:number) => { let obj = { - name : item, + name : t(`admin.${item}`), value:rv.values[index], } data.push(obj) diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index 8e153108..48c4d595 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -365,11 +365,11 @@ export default defineComponent({ ellipsis:true }, { - title: "Country", + title: "Country or Region", align: "center", dataIndex: "country", key: "country", - width:150, + width:200, ellipsis:true }, { diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index e162e58d..2bff6e11 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -292,11 +292,11 @@ export default defineComponent({ }, }, { - title: "Country", + title: "Country or Region", align: "center", dataIndex: "country", key: "country", - width:100, + width:200, }, { title: "Create Date", diff --git a/src/component/Administrator/recentActiveUser.vue b/src/component/Administrator/recentActiveUser.vue index 421ef4af..9a8cd832 100644 --- a/src/component/Administrator/recentActiveUser.vue +++ b/src/component/Administrator/recentActiveUser.vue @@ -150,11 +150,11 @@ export default defineComponent({ }, }, { - title: "Country", + title: "Country or Region", align: "center", dataIndex: "country", key: "country", - width:100, + width:200, }, { title: "Create Date", diff --git a/src/component/Administrator/recentNewUser.vue b/src/component/Administrator/recentNewUser.vue index da8a628a..33bed9d4 100644 --- a/src/component/Administrator/recentNewUser.vue +++ b/src/component/Administrator/recentNewUser.vue @@ -177,11 +177,11 @@ export default defineComponent({ }, }, { - title: "Country", + title: "Country or Region", align: "center", dataIndex: "country", key: "country", - width:100, + width:200, }, { title: "Create Date", diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 7e05ad57..868f504b 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -751,6 +751,7 @@ export default { editUser: "修改个人信息", notModifiable: "没有修改次数", remainingModifications: "本月剩余次数：", + plaseSelect:"请选择", Country: "国家或地区", CompanyName: "职业", Status: "状态", @@ -1348,5 +1349,16 @@ export default { jsContent1:'邮箱格式有误', jsContent2:'请检查所有带 * 号的内容', jsDelete:'确定删除这一项吗', + Design:'设计', + SingleDesign:'单品设计', + MoodBoard:'情绪版', + PrintBoard:'印花板', + SketchBoard:'线稿板', + Pattern:'设计', + Logo:'标志', + Slogan:'标语', + ToProductImage:'产品图', + Relight:'打光', + ChatRobot:'对话生成', }, }; diff --git a/src/lang/en.ts b/src/lang/en.ts index 7e59d3b8..ba768f27 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -753,6 +753,7 @@ export default { editUser: "Change Information", notModifiable: "Not modifiable", remainingModifications: "Remaining this month:", + plaseSelect:"Please select", Country: "Country or Region", CompanyName: "Occupation", Status: "Status", @@ -1350,5 +1351,16 @@ export default { jsContent1:'The email format is incorrect', jsContent2:'Please check the input box marked with *', jsDelete:'Are you sure you want to delete this item?', + Design:'Design', + SingleDesign:'SingleDesign', + MoodBoard:'MoodBoard', + PrintBoard:'PrintBoard', + SketchBoard:'SketchBoard', + Pattern:'Pattern', + Logo:'Logo', + Slogan:'Slogan', + ToProductImage:'ToProductImage', + Relight:'Relight', + ChatRobot:'ChatRobot', }, }; diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index d76ad75a..19c70970 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -265,7 +265,7 @@ const userHabit : Module = { */ state.userDetail.affiliate = data.affiliate state.userDetail.systemUser = data.systemUser - // state.userDetail.systemUser = 3 + state.userDetail.systemUser = 7 // 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户 state.userDetail.systemList = [] if(data.systemUser != 0)state.userDetail.systemList.push(1) From 042d5db0500b863af4b8b5709f7830443863afb6 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 14:09:56 +0800 Subject: [PATCH 06/17] fix --- src/store/userHabit/userHabit.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index 19c70970..d76ad75a 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -265,7 +265,7 @@ const userHabit : Module = { */ state.userDetail.affiliate = data.affiliate state.userDetail.systemUser = data.systemUser - state.userDetail.systemUser = 7 + // state.userDetail.systemUser = 3 // 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户 state.userDetail.systemList = [] if(data.systemUser != 0)state.userDetail.systemList.push(1) From f4d91986bbd22815adb70a946ace105c0f97177a Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 15:09:26 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=89=87=E5=BA=95=E5=9B=BE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=BA=BF=E7=A8=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/canvas/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 875d8d6b..8ac6b936 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -35,7 +35,7 @@ --> { instance.appContext.config.globalProperties.$dropdownEvents.onClose(removeOpenSpeed) + if(props.msg == 'Sketchboard'){ + speed.speedData = speed.speedList[1] + } }) onUnmounted(() => { @@ -1008,6 +1011,7 @@ export default defineComponent({ this.searchPictureName = ""; }, onPaste(e:any){ + if(this.sketchboardList.length != 0)return if(e.clipboardData.files[0] && !this.isTextarea && this.upload.level1Type !== 'Moodboard' && this.scene?.value != 'Slogan' && this.scene?.value != 'Logo'){ let param = new FormData(); param.append('inPin','0') diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index f858ef3a..56da44fd 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -357,7 +357,7 @@ - +
@@ -857,7 +857,6 @@ export default defineComponent({ dataDom.createBrand.openAddBrand() } const editImg = (item:any,index:number)=>{ - console.log(item) pageData.editIndex = index dataDom.modalCanvas.init(item,'') // imgList @@ -995,7 +994,7 @@ export default defineComponent({ label:'' } }else{ - if(newVal.value == "Pattern"){ + if(newVal.value == "Pattern" || this.selectCode == 'Sketchboard'){ this.speedData = this.speedList[1] }else{ this.speedData = this.speedList[0] @@ -1935,6 +1934,7 @@ export default defineComponent({ scaleImage.init(list,index) }, onPaste(e:any){ + if(this.selectGenerateList.length != 0)return if(e.clipboardData.files[0] && !this.isTextarea && this.selectCode !== 'Moodboard' && this.scene?.value != 'Slogan' && this.scene?.value != 'Logo'){ let param = new FormData(); param.append('inPin','0') From b8e406cea4f2972220fadb3056a87e6f4e8d5334 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 23 Sep 2025 16:02:24 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=90=97=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administrator/coupons/addAllUser.vue | 623 +++++++++--------- src/component/Detail/DesignDetail.vue | 22 +- 2 files changed, 341 insertions(+), 304 deletions(-) diff --git a/src/component/Administrator/coupons/addAllUser.vue b/src/component/Administrator/coupons/addAllUser.vue index a279de62..4825fd42 100644 --- a/src/component/Administrator/coupons/addAllUser.vue +++ b/src/component/Administrator/coupons/addAllUser.vue @@ -1,298 +1,331 @@ - - - + + + \ No newline at end of file diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 92313e5b..f403661b 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -299,7 +299,11 @@ export default defineComponent({ // ] let isCurrent = list[i].id == detailData?.selectDetail?.id console.log(isCurrent,newData) - let color = (detailData.currentDetailType == 'color' && isCurrent)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'') + let color = (detailData.currentDetailType == 'color' && isCurrent && !detailData.isEditPattern.value)? + (newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''): + (list[i].color?.rgba?.r? + `${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`: + '') if(detailData.currentDetailType == 'sketch' && newData){ color = detailData.designDetail.clothes[0].color?.rgba?.r?`${detailData.designDetail.clothes[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:'' detailData.selectDetail.maskUrl = '' @@ -308,8 +312,8 @@ export default defineComponent({ let data:any = { changed:false, color, - designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType, - id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id, + designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.designType:list[i].designType, + id:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.id:list[i].id, maskMinioUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskMinioUrl, // maskUrl:'', maskUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskUrl, @@ -320,19 +324,19 @@ export default defineComponent({ offset, partialDesign:list[i].partialDesign || {}, // partialDesign:detailData.isEditPattern.value?list[i].partialDesign:{}, - path:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.minIOPath:list[i].minIOPath, - printObject:(newData && detailData.currentDetailType == 'print' && isCurrent)?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]}, + path:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.minIOPath:list[i].minIOPath, + printObject:(newData && detailData.currentDetailType == 'print' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]}, priority, // scale:[ // 0.5, // 0.35822305 // ], scale:[scale[0]?scale[0]:1,scale[1]?scale[1]:1], - type:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.level2Type || newData.categoryValue:list[i].type, + type:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.level2Type || newData.categoryValue:list[i].type, sketchString:list[i].sketchString?list[i].sketchString:'', - trims:(newData && detailData.currentDetailType == 'element' && isCurrent)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]}, + trims:(newData && detailData.currentDetailType == 'element' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]}, } - if((list[i].color?.gradient || list[i].newDetail?.color?.gradient)){ + if((list[i].color?.gradient || list[i].newDetail?.color?.gradient) && !detailData.isEditPattern.value){ gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient gradient.colorImg = await setGradual(gradient,320,700) data.gradient = gradient @@ -388,7 +392,7 @@ export default defineComponent({ designSingleItemDTOList:clothes, isPreview:false, // ifSubmit:designItemDetail.isPreview, - gender:workspace?.sex == 'Male'?1:0, + gender:workspace?.sex, sketchString:'', modelId:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.id:detailData.designDetail.oldModel?detailData.designDetail.oldModel.id:'', modelType:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.type:detailData.designDetail.oldModel?detailData.designDetail.oldModel.type:'', From d61bb741d045ec514a3f9335c18112867eb2c079 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 23 Sep 2025 16:20:21 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=89=93=E5=BC=80=E8=B0=B7=E6=AD=8C?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Account/frontPage/bindPage.vue | 31 +++++---- src/component/LoginPage/googleLogin.vue | 70 ++++++++++++++------ 2 files changed, 69 insertions(+), 32 deletions(-) diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue index 0557f7e9..61e81949 100644 --- a/src/component/Account/frontPage/bindPage.vue +++ b/src/component/Account/frontPage/bindPage.vue @@ -27,10 +27,10 @@
{{ $t('frontPage.Unbind') }}
--> -
-
{{ $t('frontPage.BindNow') }}
- -
{{ $t('frontPage.Unbind') }}
+
+
{{ $t('frontPage.BindNow') }}
+
+
{{ $t('frontPage.Unbind') }}
@@ -138,12 +138,13 @@ export default defineComponent({ bindPageDom.bindEmail.init('Modify') } - const toGmailLogin = ()=>{ - message.info(t('account.canNotUtilize')) - } onMounted(async ()=>{ - return - let GOOGLE_CLIENT_ID = '29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com' + let GOOGLE_CLIENT_ID + if(import.meta.env.VITE_USER_NODE_ENV == 'development'){ + GOOGLE_CLIENT_ID = '157095842121-kdd1fdf8m8nudvj9sprstb2k2prnf9e4.apps.googleusercontent.com' + }else{ + GOOGLE_CLIENT_ID = '29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com' + } var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`); if(!window.isAddGmail){ if(!existingScript){ @@ -206,7 +207,6 @@ export default defineComponent({ ungroupGoogleModel, ungroupWeiXinModel, modifyEmail, - toGmailLogin, } }, data(){ @@ -271,14 +271,21 @@ export default defineComponent({ } >.gmail_btn{ position: relative; + border-radius: 4rem; + overflow: hidden; + > .gallery_btn{ + position: relative; + z-index: 2; + pointer-events: none; + } #g_id_bind{ position: absolute; left: 0; top: 0; width: 100%; height: 100%; - opacity: 0; - z-index: 2; + // opacity: 0; + z-index: 1; :deep(.nsm7Bb-HzV7m-LgbsSe.Bz112c-LgbsSe){ width: 100%; } diff --git a/src/component/LoginPage/googleLogin.vue b/src/component/LoginPage/googleLogin.vue index 74b17e88..47839f26 100644 --- a/src/component/LoginPage/googleLogin.vue +++ b/src/component/LoginPage/googleLogin.vue @@ -1,9 +1,10 @@