Commit 42375342ffbc9bf4657145d8205f17080b7529de
1 parent
55420a8a96
Exists in
master
解决冲突
Showing
1 changed file
with
1 additions
and
8 deletions
Show diff stats
src/pages/cart/cart.vue
| ... | ... | @@ -154,7 +154,6 @@ export default { |
| 154 | 154 | uid: this.$store.state.user.userInfo.uid, // 用户id |
| 155 | 155 | }) |
| 156 | 156 | }, |
| 157 | - | |
| 158 | 157 | methods: { |
| 159 | 158 | toGoods(id, sk_id) { |
| 160 | 159 | console.log('cart-list', this.$store.state.cart.cartList) |
| ... | ... | @@ -166,7 +165,6 @@ export default { |
| 166 | 165 | complete: () => {}, |
| 167 | 166 | }) |
| 168 | 167 | }, |
| 169 | - | |
| 170 | 168 | counter(index, isadd, item) { |
| 171 | 169 | // console.log('===>>counter ===>num',num) |
| 172 | 170 | // console.log('===>>counter ===>isadd',isadd) |
| ... | ... | @@ -240,7 +238,7 @@ export default { |
| 240 | 238 | for (let i = 0; i < this.childIsOpen.length; i++) { |
| 241 | 239 | m = m & this.childIsOpen[i] |
| 242 | 240 | } |
| 243 | - if (m == 1) { | |
| 241 | + if (m === 1) { | |
| 244 | 242 | this.pIsoPen = true |
| 245 | 243 | } else { |
| 246 | 244 | this.pIsoPen = false |
| ... | ... | @@ -495,8 +493,6 @@ export default { |
| 495 | 493 | } |
| 496 | 494 | } |
| 497 | 495 | } |
| 498 | - | |
| 499 | -<<<<<<< HEAD | |
| 500 | 496 | .footer { |
| 501 | 497 | position: fixed; |
| 502 | 498 | left: 0; |
| ... | ... | @@ -539,6 +535,3 @@ export default { |
| 539 | 535 | } |
| 540 | 536 | } |
| 541 | 537 | </style> |
| 542 | -======= | |
| 543 | -</style> | |
| 544 | ->>>>>>> cb58acb8c1540674edb1dd7cba23e4f04df66c19 | ... | ... |