合并后提交

components/buyPup.vue

@@ -34,16 +34,18 @@
 			return {
 				pricespop:true,
 				curProId:null,
+				curPro:{}
 			};
 		},methods:{
 			closePup() {
 				this.pricespop = false
 				this.$emit('closePup')
-				// this.proPriceList = []
+				
 			},
 			choosePrice(item) {
-				// console.log(item, 'choosePrice')
+				console.log(item, 'choosePrice')
 				this.curProId = item.productId
+				this.curPro = item
 			},
 			oprate(val){
 				if(!this.curProId){
@@ -55,10 +57,10 @@
 				}
 				if(val=='buy'){
 					console.log('直接购买');
-					this.$emit('oprate',{name:val,id:this.curProId})
+					this.$emit('oprate',{name:val,item:this.curPro})
 				}else if(val == 'gouwuche'){
 					console.log('加入购物车');
-					this.$emit('oprate',{name:val,id:this.curProId})
+					this.$emit('oprate',{name:val,item:this.curPro})
 				}
 				this.closePup()
 			}

components/z-navigation/z-navigation.vue

@@ -86,18 +86,18 @@ export default {
           selectedIconPath: "static/tab/tab_cur_02.png",
           text: "购物车",
         },
-        // {
-        //   pagePath: "pages/taihu/index",
-        //   iconPath: "static/tab/tab_nor_03.png",
-        //   selectedIconPath: "static/tab/tab_cur_03.png",
-        //   text: "太湖公益",
-        // },
+		{
+		  pagePath: "pages/bookShop/orderList",
+		  iconPath: "static/tab/order.png",
+		  selectedIconPath: "static/tab/order_active.png",
+		  text: "订单",
+		},
         {
-          pagePath: "pages/bookShop/orderList",
-          iconPath: "static/tab/order.png",
-          selectedIconPath: "static/tab/order_active.png",
-          text: "订单",
-        },
+          pagePath: "pages/taihu/index",
+          iconPath: "static/tab/tab_nor_03.png",
+          selectedIconPath: "static/tab/tab_cur_03.png",
+          text: "太湖公益",
+        },        
         {
           pagePath: "pages/mine/mine/index",
           iconPath: "static/tab/tab_nor_04.png",