From b83c44fe1f06fd34fc21a5bf3621c35ac422a876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=BB=E9=B9=8F?= <1242402566@qq.com>
Date: Tue, 26 May 2020 22:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=8E=A8=E8=8D=90=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommodityCard/CommodityCard.vue |   2 +-
 src/pages/cart/cart.vue                        | 139 ++++++++++++++-----------
 src/pages/user/user.vue                        |   1 +
 src/store/modules/cart.js                      |   6 --
 4 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/src/components/CommodityCard/CommodityCard.vue b/src/components/CommodityCard/CommodityCard.vue
index 9ad013e..38494b9 100644
--- a/src/components/CommodityCard/CommodityCard.vue
+++ b/src/components/CommodityCard/CommodityCard.vue
@@ -1,7 +1,7 @@
 <template>
   <view
     class="card"
-    @tap="toGoods(goods.id?goods.id:goods.sk_id)"
+    @tap="toGoods(goods.id?goods.id:goods.pid)"
   >
     <image
       mode="widthFix"
diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index d2cf753..1414d54 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -28,7 +28,7 @@
 							<image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
 						</view> -->
 						<view class="infoRight">
-							<view class="goodName" @tap="toGoods(item.pid,item.p_root_index)">{{item.p_name}}</view>
+							<view class="goodName" @tap="toGoods(item.pid)">{{item.p_name}}</view>
 							<!-- <view class="describ"> -->
 								<uni-collapse accordion="true" >
 									<uni-collapse-item showAnimation='true'
@@ -52,10 +52,10 @@
 								<text class="maxCount">(限购{{maxCount}}副)</text>
 								<view class="counter">
 									<view class="btn" disabled="this.addDisabled" type="default"
-									@tap="counter(index,false,item.mp_id,item.sk_id,item.num,item.cart_id)">-</view>
+									@tap="counter(index,false,item)">-</view>
 									<text>{{item.num}}</text>
 									<view class="btn" disabled="this.desDisabled" type="default"
-									@tap="counter(index,true,item.mp_id,item.sk_id,item.num,item.cart_id)">+</view>
+									@tap="counter(index,true,item)">+</view>
 								</view>
 							</view>
 						</view>
@@ -93,7 +93,7 @@ export default {
   computed: {
 
     cartList() {
-      // console.log('cart-list', this.$store.state.cart.cartList);
+      console.log('cart-list', this.$store.state.cart.cartList);
       return this.$store.state.cart.cartList
     },
     childIsOpen() {
@@ -124,58 +124,67 @@ export default {
 
   methods: {
 
-    toGoods(id, type) {
-      uni.navigateTo({
-        url: '../frameDetail/frameDetail?oderId=' + id,
-        success: res => {},
-        fail: () => {},
-        complete: () => {}
-      })
-      console.log('toGoods =====> id:' + id + '======>type:' + type)
-      switch (type) {
-        case 1:
-          uni.navigateTo({
-            url: '../frameDetail/frameDetail?oderId=' + id + '&goodType=' + type,
-            success: res => {},
-            fail: () => {},
-            complete: () => {}
-          })
-          break
-        case 2:
-          uni.navigateTo({
-            url: '../frameDetail/frameDetail?oderId=' + id + '&goodType=' + type,
-            success: res => {},
-            fail: () => {},
-            complete: () => {}
-          })
-          break
-        case 3:
-          uni.navigateTo({
-            url: '../frameDetail/frameDetail?oderId=' + id + '&goodType=' + type,
-            success: res => {},
-            fail: () => {},
-            complete: () => {}
-          })
-          break
-        case 4:
-          uni.navigateTo({
-            url: '../frameDetail/frameDetail?oderId=' + id + '&goodType=' + type,
-            success: res => {},
-            fail: () => {},
-            complete: () => {}
-          })
-          break
-        default :
-          break
-      }
+    toGoods(id) {
+	  console.log('---', '../frameDetail/frameDetail?pid=' + id)
+	  uni.navigateTo({
+	    url: '../frameDetail/frameDetail?pid=' + id,
+	    success: res => {},
+	    fail: () => {},
+	    complete: () => {}
+	  })
+      // uni.navigateTo({
+      //   url: '../frameDetail/frameDetail?oderId=' + id,
+      //   success: res => {},
+      //   fail: () => {},
+      //   complete: () => {}
+      // })
+      // console.log('toGoods =====> id:' + id + '======>type:' + type)
+      // switch (type) {
+      //   case 1:
+      //     uni.navigateTo({
+      //       url: '../frameDetail/frameDetail?oderId=' + id + '&goodType=' + type,
+      //       success: res => {},
+      //       fail: () => {},
+      //       complete: () => {}
+      //     })
+      //     break
+      //   case 2:
+      //     uni.navigateTo({
+      //       url: '../frameDetail/frameDetail?oderId=' + id + '&goodType=' + type,
+      //       success: res => {},
+      //       fail: () => {},
+      //       complete: () => {}
+      //     })
+      //     break
+      //   case 3:
+      //     uni.navigateTo({
+      //       url: '../frameDetail/frameDetail?oderId=' + id + '&goodType=' + type,
+      //       success: res => {},
+      //       fail: () => {},
+      //       complete: () => {}
+      //     })
+      //     break
+      //   case 4:
+      //     uni.navigateTo({
+      //       url: '../frameDetail/frameDetail?oderId=' + id + '&goodType=' + type,
+      //       success: res => {},
+      //       fail: () => {},
+      //       complete: () => {}
+      //     })
+      //     break
+      //   default :
+      //     break
+      // }
     },
 
-    counter(index, isadd, mp_id, sk_id, num, cart_id) {
+    counter(index, isadd, item) {
       // console.log('===>>counter ===>num',num)
       // console.log('===>>counter ===>isadd',isadd)
-      num = parseInt(num)
+	  console.log('item=====>',item)
+	  console.log('num=====>',item.num)
+      let nums = parseInt(item.num)
       if (isadd) {
-        if (num >= this.maxCount) {
+        if (nums >= this.maxCount) {
           this.addDisabled = true
         } else {
           this.addDisabled = true
@@ -186,10 +195,12 @@ export default {
           store.dispatch('cart/modiCart', {
             uid: this.$store.state.user.userInfo.uid,
             openid: this.$store.state.user.userInfo.openid,
-            mp_id: mp_id,
-            sk_id: sk_id,
-            cart_id: cart_id,
-            num: num + 1,
+            mp_id: item.mp_id,
+            sk_id: item.sk_id,
+			price: item.nowPrice,
+			pid: item.pid,
+            num: nums + 1,
+			cart_id: item.cart_id,
             args: {
               index: index,
               isadd: isadd
@@ -198,7 +209,7 @@ export default {
           this.addDisabled = false
         }
       } else {
-        if (num <= 1) {
+        if (nums <= 1) {
           this.desDisabled = true
         } else {
           this.desDisabled = false
@@ -209,10 +220,12 @@ export default {
           store.dispatch('cart/modiCart', {
             uid: this.$store.state.user.userInfo.uid,
             openid: this.$store.state.user.userInfo.openid,
-            mp_id: mp_id,
-            sk_id: sk_id,
-            cart_id: cart_id,
-            num: num - 1,
+            mp_id: item.mp_id,
+            sk_id: item.sk_id,
+			price: item.nowPrice,
+			pid: item.pid,
+            num: nums - 1,
+			cart_id: item.cart_id,
             args: {
               index: index,
               isadd: isadd
@@ -268,6 +281,8 @@ export default {
       // console.log('delcart------>cart_id',cart_id)
       // console.log('cartlist====>delcart',this.$store.state.cart.cartList)
       // console.log('delcart======>index',index)
+	  const uid=this.$store.state.user.userInfo.uid
+	  const openid=this.$store.state.user.userInfo.openid
       uni.showModal({
         title: '是否删除该商品',
         // content: '是否删除该商品',
@@ -275,8 +290,8 @@ export default {
           if (res.confirm) {
             // 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,
+              uid: uid,
+              openid: openid,
               cart_id: cart_id, // 要修改的购物车id
               arg: index // 由于action 传参是能接收两参数，因此将index放入对象
             })
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 4a2cacd..50e71be 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -268,6 +268,7 @@ export default {
       return this.$store.state.user.userInfo.headerphoto
     },
     userRecommandList() {
+	  console.log('userRecommandList=====>',this.$store.state.userRecommand.recommandList)
       return this.$store.state.userRecommand.recommandList
     }
   },
diff --git a/src/store/modules/cart.js b/src/store/modules/cart.js
index 63739d5..86f6227 100644
--- a/src/store/modules/cart.js
+++ b/src/store/modules/cart.js
@@ -33,10 +33,6 @@ const actions = {
       data: param,
       success: (res) => {
         console.log('cart===>接口数据', res.data.data)
-        //  const resData = {
-        // ...res,
-        // data,
-        //  }
         commit('INIT', res.data.data)
       },
       fail: (res) => {
@@ -77,8 +73,6 @@ const actions = {
       success: (res) => {
         console.log('del-parm', param)
         console.log('del-myparms==>', arg)
-        // console.log('deacart====>cartList',this.$store.state.cart.cartList)
-
         commit('DEL', arg)
       },
       fail: (res) => {
-- 
2.0.0