sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws

master
sws 2024-10-22 14:07:07 +08:00
parent 532b57a4db 15b12f57e1
commit 18f6c7f87a
9 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/common/common.vue
View File

@ -157,11 +157,11 @@
},
// 底部菜单高度回调事件
footer_height_value_event(value) {
footer_height_value_event(value) {
this.setData({
footer_height_value: (value*2)+20
});
this.$emit('footer-height', value);
this.$emit('onFooterHeight', value);
// 存储底部菜单高度
app.globalData.app_tabbar_height_save(value);

4
components/diy/footer.vue
View File

@ -69,10 +69,6 @@
propKey(value, old_value) {
this.init();
},
// 菜单数据
propValue(value, old_value) {
this.init();
},
// 选中索引
propFooterActiveIndex(value, old_value) {
this.init();

8
components/diy/header.vue
View File

@ -12,9 +12,15 @@
<view class="model-head pr padding-left-main padding-right-main" style="box-sizing: border-box">
<view class="flex-col" :style="'gap:' + data_alone_row_space">
<view class="model-head-content flex-row align-c jc-sb gap-16 wh-auto pr" :style="header_style">
<!-- 支付宝小程序自带返回按钮，这里就不给返回按钮了，这里给留出一点空间就行 -->
<!-- #ifndef MP-ALIPAY -->
<view v-if="!is_tabbar_pages" class="z-i dis-inline-block margin-top-xs" @tap="top_nav_left_back_event">
<iconfont name="icon-arrow-left" size="40rpx" propContainerDisplay="flex" :color="form.style.left_back_btn_color || '#333'"></iconfont>
</view>
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<view class="dis-inline-block padding-left-sm"></view>
<!-- #endif -->
<view v-if="['1', '2', '3'].includes(form.content.theme)" class="flex-1">
<view class="flex-row align-c jc-c ht-auto gap-16" :class="position_class" :style="text_style + 'justify-content:' + form.content.indicator_location || 'center'">
<template v-if="['2', '3'].includes(form.content.theme)">
@ -209,7 +215,7 @@
// 小程序下，获取小程序胶囊的宽度
let menu_button_info = 'max-width:100%';
let new_text_style = `font-weight:${new_style.header_background_title_typeface}; font-size: ${new_style.header_background_title_size * 2}rpx; color: ${new_style.header_background_title_color};`;
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
// #ifdef MP
const custom = uni.getMenuButtonBoundingClientRect();
menu_button_info = `max-width:calc(100% - ${custom.width + 10}px);`;
new_text_style += `right:-${custom.width + 10}px;`;

6
components/goods-comments/goods-comments.vue
View File

@ -34,8 +34,10 @@
</view>
</block>
<block v-else>
<view class="cr-grey-d tc spacing-mb flex-row jc-c align-c">
<image :src="common_static_url + 'no-comment.png'" mode="widthFix" class="no-comment margin-right-main" />{{$t('goods-comments.goods-comments.1p1r2e')}}</view>
<view class="tc spacing-mb flex-row jc-c align-c margin-top-xxxxl">
<image :src="common_static_url + 'no-comment.png'" mode="widthFix" class="no-comment margin-right-main" />
<view class="cr-grey-d">{{$t('goods-comments.goods-comments.1p1r2e')}}</view>
</view>
</block>
</view>
</template>

2
pages/cart-page/cart-page.vue
View File

@ -7,7 +7,7 @@
<component-quick-nav :propIsBar="true"></component-quick-nav>
<!-- 公共 -->
<component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
<component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
</view>
</template>
<script>

2
pages/cart/cart.vue
View File

@ -4,7 +4,7 @@
<component-cart ref="cart" :propCartNavBottomValue="footer_height_value"></component-cart>
<!-- 公共 -->
<component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
<component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
</view>
</template>
<script>

2
pages/goods-category/goods-category.vue
View File

@ -362,7 +362,7 @@
</view>
<!-- 公共 -->
<component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
<component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
</view>
</template>

2
pages/goods-search-start/goods-search-start.vue
View File

@ -69,7 +69,7 @@
</view>
<!-- 公共 -->
<component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
<component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
</view>
</template>
<script>

2
pages/plugins/realstore/detail/detail.vue
View File

@ -284,7 +284,7 @@
<component-share-popup ref="share"></component-share-popup>
<!-- 公共 -->
<component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
<component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
</view>
</template>
<script>