From 734f742cf34e25e38ef17334d33dffaa8569b05d Mon Sep 17 00:00:00 2001
From: maguohua <1264889788@qq.com>
Date: Fri, 17 Feb 2017 18:00:13 +0800
Subject: [PATCH] upate scss

---
 README.md                              |    2 +
 package.json                           |    2 +-
 src/App.vue                            |    4 +-
 src/components/common/alertTip.vue     |    4 +-
 src/components/common/buyCart.vue      |   20 +-
 src/components/common/loading.vue      |    2 +-
 src/components/common/ratingStar.vue   |    2 +-
 src/components/common/shoplist.vue     |    2 +-
 src/components/header/head.vue         |    2 +-
 src/images/address_bottom.png          |  Bin 0 -> 290 bytes
 src/page/confirmOrder/confirmOrder.vue |  309 +++++-
 src/page/forget/forget.vue             |    2 +-
 src/page/login/login.vue               |    2 +-
 src/page/profile/children/balance.vue  |    2 +-
 src/page/profile/children/benefit.vue  |    2 +-
 src/page/profile/children/info.vue     |    2 +-
 src/page/profile/children/points.vue   |    2 +-
 src/page/profile/children/service.vue  |    2 +-
 src/page/search/search.vue             |    2 +-
 src/page/shop/children/foodDetail.vue  |    2 +-
 src/page/shop/children/shopDetail.vue  |    2 +-
 src/page/shop/children/shopSafe.vue    |    2 +-
 src/page/shop/shop.vue                 |    5 +-
 src/service/getData.js                 |   69 +-
 src/service/tempdata/confirm.js        | 1396 ++++++++++++++++++++++++
 src/service/tempdata/login.js          |   10 +
 src/store/mutations.js                 |   91 +-
 src/style/{common.scss => common.less} |    0
 src/style/{mixin.scss => mixin.less}   |    0
 29 files changed, 1856 insertions(+), 86 deletions(-)
 create mode 100644 src/images/address_bottom.png
 create mode 100644 src/service/tempdata/confirm.js
 rename src/style/{common.scss => common.less} (100%)
 rename src/style/{mixin.scss => mixin.less} (100%)

diff --git a/README.md b/README.md
index ee19f10..6668730 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,8 @@ vue2 + vue-rotuer2 + vuex + webpack + ES6/7 + fetch + sass + flex + svg + http-p
 - [x] 修改密码 -- 完成
 - [x] 个人中心 -- 完成
 - [ ] 帐户信息
+- [ ] 上传头像，修改用户名
+- [ ] 积分商城
 - [ ] 服务中心
 - [ ] 添加、删除、修改收货地址
 - [ ] 订单列表
diff --git a/package.json b/package.json
index cc757d4..1c8619f 100644
--- a/package.json
+++ b/package.json
@@ -60,4 +60,4 @@
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index c2e0f1a..a3553d2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,13 +9,13 @@
 <script>
 
   	export default {
-    
+    	
   	}
 
 </script>
 
 <style lang="scss">
-  	@import './style/common.scss';
+  	@import './style/common';
 	.router-fade-enter-active, .router-fade-leave-active {
 	  	transition: opacity .4s;
 	}
diff --git a/src/components/common/alertTip.vue b/src/components/common/alertTip.vue
index 82a5cb5..c0df88b 100644
--- a/src/components/common/alertTip.vue
+++ b/src/components/common/alertTip.vue
@@ -32,7 +32,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
 	@keyframes tipMove{
        0%   { transform: scale(1) }
        35%  { transform: scale(.8) }
@@ -55,7 +55,7 @@
         margin-left: -6rem;
         width: 12rem;
         animation: tipMove .4s ;
-        background-color: #fff;
+        background-color: rgba(255,255,255,1);
         border: 1px;
         padding-top: .6rem;
         display: flex;
diff --git a/src/components/common/buyCart.vue b/src/components/common/buyCart.vue
index f84ed91..83364b8 100644
--- a/src/components/common/buyCart.vue
+++ b/src/components/common/buyCart.vue
@@ -2,14 +2,14 @@
     <section class="cart_module">
         <section v-if="!foods.specifications.length" class="cart_button">
             <transition name="showReduce">
-                <svg @click="removeOutCart(foods.category_id, foods.item_id, foods.specfoods[0].food_id, foods.specfoods[0].name, foods.specfoods[0].price, '')" v-if="foodNum">
+                <svg @click="removeOutCart(foods.category_id, foods.item_id, foods.specfoods[0].food_id, foods.specfoods[0].name, foods.specfoods[0].price, '', foods.specfoods[0].packing_fee, foods.specfoods[0].sku_id, foods.specfoods[0].stock)" v-if="foodNum">
                     <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#cart-minus"></use>
                 </svg>
             </transition>
             <transition name="fade">
                 <span class="cart_num" v-if="foodNum">{{foodNum}}</span>
             </transition>
-            <svg @click="addToCart(foods.category_id, foods.item_id, foods.specfoods[0].food_id, foods.specfoods[0].name, foods.specfoods[0].price, '', $event)">
+            <svg @click="addToCart(foods.category_id, foods.item_id, foods.specfoods[0].food_id, foods.specfoods[0].name, foods.specfoods[0].price, '', foods.specfoods[0].packing_fee, foods.specfoods[0].sku_id, foods.specfoods[0].stock, $event)">
                 <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#cart-add"></use>
             </svg>
             <transition 
@@ -66,7 +66,7 @@
                                 <span>¥ </span>
                                 <span>{{foods.specfoods[specsIndex].price}}</span>
                             </div>
-                            <div class="specs_addto_cart" @click="addSpecs(foods.category_id, foods.item_id, foods.specfoods[specsIndex].food_id, foods.specfoods[specsIndex].name, foods.specfoods[specsIndex].price, foods.specifications[0].values[specsIndex])">加入购物车</div>
+                            <div class="specs_addto_cart" @click="addSpecs(foods.category_id, foods.item_id, foods.specfoods[specsIndex].food_id, foods.specfoods[specsIndex].name, foods.specfoods[specsIndex].price, foods.specifications[0].values[specsIndex], foods.specfoods[specsIndex].packing_fee, foods.specfoods[specsIndex].sku_id, foods.specfoods[specsIndex].stock)">加入购物车</div>
                         </footer>
                     </div>
                 </transition>
@@ -123,14 +123,14 @@
                 'ADD_CART','REDUCE_CART',
             ]),
             //移出购物车
-            removeOutCart(category_id, item_id, food_id, name, price, specs){
+            removeOutCart(category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock){
                 if (this.foodNum > 0) {
-                    this.REDUCE_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs});
+                    this.REDUCE_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock});
                 }
             },
             //加入购物车，计算按钮位置。
-            addToCart(category_id, item_id, food_id, name, price, specs, event){
-                this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs});
+            addToCart(category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock, event){
+                this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock});
                 this.elLeft = event.target.getBoundingClientRect().left;
                 this.elBottom = event.target.getBoundingClientRect().bottom;
                 this.showMoveDot.push(true);
@@ -146,8 +146,8 @@
                 this.specsIndex = index;
             },
             //多规格商品加入购物车
-            addSpecs(category_id, item_id, food_id, name, price, specs){
-                this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs});
+            addSpecs(category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock){
+                this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock});
                 this.showChooseList();
             },
             //点击多规格商品的减按钮，弹出提示
@@ -180,7 +180,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
 	.cart_module{
         .cart_button{
             display: flex;
diff --git a/src/components/common/loading.vue b/src/components/common/loading.vue
index 123a612..85a4a99 100644
--- a/src/components/common/loading.vue
+++ b/src/components/common/loading.vue
@@ -28,7 +28,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
 	@keyframes load{
 		0%   {transform: translateY(0px);}
 		50%  {transform: translateY(-50px);}
diff --git a/src/components/common/ratingStar.vue b/src/components/common/ratingStar.vue
index 0dd099d..c3e28b5 100644
--- a/src/components/common/ratingStar.vue
+++ b/src/components/common/ratingStar.vue
@@ -30,7 +30,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
 	.rating_container{
         position: relative;
         @include wh(2rem, .4rem);
diff --git a/src/components/common/shoplist.vue b/src/components/common/shoplist.vue
index 04c1028..6211ec7 100644
--- a/src/components/common/shoplist.vue
+++ b/src/components/common/shoplist.vue
@@ -148,7 +148,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-	@import '../../style/mixin.scss';
+	@import '../../style/mixin';
 	.shoplist_container{
 		background-color: #fff;
 	}
diff --git a/src/components/header/head.vue b/src/components/header/head.vue
index 49cbc8d..f9951b9 100644
--- a/src/components/header/head.vue
+++ b/src/components/header/head.vue
@@ -55,7 +55,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
 
     #head_top{
         background-color: $blue;
diff --git a/src/images/address_bottom.png b/src/images/address_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..18df78e8e0f42392509c45a7e5e122c07524100f
GIT binary patch
literal 290
zcmV+-0p0$IP)<h;3K|Lk000e1NJLTq001-q000IE1^@s6jLN-D00001b5ch_0Itp)
z=>Px#+(|@1R5%f1WPpOEg%4U8{xiD6_~g)x{~6BICdy~v)B9`pl4T4G|0D6KAtcAh
z$gq#qCDs|6Iwp`{*V4zTlzIka4l4uGR1l2|{NJ-o59pW(T=K+<|7T{b#-)}8B=O_d
zzbpnuTuO)(|Icu^B2o4-KGlC1{<i%8Pnk`?0NKpy7;^%bJxm?*AL|0Gu*Ic-SaA+E
zrfK-p{@TC90_YiEd};{EF)}j#XJKHj!KaStH^aYdd<uw?WBk9fEL!$9KDCU0|F`0k
oCq@n!AS)PMqAn4mcG#!^0FrSz4R#DiLI3~&07*qoM6N<$f~&%Ps{jB1

literal 0
HcmV?d00001

diff --git a/src/page/confirmOrder/confirmOrder.vue b/src/page/confirmOrder/confirmOrder.vue
index 37ef00b..6c28e47 100644
--- a/src/page/confirmOrder/confirmOrder.vue
+++ b/src/page/confirmOrder/confirmOrder.vue
@@ -1,30 +1,327 @@
 <template>
-    <div>
-        <head-top head-title="确认订单" goBack="true"></head-top>
-        <div class="confirmOrderContainer">确认订单页</div>    
+    <div class="confirmOrderContainer">
+        <section v-if="!showLoading">
+            <head-top head-title="确认订单" goBack="true" signin-up='confirmOrder'></head-top>
+            <section class="address_container">
+                <div class="address_empty_left">
+                    <svg class="location_icon">
+                        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#location"></use>
+                    </svg>
+                    <span class="add_address">请添加一个收获地址</span>
+                </div>
+                <svg class="address_empty_right">
+                    <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#arrow-right"></use>
+                </svg>
+            </section>
+            <section class="delivery_model container_style">
+                <p class="deliver_text">送达时间</p>
+                <section class="deliver_time">
+                    <p>尽快送达 | 预计{{checkoutData.delivery_reach_time}}</p>
+                    <p v-if="checkoutData.cart.is_deliver_by_fengniao">蜂鸟专送</p>
+                </section>
+            </section>
+            <section class="pay_way container_style">
+                <header class="header_style">
+                    <span>支付方式</span>
+                    <div class="more_type">
+                        <span>在线支付</span>
+                        <svg class="address_empty_right">
+                            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#arrow-right"></use>
+                        </svg>
+                    </div>
+                </header>
+                <section class="hongbo">
+                    <span>红包</span>
+                    <span>暂时只在饿了么 APP 中支持</span>
+                </section>
+            </section>
+            <section class="food_list">
+                <header>
+                    <img :src="imgBaseUrl + checkoutData.cart.restaurant_info.image_path">
+                    <span>{{checkoutData.cart.restaurant_info.name}}</span>
+                </header>
+                <ul class="food_list_ul">
+                    <li v-for="item in checkoutData.cart.groups[0]" :key="item.id" class="food_item_style">
+                        <p class="food_name ellipsis">{{item.name}}</p>
+                        <div class="num_price">
+                            <span>x {{item.quantity}}</span>
+                            <span>¥{{item.price}}</span>
+                        </div>
+                    </li>
+                </ul>
+                <div class="food_item_style">
+                    <p class="food_name ellipsis">{{checkoutData.cart.extra[0].name}}</p>
+                    <div class="num_price">
+                        <span></span>
+                        <span>¥ {{checkoutData.cart.extra[0].price}}</span>
+                    </div>
+                </div>
+                <div class="food_item_style total_price">
+                    <p class="food_name ellipsis">订单 ¥{{checkoutData.cart.total}}</p>
+                    <div class="num_price">
+                        <span></span>
+                        <span>待支付 ¥{{checkoutData.cart.total}}</span>
+                    </div>
+                </div>
+            </section>
+            <section class="pay_way container_style">
+                <header class="header_style">
+                    <span>订单备注</span>
+                    <div class="more_type">
+                        <span>口味偏、好等</span>
+                        <svg class="address_empty_right">
+                            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#arrow-right"></use>
+                        </svg>
+                    </div>
+                </header>
+                <section class="hongbo">
+                    <span>发票抬头</span>
+                    <span>商家不支持开发票</span>
+                </section>
+            </section>
+            <section class="confrim_order">
+                <p>待支付 ¥{{checkoutData.cart.total}}</p>
+                <p>确认下单</p>
+            </section>
+            <transition name="fade">
+                <div></div>
+            </transition>
+            
+        </section>
+        <loading v-if="showLoading"></loading>    
     </div>
 </template>
 
 <script>
+    import {mapState, mapMutations} from 'vuex'
     import headTop from '../../components/header/head'
+    import alertTip from '../../components/common/alertTip'
+    import loading from '../../components/common/loading'
+    import {checkout} from '../../service/getData'
+    import {imgBaseUrl} from '../../config/env'
 
     export default {
         data(){
             return {
-
+                geohash: '', //geohash位置信息
+                shopId: null, //商店id值
+                showLoading: true,
+                checkoutData: null,
+                shopCart: null,
+                imgBaseUrl, 
             }
         },
+        created(){
+            //获取上个页面传递过来的geohash值
+            this.geohash = this.$route.query.geohash;
+            //获取上个页面传递过来的shopid值
+            this.shopId = this.$route.query.shopId;
+            this.INIT_BUYCART();
+            this.shopCart = this.cartList[this.shopId];
+        },
+        mounted(){
+            this.initData();
+        },
         components: {
             headTop,
+            alertTip,
+            loading,
+        },
+        computed: {
+            ...mapState([
+                'cartList'
+            ]),
         },
+        methods: {
+            ...mapMutations([
+                'INIT_BUYCART'
+            ]),
+            async initData(){
+                let newArr = new Array;
+                Object.values(this.shopCart).forEach(categoryItem => {
+                    Object.values(categoryItem).forEach(itemValue=> {
+                        Object.values(itemValue).forEach(item => {
+                            newArr.push({
+                                attrs: [],
+                                extra: {},
+                                id: item.id,
+                                name: item.name,
+                                packing_fee: item.packing_fee,
+                                price: item.price,
+                                quantity: item.num,
+                                sku_id: item.sku_id,
+                                specs: [item.specs],
+                                stock: item.stock,
+                            })
+                        })
+                    })
+                })
+                this.checkoutData = await checkout(this.geohash, [newArr]);
+                this.showLoading = false;
+            },
+        }
     }
 
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
-
+    @import '../../style/mixin';
+    
     .confirmOrderContainer{
         padding-top: 1.95rem;
+        padding-bottom: 3rem;
+        p, span{
+            font-family: Helvetica Neue,Tahoma,Arial;
+        }
+    }
+    .container_style{
+        background-color: #fff;
+        margin-top: .4rem;
+        padding: 0 .7rem;
+    }
+    .address_container{
+        min-height: 3.5rem;
+        @include fj;
+        align-items: center;
+        padding: 0 0.6rem;
+        background: url(../../images/address_bottom.png) left bottom repeat-x;
+        background-color: #fff;
+        background-size: auto .12rem;
+        .address_empty_left{
+            display: flex;
+            align-items: center;
+            .location_icon{
+                @include wh(.8rem, .8rem);
+                fill: $blue;
+                margin-right: .2rem;
+            }
+            .add_address{
+                @include sc(.7rem, #333);
+            }
+        }
+        .address_empty_right{
+            @include wh(.6rem, .6rem);
+            fill: #999;
+        }
+    }
+    .delivery_model{
+        border-left: .2rem solid $blue;
+        min-height: 4rem;
+        @include fj;
+        align-items: center;
+        .deliver_text{
+            @include sc(.8rem, #333);
+            font-weight: bold;
+            padding-left: .3rem;
+        }
+        .deliver_time{
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
+            p:nth-of-type(1){
+                @include sc(.7rem, $blue);
+            }
+            p:nth-of-type(2){
+                @include sc(.5rem, #fff);
+                background-color: $blue;
+                width: 2.4rem;
+                margin-top: .5rem;
+                text-align: center;
+                border-radius: 0.12rem;
+                padding: .1rem;
+            }
+        }
+    }
+    .pay_way{
+        .header_style{
+            @include fj;
+            line-height: 2rem;
+            span:nth-of-type(1){
+                @include sc(.7rem, #666);
+            }
+            .more_type{
+                span:nth-of-type(1){
+                    @include sc(.6rem, #aaa);
+                }
+                svg{
+                    @include wh(.5rem, .5rem);
+                    fill: #ccc;
+                }
+            }
+        }
+        .hongbo{
+            @include fj;
+            border-top: 0.025rem solid #f5f5f5;
+            span{
+                @include sc(.6rem, #ccc);
+                line-height: 2rem;
+            }
+        }
+    }
+    .food_list{
+        background-color: #fff;
+        margin-top: .4rem;
+        header{
+            padding: .7rem;
+            border-bottom: 0.025rem solid #f5f5f5; 
+            img{
+                @include wh(1.2rem, 1.2rem);
+                vertical-align: middle;
+            }
+            span{
+                @include sc(.8rem, #333);
+            }
+        }
+        .food_list_ul{
+            padding-top: .5rem;
+        }
+        .food_item_style{
+            @include fj;
+            line-height: 1.8rem;
+            padding: 0 .7rem;
+            span,p{
+                @include sc(.65rem, #666);
+            }
+            .food_name{
+                width: 11rem;
+            }
+            .num_price{
+                flex: 1;
+                @include fj;
+                span:nth-of-type(2){
+                    color: #f60;
+                }
+            }
+        }
+        .total_price{
+            border-top: 0.025rem solid #f5f5f5; 
+        }
+    }
+    .confrim_order{
+        display: flex;
+        position: fixed;
+        bottom: 0;
+        width: 100%;
+        height: 2rem;
+        p{
+            line-height: 2rem;
+            @include sc(.75rem, #fff);
+        }
+        p:nth-of-type(1){
+            background-color: #3c3c3c;
+            flex: 5;
+            padding-left: .7rem;
+        }
+        p:nth-of-type(2){
+            flex: 2;
+            background-color: #56d176;
+            text-align: center;
+        }
+    }
+    .fade-enter-active, .fade-leave-active {
+        transition: opacity .5s;
+    }
+    .fade-enter, .fade-leave-active {
+        opacity: 0;
     }
 </style>
diff --git a/src/page/forget/forget.vue b/src/page/forget/forget.vue
index 8f5d8cf..026c399 100644
--- a/src/page/forget/forget.vue
+++ b/src/page/forget/forget.vue
@@ -123,7 +123,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
 
     .restContainer{
         padding-top: 1.95rem;
diff --git a/src/page/login/login.vue b/src/page/login/login.vue
index c438746..838732a 100644
--- a/src/page/login/login.vue
+++ b/src/page/login/login.vue
@@ -176,7 +176,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
 
     .loginContainer{
         padding-top: 1.95rem;
diff --git a/src/page/profile/children/balance.vue b/src/page/profile/children/balance.vue
index 3fedebe..1b7af95 100644
--- a/src/page/profile/children/balance.vue
+++ b/src/page/profile/children/balance.vue
@@ -31,7 +31,7 @@
 </script>
   
 <style lang="scss" scoped>
-    @import '../../../style/mixin.scss';
+    @import '../../../style/mixin';
   
     .rating_page{
         position: absolute;
diff --git a/src/page/profile/children/benefit.vue b/src/page/profile/children/benefit.vue
index 3e51e8f..480f8d7 100644
--- a/src/page/profile/children/benefit.vue
+++ b/src/page/profile/children/benefit.vue
@@ -31,7 +31,7 @@
 </script>
   
 <style lang="scss" scoped>
-    @import '../../../style/mixin.scss';
+    @import '../../../style/mixin';
   
     .rating_page{
         position: absolute;
diff --git a/src/page/profile/children/info.vue b/src/page/profile/children/info.vue
index fe091a9..d88e266 100644
--- a/src/page/profile/children/info.vue
+++ b/src/page/profile/children/info.vue
@@ -31,7 +31,7 @@
 </script>
   
 <style lang="scss" scoped>
-    @import '../../../style/mixin.scss';
+    @import '../../../style/mixin';
   
     .rating_page{
         position: absolute;
diff --git a/src/page/profile/children/points.vue b/src/page/profile/children/points.vue
index 1d6d18a..8854bf8 100644
--- a/src/page/profile/children/points.vue
+++ b/src/page/profile/children/points.vue
@@ -31,7 +31,7 @@
 </script>
   
 <style lang="scss" scoped>
-    @import '../../../style/mixin.scss';
+    @import '../../../style/mixin';
   
     .rating_page{
         position: absolute;
diff --git a/src/page/profile/children/service.vue b/src/page/profile/children/service.vue
index 1d6d18a..8854bf8 100644
--- a/src/page/profile/children/service.vue
+++ b/src/page/profile/children/service.vue
@@ -31,7 +31,7 @@
 </script>
   
 <style lang="scss" scoped>
-    @import '../../../style/mixin.scss';
+    @import '../../../style/mixin';
   
     .rating_page{
         position: absolute;
diff --git a/src/page/search/search.vue b/src/page/search/search.vue
index 9da6295..7a2fd6f 100644
--- a/src/page/search/search.vue
+++ b/src/page/search/search.vue
@@ -142,7 +142,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
 
     .search_form{
         background-color: #fff;
diff --git a/src/page/shop/children/foodDetail.vue b/src/page/shop/children/foodDetail.vue
index 49ed4e7..828905b 100644
--- a/src/page/shop/children/foodDetail.vue
+++ b/src/page/shop/children/foodDetail.vue
@@ -75,7 +75,7 @@
 </script>
 	
 <style lang="scss" scoped>
-    @import '../../../style/mixin.scss';
+    @import '../../../style/mixin';
 	
 	.rating_page{
 		position: absolute;
diff --git a/src/page/shop/children/shopDetail.vue b/src/page/shop/children/shopDetail.vue
index 03e2803..f5a5022 100644
--- a/src/page/shop/children/shopDetail.vue
+++ b/src/page/shop/children/shopDetail.vue
@@ -110,7 +110,7 @@
 </script>
 	
 <style lang="scss" scoped>
-    @import '../../../style/mixin.scss';
+    @import '../../../style/mixin';
 	
 	.rating_page{
 		position: absolute;
diff --git a/src/page/shop/children/shopSafe.vue b/src/page/shop/children/shopSafe.vue
index 9d25bd1..220279b 100644
--- a/src/page/shop/children/shopSafe.vue
+++ b/src/page/shop/children/shopSafe.vue
@@ -128,7 +128,7 @@
 </script>
 	
 <style lang="scss" scoped>
-    @import '../../../style/mixin.scss';
+    @import '../../../style/mixin';
 	
 	.safe_shop{
 		position: absolute;
diff --git a/src/page/shop/shop.vue b/src/page/shop/shop.vue
index 66757c4..d85279d 100644
--- a/src/page/shop/shop.vue
+++ b/src/page/shop/shop.vue
@@ -140,7 +140,7 @@
                         </section>
                         <section class="gotopay" :class="{gotopay_acitvity: minimumOrderAmount < 0}">
                             <span class="gotopay_button_style" v-if="minimumOrderAmount > 0">还差¥{{minimumOrderAmount}}起送</span>
-                            <router-link to="/confirmOrder" class="gotopay_button_style" v-else >去结算</router-link>
+                            <router-link :to="{path:'/confirmOrder', query:{geohash, shopId}}" class="gotopay_button_style" v-else >去结算</router-link>
                         </section>
                     </section>
                     <transition name="toggle-cart">
@@ -253,7 +253,6 @@
 
 <script>
     import {mapState, mapMutations} from 'vuex'
-    import {imgBaseUrl} from '../../config/env'
     import {msiteAdress, shopDetails, foodMenu, getRatingList, ratingScores, ratingTags} from '../../service/getData'
     import loading from '../../components/common/loading'
     import buyCart from '../../components/common/buyCart'
@@ -556,7 +555,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../style/mixin.scss';
+    @import '../../style/mixin';
     @keyframes mymove{
        0%   { transform: scale(1) }
        25%  { transform: scale(.8) }
diff --git a/src/service/getData.js b/src/service/getData.js
index e5710f6..537c9d8 100644
--- a/src/service/getData.js
+++ b/src/service/getData.js
@@ -6,6 +6,7 @@ import * as search from './tempdata/search'
 import * as food from './tempdata/food'
 import * as shop from './tempdata/shop'
 import * as login from './tempdata/login'
+import * as confirm from './tempdata/confirm'
 
 /**
  * 获取首页默认地址
@@ -120,16 +121,16 @@ export const foodActivity = (latitude, longitude) => fetch('GET', '/shopping/v1/
 /**
  * 获取shop页面商铺详情
  */
-export const shopDetails = (shopid, latitude, longitude) => fetch('GET', '/shopping/restaurant/' + shopid, {
-	latitude,
-	longitude: longitude + '&extras[]=activities&extras[]=album&extras[]=license&extras[]=identification&extras[]=statistics'
-});
+// export const shopDetails = (shopid, latitude, longitude) => fetch('GET', '/shopping/restaurant/' + shopid, {
+// 	latitude,
+// 	longitude: longitude + '&extras[]=activities&extras[]=album&extras[]=license&extras[]=identification&extras[]=statistics'
+// });
 /**
  * 获取food页面的商家属性活动列表
  */
-export const foodMenu = restaurant_id => fetch('GET', '/shopping/v2/menu', {
-	restaurant_id
-});
+// export const foodMenu = restaurant_id => fetch('GET', '/shopping/v2/menu', {
+// 	restaurant_id
+// });
 /**
  * 获取商铺评价列表
  */
@@ -150,11 +151,11 @@ export const ratingTags = shopid => fetch('GET', '/ugc/v2/restaurants/' + shopid
 /**
  * 获取短信验证码
  */
-export const mobileCode = phone => fetch('POST', '/v4/mobile/verify_code/send', {
-	mobile: phone,
-	scene: 'login',
-	type: 'sms'
-});
+// export const mobileCode = phone => fetch('POST', '/v4/mobile/verify_code/send', {
+// 	mobile: phone,
+// 	scene: 'login',
+// 	type: 'sms'
+// });
 /**
  * 手机号登陆
  */
@@ -170,21 +171,30 @@ export const getcaptchas = () => fetch('POST', '/v1/captchas', {});
 /**
  * 检测帐号是否存在
  */
-export const checkExsis = (checkNumber, type) => fetch('GET', '/v1/users/exists', {
-	[type]: checkNumber,
-	type
-});
+// export const checkExsis = (checkNumber, type) => fetch('GET', '/v1/users/exists', {
+// 	[type]: checkNumber,
+// 	type
+// });
 /**
  * 发送帐号
  */
-export const sendMobile = (sendData, captcha_code, type, password) => fetch('POST', '/v1/mobile/verify_code/send', {
-	action: "send",
-	captcha_code,
-	[type]: sendData,
-	type: "sms",
-	way: type,
-	password,
-});
+// export const sendMobile = (sendData, captcha_code, type, password) => fetch('POST', '/v1/mobile/verify_code/send', {
+// 	action: "send",
+// 	captcha_code,
+// 	[type]: sendData,
+// 	type: "sms",
+// 	way: type,
+// 	password,
+// });
+
+/**
+ * 确认订单
+ */
+// export const checkout = (geohash, entities) => fetch('POST', '/v1/carts/checkout', {
+// 	come_from: "web",
+// 	geohash,
+// 	entities,
+// });
 
 
 
@@ -209,11 +219,14 @@ const setpromise = data => {
 // export const foodCategory = (latitude, longitude) => setpromise(food.category);
 // export const foodDelivery = (latitude, longitude) => setpromise(food.delivery);
 // export const foodActivity = (latitude, longitude) => setpromise(food.activity);
-// export const shopDetails = (shopid, latitude, longitude) => setpromise(shop.shopDetails);
-// export const foodMenu = restaurant_id => setpromise(shop.shopMenu);
+export const shopDetails = (shopid, latitude, longitude) => setpromise(shop.shopDetails);
+export const foodMenu = restaurant_id => setpromise(shop.shopMenu);
 // export const getRatingList = (offset, tag_name = '') => setpromise(shop.ratingList);
 // export const ratingScores = shopid => setpromise(shop.scores);
 // export const ratingTags = shopid => setpromise(shop.tage);
-//export const mobileCode = phone => setpromise(login.validate_token);
+export const mobileCode = phone => setpromise(login.validate_token);
 export const sendLogin = (code, mobile, validate_token) => setpromise(login.userInfo);
-export const accountLogin = (username, password, captcha_code) => setpromise(login.userInfo);
\ No newline at end of file
+export const accountLogin = (username, password, captcha_code) => setpromise(login.userInfo);
+export const checkExsis = (checkNumber, type) => setpromise(login.checkExsis);
+export const sendMobile = (sendData, captcha_code, type, password) => setpromise(login.send);
+export const checkout = (geohash, entities) => setpromise(confirm.checkout);
\ No newline at end of file
diff --git a/src/service/tempdata/confirm.js b/src/service/tempdata/confirm.js
new file mode 100644
index 0000000..7f0d0a9
--- /dev/null
+++ b/src/service/tempdata/confirm.js
@@ -0,0 +1,1396 @@
+export const checkout = {
+	"cart": {
+		"pindan": {
+			"is_pindan": 0,
+			"owners": null,
+			"lock": 0,
+			"num": 0,
+			"order_id": 0
+		},
+		"service_fee_explanation": "",
+		"id": "8dc39704f4e011e69e5fe4a8b6cc4aae",
+		"user_id": 0,
+		"extra": [{
+			"description": "\u672c\u8ba2\u5355\u7531\u3010\u8702\u9e1f\u4e13\u9001\u3011\u63d0\u4f9b\u914d\u9001",
+			"price": 5,
+			"name": "\u914d\u9001\u8d39",
+			"category_id": 2,
+			"id": -10,
+			"quantity": 1,
+			"type": 0,
+			"icon": {
+				"name": "\u60e0",
+				"color": "f1884f",
+				"image_hash": ""
+			}
+		}],
+		"total": 425,
+		"deliver_amount": 420,
+		"abandoned_extra": [{
+			"description": "\u4ec5\u9650\u79fb\u52a8\u5ba2\u6237\u7aef\u4eab\u7528",
+			"quantity": 2,
+			"price": -19,
+			"food_id": 101937131,
+			"id": 19107728,
+			"must_new_user": false,
+			"category_id": 11,
+			"type": 4,
+			"stats_quantity": 2,
+			"name": "\u53cc\u4eba\u5206\u4eab\u5957\u9910A",
+			"icon": {
+				"image_hash": null,
+				"name": "\u7279",
+				"color": "f1884f"
+			}
+		}, {
+			"description": "\u4ec5\u9650\u79fb\u52a8\u5ba2\u6237\u7aef\u4eab\u7528",
+			"quantity": 1,
+			"price": -30,
+			"id": 21031441,
+			"category_id": 12,
+			"type": 102,
+			"stats_quantity": 1,
+			"name": "(\u4e0d\u4e0e\u7f8e\u98df\u6d3b\u52a8\u540c\u4eab)\u5728\u7ebf\u652f\u4ed8\u7acb\u51cf\u4f18\u60e0",
+			"icon": {
+				"image_hash": null,
+				"name": "\u51cf",
+				"color": "f07373"
+			}
+		}],
+		"deliver_time": "",
+		"original_total": 425,
+		"phone": "",
+		"group": [
+			[{
+				"sku_id": "",
+				"name": "\u8d85\u7ea7\u81f3\u5c0a\u6bd4\u8428-\u94c1\u76d8",
+				"quantity": 1,
+				"price": 74,
+				"sale_mode": 0,
+				"new_specs": [],
+				"id": 508807792,
+				"attrs": [],
+				"garnish": [],
+				"specs": ["\u94c1\u76d8"],
+				"has_default_attrs": false,
+				"category_id": 1
+			}, {
+				"sku_id": "",
+				"name": "\u6d53\u60c5\u70e4\u7fc5-4\u53ea\u88c5",
+				"quantity": 1,
+				"price": 30,
+				"sale_mode": 0,
+				"new_specs": [],
+				"id": 508807826,
+				"attrs": [],
+				"garnish": [],
+				"specs": ["4\u53ea\u88c5"],
+				"has_default_attrs": false,
+				"category_id": 1
+			}, {
+				"sku_id": "",
+				"name": "\u53cc\u4eba\u5206\u4eab\u5957\u9910A",
+				"quantity": 2,
+				"price": 158,
+				"sale_mode": 0,
+				"new_specs": [],
+				"id": 101937131,
+				"attrs": [],
+				"garnish": [],
+				"specs": [""],
+				"has_default_attrs": false,
+				"category_id": 1
+			}]
+		],
+		"must_new_user": 0,
+		"is_online_paid": 1,
+		"must_pay_online": 0,
+		"dist_info": null,
+		"restaurant_id": 834828,
+		"restaurant_name_for_url": "bskpsh058",
+		"restaurant_minimum_order_amount": 20,
+		"restaurant_status": 1,
+		"discount_amount": 0,
+		"groups": [
+			[{
+				"sku_id": "",
+				"name": "\u8d85\u7ea7\u81f3\u5c0a\u6bd4\u8428-\u94c1\u76d8",
+				"quantity": 1,
+				"price": 74,
+				"sale_mode": 0,
+				"new_specs": [],
+				"id": 508807792,
+				"attrs": [],
+				"garnish": [],
+				"specs": ["\u94c1\u76d8"],
+				"has_default_attrs": false,
+				"category_id": 1,
+				"is_valid": true,
+				"is_sold_out": false,
+				"is_understock": false
+			}, {
+				"sku_id": "",
+				"name": "\u6d53\u60c5\u70e4\u7fc5-4\u53ea\u88c5",
+				"quantity": 1,
+				"price": 30,
+				"sale_mode": 0,
+				"new_specs": [],
+				"id": 508807826,
+				"attrs": [],
+				"garnish": [],
+				"specs": ["4\u53ea\u88c5"],
+				"has_default_attrs": false,
+				"category_id": 1,
+				"is_valid": true,
+				"is_sold_out": false,
+				"is_understock": false
+			}, {
+				"sku_id": "",
+				"name": "\u53cc\u4eba\u5206\u4eab\u5957\u9910A",
+				"quantity": 2,
+				"price": 158,
+				"sale_mode": 0,
+				"new_specs": [],
+				"id": 101937131,
+				"attrs": [],
+				"garnish": [],
+				"specs": [""],
+				"has_default_attrs": false,
+				"category_id": 1,
+				"is_valid": true,
+				"is_sold_out": false,
+				"is_understock": false
+			}]
+		],
+		"is_ontime_available": 0,
+		"promise_delivery_time": 0,
+		"is_deliver_by_fengniao": true,
+		"ontime_status": 0,
+		"ontime_unavailable_reason": "",
+		"share_pindan": {
+			"url": "https:\/\/h5.ele.me\/spell\/#cartId=8dc39704f4e011e69e5fe4a8b6cc4aae&sig=5f39c5c428e8e73d0a4fde09bc0f9107",
+			"title": "\u6709\u4eba\u4e00\u8d77\u70b9\u5916\u5356\u4e48\uff1f",
+			"description": "\u6211\u8981\u70b9\u3010\u5fc5\u80dc\u5ba2\uff08\u65b0\u4e16\u754c\u5e97\uff09\u3011\u7684\u5916\u5356\uff0c\u6709\u4e00\u8d77\u70b9\u7684\u4e48\uff1f",
+			"image_path": "\/1\/c2\/a34b4ce63e4ac11494b916d3e8ab6jpeg.jpeg?w=86&h=86"
+		},
+		"extra_for_app": {
+			"fee": [{
+				"description": "\u672c\u8ba2\u5355\u7531\u3010\u8702\u9e1f\u4e13\u9001\u3011\u63d0\u4f9b\u914d\u9001",
+				"price": 5,
+				"name": "\u914d\u9001\u8d39",
+				"category_id": 2,
+				"id": -10,
+				"quantity": 1,
+				"type": 0,
+				"icon": {
+					"name": "\u60e0",
+					"color": "f1884f",
+					"image_hash": ""
+				}
+			}],
+			"activities": [],
+			"coupon": []
+		},
+		"is_address_too_far": false,
+		"restaurant_info": {
+			"id": 834828,
+			"name": "\u5fc5\u80dc\u5ba2\uff08\u65b0\u4e16\u754c\u5e97\uff09",
+			"latitude": 31.235082,
+			"longitude": 121.473686,
+			"description": "\u5fc5\u80dc\u5ba2\uff08\u65b0\u4e16\u754c\u5e97\uff09",
+			"phone": "021-63592395",
+			"order_mode": 3,
+			"promotion_info": "",
+			"name_for_url": "bskpsh058",
+			"flavors": "",
+			"is_time_ensure": false,
+			"is_premium": true,
+			"time_ensure_full_description": "",
+			"recent_order_num": 624,
+			"image_path": "\/1\/c2\/a34b4ce63e4ac11494b916d3e8ab6jpeg.jpeg",
+			"is_free_delivery": false,
+			"minimum_order_amount": 20,
+			"order_lead_time": 39,
+			"is_support_invoice": true,
+			"is_new": false,
+			"is_third_party_delivery": false,
+			"is_in_book_time": true,
+			"rating_count": 194,
+			"address": "\u4e0a\u6d77\u5e02\u5357\u4eac\u897f\u8def2-68\u53f7",
+			"month_sales": 1918,
+			"delivery_fee": 5,
+			"minimum_free_delivery_amount": 0,
+			"minimum_order_description": "10:30-20:30",
+			"minimum_invoice_amount": 0,
+			"is_open_time": true,
+			"opening_hours": ["10:00\/20:30"],
+			"book_times": ["16:15:00", "16:30:00", "16:45:00", "17:00:00", "17:15:00", "17:30:00", "17:45:00", "18:00:00", "18:15:00", "18:30:00", "18:45:00", "19:00:00", "19:15:00", "19:30:00", "19:45:00", "20:00:00", "20:15:00"],
+			"is_online_payment": true,
+			"status": 1,
+			"distance": 647,
+			"supports": [{
+				"id": 7,
+				"name": "\u5916\u5356\u4fdd",
+				"description": "\u5df2\u52a0\u5165\u201c\u5916\u5356\u4fdd\u201d\u8ba1\u5212\uff0c\u98df\u54c1\u5b89\u5168\u6709\u4fdd\u969c",
+				"icon_color": "4B9A18",
+				"icon_name": "\u4fdd"
+			}, {
+				"id": 3,
+				"name": "\u5728\u7ebf\u652f\u4ed8",
+				"description": "\u53ef\u4f7f\u7528\u652f\u4ed8\u5b9d\u3001\u5fae\u4fe1\u3001\u624b\u673aQQ\u8fdb\u884c\u5728\u7ebf\u652f\u4ed8",
+				"icon_color": "FF4E00",
+				"icon_name": "\u4ed8"
+			}, {
+				"id": 4,
+				"name": "\u5f00\u53d1\u7968",
+				"description": "\u8be5\u5546\u5bb6\u652f\u6301\u5f00\u53d1\u7968\uff0c\u8bf7\u5728\u4e0b\u5355\u65f6\u586b\u5199\u597d\u53d1\u7968\u62ac\u5934",
+				"icon_color": "9071CB",
+				"icon_name": "\u7968"
+			}],
+			"food_tips": "(194) \u6708\u552e1918\u4efd",
+			"restaurant_tips": "20\u5143\u8d77\u9001 \/ 39\u5206\u949f \/ 647\u7c73",
+			"next_business_time": "",
+			"is_coupon_enabled": false,
+			"is_insurance": true,
+			"delivery_mode": {
+				"id": 1,
+				"text": "\u8702\u9e1f\u4e13\u9001",
+				"color": "4CA9FF",
+				"is_solid": true
+			},
+			"business_district": "",
+			"only_use_poi": true,
+			"closing_count_down": 0
+		}
+	},
+	"sig": "5f39c5c428e8e73d0a4fde09bc0f9107",
+	"current_address": null,
+	"deliver_times": [{
+		"time": "16:15",
+		"time_description": "16:15 - 16:30"
+	}, {
+		"time": "16:30",
+		"time_description": "16:30 - 16:45"
+	}, {
+		"time": "16:45",
+		"time_description": "16:45 - 17:00"
+	}, {
+		"time": "17:00",
+		"time_description": "17:00 - 17:15"
+	}, {
+		"time": "17:15",
+		"time_description": "17:15 - 17:30"
+	}, {
+		"time": "17:30",
+		"time_description": "17:30 - 17:45"
+	}, {
+		"time": "17:45",
+		"time_description": "17:45 - 18:00"
+	}, {
+		"time": "18:00",
+		"time_description": "18:00 - 18:15"
+	}, {
+		"time": "18:15",
+		"time_description": "18:15 - 18:30"
+	}, {
+		"time": "18:30",
+		"time_description": "18:30 - 18:45"
+	}, {
+		"time": "18:45",
+		"time_description": "18:45 - 19:00"
+	}, {
+		"time": "19:00",
+		"time_description": "19:00 - 19:15"
+	}, {
+		"time": "19:15",
+		"time_description": "19:15 - 19:30"
+	}, {
+		"time": "19:30",
+		"time_description": "19:30 - 19:45"
+	}, {
+		"time": "19:45",
+		"time_description": "19:45 - 20:00"
+	}, {
+		"time": "20:00",
+		"time_description": "20:00 - 20:15"
+	}, {
+		"time": "20:15",
+		"time_description": "20:15 - 20:30"
+	}],
+	"deliver_times_v2": [{
+		"tab": "\u4eca\u65e5\uff08\u5468\u4e94\uff09",
+		"time_points": [{
+			"time": "16:02",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": ""
+		}, {
+			"time": "16:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "16:15"
+		}, {
+			"time": "16:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "16:30"
+		}, {
+			"time": "16:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "16:45"
+		}, {
+			"time": "17:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "17:00"
+		}, {
+			"time": "17:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "17:15"
+		}, {
+			"time": "17:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "17:30"
+		}, {
+			"time": "17:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "17:45"
+		}, {
+			"time": "18:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "18:00"
+		}, {
+			"time": "18:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "18:15"
+		}, {
+			"time": "18:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "18:30"
+		}, {
+			"time": "18:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "18:45"
+		}, {
+			"time": "19:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "19:00"
+		}, {
+			"time": "19:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "19:15"
+		}, {
+			"time": "19:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "19:30"
+		}, {
+			"time": "19:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "19:45"
+		}, {
+			"time": "20:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "20:00"
+		}, {
+			"time": "20:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "20:15"
+		}]
+	}, {
+		"tab": "\u660e\u65e5\uff08\u5468\u516d\uff09",
+		"time_points": [{
+			"time": "10:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 10:45"
+		}, {
+			"time": "11:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 11:00"
+		}, {
+			"time": "11:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 11:15"
+		}, {
+			"time": "11:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 11:30"
+		}, {
+			"time": "11:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 11:45"
+		}, {
+			"time": "12:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 12:00"
+		}, {
+			"time": "12:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 12:15"
+		}, {
+			"time": "12:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 12:30"
+		}, {
+			"time": "12:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 12:45"
+		}, {
+			"time": "13:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 13:00"
+		}, {
+			"time": "13:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 13:15"
+		}, {
+			"time": "13:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 13:30"
+		}, {
+			"time": "13:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 13:45"
+		}, {
+			"time": "14:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 14:00"
+		}, {
+			"time": "14:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 14:15"
+		}, {
+			"time": "14:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 14:30"
+		}, {
+			"time": "14:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 14:45"
+		}, {
+			"time": "15:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 15:00"
+		}, {
+			"time": "15:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 15:15"
+		}, {
+			"time": "15:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 15:30"
+		}, {
+			"time": "15:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 15:45"
+		}, {
+			"time": "16:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 16:00"
+		}, {
+			"time": "16:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 16:15"
+		}, {
+			"time": "16:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 16:30"
+		}, {
+			"time": "16:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 16:45"
+		}, {
+			"time": "17:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 17:00"
+		}, {
+			"time": "17:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 17:15"
+		}, {
+			"time": "17:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 17:30"
+		}, {
+			"time": "17:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 17:45"
+		}, {
+			"time": "18:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 18:00"
+		}, {
+			"time": "18:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 18:15"
+		}, {
+			"time": "18:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 18:30"
+		}, {
+			"time": "18:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 18:45"
+		}, {
+			"time": "19:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 19:00"
+		}, {
+			"time": "19:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 19:15"
+		}, {
+			"time": "19:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 19:30"
+		}, {
+			"time": "19:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 19:45"
+		}, {
+			"time": "20:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 20:00"
+		}, {
+			"time": "20:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-18 20:15"
+		}]
+	}, {
+		"tab": "02-19\uff08\u5468\u65e5\uff09",
+		"time_points": [{
+			"time": "10:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 10:45"
+		}, {
+			"time": "11:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 11:00"
+		}, {
+			"time": "11:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 11:15"
+		}, {
+			"time": "11:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 11:30"
+		}, {
+			"time": "11:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 11:45"
+		}, {
+			"time": "12:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 12:00"
+		}, {
+			"time": "12:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 12:15"
+		}, {
+			"time": "12:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 12:30"
+		}, {
+			"time": "12:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 12:45"
+		}, {
+			"time": "13:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 13:00"
+		}, {
+			"time": "13:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 13:15"
+		}, {
+			"time": "13:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 13:30"
+		}, {
+			"time": "13:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 13:45"
+		}, {
+			"time": "14:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 14:00"
+		}, {
+			"time": "14:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 14:15"
+		}, {
+			"time": "14:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 14:30"
+		}, {
+			"time": "14:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 14:45"
+		}, {
+			"time": "15:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 15:00"
+		}, {
+			"time": "15:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 15:15"
+		}, {
+			"time": "15:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 15:30"
+		}, {
+			"time": "15:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 15:45"
+		}, {
+			"time": "16:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 16:00"
+		}, {
+			"time": "16:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 16:15"
+		}, {
+			"time": "16:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 16:30"
+		}, {
+			"time": "16:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 16:45"
+		}, {
+			"time": "17:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 17:00"
+		}, {
+			"time": "17:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 17:15"
+		}, {
+			"time": "17:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 17:30"
+		}, {
+			"time": "17:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 17:45"
+		}, {
+			"time": "18:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 18:00"
+		}, {
+			"time": "18:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 18:15"
+		}, {
+			"time": "18:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 18:30"
+		}, {
+			"time": "18:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 18:45"
+		}, {
+			"time": "19:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 19:00"
+		}, {
+			"time": "19:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 19:15"
+		}, {
+			"time": "19:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 19:30"
+		}, {
+			"time": "19:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 19:45"
+		}, {
+			"time": "20:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 20:00"
+		}, {
+			"time": "20:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-19 20:15"
+		}]
+	}, {
+		"tab": "02-20\uff08\u5468\u4e00\uff09",
+		"time_points": [{
+			"time": "10:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 10:45"
+		}, {
+			"time": "11:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 11:00"
+		}, {
+			"time": "11:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 11:15"
+		}, {
+			"time": "11:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 11:30"
+		}, {
+			"time": "11:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 11:45"
+		}, {
+			"time": "12:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 12:00"
+		}, {
+			"time": "12:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 12:15"
+		}, {
+			"time": "12:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 12:30"
+		}, {
+			"time": "12:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 12:45"
+		}, {
+			"time": "13:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 13:00"
+		}, {
+			"time": "13:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 13:15"
+		}, {
+			"time": "13:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 13:30"
+		}, {
+			"time": "13:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 13:45"
+		}, {
+			"time": "14:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 14:00"
+		}, {
+			"time": "14:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 14:15"
+		}, {
+			"time": "14:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 14:30"
+		}, {
+			"time": "14:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 14:45"
+		}, {
+			"time": "15:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 15:00"
+		}, {
+			"time": "15:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 15:15"
+		}, {
+			"time": "15:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 15:30"
+		}, {
+			"time": "15:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 15:45"
+		}, {
+			"time": "16:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 16:00"
+		}, {
+			"time": "16:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 16:15"
+		}, {
+			"time": "16:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 16:30"
+		}, {
+			"time": "16:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 16:45"
+		}, {
+			"time": "17:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 17:00"
+		}, {
+			"time": "17:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 17:15"
+		}, {
+			"time": "17:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 17:30"
+		}, {
+			"time": "17:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 17:45"
+		}, {
+			"time": "18:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 18:00"
+		}, {
+			"time": "18:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 18:15"
+		}, {
+			"time": "18:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 18:30"
+		}, {
+			"time": "18:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 18:45"
+		}, {
+			"time": "19:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 19:00"
+		}, {
+			"time": "19:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 19:15"
+		}, {
+			"time": "19:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 19:30"
+		}, {
+			"time": "19:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 19:45"
+		}, {
+			"time": "20:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 20:00"
+		}, {
+			"time": "20:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-20 20:15"
+		}]
+	}, {
+		"tab": "02-21\uff08\u5468\u4e8c\uff09",
+		"time_points": [{
+			"time": "10:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 10:45"
+		}, {
+			"time": "11:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 11:00"
+		}, {
+			"time": "11:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 11:15"
+		}, {
+			"time": "11:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 11:30"
+		}, {
+			"time": "11:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 11:45"
+		}, {
+			"time": "12:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 12:00"
+		}, {
+			"time": "12:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 12:15"
+		}, {
+			"time": "12:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 12:30"
+		}, {
+			"time": "12:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 12:45"
+		}, {
+			"time": "13:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 13:00"
+		}, {
+			"time": "13:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 13:15"
+		}, {
+			"time": "13:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 13:30"
+		}, {
+			"time": "13:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 13:45"
+		}, {
+			"time": "14:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 14:00"
+		}, {
+			"time": "14:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 14:15"
+		}, {
+			"time": "14:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 14:30"
+		}, {
+			"time": "14:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 14:45"
+		}, {
+			"time": "15:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 15:00"
+		}, {
+			"time": "15:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 15:15"
+		}, {
+			"time": "15:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 15:30"
+		}, {
+			"time": "15:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 15:45"
+		}, {
+			"time": "16:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 16:00"
+		}, {
+			"time": "16:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 16:15"
+		}, {
+			"time": "16:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 16:30"
+		}, {
+			"time": "16:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 16:45"
+		}, {
+			"time": "17:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 17:00"
+		}, {
+			"time": "17:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 17:15"
+		}, {
+			"time": "17:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 17:30"
+		}, {
+			"time": "17:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 17:45"
+		}, {
+			"time": "18:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 18:00"
+		}, {
+			"time": "18:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 18:15"
+		}, {
+			"time": "18:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 18:30"
+		}, {
+			"time": "18:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 18:45"
+		}, {
+			"time": "19:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 19:00"
+		}, {
+			"time": "19:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 19:15"
+		}, {
+			"time": "19:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 19:30"
+		}, {
+			"time": "19:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 19:45"
+		}, {
+			"time": "20:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 20:00"
+		}, {
+			"time": "20:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-21 20:15"
+		}]
+	}, {
+		"tab": "02-22\uff08\u5468\u4e09\uff09",
+		"time_points": [{
+			"time": "10:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 10:45"
+		}, {
+			"time": "11:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 11:00"
+		}, {
+			"time": "11:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 11:15"
+		}, {
+			"time": "11:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 11:30"
+		}, {
+			"time": "11:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 11:45"
+		}, {
+			"time": "12:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 12:00"
+		}, {
+			"time": "12:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 12:15"
+		}, {
+			"time": "12:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 12:30"
+		}, {
+			"time": "12:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 12:45"
+		}, {
+			"time": "13:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 13:00"
+		}, {
+			"time": "13:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 13:15"
+		}, {
+			"time": "13:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 13:30"
+		}, {
+			"time": "13:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 13:45"
+		}, {
+			"time": "14:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 14:00"
+		}, {
+			"time": "14:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 14:15"
+		}, {
+			"time": "14:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 14:30"
+		}, {
+			"time": "14:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 14:45"
+		}, {
+			"time": "15:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 15:00"
+		}, {
+			"time": "15:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 15:15"
+		}, {
+			"time": "15:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 15:30"
+		}, {
+			"time": "15:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 15:45"
+		}, {
+			"time": "16:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 16:00"
+		}, {
+			"time": "16:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 16:15"
+		}, {
+			"time": "16:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 16:30"
+		}, {
+			"time": "16:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 16:45"
+		}, {
+			"time": "17:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 17:00"
+		}, {
+			"time": "17:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 17:15"
+		}, {
+			"time": "17:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 17:30"
+		}, {
+			"time": "17:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 17:45"
+		}, {
+			"time": "18:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 18:00"
+		}, {
+			"time": "18:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 18:15"
+		}, {
+			"time": "18:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 18:30"
+		}, {
+			"time": "18:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 18:45"
+		}, {
+			"time": "19:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 19:00"
+		}, {
+			"time": "19:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 19:15"
+		}, {
+			"time": "19:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 19:30"
+		}, {
+			"time": "19:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 19:45"
+		}, {
+			"time": "20:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 20:00"
+		}, {
+			"time": "20:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-22 20:15"
+		}]
+	}, {
+		"tab": "02-23\uff08\u5468\u56db\uff09",
+		"time_points": [{
+			"time": "10:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 10:45"
+		}, {
+			"time": "11:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 11:00"
+		}, {
+			"time": "11:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 11:15"
+		}, {
+			"time": "11:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 11:30"
+		}, {
+			"time": "11:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 11:45"
+		}, {
+			"time": "12:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 12:00"
+		}, {
+			"time": "12:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 12:15"
+		}, {
+			"time": "12:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 12:30"
+		}, {
+			"time": "12:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 12:45"
+		}, {
+			"time": "13:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 13:00"
+		}, {
+			"time": "13:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 13:15"
+		}, {
+			"time": "13:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 13:30"
+		}, {
+			"time": "13:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 13:45"
+		}, {
+			"time": "14:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 14:00"
+		}, {
+			"time": "14:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 14:15"
+		}, {
+			"time": "14:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 14:30"
+		}, {
+			"time": "14:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 14:45"
+		}, {
+			"time": "15:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 15:00"
+		}, {
+			"time": "15:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 15:15"
+		}, {
+			"time": "15:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 15:30"
+		}, {
+			"time": "15:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 15:45"
+		}, {
+			"time": "16:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 16:00"
+		}, {
+			"time": "16:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 16:15"
+		}, {
+			"time": "16:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 16:30"
+		}, {
+			"time": "16:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 16:45"
+		}, {
+			"time": "17:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 17:00"
+		}, {
+			"time": "17:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 17:15"
+		}, {
+			"time": "17:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 17:30"
+		}, {
+			"time": "17:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 17:45"
+		}, {
+			"time": "18:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 18:00"
+		}, {
+			"time": "18:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 18:15"
+		}, {
+			"time": "18:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 18:30"
+		}, {
+			"time": "18:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 18:45"
+		}, {
+			"time": "19:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 19:00"
+		}, {
+			"time": "19:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 19:15"
+		}, {
+			"time": "19:30",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 19:30"
+		}, {
+			"time": "19:45",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 19:45"
+		}, {
+			"time": "20:00",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 20:00"
+		}, {
+			"time": "20:15",
+			"delivery_fee_description": "5\u5143\u914d\u9001\u8d39",
+			"delivery_time": "2017-02-23 20:15"
+		}]
+	}],
+	"payments": [{
+		"id": 1,
+		"name": "\u5728\u7ebf\u652f\u4ed8",
+		"is_online_payment": true,
+		"disabled_reason": "",
+		"description": "\uff08\u5546\u5bb6\u4ec5\u652f\u6301\u5728\u7ebf\u652f\u4ed8\uff09",
+		"select_state": 1,
+		"promotion": []
+	}, {
+		"id": 0,
+		"name": "\u8d27\u5230\u4ed8\u6b3e",
+		"is_online_payment": false,
+		"disabled_reason": "\u5546\u5bb6\u4ec5\u652f\u6301\u5728\u7ebf\u652f\u4ed8",
+		"description": "\uff08\u5546\u5bb6\u4e0d\u652f\u6301\u8d27\u5230\u4ed8\u6b3e\uff09",
+		"select_state": -1,
+		"promotion": []
+	}],
+	"invoice": {
+		"is_available": true,
+		"status_text": "\u4e0d\u9700\u8981\u5f00\u53d1\u7968"
+	},
+	"discount_rule": {
+		"rule_url": "eleme:\/\/web?url=https:\/\/m.ele.me\/profile\/explain\/discount&animation_type=1",
+		"rule_available": true
+	},
+	"is_support_coupon": false,
+	"hongbao_info": {
+		"status": -1,
+		"status_text": "\u767b\u5f55\u540e\u4f7f\u7528\u7ea2\u5305",
+		"valid_hongbao_count": 0,
+		"invalid_hongbao_count": 0,
+		"hongbao": null
+	},
+	"delivery_reach_time": "15:52",
+	"number_of_meals": {
+		"is_available": true,
+		"description": "\u4fbf\u4e8e\u5546\u5bb6\u5e26\u591f\u9910\u5177"
+	},
+	"merchant_coupon_info": {
+		"status": 1,
+		"status_text": "",
+		"valid_merchant_coupon_count": 0,
+		"invalid_merchant_coupon_count": 0,
+		"merchant_coupon": null
+	},
+	"is_support_ninja": 1
+};
\ No newline at end of file
diff --git a/src/service/tempdata/login.js b/src/service/tempdata/login.js
index 6f8c1b9..529d96d 100644
--- a/src/service/tempdata/login.js
+++ b/src/service/tempdata/login.js
@@ -26,4 +26,14 @@ export const userInfo = {
 	"point": 960,
 	"user_id": 109065163,
 	"username": "cangdu"
+};
+
+export const checkExsis = {
+	"message": "\u8bf7\u68c0\u67e5\u624b\u673a\u53f7\u7801\u683c\u5f0f\u662f\u5426\u6709\u8bef",
+	"name": "VALIDATION_FAILED"
+};
+
+export const send = {
+	"message": "\u9a8c\u8bc1\u7801\u9519\u8bef\uff0c\u8bf7\u91cd\u65b0\u586b\u5199",
+	"name": "CAPTCHA_CODE_ERROR"
 };
\ No newline at end of file
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 52c9204..ff11c68 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -1,50 +1,93 @@
-import { RECORD_ADDRESS, ADD_CART, REDUCE_CART, INIT_BUYCART, CLEAR_CART, RECORD_SHOPDETAIL, RECORD_USERINFO, GET_USERINFO} from './mutation-types.js'
-import {setStore, getStore} from '../config/mUtils'
+import {
+	RECORD_ADDRESS,
+	ADD_CART,
+	REDUCE_CART,
+	INIT_BUYCART,
+	CLEAR_CART,
+	RECORD_SHOPDETAIL,
+	RECORD_USERINFO,
+	GET_USERINFO,
+} from './mutation-types.js'
+import {
+	setStore,
+	getStore,
+} from '../config/mUtils'
 
 export default {
 	// 记录当前经度纬度
-	[RECORD_ADDRESS] (state, {latitude, longitude}) {
+	[RECORD_ADDRESS](state, {
+		latitude,
+		longitude
+	}) {
 		state.latitude = latitude;
 		state.longitude = longitude;
 	},
-	[RECORD_SHOPDETAIL](state, detail){
+
+	[RECORD_SHOPDETAIL](state, detail) {
 		state.shopDetail = detail;
 	},
 	// 加入购物车
-	[ADD_CART] (state, {shopid, category_id, item_id, food_id, name, price, specs}) {
+	[ADD_CART](state, {
+		shopid,
+		category_id,
+		item_id,
+		food_id,
+		name,
+		price,
+		specs,
+		packing_fee,
+		sku_id,
+		stock
+	}) {
 		let cart = state.cartList;
-		if (cart[shopid]&&cart[shopid][category_id]&&cart[shopid][category_id][item_id]&&cart[shopid][category_id][item_id][food_id]) {
-			cart[shopid][category_id][item_id][food_id]['num'] ++;
-		}else if(cart[shopid]&&cart[shopid][category_id]&&cart[shopid][category_id][item_id]){
+		if (cart[shopid] && cart[shopid][category_id] && cart[shopid][category_id][item_id] && cart[shopid][category_id][item_id][food_id]) {
+			cart[shopid][category_id][item_id][food_id]['num']++;
+		} else if (cart[shopid] && cart[shopid][category_id] && cart[shopid][category_id][item_id]) {
 			cart[shopid][category_id][item_id][food_id] = {};
 			cart[shopid][category_id][item_id][food_id]['num'] = 1;
+			cart[shopid][category_id][item_id][food_id]['id'] = food_id;
 			cart[shopid][category_id][item_id][food_id]['name'] = name;
 			cart[shopid][category_id][item_id][food_id]['price'] = price;
 			cart[shopid][category_id][item_id][food_id]['specs'] = specs;
-		}else if(cart[shopid]&&cart[shopid][category_id]){
+			cart[shopid][category_id][item_id][food_id]['packing_fee'] = packing_fee;
+			cart[shopid][category_id][item_id][food_id]['sku_id'] = sku_id;
+			cart[shopid][category_id][item_id][food_id]['stock'] = stock;
+		} else if (cart[shopid] && cart[shopid][category_id]) {
 			cart[shopid][category_id][item_id] = {};
 			cart[shopid][category_id][item_id][food_id] = {};
 			cart[shopid][category_id][item_id][food_id]['num'] = 1;
+			cart[shopid][category_id][item_id][food_id]['id'] = food_id;
 			cart[shopid][category_id][item_id][food_id]['name'] = name;
 			cart[shopid][category_id][item_id][food_id]['price'] = price;
 			cart[shopid][category_id][item_id][food_id]['specs'] = specs;
-		}else if(cart[shopid]){
+			cart[shopid][category_id][item_id][food_id]['packing_fee'] = packing_fee;
+			cart[shopid][category_id][item_id][food_id]['sku_id'] = sku_id;
+			cart[shopid][category_id][item_id][food_id]['stock'] = stock;
+		} else if (cart[shopid]) {
 			cart[shopid][category_id] = {};
 			cart[shopid][category_id][item_id] = {};
 			cart[shopid][category_id][item_id][food_id] = {};
 			cart[shopid][category_id][item_id][food_id]['num'] = 1;
+			cart[shopid][category_id][item_id][food_id]['id'] = food_id;
 			cart[shopid][category_id][item_id][food_id]['name'] = name;
 			cart[shopid][category_id][item_id][food_id]['price'] = price;
 			cart[shopid][category_id][item_id][food_id]['specs'] = specs;
-		}else{
+			cart[shopid][category_id][item_id][food_id]['packing_fee'] = packing_fee;
+			cart[shopid][category_id][item_id][food_id]['sku_id'] = sku_id;
+			cart[shopid][category_id][item_id][food_id]['stock'] = stock;
+		} else {
 			cart[shopid] = {};
 			cart[shopid][category_id] = {};
 			cart[shopid][category_id][item_id] = {};
 			cart[shopid][category_id][item_id][food_id] = {};
 			cart[shopid][category_id][item_id][food_id]['num'] = 1;
+			cart[shopid][category_id][item_id][food_id]['id'] = food_id;
 			cart[shopid][category_id][item_id][food_id]['name'] = name;
 			cart[shopid][category_id][item_id][food_id]['price'] = price;
 			cart[shopid][category_id][item_id][food_id]['specs'] = specs;
+			cart[shopid][category_id][item_id][food_id]['packing_fee'] = packing_fee;
+			cart[shopid][category_id][item_id][food_id]['sku_id'] = sku_id;
+			cart[shopid][category_id][item_id][food_id]['stock'] = stock;
 		}
 		//返回一个新的对象，否则计算属性无法监听到数据的变化
 		state.cartList = Object.assign({}, cart);
@@ -52,39 +95,49 @@ export default {
 		setStore('buyCart', state.cartList);
 	},
 	// 移出购物车
-	[REDUCE_CART] (state, {shopid, category_id, item_id, food_id, name, price, specs}) {
+	[REDUCE_CART](state, {
+		shopid,
+		category_id,
+		item_id,
+		food_id,
+		name,
+		price,
+		specs
+	}) {
 		let cart = state.cartList;
-		if (cart[shopid]&&cart[shopid][category_id]&&cart[shopid][category_id][item_id]&&cart[shopid][category_id][item_id][food_id]) {
+		if (cart[shopid] && cart[shopid][category_id] && cart[shopid][category_id][item_id] && cart[shopid][category_id][item_id][food_id]) {
 			if (cart[shopid][category_id][item_id][food_id]['num'] > 0) {
-				cart[shopid][category_id][item_id][food_id]['num'] --;
+				cart[shopid][category_id][item_id][food_id]['num']--;
 				//返回一个新的对象，否则计算属性无法监听到数据的变化
 				state.cartList = Object.assign({}, cart);
 				//存入localStorage
 				setStore('buyCart', state.cartList);
-			}else{
+			} else {
 				//商品数量为0，则清空当前商品的信息
 				cart[shopid][category_id][item_id][food_id] = null;
 			}
 		}
 	},
 	//网页初始化时从本地缓存获取购物车数据
-	[INIT_BUYCART](state){
+	[INIT_BUYCART](state) {
 		let initCart = getStore('buyCart');
 		if (initCart) {
 			state.cartList = JSON.parse(initCart);
 		}
 	},
 	//清空当前商品的购物车信息
-	[CLEAR_CART](state,shopid){
+	[CLEAR_CART](state, shopid) {
 		state.cartList[shopid] = null;
 		state.cartList = Object.assign({}, state.cartList);
 		setStore('buyCart', state.cartList);
 	},
-	[RECORD_USERINFO](state, info){
+
+	[RECORD_USERINFO](state, info) {
 		state.userInfo = info;
 		setStore('useInfo', info);
 	},
-	[GET_USERINFO](state){
+
+	[GET_USERINFO](state) {
 		let info = getStore('useInfo');
 		if (info) {
 			state.userInfo = JSON.parse(info);
diff --git a/src/style/common.scss b/src/style/common.less
similarity index 100%
rename from src/style/common.scss
rename to src/style/common.less
diff --git a/src/style/mixin.scss b/src/style/mixin.less
similarity index 100%
rename from src/style/mixin.scss
rename to src/style/mixin.less
-- 
GitLab