diff --git a/.env.development b/.env.development index db76d4c..70e7c7a 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ MP_API_BASE_URL=https://patient.youcan365.com MP_CACHE_PREFIX=development MP_WX_APP_ID=wx6ee11733526b4f04 -MP_TIM_SDK_APP_ID=1600123876 \ No newline at end of file +MP_TIM_SDK_APP_ID=1600126296 \ No newline at end of file diff --git a/.env.localhost b/.env.localhost index caeee5d..2031b21 100644 --- a/.env.localhost +++ b/.env.localhost @@ -1,4 +1,4 @@ MP_API_BASE_URL=http://localhost:8080 MP_CACHE_PREFIX=development MP_WX_APP_ID=wx6ee11733526b4f04 -MP_TIM_SDK_APP_ID=1600123876 +MP_TIM_SDK_APP_ID=1600126296 diff --git a/components/group-avatar.vue b/components/group-avatar.vue index 6d8ab1d..44b83a7 100644 --- a/components/group-avatar.vue +++ b/components/group-avatar.vue @@ -25,7 +25,7 @@ const props = defineProps({ } }) -const list = computed(() => props.avatarList.map(i => i || '/static/default-avatar.png')) +const list = computed(() => props.avatarList.map(i => i || '/static/default-avatar.svg')) const size = computed(() => { const val = Number.isInteger(props.size) && props.size > 0 ? props.size : 144; diff --git a/pages.json b/pages.json index 5528af6..d8b5719 100644 --- a/pages.json +++ b/pages.json @@ -1,155 +1,181 @@ { - "pages": [{ + "pages": [ + { "path": "pages/home/home", "style": { "navigationBarTitleText": "首页", - "navigationStyle": "custom" + "navigationStyle": "custom", + "disableScroll": true } }, { "path": "pages/article/article-list", "style": { - "navigationBarTitleText": "我的宣教" + "navigationBarTitleText": "我的宣教", + "disableScroll": true } }, { "path": "pages/article/article-cate-list", "style": { - "navigationBarTitleText": "健康宣教" + "navigationBarTitleText": "健康宣教", + "disableScroll": true } }, { "path": "pages/survey/survey-list", "style": { - "navigationBarTitleText": "我的问卷" + "navigationBarTitleText": "我的问卷", + "disableScroll": true } }, { "path": "pages/message/message", "style": { - "navigationBarTitleText": "消息" + "navigationBarTitleText": "消息", + "disableScroll": true } }, { "path": "pages/message/index", "style": { "navigationBarTitleText": "聊天", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "disableScroll": true } }, { "path": "pages/login/login", "style": { "navigationBarTitleText": "健康柚", - "navigationStyle": "custom" + "navigationStyle": "custom", + "disableScroll": true } }, { "path": "pages/login/redirect-page", "style": { - "navigationBarTitleText": "健康柚" + "navigationBarTitleText": "健康柚", + "disableScroll": true } }, { "path": "pages/login/agreement", "style": { - "navigationBarTitleText": "健康柚" + "navigationBarTitleText": "健康柚", + "disableScroll": true } }, { "path": "pages/archive/archive-manage", "style": { - "navigationBarTitleText": "档案管理" + "navigationBarTitleText": "档案管理", + "disableScroll": true } }, { "path": "pages/archive/edit-archive", "style": { - "navigationBarTitleText": "新增档案" + "navigationBarTitleText": "新增档案", + "disableScroll": true } }, { "path": "pages/archive/archive-result", "style": { - "navigationBarTitleText": "团队服务" + "navigationBarTitleText": "团队服务", + "disableScroll": true } }, { "path": "pages/health/list", "style": { - "navigationBarTitleText": "健康信息" + "navigationBarTitleText": "健康信息", + "disableScroll": true } }, { "path": "pages/health/record", "style": { - "navigationBarTitleText": "健康信息" + "navigationBarTitleText": "健康信息", + "disableScroll": true } }, { "path": "pages/library/diagnosis-list", "style": { - "navigationBarTitleText": "选择诊断" + "navigationBarTitleText": "选择诊断", + "disableScroll": true } }, { "path": "pages/team/team-detail", "style": { - "navigationBarTitleText": "团队介绍" + "navigationBarTitleText": "团队介绍", + "disableScroll": true } }, { "path": "pages/team/homepage", "style": { - "navigationBarTitleText": "个人主页" + "navigationBarTitleText": "个人主页", + "disableScroll": true } }, { "path": "pages/team/friend", "style": { - "navigationBarTitleText": "添加好友" + "navigationBarTitleText": "添加好友", + "disableScroll": true } }, { "path": "pages/web-view/web-view", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "disableScroll": true } }, { "path": "pages/mine/mine", "style": { - "navigationBarTitleText": "我的" + "navigationBarTitleText": "我的", + "disableScroll": true } }, { "path": "pages/mine/contact", "style": { - "navigationBarTitleText": "联系客服" + "navigationBarTitleText": "联系客服", + "disableScroll": true } }, { "path": "pages/common/privacy", "style": { - "navigationBarTitleText": "隐私政策" + "navigationBarTitleText": "隐私政策", + "disableScroll": true } }, { "path": "pages/common/agreement", "style": { - "navigationBarTitleText": "用户协议" + "navigationBarTitleText": "用户协议", + "disableScroll": true } }, { "path": "pages/article/article-detail", "style": { - "navigationBarTitleText": "宣教文章" + "navigationBarTitleText": "宣教文章", + "disableScroll": true } }, { "path": "pages/article/send-article", "style": { - "navigationBarTitleText": "选择宣教文章" + "navigationBarTitleText": "选择宣教文章", + "disableScroll": true } } ], @@ -164,7 +190,8 @@ "selectedColor": "#007aff", "backgroundColor": "#ffffff", "borderStyle": "white", - "list": [{ + "list": [ + { "pagePath": "pages/home/home", "iconPath": "static/tabbar/home.png", "selectedIconPath": "static/tabbar/home_selected.png", diff --git a/pages/home/team-mate.vue b/pages/home/team-mate.vue index 16ef2c6..3645836 100644 --- a/pages/home/team-mate.vue +++ b/pages/home/team-mate.vue @@ -13,7 +13,7 @@ - + diff --git a/pages/message/components/chat-input.vue b/pages/message/components/chat-input.vue index b13a052..6e04776 100644 --- a/pages/message/components/chat-input.vue +++ b/pages/message/components/chat-input.vue @@ -8,7 +8,7 @@