From cc196c33cca49d2c88ced1f67f17c6a0179cf45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=BB=E9=B9=8F?= <1242402566@qq.com>
Date: Thu, 21 May 2020 21:21:52 +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=E6=8E=A5=E5=8F=A3=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommodityCard/CommodityCard.vue |  10 +-
 src/pages/cart/cart.vue                        | 402 +++++++++++++++++++------
 src/pages/user/user.vue                        |  37 ++-
 src/store/modules/cart.js                      | 195 ++++++++++--
 src/store/modules/userRecommand.js             |  48 ++-
 src/store/url.js                               |   3 +
 6 files changed, 562 insertions(+), 133 deletions(-)

diff --git a/src/components/CommodityCard/CommodityCard.vue b/src/components/CommodityCard/CommodityCard.vue
index 41fcfc0..e90b6c2 100644
--- a/src/components/CommodityCard/CommodityCard.vue
+++ b/src/components/CommodityCard/CommodityCard.vue
@@ -1,12 +1,12 @@
 <template>
-	<view class="card" @tap="toGoods(goods.id,goods.goodType)">
-		<image mode="widthFix" :src="goods.imgurl" ></image>
-		<view class="name">{{goods.name}}</view>
+	<view class="card" @tap="toGoods(goods.id?goods.id:goods.pid,goods.goodType?goods.goodType:goods.p_root_index)">
+		<image mode="widthFix" :src="goods.imgurl?goods.imgurl:goods.pic" ></image>
+		<view class="name">{{goods.name?goods.name:goods.p_name}}</view>
 		<view class="info">
 			<view class="priceBox">
-				<view class="price">{{goods.price}}</view>
+				<view class="price">{{goods.price?goods.price:goods.real_price}}</view>
 				<view class="originCost">
-					{{goods.rsSon.Max_Price}}
+					{{goods.rsSon.Max_Price?goods.rsSon.Max_Price:goods.old_price}}
 				</view>
 			</view>
 			<view class="trade_num">{{goods.trade_num}}人购买</view>
diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index e0a6bc2..6e41b46 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -1,88 +1,60 @@
 <template>
 	<view class="content">
-		
-		<view class="card">
-			<view class="cardHeader">
-				<block v-if="pIsoPen">
-					<view class="partentChecked" @click="pChange(pIsoPen)">
-						<span class="status correct"></span>
-					</view>
-				</block>
-				<block v-else>
-					<view class="partentCheck" @click="pChange(pIsoPen)"></view>
-				</block>
-				<image src="../../static/store.png" mode="aspectFill"></image>
-				<text>非常戴镜</text>
-			</view>
+		<block v-if="cartList.length==0">
 			
-			<view class="cardBody">
-				<template v-if="childIsOpen.child1">
-					<view class="partentChecked" @click="cChange(childIsOpen.child1,'child1')">
-						<span class="status correct"></span>
+		</block>
+		<block v-else>
+			<view class="card">
+				<view class="cardHeader">
+					<view v-bind:class="pIsoPen? 'partentChecked' : 'partentCheck'"
+					@click="pChange(pIsoPen)">
+						<span class="correct"></span>
 					</view>
-				</template>
-				<template v-else>
-					<view class="partentCheck" @click="cChange(childIsOpen.child1,'child1')"></view>
-				</template>
-				<view class="goodInfo">
-					<view class="imageWrap">
-						<image src="../../static/img/detail/d1.png" mode="aspectFill" style="width: 188rpx;height: 168rpx;"></image>
+					<image src="../../static/store.png" mode="aspectFill"></image>
+					<text>非常戴镜</text>
+				</view>
+			
+				<view class="cardBody" v-for="(item,index) in cartList" :key="item.cart_id" 
+				@longpress="delCart(item.cart_id,index)">
+					<view v-bind:class="childIsOpen[index]? 'partentChecked':'partentCheck'" 
+					@click="Change(childIsOpen[index],index)">
+						<span class="correct"></span>
 					</view>
-					<view class="infoRight">
-						<text class="goodName">眼镜名称眼镜名称眼镜名称眼镜名称</text>
-						<view class="describ"><text>颜色 玫瑰金 /材质 钛合金 / 功能 防日光 / 配件 免费送 /折射 … </text>
-						<view class="icon"></view>
+					<view class="goodInfo">
+						<view class="imageWrap">
+							<image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
 						</view>
-						<view class="priceBox">
-							<view class="price">￥{{198}}</view>
-							<text>(限购{{maxCount}}副)</text>
-							<view class="counter">
-								<view class="btn" disabled="this.addDisabled" type="default" @click="counter(false)">-</view>
-								<text>{{count}}</text>
-								<view class="btn" disabled="this.desDisabled" type="default" @click="counter(true)">+</view>
+						<view class="infoRight">
+							<view class="goodName" @tap="toGoods(item.pid,item.p_root_index)">{{item.p_name}}</view>
+							<view class="describ" @tap="toshop(item.pid,item.p_root_index)">
+								<text>
+									<block v-for="tag in item.tag.prod_tag_fun" :key="tag.value">
+										{{tag.label+`&nbsp;&nbsp;`}}
+									</block>
+								</text>
+							<view class="icon"></view>
+							</view>
+							<view class="priceBox">
+								<view class="price">￥{{item.nowPrice*item.num}}</view>
+								<text>(限购{{maxCount}}副)</text>
+								<view class="counter">
+									<view class="btn" disabled="this.addDisabled" type="default" 
+									@click="counter(index,false,item.mp_id,item.sk_id,item.num,item.cart_id)">-</view>
+									<text>{{item.num}}</text>
+									<view class="btn" disabled="this.desDisabled" type="default" 
+									@click="counter(index,true,item.mp_id,item.sk_id,item.num,item.cart_id)">+</view>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		<view class="cardBody">
-			<!-- <MyCheckbox :isOpenProp="controlCheck.child1"></MyCheckbox> -->
-			<template v-if="childIsOpen.child2">
-				<view class="partentChecked" @click="cChange(childIsOpen.child2,'child2')">
-					<span class="status correct"></span>
-				</view>
-			</template>
-			<template v-else>
-				<view class="partentCheck" @click="cChange(childIsOpen.child2,'child2')"></view>
-			</template>
-			<view class="goodInfo">
-				<view class="imageWrap">
-					<image src="../../static/img/detail/d1.png" mode="aspectFill" style="width: 188rpx;height: 168rpx;"></image>
-				</view>
-				<view class="infoRight">
-					<text class="goodName">眼镜名称眼镜名称眼镜名称眼镜名称</text>
-					<view class="describ"><text>颜色 玫瑰金 /材质 钛合金 / 功能 防日光 / 配件 免费送 /折射 … </text>
-					<view class="icon"></view>
-					</view>
-					<view class="priceBox">
-						<view class="price">￥198</view>
-						<text>(限购{{maxCount}}副)</text>
-						<view class="counter">
-							<view class="btn" disabled="this.addDisabled" type="default" @click="counter(false)">-</view>
-							<text>{{count}}</text>
-							<view class="btn" disabled="this.desDisabled" type="default" @click="counter(true)">+</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		</view>
-		
+		</block>
 		<view class="footer">
 			<view class="footerLeft">实付金额:<text>￥{{totalPrice}}</text></view>
 			<view class="footerRight">
-				<navigator url="/pages/myOrderPaying/myOrderPaying" hover-class="navigator-hover">
-					<view class="paybtn">立即支付</view>
+				<navigator url="/pages/confirmOrder/confirmOrder" hover-class="navigator-hover">
+					<view class="paybtn" >立即结算</view>
 				</navigator>
 			</view>
 		</view>
@@ -97,50 +69,273 @@
 
 		data() {
 			return {
-				totalPrice: 360,
-				count:1,
+				totalPrice: 0,
+				pIsoPen:false,
+				// childIsOpen:[],
 				maxCount:20,
-				pIsoPen: false,
-				childIsOpen:{
-					"child1":true,
-					"child2":true
-				},
 			}
 		},
 		computed:{
+
 			cartList() {
-			  // 也可以从 getters 获取
-			    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(){
+				let temp=[];
+				temp.length=this.$store.state.cart.cartList.length;
+				for (let i = 0; i < temp.length; i++) {
+					temp[i]= false
+				}
+				console.log('this.childisOPne===>',temp)
+				return temp
 			}
 		},
 		onLoad: function() {
+			// 判断是否授权
+			// uni.getSetting({
+			// 	success(res) {
+			// 		console.log('authSetting',res.authSetting)
+			// 		if(res.authSetting['scope.userInfo'] !== true) {
+						
+			// 			uni.switchTab({
+			// 				url:'/pages/user/user'
+			// 			})
+			// 		}else {
+			// 		}
+			// 	}
+			// })
+
+			// console.log('usr-my',this.$store.state.user.userInfo)
+			// store.dispatch('cart/addCart',{
+			// 	"num":1,
+			// 	"pid": 7,//产品id
+			// 	"uid":1,
+			// 	"sk_id": 72,
+			// 	"price": 120,
+			// 	"mp_id":1,
+			// 	"checkedSKU":{
+			// 		 "discount": "45",
+			// 		 "in_price": "6000",
+			// 		 "kc": "0",
+			// 		 "model_pic": null,
+			// 		 "out_price": 191.8,
+			// 		 "pic": "https://glass.xiuyetang.com//upload_jk/7/7_22AE0C.jpg",
+			// 		 "pid": "7",
+			// 		 "real_price": 99,
+			// 		 "sk_id": "89",
+			// 		 "sku_name": "1.56非球面防蓝光_黑",
+			// 		 "sku_shop_value": "",
+			// 		 "sku_value": "58_61",
+			// 		 "status": "1",
+			// 	},	
+			// });
 			store.dispatch('cart/getCartList',{
 				uid: 1, //用户id
 			});
 		},
+
 		methods: {
-			counter(isadd){
+			// 跳转到对应的选购页面
+			toshop(id,type){
+				console.log('===',id,type)
+				switch(type){
+					case 1:
+						uni.navigateTo({
+							url:  `../detailsChoiceArgs/detailsChoiceArgs?oderId=`+id+`&goodType=`+type,
+							success: res => {},
+							fail: () => {},
+							complete: () => {}
+						});
+					break;
+					case 2:
+						uni.navigateTo({
+							url: `../detailStandard/detailStandard_k?oderId=`+id+`&goodType=`+type,
+							success: res => {},
+							fail: () => {},
+							complete: () => {}
+						});
+					break;
+					case 3||4:
+						uni.navigateTo({
+							url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
+							success: res => {},
+							fail: () => {},
+							complete: () => {}
+						});
+					break;
+					// case 4:
+					// 	uni.navigateTo({
+					// 		url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
+					// 		success: res => {},
+					// 		fail: () => {},
+					// 		complete: () => {}
+					// 	});
+					case 5:
+						uni.navigateTo({
+							url: `../purchaseLenses/purchaseLenses?oderId=`+id+`&goodType=`+type,
+							success: res => {},
+							fail: () => {},
+							complete: () => {}
+						});
+					break;
+					default :
+						break
+				}
+			},
+			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
+					}
+				},
+			
+			counter(index,isadd,mp_id,sk_id,num,cart_id){
+				// console.log('===>>counter ===>num',num)
+				// console.log('===>>counter ===>isadd',isadd)
+				num=parseInt(num);
 				if(isadd){
-					this.count >= this.maxCount? this.addDisabled = true:this.count++;
+					if(num>=this.maxCount){
+						this.addDisabled = true
+					} else{
+						this.addDisabled= true
+						// 修改num
+						store.dispatch('cart/modiCart',{
+							uid: 1,
+							// openid: '',
+							mp_id: mp_id,
+							sk_id: sk_id,
+							cart_id:cart_id,
+							num:num+1,
+							args:{
+								index:index,
+								isadd:isadd,
+							}
+						})
+						this.addDisabled= false
+					}
+				}else{
+					if(num<=1){
+						this.desDisabled = true
+					} else{
+						this.desDisabled = false
+						// post 请求修改相关参数
+						store.dispatch('cart/modiCart',{
+							uid: 1,
+							// openid: '',
+							mp_id: mp_id,
+							sk_id: sk_id,
+							cart_id:cart_id,
+							num:num-1,
+							args:{
+								index:index,
+								isadd:isadd,
+							}
+						})
+						this.desDisabled = true
+					}
+				}
+			},
+
+			Change(isopen,indexC){
+				// console.log('lalla===>',isopen)
+				this.childIsOpen[indexC]=!isopen
+				if(!isopen){
+					this.totalPrice=this.totalPrice+(this.$store.state.cart.cartList[indexC].num*this.$store.state.cart.cartList[indexC].nowPrice)
 				}else{
-					this.count <= 1? this.desDisabled = true:this.count--;
+					this.totalPrice=this.totalPrice-(this.$store.state.cart.cartList[indexC].num*this.$store.state.cart.cartList[indexC].nowPrice)
+				}
+				let m=true;
+				for (let i = 0; i < this.childIsOpen.length; i++) {
+					m=m&this.childIsOpen[i]
+				}
+				if(m==1){
+					this.pIsoPen=true
+				} else{
+					this.pIsoPen=false
 				}
 			},
 			pChange(isopen){
-				// console.log(isopen)
 				this.pIsoPen=!isopen
-				this.childIsOpen.child1=!isopen
-				this.childIsOpen.child2=!isopen
-			},
-			cChange(isopen,child){
-				// console.log(child)
-				if(child==='child1'){
-					this.childIsOpen.child1=!isopen
+				for (let i = 0; i < this.childIsOpen.length; i++) {
+					this.childIsOpen[i]=!isopen
 				}
-				if(child==='child2'){
-					this.childIsOpen.child2=!isopen
+				if(this.pIsoPen){
+					// 计算总价逻辑
+					if(this.childIsOpen.length!=0){
+						for (let i = 0; i < this.childIsOpen.length; i++) {
+							if(this.childIsOpen[i]){
+								this.totalPrice= this.totalPrice+(this.$store.state.cart.cartList[i].num*this.$store.state.cart.cartList[i].nowPrice)
+							}
+						}
+					} 
+				} else{
+					this.totalPrice=0
 				}
+			
+			},
+			delCart(cart_id,index){
+				// console.log('userInfo',this.$store.state.user.userInfo)
+				cart_id=parseInt(cart_id)
+				// console.log('delcart------>cart_id',cart_id)
+				// console.log('cartlist====>delcart',this.$store.state.cart.cartList)
+				// console.log('delcart======>index',index)
+				uni.showModal({
+					title: "是否删除该商品",
+					// content: '是否删除该商品',
+					success: function (res) {
+						if (res.confirm) {
+							// this.$store.state.cart.cartList.splice(index,1)
+							store.dispatch('cart/delCart',{
+								uid: 1, //用户id
+								openid: "",
+								cart_id: cart_id, // 要修改的购物车id
+								arg:index, // 由于action 传参是能接收两参数，因此将index放入对象
+							});
+							console.log('用户点击确定');
+						} 
+					}
+				});
+
 			}
 		}
 	}
@@ -171,21 +366,22 @@
 			background-color: #FF6B4A;
 			.correct {
 				display: inline-block;
-				width: 5px;
-				height: 1px;
+				position: relative;
+				width: 10rpx;
+				height: 2rpx;
 				background: #FFFFFF;
 				line-height: 0;
 				font-size: 0;
 				position: relative;
-				top: -6px;
+				top: -7px;
 				left: 4px;
 				-webkit-transform: rotate(45deg);
 			}
 			.correct:after {
 				content: '/';
 				display: block;
-				width: 8px;
-				height: 1px;
+				width: 16rpx;
+				height: 2rpx;
 				background: #FFFFFF;
 				-webkit-transform: rotate(-90deg) translateY(50%) translateX(50%);
 			}
@@ -200,6 +396,7 @@
 			flex-direction: column;
 			align-items: center;
 			justify-content: space-between;
+			margin-bottom: 180rpx;
 			.cardHeader{
 				width: 100%;
 				height: 36rpx;
@@ -248,6 +445,11 @@
 						justify-content: space-between;
 						height: 240rpx;
 						.goodName{
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							text-align: justify;
+							overflow: hidden;
 							font-size: 28rpx;
 							color: #333333;
 						}
@@ -257,8 +459,10 @@
 							box-sizing: border-box;
 							padding: 10rpx;
 							font-size: 20rpx;
+							letter-spacing: -0.23px;
+							text-align: justify;
 							color: #999999;
-							background: #F2F2F2;
+							background: #F9F9F9;
 							display: flex;
 							justify-content: center;
 							align-items: center;
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 5cd014e..71c08c7 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -47,11 +47,13 @@
 				</view>
 				<!-- 商品列表 -->
 				<view class="goods-list">
-					<view class="product-list">
-						<view class="product" v-for="(goods) in goodsList" :key="goods.goods_id" >
-							<Card :goods = "goods"></Card>
-						</view>
-					</view>
+					<scroll-view enable-flex @scrolltolower="handleScrolltolower" scroll-y class="product-list">
+						<block v-for="(goods) in userRecommandList " :key="goods.list.sk_id">
+							<view class="product" v-for="(item) in goods.list" :key="item.sk_id">
+								<Card :goods="item" ></Card>
+							</view>
+						</block>
+					</scroll-view>
 					<view class="loading-text">{{loadingText}}</view>
 				</view>
 			</view>
@@ -93,7 +95,8 @@
 					{ goods_id: 8, img: '/static/img/goods/p9.jpg', name: '商品名称',originCost:'￥198',price: '￥168', slogan:'1235人浏览' },
 					{ goods_id: 9, img: '/static/img/goods/p10.jpg', name: '商品名称',originCost:'￥198',price: '￥168', slogan:'1235人浏览' }
 				],
-				isAuth: true, // 是否显示授权页面
+				isAuth: true, // 是否显示授权页面,
+				pagesnum:1 // 分页请求初始值
 			}
 		},
 		onLoad() {
@@ -108,6 +111,7 @@
 					}
 				}
 			})
+			
 		},
 		computed: {
 			nickName() {
@@ -122,11 +126,18 @@
 				return this.$store.state.userRecommand.recommandList;
 			}
 		},
-		onLoad: function() {
+		onLoad:function(){
+			console.log('usr-my',this.$store.state.user.userInfo)
+			
 			store.dispatch('userRecommand/getRecommandList', {
-				uid: 2,
+				// uid:468,
+				uid: this.$store.state.user.userInfo.uid,
+				// openid:"oc8cg0d-0mFIInO4LyrCFtInPWr4",
+				openid:this.$store.state.user.userInfo.openid,
+				page: this.pagesnum
 			});
 		},
+
 		methods: {
 			// 授权
 			onGotUserInfo(e) {
@@ -172,6 +183,15 @@
 				uni.navigateTo({
 					url:'../refundProgress/refundProgress'
 				})
+			},
+			handleScrolltolower(){
+				// console.log('usr-my',this.$store.state.user.userInfo)
+				this.pagesnum++;
+				store.dispatch('userRecommand/getRecommandList', {
+					uid: this.$store.state.user.userInfo.uid,
+					openid:this.$store.state.user.userInfo.openid,
+					page: this.pagesnum
+				});
 			}
 		}
 	}
@@ -334,6 +354,7 @@
 				width: 92%;
 				padding: 0 4% 3vw 4%; 
 				display: flex;
+				height: 200px;
 				justify-content: space-between;
 				flex-wrap: wrap;
 				.product{
diff --git a/src/store/modules/cart.js b/src/store/modules/cart.js
index a42dd02..46f308b 100644
--- a/src/store/modules/cart.js
+++ b/src/store/modules/cart.js
@@ -1,38 +1,195 @@
 import urlAlias from '../url';
 import request from '../request';
 
-const { cartList } = urlAlias;
+const { cartList , cartModi, cartDel, cartAdd } = urlAlias;
 
 const state = {
   cartList: [],
 };
 
+
+const data = {
+	    data:{
+			// list 购物车列表
+			list:[
+				{
+					goods_name: "1.56非球面防蓝光_黑01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流", //商品名称
+					pid: "6",//产品id
+					real_price: 99,
+					checked: true,//是否选中
+					name: "颜色 玫瑰金 /材质 钛合金 / 功能 防日光 / 配件 免费送 /折射防日光 / 配件 免费送 /折射",//属性名称 ,颜色 玫瑰金 /材质 钛合金 / 功能 防日光 / 配件 免费送 /折射 …
+					cart_id: "39", //购物车唯一序列号
+					num: "1", //此购物
+					pics: "/static/myorder-paying-pic.png", //商品图片
+					goodsType:2,// 商品种类
+				},
+				{
+					goods_name: "1.56非球面防蓝光_黑01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流", //商品名称
+					pid: "4",//产品id
+					real_price: 189,
+					checked: false,//是否选中
+					name: "颜色 玫瑰金 /材质 钛合金 / 功能 防日光 / 配件 免费送 /折射防日光 / 配件 免费送 /折射",//属性名称 ,颜色 玫瑰金 /材质 钛合金 / 功能 防日光 / 配件 免费送 /折射 …
+					cart_id: "38", //购物车唯一序列号
+					num: "2", //此购物
+					pics: "/static/myorder-paying-pic.png", //商品图片
+					goodsType:3,// 商品种类
+				},
+			], 
+			mp_id: "1", 
+			mp_list://使用人，一个产品只有一个使用人
+				[
+					{
+						glassWidth: "54",//镜宽
+						img_url2: "http://localhost:8087/images/shop_1/1/",//使用人的头像，根据此头像，AI识别出数据。
+						in_time: "2020-02-22 03:19:38",//使用人加入的时间
+						leftAxi: "124",//左眼数据
+						leftCyl: "-2",//左眼数据
+						leftSph: "-1",//左眼数据
+						leftVis: "5",//左眼数据
+						legWidth: "158",//镜腿长
+						metal: null,//使用人的其它定义（材质过敏之类的）
+						mp_id: "1",//使用的id
+						name: "me",//使用人的名字
+						norseWidth: "18",//鼻宽
+						pd: "89.6",//瞳距
+						price: "0",//此人偏好的价格
+						rightAxi: "123",//右眼数据
+						rightCyl: "24",//右眼数据
+						rightSph: "-4",//右眼数据
+						rightVis: "5.1",//右眼数据
+						uid: "1",//购买人的uid
+					}
+				],
+			sk_id: "80",//此产品下的sku的唯一id
+			skuList:[//sku清单
+				{
+					discount: "45",//折扣，数据库中以int型存储，所以要除100
+					in_price: "6000",//进货价格，数据库中以int型存储，单位是分，所以显示时要除以100
+					kc: "0",//库存
+					model_pic: null,//模型试戴图
+					out_price: 191.8,//销售价格，元
+					pic: "https://glass.xiuyetang.com//upload_jk/6/6_321EB1.jpg",//可供查看图
+					pid: "6",//索引产品id
+					real_price: 99,//真实可成交价格
+					sk_id: "74",//成交时的sku_id
+					sku_name: "1.56非球面防蓝光_黑色",//sku名称
+					sku_shop_value: "",//sku商家定义值
+					sku_value: "47_51",//sku系统生成值
+					status: "1",//此产品下的sku状态
+				}
+			]
+		},    // 一个产品下，会有多个sku，都在这个skuList数组下
+	    msg: "ok",
+	    status: 1,
+}
+
 const mutations = {
   INIT: (state, cartList) => {
     state.cartList = cartList;
   },
+  DEL:(state,index)=>{
+	  console.log('mutations====>',state.cartList)
+	  state.cartList.splice(index,1)
+	  console.log('mutations====>index',index)
+	  // state.cartList=delList
+  },
+  MODI:(state,args) => {
+	  console.log('the num',state.cartList[args.index].num)
+	  console.log('mutations====>isadd',args)
+	  if(args.isadd)
+	  {
+		  state.cartList[args.index].num=args.num
+	  } else{
+		  state.cartList[args.index].num=args.num
+	  }
+	  console.log('the num',state.cartList[args.index].num)
+  },
+  
 };
 
-
-
 const actions = {
 	
-  getCartList({ commit }, param) {
-    request({
-      url: cartList,
-      success: (res) => {
-		  
-        commit('INIT', res.data.data)
-      },
-      fail: (res) => {
-        console.log("fail status === > ", res);
-      },
-      complete: (res) => {
-        console.log("complete status === > ", res);
-      },
-    })
-  }
-  
+   getCartList({ commit }, param) {
+		request({
+		  url: cartList,
+		  data:param,
+		  success: (res) => {
+			  console.log('cart===>接口数据',res.data.data)
+			 //  const resData = {
+				// ...res,
+				// data,
+			 //  }
+			commit('INIT', res.data.data)
+		  },
+		  fail: (res) => {
+			console.log("fail status === > ", res);
+		  },
+		  complete: (res) => {
+			console.log("complete status === > ", res);
+		  },
+		})
+	},
+	
+	modiCart({ commit }, param) {
+		const args=Object.assign({num:param.num},param.args)
+		delete param.args
+	  request({
+		url: cartModi,
+		data: param,
+		success: (res) => {
+			console.log('modi-parm',param)
+		  commit('MODI',args)
+		},
+		fail: (res) => {
+		  console.log("fail status === > ", res);
+		},
+		complete: (res) => {
+		  console.log("complete status === > ", res);
+		},
+	  })
+	},
+	
+	delCart({ commit },param ) {
+		let arg = param.arg;
+		delete param.arg
+	  request({
+		url: cartDel,
+		data: param,
+		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) => {
+		  console.log("fail status === > ", res);
+		},
+		complete: (res) => {
+		  console.log("complete status === > ", res);
+		},
+	  })
+	},
+	
+	addCart({ commit }, param) {
+		console.log('请求接口开始')
+	  request({
+		url: cartAdd,
+		data:param,
+		success: (res) => {
+			console.log('add-parm',param)
+			console.log('addcart===>res.data===>',res.data)
+		  // commit('INIT', res.data.data)
+		},
+		fail: (res) => {
+		  console.log("fail status === > ", res);
+		},
+		complete: (res) => {
+		  console.log("complete status === > ", res);
+		},
+	  })
+	},
+	
 }
 
 export default {
diff --git a/src/store/modules/userRecommand.js b/src/store/modules/userRecommand.js
index a04185c..8f36347 100644
--- a/src/store/modules/userRecommand.js
+++ b/src/store/modules/userRecommand.js
@@ -9,21 +9,65 @@ const state = {
   recommandList: [],
 };
 
+const data = {
+    "code": 1,
+    "msg": "请求成功",
+    "data": {
+			// list 表示商品数据列表
+            "list": [
+				{
+					model_pic: null,
+					p_name: "1.61防蓝光镜片 非球面_枪色款镜架商务男士防蓝光眼镜",
+					p_root_index: "1", //对应goodType
+					pic: "http://localhost/sys-glass/image/picture.png",
+					pid: "96",
+					real_price: "17800",
+					sk_id: "1448",
+					sku_name: "1.61防蓝光镜片 非球面_枪色款镜架",
+					trade_num: "0",
+                },
+				{
+                    "sk_id": "39",
+                    "pic": "/static/img/goods/p1.jpg",
+                    "p_name": "1.56防蓝光镜片非球面_黑银色镜架防蓝光眼镜超轻不压鼻",
+                    "old_price": "18000",
+                    "real_price": "9900",
+                    "trade_num": 123,	// 对应购买人数
+                    "p_root_index": 2,		// 对应跳转的详情页
+					"pid":4, // 产品id
+                },
+            ],
+			pagesnum:1, // 懒加载要用到的页数
+			pagessize:10,// 每次请求返回的list长度
+        }
+    
+}
+
 const mutations = {
   INIT: (state, list) => {
     state.recommandList = list;
   },
 };
 
+let goodsList=[];
+
 const actions = {
   getRecommandList({ commit }, param) {
     request({
       url: recommandList,
       success: (res) => {
-		  console.log(res.data)
-        commit('INIT', res.data.data)
+		  console.log('userRecommand-parm',param)
+		  console.log(res.data.data)
+		  // const Res={...res.data.data.list,...data.data.list}
+		  goodsList=[...goodsList,...res.data.data]
+		  // console.log(res.data)
+        commit('INIT', goodsList)
       },
       fail: (res) => {
+		  uni.showToast({
+			  title:"数据加载完了",
+			  icon:"none"
+		  })
         console.log("fail status === > ", res);
       },
       complete: (res) => {
diff --git a/src/store/url.js b/src/store/url.js
index b4d15cb..03b7127 100644
--- a/src/store/url.js
+++ b/src/store/url.js
@@ -20,6 +20,9 @@ const urlAlias = {
 	
 	// 购物车
 	cartList: '/app/cart/list', // 获取购物车列表
+	cartModi: '/app/cart/modi', // 修改购物车
+	cartDel: '/app/cart/del', // 删除购物车
+	cartAdd: '/app/cart/add',// 添加购物车
 	
 	// 我的
   recommandList:'/app/prod/recommand', // 获取用户个性化推荐商品
-- 
2.0.0