From 092a69b52d384219bc08553afecce9214b03b442 Mon Sep 17 00:00:00 2001 From: Jason <5340635+wen-jason@user.noreply.gitee.com> Date: Thu, 15 Sep 2022 16:54:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dh5=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=96=B0=E9=97=BB=E8=B5=84=E8=AE=AF=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.env.production | 2 +- app/src/components/tab/tab.vue | 7 ++++--- app/src/components/tabs/tabs.vue | 4 ++-- app/src/pages/news/component/news-list.vue | 4 ++-- h5/assets/{account.00a6144f.js => account.1ac7d7e9.js} | 2 +- h5/assets/{index.21969731.js => index.4f50f7aa.js} | 6 +++--- h5/assets/{news-card.14a6e803.js => news-card.572a4bb0.js} | 2 +- h5/assets/news.0d842806.js | 1 + h5/assets/news.65bbe893.js | 1 - h5/assets/news.6a2c6971.css | 1 - h5/assets/news.f277b7a2.css | 1 + ...t.75c3e76a.js => pages-agreement-agreement.ff9b6ce3.js} | 2 +- h5/assets/pages-as_us-as_us.82745650.js | 1 + h5/assets/pages-as_us-as_us.980dcae0.js | 1 - h5/assets/pages-bind_mobile-bind_mobile.286a03dd.js | 1 - h5/assets/pages-bind_mobile-bind_mobile.a670d5c5.js | 1 + .../pages-change_password-change_password.132c2978.js | 1 + .../pages-change_password-change_password.e984112e.js | 1 - h5/assets/pages-collection-collection.cd3b9ef9.js | 1 - h5/assets/pages-collection-collection.f3dd57af.js | 1 + ...=> pages-customer_service-customer_service.bf5834a6.js} | 2 +- h5/assets/pages-empty-empty.637fcb62.js | 1 - h5/assets/pages-empty-empty.a6edb204.js | 1 + h5/assets/pages-forget_pwd-forget_pwd.fad274e4.js | 1 - h5/assets/pages-forget_pwd-forget_pwd.fe4a2437.js | 1 + ...dex-index.fe168679.js => pages-index-index.e831406c.js} | 2 +- h5/assets/pages-login-login.a1964be5.js | 1 + h5/assets/pages-login-login.a833f688.js | 1 - h5/assets/pages-news-news.4422a672.js | 1 - h5/assets/pages-news-news.bf1217ff.js | 1 + ...2e1c41.js => pages-news_detail-news_detail.37bb999c.js} | 2 +- ...ter.82ddc6e3.js => pages-register-register.fff25c1c.js} | 2 +- h5/assets/pages-search-search.377f4704.js | 1 - h5/assets/pages-search-search.6b081b11.js | 1 + ...s-user-user.2a9fe1a9.js => pages-user-user.254a9415.js} | 2 +- h5/assets/pages-user_data-user_data.567666d7.js | 1 + h5/assets/pages-user_data-user_data.8b999feb.js | 1 - ...set.f57bc223.js => pages-user_set-user_set.75d35cd3.js} | 2 +- h5/assets/pages-webview-webview.1842ea1f.js | 1 - h5/assets/pages-webview-webview.d98b21f2.js | 1 + h5/assets/shop.20664790.js | 1 - h5/assets/shop.b2a53e93.js | 1 + h5/assets/{tabbar.9757c3e5.js => tabbar.f1602f4a.js} | 2 +- h5/assets/{u-avatar.c390bffe.js => u-avatar.bbc58a10.js} | 2 +- h5/assets/{u-button.126b2542.js => u-button.3962b4f3.js} | 2 +- .../{u-checkbox.c5fcea9f.js => u-checkbox.fe900004.js} | 2 +- .../{u-form-item.b469356e.js => u-form-item.f875c20d.js} | 2 +- h5/assets/{u-form.c3a815ba.js => u-form.17f5f9a9.js} | 2 +- h5/assets/{u-icon.67feec68.js => u-icon.0a81a19c.js} | 2 +- h5/assets/{u-image.e641a9f8.js => u-image.29be3df8.js} | 2 +- h5/assets/u-parse.5f650ac0.js | 1 - h5/assets/u-parse.792ac186.js | 1 + h5/assets/{u-popup.efa6beec.js => u-popup.b9da59e2.js} | 2 +- h5/assets/{u-search.8bcd4dc2.js => u-search.be8f9e92.js} | 2 +- ...on-code.f035b1a4.js => u-verification-code.1c1b948f.js} | 2 +- h5/assets/{uni.67383283.css => uni.c1194171.css} | 2 +- ...mponents-u-avatar-cropper-u-avatar-cropper.693060b6.js} | 2 +- h5/assets/util.18b010b0.js | 1 + h5/assets/util.34a4212c.js | 1 - h5/assets/z-paging.19bee01b.js | 1 + h5/assets/z-paging.1ef01bbf.js | 1 - h5/index.html | 4 ++-- 62 files changed, 53 insertions(+), 52 deletions(-) rename h5/assets/{account.00a6144f.js => account.1ac7d7e9.js} (92%) rename h5/assets/{index.21969731.js => index.4f50f7aa.js} (96%) rename h5/assets/{news-card.14a6e803.js => news-card.572a4bb0.js} (86%) create mode 100644 h5/assets/news.0d842806.js delete mode 100644 h5/assets/news.65bbe893.js delete mode 100644 h5/assets/news.6a2c6971.css create mode 100644 h5/assets/news.f277b7a2.css rename h5/assets/{pages-agreement-agreement.75c3e76a.js => pages-agreement-agreement.ff9b6ce3.js} (65%) create mode 100644 h5/assets/pages-as_us-as_us.82745650.js delete mode 100644 h5/assets/pages-as_us-as_us.980dcae0.js delete mode 100644 h5/assets/pages-bind_mobile-bind_mobile.286a03dd.js create mode 100644 h5/assets/pages-bind_mobile-bind_mobile.a670d5c5.js create mode 100644 h5/assets/pages-change_password-change_password.132c2978.js delete mode 100644 h5/assets/pages-change_password-change_password.e984112e.js delete mode 100644 h5/assets/pages-collection-collection.cd3b9ef9.js create mode 100644 h5/assets/pages-collection-collection.f3dd57af.js rename h5/assets/{pages-customer_service-customer_service.9e2cb16b.js => pages-customer_service-customer_service.bf5834a6.js} (86%) delete mode 100644 h5/assets/pages-empty-empty.637fcb62.js create mode 100644 h5/assets/pages-empty-empty.a6edb204.js delete mode 100644 h5/assets/pages-forget_pwd-forget_pwd.fad274e4.js create mode 100644 h5/assets/pages-forget_pwd-forget_pwd.fe4a2437.js rename h5/assets/{pages-index-index.fe168679.js => pages-index-index.e831406c.js} (50%) create mode 100644 h5/assets/pages-login-login.a1964be5.js delete mode 100644 h5/assets/pages-login-login.a833f688.js delete mode 100644 h5/assets/pages-news-news.4422a672.js create mode 100644 h5/assets/pages-news-news.bf1217ff.js rename h5/assets/{pages-news_detail-news_detail.192e1c41.js => pages-news_detail-news_detail.37bb999c.js} (85%) rename h5/assets/{pages-register-register.82ddc6e3.js => pages-register-register.fff25c1c.js} (89%) delete mode 100644 h5/assets/pages-search-search.377f4704.js create mode 100644 h5/assets/pages-search-search.6b081b11.js rename h5/assets/{pages-user-user.2a9fe1a9.js => pages-user-user.254a9415.js} (76%) create mode 100644 h5/assets/pages-user_data-user_data.567666d7.js delete mode 100644 h5/assets/pages-user_data-user_data.8b999feb.js rename h5/assets/{pages-user_set-user_set.f57bc223.js => pages-user_set-user_set.75d35cd3.js} (95%) delete mode 100644 h5/assets/pages-webview-webview.1842ea1f.js create mode 100644 h5/assets/pages-webview-webview.d98b21f2.js delete mode 100644 h5/assets/shop.20664790.js create mode 100644 h5/assets/shop.b2a53e93.js rename h5/assets/{tabbar.9757c3e5.js => tabbar.f1602f4a.js} (97%) rename h5/assets/{u-avatar.c390bffe.js => u-avatar.bbc58a10.js} (94%) rename h5/assets/{u-button.126b2542.js => u-button.3962b4f3.js} (98%) rename h5/assets/{u-checkbox.c5fcea9f.js => u-checkbox.fe900004.js} (96%) rename h5/assets/{u-form-item.b469356e.js => u-form-item.f875c20d.js} (99%) rename h5/assets/{u-form.c3a815ba.js => u-form.17f5f9a9.js} (62%) rename h5/assets/{u-icon.67feec68.js => u-icon.0a81a19c.js} (87%) rename h5/assets/{u-image.e641a9f8.js => u-image.29be3df8.js} (95%) delete mode 100644 h5/assets/u-parse.5f650ac0.js create mode 100644 h5/assets/u-parse.792ac186.js rename h5/assets/{u-popup.efa6beec.js => u-popup.b9da59e2.js} (98%) rename h5/assets/{u-search.8bcd4dc2.js => u-search.be8f9e92.js} (94%) rename h5/assets/{u-verification-code.f035b1a4.js => u-verification-code.1c1b948f.js} (93%) rename h5/assets/{uni.67383283.css => uni.c1194171.css} (88%) rename h5/assets/{uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.ab2e984a.js => uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.693060b6.js} (77%) create mode 100644 h5/assets/util.18b010b0.js delete mode 100644 h5/assets/util.34a4212c.js create mode 100644 h5/assets/z-paging.19bee01b.js delete mode 100644 h5/assets/z-paging.1ef01bbf.js diff --git a/app/.env.production b/app/.env.production index c26c7fb9..a174cad2 100644 --- a/app/.env.production +++ b/app/.env.production @@ -1,3 +1,3 @@ # 请求域名 -VITE_APP_BASE_URL='' \ No newline at end of file +VITE_APP_BASE_URL='https://likeadmin-java-api.yixiangonline.com' \ No newline at end of file diff --git a/app/src/components/tab/tab.vue b/app/src/components/tab/tab.vue index 4c7ae53c..2ce9592d 100644 --- a/app/src/components/tab/tab.vue +++ b/app/src/components/tab/tab.vue @@ -33,7 +33,7 @@ const handleChange: any = inject('handleChange') const updateRender = (value) => { inited.value = inited.value || value active.value = value - shouldRender.value = inited.value + shouldRender.value = inited.value! shouldShow.value = value } const update = () => { @@ -42,8 +42,9 @@ const update = () => { } } -const { ctx } = getCurrentInstance() -handleChange(ctx, updateRender) +const instance = getCurrentInstance() +console.log(instance) +handleChange(instance?.props, updateRender) onMounted(() => { update() diff --git a/app/src/components/tabs/tabs.vue b/app/src/components/tabs/tabs.vue index 9a4c4ad9..27a4e9b6 100644 --- a/app/src/components/tabs/tabs.vue +++ b/app/src/components/tabs/tabs.vue @@ -142,7 +142,7 @@ const barFirstTimeMove = ref(true) // 滑块第一次移动时(页面 const swiping = ref(false) //@ts-ignore -const { ctx } = getCurrentInstance() +const ctx = getCurrentInstance() // 监听tab的变化,重新计算tab菜单的布局信息,因为实际使用中菜单可能是通过 // 后台获取的(如新闻app顶部的菜单),获取返回需要一定时间,所以list变化时,重新获取布局信息 @@ -232,7 +232,7 @@ const updateTabs = () => { } }) // nextTick(() => { - // init() + // init() // }) } diff --git a/app/src/pages/news/component/news-list.vue b/app/src/pages/news/component/news-list.vue index e09a92c0..c4c6e89f 100644 --- a/app/src/pages/news/component/news-list.vue +++ b/app/src/pages/news/component/news-list.vue @@ -16,7 +16,7 @@ +