diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 9599c97e..ca699096 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -118,6 +118,86 @@ top: 0; } +.account-sides-info .head { + display: flex; + flex-direction: column; + align-items: center; + padding: 2rem 1rem; + background-color: #fff; +} +.account-sides-info .head .portrait { + width: 100px; + height: 100px; + border-radius: 50%; + box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.14); + border: 2px solid #FFFFFF; + overflow: hidden; + margin-bottom: 1rem; +} +.account-sides-info .head .account-name { + font-weight: bold; + font-size: 1rem; + margin-bottom: 0.4rem; +} +.account-sides-info .head .account-email { + color: #666666; +} +.account-sides-info .account-links > a { + color: #4B566B; + border: none; + padding: 0.8rem 1rem; + border-bottom: 1px solid #EEEEEE; + transition: all 0.2s ease-in-out; + text-decoration: none !important; +} +.account-sides-info .account-links > a:hover { + background-color: #E9ECEF; +} +.account-sides-info .account-links > a.active { + background-color: #E9ECEF; + color: #4B566B; +} +.account-sides-info .account-links > a .badge { + color: #fff; +} + +.account-card { + border: none; +} +.account-card .card-header { + border: none; + background-color: #fff; + padding-top: 1rem; +} +.account-card .card-header h6 { + border-left: 3px solid #fd560f; + padding-left: 6px; + font-weight: bold; + font-size: 1rem; +} +.account-card .card-items > a { + width: 25%; + color: #444444; + text-decoration: none !important; +} +.account-card .card-items > a i { + font-size: 2rem; +} +.account-card .card-items > a span { + display: flex; +} +.account-card .order-wrap { + background-color: #f6f8f9; + padding: 2rem 1rem; +} +.account-card .order-wrap .icon i { + font-size: 4.5rem; + color: #777; +} +.account-card .order-wrap .text { + font-size: 1rem; +} + header { background: #fff; } @@ -294,85 +374,6 @@ body.page-login .card { body.page-account { background-color: #F7F8FA; } -body.page-account .account-info .head { - display: flex; - flex-direction: column; - align-items: center; - padding: 2rem 1rem; - background-color: #fff; -} -body.page-account .account-info .head .portrait { - width: 100px; - height: 100px; - border-radius: 50%; - box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.14); - border: 2px solid #FFFFFF; - overflow: hidden; - margin-bottom: 1rem; -} -body.page-account .account-info .head .account-name { - font-weight: bold; - font-size: 1rem; - margin-bottom: 0.4rem; -} -body.page-account .account-info .head .account-email { - color: #666666; -} -body.page-account .account-info .account-links > a { - color: #4B566B; - border: none; - padding: 0.8rem 1rem; - border-bottom: 1px solid #EEEEEE; - transition: all 0.2s ease-in-out; - text-decoration: none !important; -} -body.page-account .account-info .account-links > a:hover { - background-color: #E9ECEF; -} -body.page-account .account-info .account-links > a.active { - background-color: #E9ECEF; - color: #4B566B; -} -body.page-account .account-info .account-links > a .badge { - color: #fff; -} -body.page-account .account-card { - border: none; -} -body.page-account .account-card .card-header { - border: none; - background-color: #fff; - padding-top: 1rem; -} -body.page-account .account-card .card-header h6 { - border-left: 3px solid #fd560f; - padding-left: 6px; - font-weight: bold; - font-size: 1rem; -} -body.page-account .account-card .card-items > a { - width: 25%; - color: #444444; - text-decoration: none !important; -} -body.page-account .account-card .card-items > a i { - font-size: 2rem; -} -body.page-account .account-card .card-items > a span { - display: flex; -} -body.page-account .account-card .order-wrap { - background-color: #f6f8f9; - padding: 2rem 1rem; -} -body.page-account .account-card .order-wrap .icon i { - font-size: 4.5rem; - color: #777; -} -body.page-account .account-card .order-wrap .text { - font-size: 1rem; -} - body.page-product .product-image .left { margin-right: 1rem; } @@ -710,3 +711,7 @@ body.page-order-success .order-wrap .card-body .order-bottom { margin-left: calc(2rem + 80px); line-height: 2; } + +body.page-account-order-list { + background-color: #F7F8FA; +} diff --git a/resources/beike/admin/views/pages/customer_groups/index.blade.php b/resources/beike/admin/views/pages/customer_groups/index.blade.php index c17a11a9..b0fb7ae1 100644 --- a/resources/beike/admin/views/pages/customer_groups/index.blade.php +++ b/resources/beike/admin/views/pages/customer_groups/index.blade.php @@ -83,10 +83,6 @@ - - - - 保存 取消 @@ -121,7 +117,6 @@ discount_factor: '', // 折扣率 reward_point_factor: '', // 奖励积分系数使用积分系数 use_point_factor: '', // 使用积分系数 - status: 1, }, }, @@ -150,6 +145,7 @@ name: {}, description: {}, total: group.total, //消费额度 + level: group.level, //消费额度 discount_factor: group.discount_factor, // 折扣率 reward_point_factor: group.reward_point_factor, // 奖励积分系数使用积分系数 use_point_factor: group.use_point_factor, // 使用积分系数 diff --git a/resources/beike/shop/default/css/account/account.scss b/resources/beike/shop/default/css/account/account.scss index 3cf2c2db..d0633b84 100644 --- a/resources/beike/shop/default/css/account/account.scss +++ b/resources/beike/shop/default/css/account/account.scss @@ -6,105 +6,4 @@ body.page-account { footer { // background-color: #fff; } - - .account-info { - .head { - display: flex; - flex-direction: column; - align-items: center; - padding: 2rem 1rem; - background-color: #fff; - - .portrait { - width: 100px; - height: 100px; - border-radius: 50%; - box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.14); - border: 2px solid #FFFFFF; - overflow: hidden; - margin-bottom: 1rem; - } - - .account-name { - font-weight: bold; - font-size: 1rem; - margin-bottom: 0.4rem; - } - - .account-email { - color: #666666; - } - } - - .account-links { - > a { - color: #4B566B; - border: none; - padding: 0.8rem 1rem; - border-bottom: 1px solid #EEEEEE; - transition: all .2s ease-in-out; - text-decoration: none !important; - - &:hover { - background-color: #E9ECEF; - } - - &.active { - background-color: #E9ECEF; - color: #4B566B; - } - - .badge { - color: #fff; - } - } - } - } - - .account-card { - border: none; - - .card-header { - border: none; - background-color: #fff; - padding-top: 1rem; - - h6 { - border-left: 3px solid $primary; - padding-left: 6px; - font-weight: bold; - font-size: 1rem; - } - } - - .card-items { - > a { - width: 25%; - color: #444444; - text-decoration: none !important; - i { - font-size: 2rem; - } - - span { - display: flex; - } - } - } - - .order-wrap { - background-color: #f6f8f9; - padding: 2rem 1rem; - .icon { - i { - font-size: 4.5rem; - color: #777; - } - } - - .text { - font-size: 1rem; - } - } - } } diff --git a/resources/beike/shop/default/css/app.scss b/resources/beike/shop/default/css/app.scss index b19851bb..23a1b534 100644 --- a/resources/beike/shop/default/css/app.scss +++ b/resources/beike/shop/default/css/app.scss @@ -18,3 +18,4 @@ $primary: #fd560f; @import './page-checkout'; @import './element-ui'; @import './order-success'; +@import './page-account-order-list'; diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index 835dfb4c..e5c2951e 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -116,4 +116,105 @@ .fixed-top-line-fixed { position: fixed; top: 0; +} + +.account-sides-info { + .head { + display: flex; + flex-direction: column; + align-items: center; + padding: 2rem 1rem; + background-color: #fff; + + .portrait { + width: 100px; + height: 100px; + border-radius: 50%; + box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.14); + border: 2px solid #FFFFFF; + overflow: hidden; + margin-bottom: 1rem; + } + + .account-name { + font-weight: bold; + font-size: 1rem; + margin-bottom: 0.4rem; + } + + .account-email { + color: #666666; + } + } + + .account-links { + > a { + color: #4B566B; + border: none; + padding: 0.8rem 1rem; + border-bottom: 1px solid #EEEEEE; + transition: all .2s ease-in-out; + text-decoration: none !important; + + &:hover { + background-color: #E9ECEF; + } + + &.active { + background-color: #E9ECEF; + color: #4B566B; + } + + .badge { + color: #fff; + } + } + } +} + +.account-card { + border: none; + + .card-header { + border: none; + background-color: #fff; + padding-top: 1rem; + + h6 { + border-left: 3px solid $primary; + padding-left: 6px; + font-weight: bold; + font-size: 1rem; + } + } + + .card-items { + > a { + width: 25%; + color: #444444; + text-decoration: none !important; + i { + font-size: 2rem; + } + + span { + display: flex; + } + } + } + + .order-wrap { + background-color: #f6f8f9; + padding: 2rem 1rem; + .icon { + i { + font-size: 4.5rem; + color: #777; + } + } + + .text { + font-size: 1rem; + } + } } \ No newline at end of file diff --git a/resources/beike/shop/default/css/page-account-order-list.scss b/resources/beike/shop/default/css/page-account-order-list.scss new file mode 100644 index 00000000..8d14fb27 --- /dev/null +++ b/resources/beike/shop/default/css/page-account-order-list.scss @@ -0,0 +1,5 @@ +@charset "UTF-8"; + +body.page-account-order-list { + background-color: #F7F8FA; +} \ No newline at end of file diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php index ba1c8ae4..b9c9810d 100644 --- a/themes/default/account/account.blade.php +++ b/themes/default/account/account.blade.php @@ -13,7 +13,7 @@
-