master
gongfuxiang 2024-12-16 17:13:13 +08:00
commit 0685eb53b2
6 changed files with 40 additions and 37 deletions

View File

@ -53,10 +53,10 @@
<uni-swipe-action> <uni-swipe-action>
<view v-for="(item, index) in data_list" :key="index" class="oh border-radius-main bg-white spacing-mb"> <view v-for="(item, index) in data_list" :key="index" class="oh border-radius-main bg-white spacing-mb">
<uni-swipe-action-item :right-options="swipe_options" @click="swipe_opt_event" @change="swipe_change($event, index)"> <uni-swipe-action-item :right-options="swipe_options" @click="swipe_opt_event" @change="swipe_change($event, index)">
<view class="flex-row align-c" :class="'cart-goods-item padding-main pr ' + (common_site_type == 1 ? 'cart-exhibition-mode-data' : '')"> <view class="cart-goods-item flex-row align-c bs-bb padding-main pr wh-auto" :class="(common_site_type == 1 ? 'cart-exhibition-mode-data' : '')">
<!-- 选择 --> <!-- 选择 -->
<view v-if="common_site_type != 1" @tap="selected_event" data-type="node" :data-index="index" class="cart-selected pr z-i ht-auto"> <view v-if="common_site_type != 1" @tap="selected_event" data-type="node" :data-index="index" class="cart-selected pr z-i">
<iconfont :name="'icon-zhifu-' + (item.selected || false ? 'yixuan' : 'weixuan')" size="40rpx" :color="item.selected || false ? theme_color : '#999'"></iconfont> <iconfont :name="'icon-zhifu-' + (item.selected || false ? 'yixuan' : 'weixuan')" size="34rpx" :color="item.selected || false ? theme_color : '#999'"></iconfont>
</view> </view>
<view class="items oh padding-left-main flex-1 flex-row"> <view class="items oh padding-left-main flex-1 flex-row">
<view> <view>
@ -1547,9 +1547,9 @@
width: 100%; width: 100%;
} }
.scroll-box-popup .cart-selected { .scroll-box-popup .cart-selected {
background-color: #fff; background-color: #fff;
height: 46rpx; height: 46rpx;
border-radius: 50%; border-radius: 50%;
padding: 0 4rpx; padding: 0 4rpx;
} }
.scroll-box-popup .alias { .scroll-box-popup .alias {

View File

@ -1,7 +1,7 @@
<template> <template>
<view :class="theme_view"> <view :class="theme_view">
<!-- 底部菜单 --> <!-- 底部菜单 -->
<block v-if="is_tabbar"> <block v-if="is_tabbar">
<component-diy-footer :propKey="key" :propValue="app_tabbar" @onFooterHeight="footer_height_value_event"></component-diy-footer> <component-diy-footer :propKey="key" :propValue="app_tabbar" @onFooterHeight="footer_height_value_event"></component-diy-footer>
<view v-if="propIsFooterSeat && footer_height_value > 0" :style="'height:'+footer_height_value+'rpx;'"></view> <view v-if="propIsFooterSeat && footer_height_value > 0" :style="'height:'+footer_height_value+'rpx;'"></view>
</block> </block>
@ -36,16 +36,16 @@
<component-app-admin ref="app_admin" :propIsHideStar="true"></component-app-admin> <component-app-admin ref="app_admin" :propIsHideStar="true"></component-app-admin>
<!-- 用户基础 --> <!-- 用户基础 -->
<component-user-base ref="user_base" :propIsGrayscale="propIsGrayscale"></component-user-base> <component-user-base ref="user_base" :propIsGrayscale="propIsGrayscale"></component-user-base>
</view> </view>
</template> </template>
<script> <script>
const app = getApp(); const app = getApp();
import componentDiyFooter from '@/components/diy/footer'; import componentDiyFooter from '@/components/diy/footer';
import componentAppAdmin from '@/components/app-admin/app-admin'; import componentAppAdmin from '@/components/app-admin/app-admin';
import componentUserBase from '@/components/user-base/user-base'; import componentUserBase from '@/components/user-base/user-base';
export default { export default {
data() { data() {
return { return {
theme_view: app.globalData.get_theme_value_view(), theme_view: app.globalData.get_theme_value_view(),
logo: app.globalData.get_application_logo_square(), logo: app.globalData.get_application_logo_square(),
@ -53,10 +53,10 @@
is_show_privacy: false, is_show_privacy: false,
privacy_content: null, privacy_content: null,
key: '', key: '',
is_tabbar: false, is_tabbar: false,
app_tabbar: null, app_tabbar: null,
footer_height_value: 0, footer_height_value: 0,
}; };
}, },
props: { props: {
// //
@ -84,11 +84,11 @@
componentDiyFooter, componentDiyFooter,
componentAppAdmin, componentAppAdmin,
componentUserBase componentUserBase
}, },
// //
created: function () { created: function () {
// //
this.init_config(); this.init_config();
}, },
methods: { methods: {
// //
@ -196,9 +196,9 @@
exit_event(e) { exit_event(e) {
uni.exitMiniProgram(); uni.exitMiniProgram();
}, },
} }
}; };
</script> </script>
<style scoped> <style scoped>
.agreement-page { .agreement-page {
background-color: rgba(0, 0, 0, 0.6); background-color: rgba(0, 0, 0, 0.6);

View File

@ -1,6 +1,7 @@
<template> <template>
<view class="pr" :style="style_container + swiper_bg_style"> <view class="pr re" :style="style_container + swiper_bg_style">
<view class="pr re" :style="style_img_container + swiper_bg_img_style"> <view class="pa top-0 wh-auto ht-auto" :style="swiper_bg_img_style"></view>
<view class="pr re" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? 'background-image: url(null);' : '')">
<swiper circular="true" :autoplay="form.is_roll == '1'" :interval="form.interval_time * 1000" :display-multiple-items="slides_per_group" :duration="500" :style="{ height: swiper_height }" :previous-margin="previousMargin" :next-margin="nextMargin" @change="slideChange"> <swiper circular="true" :autoplay="form.is_roll == '1'" :interval="form.interval_time * 1000" :display-multiple-items="slides_per_group" :duration="500" :style="{ height: swiper_height }" :previous-margin="previousMargin" :next-margin="nextMargin" @change="slideChange">
<block v-if="form.carousel_type == 'card'"> <block v-if="form.carousel_type == 'card'">
<swiper-item v-for="(item, index) in new_list" :key="index"> <swiper-item v-for="(item, index) in new_list" :key="index">
@ -66,7 +67,7 @@
<script> <script>
const app = getApp(); const app = getApp();
import { common_styles_computer, common_img_computer, radius_computer, isEmpty, gradient_computer, padding_computer, get_indicator_location_style, get_indicator_style } from '@/common/js/common/common.js'; import { common_styles_computer, common_img_computer, radius_computer, isEmpty, gradient_computer, padding_computer, get_indicator_location_style, get_indicator_style, background_computer } from '@/common/js/common/common.js';
import imageEmpty from '@/components/diy/modules/image-empty.vue'; import imageEmpty from '@/components/diy/modules/image-empty.vue';
var system = app.globalData.get_system_info(null, null, true); var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth); var sys_width = app.globalData.window_width_handle(system.windowWidth);
@ -228,12 +229,12 @@
return ''; return '';
} }
if (!isEmpty(form.carousel_list[actived_index]?.style?.background_img)) { if (!isEmpty(form.carousel_list[actived_index]?.style?.background_img)) {
return background_computer(form.carousel_list[actived_index].style); return background_computer(form.carousel_list[actived_index].style) + (form?.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.8;` : '');
} }
return ''; return '';
}, },
get_seat_list(form) { get_seat_list(form) {
if (form.carousel_list.length > 3 || form.carousel_type !== 'card') { if (form.carousel_list.length > 3) {
return []; return [];
} else { } else {
let seat_list = []; let seat_list = [];
@ -246,7 +247,7 @@
seat_list.push(...list); seat_list.push(...list);
break; break;
case 3: case 3:
seat_list.push(...list.slice(0, 1)); seat_list.push(...list);
break; break;
default: default:
break; break;
@ -256,10 +257,10 @@
}, },
slideChange(e) { slideChange(e) {
let actived_index = e.detail.current; let actived_index = e.detail.current;
if (e.detail.current > this.form.carousel_list.length - 1 && this.form.carousel_type == 'card') { if (e.detail.current > this.form.carousel_list.length - 1) {
const seat_length = this.seat_list.length; const seat_length = this.seat_list.length;
if (seat_length == 2 && e.detail.current == 3) { if (this.form.carousel_list.length > 1) {
actived_index = 1; actived_index = actived_index - seat_length;
} else { } else {
actived_index = 0; actived_index = 0;
} }

View File

@ -1,6 +1,7 @@
<template> <template>
<view class="ou" :style="style_container + swiper_bg_style"> <view class="ou re" :style="style_container + swiper_bg_style">
<view class="flex-col ou wh-auto" :style="style_img_container + carousel_img_container"> <view class="pa top-0 wh-auto ht-auto" :style="swiper_bg_img_style"></view>
<view class="flex-col ou wh-auto" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? 'background-image: url(null);' : '')">
<componentDiyTabs :propContentPadding="propContentPadding" :propValue="propValue" :propTop="propTop" :propNavIsTop="propNavIsTop" :propTabsIsTop="propTabsIsTop" :propIsCommon="false" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propSpacingCommonStyle="spacing_common_style" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event"></componentDiyTabs> <componentDiyTabs :propContentPadding="propContentPadding" :propValue="propValue" :propTop="propTop" :propNavIsTop="propNavIsTop" :propTabsIsTop="propTabsIsTop" :propIsCommon="false" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propSpacingCommonStyle="spacing_common_style" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event"></componentDiyTabs>
<view :style="carousel_container"> <view :style="carousel_container">
<view :style="carousel_img_container"> <view :style="carousel_img_container">
@ -100,6 +101,7 @@
}, },
}, },
methods: { methods: {
isEmpty,
init() { init() {
const new_content = this.propValue.content || {}; const new_content = this.propValue.content || {};
const new_style = this.propValue.style || {}; const new_style = this.propValue.style || {};
@ -171,7 +173,7 @@
}, },
get_swiper_bg_img_style(form, actived_index) { get_swiper_bg_img_style(form, actived_index) {
if (!isEmpty(form.carousel_list[actived_index]?.style?.background_img)) { if (!isEmpty(form.carousel_list[actived_index]?.style?.background_img)) {
return background_computer(form.carousel_list[actived_index].style); return background_computer(form.carousel_list[actived_index].style) + (form?.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.8;` : '');
} }
return ''; return '';
}, },

View File

@ -104,7 +104,8 @@
type = Object.keys(obj)[index]; type = Object.keys(obj)[index];
} }
} }
if((type || null) == null) {
if((type || null) != null) {
// //
if (!this.popup_status && this.pages.indexOf(type) != -1 && this.client.indexOf(this.application_client_type) != -1) { if (!this.popup_status && this.pages.indexOf(type) != -1 && this.client.indexOf(this.application_client_type) != -1) {
// //

View File

@ -448,7 +448,6 @@
this.init(); this.init();
// //
this.init_config(); this.init_config();
// onshow // onshow
if ((this.$refs.common || null) != null) { if ((this.$refs.common || null) != null) {
this.$refs.common.on_show(); this.$refs.common.on_show();