diff --git a/components.d.ts b/components.d.ts index 2a14798..14a87fa 100644 --- a/components.d.ts +++ b/components.d.ts @@ -12,6 +12,41 @@ declare module 'vue' { Back: typeof import('./src/components/Back.vue')['default'] Cart: typeof import('./src/components/Cart.vue')['default'] MerList: typeof import('./src/components/MerList.vue')['default'] + NutAvatar: typeof import('@nutui/nutui-taro')['Avatar'] + NutBacktop: typeof import('@nutui/nutui-taro')['Backtop'] + NutButton: typeof import('@nutui/nutui-taro')['Button'] + NutCalendar: typeof import('@nutui/nutui-taro')['Calendar'] + NutCell: typeof import('@nutui/nutui-taro')['Cell'] + NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup'] + NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox'] + NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup'] + NutDialog: typeof import('@nutui/nutui-taro')['Dialog'] + NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis'] + NutEmpty: typeof import('@nutui/nutui-taro')['Empty'] + NutForm: typeof import('@nutui/nutui-taro')['Form'] + NutFormItem: typeof import('@nutui/nutui-taro')['FormItem'] + NutGrid: typeof import('@nutui/nutui-taro')['Grid'] + NutGridItem: typeof import('@nutui/nutui-taro')['GridItem'] + NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview'] + NutInput: typeof import('@nutui/nutui-taro')['Input'] + NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber'] + NutOverlay: typeof import('@nutui/nutui-taro')['Overlay'] + NutPagination: typeof import('@nutui/nutui-taro')['Pagination'] + NutPicker: typeof import('@nutui/nutui-taro')['Picker'] + NutPopover: typeof import('@nutui/nutui-taro')['Popover'] + NutPopup: typeof import('@nutui/nutui-taro')['Popup'] + NutPrice: typeof import('@nutui/nutui-taro')['Price'] + NutRadio: typeof import('@nutui/nutui-taro')['Radio'] + NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup'] + NutRate: typeof import('@nutui/nutui-taro')['Rate'] + NutSwiper: typeof import('@nutui/nutui-taro')['Swiper'] + NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem'] + NutSwitch: typeof import('@nutui/nutui-taro')['Switch'] + NutTable: typeof import('@nutui/nutui-taro')['Table'] + NutTabPane: typeof import('@nutui/nutui-taro')['TabPane'] + NutTabs: typeof import('@nutui/nutui-taro')['Tabs'] + NutTextarea: typeof import('@nutui/nutui-taro')['Textarea'] + NutUploader: typeof import('@nutui/nutui-taro')['Uploader'] Pay: typeof import('./src/components/Pay.vue')['default'] Popup: typeof import('./src/components/Popup.vue')['default'] RichEditor: typeof import('./src/components/RichEditor.vue')['default'] diff --git a/config/index.ts b/config/index.ts index 5a399a0..7f09230 100644 --- a/config/index.ts +++ b/config/index.ts @@ -51,7 +51,7 @@ const config = { prebundle: { enable: false }, }, cache: { - enable: true, // Webpack 持久化缓存配置,建议开启。默认配置请参考:https://docs.taro.zone/docs/config-detail#cache + enable: false, // Webpack 持久化缓存配置,建议开启。默认配置请参考:https://docs.taro.zone/docs/config-detail#cache }, sass: { data: `@import "@nutui/nutui-taro/dist/styles/variables.scss";`, diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue index 7ee8e7e..a970144 100644 --- a/src/pages/user/index.vue +++ b/src/pages/user/index.vue @@ -316,7 +316,7 @@ const userMenuList = ref([ const clickLogin = () => { // isShowLogin.value = true - Taro.redirectTo({ + Taro.navigateTo({ url: '/pages/users/login/index', }); }; diff --git a/src/pages/users/login/index.vue b/src/pages/users/login/index.vue index 3577eec..96b71d8 100644 --- a/src/pages/users/login/index.vue +++ b/src/pages/users/login/index.vue @@ -4,11 +4,27 @@ import UserModal from '@/components/UserModal.vue'; import { ref } from 'vue'; import { getPhone, login, getPersonalInfo } from '@/api/user'; import logoImg from '../../../static/logo.jpg'; +import { Left, Home } from '@nutui/icons-vue-taro'; + +const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight; +const BarHeight = ref((statusBarHeight as number) - 7); const isShow = ref(false); const val = ref(false); +const returns = () => { + Taro.navigateBack({ + delta: 1, + }); +}; + +const goHome = () => { + Taro.switchTab({ + url: '/pages/index/index', + }); +}; + const getCode = () => { if (!val.value) return Taro.showToast({ @@ -133,6 +149,12 @@ const clickText = (type: number, text: string) => {