Skip to content

Commit 734f742

Browse files
bailicangdubailicangdu
committed
upate scss
1 parent b7e4051 commit 734f742

29 files changed

+1856
-86
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ vue2 + vue-rotuer2 + vuex + webpack + ES6/7 + fetch + sass + flex + svg + http-p
2929
- [x] 修改密码 -- 完成
3030
- [x] 个人中心 -- 完成
3131
- [ ] 帐户信息
32+
- [ ] 上传头像，修改用户名
33+
- [ ] 积分商城
3234
- [ ] 服务中心
3335
- [ ] 添加、删除、修改收货地址
3436
- [ ] 订单列表

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@
6060
"node": ">= 4.0.0",
6161
"npm": ">= 3.0.0"
6262
}
63-
}
63+
}

‎src/App.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<script>
1010
1111
export default {
12-
12+
1313
}
1414
1515
</script>
1616

1717
<style lang="scss">
18-
@import './style/common.scss';
18+
@import './style/common';
1919
.router-fade-enter-active, .router-fade-leave-active {
2020
transition: opacity .4s;
2121
}

‎src/components/common/alertTip.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</script>
3333

3434
<style lang="scss" scoped>
35-
@import '../../style/mixin.scss';
35+
@import '../../style/mixin';
3636
@keyframes tipMove{
3737
0% { transform: scale(1) }
3838
35% { transform: scale(.8) }
@@ -55,7 +55,7 @@
5555
margin-left: -6rem;
5656
width: 12rem;
5757
animation: tipMove .4s ;
58-
background-color: #fff;
58+
background-color: rgba(255,255,255,1);
5959
border: 1px;
6060
padding-top: .6rem;
6161
display: flex;

‎src/components/common/buyCart.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<section class="cart_module">
33
<section v-if="!foods.specifications.length" class="cart_button">
44
<transition name="showReduce">
5-
<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">
5+
<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">
66
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#cart-minus"></use>
77
</svg>
88
</transition>
99
<transition name="fade">
1010
<span class="cart_num" v-if="foodNum">{{foodNum}}</span>
1111
</transition>
12-
<svg @click="addToCart(foods.category_id, foods.item_id, foods.specfoods[0].food_id, foods.specfoods[0].name, foods.specfoods[0].price, '', $event)">
12+
<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)">
1313
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#cart-add"></use>
1414
</svg>
1515
<transition
@@ -66,7 +66,7 @@
6666
<span>¥ </span>
6767
<span>{{foods.specfoods[specsIndex].price}}</span>
6868
</div>
69-
<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>
69+
<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>
7070
</footer>
7171
</div>
7272
</transition>
@@ -123,14 +123,14 @@
123123
'ADD_CART','REDUCE_CART',
124124
]),
125125
//移出购物车
126-
removeOutCart(category_id, item_id, food_id, name, price, specs){
126+
removeOutCart(category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock){
127127
if (this.foodNum > 0) {
128-
this.REDUCE_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs});
128+
this.REDUCE_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock});
129129
}
130130
},
131131
//加入购物车，计算按钮位置。
132-
addToCart(category_id, item_id, food_id, name, price, specs, event){
133-
this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs});
132+
addToCart(category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock, event){
133+
this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock});
134134
this.elLeft = event.target.getBoundingClientRect().left;
135135
this.elBottom = event.target.getBoundingClientRect().bottom;
136136
this.showMoveDot.push(true);
@@ -146,8 +146,8 @@
146146
this.specsIndex = index;
147147
},
148148
//多规格商品加入购物车
149-
addSpecs(category_id, item_id, food_id, name, price, specs){
150-
this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs});
149+
addSpecs(category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock){
150+
this.ADD_CART({shopid: this.shopId, category_id, item_id, food_id, name, price, specs, packing_fee, sku_id, stock});
151151
this.showChooseList();
152152
},
153153
//点击多规格商品的减按钮，弹出提示
@@ -180,7 +180,7 @@
180180
</script>
181181

182182
<style lang="scss" scoped>
183-
@import '../../style/mixin.scss';
183+
@import '../../style/mixin';
184184
.cart_module{
185185
.cart_button{
186186
display: flex;

‎src/components/common/loading.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</script>
2929

3030
<style lang="scss" scoped>
31-
@import '../../style/mixin.scss';
31+
@import '../../style/mixin';
3232
@keyframes load{
3333
0% {transform: translateY(0px);}
3434
50% {transform: translateY(-50px);}

‎src/components/common/ratingStar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</script>
3131

3232
<style lang="scss" scoped>
33-
@import '../../style/mixin.scss';
33+
@import '../../style/mixin';
3434
.rating_container{
3535
position: relative;
3636
@include wh(2rem, .4rem);

‎src/components/common/shoplist.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ export default {
148148
</script>
149149

150150
<style lang="scss" scoped>
151-
@import '../../style/mixin.scss';
151+
@import '../../style/mixin';
152152
.shoplist_container{
153153
background-color: #fff;
154154
}

‎src/components/header/head.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</script>
5656

5757
<style lang="scss" scoped>
58-
@import '../../style/mixin.scss';
58+
@import '../../style/mixin';
5959
6060
#head_top{
6161
background-color: $blue;

‎src/images/address_bottom.png

290 Bytes
Loading

0 commit comments

Comments
 (0)