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

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

master
sws 2024-10-17 18:10:02 +08:00
parent 3066154e5e 8d7d82bee4
commit c0cac29acf
7 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App.vue
View File

@ -25,10 +25,10 @@
application_logo: '',
// 版本号、如: v1.0.0
version: 'v6.2',
version: 'v6.3',
// app版本信息、如: v1.0.0 20180118
app_version_info: 'v6.2 20240704',
app_version_info: 'v6.3 20241022',
// 货币价格符号
currency_symbol: '￥',

16
components/wholesale-rules/wholesale-rules.vue
View File

@ -1,16 +1,16 @@
<template>
<view :class="theme_view">
<!-- 批发规则展示 -->
<view v-if="(data || null) != null" class="scroll-view-horizontal">
<view v-if="(data || null) != null" class="plugins-wholesale-container scroll-view-horizontal">
<scroll-view scroll-x="true">
<view :class="'plugins-wholesale-container-rules-view wh-auto item-number-'+data.rules.length" @tap="popup_wholesale_event">
<view :class="'plugins-wholesale-container-rules-view wh-auto padding-main item-number-'+data.rules.length" @tap="popup_wholesale_event">
<view v-for="(item, index) in data.rules" :key="index" class="item">
<view class="price">
<text v-if="item.arr.type == 1" class="cr-red text-size-xs">{{propCurrencySymbol}}</text>
<text class="sales-price text-size-lg">{{item.range_val}}</text>
<text v-if="item.arr.type == 0" class="unit text-size-xsss">{{item.arr.unit}}</text>
</view>
<view :class="'msg text-size-sm cr-base margin-top-xs '+(propIsSeckill ? 'cr-white' : 'cr-black')">{{item.range_msg}}</view>
<view class="msg text-size-sm cr-base margin-top-xs cr-black">{{item.range_msg}}</view>
</view>
</view>
</scroll-view>
@ -64,11 +64,6 @@ export default {
componentPopup
},
props: {
// 是否秒杀状态
propIsSeckill: {
type: Boolean,
default: false,
},
// 是否展示弹窗
propIsPopup: {
type: Boolean,
@ -121,10 +116,13 @@ export default {
}
}
</script>
<style>
<style scoped>
/**
* 批发 - 插件
*/
.plugins-wholesale-container {
background: linear-gradient(to bottom, #fafafa 0%, #fff 100%);
}
.plugins-wholesale-container-rules-view {
display: flex;
justify-content: flex-start;

1
locale/en.json
View File

@ -98,6 +98,7 @@
"extraction-address": "Self pickup address",
"customview-customview": "Custom Page",
"design": "",
"diy": "",
"error": "Kind reminder",
"article-category": "All articles",
"article-detail": "Article details",

1
locale/zh.json
View File

@ -100,6 +100,7 @@
"common-agreement": "",
"customview-customview": "自定义页面",
"design": "",
"diy": "",
"error": "温馨提示",
"article-category": "所有文章",
"article-detail": "文章详情",

10
pages/diy/diy.vue
View File

@ -167,12 +167,12 @@
});
}
});
}
},
},
// 状态栏设置
set_navigation_bar_color() {
app.globalData.set_navigation_bar_color(parseInt(app.globalData.get_key_data(this.data, 'config.header.com_data.style.function_buttons_type', 0)) == 1);
// 状态栏设置
set_navigation_bar_color() {
app.globalData.set_navigation_bar_color(parseInt(app.globalData.get_key_data(this.data, 'config.header.com_data.style.function_buttons_type', 0)) == 1);
}
}
};
</script>

10
pages/goods-detail/goods-detail.css
View File

@ -261,17 +261,17 @@
width: 60%;
min-height: 164rpx;
}
.goods-base-price-countdown .price-icon {
.goods-base-price-countdown .price-content .price-icon {
border-color: #fff;
color: #fff;
background: transparent;
}
.goods-base-price-countdown .sales-price,
.goods-base-price-countdown .sales-price-unit {
.goods-base-price-countdown .price-content .sales-price,
.goods-base-price-countdown .price-content .sales-price-unit {
color: #fff !important;
}
.goods-base-price-countdown .original-price,
.goods-base-price-countdown .unit{
.goods-base-price-countdown .price-content .original-price,
.goods-base-price-countdown .price-content .unit{
color: #ffcece !important;
}
.price-content .price-icon.seckill {

10
pages/goods-detail/goods-detail.vue
View File

@ -75,15 +75,11 @@
<!-- 价格信息 -->
<view class="goods-base-price bg-white oh spacing-mb" :class="plugins_seckill_is_valid ? 'goods-base-price-countdown' : ''">
<!-- 批发规则、未隐藏商品售价的时候独立行展示 -->
<view v-if="(plugins_wholesale_data || null) != null && (plugins_wholesale_data.is_hide_goods_price || 0) != 1" :class="'padding-horizontal-main padding-top-main '+((plugins_seckill_is_valid) ? 'padding-bottom-main' : '')">
<component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data" :propIsSeckill="plugins_seckill_is_valid"></component-wholesale-rules>
</view>
<block v-if="(plugins_wholesale_data || null) != null && (plugins_wholesale_data.is_hide_goods_price || 0) != 1">
<component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data"></component-wholesale-rules>
</block>
<!-- 价格 -->
<view class="price-content padding-vertical-main padding-left-main bs-bb fl" :style="plugins_seckill_is_valid ? 'background-image: url(' + plugins_seckill_data.goods_detail_header + ')' : ''">
<!-- 批发规则、隐藏商品售价的时候在这里展示 -->
<view v-if="(plugins_wholesale_data || null) != null && (plugins_wholesale_data.is_hide_goods_price || 0) == 1" class="item">
<component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data" :propIsSeckill="plugins_seckill_is_valid"></component-wholesale-rules>
</view>
<!-- 批发插件是否开启隐藏价格信息 -->
<block v-if="(plugins_wholesale_data || null) == null || (plugins_wholesale_data.is_hide_goods_price || 0) != 1">
<!-- 售价 -->