diff --git a/src/application/online.vue b/src/application/online.vue index 3e26403..ced832a 100644 --- a/src/application/online.vue +++ b/src/application/online.vue @@ -20,6 +20,7 @@ { inputFocus.value = true + if (useScoketMsg().msgList.length < 7) { + uni.pageScrollTo({ + offsetTop: 0 + }) + } }) }) } diff --git a/src/application/product-details.vue b/src/application/product-details.vue index 8c94745..b0310f8 100644 --- a/src/application/product-details.vue +++ b/src/application/product-details.vue @@ -172,7 +172,7 @@ - + {{$t('common.sendInquiry')}} @@ -214,6 +214,7 @@ tabsActive.value = index uni.pageScrollTo({ scrollTop: anchorTop.value[index].top, + duration: 0 }) } @@ -296,6 +297,10 @@ } const submit = () => { dataFormRef.value.validate().then(() => { + uni.showLoading({ + title: `${t('common.Loading')}`, + mask: true + }) submitFormApi(dataForm.value).then(() => { uni.$showTost(t('common.submitSuccess')) dataForm.value.name = '' @@ -305,6 +310,8 @@ dataForm.value.tel = '' dataForm.value.content = '' dataFormRef.value.clearValidate() + }).finally(() => { + uni.hideLoading() }) }) } diff --git a/src/assets/images/bg/Inquiry-bg.png b/src/assets/images/bg/Inquiry-bg.png index e21de42..90a5244 100644 Binary files a/src/assets/images/bg/Inquiry-bg.png and b/src/assets/images/bg/Inquiry-bg.png differ diff --git a/src/assets/images/bg/company-profile-panel.png b/src/assets/images/bg/company-profile-panel.png index fa561f2..58ab953 100644 Binary files a/src/assets/images/bg/company-profile-panel.png and b/src/assets/images/bg/company-profile-panel.png differ diff --git a/src/assets/images/bg/contact-panel.png b/src/assets/images/bg/contact-panel.png index 56c55a6..d0f8712 100644 Binary files a/src/assets/images/bg/contact-panel.png and b/src/assets/images/bg/contact-panel.png differ diff --git a/src/assets/images/bg/news-panel.png b/src/assets/images/bg/news-panel.png index 5c8d5b2..4d99645 100644 Binary files a/src/assets/images/bg/news-panel.png and b/src/assets/images/bg/news-panel.png differ diff --git a/src/assets/images/bg/online-bg.png b/src/assets/images/bg/online-bg.png index 90f6923..6282cfd 100644 Binary files a/src/assets/images/bg/online-bg.png and b/src/assets/images/bg/online-bg.png differ diff --git a/src/assets/images/bg/products-panel.png b/src/assets/images/bg/products-panel.png index bb54e8e..5b891e4 100644 Binary files a/src/assets/images/bg/products-panel.png and b/src/assets/images/bg/products-panel.png differ diff --git a/src/assets/images/icon/Google.png b/src/assets/images/icon/Google.png index 29dbc01..2cb046c 100644 Binary files a/src/assets/images/icon/Google.png and b/src/assets/images/icon/Google.png differ diff --git a/src/assets/images/icon/X.png b/src/assets/images/icon/X.png index c3d869a..b30fcfc 100644 Binary files a/src/assets/images/icon/X.png and b/src/assets/images/icon/X.png differ diff --git a/src/assets/images/icon/YouTobe.png b/src/assets/images/icon/YouTobe.png index 44a9b4c..4535ac7 100644 Binary files a/src/assets/images/icon/YouTobe.png and b/src/assets/images/icon/YouTobe.png differ diff --git a/src/assets/images/icon/address.png b/src/assets/images/icon/address.png index 37e244b..9548c33 100644 Binary files a/src/assets/images/icon/address.png and b/src/assets/images/icon/address.png differ diff --git a/src/assets/images/icon/arrow.png b/src/assets/images/icon/arrow.png index 6855544..092303e 100644 Binary files a/src/assets/images/icon/arrow.png and b/src/assets/images/icon/arrow.png differ diff --git a/src/assets/images/icon/facebook.png b/src/assets/images/icon/facebook.png index ea05921..2e96136 100644 Binary files a/src/assets/images/icon/facebook.png and b/src/assets/images/icon/facebook.png differ diff --git a/src/assets/images/icon/goto.png b/src/assets/images/icon/goto.png index 957f86c..2f0f4e2 100644 Binary files a/src/assets/images/icon/goto.png and b/src/assets/images/icon/goto.png differ diff --git a/src/assets/images/icon/in.png b/src/assets/images/icon/in.png index 1dacbae..a8af708 100644 Binary files a/src/assets/images/icon/in.png and b/src/assets/images/icon/in.png differ diff --git a/src/assets/images/icon/mail.png b/src/assets/images/icon/mail.png index cfcf221..c2292fc 100644 Binary files a/src/assets/images/icon/mail.png and b/src/assets/images/icon/mail.png differ diff --git a/src/assets/images/icon/mail2.png b/src/assets/images/icon/mail2.png index b89b0e8..2751a70 100644 Binary files a/src/assets/images/icon/mail2.png and b/src/assets/images/icon/mail2.png differ diff --git a/src/assets/images/icon/msg-box.png b/src/assets/images/icon/msg-box.png index a1723f8..d54abc8 100644 Binary files a/src/assets/images/icon/msg-box.png and b/src/assets/images/icon/msg-box.png differ diff --git a/src/assets/images/icon/msg.png b/src/assets/images/icon/msg.png index 114940a..a5f2481 100644 Binary files a/src/assets/images/icon/msg.png and b/src/assets/images/icon/msg.png differ diff --git a/src/assets/images/icon/online-close.png b/src/assets/images/icon/online-close.png index 2556f86..d7d16d4 100644 Binary files a/src/assets/images/icon/online-close.png and b/src/assets/images/icon/online-close.png differ diff --git a/src/assets/images/icon/online.png b/src/assets/images/icon/online.png index fd1042c..74c1ba2 100644 Binary files a/src/assets/images/icon/online.png and b/src/assets/images/icon/online.png differ diff --git a/src/assets/images/icon/phone.png b/src/assets/images/icon/phone.png index cf60e4a..1b9addc 100644 Binary files a/src/assets/images/icon/phone.png and b/src/assets/images/icon/phone.png differ diff --git a/src/assets/images/icon/phone2.png b/src/assets/images/icon/phone2.png index 14d3d98..7a8c516 100644 Binary files a/src/assets/images/icon/phone2.png and b/src/assets/images/icon/phone2.png differ diff --git a/src/assets/images/icon/phoneApp.png b/src/assets/images/icon/phoneApp.png index f48f329..eb658d6 100644 Binary files a/src/assets/images/icon/phoneApp.png and b/src/assets/images/icon/phoneApp.png differ diff --git a/src/assets/images/icon/search.png b/src/assets/images/icon/search.png index e6149fe..6ab2530 100644 Binary files a/src/assets/images/icon/search.png and b/src/assets/images/icon/search.png differ diff --git a/src/assets/images/icon/select-common.png b/src/assets/images/icon/select-common.png index 7ee520a..94aa15f 100644 Binary files a/src/assets/images/icon/select-common.png and b/src/assets/images/icon/select-common.png differ diff --git a/src/assets/images/icon/send.png b/src/assets/images/icon/send.png index e2732ef..55c7d9b 100644 Binary files a/src/assets/images/icon/send.png and b/src/assets/images/icon/send.png differ diff --git a/src/assets/images/icon/top.png b/src/assets/images/icon/top.png index 8a6df1d..e50783b 100644 Binary files a/src/assets/images/icon/top.png and b/src/assets/images/icon/top.png differ diff --git a/src/assets/images/icon/user.png b/src/assets/images/icon/user.png index 7f4b016..0a9fa55 100644 Binary files a/src/assets/images/icon/user.png and b/src/assets/images/icon/user.png differ diff --git a/src/assets/images/icon/view-more.png b/src/assets/images/icon/view-more.png index b52bd0f..2cabf49 100644 Binary files a/src/assets/images/icon/view-more.png and b/src/assets/images/icon/view-more.png differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index 79c75ec..e531c10 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/components/suspension-btn.vue b/src/components/suspension-btn.vue index ba16ac1..9dcbad5 100644 --- a/src/components/suspension-btn.vue +++ b/src/components/suspension-btn.vue @@ -1,11 +1,11 @@ @@ -23,7 +23,7 @@ position: fixed; right: 26rpx; bottom: 130rpx; - button { + view { width: 100%; height: 96rpx; margin-bottom: 20rpx !important; @@ -35,16 +35,14 @@ background: linear-gradient( 180deg, #FFC157 0%, #FC8815 100%); box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(165,93,31,0.25); image { - width: 42rpx; - height: 38rpx; + width: 56rpx; } } &:last-child { background: linear-gradient( 180deg, #53B0FF 0%, #3573FF 100%); box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(76,109,176,0.25); image { - width: 44rpx; - height: 44rpx; + width: 46rpx; } } } diff --git a/src/components/tabs.vue b/src/components/tabs.vue index 1edf08e..3b78041 100644 --- a/src/components/tabs.vue +++ b/src/components/tabs.vue @@ -59,6 +59,7 @@ bottom: -15rpx; transform: translateX(-50%); background: url('@/assets/images/icon/select-common.png') no-repeat; + background-size: 100% 100%; } } } diff --git a/src/locale/en.json b/src/locale/en.json index d3d3082..b9ab055 100644 --- a/src/locale/en.json +++ b/src/locale/en.json @@ -56,7 +56,8 @@ "appUpdate": "Updating", "confirm": "confirm", "cancel": "cancel", - "KindReminder": "KindReminder" + "KindReminder": "KindReminder", + "Loading": "Loading" }, "menu": { "Home": "Home", diff --git a/src/locale/zh-Hans.json b/src/locale/zh-Hans.json index d5f4f4d..7c56683 100644 --- a/src/locale/zh-Hans.json +++ b/src/locale/zh-Hans.json @@ -56,7 +56,8 @@ "appUpdate": "更新中", "confirm": "确认", "cancel": "取消", - "KindReminder": "温馨提示" + "KindReminder": "温馨提示", + "Loading": "加载中" }, "menu": { "Home": "首页", diff --git a/src/pages/inquiry/index.vue b/src/pages/inquiry/index.vue index 35a92f5..a7733f6 100644 --- a/src/pages/inquiry/index.vue +++ b/src/pages/inquiry/index.vue @@ -220,6 +220,10 @@ } const submit = () => { dataFormRef.value.validate().then(() => { + uni.showLoading({ + title: `${t('common.Loading')}`, + mask: true + }) submitFormApi(dataForm.value).then(() => { uni.$showTost(t('common.submitSuccess')) dataForm.value.name = '' @@ -229,6 +233,8 @@ dataForm.value.tel = '' dataForm.value.content = '' dataFormRef.value.clearValidate() + }).finally(() => { + uni.hideLoading() }) }) } diff --git a/src/static/aboutus-select.png b/src/static/aboutus-select.png index 4cf8aa5..7b05f58 100644 Binary files a/src/static/aboutus-select.png and b/src/static/aboutus-select.png differ diff --git a/src/static/aboutus.png b/src/static/aboutus.png index 029b8d8..8e7c6b9 100644 Binary files a/src/static/aboutus.png and b/src/static/aboutus.png differ diff --git a/src/static/contactus-select.png b/src/static/contactus-select.png index 745f56d..f68f3dd 100644 Binary files a/src/static/contactus-select.png and b/src/static/contactus-select.png differ diff --git a/src/static/contactus.png b/src/static/contactus.png index 0c2919d..05c4702 100644 Binary files a/src/static/contactus.png and b/src/static/contactus.png differ diff --git a/src/static/home-select.png b/src/static/home-select.png index fd2ae32..d6efd46 100644 Binary files a/src/static/home-select.png and b/src/static/home-select.png differ diff --git a/src/static/home.png b/src/static/home.png index 25b0c22..a877cd8 100644 Binary files a/src/static/home.png and b/src/static/home.png differ diff --git a/src/static/news-select.png b/src/static/news-select.png index 5f7a2e0..c8490ee 100644 Binary files a/src/static/news-select.png and b/src/static/news-select.png differ diff --git a/src/static/news.png b/src/static/news.png index fd46437..005f1f9 100644 Binary files a/src/static/news.png and b/src/static/news.png differ diff --git a/src/static/product-select.png b/src/static/product-select.png index 6300966..8d42c6f 100644 Binary files a/src/static/product-select.png and b/src/static/product-select.png differ diff --git a/src/static/product.png b/src/static/product.png index a0ac1c4..818c36b 100644 Binary files a/src/static/product.png and b/src/static/product.png differ diff --git a/src/stores/index.js b/src/stores/index.js index 4d3c320..95090b3 100644 --- a/src/stores/index.js +++ b/src/stores/index.js @@ -177,6 +177,9 @@ export const useAppUpdate = defineStore('appUpdate', () => { const callback = ref(null) const getAppInfo = () => { + // #ifdef H5 + return + // #endif if (loading.value) { return } diff --git a/src/utils/request.js b/src/utils/request.js index 650da88..e3e967b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -12,11 +12,8 @@ $http.interceptors.request.use(async (config) => { // 可使用async await 做 config.header = { ...config.header } - config.params = {...config.params, tenantId: 'main'} - uni.showLoading({ - title: '加载中...', - mask: true - }) + config.params = {...config.params, tenantId: 'main',equipment: 'App'} + config.data = {...config.data, tenantId: 'main', equipment: 'App'} return config }, config => { // 可使用async await 做异步操作 @@ -25,7 +22,6 @@ $http.interceptors.request.use(async (config) => { // 可使用async await 做 // 响应拦截器 $http.interceptors.response.use((response) => { - uni.hideLoading() switch(response.data.code) { case 200: break;