diff --git a/components.d.ts b/components.d.ts
index c2bb993..a85e835 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -27,8 +27,6 @@ declare module 'vue' {
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']
NutInput: typeof import('@nutui/nutui-taro')['Input']
NutNavbar: typeof import('@nutui/nutui-taro')['Navbar']
NutRow: typeof import('@nutui/nutui-taro')['Row']
diff --git a/src/app.config.ts b/src/app.config.ts
index 4eff6e9..a9bb506 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -4,7 +4,7 @@ export default defineAppConfig({
'pages/contact/index',
'pages/contact-new/index',
'pages/contact-edit/index',
- 'pages/invite/index',
+ 'pages/notifications/index',
'pages/settings/index',
'pages/login/index',
'pages/web-view/index',
@@ -25,16 +25,16 @@ export default defineAppConfig({
list: [
{
pagePath: 'pages/index/index',
- selectedIconPath: 'images/bell-solid-397ef5.png',
- iconPath: 'images/bell-regular-797979.png',
- text: '通知'
- },
- {
- pagePath: 'pages/invite/index',
selectedIconPath: 'images/calendar-plus-solid-397ef5.png',
iconPath: 'images/calendar-plus-regular-797979.png',
text: '邀约'
},
+ {
+ pagePath: 'pages/notifications/index',
+ selectedIconPath: 'images/bell-solid-397ef5.png',
+ iconPath: 'images/bell-regular-797979.png',
+ text: '通知'
+ },
{
pagePath: 'pages/contact/index',
selectedIconPath: 'images/address-book-solid-397ef5.png',
diff --git a/src/pages/index/index.config.ts b/src/pages/index/index.config.ts
index 1a6a18c..5662c12 100644
--- a/src/pages/index/index.config.ts
+++ b/src/pages/index/index.config.ts
@@ -1,6 +1,6 @@
export default definePageConfig({
navigationBarTitleText: '',
- navigationStyle: 'custom',
- disableScroll: true,
usingComponents: {},
+ navigationStyle: 'custom',
+ disableScroll: true
})
diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss
index ab1f759..4f21afa 100644
--- a/src/pages/index/index.scss
+++ b/src/pages/index/index.scss
@@ -11,8 +11,20 @@ page {
overflow: scroll;
}
-.skeleton {
- flex: 1;
- overflow: hidden;
+.nut-grid-item__content {
+ padding: 0;
+ display:unset;
+}
+.nut-grid-item__content--border {
+ border-right-width: unset;
+ border-bottom-width: unset;
+}
+.nut-grid-item__content--surround {
+ border-top-width: unset;
+ border-left-width: unset;
}
+.skeleton-avatar .nut-skeleton-content__line {
+ visibility: hidden !important;
+ display: none !important;
+}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e670f43..789d174 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,176 +1,208 @@
-
-
-
-
-
-
-
-
- 来访记录
+
+
+ 我的邀约
+
+
+
+
+
+
+
+
+
+ 新邀约
+
-
-
- 最近30天的来访
+
+
+
+
+
+ 刷新
+
+
+
+
+
+
+ 刷新
+
+
+
+
+ 来访联系人
+
+
+
+
+
+
+
+
+ {{BjxHelper.getBJXFirstChar(item.name)}}
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+ 可随时来访联系人
+
+
+
+
+
+
+
+
+
+ {{BjxHelper.getBJXFirstChar(item.name)}}
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
-
-
-
-
- 刷新
-
-
-
-
-
-
-
-
-
-
-
-
- 没有更多了
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
diff --git a/src/pages/invite/invite.jpeg b/src/pages/index/invite.jpeg
similarity index 100%
rename from src/pages/invite/invite.jpeg
rename to src/pages/index/invite.jpeg
diff --git a/src/pages/invite/index.scss b/src/pages/invite/index.scss
deleted file mode 100644
index 5e4d9d8..0000000
--- a/src/pages/invite/index.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-page {
- height: 100%;
-}
-
-.nut-navbar {
- background: transparent;
-}
-
-.scroll {
- flex: 1;
- overflow: scroll;
-}
-
-.nut-grid-item__content {
- padding: 0;
- display:unset;
-}
-.nut-grid-item__content--border {
- border-right-width: unset;
- border-bottom-width: unset;
-}
-.nut-grid-item__content--surround {
- border-top-width: unset;
- border-left-width: unset;
-}
diff --git a/src/pages/invite/index.vue b/src/pages/invite/index.vue
deleted file mode 100644
index c142b6d..0000000
--- a/src/pages/invite/index.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-
-
-
-
-
-
-
-
- 我的邀约
-
-
-
-
-
-
-
-
-
- 新邀约
-
-
-
-
-
-
-
-
- 刷新
-
-
-
-
-
-
- 刷新
-
-
-
-
- 来访联系人
-
-
-
-
-
-
-
-
- {{BjxHelper.getBJXFirstChar(item.name)}}
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
- 可随时来访联系人
-
-
-
-
-
-
-
-
-
- {{BjxHelper.getBJXFirstChar(item.name)}}
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/invite/index.config.ts b/src/pages/notifications/index.config.ts
similarity index 83%
rename from src/pages/invite/index.config.ts
rename to src/pages/notifications/index.config.ts
index 5662c12..1a6a18c 100644
--- a/src/pages/invite/index.config.ts
+++ b/src/pages/notifications/index.config.ts
@@ -1,6 +1,6 @@
export default definePageConfig({
navigationBarTitleText: '',
- usingComponents: {},
navigationStyle: 'custom',
- disableScroll: true
+ disableScroll: true,
+ usingComponents: {},
})
diff --git a/src/pages/notifications/index.scss b/src/pages/notifications/index.scss
new file mode 100644
index 0000000..ab1f759
--- /dev/null
+++ b/src/pages/notifications/index.scss
@@ -0,0 +1,18 @@
+page {
+ height: 100%;
+}
+
+.nut-navbar {
+ background: transparent;
+}
+
+.scroll {
+ flex: 1;
+ overflow: scroll;
+}
+
+.skeleton {
+ flex: 1;
+ overflow: hidden;
+}
+
diff --git a/src/pages/notifications/index.vue b/src/pages/notifications/index.vue
new file mode 100644
index 0000000..84cfeb9
--- /dev/null
+++ b/src/pages/notifications/index.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 来访记录
+
+
+
+
+ 最近30天的来访
+
+
+
+
+
+
+ 刷新
+
+
+
+
+
+
+
+
+
+
+
+
+ 没有更多了
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+