From 8bd2e472b35457e9d8c79530ab90d113498b25fe Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 8 Oct 2019 08:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=90=8E=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/indentcon.js | 6 ++-
js/myshop.js | 17 +++++--
js/zhugouba.js | 2 +-
templete/my_help_sale.html | 90 ++------------------------------------
4 files changed, 22 insertions(+), 93 deletions(-)
diff --git a/js/indentcon.js b/js/indentcon.js
index 802bcd7..85e1626 100644
--- a/js/indentcon.js
+++ b/js/indentcon.js
@@ -91,7 +91,11 @@ function getData(page) {
this.goodsNum + '';
})
html += '
共' + this.list.length + '件商品 合计:¥' + this.realTotalMoney +
- '(含运费¥' + this.deliverMoney + ')
';
+ '(含运费¥' + this.deliverMoney + ')
';
+ if(this.goodsType == 3){
+ html += '助购人:'+ this.helpUser.userName +'
';
+ }
+ html += '';
if (this.orderStatus == -2) {
html += '
立即付款
取消订单
';
diff --git a/js/myshop.js b/js/myshop.js
index 09a8862..6f466e0 100644
--- a/js/myshop.js
+++ b/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,
- pagesize: pagesize ? pagesize : 10
+ page: nowpage ? nowpage : 1,
+ 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);
diff --git a/js/zhugouba.js b/js/zhugouba.js
index 48fe5ee..06c4bfb 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/getHelpSaleShops'), recommenddata, function(data) {
+ JZL.ajax(hyhUrl('app/shopping/getHelpShops'), recommenddata, function(data) {
var html = '';
var shopLevel
if (1 == data.status) {
diff --git a/templete/my_help_sale.html b/templete/my_help_sale.html
index 706b45c..b1d852a 100644
--- a/templete/my_help_sale.html
+++ b/templete/my_help_sale.html
@@ -20,96 +20,12 @@
我家订单我家全部订单
-
-
-