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

解决冲突

master
于肖磊 2024-09-19 15:32:39 +08:00
parent 7ac30532d9 c52df12043
commit 4a400d9816
2 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
components/diy/diy.vue
View File

@ -2,26 +2,36 @@
<view class="ht-auto min-ht">
<componentDiyHeader></componentDiyHeader>
<view v-if="value.diy_data.length > 0" :style="diy_content_style">
<view v-for="(item, index) in value.diy_data" :key="index">
<!-- 基础组件 -->
<componentDiySearch v-if="item.key == 'search'" :value="item.com_data"></componentDiySearch>
<componentCarousel v-if="item.key == 'carousel'" :value="item.com_data"></componentCarousel>
<componentNavGroup v-if="item.key == 'nav-group'" :value="item.com_data"></componentNavGroup>
<componentGoodsList v-if="item.key == 'goods-list'" :value="item.com_data"></componentGoodsList>
<componentGoodsTabs v-if="item.key == 'goods-tabs'" :value="item.com_data"></componentGoodsTabs>
<componentDataMagic v-if="item.key == 'data-magic'" :value="item.com_data"></componentDataMagic>
<componentDiyUserInfo v-if="item.key == 'user-info'" :value="item.com_data"></componentDiyUserInfo>
<componentDiyVideo v-else-if="item.key == 'video'" :value="item.com_data"></componentDiyVideo>
<componentDiyArticleList v-else-if="item.key == 'article-list'" :value="item.com_data"></componentDiyArticleList>
<componentDiyArticleTabs v-else-if="item.key == 'article-tabs'" :value="item.com_data"></componentDiyArticleTabs>
<componentDiyHotZone v-else-if="item.key == 'hot-zone'" :value="item.com_data"></componentDiyHotZone>
<componentDiyCoupon v-else-if="item.key == 'coupon'" :value="item.com_data"></componentDiyCoupon>
<!-- 工具组件 -->
<componentFloatWindow v-else-if="item.key == 'float-window'" :value="item.com_data"></componentFloatWindow>
<componentTextTitle v-else-if="item.key == 'text-title'" :value="item.com_data"></componentTextTitle>
<componentDiyAuxiliaryLine v-else-if="item.key == 'row-line'" :value="item.com_data"></componentDiyAuxiliaryLine>
<componentDiyRichText v-else-if="item.key == 'rich-text'" :value="item.com_data"></componentDiyRichText>
<componentAuxiliaryBlank v-else-if="item.key == 'auxiliary-blank'" :value="item.com_data"></componentAuxiliaryBlank>
{{ is_tabs }}
<componentDiyTabs v-if="is_tabs" :value="tabs_data"></componentDiyTabs>
<view v-if="is_tabs_type">
<view v-for="(item, index) in value.diy_data" :key="index">
<!-- 基础组件 -->
<componentDiySearch v-if="item.key == 'search'" :value="item.com_data"></componentDiySearch>
<componentCarousel v-else-if="item.key == 'carousel'" :value="item.com_data"></componentCarousel>
<componentNavGroup v-else-if="item.key == 'nav-group'" :value="item.com_data"></componentNavGroup>
<componentDiyUserInfo v-else-if="item.key == 'user-info'" :value="item.com_data"></componentDiyUserInfo>
<componentDiyNotice v-else-if="item.key == 'notice'" :value="item.com_data"></componentDiyNotice>
<componentDiyVideo v-else-if="item.key == 'video'" :value="item.com_data"></componentDiyVideo>
<componentDiyArticleList v-else-if="item.key == 'article-list'" :value="item.com_data"></componentDiyArticleList>
<componentDiyArticleTabs v-else-if="item.key == 'article-tabs'" :value="item.com_data"></componentDiyArticleTabs>
<componentGoodsTabs v-else-if="item.key == 'goods-tabs'" :value="item.com_data"></componentGoodsTabs>
<componentGoodsList v-else-if="item.key == 'goods-list'" :value="item.com_data"></componentGoodsList>
<componentDataMagic v-if="item.key == 'data-magic'" :value="item.com_data"></componentDataMagic>
<componentDiyImgMagic v-else-if="item.key == 'img-magic'" :value="item.com_data"></componentDiyImgMagic>
<componentDiyHotZone v-else-if="item.key == 'hot-zone'" :value="item.com_data"></componentDiyHotZone>
<!-- 插件 -->
<componentDiyCoupon v-else-if="item.key == 'coupon'" :value="item.com_data"></componentDiyCoupon>
<!-- 工具组件 -->
<componentFloatWindow v-else-if="item.key == 'float-window'" :value="item.com_data"></componentFloatWindow>
<componentTextTitle v-else-if="item.key == 'text-title'" :value="item.com_data"></componentTextTitle>
<componentDiyAuxiliaryLine v-else-if="item.key == 'row-line'" :value="item.com_data"></componentDiyAuxiliaryLine>
<componentDiyRichText v-else-if="item.key == 'rich-text'" :value="item.com_data"></componentDiyRichText>
<componentAuxiliaryBlank v-else-if="item.key == 'auxiliary-blank'" :value="item.com_data"></componentAuxiliaryBlank>
</view>
</view>
<view v-else>
<!-- goods九宫格数据 -->
</view>
</view>
<componentDiyFooter :value="value.footer.com_data" @footer-height="footer_height_computer"></componentDiyFooter>
@ -90,6 +100,19 @@
},
},
methods: {
<<<<<<< HEAD
=======
init() {
// tabs选项卡数据过滤
const filter_tabs_list = this.value.tabs_data;
if (filter_tabs_list.length > 0) {
this.setData({
tabs_data: filter_tabs_list[0].com_data,
is_tabs: true,
});
}
},
>>>>>>> dev-sws
footer_height_computer(number) {
this.padding_footer_computer = number * 2;
},

5
components/diy/hot-zone.vue
View File

@ -52,13 +52,12 @@
},
// 图片加载完成 获取宽高
on_load_img(e) {
console.log('123');
const query = uni.createSelectorQuery();
// 选择我们想要的元素
query
.in(this)
.select('.container')
.boundingClientRect((res) => {
console.log('1:' + res);
if ((res || null) != null) {
// data包含元素的宽度、高度等信息
this.setData({
@ -70,9 +69,9 @@
})
.exec(); // 执行查询
query
.in(this)
.select('.hot')
.boundingClientRect((res) => {
console.log('2:' + res);
if ((res || null) != null) {
// data包含元素的宽度、高度等信息
this.setData({