Merge branch 'master-xie'

pages/bookShop/commodityDetail.vue

@@ -457,12 +457,19 @@
 			//	console.log(e)	
 				if(e.index == 0){
 				// 点击的是加入购物车
-					this.upoShow = true			
-					// this.addCart()
+				if(this.linkProducts.length > 0){
+					this.upoShow = true	
+				}else{
+					this.addCart()
+				}							
+					
 				}else{
 				// 点击的是立即购买
-				this.upoShow = true
-				// this.goPurse()
+				if(this.linkProducts.length > 0){
+				 this.upoShow = true
+				}else{
+				 this.goPurse()
+				}
 				}
 			},
 			goToListenNone(){