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-27 18:46:04 +08:00
parent 0cef6bfbb2 272bd02721
commit e9c9dacd5b
6 changed files with 60 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
components/cart/cart.vue
View File

@ -203,7 +203,7 @@
<view class="oh border-radius-main bg-white padding-sm discount_detail-popup-goods-list">
<!-- 购物车商品列表 -->
<scroll-view :scroll-y="discount_detail_goods_list_status" :class="'scroll-box-popup ' + (data_list.length > 0 ? 'cart ' : '') + cart_type_value + (!discount_detail_goods_list_status ? ' close' : '')" lower-threshold="60">
<view class="content flex-row flex-warp">
<view class="content flex-row flex-wrap">
<!-- 数据列表 -->
<view v-for="(item, index) in data_list" :key="index" class="item">
<view class="padding-sm pr">
@ -269,9 +269,9 @@
</component-popup>
<!-- 结尾 -->
<component-bottom-line :propStatus="goods_bottom_line_status"></component-bottom-line>
<!-- 底部占位 -->
<component-bottom-line :propStatus="goods_bottom_line_status"></component-bottom-line>
<!-- 底部占位 -->
<view v-if="(footer_seat_style || null) != null" :style="footer_seat_style"></view>
</view>
</scroll-view>
@ -409,9 +409,9 @@
// #ifdef H5
window_bottom: '100rpx',
window_top: '100rpx',
// #endif
// 底部购买导航样式
cart_buy_nav_style: '',
// #endif
// 底部购买导航样式
cart_buy_nav_style: '',
footer_seat_style: ''
};
},
@ -421,11 +421,11 @@
propSourceType: {
type: String,
default: '', // 默认主页面。当传入page时为子页面
},
// 来源类型
propCartNavBottomValue: {
type: Number,
default: 0
},
// 来源类型
propCartNavBottomValue: {
type: Number,
default: 0
}
},
@ -444,11 +444,11 @@
propCartType(value, old_value) {
// 数据加载
this.init();
},
// 底部购买导航距离
propCartNavBottomValue(value, old_value) {
// 页面样式处理
this.page_style_handle();
},
// 底部购买导航距离
propCartNavBottomValue(value, old_value) {
// 页面样式处理
this.page_style_handle();
}
},
@ -519,9 +519,9 @@
// 猜你喜欢
this.get_data_list(1);
}
// 页面样式处理
}
// 页面样式处理
this.page_style_handle();
// 分享菜单处理
@ -1305,15 +1305,15 @@
no_cart_data_btn_event(e) {
var url = ((this.user || null) == null) ? '/pages/login/login?event_callback=init' : this.home_page_url;
app.globalData.url_open(url);
},
// 页面样式处理
page_style_handle() {
var value = (this.propCartNavBottomValue > 0) ? (parseInt(this.propCartNavBottomValue*2)+20) : 0;
this.setData({
cart_buy_nav_style: 'bottom:'+value+'rpx;',
footer_seat_style: (value > 0) ? 'height:'+value+'rpx;' : '',
});
},
// 页面样式处理
page_style_handle() {
var value = (this.propCartNavBottomValue > 0) ? (parseInt(this.propCartNavBottomValue*2)+20) : 0;
this.setData({
cart_buy_nav_style: 'bottom:'+value+'rpx;',
footer_seat_style: (value > 0) ? 'height:'+value+'rpx;' : '',
});
}
},
};
@ -1412,10 +1412,10 @@
position: fixed;
z-index: 1;
left: auto;
bottom: 20rpx;
margin-left: 20rpx;
width: calc(100% - 40rpx);
max-width: calc(800px - 40rpx);
bottom: 20rpx;
margin-left: 20rpx;
width: calc(100% - 40rpx);
max-width: calc(800px - 40rpx);
box-shadow: 0rpx 4rpx 8rpx 0px rgba(0, 0, 0, 0.16);
}
.cart-nav-base {
@ -1424,13 +1424,13 @@
.cart-nav-submit {
padding: 20rpx 24rpx;
white-space: nowrap;
}
.cart-nav-submit .nav-btn {
font-size: 32rpx;
padding: 0 32rpx;
height: 70rpx;
line-height: 70rpx;
border-radius: 0;
}
.cart-nav-submit .nav-btn {
font-size: 32rpx;
padding: 0 32rpx;
height: 70rpx;
line-height: 70rpx;
border-radius: 0;
}
.cart-buy-nav .price {
width: calc(100% - 170rpx);

2
components/diy/goods-list.vue
View File

@ -454,7 +454,7 @@
if (goods['user_cart_count'] > 99) {
goods['user_cart_count'] = '99+';
}
if (this.theme == '5') {
if (this.theme != '5') {
new_data[index] = goods;
this.setData({
list: new_data,

19
components/diy/search.vue
View File

@ -18,7 +18,7 @@
</template>
<text v-if="form.is_tips_show == '1'" :class="[propIsPageSettings ? 'text-size-xs text-line-1' : 'text-size-md text-line-1']" :style="'color:' + new_style.tips_color">{{ form.tips }}</text>
</view>
<view v-if="form.is_search_show == '1'" class="pa search-botton flex-row align-c jc-c z-i" :style="search_button">
<view v-if="form.is_search_show == '1'" class="pa search-botton flex-row align-c jc-c z-i" :style="search_button" @tap.stop="url_event">
<template v-if="form.search_type === 'text'">
<view :class="['padding-vertical-xs text-size-xs', propIsPageSettings ? 'padding-horizontal' : 'padding-horizontal-lg']">{{ form.search_tips }}</view>
</template>
@ -143,16 +143,21 @@
},
search_tap() {
if (this.propIsPageSettings) {
this.setData({
search_content: '',
})
this.$emit('search_tap', true);
} else {
this.setData({
is_click: true,
search_content: '',
})
}
},
search_hot_close() {
this.setData({
is_click: false
is_click: false,
search_content: '',
})
},
get_search_button() {
@ -181,14 +186,22 @@
},
url_event() {
if (!isEmpty(this.search_content)) {
const content = this.search_content;
if (this.propIsPageSettings) {
this.setData({
search_content: '',
})
this.$emit('search_tap', false);
} else {
this.setData({
is_click: false,
search_content: '',
})
}
app.globalData.url_open('/pages/goods-search/goods-search?keywords=' + this.search_content);
app.globalData.url_open('/pages/goods-search/goods-search?keywords=' + content);
} else {
app.globalData.showToast('请输入搜索关键字', 'error');
}
}
},

2
components/magic-list/magic-list.vue
View File

@ -4,7 +4,7 @@
<view v-for="(item, index) in data_goods_list" :key="index" class="plugins-magic-content border-radius-main oh spacing-mb">
<view v-if="(item.data || null) != null && item.data.length > 0" :style="(item.bg_images || null) !== null ? 'background-image: url(' + item.bg_images + ');background-size: auto 100%;' : (((item.is_text_white || 0) == 1) ? 'background: linear-gradient(180deg, '+theme_color+' 0%, '+theme_color_light+' 80%);' : 'background: #fff;')">
<!-- 上下滚动 -->
<view v-if="item.show_style == 0" :class="'hot-list flex-row flex-warp padding-vertical-main '+(((item.is_text_white || 0) == 1) ? 'is-text-white' : '')">
<view v-if="item.show_style == 0" :class="'hot-list flex-row flex-wrap padding-vertical-main '+(((item.is_text_white || 0) == 1) ? 'is-text-white' : '')">
<block v-for="(items, indexs) in item.data" :key="indexs">
<block v-if="(items.data || null) != null && items.data.length > 0">
<view :class="'group-item '+(item.data.length%2 != 0 && item.data.length-1 === indexs ? 'wh-auto' : 'flex-width-half')">

2
pages/plugins/coin/recharge/recharge.vue
View File

@ -51,7 +51,7 @@
<view class="margin-bottom-xxxl">
<view v-if="accounts.platform_data.preset_data.length > 0">
<view class="margin-bottom-xs">{{$t('recharge.recharge.eb6722')}}</view>
<view class="flex-row flex-warp recharge-price-item margin-bottom-xs">
<view class="flex-row flex-wrap recharge-price-item margin-bottom-xs">
<block v-for="(item, index) in accounts.platform_data.preset_data" :key="index">
<view class="recharge-price-list flex-col align-c jc-c pr" :class="preset_data_index == index ? 'active' : ''" :data-index="index" :data-value="item.value" @tap="preset_data_change">
<view class="flex-row align-c jc-c">

2
pages/plugins/wallet/recharge/recharge.vue
View File

@ -16,7 +16,7 @@
<view class="recharge-content bg-white spacing-mt">
<block v-if="preset_data.length > 0">
<view class="padding-horizontal-sm spacing-mb">{{$t('recharge.recharge.60k2v3')}}</view>
<view class="flex-row flex-warp tc spacing-mb">
<view class="flex-row flex-wrap tc spacing-mb">
<view v-for="(item, index) in preset_data" :key="index" class="recharge-price-list" :data-index="index" :data-value="item.value" @tap="change_price_event">
<view class="recharge-price-content border-radius-main pr" :class="select_index === index ? 'active' : ''">
<view v-if="item.tips" class="tips cr-white dis-inline-block pa left-0 text-size-xss">{{ item.tips }}</view>