From 0bda9efecb78d2453ed3aed490be6f1eda6a2665 Mon Sep 17 00:00:00 2001
From: BigBoss <2280520255@qq.com>
Date: Wed, 3 Jun 2020 11:57:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/cart/cart.vue                          | 96 +++++++-----------------
 src/pages/frameDetail/components/BottomSheet.vue | 31 +++++++-
 src/pages/frameDetail/frameDetail.vue            | 68 +++++++++--------
 src/store/modules/cart.js                        | 26 +++----
 4 files changed, 105 insertions(+), 116 deletions(-)

diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index e501169..47cb76a 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -46,28 +46,14 @@
                 class="goodName"
                 @tap="toGoods(item.pid,item.sk_id)"
               >{{item.p_name}}</view>
-              <!-- <view class="describ"> -->
-              <uni-collapse accordion="true" style="justify-content: space-around;width: 196px;">
-                <uni-collapse-item
-                  showAnimation='true'
-                  :title="item.tag.prod_tag_fun[0].label&&item.tag.prod_tag_fun[1].label?item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'...':'暂无数据'">
-                  <text class="describ">
-                    <block
-                      v-for="tag in item.tag.prod_tag_fun"
-                      :key="tag.value"
-                    >
-                      {{tag.label+`&nbsp;&nbsp;`}}
-                    </block>
-                  </text>
-                  <!--                    <text>
-                      <block v-for="tag in item.tag.prod_tag_style" :key="tag.value">
-                        {{tag.label+`&nbsp;&nbsp;`}}
-                      </block>
-                    </text> -->
-                </uni-collapse-item>
-              </uni-collapse>
-              <!-- <view v-bind:class="collapseList[index]? 'icon':'iconed'"></view> -->
-              <!-- </view> -->
+              <view class="describ">
+                    <view class="people">
+                    	使用人:{{item.peopleName}}
+                    </view>
+					<view class="skuInfo">
+						{{item.sku_name}}
+					</view>
+              </view>
               <view class="priceBox">
                 <view class="price">￥{{item.nowPrice*item.num}}</view>
                 <text class="maxCount">(限购{{maxCount}}副)</text>
@@ -95,12 +81,7 @@
     <view class="footer">
       <view class="footerLeft">实付金额:<text>￥{{totalPrice}}</text></view>
       <view class="footerRight">
-        <navigator
-          url="/pages/confirmOrder/confirmOrder"
-          hover-class="navigator-hover"
-        >
-          <view class="paybtn">立即结算</view>
-        </navigator>
+          <view class="paybtn" @click="toComfirmOrder">立即结算</view>
       </view>
     </view>
 
@@ -108,12 +89,10 @@
 </template>
 
 <script>
-import UniCollapse from '@/components/UniCollapse/UniCollapse.vue'
-import UniCollapseItem from '@/components/UniCollapseItem/UniCollapseItem.vue'
+
 import store from '@/store'
 
 export default {
-  components: { UniCollapse, UniCollapseItem },
   data() {
     return {
       totalPrice: 0,
@@ -123,10 +102,12 @@ export default {
     }
   },
   computed: {
-
+	// skInfo(){
+	// 	return filters()
+	// }
     cartList() {
       // console.log('cart-list', this.$store.state.cart.cartList);
-	  this.totalPrice=0
+	  // this.totalPrice=0
       return this.$store.state.cart.cartList
     },
     childIsOpen() {
@@ -165,6 +146,14 @@ export default {
         complete: () => {},
       })
     },
+	toComfirmOrder(){
+		uni.navigateTo({
+			url:`../confirmOrder/confirmOrder`,
+			fail(res) {
+				console.log(res)
+			}
+		})
+	},
     counter(index, isadd, item) {
       // console.log('===>>counter ===>num',num)
       // console.log('===>>counter ===>isadd',isadd)
@@ -410,49 +399,16 @@ export default {
           }
           .describ {
             width: 100%;
-            // min-height: 80rpx;
+            min-height: 80rpx;
             // box-sizing: border-box;
             // padding: 10rpx;
             font-size: 20rpx;
             letter-spacing: -0.23px;
             text-align: justify;
             color: #999999;
-            // background: #F9F9F9;
-            // display: flex;
-            // justify-content: center;
-            // align-items: center;
-            // text{
-            //   text-overflow: -o-ellipsis-lastline;
-            //    overflow: hidden;
-            //    text-overflow: ellipsis;
-            //    display: -webkit-box;
-            //    -webkit-line-clamp: 2;
-            //    line-clamp: 2;
-            //    -webkit-box-orient: vertical;
-            // }
-            // .icon {
-            // width: 0;
-            // height: 0;
-            // border-left: 5px transparent;
-            // border-right: 5px transparent;
-            // border-top: 5px #979797;
-            // border-bottom: 0 transparent;
-            // border-style: solid;
-            // position: relative;
-            // margin-left: 10px;
-            // // transform: scaleY(-1);
-            // }
-            // .icon::after{
-            //     content: '';
-            //     position: absolute;
-            //     top: -6.5px;
-            //     left: -5px;
-            //  border-left: 5px transparent;
-            //  border-right: 5px transparent;
-            //  border-top: 5px #FFFFFF;
-            //  border-bottom: 0 transparent;
-            //  border-style: solid;
-            // }
+			view{
+				margin: 10rpx 0 10rpx 0 ;
+			}
           }
           .priceBox {
             display: flex;
diff --git a/src/pages/frameDetail/components/BottomSheet.vue b/src/pages/frameDetail/components/BottomSheet.vue
index eddcaab..e138d5f 100644
--- a/src/pages/frameDetail/components/BottomSheet.vue
+++ b/src/pages/frameDetail/components/BottomSheet.vue
@@ -241,7 +241,15 @@
 				  </view>
 				  <view
 				    class="button"
+				    @click.native="addCart"
+					v-if="isCart"
+				  >
+				    加入购物车
+				  </view>
+				  <view
+				    class="button"
 				    @click="toComfirmOrder"
+					v-else
 				  >
 				    立即结算
 				  </view>
@@ -262,7 +270,8 @@ import store from '@/store'
 		props: {
 			isShowBottom : Boolean,
 			pid: Number,
-			goodInfo:Object
+			goodInfo:Object,
+			isCart:Boolean
 		},
 		data() {
 		  return {
@@ -379,6 +388,26 @@ import store from '@/store'
 		},
 		name : "bottomSheet",
 		methods: {
+			addCart(){
+				const that = this
+				const checkedSKUName = [that.goodInfo.attrList[0].meta_name,that.goodInfo.attrList[1].meta_name]
+				const checkedSKU = []
+				let j;
+				for (let i = 0;i<that.current.length;i++) {
+					checkedSKU.push(that.goodInfo.attrList[i].attr[that.current[i]])
+					// console.log('i', i, j, i !== this.current.length - 1)
+					  if (i !== this.current.length - 1) {
+					    // 后续需修改算法：目前暂定只有两个参数选择，后续若有多个参数需要修改实现自适应
+					    j = this.current[i] * this.attrList[1].attr.length
+					  } else {
+					    j += this.current[i]
+					  }
+				}
+				let sk_id = this.skuList[j].sk_id
+				console.log('选择的商品sk_id',sk_id,'选择的商品参数',checkedSKU)
+				this.$emit("addCart",this.mp_id,this.count,checkedSKU,sk_id)//添加购物车
+				this.$emit("closeBottom")//关闭弹窗
+			},
 			onClickLoveItem(index,name){
 				const loveList = this.loveList
 				for (let index = 0; index < loveList.length; index++) {
diff --git a/src/pages/frameDetail/frameDetail.vue b/src/pages/frameDetail/frameDetail.vue
index 6fdb076..45d2f6c 100644
--- a/src/pages/frameDetail/frameDetail.vue
+++ b/src/pages/frameDetail/frameDetail.vue
@@ -317,16 +317,17 @@
       <view class="botton_2">
         <view
           class="botton_input"
-          @tap="addCart()"
+          @tap="showBottom(true)"
         >加入购物车</view>
         <view
           class="botton_now"
          
-		  @click="showBottom()"
+		  @click="showBottom(false)"
         >立即购买</view>
       </view>
     </view>
-	<BottomSheet v-if="isShowBottom" :pid="pid" :goodInfo="goodInfo" :isShowBottom="isShowBottom"  @closeBottom="closeBottom"></BottomSheet>
+	<BottomSheet v-if="isShowBottom" :isCart="isCart" @addCart="addCart" 
+	 :pid="pid" :goodInfo="goodInfo" :isShowBottom="isShowBottom"  @closeBottom="closeBottom"></BottomSheet>
   </view>
 </template>
 
@@ -339,17 +340,10 @@ export default {
 	},
   data () {
     return {	
+	  isCart:Boolean,	
 	  isShowBottom : false,	//底部弹窗开关
       test: '',
       goodType: 2,
-      pid: 0,
-      // 购物车数据
-      addCartList: {
-        mp_id: 0,
-        sk_id: 0,
-        num: 1,
-        price: '',
-      },
       screenItems: [
         { current: 0, text: '商品介绍' },
         { current: 1, text: '规格参数' },
@@ -388,7 +382,20 @@ export default {
           label: '眼镜盒',
           value: '262',
         }],
-      },
+      },
+	  
+	  pid: 0,
+	  // 购物车数据
+	  addCartList: {
+	    uid: Number,//用户的唯一识别码	
+	    openid: String,
+	    mp_id: Number,//使用人
+	    sk_id: Number,//产品的sku_id
+	    num: Number,//购买数量
+	    pid: Number,//产品id
+	    price: Number,//价格
+	  	checkedSKU:Object//产品信息
+	  },
     }
   },
   onLoad: function ({ pid, sk_id: skId }) {
@@ -407,10 +414,11 @@ export default {
       this.tag = this.goodInfo.tag
       this.test = this.goodInfo.prodIntro1
       this.test = this.test.replace(/\<img/gi, '<img style="max-width:100%;height:auto"')
-      // addCart
+      // addCart
+	  this.addCartList.uid = this.$store.state.user.userInfo.uid
+	  this.addCartList.openid = this.$store.state.user.userInfo.openid
+	  this.addCartList.pid = this.goodInfo.pid
       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
     })
     store.dispatch('cart/getCartList')
     // console.log(this.$store.state.user.userInfo.uid + 'ssss')
@@ -429,7 +437,8 @@ export default {
   },
   methods: {
 	  //底部弹窗开关
-	  showBottom(){
+	  showBottom(isCart){
+		  this.isCart = isCart;
 	  	this.isShowBottom = true;
 	  },
 	  closeBottom(){
@@ -445,20 +454,19 @@ export default {
       })
     },
     // 加入购物车
-    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,
-      })
-      // 再次请求购物车接口，实现实时更新
-      store.dispatch('cart/getCartList', {
-        uid: this.$store.state.user.userInfo.uid,
-      })
+    addCart (mp_id,num,checkedSKU,sk_id) {
+		this.addCartList.mp_id = mp_id
+		this.addCartList.sk_id = sk_id
+		this.addCartList.num = num
+		this.addCartList.checkedSKU = checkedSKU
+		console.log('添加购物车的参数',this.addCartList)
+      store.dispatch('cart/addCart', this.addCartList).then((res)=>{
+		  console.log('*-*-*-*--*-',res)
+		  // 再次请求购物车接口，实现实时更新
+		  store.dispatch('cart/getCartList', {
+		    uid: this.$store.state.user.userInfo.uid,
+		  })
+	  })
     },
     goPerchase () {
       // switch (this.updateGoodType) {
diff --git a/src/store/modules/cart.js b/src/store/modules/cart.js
index 50b6412..49c8b9e 100644
--- a/src/store/modules/cart.js
+++ b/src/store/modules/cart.js
@@ -28,21 +28,16 @@ const mutations = {
 
 const actions = {
   // 获取购物车列表
-  getCartList({ commit }, param) {
-    request({
+    getCartList({ commit }, param) {
+    return new Promise((resolve) =>  request({
       url: cartList,
       data: param,
       success: (res) => {
         console.log('cart===>接口数据', res.data.data)
-        commit('INIT', res.data.data)
+        commit('INIT', res.data.data)
+		resolve(res.data.data)
       },
-      // fail: (res) => {
-      //   console.log('fail status === > ', res)
-      // },
-      // complete: (res) => {
-      //   console.log('complete status === > ', res)
-      // },
-    })
+    }))
   },
   // 修改购物车数量
   modiCart({ commit }, param) {
@@ -87,21 +82,22 @@ const actions = {
   // 添加到购物车
   addCart({ commit }, param) {
     console.log('请求接口开始')
-    request({
+    return new Promise((resolve) =>  request({
       url: cartAdd,
       data: param,
       success: (res) => {
         console.log('add-parm', param)
         console.log('addcart===>res.data===>', res.data)
-        // commit('INIT', res.data.data)
+        // commit('INIT', res.data.data)
+		resolve(res.data)
       },
       fail: (res) => {
-        console.log('fail status === > ', res)
+        console.log('添加购物车失败 === > ', res)
       },
       complete: (res) => {
-        console.log('complete status === > ', res)
+        console.log('添加购物车完成 === > ', res)
       },
-    })
+    }))
   },
 }
 
-- 
2.0.0