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

Merge branch 'dev-sws' into dev-yxl

master
于肖磊 2024-09-25 16:47:41 +08:00
parent 657c60c117 bfb21af9d1
commit 43692681b4
4 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/diy/diy.vue
View File

@ -11,7 +11,7 @@
</view>
<view v-if="is_tabs_type" class="diy-content">
<template v-if="diy_data.length > 0">
<view v-for="(item, index) in diy_data" :key="index" :style="{'margin-top': -(item.com_data.style.common_style.floating_up * 2 || 0) + 'rpx' }">
<view v-for="(item, index) in diy_data" :key="index" :style="{ 'margin-top': -(item.com_data.style.common_style.floating_up * 2 || 0) + 'rpx' }">
<!-- 基础组件 -->
<componentDiySearch v-if="item.key == 'search'" :value="item.com_data"></componentDiySearch>
<componentDiyCarousel v-else-if="item.key == 'carousel'" :value="item.com_data"></componentDiyCarousel>
@ -55,7 +55,9 @@
</scroll-view>
</view>
</view>
<componentDiyFooter :key="key" :value="footer_data.com_data" @footer-height="footer_height_computer" @footer-click="footer_click_event"></componentDiyFooter>
<block v-if="is_show_footer !== '0'">
<componentDiyFooter :key="key" :value="footer_data.com_data" @footer-height="footer_height_computer" @footer-click="footer_click_event"></componentDiyFooter>
</block>
</view>
</template>
@ -164,6 +166,7 @@
// 选项卡数据
tabs_data: {},
diy_data: [],
is_show_footer: '0',
tabs_home_id: this.propHomeId,
// 商品列表
goods_list: [],
@ -197,20 +200,21 @@
// tabs选项卡数据过滤
// const filter_tabs_list = this.value.tabs_data || [];
this.setData({
is_show_footer: this.value.header.com_data.content.bottom_navigation_show,
key: get_math(),
header_data: this.value.header,
footer_data: this.value.footer,
diy_data: this.value.diy_data,
tabs_data: this.value.tabs_data,
});
uni.setStorageSync('diy-data-' + this.propId, this.value.diy_data);
uni.setStorageSync('diy-data-' + this.tabs_home_id, this.value.diy_data);
},
footer_height_computer(number) {
this.padding_footer_computer = number * 2;
},
// 选项卡回调更新数据
tabs_click_event(tabs_id, bool, params = {}) {
let new_data = this.value.diy_data;
let new_data = [];
this.setData({
is_tabs_type: bool,
});
@ -257,7 +261,9 @@
this.get_goods_list(1);
}
} else {
new_data = uni.getStorageSync('diy-data-' + this.tabs_home_id) || [];
if (tabs_id == '') {
new_data = uni.getStorageSync('diy-data-' + this.tabs_home_id) || [];
}
// 先使用缓存数据展示
this.setData({
diy_data: new_data,

10
components/diy/header.vue
View File

@ -20,7 +20,7 @@
</template>
</view>
<view v-else-if="['4', '5'].includes(form.content.theme)" class="flex-1 flex-row align-c h gap-10">
<view class="flex-row align-c gap-2">
<view class="flex-row align-c gap-2" @tap="go_map_event">
<iconfont name="icon-location" size="12" color="0"></iconfont>
<text class="size-14 cr-3 text-line-1">{{ form.content.positioning_name }}</text>
<iconfont v-if="form.content.is_arrows_show == '1'" name="icon-arrow-right" size="24rpx" color="#000"></iconfont>
@ -32,7 +32,7 @@
</template>
</view>
<view v-if="!isEmpty(form.content.icon_setting)" class="flex-row align-c" :class="['1'].includes(form.content.theme) ? 'pa right-0 padding-right-main' : ''" :style="{ gap: form.style.img_space * 2 + 'rpx' }">
<view v-for="(item, index) in form.content.icon_setting" :key="index" :style="{ width: form.style.img_size * 2 + 'rpx', height: form.style.img_size * 2 + 'rpx' }">
<view v-for="(item, index) in form.content.icon_setting" :key="index" :style="{ width: form.style.img_size * 2 + 'rpx', height: form.style.img_size * 2 + 'rpx' }" :data-value="item.link.page" @tap="url_event">
<image-empty v-if="item.img.length > 0" :image-src="item.img[0].url" :error-style="'width: ' + Number(form.style.img_size) * 2 + 'rpx;height:' + Number(form.style.img_size) * 2 + 'rpx;'"></image-empty>
<iconfont v-else :name="'icon-' + item.icon" :size="form.style.img_size * 2 + 'rpx'" color="#666"></iconfont>
</view>
@ -123,6 +123,12 @@
header_style: menuButtonInfo,
});
},
go_map_event() {
console.log('地图方法');
},
url_event(e) {
app.globalData.url_event(e);
},
},
};
</script>

13
components/diy/modules/tabs-view.vue
View File

@ -31,7 +31,7 @@
</view>
</view>
</view>
<view class="tc padding-top-lg" @tap="quick_close_event">
<view class="tc padding-top-lg flex-row jc-c align-c" @tap="quick_close_event">
<text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
<iconfont name="icon-arrow-top" color="#ccc"></iconfont>
</view>
@ -85,7 +85,16 @@
// 过滤弹窗
popup_status: false,
propIsBar: false,
propTop: bar_height + 120 + 'rpx',
// 5,7,0 是误差，， 12 是下边距，60是高度，bar_height是不同小程序下的导航栏距离顶部的高度
// #ifdef MP
propTop: bar_height + 34 + 5 + 12 + 'px;',
// #endif
// #ifdef H5 || MP-TOUTIAO
propTop: bar_height + 34 + 7 + 12 + 'px;',
// #endif
// #ifdef APP
propTop: bar_height + 34 + 0 + 12 + 'px;',
// #endif
};
},
mounted() {

4
components/diy/user-info.vue
View File

@ -4,8 +4,8 @@
<view class="pr padding-xxl" :style="style">
<view class="flex-row jc-sb align-c margin-bottom-xxl">
<view class="flex-1 flex-row align-c gap-12">
<image :src="(user_info.user || null) !== null ? user_info.user.avatar : user.avatar" class="circle" mode="widthFix" :style="'width:' + base_data.user_avatar_size * 2 + 'rpx;height:' + base_data.user_avatar_size * 2 + 'rpx;'" />
<view class="flex-col gap-8">
<image :src="(user_info.user || null) !== null ? user_info.user.avatar : user.avatar" class="circle" mode="widthFix" :style="'width:' + base_data.user_avatar_size * 2 + 'rpx;height:' + base_data.user_avatar_size * 2 + 'rpx;'" data-value="/pages/personal/personal" @tap="url_event" />
<view class="flex-col gap-8" data-value="/pages/personal/personal" @tap="url_event">
<view class="text-size fw-b" :style="user_name_style">{{ (user_info.user || null) !== null ? user_info.user.user_name_view : user.user_name_view }}</view>
<view v-if="id_bool && (user_info.user || null) !== null" class="padding-horizontal-sm padding-vertical-xsss border-radius-sm" :style="number_code_style">ID:{{ user_info.user.number_code }}</view>
</view>