From 13f7c105364289d146e2f6189cdc485724eeee75 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Wed, 24 May 2023 15:18:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LangSelect/index.vue | 38 ++--- src/lang/package/en.ts | 15 +- src/lang/package/zh-cn.ts | 13 +- src/layout/components/Navbar.vue | 22 ++- src/layout/components/TagsView/index.vue | 114 +++++++------- src/types/auto-imports.d.ts | 2 + src/views/login/index.vue | 186 +++++++++++++++++++++-- src/views/myAccount/index.vue | 34 ++++- src/views/myStore/index.vue | 28 ++-- 9 files changed, 335 insertions(+), 117 deletions(-) diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue index aa4652f..fa07016 100644 --- a/src/components/LangSelect/index.vue +++ b/src/components/LangSelect/index.vue @@ -1,22 +1,3 @@ - - + + diff --git a/src/views/myStore/index.vue b/src/views/myStore/index.vue index 9310d75..abfccee 100644 --- a/src/views/myStore/index.vue +++ b/src/views/myStore/index.vue @@ -9,7 +9,7 @@
- {{ item.title }} + {{ $t(item.title) }}
{{ item.price }}元/{{ @@ -21,7 +21,7 @@ >分钟/月
- 选择方案 + {{ $t("shop.selectPlan") }}
@@ -43,7 +43,7 @@
-
{{ presentItme.value.title }}
+
{{ $t(presentItme.value.title) }}
{{ presentItme.value.price }} 元/{{ presentItme.value.priceTime }} @@ -57,8 +57,10 @@
-
微信支付
-
支付宝支付
+
+ {{ $t("shop.WeChatPay") }} +
+
{{ $t("shop.Alipay") }}
Paypal
@@ -70,13 +72,13 @@ const title = ref(""); const list = reactive([ { color: "#f3af00", - title: "基础款", + title: "shop.Lite", icon: "", price: "0", priceTime: "14天", time: "5", authority: [ - "D-ID 水印", + "Metavatar 水印", "高级和标准演示器", "15 个 AI 演示提示", "AI 脚本世代", @@ -84,13 +86,13 @@ const list = reactive([ }, { color: "#c971ff", - title: "升级款", + title: "shop.Pro", icon: "", price: "10", priceTime: "30天", time: "10", authority: [ - "D-ID 水印", + "Metavatar 水印", "高级和标准演示器", "15 个 AI 演示提示", "AI 脚本世代", @@ -99,13 +101,13 @@ const list = reactive([ }, { color: "#7b61ff", - title: "豪华款", + title: "shop.Adv", icon: "", price: "20", priceTime: "30天", time: "15", authority: [ - "D-ID 水印", + "Metavatar 水印", "高级和标准演示器", "15 个 AI 演示提示", "AI 脚本世代", @@ -115,13 +117,13 @@ const list = reactive([ }, { color: "#000", - title: "探索款", + title: "shop.Ent", icon: "", price: "50", priceTime: "30天", time: "40", authority: [ - "D-ID 水印", + "Metavatar 水印", "高级和标准演示器", "15 个 AI 演示提示", "AI 脚本世代", From 9b6ed8392ac3a2735b7c4b5a54827e65429eb254 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Wed, 24 May 2023 15:38:33 +0800 Subject: [PATCH 2/7] upload --- package.json | 1 + src/types/auto-imports.d.ts | 2 ++ src/types/components.d.ts | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/package.json b/package.json index 458eb57..1a0a410 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "type": "module", "scripts": { "dev": "vite serve --mode development", + "build:dev": "vite build --mode development &&vue-tsc --noEmit", "build:prod": "vite build --mode production &&vue-tsc --noEmit", "prepare": "husky install", "lint:eslint": "eslint --fix --ext .ts,.js,.vue ./src ", diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index e5c7bdb..eb6c842 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -5,6 +5,7 @@ declare global { const ElForm: typeof import('element-plus/es')['ElForm'] const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] + const ElTree: typeof import('element-plus/es')['ElTree'] const asyncComputed: typeof import('@vueuse/core')['asyncComputed'] const autoResetRef: typeof import('@vueuse/core')['autoResetRef'] const computed: typeof import('vue')['computed'] @@ -274,6 +275,7 @@ declare module 'vue' { readonly ElForm: UnwrapRef readonly ElMessage: UnwrapRef readonly ElMessageBox: UnwrapRef + readonly ElTree: UnwrapRef readonly asyncComputed: UnwrapRef readonly autoResetRef: UnwrapRef readonly computed: UnwrapRef diff --git a/src/types/components.d.ts b/src/types/components.d.ts index d67af9e..4c4493c 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -8,9 +8,12 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] + ElAlert: typeof import('element-plus/es')['ElAlert'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCard: typeof import('element-plus/es')['ElCard'] + ElCol: typeof import('element-plus/es')['ElCol'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] @@ -20,25 +23,46 @@ declare module '@vue/runtime-core' { ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElLink: typeof import('element-plus/es')['ElLink'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPagination: typeof import('element-plus/es')['ElPagination'] + ElPopover: typeof import('element-plus/es')['ElPopover'] + ElRadio: typeof import('element-plus/es')['ElRadio'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] + ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] + ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] + ElUpload: typeof import('element-plus/es')['ElUpload'] GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] + IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpClose: typeof import('~icons/ep/close')['default'] + IEpCollection: typeof import('~icons/ep/collection')['default'] IEpDelete: typeof import('~icons/ep/delete')['default'] IEpDownload: typeof import('~icons/ep/download')['default'] IEpEdit: typeof import('~icons/ep/edit')['default'] IEpGoods: typeof import('~icons/ep/goods')['default'] IEpMenu: typeof import('~icons/ep/menu')['default'] + IEpPlus: typeof import('~icons/ep/plus')['default'] + IEpPosition: typeof import('~icons/ep/position')['default'] + IEpRefresh: typeof import('~icons/ep/refresh')['default'] + IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default'] + IEpSearch: typeof import('~icons/ep/search')['default'] IEpSetting: typeof import('~icons/ep/setting')['default'] + IEpTop: typeof import('~icons/ep/top')['default'] + IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default'] IEpVideoPlay: typeof import('~icons/ep/video-play')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] @@ -51,4 +75,7 @@ declare module '@vue/runtime-core' { SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default'] WangEditor: typeof import('./../components/WangEditor/index.vue')['default'] } + export interface ComponentCustomProperties { + vLoading: typeof import('element-plus/es')['ElLoadingDirective'] + } } From b03b11341bfb2d31aaa3dfa3b233121454c21285 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Wed, 24 May 2023 15:40:38 +0800 Subject: [PATCH 3/7] upload --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 1a0a410..a2c2b87 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "dev": "vite serve --mode development", "build:dev": "vite build --mode development &&vue-tsc --noEmit", "build:prod": "vite build --mode production &&vue-tsc --noEmit", - "prepare": "husky install", "lint:eslint": "eslint --fix --ext .ts,.js,.vue ./src ", "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,tsx,css,less,scss,vue,html,md}\"", "lint:stylelint": "stylelint \"**/*.{css,scss,vue}\" --fix", From dc6dcfa5140b6b83b8c803141a5c9997a2fa6a52 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Wed, 24 May 2023 15:44:28 +0800 Subject: [PATCH 4/7] upload --- package.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package.json b/package.json index a2c2b87..c0dd0f2 100644 --- a/package.json +++ b/package.json @@ -6,12 +6,7 @@ "scripts": { "dev": "vite serve --mode development", "build:dev": "vite build --mode development &&vue-tsc --noEmit", - "build:prod": "vite build --mode production &&vue-tsc --noEmit", - "lint:eslint": "eslint --fix --ext .ts,.js,.vue ./src ", - "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,tsx,css,less,scss,vue,html,md}\"", - "lint:stylelint": "stylelint \"**/*.{css,scss,vue}\" --fix", - "lint:lint-staged": "lint-staged", - "commit": "git-cz" + "build:prod": "vite build --mode production &&vue-tsc --noEmit" }, "config": { "commitizen": { From 36d701a698dc3f7da23beb04ec1ea3ecf2f0a0b2 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Wed, 24 May 2023 15:49:48 +0800 Subject: [PATCH 5/7] upload --- src/layout/components/Navbar.vue | 3 ++- src/views/createVideo/index.vue | 3 ++- src/views/myAccount/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 5fadf44..7060603 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -80,11 +80,12 @@ import { useAppStore } from "@/store/modules/app"; import { useTagsViewStore } from "@/store/modules/tagsView"; import { useUserStore } from "@/store/modules/user"; import { useI18n } from "vue-i18n"; +import LangSelect from "@/components/LangSelect/index.vue"; + const { locale } = useI18n(); // 当前语言状态与国际化组件 const lanChange = ref(locale); -import LangSelect from "@/components/LangSelect/index.vue"; const appStore = useAppStore(); const tagsViewStore = useTagsViewStore(); diff --git a/src/views/createVideo/index.vue b/src/views/createVideo/index.vue index ed9145e..d9c5c36 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -141,6 +141,7 @@