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

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

master
gongfuxiang 2024-10-18 15:33:52 +08:00
parent e820335a8e 573c6a929d
commit 362e2ddf19
10 changed files with 75 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
App.vue
View File

@ -7,12 +7,12 @@
data: {
// 基础配置
// 数据接口请求地址
//request_url: 'http://shopxo.com/',
request_url:'https://new.shopxo.vip/',
request_url: 'http://shopxo.com/',
// request_url:'https://new.shopxo.vip/',
// 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
//static_url: 'http://shopxo.com/',
static_url:'https://new.shopxo.vip/',
static_url: 'http://shopxo.com/',
// static_url:'https://new.shopxo.vip/',
// 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
system_type: 'default',

4
components/diy/diy.vue
View File

@ -141,8 +141,8 @@
default: '',
},
propKey: {
type: String,
default: '',
type: Number,
default: 0,
},
},
components: {

2
components/diy/footer.vue
View File

@ -35,7 +35,7 @@
props: {
propKey: {
type: [Number, String],
default: '‘',
default: '',
},
propValue: {
type: Object,

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

@ -23,9 +23,12 @@
<imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
</view>
</block>
<view class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
<view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || is_show('sales_count') || is_show('plugins_view_icon') || form.is_shop_show == '1'" class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
<view class="flex-col gap-10 top-title">
<view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
<view v-if="is_show('title') || (['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc'))" class="flex-col" :style="{'gap': new_style.title_simple_desc_spacing * 2 + 'rpx' }">
<view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
<view v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
</view>
<view v-if="show_content && is_show('plugins_view_icon') && !isEmpty(item.plugins_view_icon_data)" class="flex-row gap-5 align-c">
<view v-for="(icon_data, icon_index) in item.plugins_view_icon_data" :key="icon_index" class="radius text-size-xsss padding-horizontal-xs" :style="{ background: icon_data.bg_color, color: icon_data.color, border: '1rpx solid' + (!isEmpty(icon_data.br_color) ? icon_data.br_color : icon_data.bg_color) }">{{ icon_data.name }}</view>
</view>
@ -113,9 +116,12 @@
<imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
</view>
</block>
<view class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
<view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('plugins_view_icon') || is_show('original_price') || form.is_shop_show == '1'" class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
<view class="flex-col gap-10 top-title">
<view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
<view v-if="is_show('title') || (['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc'))" class="flex-col" :style="{'gap': new_style.title_simple_desc_spacing * 2 + 'rpx' }">
<view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
<view v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
</view>
<view v-if="show_content && is_show('plugins_view_icon') && !isEmpty(item.plugins_view_icon_data)" class="flex-row gap-5 align-c">
<view v-for="(icon_data, icon_index) in item.plugins_view_icon_data" :key="icon_index" class="radius text-size-xsss padding-horizontal-xs" :style="{ background: icon_data.bg_color, color: icon_data.color, border: '1rpx solid' + (!isEmpty(icon_data.br_color) ? icon_data.br_color : icon_data.bg_color) }">{{ icon_data.name }}</view>
</view>
@ -219,6 +225,7 @@
sold_number_style: '',
score_style: '',
button_style: '',
simple_desc: '',
};
},
computed: {
@ -277,11 +284,12 @@
style_container: this.propIsCommonStyle ? common_styles_computer(new_style.common_style) : '', // 公共样式
style_img_container: this.propIsCommonStyle ? common_img_computer(new_style.common_style) : '', // 图片样式
// 内容样式设置
title_style: this.trends_config(new_style, 'title'),
title_style: this.trends_config(new_style, 'title', 'title', new_form.theme),
price_style: this.trends_config(new_style, 'price'),
sold_number_style: this.trends_config(new_style, 'sold_number'),
score_style: this.trends_config(new_style, 'score'),
button_style: this.trends_config(new_style, 'button', 'gradient'),
simple_desc: this.trends_config(new_style, 'simple_desc', 'desc'),
shop_content_list: this.get_shop_content_list(new_list, new_form),
is_show_cart: new_form.shop_button_effect == '1',
});
@ -382,14 +390,22 @@
return this.form.is_show.includes(index);
},
// 根据传递的参数，从对象中取值
trends_config(new_style, key, type) {
return this.style_config(new_style[`shop_${key}_typeface`], new_style[`shop_${key}_size`], new_style[`shop_${key}_color`], type);
trends_config(new_style, key, type, theme) {
return this.style_config(new_style[`shop_${key}_typeface`], new_style[`shop_${key}_size`], new_style[`shop_${key}_color`], type, theme);
},
// 根据传递的值，显示不同的内容
style_config(typeface, size, color, type) {
style_config(typeface, size, color, type, theme) {
let style = `font-weight:${typeface}; font-size: ${size * 2}rpx;`;
if (type == 'gradient') {
style += this.button_gradient;
} else if (type == 'title') {
if (['1', '6'].includes(theme)) {
style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
} else if (['0', '2', '3', '4', '5'].includes(theme)) {
style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`;
}
} else if (type == 'desc') {
style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
} else {
style += `color: ${color};`;
}
@ -408,9 +424,10 @@
url_event(e) {
let index = e.currentTarget.dataset.index || 0;
let goods = this.list[index];
let split_index = 0;
if (this.theme == '5') {
split_index = e.currentTarget.dataset.split_index || 0;
goods = this.shop_content_list[index][split_index];
split_index = e.currentTarget.dataset.splitIndex || 0;
goods = this.shop_content_list[index].split_list[split_index];
}
app.globalData.goods_data_cache_handle(goods.id, goods);
@ -425,8 +442,8 @@
let split_index = 0;
let goods = this.list[index];
if (this.theme == '5') {
split_index = e.currentTarget.dataset.split_index || 0;
goods = this.shop_content_list[index][split_index];
split_index = e.currentTarget.dataset.splitIndex || 0;
goods = this.shop_content_list[index].split_list[split_index];
}
if (this.form.shop_button_effect == '0') {
app.globalData.goods_data_cache_handle(goods.id, goods);

5
components/diy/modules/image-empty.vue
View File

@ -58,6 +58,11 @@
empty_style: `${this.propErrorStyle}`,
});
img_url = this.default_image;
} else {
this.setData({
empty_outer_style: '',
empty_style: 'width: 100%; height: 100%;', // 有图片的时候显示为100%
});
}
this.setData({
img_url: img_url,

48
components/diy/seckill.vue
View File

@ -37,7 +37,7 @@
</view>
</view>
<template v-if="form.shop_style_type != '3'">
<view class="flex-row flex-wrap wh-auto ht-auto" :style="{ gap: content_outer_spacing * 2 + 'rpx' }">
<view class="flex-row flex-wrap wh-auto ht-auto" :style="{ gap: content_outer_spacing }">
<view v-for="(item, index) in sckill_list" :key="index" :class="layout_type" :style="layout_type_style + content_radius + (form.shop_style_type == '1' ? content_padding : '')" :data-value="item.goods_url" @tap="url_event">
<template v-if="!isEmpty(item)">
<view class="oh pr">
@ -52,10 +52,13 @@
</view>
</view>
</template>
<view class="flex-col gap-10 wh-auto flex-1 jc-sb" :style="content_style">
<view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || form.is_shop_show == '1'" class="flex-col gap-10 wh-auto flex-1 jc-sb" :style="content_style">
<view class="flex-col gap-10 wh-auto">
<!-- 标题 -->
<view v-if="is_show('title')" :style="title_style" class="text-line-2 multi-text">{{ item.title }}</view>
<view v-if="is_show('title') || is_show('simple_desc')" class="flex-col" :style="{'gap': new_style.title_simple_desc_spacing * 2 + 'rpx' }">
<view v-if="is_show('title')" :style="title_style" class="text-line-2">{{ item.title }}</view>
<view v-if="is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
</view>
<!-- 进度条 -->
<!-- <view v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
<view class="re flex-1">
@ -114,10 +117,13 @@
</view>
</view>
</template>
<view class="flex-col gap-10 wh-auto flex-1 jc-sb" :style="content_style">
<view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || form.is_shop_show == '1'" class="flex-col gap-10 wh-auto flex-1 jc-sb" :style="content_style">
<view class="flex-col gap-10 wh-auto">
<!-- 标题 -->
<view v-if="is_show('title')" :style="title_style" class="text-line-2 multi-text">{{ item.title }}</view>
<view v-if="is_show('title') || is_show('simple_desc')" class="flex-col" :style="{'gap': new_style.title_simple_desc_spacing * 2 + 'rpx' }">
<view v-if="is_show('title')" :style="title_style" class="text-line-2">{{ item.title }}</view>
<view v-if="is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
</view>
<!-- 进度条 -->
<!-- <view v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
<view class="re flex-1">
@ -226,6 +232,7 @@
title_style: '',
price_style: '',
button_style: '',
simple_desc: '',
sckill_list: [],
};
},
@ -267,8 +274,8 @@
const { status, time_first_text } = data.current.time;
this.setData({
seckill_time: {
end_time: data.current.time_end,
start_time: data.current.time_start,
time_end_number: Number(data.current.time_end_number + '000'),
time_start_number: Number(data.current.time_start_number + '000'),
status: status,
time_first_text: time_first_text,
},
@ -290,7 +297,7 @@
seckill_head_img_style: this.get_seckill_head_style(new_style, '2'),
style_container: common_styles_computer(new_style.common_style) + 'box-sizing: border-box;',
style_img_container: common_img_computer(new_style.common_style),
content_outer_spacing: new_style.content_outer_spacing,
content_outer_spacing: new_style.content_outer_spacing + 'px',
content_outer_spacing_magin: new_style.content_outer_spacing * 2 + 'rpx',
content_radius: radius_computer(new_style.shop_radius),
content_padding: padding_computer(new_style.shop_padding) + 'box-sizing: border-box;',
@ -301,9 +308,10 @@
corner_marker: this.get_corner_marker(new_style),
slides_per_group: new_style.rolling_fashion == 'translation' ? new_form.carousel_col : 1,
// 内容样式设置
title_style: this.trends_config(new_style, 'title'),
title_style: this.trends_config(new_style, 'title', 'title'),
price_style: this.trends_config(new_style, 'price'),
button_style: this.trends_config(new_style, 'button', 'gradient'),
simple_desc: this.trends_config(new_style, 'simple_desc', 'desc'),
list: this.get_shop_content_list(new_list, new_form, new_style),
sckill_list: new_list,
});
@ -370,16 +378,12 @@
}
},
updateCountdown() {
let end_time = this.seckill_time.end_time;
let time_end_number = this.seckill_time.time_end_number;
if (this.seckill_time.status === 0) {
end_time = this.seckill_time.start_time;
time_end_number = this.seckill_time.time_start_number;
}
// 先获取秒杀结束时间
let time = new Date(end_time.replace(/-/g, '/')).getTime();
if (isEmpty(time)) {
time = new Date(end_time).getTime();
}
const distance = time - new Date().getTime();
// 先获取秒杀结束时间和当前时间的差值
const distance = time_end_number - new Date().getTime();
// 如果倒计时结束，显示结束信息
if (distance <= 1000) {
clearInterval(this.intervalId);
@ -387,8 +391,8 @@
if (this.seckill_time.status === 0) {
this.setData({
seckill_time: {
end_time: this.seckill_time.time_end,
start_time: this.seckill_time.time_start,
time_end_number: this.seckill_time.time_end_number,
time_start_number: this.seckill_time.time_start_number,
status: 1,
time_first_text: '距结束',
},
@ -456,6 +460,10 @@
let style = `font-weight:${typeface}; font-size: ${size * 2}rpx;`;
if (type == 'gradient') {
style += this.button_gradient;
} else if (type == 'title') {
style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`;
} else if (type == 'desc') {
style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
} else {
style += `color: ${color};`;
}
@ -470,7 +478,7 @@
}
// 计算间隔的空间。(gap * gap数量) / 模块数量
let gap = (new_style.content_outer_spacing * (model_number - 1)) / model_number;
return `calc(${100 / model_number}% - ${gap * 2}rpx)`;
return `calc(${100 / model_number}% - ${gap}px)`;
},
is_show(index) {
return this.form.is_show.includes(index);

2
pages/plugins/realstore/detail/detail.vue
View File

@ -19,7 +19,7 @@
:propIsIconOnEvent="is_realstore_top_search_scan == 1"
:propIsOnEvent="true"
:propIsRequired="false"
:propIcon="is_realstore_top_search_scan == 1 ? 'icon-scan' : 'icon-qiandao-dqxz'"
:propIcon="is_realstore_top_search_scan == 1 ? 'icon-scan' : 'icon-qiandao-yixuan'"
propPlaceholderClass="cr-grey-c"
propBgColor="#fff"
propIconColor="#333"

2
pages/plugins/thirdpartylogin/index/index.vue
View File

@ -15,7 +15,7 @@
</block>
<block v-else>
<view class="margin-top-xxl">
<iconfont name="icon-qiandao-dqxz" size="28rpx" propClass="cr-green circle"></iconfont>
<iconfont name="icon-qiandao-yixuan" size="28rpx" propClass="cr-green circle"></iconfont>
<text class="margin-left-xs">{{$t('index.index.n0vnl6')}}</text>
</view>
<view class="margin-top-xxxl padding-top-xl">

4
pages/plugins/weixinliveplayer/index/index.vue
View File

@ -50,9 +50,9 @@
<div class="ring"></div>
</div>
<!-- 暂停中 -->
<iconfont v-else-if="item.status==='2'" name="icon-zhibo-zt margin-right-xs pr top-xs"></iconfont>
<iconfont v-else-if="item.status==='2'" name="icon-player-pause margin-right-xs pr top-xs"></iconfont>
<!-- 已结束 -->
<iconfont v-else-if="item.status==='3'" name="icon-zhibo-jies margin-right-xs pr top-xs"></iconfont>
<iconfont v-else-if="item.status==='3'" name="icon-player-end margin-right-xs pr top-xs"></iconfont>
<!-- 其他 -->
<iconfont v-else name="icon-zhibo-shixiao margin-right-xs pr top-xs"></iconfont>
{{item.status_name}}

4
pages/plugins/weixinliveplayer/search/search.vue
View File

@ -38,9 +38,9 @@
<div class="ring"></div>
</div>
<!-- 暂停中 -->
<iconfont v-else-if="item.status === '2'" name="icon-zhibo-zt" propClass="margin-right-xs pr top-xs"></iconfont>
<iconfont v-else-if="item.status === '2'" name="icon-player-pause" propClass="margin-right-xs pr top-xs"></iconfont>
<!-- 已结束 -->
<iconfont v-else-if="item.status === '3'" name="icon-zhibo-jies" propClass="margin-right-xs pr top-xs"></iconfont>
<iconfont v-else-if="item.status === '3'" name="icon-player-end" propClass="margin-right-xs pr top-xs"></iconfont>
<!-- 其他 -->
<iconfont v-else name="icon-zhibo-shixiao" propClass="margin-right-xs pr top-xs"></iconfont>
{{ item.status_name }}