Skip to content

Commit

Permalink
new
Browse files Browse the repository at this point in the history
  • Loading branch information
liangxiaojuan committed Dec 27, 2016
1 parent 577341e commit 15d3c23
Show file tree
Hide file tree
Showing 18 changed files with 781 additions and 29 deletions.
Binary file modified src/common/fonts/iconfont.eot
Binary file not shown.
12 changes: 6 additions & 6 deletions src/common/fonts/iconfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/common/fonts/iconfont.ttf
Binary file not shown.
Binary file modified src/common/fonts/iconfont.woff
Binary file not shown.
27 changes: 27 additions & 0 deletions src/common/js/date.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* Created by yi on 2016-12-27.
*/

export function formatDate(date, fmt) {
if (/(y+)/.test(fmt)) {
fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
}
let o = {
'M+': date.getMonth() + 1,
'd+': date.getDate(),
'h+': date.getHours(),
'm+': date.getMinutes(),
's+': date.getSeconds()
};
for (let k in o) {
if (new RegExp(`(${k})`).test(fmt)) {
let str = o[k] + '';
fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
}
}
return fmt;
}

function padLeftZero(str) {
return ('00' + str).substr(str.length);
}
5 changes: 3 additions & 2 deletions src/common/stylus/font.styl
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

.icon-jian:before { content: "\e629"; }

.icon-gou:before { content: "\e602"; }

.icon-aixin:before { content: "\e61f"; }

.icon-down:before { content: "\e603"; }
Expand All @@ -31,6 +29,9 @@

.icon-jia:before { content: "\e622"; }

.icon-gou:before { content: "\e73d"; }

.icon-damuzhi:before { content: "\e607"; }

.icon-weibiaoti6-copy:before { content: "\e670"; }

4 changes: 2 additions & 2 deletions src/components/cartControl/cartControl.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="cartControl">
<transition name="fade">
<div class="cart-decrease" v-show="food.count>0" @click="decreaseCart($event)">
<div class="cart-decrease" v-show="food.count>0" @click.stop.prevent="decreaseCart($event)">
<transition name="inner">
<span class="inner iconfont icon-jian"></span>
</transition>
Expand All @@ -10,7 +10,7 @@
<span class="cart-count" v-show="food.count > 0 ">
{{food.count}}
</span>
<span class="iconfont icon-jia cart-add" @click="addCart($event)"></span>
<span class="iconfont icon-jia cart-add" @click.stop.prevent="addCart($event)"></span>
</div>
</template>

Expand Down
154 changes: 154 additions & 0 deletions src/components/food/food.styl
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
@import "../../common/stylus/mixin.styl"
.food
position fixed
left: 0
top: 0
bottom 48px
z-index 30
width 100%
background #ffffff
&.fade-enter-active, &.fade-leave-active {
transition: all 0.2s linear
transform translate3d(0, 0, 0)
}
&.fade-enter, &.fade-leave-active {
opacity: 0
transform translate3d(100%, 0, 0)
}
.image-header
position relative
width 100%
height 0
padding-top 100%
img
position absolute
top 0
width 100%
height 100%
.back
position absolute
top 10px
left 0
.iconfont
display block
padding 10px
font-size 20px
color #ffffff

.content
position: relative;
padding 18px
.title
line-height 14px
margin-bottom 8px
font-size 14px
font-weight 700
color rgb(7, 17, 27)
.detail
margin-bottom 18px
line-height 10px
font-size 0
height 10px
.sell-count, .rating
font-size 10px
display inline-block
color rgb(147, 153, 159)
.sell-count
margin-right 12px
.price
font-weight 700px
line-height 24px
.now
margin-right 8px
font-size 14px
color rgb(240, 20, 20)
.old
font-size 10px
color rgb(147, 153, 159)
text-decoration line-through
.cartControl-wrapper
position absolute
right 12px
bottom 12px
.buy
position absolute
right 18px
bottom 18px
z-index 10
height 24px
line-height 24px
padding 0 12px
box-sizing border-box
border-radius 12px
font-size 10px
color #fff
background rgb(0, 160, 220)
&.buy-enter-active, &.buy-leave-active {
transition: all 0.2s
opacity: 0
}
&.buy-enter, &.buy-leave-active {
opacity: 0

}
.info
padding 18px
.title
line-height 14px
margin-bottom 6px
font-size 14px
color rgb(7, 17, 27)
.text
font-size 12px
line-height 24px
padding 0 8px
color rgb(77, 85, 93)
.rating
padding-top 18px
.title
line-height 14px
margin-left 18px
font-size 14px
color rgb(7, 17, 27)
.rating-wrapper
padding 0 18px
.rating-item
position relative
padding 16px 0
border-1px(rgba(1, 17, 27, 0.1))
.user
position absolute
right 0
top 16px
font-size 0
line-height 12px
.name
display inline-block
vertical-align top
font-size 10px
color rgb(147, 153, 159)
margin-right 6px
.avatar
border-radius 50%
.time
margin-bottom 6px
line-height 12px
font-size 10px
color rgb(147, 153, 159)
.text
line-height 16px
font-size 12px
color rgb(7, 17, 27)
.iconfont
margin-right 4px
line-height 16px
font-size 12px
.icon-damuzhi
color rgb(0, 160, 220)
.icon-down
color rgb(147, 153, 159)

.no-rating
padding 16px 0
font-size 12px
color rgb(147, 153, 159)
Loading

0 comments on commit 15d3c23

Please sign in to comment.