diff --git a/components/big-coffee/big-coffee.less b/components/big-coffee/big-coffee.less deleted file mode 100644 index e6acdeb..0000000 --- a/components/big-coffee/big-coffee.less +++ /dev/null @@ -1,102 +0,0 @@ -.big-coffee{ - background-color: #FFFFFF; - padding: 0 15px; - .title{ - padding: 10px 0px 0px 0; - display: flex; - justify-content: space-between; - color: #000; - align-items: center; - - span:nth-child(1) { - font-size: 24px; - font-weight: bold; - line-height: 33px; - display: inline-block; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - } - i{ - margin-left: 5px; - } - - span:nth-child(2) { - font-size: 12px; - display: flex; - align-items: center; - text{ - font-size: 15px; - font-weight: 700; - margin-top: -8px; - margin-left: 5px; - } - } - } - .ul-list{ - .li-item{ - padding: 9px 0px; - display: flex; - align-items: center; - .left-info{ - width:122px; - height:122px; - image{ - width: 100%; - height: 100%; - vertical-align:middle; - } - } - .right-info{ - flex: 1; - overflow: hidden; - padding-left: 18px; - .name{ - height: 48px; - color:#111111; - font-size: 16px; - line-height: 24px; - margin-bottom:29px; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - overflow: hidden; - } - .referrer{ - display: flex; - align-items: center; - .avatar{ - width: 34px; - height: 34px; - border-radius: 50%; - image{ - width: 100%; - height: 100%; - border-radius: 50%; - } - } - .detail{ - flex: 1; - overflow: hidden; - padding-left: 7px; - .nick-name{ - color:#666666; - font-size: 12px; - line-height: 17px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - .sub-intro{ - color: #999999; - font-size: 10px; - line-height: 14px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - } - } - } - } - } -} \ No newline at end of file diff --git a/components/big-coffee/big-coffee.vue b/components/big-coffee/big-coffee.vue deleted file mode 100644 index 396a281..0000000 --- a/components/big-coffee/big-coffee.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - \ No newline at end of file diff --git a/components/exclusive-plan/exclusive-plan.less b/components/exclusive-plan/exclusive-plan.less deleted file mode 100644 index b724db9..0000000 --- a/components/exclusive-plan/exclusive-plan.less +++ /dev/null @@ -1,55 +0,0 @@ -.exclusive-plan{ - background-color: #FFFFFF; - .title{ - padding: 10px 15px 5px 15px; - display: flex; - justify-content: space-between; - color: #000; - align-items: center; - - span:nth-child(1) { - font-size: 24px; - font-weight: bold; - line-height: 33px; - display: inline-block; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - } - - span:nth-child(2) { - font-size: 12px; - display: flex; - align-items: center; - text{ - font-size: 15px; - font-weight: 700; - margin-left: 5px; - } - } - } - .content-plans{ - //padding:0px 0px 20px 0px; - white-space: nowrap; - overflow: auto; - .item{ - display: inline-block; - width:240px; - height: 125px; - margin: 5px; - - &:first-child { - margin-left: 15px; - } - &:last-child { - margin-right: 15px; - } - image{ - width: 100%; - height: 100%; - } - - } - - } - -} \ No newline at end of file diff --git a/components/exclusive-plan/exclusive-plan.vue b/components/exclusive-plan/exclusive-plan.vue deleted file mode 100644 index 9dbc660..0000000 --- a/components/exclusive-plan/exclusive-plan.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - diff --git a/components/health-tips/health-tips.less b/components/health-tips/health-tips.less deleted file mode 100644 index 309fb6b..0000000 --- a/components/health-tips/health-tips.less +++ /dev/null @@ -1,108 +0,0 @@ -.health-tips{ - background-color: #FFFFFF; - padding: 0 0px; - //margin-bottom:15px; - .title{ - padding: 10px 15px 0px 15px; - display: flex; - justify-content: space-between; - color: #000; - align-items: center; - - span:nth-child(1) { - font-size: 24px; - font-weight: bold; - line-height: 33px; - display: inline-block; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - } - - span:nth-child(2) { - font-size: 12px; - display: flex; - align-items: center; - text{ - font-size: 15px; - font-weight: 700; - margin-top: -8px; - margin-left: 5px; - } - } - } - .ul-content{ - .li-item{ - .top-box{ - padding: 11px 15px 8px 15px; - display: flex; - align-items: center; - justify-content: space-between; - .topic{ - color: #111111; - font-size: 14px; - line-height: 24px; - - font-weight: 700; - } - .change{ - height: 19px; - border-radius:4px; - border: 1px solid #333333; - width: 44px; - text-align: center; - color: #333333; - font-size: 11px; - } - } - .center-box{ - padding:0 15px 9px 15px; - color: #999999; - font-size: 12px; - line-height: 19px; - } - .bottom-box{ - overflow: auto; - padding:18px 10px; - display: flex; - flex-wrap: nowrap; - .item{ - margin: 0 5px; - .info{ - .img-box{ - width: 100px; - height: 100px; - image{ - width: 100%; - height: 100%; - vertical-align: middle; - } - - } - .name{ - padding:6px 0 3px 0; - color:#333333; - font-size: 12px; - line-height: 19px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - } - .money{ - color: #E7031C; - font-size: 11px; - line-height: 16px; - span{ - color: #999999; - font-size: 10px; - line-height: 14px; - text-decoration: line-through; - } - } - } - - } - - } - } - } -} \ No newline at end of file diff --git a/components/health-tips/health-tips.vue b/components/health-tips/health-tips.vue deleted file mode 100644 index e9531cf..0000000 --- a/components/health-tips/health-tips.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - - \ No newline at end of file diff --git a/components/index-call/index-call.less b/components/index-call/index-call.less deleted file mode 100644 index fa44356..0000000 --- a/components/index-call/index-call.less +++ /dev/null @@ -1,112 +0,0 @@ -@import '../../common/css/global'; -//dacall -.seckill-box{ - background: #FFFFFF; - padding:10px 15px; - .title{ - height: 35px; - display: flex; - justify-content: space-between; - color: #000; - line-height: 35px; - - span:nth-child(1) { - font-size: 22px; - font-weight: bold; - display: inline-block; - } - - span:nth-child(2) { - font-size: 12px; - display: flex; - align-items: center; - text{ - &.iconfont{ - font-size: 15px; - font-weight: 600; - margin-left: 5px; - - } - } - } - } - .seckill-info{ - display: flex; - align-items: flex-start; - margin-top: 10px; - .left{ - width: 100px; - height: 100px; - image{ - width: 100%; - height: 100%; - } - } - .right{ - flex: 1; - margin-left: 10px; - overflow: hidden; - .goods-name{ - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 16px; - } - .price-box { - color: #e50303; - font-size: 18px; - .old{ - font-size: 12px; - color: #9c9c9c; - text-decoration: line-through; - } - - &.free-money{ - font-size: 14px; - color: #9C9C9C; - display: flex; - align-items: center; - justify-content: space-between; - - .money{ - display: flex; - align-items: center; - .new { - font-size: 18px; - color: @globalColor; - } - .old{ - font-size: 10px; - margin-left: 5px; - text-decoration: line-through; - - } - } - } - } - .seckill-time{ - display: flex; - align-items: flex-end; - justify-content: space-between; - .free{ - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - flex: 1; - } - - .buy{ - width: 70px; - height: 25px; - border-radius: 50px; - color: #fff; - background:#FB5054; - font-size: 12px; - line-height: 25px; - text-align: center; - } - } - } - } - -} \ No newline at end of file diff --git a/components/index-call/index-call.vue b/components/index-call/index-call.vue deleted file mode 100644 index 78437a5..0000000 --- a/components/index-call/index-call.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - \ No newline at end of file diff --git a/components/index-category/index-category.less b/components/index-category/index-category.less deleted file mode 100644 index bdc020c..0000000 --- a/components/index-category/index-category.less +++ /dev/null @@ -1,73 +0,0 @@ -//最佳销售单品 -.index-categrory{ - .best { - overflow: hidden; - - .title { - padding:10px 15px; - display: flex; - justify-content: space-between; - color: #000; - align-items: center; - background: #FFFFFF; - span:nth-child(1) { - font-size: 22px; - font-weight: bold; - display: inline-block; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - - } - } - - .SalesGoods-box { - - .SalesGoods-item { - text-align: center; - display: inline-block; - width: 33.33%; - padding: 0 3px; - box-sizing: border-box; - vertical-align: middle; - margin-bottom: 6px; - - .item { - background: #FFFFFF; - } - } - - .slider-image { - width: 100%; - } - .goods-name { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - padding-left: 2px; - } - - .money-box { - display: flex; - align-items: center; - padding-left: 7px; - .money-now { - color: red; - font-size: 12px; - } - .money-old { - color: #c7c7c7; - font-size: 13px; - text-decoration: line-through; - } - } - } - .button-box { - width: 100%; - height: 44px; - text-align: center; - line-height: 44px; - background: #FFFFFF; - } - } - -} \ No newline at end of file diff --git a/components/index-category/index-category.vue b/components/index-category/index-category.vue deleted file mode 100644 index 891b737..0000000 --- a/components/index-category/index-category.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - \ No newline at end of file diff --git a/components/index-cube/index-cube.less b/components/index-cube/index-cube.less deleted file mode 100644 index 0ba719f..0000000 --- a/components/index-cube/index-cube.less +++ /dev/null @@ -1,114 +0,0 @@ -//图片魔方 -.picture-cube{ - background-color: #FFFFFF; - .title{ - color:#111111; - padding: 20px 15px; - font-size:22px; - font-weight: 700; - span{ - display: inline-block; - - /*padding-left:6px; - border-left:4px solid #E7031C;*/ - } - } - //一图模式 - .one-mode{ - image{ - box-sizing: border-box; - - width: 100%; - } - } - //二图模式 - .two-mode{ - // 第一种表现形式 - .first-show{ - display: flex; - padding: 5px; - .item{ - flex: 1; - padding: 5px; - image{ - width: 100%; - } - } - } - .common-show{ - display: flex; - .item{ - flex: 1; - padding: 5px; - image{ - width: 100%; - height: 100%; - } - } - .two-item{ - flex: 2; - padding: 5px; - image{ - width: 100%; - } - } - } - } - // 三图模式 - .three-mode{ - .first-show{ - display: flex; - padding: 5px; - .item{ - flex: 1; - padding: 5px; - image{ - width: 100%; - } - } - } - .common-show{ - display: flex; - .item{ - flex: 1; - padding: 5px; - image{ - width: 100%; - } - .info{ - height: 50%; - padding: 5px; - image{ - height: 100%; - } - } - } - } - } - // 四图模式 - .four-mode{ - .first-show{ - display: flex; - flex-wrap: wrap; - padding: 5px; - .item{ - width: 50%; - padding: 5px; - image{ - width: 100%; - } - } - } - .second-show{ - display: flex; - .item{ - flex: 1; - padding: 5px; - image{ - width: 100%; - } - } - } - } - -} \ No newline at end of file diff --git a/components/index-cube/index-cube.vue b/components/index-cube/index-cube.vue deleted file mode 100644 index 91b86b4..0000000 --- a/components/index-cube/index-cube.vue +++ /dev/null @@ -1,252 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/index-grouping/index-grouping.less b/components/index-grouping/index-grouping.less deleted file mode 100644 index 72af394..0000000 --- a/components/index-grouping/index-grouping.less +++ /dev/null @@ -1,166 +0,0 @@ -@import '../../common/css/global'; -.g-main { - position: relative; - - .m-lead { - font-size: 13px; - background: #ffffff; - padding:10px 15px; - - .ul-box { - - display: flex; - display: -webkit-flex; - flex-direction: row; - justify-content: center; - height: 100%; - .li-box { - position: relative; - flex: 1; - width: 1px; - height: 100%; - span { - display: inline-block; - font-size: 22px; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - font-weight: 700; - } - - .hover { - border-bottom: 2px solid #333; - box-sizing: border-box; - } - - span.active { - font-size: 17px; - font-weight: bold; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-bottom: 2px solid #000000; - } - } - - } - } - - .grouping-tap-box { - height: 45px; - line-height: 45px; - display: flex; - align-items: center; - background: #FFFFFF; - margin-bottom: 10px; - color: #999999; - .tap-item { - flex: 1; - text-align: center; - - - &.active { - span { - position: relative; - color: @globalColor; - &:after { - content: ''; - position: absolute; - bottom: -12px; - left: -10px; - right: -10px; - height: 2px; - background: @globalColor; - } - } - } - } - } - - .m-content { - padding: 10px 15px; - padding-top: 0; - - &.g-bg { - background: #F3F3F3; - } - .m-main { - display: flex; - justify-content: space-between; - flex-wrap: wrap; - align-content: space-between; - - image { - width: 100%; - box-sizing: border-box; - display: block; - } - .img-box { - position: relative; - width: 100%; - height: 100%; - margin-bottom: 10px; - .description { - position: absolute; - width: 100%; - left: 0; - bottom: 0; - height: 30px; - line-height: 30px; - text-indent: 5px; - color: #fff; - background: rgba(0, 0, 0, .5); - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - white-space: nowrap; - font-size: 14px; - } - &:last-child { - margin-bottom: 0; - } - } - .goods_box { - width: 49%; - background: #ffffff; - margin-bottom: 5px; - box-shadow:0px 1px 4px 0px rgba(210,210,210,0.5); - overflow: hidden; - .goods_image { - position: relative; - padding-top: 100%; - width: 100%; - - image { - position: absolute; - left: 0; - top: 0; - height: 100%; - width: 100%; - object-fit: cover; - object-position: center center; - } - } - - .title { - font-size: 13px; - color: #4a4a4a; - padding:0 10px; - height: 36px; - line-height: 18px; - margin-top: 5px; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp:2; - overflow: hidden; - } - - .price { - color: #ea4448; - font-size: 14px; - padding: 6px 10px; - } - } - } - } -} \ No newline at end of file diff --git a/components/index-grouping/index-grouping.vue b/components/index-grouping/index-grouping.vue deleted file mode 100644 index 433aa3e..0000000 --- a/components/index-grouping/index-grouping.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - \ No newline at end of file diff --git a/components/index-groupon/index-groupon.less b/components/index-groupon/index-groupon.less deleted file mode 100644 index 1273c50..0000000 --- a/components/index-groupon/index-groupon.less +++ /dev/null @@ -1,216 +0,0 @@ -//拼团 -@import '../../common/css/global'; -.groupon-item-box { - padding: 10px 15px; - background: #ffffff; - .title{ - padding: 10px 0px; - display: flex; - justify-content: space-between; - color: #000; - align-items: center; - - span:nth-child(1) { - font-size: 22px; - font-weight: bold; - display: inline-block; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - } - - span:nth-child(2) { - font-size: 12px; - display: flex; - align-items: center; - text{ - font-size: 15px; - font-weight: 700; - margin-left: 5px; - } - } - } - .item { - display: flex; - /*align-items: center;*/ - padding: 10px 0; - margin-bottom: 5px; - background: #ffffff; - overflow: hidden; - .left { - position: relative; - width: 120px; - .num { - font-size: 12px; - position: absolute; - width: 100%; - bottom: 0; - background: @mainColor; - opacity: .8; - text-align: center; - color: @countColor; - } - image { - display: block; - width: 100%; - } - .img-box { - display: flex; - align-items: center; - margin-top: 10px; - box-sizing: border-box; - justify-content: space-between; - image { - width: 47%; - } - } - } - .right { - display: flex; - flex-direction: column; - justify-content: space-between; - font-size: 14px; - margin-left: 12px; - flex: 1; - - .price-box { - .old-price { - font-size: 12px; - color: #9B9B9B; - text-decoration: line-through; - } - .marketing-time-box{ - width: 100%; - height: 100%; - font-size: 14px; - - //兼容首页样式 - &.index{ - font-size: 12px; - } - /*.seckill-item{ - text-align: right; - .no-starts{ - display: none; - } - .text{ - display: inline-block; - margin: 2px 5px; - } - .tiem{ - display: inline-block; - } - .num-item{ - display: inline-block; - background: #FFFFFF; - color: #fe4545; - text-align: center; - width: 26px; - border-radius: 3px; - } - .zero{ - display: inline-block; - } - - .time-out{ - display: flex; - align-items: center; - justify-content: space-between; - flex: 1; - - .tiem{ - color: #ffffff; - span{ - color: @countColor; - } - } - } - i{ - display: none; - } - } - .seckill { - &.seckill-item{ - .tiem{ - color: @countColor; - span{ - background: @mainColor; - color: @countColor; - } - } - } - .text{ - color: @countColor; - } - }*/ - - - .seckill-item { - text-align: right; - color: @countColor; - .time-out { - display: flex; - align-items: center; - justify-content: space-between; - .num-item { - display: inline-block; - text-align: center; - width: 26px; - border-radius: 3px; - background:#FB5054; - } - } - } - } - - .seckill-time-box { - .seckill-item { - text-align: left; - .time-out { - color: #000 !important; - display: block; - } - .tiem{ - color: #000; - margin: 5px 0; - } - i{ - display: none; - } - .my-class{ - margin: 5px 0; - color: #EA4448; - } - } - } - .meal-price { - display: flex; - align-items: flex-end; - .price { - flex: 1; - color: #FF2741; - span { - color: #4A4A4A; - - } - } - .btn { - color: #ffffff; - background: @mainColor; - padding: 5px 10px; - border-radius: 4px; - ._span { - display: flex; - align-items: center; - } - i { - font-size: 12px; - } - &.no-start { - background: #26a96d; - } - } - } - } - } - } -} \ No newline at end of file diff --git a/components/index-groupon/index-groupon.vue b/components/index-groupon/index-groupon.vue deleted file mode 100644 index a8dceee..0000000 --- a/components/index-groupon/index-groupon.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - \ No newline at end of file diff --git a/components/index-seckill/index-seckill.less b/components/index-seckill/index-seckill.less deleted file mode 100644 index dcb4918..0000000 --- a/components/index-seckill/index-seckill.less +++ /dev/null @@ -1,133 +0,0 @@ -@import '../../common/css/global'; -//秒杀 -.seckill-box{ - background: #FFFFFF; - padding:10px 15px; - .title{ - padding: 20px 0px; - display: flex; - justify-content: space-between; - color: #000; - align-items: center; - - span:nth-child(1) { - font-size: 22px; - font-weight: bold; - display: inline-block; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - - } - - span:nth-child(2) { - font-size: 12px; - display: flex; - align-items: center; - text{ - &.iconfont{ - font-size: 15px; - font-weight: 600; - margin-left: 5px; - - } - } - } - } - .seckill-info{ - display: flex; - align-items: center; - margin-top: 10px; - .left{ - width: 100px; - height: 100px; - image{ - width: 100%; - height: 100%; - } - } - .right{ - flex: 1; - margin-left: 10px; - overflow: hidden; - .goods-name{ - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 16px; - } - .price-box { - color: #e50303; - font-size: 18px; - .old{ - font-size: 12px; - color: #9c9c9c; - text-decoration: line-through; - } - - &.free-money{ - font-size: 14px; - color: #9C9C9C; - display: flex; - align-items: center; - justify-content: space-between; - - .money{ - display: flex; - align-items: center; - .new { - font-size: 18px; - color: @globalColor; - } - .old{ - font-size: 10px; - margin-left: 5px; - text-decoration: line-through; - - } - } - } - } - .seckill-time{ - display: flex; - align-items: flex-end; - justify-content: space-between; - .marketing-time-box { - .seckill-item { - text-align: left !important; - color: #000 !important; - .time-out { - flex-direction: column; - color: #000 !important; - align-items: flex-start !important; - .tiem { - margin: 5px 0; - .num-item { - color: #ffffff !important; - } - } - } - } - - } - .free{ - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - flex: 1; - } - - .buy{ - width: 70px; - height: 25px; - border-radius: 50px; - color: #fff; - background: @mainColor; - font-size: 12px; - line-height: 25px; - text-align: center; - } - } - } - } - -} \ No newline at end of file diff --git a/components/index-seckill/index-seckill.vue b/components/index-seckill/index-seckill.vue deleted file mode 100644 index 67e6619..0000000 --- a/components/index-seckill/index-seckill.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - - \ No newline at end of file diff --git a/components/index-suit/index-suit.less b/components/index-suit/index-suit.less deleted file mode 100644 index e16974d..0000000 --- a/components/index-suit/index-suit.less +++ /dev/null @@ -1,260 +0,0 @@ -.module-box { - background: #ffffff; - padding: 10px 20px; - .meal-price { - border: 2px solid #979797; - height: 50px; - line-height: 48px; - text-align: center; - font-size: 16px; - text:first-child { - color: #e50303 - } - text:last-child { - text-decoration: line-through; - } - } - .module-title { - display: flex; - justify-content: space-between; - color: #000; - align-items: center; - - span:nth-child(1) { - font-size: 22px; - font-weight: bold; - display: inline-block; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - - } - - span:nth-child(2) { - font-size: 12px; - display: flex; - align-items: center; - text{ - font-size: 15px; - font-weight: 600; - margin-left: 5px; - } - - } - } - .space-btween { - display: flex; - justify-content: space-between; - align-items: center; - } - .module-content { - padding: 10px 0; - position: relative; - //套餐 - .meal_list { - overflow: auto; - white-space: nowrap; - width: 100%; - table, image { - width: 100% !important; - height: auto; - } - .store_list { - //top:0; - width: 26.4%; - position: relative; - display: inline-block; - margin-right: 10%; - view { - box-sizing: border-box; - } - image { - width: 100%; - height: 100px; - } - .description { - width: 100%; - margin-top: 5px; - font-size: 14px; - //height: 48px; - overflow: hidden; - word-break: break-all; - //word-spacing: ; - -webkit-line-clamp: 2; - text-overflow: ellipsis; - //display: -webkit-box; - //-webkit-box-orient: vertical; - //white-space: normal; - - } - .price { - font-size: 14px; - height: auto; - /*overflow: visible;*/ - white-space: normal; - overflow: hidden; - text-overflow: ellipsis; - } - &:last-child { - margin-right: 0; - &:after { - display: none; - /*content: ; */ - } - } - &:after { - content: ""; - display: block; - position: absolute; - right: -28%; - top: 20%; - width: 18%; - - height: 10%; - background: url('https://ibrand-miniprogram.oss-cn-hangzhou.aliyuncs.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/uploading.png'); - background-size: 100% 100%; - } - } - } - - .add { - position: relative; - transform: translateY(120%); - width: 18px; - height: 18px; - margin-bottom: auto; - - &:last-child { - display: none; - } - .t { - - position: absolute; - top: 8px; - left: 0; - width: 100%; - height: 2px; - background: #b2b2b2; - border-radius: 19px - } - - .l { - - position: absolute; - left: 8px; - top: 0; - height: 100%; - width: 2px; - background: #b2b2b2; - border-radius: 19px - } - } - .meal { - position: relative; - width: 25%; - - .goods_image { - position: relative; - width: 100%; - padding-top: 100%; - image { - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 100%; - object-fit: cover; - object-position: center; - } - } - - .goods_title { - margin-top: 10px; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - color: #000; - } - } - - .content { - margin-left: 120px; - height: 100%; - .content_title { - padding-right: 30px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 16px; - line-height: 18px; - } - - .content_info { - display: flex; - justify-content: space-between; - align-items: baseline; - vertical-align: bottom; - - .price { - color: #e50303; - font-size: 18px; - } - .delPrice { - margin-right: auto; - font-size: 12px; - } - - .onlyPrice { - color: #9c9c9c; - font-size: 14px; - } - } - - .countDown { - margin-top: 7px; - .text { - font-size: 12px; - color: #4a4a4a; - } - - .release { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - .time { - display: flex; - align-items: center; - text { - line-height: 19px; - margin: 0 3px; - } - .dot { - display: inline-block; - width: 19px; - height: 19px; - background: #6d6d6d; - font-size: 12px; - line-height: 19px; - text-align: center; - } - } - - .btnBuy { - display: inline-block; - width: 70px; - height: 25px; - border-radius: 50px; - color: #ffffff; - background: #ea4448; - font-size: 12px; - line-height: 25px; - text-align: center; - } - } - - } - } - } -} \ No newline at end of file diff --git a/components/index-suit/index-suit.vue b/components/index-suit/index-suit.vue deleted file mode 100644 index 875c5b9..0000000 --- a/components/index-suit/index-suit.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - \ No newline at end of file diff --git a/components/waterfalls-flow/waterfalls-flow.less b/components/waterfalls-flow/waterfalls-flow.less deleted file mode 100644 index d9f28b2..0000000 --- a/components/waterfalls-flow/waterfalls-flow.less +++ /dev/null @@ -1,75 +0,0 @@ -.waterfalls-flow{ - .title{ - padding: 10px 15px 10px 15px; - display: flex; - justify-content: space-between; - color: #000; - align-items: center; - background-color: #FFFFFF; - - span:nth-child(1) { - font-size: 22px; - font-weight: bold; - display: inline-block; - //padding-left: 6px; - //border-left: 4px solid #E7031C; - } - - span:nth-child(2) { - font-size: 12px; - display: flex; - align-items: center; - text{ - font-size: 15px; - font-weight: 700; - margin-left: 5px; - } - } - } - .help-select-contet { - column-count: 2; //分为2列 - column-gap: 10px;//列之间间隔为10px - width: 100%; - padding:10px 15px; - } - .help-select-card { - background: #fff; - width:100%; - display: inline-block; /*内部卡片需要设置为inline-block,否则会截断显示,如图一*/ - justify-content: center; - flex-direction: column; - align-items: center; - margin-bottom: 10rpx; - image{ - width: 100%; - } - .goods-detail{ - padding: 10px 8px; - .name{ - color:#333333; - font-size: 12px; - height: 38px; - line-height: 18px; - margin-bottom:10px; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - overflow: hidden; - } - .money{ - color:#E7031C; - font-size: 14px; - line-height: 20px; - span{ - color:#999999; - font-size: 12px; - line-height: 17px; - text-decoration: line-through; - display: inline-block; - padding-left: 6px; - } - } - } - } - -} \ No newline at end of file diff --git a/components/waterfalls-flow/waterfalls-flow.vue b/components/waterfalls-flow/waterfalls-flow.vue deleted file mode 100644 index aa411c5..0000000 --- a/components/waterfalls-flow/waterfalls-flow.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/business/payment/money.vue b/pages/business/payment/money.vue index 9fbda42..d11f221 100644 --- a/pages/business/payment/money.vue +++ b/pages/business/payment/money.vue @@ -57,9 +57,9 @@ token: token } }).then(res => { - if(res.data.code == 200){ + if(res.data.status){ let url = '/pages/business/payment/wait?user_id='+ this.user_id; - url += '&amount='+ this.amount; + url += '&amount='+ this.money; this.$url(url, {type: 'redirect'}); }else{ let message = res.data.message || '网络错误'; diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue index 405e818..74ce519 100644 --- a/pages/index/index/index.vue +++ b/pages/index/index/index.vue @@ -15,126 +15,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 今日头条 - - {{ item.title }} - - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.title }} - - - - - - - - - - - {{ item.title }} - - - - + + + + + + + 今日头条 + + {{ item.title }} + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.title }} + + + + + {{ item.title }} + + + + @@ -398,20 +329,9 @@