Skip to content

Commit

Permalink
uddate
Browse files Browse the repository at this point in the history
  • Loading branch information
bailicangdu committed Mar 5, 2017
1 parent 2aea238 commit fd4c4ab
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions src/page/shop/shop.vue
Original file line number Diff line number Diff line change
Expand Up @@ -357,11 +357,9 @@
created(){
this.geohash = this.$route.query.geohash;
this.shopId = this.$route.query.id;
//初始化购物车,获取存储在localStorage中的购物车商品信息
this.INIT_BUYCART();
},
mounted(){
//初始化数据
this.initData();
this.windowHeight = window.innerHeight;
},
Expand All @@ -375,11 +373,9 @@
...mapState([
'latitude','longitude','cartList'
]),
//商铺公告
promotionInfo: function (){
return this.shopDetailData.promotion_info || '欢迎光临,用餐高峰期请提前下单,谢谢。'
},
//配送费
deliveryFee: function () {
if (this.shopDetailData) {
return this.shopDetailData.float_delivery_fee;
Expand Down Expand Up @@ -458,7 +454,6 @@
click: true,
});
//判断scrollTop的值,则满足条件,改变对应列表标题样式
this.foodScroll.on('scroll', (pos) => {
this.shopListTop.forEach((item, index) => {
if (this.menuIndexChange && Math.abs(Math.round(pos.y)) >= item) {
Expand All @@ -481,7 +476,6 @@
this.menuIndexChange = true;
})
},
//控制显示列表标题详情提示
showTitleDetail(index){
if (this.TitleDetailIndex == index) {
this.TitleDetailIndex = null;
Expand Down Expand Up @@ -606,7 +600,6 @@
this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock});
this.showChooseList();
},
//点击多规格商品的减按钮,弹出提示
showReduceTip(){
this.showDeleteTip = true;
clearTimeout(this.timer);
Expand All @@ -630,10 +623,8 @@
el.children[0].style.transform = `translate3d(0,0,0)`;
el.style.transition = 'transform .55s cubic-bezier(0.3, -0.25, 0.7, -0.15)';
el.children[0].style.transition = 'transform .55s linear';
//圆点到达目标点后移出
this.showMoveDot = this.showMoveDot.map(item => false);
el.children[0].style.opacity = 1;
//监听运动结束,通知父级进行后续操作
el.children[0].addEventListener('transitionend', () => {
this.listenInCart();
})
Expand Down

0 comments on commit fd4c4ab

Please sign in to comment.