From b3a64cba8b71fd7355f167f71c4307c94585a7cf Mon Sep 17 00:00:00 2001 From: woody Date: Thu, 28 Aug 2025 14:18:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(argeement):=20=E9=9A=90=E8=97=8F=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 14 +- src/assets/i18n/index.js | 101 +- src/components/agreement.vue | 83 +- src/views/hiFans/index.vue | 2269 +++++++++++++++------------ src/views/integral/index.vue | 1733 +++++++++++--------- src/views/register/index.vue | 17 +- src/views/repurchase/index.vue | 2443 +++++++++++++++-------------- src/views/rescission/index.vue | 1704 +++++++++++--------- src/views/shareConfirm/index.vue | 684 ++++---- src/views/spaceRegister/index.vue | 1710 ++++++++++---------- src/views/tvIng/index.vue | 1718 +++++++++++--------- src/views/upgrade/index.vue | 23 +- src/views/welfare/index.vue | 1727 ++++++++++---------- 13 files changed, 7667 insertions(+), 6559 deletions(-) diff --git a/src/App.vue b/src/App.vue index 113618d..c8b7127 100644 --- a/src/App.vue +++ b/src/App.vue @@ -17,9 +17,7 @@ import HeaderTop from "@/components/HeaderTop"; import enLocale from "element-ui/lib/locale/lang/en"; import zhLocale from "element-ui/lib/locale/lang/zh-CN"; -import ruLocale from "element-ui/lib/locale/lang/ru-RU"; -import frLocale from "element-ui/lib/locale/lang/fr"; -import ptLocale from "element-ui/lib/locale/lang/pt"; + import { env } from "echarts"; export default { components: { @@ -36,7 +34,6 @@ export default { self.loading = false; self.addScriptChild("zh-CN"); self.addScriptChild("en-US"); - self.addScriptChild("ru-RU"); self.addScriptChild("fr-FR"); if (process.env.NODE_ENV != "production") { // self.addScriptChild("fr-FR"); @@ -150,14 +147,7 @@ export default { ...enLocale, }); } - if (name == "ru-RU") { - if (ruRU) { - const localruRU = this.getJS(ruRU, "ruRU"); - var STlocalruRU = JSON.stringify(localruRU); - localStorage.setItem("local-ruRU", STlocalruRU); - } - this.$i18n.mergeLocaleMessage(name, ruRU); - } + if (name == "fr-FR") { if (frFR) { const localfrFR = this.getJS(frFR, "frFR"); diff --git a/src/assets/i18n/index.js b/src/assets/i18n/index.js index f49aa07..143e262 100644 --- a/src/assets/i18n/index.js +++ b/src/assets/i18n/index.js @@ -1,46 +1,45 @@ /* - * @Descripttion: - * @version: + * @Descripttion: + * @version: * @Author: kBank * @Date: 2022-07-05 17:57:49 */ -import Vue from 'vue' -import VueI18n from 'vue-i18n' -import locale from 'element-ui/lib/locale' +import Vue from "vue"; +import VueI18n from "vue-i18n"; +import locale from "element-ui/lib/locale"; // import zhCn from 'zhCN' // import enUS from 'enUS' // import ruRU from 'ruRU' // import frFR from 'frFR' // import ptPT from 'ptPT' -var localenUS = {} -var localzhCN = {} -var localruRU = {} -var localfrFR = {} -var localptPT = {} -if (localStorage.getItem('local-enUS') != undefined) { - localenUS = JSON.parse(localStorage.getItem('local-enUS')); +var localenUS = {}; +var localzhCN = {}; +var localruRU = {}; +var localfrFR = {}; +var localptPT = {}; +if (localStorage.getItem("local-enUS") != undefined) { + localenUS = JSON.parse(localStorage.getItem("local-enUS")); } -if (localStorage.getItem('local-zhCN') != undefined) { - localzhCN = JSON.parse(localStorage.getItem('local-zhCN')); +if (localStorage.getItem("local-zhCN") != undefined) { + localzhCN = JSON.parse(localStorage.getItem("local-zhCN")); } -if (localStorage.getItem('local-ruRU') != undefined) { - localruRU = JSON.parse(localStorage.getItem('local-ruRU')); +if (localStorage.getItem("local-ruRU") != undefined) { + localruRU = JSON.parse(localStorage.getItem("local-ruRU")); } -if (localStorage.getItem('local-frFR') != undefined) { - localfrFR = JSON.parse(localStorage.getItem('local-frFR')); +if (localStorage.getItem("local-frFR") != undefined) { + localfrFR = JSON.parse(localStorage.getItem("local-frFR")); } -if (localStorage.getItem('local-ptPT') != undefined) { - localptPT = JSON.parse(localStorage.getItem('local-ptPT')); +if (localStorage.getItem("local-ptPT") != undefined) { + localptPT = JSON.parse(localStorage.getItem("local-ptPT")); } -import enLocale from 'element-ui/lib/locale/lang/en' -import zhLocale from 'element-ui/lib/locale/lang/zh-CN' -import ruLocale from 'element-ui/lib/locale/lang/ru-RU' -import frLocale from 'element-ui/lib/locale/lang/fr' -import ptLocale from 'element-ui/lib/locale/lang/pt' -const lang = localStorage.getItem('lang') || 'en-US' +import enLocale from "element-ui/lib/locale/lang/en"; +import zhLocale from "element-ui/lib/locale/lang/zh-CN"; +import frLocale from "element-ui/lib/locale/lang/fr"; +import ptLocale from "element-ui/lib/locale/lang/pt"; +const lang = localStorage.getItem("lang") || "en-US"; -Vue.use(VueI18n) -console.log('18n') +Vue.use(VueI18n); +console.log("18n"); const i18n = new VueI18n({ locale: lang, @@ -51,30 +50,24 @@ const i18n = new VueI18n({ // 'ru-RU': { ...ruRU }, // 'fr-FR': { ...frFR }, // 'pt-PT': { ...ptPT }, - 'zh-CN': { - ...localzhCN, - ...zhLocale - }, - 'en-US': { - ...localenUS, - ...enLocale - }, - 'ru-RU': { - ...localruRU, - ...ruLocale - }, - 'fr-FR': { - ...localfrFR, - ...frLocale - }, - 'pt-PT': { - ...localptPT, - ...ptLocale - }, - } - -}) -locale.i18n((key, value) => i18n.t(key, value)) -export default i18n - + "zh-CN": { + ...localzhCN, + ...zhLocale, + }, + "en-US": { + ...localenUS, + ...enLocale, + }, + "fr-FR": { + ...localfrFR, + ...frLocale, + }, + "pt-PT": { + ...localptPT, + ...ptLocale, + }, + }, +}); +locale.i18n((key, value) => i18n.t(key, value)); +export default i18n; diff --git a/src/components/agreement.vue b/src/components/agreement.vue index 00eb1ed..7e6ff84 100644 --- a/src/components/agreement.vue +++ b/src/components/agreement.vue @@ -13,20 +13,17 @@ diff --git a/src/views/integral/index.vue b/src/views/integral/index.vue index c11eeb9..d08286c 100644 --- a/src/views/integral/index.vue +++ b/src/views/integral/index.vue @@ -5,881 +5,1044 @@ * @Date: 2023-01-29 17:32:44 --> diff --git a/src/views/register/index.vue b/src/views/register/index.vue index 1d0a1d5..c87bb23 100644 --- a/src/views/register/index.vue +++ b/src/views/register/index.vue @@ -732,11 +732,11 @@
- + > -->
{{ $t("w_0085") }}
@@ -1036,7 +1036,7 @@ export default { ], allGoodsData: {}, allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ // { @@ -1121,9 +1121,7 @@ export default { //获取仓库 this.getStorehouseList(); } - if (this.userInfo.buyAgreementFlag == 1) { - this.agreementShow = true; - } + // this.howRegiest = localStorage.getItem('howRegiest') || 0 // 幂等性 api.generate().then((res) => { @@ -1400,13 +1398,6 @@ export default { }); }); this.$refs[formName].validate((valid) => { - if (!this.agreementShow) { - this.$message({ - message: this.$t("w_0091"), - type: "warning", - }); - return; - } if (valid) { this.openLoading(); let obj = Object.assign({}, this.allGoodsData, this.ruleForm, { diff --git a/src/views/repurchase/index.vue b/src/views/repurchase/index.vue index c4a1075..646b958 100644 --- a/src/views/repurchase/index.vue +++ b/src/views/repurchase/index.vue @@ -6,61 +6,101 @@ * *复消专区 --> \ No newline at end of file +.tab_b { + text-align: right; + font-size: 12px; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #666666; + padding: 20px 60px 0 0; +} + diff --git a/src/views/rescission/index.vue b/src/views/rescission/index.vue index beda0cc..daa15b8 100644 --- a/src/views/rescission/index.vue +++ b/src/views/rescission/index.vue @@ -5,879 +5,1015 @@ * @Date: 2023-01-29 17:32:44 --> diff --git a/src/views/shareConfirm/index.vue b/src/views/shareConfirm/index.vue index 4b9de4a..8a0eb0d 100644 --- a/src/views/shareConfirm/index.vue +++ b/src/views/shareConfirm/index.vue @@ -20,12 +20,14 @@
--> - +
-
{{ $t('w_0065') }}
-
{{ $t('w_0066') }}
+
{{ $t("w_0065") }}
+
{{ $t("w_0066") }}
- + - - + + - - + + - - + + - - + + - + - + - +
-
-
{{ $t('w_0073') }}
+
+
{{ $t("w_0073") }}
-
-
- {{ }} -
{{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)
-
{{ $t('w_0074') }}
-
{{ $t('w_0075') }}
-
{{ $t('w_0076') }}
-
{{ $t('ENU_CONTROL_TYPE_3') }}
+
+
+ {{ + }} +
+ {{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收) +
+
+ {{ $t("w_0074") }} +
+
+ {{ $t("w_0075") }} +
+
+ {{ $t("w_0076") }} +
+
+ {{ $t("ENU_CONTROL_TYPE_3") }} +
-
{{ $t('w_0132') }}
+
{{ $t("w_0132") }}
- - + + - + - + - + - + - +
-
{{ $t('w_0071') }}:{{ userInfo.currencyIcon }}{{ ruleForm.postage | numberToCurrency }}
+
+ {{ $t("w_0071") }}:{{ userInfo.currencyIcon + }}{{ ruleForm.postage | numberToCurrency }} +
- +
-
+
-
{{ $t('w_0325') }}:
-
{{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency}}
+
{{ $t("w_0325") }}:
+
+ {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }} +
-
-
{{ $t('w_0084') }}：{{ruleForm.nameList}}{{ ruleForm.recAddress }}
-
{{ $t('MY_ORD_10') }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}
+
+
+ {{ $t("w_0084") }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }} +
+
+ {{ $t("MY_ORD_10") }}：{{ ruleForm.recName }} + {{ ruleForm.recPhone }} +
- -
{{ $t('w_0085') }}
+ +
+ {{ $t("w_0085") }} +
- +
\ No newline at end of file + diff --git a/src/views/spaceRegister/index.vue b/src/views/spaceRegister/index.vue index 7bb1d48..4ac8e69 100644 --- a/src/views/spaceRegister/index.vue +++ b/src/views/spaceRegister/index.vue @@ -5,882 +5,1016 @@ * @Date: 2023-01-29 17:32:44 --> diff --git a/src/views/tvIng/index.vue b/src/views/tvIng/index.vue index 785b63d..35384c4 100644 --- a/src/views/tvIng/index.vue +++ b/src/views/tvIng/index.vue @@ -5,879 +5,1029 @@ * @Date: 2023-01-29 17:32:44 --> diff --git a/src/views/upgrade/index.vue b/src/views/upgrade/index.vue index 0ec1ccf..954af04 100644 --- a/src/views/upgrade/index.vue +++ b/src/views/upgrade/index.vue @@ -512,11 +512,11 @@
- + > -->
{{ $t("w_0085") }}
@@ -679,7 +679,7 @@ export default { moren: "", allGoodsData: [], allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ { @@ -788,9 +788,6 @@ export default { this.ruleForm.transType = 1; this.ruleForm.deliveryWay = 1; } - if (this.userInfo.buyAgreementFlag == 1) { - this.agreementShow = true; - } }, methods: { handleSizeChange(val) { @@ -1043,13 +1040,13 @@ export default { shoppingId: item, }); }); - if (!this.agreementShow) { - this.$message({ - message: this.$t("w_0091"), - type: "warning", - }); - return; - } + // if (!this.agreementShow) { + // this.$message({ + // message: this.$t("w_0091"), + // type: "warning", + // }); + // return; + // } if (this.isDeliveryWay && !this.ruleForm.recPhone) { this.$message({ message: this.$t("w_0092"), diff --git a/src/views/welfare/index.vue b/src/views/welfare/index.vue index fb69fd3..3bd27db 100644 --- a/src/views/welfare/index.vue +++ b/src/views/welfare/index.vue @@ -5,882 +5,1035 @@ * @Date: 2023-01-29 17:32:44 -->