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

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

master
sws 2024-09-26 14:58:33 +08:00
parent 3915794ff0 6e156b8350
commit ffd3174ca9
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/diy/diy.vue
View File

@ -32,7 +32,7 @@
<componentDiyCoupon v-else-if="item.key == 'coupon'" :propValue="item.com_data"></componentDiyCoupon>
<!-- 工具组件 -->
<componentDiyFloatWindow v-else-if="item.key == 'float-window'" :propValue="item.com_data"></componentDiyFloatWindow>
<componentDiyTitle v-else-if="item.key == 'text-title'" :propValue="item.com_data"></componentDiyTitle>
<componentDiyTitle v-else-if="item.key == 'title'" :propValue="item.com_data"></componentDiyTitle>
<componentDiyAuxiliaryLine v-else-if="item.key == 'row-line'" :propValue="item.com_data"></componentDiyAuxiliaryLine>
<componentDiyRichText v-else-if="item.key == 'rich-text'" :propValue="item.com_data"></componentDiyRichText>
<componentDiyAuxiliaryBlank v-else-if="item.key == 'auxiliary-blank'" :propValue="item.com_data"></componentDiyAuxiliaryBlank>

12
components/diy/goods-tabs.vue
View File

@ -2,14 +2,14 @@
<view class="ou" :style="style_container">
<componentDiyModulesTabsView :propValue="goods_tabs" :propIsTop="top_up == '1'" :propTop="tabs_top" :propStyle="tabs_style" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
<view class="padding-top oh">
<componentGoodsList :key="key" :propValue="goods_tabs" :propIsCommonStyle="false"></componentGoodsList>
<componentGoodsList v-if="hackReset" :propValue="goods_tabs" :propIsCommonStyle="false"></componentGoodsList>
</view>
</view>
</template>
<script>
const app = getApp();
import { common_styles_computer, get_math } from '@/common/js/common/common.js';
import { common_styles_computer } from '@/common/js/common/common.js';
import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
import componentGoodsList from '@/components/diy/goods-list'; // 状态栏高度
var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
@ -32,6 +32,7 @@
data() {
return {
style_container: '',
hackReset: true,
goods_tabs: {},
key: 1,
// 是否滑动置顶
@ -90,7 +91,12 @@
new_data.content.data_auto_list = new_data.content.tabs_list[index].data_auto_list;
this.setData({
goods_tabs: new_data,
key: get_math(),
hackReset: false,
});
this.$nextTick(() => {
this.setData({
hackReset: true,
});
});
},
handle_scroll() {

33
components/diy/title.vue
View File

@ -2,9 +2,9 @@
<view :style="style_container">
<view class="flex-col gap-10">
<view class="pr flex-row" :class="title_center">
<view class="z-i flex-row align-c gap-10 title-img">
<template v-if="!isEmpty(form.img_src)">
<imageEmpty :propImageSrc="form.img_src[0]"></imageEmpty>
<view class="z-i flex-row align-c gap-10">
<template v-if="!isEmpty(form.img_src) && !isEmpty(form.img_src[0].url)">
<image :src="form.img_src[0].url" class="title-img" mode="heightFix"></image>
</template>
<template v-else-if="!isEmpty(form.icon_class)">
<iconfont :name="'icon-' + form.icon_class" :size="new_style.icon_size * 2 + 'rpx'" :color="new_style.icon_color"></iconfont>
@ -13,12 +13,12 @@
</view>
<view class="flex-row gap-10 align-c right-0 pa">
<template v-if="form.keyword_show == '1'">
<view v-for="item in keyword_list" :key="item.id" :style="keyword_style">
<view v-for="item in keyword_list" :key="item.id" :style="keyword_style" :data-value="item.link.page" @tap="url_event">
{{ item.title }}
</view>
</template>
<view v-if="form.right_show == '1'" class="nowrap" :style="right_style">{{ form.right_title }}
<iconfont name="icon-arrow-right" :color="new_style.right_color || '#999'"></iconfont>
<view v-if="form.right_show == '1'" class="nowrap flex-row align-c" :style="right_style" :data-value="form.right_link.page" @tap="url_event">{{ form.right_title }}
<iconfont name="icon-arrow-right" :color="new_style.right_color" :size="new_style.right_size * 2 + 'rpx'"></iconfont>
</view>
</view>
</view>
@ -29,7 +29,7 @@
<script>
const app = getApp();
import { common_styles_computer, is_obj_empty } from '@/common/js/common/common.js';
import { common_styles_computer, isEmpty } from '@/common/js/common/common.js';
export default {
props: {
propValue: {
@ -57,9 +57,12 @@ export default {
form: this.propValue.content,
new_style: this.propValue.style,
});
console.log(this.propValue);
this.init();
},
methods: {
isEmpty,
init() {
// 是否居中
this.setData({
@ -96,17 +99,15 @@ export default {
},
get_subtitle_style() {
let common_styles = '';
if (new_style.value.subtitle_weight == 'italic') {
if (this.new_style.subtitle_weight == 'italic') {
common_styles += `font-style: italic`;
} else if (new_style.value.subtitle_weight == '500') {
} else if (this.new_style.subtitle_weight == '500') {
common_styles += `font-weight: 500`;
}
return `color:${new_style.value.subtitle_color}; font-size: ${new_style.value.subtitle_size * 2}rpx; ${common_styles}`;
return `color:${this.new_style.subtitle_color}; font-size: ${this.new_style.subtitle_size * 2}rpx; ${common_styles}`;
},
url_open_event(link) {
if (!is_obj_empty(link)) {
app.globalData.url_open(link.page);
}
url_event(e) {
app.globalData.url_event(e);
},
},
};
@ -125,7 +126,7 @@ export default {
}
.title-img {
max-width: 6rem;
max-height: 3rem;
max-width: 120rpx;
max-height: 60rpx;
}
</style>