From ed7e3505eeea04ea98bef3bb19f96da0f6131ea5 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 29 Oct 2019 23:16:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=B0=E8=B4=AD=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html            | 2 +-
 js/details.js         | 6 +-----
 js/store_commodity.js | 1 +
 js/zhugouba.js        | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 377828f..9a35681 100644
--- a/index.html
+++ b/index.html
@@ -48,7 +48,7 @@
 			    <!-- <span>逛商都</span> -->
 			</a>
 			<a class="mui-tab-item" href="templete/zhugouba.html" data-num='2'>
-				<span class="mui-icon"><img class="nav_out img" src="" /><img class="nav_in" src="" /></span>
+				<span class="mui-icon"><img class="img" src="" /></span>
 			    <!-- <span>助购吧</span> -->
 			</a>
 			<a class="mui-tab-item" href="templete/zhuweiba.html" data-num='3'>
diff --git a/js/details.js b/js/details.js
index 77a6bfd..d628a70 100644
--- a/js/details.js
+++ b/js/details.js
@@ -662,10 +662,6 @@ mui.plusReady(function() {
 		} else {
 			alert('请选择商品分类！');
 			return
-		}
-		 if(goodsType==2 & from_id!=3 & $(this).hasClass('engwc')) {
-			mui.alert ("助微吧商品不能加入购物车")
-			return;
 		}
 		//		//console.log(arry_str)
 		//		//console.log(goodsSpecId)
@@ -812,7 +808,7 @@ mui.plusReady(function() {
 	})
 	$('.footer').on('tap', '#storebtn', function() {
 		var shopId = this.attributes["data-shopId"].nodeValue;		
-		JZL.openWindow('storeout.html','storeout.html'+ shopId,{shopId: shopId,shopName:shopName});		
+		JZL.openWindow('storeout.html','storeout.html'+ shopId,{shopId: shopId,shopName:shopName, from_id: from_id});		
 	})
 	$('.con').on('tap', '.shop_title p', function() {
 		var shopId = this.attributes["data-shopId"].nodeValue;
diff --git a/js/store_commodity.js b/js/store_commodity.js
index 76fcab5..330e972 100644
--- a/js/store_commodity.js
+++ b/js/store_commodity.js
@@ -241,6 +241,7 @@ mui.plusReady(function() {
 
 	function getRecommend(nowpage, pagesize) {
 		var recommenddata = {
+			from_id: from_id,
 			page: nowpage ? nowpage : 1,
 			PerPage: pagesize ? pagesize : 10
 		}
diff --git a/js/zhugouba.js b/js/zhugouba.js
index 1dbc5da..76663fa 100644
--- a/js/zhugouba.js
+++ b/js/zhugouba.js
@@ -128,7 +128,7 @@ mui.plusReady(function() {
 		if (true == isLoading) return;
 		isLoading = true;
 		//console.log(lat);
-		JZL.ajax(hyhUrl('app/shopping/getHelpShops'), recommenddata, function(data) {
+		JZL.ajax(hyhUrl('app/shopping/getHelpSaleShops'), recommenddata, function(data) {
 			var html = '';
 			var shopLevel
 			if (1 == data.status) {