From 637a02b07932dead77c556937018bc994178414e Mon Sep 17 00:00:00 2001
From: yr <1308291615@qq.com>
Date: Tue, 26 May 2020 19:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/cart/cart.vue                   | 21 +++++++--------
 src/pages/frameDetail/frameDetail.vue     | 44 ++++++++++++++++++++++++++++---
 src/pages/myOrderPaying/myOrderPaying.vue |  1 -
 src/store/modules/cart.js                 |  4 +--
 4 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index b2329a8..d2cf753 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -93,8 +93,8 @@ export default {
   computed: {
 
     cartList() {
-        // console.log('cart-list', this.$store.state.cart.cartList);
-        return this.$store.state.cart.cartList
+      // console.log('cart-list', this.$store.state.cart.cartList);
+      return this.$store.state.cart.cartList
     },
     childIsOpen() {
       const temp = []
@@ -107,8 +107,8 @@ export default {
     }
   },
   onLoad: function() {
-	 //  store.dispatch('cart/addCart', {
-	 //    uid: this.$store.state.user.userInfo.uid,
+	  //  store.dispatch('cart/addCart', {
+	  //    uid: this.$store.state.user.userInfo.uid,
 		// openid: this.$store.state.user.userInfo.openid,
 		// mp_id: 7,
 		// sk_id: 7,
@@ -116,11 +116,10 @@ export default {
 		// pid: 8,
 		// price: 128,
 		// checkedSKU:{},
-	 //  })
+	 	//  })
     store.dispatch('cart/getCartList', {
       uid: this.$store.state.user.userInfo.uid // 用户id
     })
-
   },
 
   methods: {
@@ -181,7 +180,7 @@ export default {
         } else {
           this.addDisabled = true
           // 修改num
-		  if(this.childIsOpen[index]){
+		  if (this.childIsOpen[index]) {
 			  this.totalPrice = this.totalPrice + this.$store.state.cart.cartList[index].nowPrice
 		  }
           store.dispatch('cart/modiCart', {
@@ -204,8 +203,8 @@ export default {
         } else {
           this.desDisabled = false
           // post 请求修改相关参数
-		  if(this.childIsOpen[index]){
-		  	this.totalPrice = this.totalPrice - this.$store.state.cart.cartList[index].nowPrice
+		  if (this.childIsOpen[index]) {
+           this.totalPrice = this.totalPrice - this.$store.state.cart.cartList[index].nowPrice
 		  }
           store.dispatch('cart/modiCart', {
             uid: this.$store.state.user.userInfo.uid,
@@ -277,7 +276,7 @@ export default {
             // this.$store.state.cart.cartList.splice(index,1)
             store.dispatch('cart/delCart', {
               uid: this.$store.state.user.userInfo.uid,
-			  openid: this.$store.state.user.userInfo.openid,
+              openid: this.$store.state.user.userInfo.openid,
               cart_id: cart_id, // 要修改的购物车id
               arg: index // 由于action 传参是能接收两参数，因此将index放入对象
             })
@@ -291,7 +290,7 @@ export default {
 </script>
 
 <style lang="scss">
-	.content {
+.content {
 		min-height: 100vh;
 		background-color: #f2f2f2;
 		display: flex;
diff --git a/src/pages/frameDetail/frameDetail.vue b/src/pages/frameDetail/frameDetail.vue
index 018bb9d..806393a 100644
--- a/src/pages/frameDetail/frameDetail.vue
+++ b/src/pages/frameDetail/frameDetail.vue
@@ -315,7 +315,7 @@
       <view class="botton_2">
         <view
           class="botton_input"
-          @tap="toCart()"
+          @tap="addCart()"
         >加入购物车</view>
         <view
           class="botton_now"
@@ -334,6 +334,13 @@ export default {
       test: '',
       goodType: 2,
       pid: 0,
+      // 购物车数据
+      addCartList: {
+        mp_id: 335,
+        sk_id: 0,
+        num: 1,
+        price: ''
+      },
       screenItems: [
         { current: 0, text: '商品介绍' },
         { current: 1, text: '规格参数' },
@@ -387,6 +394,7 @@ export default {
       this.parameter[4].slength = `${this.goodInfo.leg_long}mm`
       this.parameter[5].slength = `${this.goodInfo.weight}mm`
       this.tag = this.goodInfo.tag
+      this.addCartList.price = this.goodInfo.p_sale_price
       this.test = this.goodInfo.prodIntro1
       this.test = this.test.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ')
     })
@@ -410,6 +418,22 @@ export default {
         complete: () => { console.log('toCart') }
       })
     },
+    // 加入购物车
+    addCart () {
+      store.dispatch('cart/addCart', {
+        uid: this.$store.state.user.userInfo.uid,
+        openid: this.$store.state.user.userInfo.openid,
+        mp_id: this.addCartList.mp_id,
+        sk_id: this.addCartList.sk_id,
+        num: this.addCartList.num,
+        pid: this.pid,
+        price: this.addCartList.price,
+        checkedSKU: {}
+      })
+      store.dispatch('cart/getCartList', {
+        uid: this.$store.state.user.userInfo.uid // 用户id
+      })
+    },
     goPerchase () {
       // switch (this.updateGoodType) {
       //   case '1':
@@ -449,6 +473,18 @@ export default {
       //   break
       // }
     },
+    // 加入购物车
+    addCart () {
+      store.dispatch('cart/addCart', {
+        uid: this.$store.state.user.userInfo.uid,
+        openid: this.$store.state.user.userInfo.openid,
+        pid: this.pid,
+        checkedSKU: {}
+      })
+      store.dispatch('cart/getCartList', {
+        uid: this.$store.state.user.userInfo.uid // 用户id
+      })
+    },
     tabChange (e) {
       if (this.current !== e) {
         this.current = e
@@ -472,10 +508,10 @@ export default {
   box-sizing: border-box;
   .swiperImage {
     width: 684rpx;
-    height: 512rpx;
+    height: 480rpx;
     image {
-      width: 100%;
-      height: 100%;
+      max-width: 100%;
+      max-height: 100%;
       border-radius: 16rpx;
     }
   }
diff --git a/src/pages/myOrderPaying/myOrderPaying.vue b/src/pages/myOrderPaying/myOrderPaying.vue
index 0acb2ba..fc8c368 100644
--- a/src/pages/myOrderPaying/myOrderPaying.vue
+++ b/src/pages/myOrderPaying/myOrderPaying.vue
@@ -235,7 +235,6 @@ export default {
     timerChange: function(value) {
       var newDate = new Date()
       newDate.setTime(value * 1000)
-      console.log(newDate.toLocaleString())
       return newDate.toLocaleString()
     }
   }
diff --git a/src/store/modules/cart.js b/src/store/modules/cart.js
index 002986c..63739d5 100644
--- a/src/store/modules/cart.js
+++ b/src/store/modules/cart.js
@@ -20,7 +20,7 @@ const mutations = {
   MODI: (state, args) => {
     console.log('the num', state.cartList[args.index].num)
     console.log('mutations====>isadd', args)
-	state.cartList[args.index].num = args.num
+    state.cartList[args.index].num = args.num
     console.log('the num', state.cartList[args.index].num)
   }
 
@@ -55,7 +55,7 @@ const actions = {
       url: cartModi,
       data: param,
       success: (res) => {
-		  console.log('modiCart-res=====>',res.data)
+        console.log('modiCart-res=====>', res.data)
         console.log('modi-parm', param)
         commit('MODI', arg)
       },
-- 
2.0.0