diff --git a/App.vue b/App.vue
index a001e45..caa39d9 100644
--- a/App.vue
+++ b/App.vue
@@ -182,10 +182,11 @@
// socket()
});
onLaunch(() => {
- // 隐藏原生导航栏 使用自定义底部导航
- // uni.hideTabBar({
- // fail: () => {},
- // });
+ try {
+ uni.hideTabBar({
+ fail: () => {},
+ });
+ } catch (e) {}
// globalData.value.statusBarHeight = uni.getSystemInfoSync()?.statusBarHeight;
// globalData.value.windowHeight = uni.getSystemInfoSync()?.windowHeight;
// 获取微信胶囊的位置信息 width,height,top,right,left,bottom
@@ -208,6 +209,11 @@
});
onShow(() => {
+ try {
+ uni.hideTabBar({
+ fail: () => {},
+ });
+ } catch (e) {}
// #ifdef APP-PLUS
// 获取urlSchemes参数
const args =
diff --git a/components/card_navbar/card_navbar.vue b/components/card_navbar/card_navbar.vue
index c6525fa..55266e5 100644
--- a/components/card_navbar/card_navbar.vue
+++ b/components/card_navbar/card_navbar.vue
@@ -1,5 +1,5 @@
-
+
@@ -91,7 +91,7 @@
}
.cardBg {
// 背景图片顶部显示, 超出部分隐藏, 宽等于100%
- background-color: #ffffff;
+ background-color: transparent;
}
:deep(.uniui-left) {
font-size: 44rpx !important;
diff --git a/components/card_tabber/card_tabber.vue b/components/card_tabber/card_tabber.vue
index 3fb6176..bb48a4a 100644
--- a/components/card_tabber/card_tabber.vue
+++ b/components/card_tabber/card_tabber.vue
@@ -1,47 +1,237 @@
-
-
+
+
+
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
-
\ No newline at end of file
+ .tabbar {
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 80;
+ // background: var(--tabbar-bg, #ffffff);
+ overflow: visible;
+ }
+
+ .tabbar-bg {
+ position: absolute;
+ left: 0;
+ right: 0;
+ bottom: env(safe-area-inset-bottom);
+ width: 100%;
+ height: 100rpx;
+ filter: drop-shadow(0 -6rpx 24rpx rgba(0, 0, 0, 0.12));
+ pointer-events: none;
+ }
+
+ .tabbar-inner {
+ height: 100rpx;
+ display: flex;
+ align-items: flex-end;
+ padding: 0 12rpx;
+ position: relative;
+ z-index: 1;
+ }
+
+ .tabbar-item {
+ min-width: 0;
+ padding-bottom: 10rpx;
+ }
+
+ .tabbar-item--mid {
+ padding-bottom: 0;
+ transform: translateY(-25rpx);
+ }
+
+ .icon {
+ width: 44rpx;
+ height: 44rpx;
+ }
+
+ .iconBox {
+ height: 150rpx;
+ display: flex;
+ align-items: flex-end;
+ justify-content: center;
+ }
+
+ .iconMid {
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 50%;
+ border-radius: 50%;
+ box-shadow: 0rpx 0rpx 12rpx 0rpx rgba(0, 0, 0, 0.12);
+ background: transparent;
+ }
+
+ .border_f {
+ // border: 6rpx solid #fff;
+ }
+
+ .text {
+ margin-top: 6rpx;
+ font-size: 22rpx;
+ line-height: 1;
+ color: var(--tabbar-text, #979797);
+ }
+
+ .textActive {
+ color: var(--color32, #fa7e31);
+ }
+
+ .safe-bottom {
+ padding-bottom: env(safe-area-inset-bottom);
+ }
+
+ .tabbar-placeholder {
+ height: 100rpx;
+ }
+
diff --git a/components/goods/goods.vue b/components/goods/goods.vue
index 4e417bd..ada73b2 100644
--- a/components/goods/goods.vue
+++ b/components/goods/goods.vue
@@ -11,7 +11,7 @@
@click="navChange(i)"
>
{{ v.name }}
-
+
@@ -60,16 +60,11 @@
white-space: nowrap;
}
.navs {
- // padding: 0 32rpx;
box-sizing: border-box;
height: 120rpx;
- // padding-bottom: 10rpx;
.navItem {
color: #777777;
- font-size: 32rpx;
- // width: 20%;
- // text-align: center;
- // margin-right: 40rpx;
+ font-size: 28rpx;
white-space: nowrap;
flex-shrink: 0; // 防止被压缩
image {
@@ -81,8 +76,10 @@
}
.tabIndex {
color: #777777;
- font-size: 36rpx;
font-weight: 500;
+ background: linear-gradient(135deg, #2C8CFA 0%, #3D5EFB 100%);
+ color: #ffffff !important;
+ border-radius: 12rpx;
image {
opacity: 1;
}
diff --git a/pages.json b/pages.json
index f72f32c..d478cbd 100644
--- a/pages.json
+++ b/pages.json
@@ -955,31 +955,7 @@
"height": "50px",
"backgroundImage": "/static/index/6.png"
},
- "list": [{
- "pagePath": "pages/index/index",
- "text": "首页",
- "iconPath": "static/index/1.png",
- "selectedIconPath": "static/index/1_1.png"
- },
- {
- "pagePath": "pages/index/category",
- "text": "分类",
- "iconPath": "static/index/2.png",
- "selectedIconPath": "static/index/2_1.png"
- },
- {
- "pagePath": "pages/cart/cart",
- "text": "购物车",
- "iconPath": "static/index/3.png",
- "selectedIconPath": "static/index/3_1.png"
- },
- {
- "pagePath": "pages/index/user",
- "text": "我的",
- "iconPath": "static/index/4.png",
- "selectedIconPath": "static/index/4_1.png"
- }
- ]
+ "list": []
},
"condition": {
"current": 0,
diff --git a/pages/AI/member.vue b/pages/AI/member.vue
index 144ca31..b8ec8c3 100644
--- a/pages/AI/member.vue
+++ b/pages/AI/member.vue
@@ -333,7 +333,12 @@ onShow(async () => {
await loadPageData();
});
const onClickLeft = () => {
- uni.switchTab({ url: '/pages/index/index' });
+ uni.switchTab({
+ url: '/pages/index/index',
+ fail: () => {
+ uni.reLaunch({ url: '/pages/index/index' });
+ },
+ });
};
let sysInfo = uni.getSystemInfoSync();
const windowHeight = sysInfo.windowHeight;
@@ -629,4 +634,4 @@ function getProduct(status) {
font-size: 51rpx;
line-height: 66rpx;
}
-
\ No newline at end of file
+
diff --git a/pages/goods/components/detail/detail-tabbar.vue b/pages/goods/components/detail/detail-tabbar.vue
index 831a20f..9d22c34 100644
--- a/pages/goods/components/detail/detail-tabbar.vue
+++ b/pages/goods/components/detail/detail-tabbar.vue
@@ -129,6 +129,9 @@
const onCart = () => {
uni.switchTab({
url: '/pages/cart/cart',
+ fail: () => {
+ uni.reLaunch({ url: '/pages/cart/cart' });
+ },
});
};
diff --git a/pages/home/share.vue b/pages/home/share.vue
index fe5d5bf..55b0e18 100644
--- a/pages/home/share.vue
+++ b/pages/home/share.vue
@@ -2,22 +2,17 @@
- {{ t }}
+
-
- 邀好友来购物
- 长按保存二维码或复制邀请码分享
-
-
@@ -25,16 +20,17 @@
- 您的推荐码
+ 我的邀请码
{{ inviteinfo?.inviteCode }}
- 复制
+ 扫描二维码,注册并登录APP
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 搜索想要的商品
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/user.vue b/pages/index/user.vue
index 3e5a280..50f45bd 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -104,10 +104,11 @@
-
+
-
\ No newline at end of file
+
diff --git a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
index fa2ab6f..8a65384 100644
--- a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
+++ b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
@@ -271,7 +271,11 @@ export default {
uni.reLaunch(callback);
break;
case 'switchTab':
- uni.switchTab(callback);
+ uni.switchTab(Object.assign({}, callback, {
+ fail: () => {
+ uni.reLaunch(callback);
+ }
+ }));
break;
default:
uni.navigateTo(callback);