diff --git a/components.d.ts b/components.d.ts index db1401b4..1c57248a 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,20 +9,31 @@ export {} declare module 'vue' { export interface GlobalComponents { ABadge: typeof import('ant-design-vue/es')['Badge'] + ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb'] ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] + ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADrawer: typeof import('ant-design-vue/es')['Drawer'] AImage: typeof import('ant-design-vue/es')['Image'] AInputNumber: typeof import('ant-design-vue/es')['InputNumber'] + AMenu: typeof import('ant-design-vue/es')['Menu'] + AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] AModal: typeof import('ant-design-vue/es')['Modal'] + APagination: typeof import('ant-design-vue/es')['Pagination'] APopover: typeof import('ant-design-vue/es')['Popover'] ARangePicker: typeof import('ant-design-vue/es')['RangePicker'] ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] ASlider: typeof import('ant-design-vue/es')['Slider'] + ASpace: typeof import('ant-design-vue/es')['Space'] ASpin: typeof import('ant-design-vue/es')['Spin'] + ASubMenu: typeof import('ant-design-vue/es')['SubMenu'] ASwitch: typeof import('ant-design-vue/es')['Switch'] ATable: typeof import('ant-design-vue/es')['Table'] + ATabPane: typeof import('ant-design-vue/es')['TabPane'] + ATabs: typeof import('ant-design-vue/es')['Tabs'] + ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker'] AUpload: typeof import('ant-design-vue/es')['Upload'] + ElCascader: typeof import('element-plus/es')['ElCascader'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] } diff --git a/src/assets/style/style.css b/src/assets/style/style.css index da7c4baf..90b42860 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1001,7 +1001,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte position: absolute; top: 0; right: 0; - transform: translate(100%, -100%); + transform: translate(100%, -50%); cursor: pointer; width: calc(4rem*1.2); height: calc(4rem*1.2); diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 8d6c1436..e06c3b65 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1093,7 +1093,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte position: absolute; top: 0; right: 0; - transform: translate(100%, -100%); + transform: translate(100%, -50%); cursor: pointer; width: calc(4rem*1.2); height: calc(4rem*1.2); diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 58728787..b3e5c883 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -137,7 +137,7 @@
{{ item.label }}
diff --git a/src/component/HomePage/renew.vue b/src/component/HomePage/renew.vue index a65387e7..de626e08 100644 --- a/src/component/HomePage/renew.vue +++ b/src/component/HomePage/renew.vue @@ -314,7 +314,7 @@ export default defineComponent({ }, { price: "500", - sellWell: true, + sellWell: false, activity: false, //活动打折 type: { value: "Month", @@ -337,7 +337,7 @@ export default defineComponent({ value: "Year", label: computed(()=>t("Renew.Yearly")), }, - PaymentType: "", + PaymentType: "CreditCard", promotionData: { code: "", error: "", diff --git a/src/component/Pay/payMethod.vue b/src/component/Pay/payMethod.vue index f43e8186..bb7756a7 100644 --- a/src/component/Pay/payMethod.vue +++ b/src/component/Pay/payMethod.vue @@ -195,7 +195,7 @@ export default defineComponent({ }; const cancelDsign = () => { payMethod.payMethodModel = false; - store.dispatch('getLangType') + if(prop.type != 'credits')store.dispatch('getUserDetail') }; const payAffirm = () => { if (!payMethodData.clause) { diff --git a/src/lang/en.ts b/src/lang/en.ts index 0786aefc..492f531d 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1283,7 +1283,7 @@ export default { changeBackground:'Change the background', toproductFlus:'Premium', toproductBasic:'Basic', - generateWx:'High', + generateWx:'Premium', generateFlux:'Advanced', generateNormal:'Normal', }, diff --git a/src/tool/https.js b/src/tool/https.js index 25709083..d6b36d6b 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -31,6 +31,7 @@ let httpIp = import.meta.env.VITE_USER_NODE_ENV == 'development' ? "" : ""; axios.defaults.baseURL = httpIp; //配置接口地址 // console.log(axios.defaults.baseURL); axios.defaults.baseURL = import.meta.env.VITE_APP_BASE_URL; //配置接口地址 +console.log(import.meta.env.VITE_APP_BASE_URL) // 创建取消令牌 const CancelToken = axios.CancelToken; diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 99855d80..65b2648d 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -118,7 +118,7 @@
-
+
{{$t('Header.openUpgrade')}} @@ -1606,7 +1606,6 @@ export default defineComponent({ cursor: pointer; background: #fff; img{ - background: #000; width: 100%; height: 100%; object-fit: cover; diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue index 45fa31b7..5c53d80a 100644 --- a/src/views/HomeView/Works.vue +++ b/src/views/HomeView/Works.vue @@ -218,9 +218,9 @@ export default defineComponent({ if(filter.isShowMark && !filter.isNoData)return filter.isShowMark = true - if(prop.otherUsers){ + // if(prop.otherUsers){ data.accountId = store.state.UserHabit.userDetail.userId - } + // } Https.axiosPost(Https.httpUrls.getPorfolio, data) .then((rv) => { if(data.page == 1 && rv.content.length == 0){ diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index e79b707d..0751cfba 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -436,7 +436,7 @@
{{ item.label }}