diff --git a/App.vue b/App.vue index 371cc19..3b277f6 100644 --- a/App.vue +++ b/App.vue @@ -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"]), diff --git a/bundle/pages/balance_transfer/balance_transfer.vue b/bundle/pages/balance_transfer/balance_transfer.vue index 4b657da..2c30c51 100644 --- a/bundle/pages/balance_transfer/balance_transfer.vue +++ b/bundle/pages/balance_transfer/balance_transfer.vue @@ -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; } } } diff --git a/bundle/pages/bargain_process/bargain_process.vue b/bundle/pages/bargain_process/bargain_process.vue index d61a2b2..c821590 100644 --- a/bundle/pages/bargain_process/bargain_process.vue +++ b/bundle/pages/bargain_process/bargain_process.vue @@ -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; } } \ No newline at end of file diff --git a/bundle/pages/forget_pay_pwd/forget_pay_pwd.vue b/bundle/pages/forget_pay_pwd/forget_pay_pwd.vue index 36c7f6f..76e7e13 100644 --- a/bundle/pages/forget_pay_pwd/forget_pay_pwd.vue +++ b/bundle/pages/forget_pay_pwd/forget_pay_pwd.vue @@ -172,7 +172,7 @@ export default { width: 176rpx; height: 58rpx; flex: none; - border: 1px solid $-color-primary; + border: 1px solid $color-primary; } } diff --git a/bundle/pages/goods_combination/goods_combination.vue b/bundle/pages/goods_combination/goods_combination.vue index 9cd26ec..ce3d630 100644 --- a/bundle/pages/goods_combination/goods_combination.vue +++ b/bundle/pages/goods_combination/goods_combination.vue @@ -120,7 +120,7 @@ diff --git a/bundle/pages/luckly_wheel/luckly_wheel.vue b/bundle/pages/luckly_wheel/luckly_wheel.vue index faeb7b3..b5758c0 100644 --- a/bundle/pages/luckly_wheel/luckly_wheel.vue +++ b/bundle/pages/luckly_wheel/luckly_wheel.vue @@ -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 { diff --git a/bundle/pages/message_center/message_center.vue b/bundle/pages/message_center/message_center.vue index 615c116..b7b586c 100644 --- a/bundle/pages/message_center/message_center.vue +++ b/bundle/pages/message_center/message_center.vue @@ -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; diff --git a/bundle/pages/notice/notice.vue b/bundle/pages/notice/notice.vue index f6808b3..ccb228e 100644 --- a/bundle/pages/notice/notice.vue +++ b/bundle/pages/notice/notice.vue @@ -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; } diff --git a/bundle/pages/recharge_code/recharge_code.vue b/bundle/pages/recharge_code/recharge_code.vue index b11c157..5452184 100644 --- a/bundle/pages/recharge_code/recharge_code.vue +++ b/bundle/pages/recharge_code/recharge_code.vue @@ -73,7 +73,7 @@ padding: 20rpx 30rpx; &:not(:last-of-type) { - border-bottom: $-solid-border; + border-bottom: $solid-border; } } } diff --git a/bundle/pages/sign_detail/sign_detail.vue b/bundle/pages/sign_detail/sign_detail.vue index 39ee733..bb1cacb 100644 --- a/bundle/pages/sign_detail/sign_detail.vue +++ b/bundle/pages/sign_detail/sign_detail.vue @@ -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 { diff --git a/bundle/pages/transfer_record/transfer_record.vue b/bundle/pages/transfer_record/transfer_record.vue index 8b43241..8625d80 100644 --- a/bundle/pages/transfer_record/transfer_record.vue +++ b/bundle/pages/transfer_record/transfer_record.vue @@ -152,7 +152,7 @@ .list { .item { padding: 20rpx 30rpx; - border-bottom: $-solid-border; + border-bottom: $solid-border; align-items: flex-start; .avatar { width: 68rpx; diff --git a/bundle/pages/user_bill/user_bill.vue b/bundle/pages/user_bill/user_bill.vue index 34ebd50..28e1d1a 100644 --- a/bundle/pages/user_bill/user_bill.vue +++ b/bundle/pages/user_bill/user_bill.vue @@ -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; } } } diff --git a/bundle/pages/user_fans/user_fans.vue b/bundle/pages/user_fans/user_fans.vue index 9c260eb..0ff4061 100644 --- a/bundle/pages/user_fans/user_fans.vue +++ b/bundle/pages/user_fans/user_fans.vue @@ -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; } } } diff --git a/bundle/pages/user_payment/user_payment.vue b/bundle/pages/user_payment/user_payment.vue index 8c6b4cf..1224d2f 100644 --- a/bundle/pages/user_payment/user_payment.vue +++ b/bundle/pages/user_payment/user_payment.vue @@ -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; diff --git a/bundle/pages/user_profile/user_profile.vue b/bundle/pages/user_profile/user_profile.vue index 4a98eff..98fce09 100644 --- a/bundle/pages/user_profile/user_profile.vue +++ b/bundle/pages/user_profile/user_profile.vue @@ -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; } } diff --git a/bundle/pages/user_set/user_set.vue b/bundle/pages/user_set/user_set.vue index 8233c19..d882533 100644 --- a/bundle/pages/user_set/user_set.vue +++ b/bundle/pages/user_set/user_set.vue @@ -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; } } diff --git a/bundle/pages/user_sign/user_sign.vue b/bundle/pages/user_sign/user_sign.vue index 5dd1569..1508d66 100644 --- a/bundle/pages/user_sign/user_sign.vue +++ b/bundle/pages/user_sign/user_sign.vue @@ -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 { diff --git a/bundle/pages/user_spread/user_spread.vue b/bundle/pages/user_spread/user_spread.vue index f522c28..815096e 100644 --- a/bundle/pages/user_spread/user_spread.vue +++ b/bundle/pages/user_spread/user_spread.vue @@ -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 { diff --git a/bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue b/bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue index fcb27c7..2005659 100644 --- a/bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue +++ b/bundle/pages/user_spread_month_bill_detail/user_spread_month_bill_detail.vue @@ -202,7 +202,7 @@ export default { diff --git a/pages/pay_result/pay_result.vue b/pages/pay_result/pay_result.vue index f88de58..d75ac00 100644 --- a/pages/pay_result/pay_result.vue +++ b/pages/pay_result/pay_result.vue @@ -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; } } diff --git a/pages/payment/payment.vue b/pages/payment/payment.vue index 11527db..b49a46a 100644 --- a/pages/payment/payment.vue +++ b/pages/payment/payment.vue @@ -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 { diff --git a/pages/register/register.vue b/pages/register/register.vue index 413a6af..957259d 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -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; diff --git a/pages/shop_cart/shop_cart.vue b/pages/shop_cart/shop_cart.vue index fc5d51d..dd1aaf9 100644 --- a/pages/shop_cart/shop_cart.vue +++ b/pages/shop_cart/shop_cart.vue @@ -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; diff --git a/pages/sort/sort.vue b/pages/sort/sort.vue index 7b95fc6..7ee7f59 100644 --- a/pages/sort/sort.vue +++ b/pages/sort/sort.vue @@ -74,7 +74,7 @@ .header { box-sizing: border-box; height: $header-height; - border-bottom: $-solid-border; + border-bottom: $solid-border; .search { flex: 1; diff --git a/pages/user/user.vue b/pages/user/user.vue index 49f25e7..01a599f 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -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; diff --git a/pages/user_address/user_address.vue b/pages/user_address/user_address.vue index bda88ac..333b463 100644 --- a/pages/user_address/user_address.vue +++ b/pages/user_address/user_address.vue @@ -276,7 +276,7 @@ export default { padding: 0 30rpx; .address { padding: 20rpx 0; - border-bottom: $-solid-border; + border-bottom: $solid-border; } .operation { height: 80rpx; diff --git a/pages/user_collection/user_collection.vue b/pages/user_collection/user_collection.vue index a336967..43e595f 100644 --- a/pages/user_collection/user_collection.vue +++ b/pages/user_collection/user_collection.vue @@ -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; diff --git a/styles/base.scss b/styles/base.scss index 3b25b93..4bcc8cc 100644 --- a/styles/base.scss +++ b/styles/base.scss @@ -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; diff --git a/uni.scss b/uni.scss index b899019..b8b2f0a 100644 --- a/uni.scss +++ b/uni.scss @@ -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;