yikouyan/uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新vue2的sass报错

Browse Source
This commit is contained in:
李志强 2025-08-06 17:32:46 +08:00
parent dc5fba137c
commit 4146097331
57 changed files with 159 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App.vue
View File

@ -15,7 +15,7 @@ export default {
});
// 获取配置
this.getConfigFun();
//获取用户
this.getUser();
// 获取分享
this.getShareInfo();
@ -27,7 +27,7 @@ export default {
this.bindCode(options);
},
onHide: function () {
console.log("App Hide");
// console.log("App Hide");
},
methods: {
...mapMutations(["SETCONFIG"]),

4
bundle/pages/balance_transfer/balance_transfer.vue
View File

@ -189,7 +189,7 @@ export default {
padding: 30rpx 45rpx;
.input {
border-bottom: $-solid-border;
border-bottom: $solid-border;
margin-top: 30rpx;
input {
@ -215,7 +215,7 @@ export default {
padding: 26rpx 0;
&:not(:last-of-type) {
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
}
}

20
bundle/pages/bargain_process/bargain_process.vue
View File

@ -535,7 +535,7 @@
.bargain-panel {
margin-top: 30rpx;
padding: 24rpx 24rpx 20rpx;
background-color: $-color-white;
background-color: $color-white;
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.06);
border-radius: 20rpx;
.bargain-panel-header {
@ -558,7 +558,7 @@
}
}
.invite-btn1 {
background-color: $-color-primary;
background-color: $color-primary;
height: 84rpx;
margin-top: 36rpx;
box-shadow: 0px 3px 10px rgba(235, 36, 51, 0.5);
@ -580,7 +580,7 @@
.invite-friend-btn {
width: 316rpx;
height: 84rpx;
background-color: $-color-primary;
background-color: $color-primary;
}
}
.bargain-code-content {
@ -603,13 +603,13 @@
.btn-container {
margin-top: 40rpx;
.help-knife-btn {
background-color: $-color-primary;
background-color: $color-primary;
height: 84rpx;
box-shadow: 0px 3px 10px rgba(235, 36, 51, 0.5);
}
.knife-btn {
height: 84rpx;
background-color: $-color-white;
background-color: $color-white;
border: 1px solid #BBBBBB;
margin-top: 30rpx;
}
@ -617,7 +617,7 @@
.code-content {
margin-top: 30rpx;
padding: 27rpx 24rpx;
background-color: $-color-white;
background-color: $color-white;
.user-item {
padding: 15rpx 0;
margin-top: 10rpx;
@ -633,13 +633,13 @@
}
.choose-content {
padding: 30rpx 20rpx;
background-color: $-color-white;
background-color: $color-white;
border-radius: 10px;
}
}
.lunch-btn {
height: 84rpx;
background-color: $-color-primary;
background-color: $color-primary;
box-shadow: 0px 3px 10px rgba(235, 36, 51, 0.5);
}
}
@ -663,7 +663,7 @@
.spec-active-item {
padding: 8rpx 28rpx;
color: white;
background-color: $-color-primary;
background-color: $color-primary;
}
}
.pickup-number {
@ -711,7 +711,7 @@
}
.share-pop-container {
height: 500rpx;
background-color: $-color-white;
background-color: $color-white;
}
}
</style>

2
bundle/pages/forget_pay_pwd/forget_pay_pwd.vue
View File

@ -172,7 +172,7 @@ export default {
width: 176rpx;
height: 58rpx;
flex: none;
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
}
}

4
bundle/pages/goods_combination/goods_combination.vue
View File

@ -120,7 +120,7 @@
</script>
<style lang="scss">
.goods-combination {
background-color: $-color-primary;
background-color: $color-primary;
min-height: 100vh;
.header .img {
@ -147,7 +147,7 @@
flex: 1;
width: 475rpx;
.group {
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
border-radius: 4rpx;
.group-img {
padding: 2rpx 6rpx;

4
bundle/pages/invite_fans/invite_fans.vue
View File

@ -142,12 +142,12 @@
}
.copy-btn {
color: $-color-primary;
color: $color-primary;
}
.save-btn {
color: #fff;
background-color: $-color-primary;
background-color: $color-primary;
}
}
</style>

2
bundle/pages/luckly_wheel/luckly_wheel.vue
View File

@ -152,7 +152,7 @@
/* pages/luckly_wheel/luckly_wheel.wxss */
.luckly-wheel-container {
background-color: $-color-primary;
background-color: $color-primary;
padding-bottom: 20rpx;
.header {

2
bundle/pages/message_center/message_center.vue
View File

@ -70,7 +70,7 @@ export default {
.message-item {
padding: 32rpx 0;
&:not(:last-of-type) {
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.item-info {
font-size: 32rpx;

2
bundle/pages/notice/notice.vue
View File

@ -130,7 +130,7 @@ export default {
border-radius: 10rpx;
.item-header {
padding: 19rpx 0;
border-bottom: $-solid-border;
border-bottom: $solid-border;
.header-title {
font-weight: bold;
}

2
bundle/pages/recharge_code/recharge_code.vue
View File

@ -73,7 +73,7 @@
padding: 20rpx 30rpx;
&:not(:last-of-type) {
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
}
}

2
bundle/pages/sign_detail/sign_detail.vue
View File

@ -103,7 +103,7 @@ export default {
.sign-detail-container .sign-item {
padding: 18rpx 30rpx;
background-color: #fff;
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.sign-type {

2
bundle/pages/transfer_record/transfer_record.vue
View File

@ -152,7 +152,7 @@
.list {
.item {
padding: 20rpx 30rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
align-items: flex-start;
.avatar {
width: 68rpx;

4
bundle/pages/user_bill/user_bill.vue
View File

@ -165,9 +165,9 @@ export default {
.bill-list {
.bill-item {
padding: 20rpx 30rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
.income {
color: $-color-primary;
color: $color-primary;
}
}
}

6
bundle/pages/user_fans/user_fans.vue
View File

@ -259,7 +259,7 @@ export default {
}
.item-active {
color: white;
background-color: $-color-primary;
background-color: $color-primary;
border-radius: 100rpx;
height: 100%;
}
@ -272,7 +272,7 @@ export default {
line-height: 40rpx;
height: 100%;
.item-active {
color: $-color-primary;
color: $color-primary;
}
}
}
@ -304,7 +304,7 @@ export default {
text-align: right;
}
&:not(:nth-last-of-type(3)) {
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
}
}

4
bundle/pages/user_payment/user_payment.vue
View File

@ -248,7 +248,7 @@
margin-left: 30rpx;
}
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.tip {
@ -279,7 +279,7 @@
height: 150rpx;
border-radius: 10rpx;
margin-bottom: 16rpx;
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
&:not(:nth-of-type(3n)) {
margin-right: 24rpx;

10
bundle/pages/user_profile/user_profile.vue
View File

@ -629,8 +629,8 @@ export default {
.bd-btn {
padding: 8rpx 24rpx;
border: 1px solid $-color-primary;
color: $-color-primary;
border: 1px solid $color-primary;
color: $color-primary;
}
}
@ -666,7 +666,7 @@ export default {
padding-bottom: 30rpx;
width: 580rpx;
border-radius: 30rpx;
background-color: $-color-white;
background-color: $color-white;
.title {
padding: 26rpx 0rpx;
@ -678,10 +678,10 @@ export default {
border-bottom: 1rpx solid #e5e5e5;
.send-code-btn {
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
width: 184rpx;
height: 62rpx;
color: $-color-primary;
color: $color-primary;
}
}

10
bundle/pages/user_set/user_set.vue
View File

@ -548,8 +548,8 @@ export default {
.bd-btn {
padding: 8rpx 24rpx;
border: 1px solid $-color-primary;
color: $-color-primary;
border: 1px solid $color-primary;
color: $color-primary;
}
}
@ -585,7 +585,7 @@ export default {
padding-bottom: 30rpx;
width: 580rpx;
border-radius: 30rpx;
background-color: $-color-white;
background-color: $color-white;
.title {
padding: 26rpx 0rpx;
@ -597,10 +597,10 @@ export default {
border-bottom: 1rpx solid #e5e5e5;
.send-code-btn {
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
width: 184rpx;
height: 62rpx;
color: $-color-primary;
color: $color-primary;
}
}

10
bundle/pages/user_sign/user_sign.vue
View File

@ -216,7 +216,7 @@ export default {
.user-sgin .main .contain .title .line {
width: 8rpx;
height: 34rpx;
background-color: $-color-primary;
background-color: $color-primary;
}
.user-sgin .main .day-list {
@ -275,7 +275,7 @@ export default {
background: linear-gradient(270deg, rgba(249, 95, 47, 1) 0%, rgba(252, 67, 54, 1) 55%, rgba(255, 44, 60, 1) 100%);
}
.user-sgin .main .contain .task {
border-top: $-solid-border;
border-top: $solid-border;
}
.user-sgin .main .contain .task .item {
padding: 23rpx 30rpx;
@ -290,10 +290,10 @@ export default {
}
.user-sgin .main .contain .task .item .btn {
width: 154rpx;
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
}
.user-sgin .main .contain .task .item .con .num {
color: $-color-primary;
color: $color-primary;
}
.score-detail-entry {
@ -326,7 +326,7 @@ export default {
font-weight: bold;
padding-top: 90rpx;
padding-bottom: 150rpx;
color: $-color-primary;
color: $color-primary;
}
.desc {

10
bundle/pages/user_spread/user_spread.vue
View File

@ -567,7 +567,7 @@ export default {
.usual-tools-header {
height: 100rpx;
line-height: 44rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.usual-content {
padding: 40rpx 0;
@ -610,7 +610,7 @@ export default {
margin-top: 60rpx;
.form-item {
padding: 24rpx 0 24rpx 30rpx;
border: $-solid-border;
border: $solid-border;
margin: 0 34rpx 30rpx;
.label {
width: 150rpx;
@ -647,7 +647,7 @@ export default {
padding: 60rpx 0 22rpx;
/* margin: 0 8px; */
width: 100%;
border-bottom: $-solid-border;
border-bottom: $solid-border;
.apply-result-img {
width: 100rpx;
height: 100rpx;
@ -707,7 +707,7 @@ van-field textarea {
}
.main .user-result-box .user-result-content .apply-fail-reason {
color: $-color-primary;
color: $color-primary;
line-height: 36rpx;
margin-top: 10rpx;
}
@ -719,7 +719,7 @@ van-field textarea {
padding-bottom: 30rpx;
width: 580rpx;
border-radius: 6rpx;
background-color: $-color-white;
background-color: $color-white;
}
.inviteformContain .title {

6
bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue
View File

@ -202,7 +202,7 @@ export default {
<style lang="scss">
.user-spread-month-bill .header {
height: 240rpx;
background-color: $-color-primary;
background-color: $color-primary;
padding-top: 60rpx;
}
@ -226,7 +226,7 @@ export default {
.user-spread-month-bill .content .order-container .order-item .order-header {
padding: 20rpx 30rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.user-spread-month-bill .content .order-container .order-item .order-header .guide-shop-btn {
@ -238,7 +238,7 @@ export default {
.user-spread-month-bill .content .order-container .order-item .order-content {
padding: 20rpx 30rpx 20rpx 20rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.user-spread-month-bill .content .order-container .order-item .order-content .order-goods-img {

4
bundle/pages/user_withdraw/user_withdraw.vue
View File

@ -382,7 +382,7 @@
border-radius: 20rpx;
.input {
border-bottom: $-solid-border;
border-bottom: $solid-border;
input {
width: 100%;
@ -410,7 +410,7 @@
.input-item {
padding: 28rpx 0 30rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.input-label {

2
bundle/pages/user_withdraw_code/user_withdraw_code.vue
View File

@ -105,7 +105,7 @@ export default {
color: #666666;
}
.error-status {
color: $-color-primary;
color: $color-primary;
}
&:not(:last-of-type) {
border-bottom: var(--border);

2
bundle/pages/widthdraw_result/widthdraw_result.vue
View File

@ -170,7 +170,7 @@
.go-back-btn {
width: 650rpx;
height: 84rpx;
border: solid 1rpx $-color-primary;
border: solid 1rpx $color-primary;
box-sizing: border-box;
}
}

2
components/active-area/active-area.vue
View File

@ -93,7 +93,7 @@
border-radius: 10rpx;
padding-bottom: 20rpx;
&.seckill {
background-color: $-color-white;
background-color: $color-white;
background-image: url(../../static/images/home_seckill_bg.png);
}

2
components/after-sales-list/after-sales-list.vue
View File

@ -396,7 +396,7 @@ export default {
.btn {
padding: 9rpx 34rpx;
font-family: PingFang SC;
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
}
.grey-btn {

4
components/bargain-list/bargain-list.vue
View File

@ -105,7 +105,7 @@
<style lang="scss">
.bargain-list-container {
.bargain-list {
background-color: $-color-white;
background-color: $color-white;
.header {
height: 80rpx;
padding: 20rpx 20rpx;
@ -126,7 +126,7 @@
// 继续砍价 按钮
height: 62rpx;
padding: 0 44rpx;
background-color: $-color-primary;
background-color: $color-primary;
}
.purchase-btn {
// 直接购买

2
components/cate-four/cate-four.vue
View File

@ -242,7 +242,7 @@
padding: 26rpx 10rpx;
&.active {
color: $-color-primary;
color: $color-primary;
font-size: 26rpx;
font-weight: bold;
}

4
components/cate-list/cate-list.vue
View File

@ -255,7 +255,7 @@
border: 1px solid transparent;
border-radius: 50%;
&.active {
border-color: $-color-primary;
border-color: $color-primary;
}
}
.name {
@ -279,7 +279,7 @@
&.active {
width: 20rpx;
background-color: $-color-primary;
background-color: $color-primary;
}
}

2
components/cate-three/cate-three.vue
View File

@ -101,7 +101,7 @@
padding: 26rpx 10rpx;
&.active {
color: $-color-primary;
color: $color-primary;
font-size: 26rpx;
font-weight: bold;
}

4
components/comment-list/comment-list.vue
View File

@ -176,7 +176,7 @@ export default {
}
.btn {
padding: 6rpx 34rpx;
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
}
}
}
@ -194,7 +194,7 @@ export default {
.btn {
width: 178rpx;
height: 52rpx;
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
}
}
}

2
components/download-nav/download-nav.vue
View File

@ -58,7 +58,7 @@
z-index: 871;
top: 0;
.primary-btn {
background-color: $-color-primary;
background-color: $color-primary;
height: 54rpx;
width: 154rpx;
margin-right: 30rpx;

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

@ -159,7 +159,7 @@
}
.group-footer {
height: 100rpx;
border-top: $-solid-border;
border-top: $solid-border;
padding: 0 24rpx;
.btn {
width: 244rpx;

2
components/home-coupon/home-coupon.vue
View File

@ -167,7 +167,7 @@
.coupon-right {
background-color: #E5E5E5;
color: $-color-muted;
color: $color-muted;
}
}

2
components/lime-painter/components/l-painter/painter.js
View File

File diff suppressed because one or more lines are too long

10
components/lyg-popup/lyg-popup.vue
View File

@ -175,13 +175,13 @@
flex: 1;
}
button {
color: $-color-white;
background-color: $-color-primary;
color: $color-white;
background-color: $color-primary;
}
.plain {
color: $-color-primary;
background-color: $-color-white;
border: 1px solid $-color-primary;
color: $color-primary;
background-color: $color-white;
border: 1px solid $color-primary;
}
}
}

4
components/order-list/order-list.vue
View File

@ -463,14 +463,14 @@ export default {
.order-footer {
height: 100rpx;
border-top: $-solid-border;
border-top: $solid-border;
padding: 0 24rpx;
.plain {
border: 1px solid #bbbbbb;
&.red {
border-color: $-color-primary;
border-color: $color-primary;
}
}
}

2
components/privacy-popup/privacy-popup.vue
View File

@ -101,7 +101,7 @@ export default {
margin-top: 15rpx;
}
.btn-comfirm {
background-color: $-color-primary;
background-color: $color-primary;
color: white;
height: 80rpx;
line-height: 80rpx;

2
components/share-popup/share-popup.vue
View File

@ -264,7 +264,7 @@
.save-btn {
// @include background_color();
background-color: $-color-primary;
background-color: $color-primary;
color: #fff;
margin-top: 20rpx;
}

8
components/spec-popup/spec-popup.vue
View File

@ -405,7 +405,7 @@ export default {
padding: 30rpx 20rpx;
padding-right: 70rpx;
align-items: flex-start;
border: $-solid-border;
border: $solid-border;
.vip-price {
margin: 0 24rpx;
background-color: #ffe9ba;
@ -453,14 +453,14 @@ export default {
border: 1px solid #f4f4f4;
// &.checked {
// background-color: $-color-primary;
// background-color: $color-primary;
// color: #fff;
// }
&.checked {
background-color: #ffe9eb;
color: $-color-primary;
border-color: $-color-primary;
color: $color-primary;
border-color: $color-primary;
}
&.disabled {

2
components/swipers/swipers.vue
View File

@ -170,7 +170,7 @@
&.active {
width: 16rpx;
border-radius: 8rpx;
background-color: $-color-primary;
background-color: $color-primary;
}
}
}

2
pages/address_edit/address_edit.vue
View File

@ -295,7 +295,7 @@ export default {
padding: 0 24rpx;
height: 80rpx;
&:not(:nth-of-type(3)) {
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.label {
width: 150rpx;

2
pages/all_comments/all_comments.vue
View File

@ -257,7 +257,7 @@ export default {
.evaluation-item {
padding: 20rpx;
&:not(:last-of-type) {
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.avatar {
width: 60rpx;

2
pages/forget_pwd/forget_pwd.vue
View File

@ -211,7 +211,7 @@ page {
height: 100rpx;
border-radius: 10rpx;
width: 670rpx;
border: $-solid-border;
border: $solid-border;
margin-top: 30rpx;
}
}

10
pages/goods_details/goods_details.vue
View File

@ -774,7 +774,7 @@
padding: 0 18rpx;
border-radius: 6rpx;
box-sizing: border-box;
background-color: $-color-primary;
background-color: $color-primary;
color: #fff;
white-space: nowrap;
overflow: hidden;
@ -817,7 +817,7 @@
.evaluation {
.title {
height: 100rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
padding: 0 24rpx;
}
@ -895,14 +895,14 @@
}
.right-buy {
background-color: $-color-primary;
background-color: $color-primary;
}
}
.group-play {
.title {
padding: 20rpx 28rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.steps {
@ -935,7 +935,7 @@
padding: 20rpx 24rpx;
&:not(:last-of-type) {
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.group-btn {

8
pages/index/index.vue
View File

@ -585,7 +585,7 @@ export default {
justify-content: center;
width: 80rpx;
height: 80rpx;
border: $-solid-border;
border: $solid-border;
border-radius: 50%;
font-size: 32rpx;
background-color: #ffffff;
@ -660,7 +660,7 @@ export default {
&.active {
width: 20rpx;
background-color: $-color-primary;
background-color: $color-primary;
}
}
}
@ -780,7 +780,7 @@ export default {
.coupon-right {
padding-left: 30rpx;
border-left: 1rpx dashed $-color-primary;
border-left: 1rpx dashed $color-primary;
}
}
}
@ -823,7 +823,7 @@ export default {
.price {
width: 160rpx;
border-right: 1px dashed $-color-primary;
border-right: 1px dashed $color-primary;
height: 100%;
}
}

8
pages/login/login.vue
View File

@ -568,7 +568,7 @@ page {
height: 100rpx;
}
.phonebtn {
border: $-solid-border;
border: $solid-border;
margin-top: 50rpx;
width: 100%;
height: 100rpx;
@ -577,12 +577,12 @@ page {
height: 100rpx;
border-radius: 10rpx;
width: 670rpx;
border: $-solid-border;
border: $solid-border;
margin-top: 30rpx;
}
.sms-btn {
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
width: 176rpx;
height: 60rpx;
box-sizing: border-box;
@ -605,7 +605,7 @@ page {
padding: 60rpx 0 70rpx 0;
}
.agreement {
color: $-color-primary;
color: $color-primary;
}
.inactive {
opacity: 0.5;

6
pages/order_details/order_details.vue
View File

@ -621,7 +621,7 @@ export default {
top: 0;
width: 100%;
height: 200rpx;
background-color: $-color-primary;
background-color: $color-primary;
z-index: 0;
}
@ -691,7 +691,7 @@ export default {
}
.footer .plain.red {
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
}
.tips-dialog {
@ -783,6 +783,6 @@ export default {
}
.receive-info-item:nth-child(n + 2) {
border-top: $-dashed-border;
border-top: $dashed-border;
}
</style>

2
pages/pay_result/pay_result.vue
View File

@ -146,7 +146,7 @@
.go-back-btn {
width: 650rpx;
height: 84rpx;
border:1px solid $-color-primary;
border:1px solid $color-primary;
box-sizing: border-box;
}
}

10
pages/payment/payment.vue
View File

@ -262,7 +262,7 @@
justify-content: center;
padding: 20rpx 0;
font-size: 26rpx;
color: $-color-muted;
color: $color-muted;
}
}
@ -276,7 +276,7 @@
height: 120rpx;
&:nth-child(n+2) {
border-top: $-dashed-border;
border-top: $dashed-border;
}
&-content {
@ -287,12 +287,12 @@
&-name {
font-size: 28rpx;
color: $-color-black;
color: $color-black;
}
&-tips {
font-size: 22rpx;
color: $-color-muted;
color: $color-muted;
}
}
}
@ -307,7 +307,7 @@
margin-top: 10rpx;
font-size: 22rpx;
background-color: #FFFFFF;
color: $-color-normal;
color: $color-normal;
}
&-submit {

8
pages/register/register.vue
View File

@ -291,7 +291,7 @@ page {
height: 100rpx;
border-radius: 10rpx;
width: 670rpx;
border: $-solid-border;
border: $solid-border;
margin-top: 30rpx;
}
.input-item {
@ -312,10 +312,10 @@ page {
height: 29px;
width: 88px;
flex: none;
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
cursor: pointer;
.seconds {
color: $-color-primary;
color: $color-primary;
}
}
}
@ -332,7 +332,7 @@ page {
padding: 60rpx 0 70rpx 0;
}
.agreement {
color: $-color-primary;
color: $color-primary;
}
.inactive {
opacity: 0.5;

6
pages/shop_cart/shop_cart.vue
View File

@ -335,20 +335,20 @@ export default {
margin: 20rpx 20rpx 0;
border-radius: 10rpx;
// &.invalid {
// background-color: $-color-body;
// background-color: $color-body;
// }
}
.select {
height: 80rpx;
padding: 0 20rpx;
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
}
.cart-null {
.btn {
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
width: 184rpx;
margin-left: auto;
margin-right: auto;

2
pages/sort/sort.vue
View File

@ -74,7 +74,7 @@
.header {
box-sizing: border-box;
height: $header-height;
border-bottom: $-solid-border;
border-bottom: $solid-border;
.search {
flex: 1;

8
pages/user/user.vue
View File

@ -348,7 +348,7 @@ export default {
position: absolute;
background-color: #ee0a24;
border: 2rpx solid #ffffff;
color: $-color-primary;
color: $color-primary;
border-radius: 100%;
top: 6rpx;
right: 0rpx;
@ -398,7 +398,7 @@ export default {
.title {
height: 88rpx;
padding: 0 30rpx;
border-bottom: $-dashed-border;
border-bottom: $dashed-border;
}
.nav {
@ -418,8 +418,8 @@ export default {
height: 28rpx;
border-radius: 28rpx;
box-sizing: border-box;
border: 1rpx solid $-color-primary;
color: $-color-primary;
border: 1rpx solid $color-primary;
color: $color-primary;
position: absolute;
left: 33rpx;
top: -10rpx;

2
pages/user_address/user_address.vue
View File

@ -276,7 +276,7 @@ export default {
padding: 0 30rpx;
.address {
padding: 20rpx 0;
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.operation {
height: 80rpx;

4
pages/user_collection/user_collection.vue
View File

@ -154,7 +154,7 @@ export default {
.collection-item {
padding: 20rpx;
&:not(:last-of-type) {
border-bottom: $-solid-border;
border-bottom: $solid-border;
}
.info {
flex: 1;
@ -168,7 +168,7 @@ export default {
width: 148rpx;
height: 52rpx;
right: 20rpx;
border: 1px solid $-color-primary;
border: 1px solid $color-primary;
display: flex;
justify-content: center;
align-items: center;

44
styles/base.scss
View File

@ -4,9 +4,9 @@ page {
/* 定义一些主题色及基础样式 */
font-family: PingFang SC, Arial, Hiragino Sans GB, Microsoft YaHei, sans-serif;
font-size: 28rpx;
color: $-color-normal;
color: $color-normal;
padding-bottom: env(safe-area-inset-bottom);
background-color: $-color-body;
background-color: $color-body;
}
.flex1{
@ -25,41 +25,41 @@ page {
}
/* 定义字体颜色 */
.primary {
color: $-color-primary;
color: $color-primary;
}
.bg-primary {
background-color: $-color-primary;
background-color: $color-primary;
}
.bg-white {
background-color: $-color-white;
background-color: $color-white;
}
.bg-body {
background-color: $-color-body;
background-color: $color-body;
}
.bg-gray {
background-color: $-color-border;
background-color: $color-border;
}
.black {
color: $-color-black;
color: $color-black;
}
.white {
color: $-color-white;
color: $color-white;
}
.normal {
color: $-color-normal;
color: $color-normal;
}
.lighter {
color: $-color-lighter;
color: $color-lighter;
}
.muted {
color: $-color-muted;
color: $color-muted;
}
/* 定义字体大小 */
@ -278,10 +278,10 @@ page input {
font-size: 28rpx;
}
button[type=primary] {
background-color: $-color-primary;
background-color: $color-primary;
}
.button-hover[type=primary] {
background-color: $-color-primary;
background-color: $color-primary;
}
/* 按钮大小 */
button[size="xs"]{
@ -366,8 +366,8 @@ radio {
width: 34rpx;
height: 34rpx;
&.uni-radio-input-checked {
border: 1px solid $-color-primary !important;
background-color: $-color-primary !important;
border: 1px solid $color-primary !important;
background-color: $color-primary !important;
}
}
}
@ -380,8 +380,8 @@ checkbox {
width: 34rpx;
height: 34rpx;
&.uni-checkbox-input-checked {
border: 1px solid $-color-primary !important;
background-color: $-color-primary !important;
border: 1px solid $color-primary !important;
background-color: $color-primary !important;
color: #fff !important;
&::before {
font-size: 35rpx;
@ -404,8 +404,8 @@ radio {
width: 34rpx;
height: 34rpx;
&.wx-radio-input-checked {
border: 1px solid $-color-primary !important;
background-color: $-color-primary !important;
border: 1px solid $color-primary !important;
background-color: $color-primary !important;
}
}
}
@ -418,8 +418,8 @@ checkbox {
width: 34rpx;
height: 34rpx;
&.wx-checkbox-input-checked {
border: 1px solid $-color-primary !important;
background-color: $-color-primary !important;
border: 1px solid $color-primary !important;
background-color: $color-primary !important;
color: #fff !important;
&::before {
font-size: 35rpx;

20
uni.scss
View File

@ -17,26 +17,26 @@
/* 行为相关颜色 */
//主题色
$-color-primary: #FF2C3C;
$color-primary: #FF2C3C;
//主要边框颜色
$-color-border: #E5E5E5;
$color-border: #E5E5E5;
//黑色
$-color-black:#101010;
$color-black:#101010;
//白色
$-color-white: #ffffff;
$color-white: #ffffff;
//字体主色
$-color-normal: #333333;
$color-normal: #333333;
//字体浅色
$-color-lighter: #666666;
$color-lighter: #666666;
//字体更浅色
$-color-muted: #999999;
$color-muted: #999999;
//背景色
$-color-body: #F6F6F6;
$color-body: #F6F6F6;
//边框
$-solid-border: 1px solid $-color-border;
$-dashed-border: 1px dashed $-color-border;
$solid-border: 1px solid $color-border;
$dashed-border: 1px dashed $color-border;