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

Merge branch 'dev-sws' into dev-yxl

master
于肖磊 2024-10-16 10:39:33 +08:00
parent 540757819a 5358b6c734
commit bea677200e
10 changed files with 786 additions and 786 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/css/page.css
View File

@ -557,6 +557,9 @@ button:before {
.cr-blue {
color: #2196F3 !important;
}
.cr-blue-dark {
color: #B3BFCB !important;
}
/**
* 统一背景色
@ -1356,4 +1359,10 @@ button[disabled].bg-grey {
/* #ifndef H5 */
padding-top: calc(var(--status-bar-height) + 10rpx);
/* #endif */
}
/* 富文本 */
.diy-rich-text * {
max-width: 100%;
/* width: 100%; */
}

15
components/diy/coupon.vue
View File

@ -363,8 +363,8 @@
.item {
flex-basis: auto;
flex-shrink: 0;
width: 180rpx;
height: 180rpx;
width: 168rpx;
height: 168rpx;
border-radius: 20rpx;
margin-top: 20rpx;
@ -411,7 +411,7 @@
font-size: 18rpx;
border-radius: 46rpx;
position: relative;
top: -4rpx;
top: -10rpx;
}
}
}
@ -803,14 +803,13 @@
.coupon-theme-6 {
display: flex;
.item {
flex-basis: auto;
flex-shrink: 0;
border-radius: 24rpx;
padding: 12rpx;
width: 280rpx;
height: 200rpx;
width: 268rpx;
height: 188rpx;
position: relative;
box-sizing: border-box;
@ -876,12 +875,12 @@
}
.bottom {
margin-top: 12rpx;
margin-top: 8rpx;
text-align: center;
.coupon-btn {
position: relative;
font-size: 32rpx;
font-size: 28rpx;
line-height: 44rpx;
font-weight: 500;
text-align: center;

2
components/diy/float-window.vue
View File

@ -74,7 +74,7 @@
const { windowWidth, windowHeight } = uni.getSystemInfoSync();
let x = display_location == 'left' ? 10 : windowWidth - 60;
// 计算出距离顶部的距离
const y = Math.ceil(windowHeight * (1 - Number(offset_number_percentage)));
const y = Math.ceil(windowHeight * (1 - Number(offset_number_percentage)) - 20);
this.setData({
content_style: float_style == 'shadow' ? `box-shadow: 0 0 40rpx ${float_style_color};border-radius: 50%;` : `background-color: ${float_style_color};border-radius: 50%;`,
x: x,

2
components/diy/header.vue
View File

@ -12,7 +12,7 @@
<view class="model-head pr flex-row align-c" :style="header_style">
<view class="model-head-content flex-row align-c jc-sb gap-16 wh-auto pr padding-left-main">
<view v-if="!is_tabbar_pages" class="z-i dis-inline-block margin-top-xs" @tap="top_nav_left_back_event">
<iconfont name="icon-arrow-left" size="40rpx" propContainerDisplay="flex"></iconfont>
<iconfont name="icon-arrow-left" size="40rpx" propContainerDisplay="flex" :color="form.style.left_back_btn_color || '#333'"></iconfont>
</view>
<view v-if="['1', '2', '3'].includes(form.content.theme)" class="flex-1">
<view class="flex-row align-c jc-c ht-auto gap-16" :class="position_class" :style="text_style + 'justify-content:' + form.content.indicator_location || 'center'">

13
components/diy/rich-text.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 富文本 -->
<view class="rich-text" :style="style_container">
<view class="diy-rich-text" :style="style_container">
<view :style="style_img_container">
<mp-html :content="content" />
</view>
@ -50,13 +50,4 @@
};
</script>
<style>
.rich-text {
* {
max-width: 100%;
}
[id^=v] {
width: 100%;
}
}
</style>
<style></style>

2
components/search/search.vue
View File

@ -119,7 +119,7 @@
},
propPadding: {
type: String,
default: '14rpx 20rpx 0 20rpx;',
default: '16rpx 20rpx 0 20rpx;',
},
},
// 属性值改变监听

7
pages/goods-search-start/goods-search-start.css
View File

@ -1,5 +1,5 @@
.ranking-list .ranking-item {
width: 65%;
width: 65vw;
}
.ranking-list .goods-list .goods-image {
width: 100rpx;
@ -9,5 +9,8 @@
width: calc(100% - 120rpx);
}
.ranking-list .goods-list .single-text {
width: 54vw;
width: 59vw;
}
.ranking-list .goods-list .icon {
width: 38rpx;
}

12
pages/goods-search-start/goods-search-start.vue
View File

@ -42,17 +42,17 @@
<view class="goods-list bg-white border-radius-main padding-main margin-top-xs">
<block v-for="(item2, index2) in item.data" :key="index2">
<view class="goods-item oh margin-bottom-main" :data-value="item2.goods_url" @tap="url_event">
<view v-if="index2 > 3" class="single-text">
<view v-if="index2 > 2" class="single-text">
<view class="dis-inline-block pr margin-right-sm">
<iconfont :name="item.icon" size="26rpx" propClass="cr-main"></iconfont>
<text class="pa top-0 left-0 cr-white">{{index2}}</text>
<iconfont name="icon-label" size="38rpx" propClass="cr-grey-c"></iconfont>
<view class="icon pa top-0 left-xs tc cr-white text-size-xs">{{index2+1}}</view>
</view>
<text class="text-size-sm">{{item2.title}}</text>
</view>
<view v-else class="pr">
<view class="pa top-sm left-sm z-i">
<iconfont :name="item.icon" size="26rpx" propClass="cr-main"></iconfont>
<text class="pa top-0 left-0 cr-white">{{index2}}</text>
<view class="pa top-sm left-sm z-i tc">
<iconfont name="icon-label" size="38rpx" :propClass="index2 == 0 ? 'cr-red' : (index2 == 1 ? 'cr-yellow' : 'cr-blue-dark')"></iconfont>
<view class="icon pa top-0 left-xs tc cr-white text-size-xs">{{index2+1}}</view>
</view>
<image class="goods-image radius fl" :src="item2.images" mode="aspectFill"></image>
<view class="goods-title text-size-sm multi-text fr">{{item2.title}}</view>

1510
static/icon/iconfont.css
View File

File diff suppressed because one or more lines are too long

BIN
static/icon/iconfont.ttf
View File

Binary file not shown.