xsl/meida_applet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/sheepjs/shopro-uniapp

Browse Source
This commit is contained in:
ldh
2023-01-27 19:34:44 +08:00
parent d5ae2524c0 7a85bc19b2
commit 84cc095570
25 changed files with 153 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sheep/components/s-empty/s-empty.vue
+2 -2
View File
@@ -84,10 +84,10 @@
.empty-btn {
width: 320rpx;
height: 70rpx;
border: 2rpx solid v-bind('props.buttonColor');
border: 2rpx solid v-bind('buttonColor');
border-radius: 35rpx;
font-weight: 500;
color: v-bind('props.buttonColor');
color: v-bind('buttonColor');
font-size: 28rpx;
}
</style>
sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
+2 -1
View File
@@ -128,6 +128,7 @@
import { formatPrice } from '@/sheep/hooks/useGoods';
import { isEmpty } from 'lodash';
const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/groupon-btn-long.png');
const emits = defineEmits(['change', 'addCart', 'buy', 'close', 'ladder']);
const props = defineProps({
show: {
@@ -403,7 +404,7 @@
font-size: 24rpx;
font-weight: 600;
margin-left: -50rpx;
background-image: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png')");
background-image: v-bind(headerBg);
background-repeat: no-repeat;
background-size: 100% 100%;
color: #ffffff;
sheep/ui/su-coupon/su-coupon.vue
+16 -16
View File
@@ -182,18 +182,18 @@
font-size: 50rpx;
line-height: 50rpx;
font-weight: bold;
color: v-bind('props.textColor');
color: v-bind('textColor');
vertical-align: text-bottom;
}
.value-unit {
color: v-bind('props.textColor');
color: v-bind('textColor');
font-size: 24rpx;
line-height: 30rpx;
}
.title-text {
color: v-bind('props.textColor');
color: v-bind('textColor');
font-size: 24rpx;
line-height: 30rpx;
width: 150rpx;
@@ -205,10 +205,10 @@
height: 50rpx;
border-radius: 25rpx;
border-style: solid;
border-color: v-bind('props.btnTextColor');
border-color: v-bind('btnTextColor');
border-width: 1px;
color: v-bind('props.btnTextColor');
background-color: v-bind('props.btnBg');
color: v-bind('btnTextColor');
background-color: v-bind('btnBg');
font-size: 24rpx;
line-height: 50rpx;
}
@@ -231,19 +231,19 @@
font-size: 36rpx;
line-height: 36rpx;
font-weight: bold;
color: v-bind('props.textColor');
color: v-bind('textColor');
vertical-align: text-bottom;
}
.value-unit {
color: v-bind('props.textColor');
color: v-bind('textColor');
font-size: 22rpx;
line-height: 22rpx;
}
.title-text,
.surplus-text {
color: v-bind('props.textColor');
color: v-bind('textColor');
font-size: 22rpx;
line-height: 22rpx;
}
@@ -253,7 +253,7 @@
height: 100%;
.btn-text {
color: v-bind('props.btnTextColor');
color: v-bind('btnTextColor');
font-size: 24rpx;
text-align: center;
writing-mode: vertical-lr;
@@ -278,12 +278,12 @@
font-size: 50rpx;
line-height: 50rpx;
font-weight: bold;
color: v-bind('props.textColor');
color: v-bind('textColor');
vertical-align: text-bottom;
}
.value-unit {
color: v-bind('props.textColor');
color: v-bind('textColor');
font-size: 22rpx;
line-height: 22rpx;
}
@@ -291,7 +291,7 @@
.title-text,
.sellby-text,
.surplus-text {
color: v-bind('props.textColor');
color: v-bind('textColor');
font-size: 22rpx;
line-height: 22rpx;
}
@@ -303,10 +303,10 @@
height: 50rpx;
border-radius: 25rpx;
border-style: solid;
border-color: v-bind('props.btnTextColor');
border-color: v-bind('btnTextColor');
border-width: 1px;
color: v-bind('props.btnTextColor');
background-color: v-bind('props.btnBg');
color: v-bind('btnTextColor');
background-color: v-bind('btnBg');
font-size: 24rpx;
line-height: 50rpx;
}
sheep/ui/su-popup/su-popup.vue
+1 -1
View File
@@ -556,7 +556,7 @@
display: block;
/* #endif */
position: relative;
background: v-bind('sheep.$url.css(backgroundImage)') no-repeat;
background: v-bind(backgroundImage) no-repeat;
background-size: 100% 100%;
/* iphonex 等安全区设置，底部安全区适配 */