Merge branch 'v1.6' into v1.8

* v1.6:
  feat: 添加商户端页面
This commit is contained in:
2026-07-14 13:41:20 +08:00
9 changed files with 1026 additions and 1 deletions
+4 -1
View File
@@ -71,7 +71,8 @@
<!-- 全局快捷入口 -->
<s-menu-tools />
</view>
<cardTabber v-if="props.tabbar" :path="tabbarPath" />
<merchantTabber v-if="props.tabbar && isMerchantMode" :path="tabbarPath" />
<cardTabber v-else-if="props.tabbar" :path="tabbarPath" />
<view v-if="showUpdateProgress" class="update-progress-mask">
<view class="update-progress-card">
@@ -92,6 +93,7 @@
import cardNavbar from '@/components/card_navbar/card_navbar';
import transparentNavbar from '@/components/card_navbar/transparent_navbar';
import cardTabber from '@/components/card_tabber/card_tabber.vue';
import merchantTabber from '@/components/merchant_tabber/merchant_tabber.vue';
import sheep from '@/sheep';
const emits = defineEmits(['onClickLeft']);
const instance = getCurrentInstance();
@@ -186,6 +188,7 @@
const userStore = sheep.$store('user');
const appStore = sheep.$store('app');
const modalStore = sheep.$store('modal');
const isMerchantMode = computed(() => appStore.bizMode === 'merchant');
let statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
let paddingTop = ref();
paddingTop.value = statusBarHeight + uni.upx2px(88);