Merge branch 'master' of http://121.40.31.31:8888/jp/gulu-vue

喻鹏
2 parents 9c990fb492 0466216f3c
Showing 2 changed files Show diff stats
src/pages/cart/cart.vue
src/pages/frameDetail/frameDetail.vue
@@ -551,4 +551,4 @@ export default {
 		}
 	}
  
-</style>
+</style>
 \ No newline at end of file
@@ -336,7 +336,6 @@ export default {
       // 购物车数据
       addCartList: {
         mp_id: 0,
-        uid: 0,
         sk_id: 0,
         num: 1,
         price: '',
@@ -399,10 +398,9 @@ export default {
       this.test = this.goodInfo.prodIntro1
       this.test = this.test.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ')
       // addCart
-      this.addCartList.price = this.goodInfo.p_sale_price
+      this.addCartList.price = this.goodInfo.priceArea.Min_Price
       this.addCartList.sk_id = this.goodInfo.skuList[0].sk_id
       this.addCartList.mp_id = this.goodInfo.glassData.mp_id
-      this.addCartList.uid = this.$store.state.user.userInfo.uid
     })
     // console.log(this.$store.state.user.userInfo.uid + 'ssss')
   },
@@ -435,10 +433,10 @@ export default {
         num: this.addCartList.num,
         pid: this.pid,
         price: this.addCartList.price,
-        checkedSKU: {},
       })
+      // 再次请求购物车接口，实现实时更新
       store.dispatch('cart/getCartList', {
-        uid: this.$store.state.user.userInfo.uid, // 用户id
+        uid: this.$store.state.user.userInfo.uid,
       })
     },
     goPerchase () {
...	...	@@ -336,7 +336,6 @@ export default {
336	336	// 购物车数据
337	337	addCartList: {
338	338	mp_id: 0,
339		- uid: 0,
340	339	sk_id: 0,
341	340	num: 1,
342	341	price: '',
...	...	@@ -399,10 +398,9 @@ export default {
399	398	this.test = this.goodInfo.prodIntro1
400	399	this.test = this.test.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ')
401	400	// addCart
402		- this.addCartList.price = this.goodInfo.p_sale_price
	401	+ this.addCartList.price = this.goodInfo.priceArea.Min_Price
403	402	this.addCartList.sk_id = this.goodInfo.skuList[0].sk_id
404	403	this.addCartList.mp_id = this.goodInfo.glassData.mp_id
405		- this.addCartList.uid = this.$store.state.user.userInfo.uid
406	404	})
407	405	// console.log(this.$store.state.user.userInfo.uid + 'ssss')
408	406	},
...	...	@@ -435,10 +433,10 @@ export default {
435	433	num: this.addCartList.num,
436	434	pid: this.pid,
437	435	price: this.addCartList.price,
438		- checkedSKU: {},
439	436	})
	437	+ // 再次请求购物车接口，实现实时更新
440	438	store.dispatch('cart/getCartList', {
441		- uid: this.$store.state.user.userInfo.uid, // 用户id
	439	+ uid: this.$store.state.user.userInfo.uid,
442	440	})
443	441	},
444	442	goPerchase () {
...	...