最后提交

js/indentcon.js

@@ -91,7 +91,11 @@ function getData(page) {
 					this.goodsNum + '</span></div></div></div>';
 			})
 			html += '</div><div class="combination">共' + this.list.length + '件商品 合计：<o>￥' + this.realTotalMoney +
-				'</o>（含运费￥' + this.deliverMoney + '）</div><div class="btns clearfix">';
+				'</o>（含运费￥' + this.deliverMoney + '）</div>';
+			if(this.goodsType == 3){
+				html += '<div class="combination">助购人：'+ this.helpUser.userName +'</div>';
+			}
+			html += '<div class="btns clearfix">';
 			if (this.orderStatus == -2) {
 				html += '<div class="btns_btn ljfk" data-payName="' + this.pay_name +
 					'">立即付款</div><div class="btns_btn qxdd_js">取消订单</div>';

js/myshop.js

@@ -80,11 +80,20 @@ mui.plusReady(function() {
 	var nowpage = 1;
 	var pagesize = 10;
 	var isload = false;
-
+	document.querySelector('.mui-scroll-wrapper').addEventListener('scroll', function(e) {
+		if (scroll.y >= scroll.maxScrollY) {
+			if (isload == false) {
+				nowpage++;
+				// getShops(nowPage, pageSize);
+				console.log(nowpage)
+				getRecommend(nowpage, pagesize)
+			}
+		}
+	})
 	function getRecommend(nowpage, pagesize) {
 		var recommenddata = {
-			nowpage: nowpage ? nowpage : 1,
+			page: nowpage ? nowpage : 1,
-			pagesize: pagesize ? pagesize : 10
+			pageSize: pagesize ? pagesize : 10
 		}
 		recommenddata.shopId = shopId
 
@@ -142,7 +151,7 @@ mui.plusReady(function() {
 				} else{
 					mui.alert(data.msg)
 				}
-				isload - false
+				isload = false
 			},
 			error: function(xhr, type, errorThrown) { //异常处理；  
 				//								mui.alert(errorThrown);      

js/zhugouba.js

@@ -128,7 +128,7 @@ mui.plusReady(function() {
 		if (true == isLoading) return;
 		isLoading = true;
 		//console.log(lat);
-		JZL.ajax(hyhUrl('app/shopping/getHelpSaleShops'), recommenddata, function(data) {
+		JZL.ajax(hyhUrl('app/shopping/getHelpShops'), recommenddata, function(data) {
 			var html = '';
 			var shopLevel
 			if (1 == data.status) {

templete/my_help_sale.html

@@ -20,96 +20,12 @@
 		<div class="block">
 			<div class="row shadown_wai" id="myHelpSaleOrder"><img class="img" src="../img/setting_lock1.png" /><span class="r1">我家订单</span><span
 				 class="r2">我家全部订单</span><img class="youjiantou" src="../img/youjiantou.png" /></div>
-			<div class="mydata shadown_wai" style="margin-top: 6px;">
  			
-				<div class="mydata-content">
+ <div class="row shadown_wai" id="preGetCoupon" style="margin-top: 6px;"><img class="img" src="../img/setting_user1.png" /><span class="r1" id="userName"></span><span
-					<!-- <div class="mydata-table "> -->
-					<div class="mydata-table-view-cell helpSaleCart">
-						<a href="javascript:;">
-							<div class="orderimg">
-			
-								<img src="../img/gouwuche.png" />
-							</div>
-							<p>助购车</p>
-						</a>
-					</div>
-					<div class="mydata-table-view-cell waitSend">
-						<a href="javascript:;">
-							<div class="orderimg">
-								<img src="../img/daifukuan.png" /></div>
-							<p>待发货</p>
-						</a>
-					</div>
-					<div class="mydata-table-view-cell waitDeliver">
-						<a href="javascript:;">
-							<div class="orderimg">
-								<img src="../img/daishouhuo.png" /></div>
-							<p>待收货</p>
-						</a>
-					</div>
-					<div class="mydata-table-view-cell waitAppraise">
-						<a href="javascript:;">
-							<div class="orderimg">
-								<img src="../img/pingjia.png" /></div>
-							<p>待评价</p>
-						</a>
-					</div>
-					<div class="mydata-table-view-cell abnormal">
-						<a href="javascript:;">
-							<div class="orderimg">
-								<img src="../img/orderdetail.png" /></div>
-							<p style="font-size: 88%;">退单售后</p>
-						</a>
-					</div>
-				</div>
-			</div>
-			<div class="mydata shadown_wai" style="margin-top: 6px;">
-				<div class="mydata-content">
-					<!-- <div class="mydata-table "> -->
-					<div class="mydata-table-view-cell helpSaleConfirm">
-						<a href="javascript:;">
-							<div class="orderimg">
-							
-								<img src="../img/gouwuche.png" />
-							</div>
-							<p>待确认</p>
-						</a>
-					</div>
-					<div class="mydata-table-view-cell helpSalePaid ">
-						<a href="javascript:;">
-							<div class="orderimg">
-								<img src="../img/daifukuan.png" /></div>
-							<p>待付款</p>
-						</a>
-					</div>
-					<div class="mydata-table-view-cell helpSaleUpload">
-						<a href="javascript:;">
-							<div class="orderimg">
-								<img src="../img/pengyou.png" /></div>
-							<p>待上传</p>
-						</a>
-					</div>
-					<div class="mydata-table-view-cell helpSaleRecive">
-						<a href="javascript:;">
-							<div class="orderimg">
-								<img src="../img/weiba.png" /></div>
-							<p>待收货</p>
-						</a>
-					</div>
-					<div class="mydata-table-view-cell userPaymentvoucher">
-						<a href="javascript:;">
-							<div class="orderimg">
-								<img src="../img/pingzheng.png" /></div>
-							<p style="font-size: 88%;">发起提现</p>
-						</a>
-					</div>
-				</div>
-			</div>
-			<div class="row shadown_wai" id="preGetCoupon" style="margin-top: 6px;"><img class="img" src="../img/setting_user1.png" /><span class="r1" id="userName"></span><span
 				 class="r2" id="preGetCouponCount" style="font-size: 90%;"></span><img class="youjiantou" src="../img/youjiantou.png" /></div>
 			<div id="helpSaleTable">
 				<div class="row helpSaleTableRow shadown_wai"><span class="c1">助购户</span><span class="c2">助购预获</span>
-					<span class="c3 btn" id="toHelpSale">购物</span></div>
+					<span class="c3 btn" id="toHelpSale">助购去</span></div>
 			</div>
 		</div>