diff --git a/api/user.js b/api/user.js
index a8f6647..4927cf8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -48,10 +48,10 @@ export default {
status:{
unused:'UNUSED',used:'USED',expired:'EXPIRED'
},
- list:(status)=>request.get('/api/coupon/user/list',status?{status}:{})
+ list:(data)=>request.get('/api/coupon/user/list',data)
},
point:{
- list:()=>request.get('/api/point/records')
+ list:(data)=>request.get('/api/point/records',data)
},
friend:{
list:()=>request.get('/api/user/referrals')
diff --git a/components/merchantOrder/index.js b/components/merchantOrder/index.js
index a0f1463..6d798db 100644
--- a/components/merchantOrder/index.js
+++ b/components/merchantOrder/index.js
@@ -42,7 +42,6 @@ Component({
signType:data.payment_params.signType,
paySign:data.payment_params.paySign,
success:(res)=>{
- console.log(res);
wx.navigateTo({
url: '/pages/shop/success/index',
})
diff --git a/pages/help/index/index.wxml b/pages/help/index/index.wxml
index 06ef172..492725c 100644
--- a/pages/help/index/index.wxml
+++ b/pages/help/index/index.wxml
@@ -91,15 +91,15 @@
服务费
- {{preOrder.price_info.original_amount}}
+ {{preOrder.price_info.original_amount}}
跑腿券
- {{preOrder.price_info.coupon_discount_amount}}
-
+
蜂蜜抵
- - {{preOrder.price_info.points_used}}克
+ - {{preOrder.used_points}}克
diff --git a/pages/my/coupon/index.js b/pages/my/coupon/index.js
index be1de4d..433742b 100644
--- a/pages/my/coupon/index.js
+++ b/pages/my/coupon/index.js
@@ -7,27 +7,76 @@ Page({
*/
data: {
tabIndex:0,
- list:[]
+ tab1List:[],
+ tab2List:[],
+ tab3List:[],
+ listViewHeight:0,
+ pager:{
+ tab1:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false},
+ tab2:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false},
+ tab3:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false}
+ }
},
changeTab(event){
- const tabIndex = event.currentTarget.dataset.index;
+ const tabIndex = parseInt(event.currentTarget.dataset.index);
this.setData({tabIndex})
- this.loadList();
+ this.loadList(`tab${tabIndex+1}`);
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- this.loadList();
+ const windowInfo = wx.getWindowInfo();
+ console.log(windowInfo);
+ this.setData({
+ listViewHeight:windowInfo.windowHeight-57
+ })
+ this.loadList('tab1');
},
-
- loadList(){
+ refreshList(){
+ let tab = `tab${this.data.tabIndex+1}`
+ this.data.pager[tab].pageIndex = 0;
+ this.data.pager[tab].loadAll = false;
+ this.setData({
+ pager:this.data.pager
+ });
+ this.loadList(tab);
+ },
+ loadMore(){
+ this.loadList(`tab${this.data.tabIndex+1}`);
+ },
+ loadList(tabName){
+ console.log(tabName);
+ if(this.data.pager[tabName].loading||this.data.pager[tabName].loadAll){
+ return;
+ }
+ this.data.pager[tabName].loading = true;
+ this.setData({
+ pager:this.data.pager
+ });
const status = [userApi.coupon.status.unused,userApi.coupon.status.used,userApi.coupon.status.expired];
- userApi.coupon.list(status[this.data.tabIndex]).then((data)=>{
+ userApi.coupon.list({
+ status:status[this.data.tabIndex],
+ skip:this.data.pager[tabName].limit*this.data.pager[tabName].pageIndex,
+ limit:this.data.pager[tabName].limit
+ }).then((data)=>{
+ if(this.data.pager[tabName].pageIndex==0){
+ this.data[tabName+'List'] = data;
+ }else{
+ this.data[tabName+'List'] = this.data[tabName+'List'].concat(data);
+ }
+ this.data.pager[tabName].loading = false;
+ this.data.pager[tabName].pageIndex++;
+ if(data.length
-
-
+
+
{{item.coupon_name}}
有效期至 {{item.expire_time}}
{{item.coupon_amount}}
-
+
+
+ 暂无跑腿券
+
+
-
-
- 暂无跑腿券
-
\ No newline at end of file
+
+
+
+
+ {{item.coupon_name}}
+ 有效期至 {{item.expire_time}}
+
+ {{item.coupon_amount}}
+
+
+
+ 暂无跑腿券
+
+
+
+
+
+
+
+ {{item.coupon_name}}
+ 有效期至 {{item.expire_time}}
+
+ {{item.coupon_amount}}
+
+
+
+ 暂无跑腿券
+
+
diff --git a/pages/my/coupon/index.wxss b/pages/my/coupon/index.wxss
index 3fc7bfe..d1958e3 100644
--- a/pages/my/coupon/index.wxss
+++ b/pages/my/coupon/index.wxss
@@ -1,6 +1,3 @@
-.coupon-list{
-
-}
.coupon-list .item{
display: flex;
margin:20rpx;
diff --git a/pages/my/firend/index.js b/pages/my/firend/index.js
index b3e6c48..90b86a6 100644
--- a/pages/my/firend/index.js
+++ b/pages/my/firend/index.js
@@ -6,16 +6,44 @@ Page({
* 页面的初始数据
*/
data: {
- list:[]
+ list:[],
+ scrollViewHeight:0,
+ pager:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ const windowInfo = wx.getWindowInfo();
+ this.setData({
+ scrollViewHeight:windowInfo.windowHeight
+ });
+ this.loadList();
+ },
+ refreshList(){
+ this.data.pager.pageIndex = 0;
+ this.data.pager.loadAll = false;
+ this.setData({
+ pager:this.data.pager
+ });
+ this.loadList();
+ },
+ loadList(){
+ if(this.data.pager.loading||this.data.pager.loadAll){
+ return;
+ }
+ this.data.pager.loading = true;
+ this.setData({
+ pager:this.data.pager
+ });
userApi.friend.list().then((data)=>{
+ this.data.pager.loading = false;
+ this.data.pager.loadAll = true;
+ this.data.pager.refreshTrigger = false;
this.setData({
- list:data
+ list:data,
+ pager:this.data.pager
})
})
},
diff --git a/pages/my/firend/index.json b/pages/my/firend/index.json
index 1e22c5e..401bc40 100644
--- a/pages/my/firend/index.json
+++ b/pages/my/firend/index.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "list-view":"/components/listView"
+ },
"navigationBarTitleText": "我的邻友"
}
\ No newline at end of file
diff --git a/pages/my/firend/index.wxml b/pages/my/firend/index.wxml
index 7d0552e..356c67e 100644
--- a/pages/my/firend/index.wxml
+++ b/pages/my/firend/index.wxml
@@ -1,4 +1,8 @@
-
+
跑腿订单返现
@@ -9,7 +13,7 @@
2023.04.06 17:00
-
-
- 暂无邻友
-
\ No newline at end of file
+
+ 暂无邻友
+
+
\ No newline at end of file
diff --git a/pages/my/money/index.js b/pages/my/money/index.js
index 8c8f748..fc1c1b9 100644
--- a/pages/my/money/index.js
+++ b/pages/my/money/index.js
@@ -8,25 +8,66 @@ Page({
*/
data: {
list:[],
- userInfo:{}
+ userInfo:{},
+ scrollViewHeight:0,
+ pager:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- userApi.point.list().then((data)=>{
- this.setData({
- list:data.items
- })
- });
+ const windowInfo = wx.getWindowInfo();
+ this.setData({
+ scrollViewHeight:windowInfo.windowHeight-131
+ })
app.getUserInfo().then((data)=>{
this.setData({
userInfo:data
})
- })
+ });
+ this.loadList();
},
+ refreshList(){
+ this.data.pager.pageIndex = 0;
+ this.data.pager.loadAll = false;
+ this.setData({
+ pager:this.data.pager
+ });
+ this.loadList();
+ },
+
+ loadList(){
+ if(this.data.pager.loading||this.data.pager.loadAll){
+ return;
+ }
+ this.data.pager.loading = true;
+ this.setData({
+ pager:this.data.pager
+ });
+ userApi.point.list({
+ skip:this.data.pager.pageIndex*this.data.pager.limit,
+ limit:this.data.pager.limit
+ }).then((data)=>{
+ if(this.data.pager.pageIndex==0){
+ this.data.list = data.items;
+ }else{
+ this.data.list = this.data.list.concat(data.items);
+ }
+ this.data.pager.loading = false;
+ this.data.pager.pageIndex++;
+ this.data.pager.refreshTrigger = false;
+ if(data.items.length取包裹自动抵扣
-
+
{{item.description}}
@@ -12,8 +16,9 @@
{{item.points}}
-
-
-
- 暂无蜂蜜
-
\ No newline at end of file
+
+
+
+ 暂无蜂蜜
+
+
\ No newline at end of file
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index 26eadb8..119271a 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -27,7 +27,7 @@ Page({
pager:{
tab1:{limit:10,loading:false,loadAll:false,pageIndex:0},
tab2:{limit:10,loading:false,loadAll:false,pageIndex:0},
- tab3:{limit:4,loading:false,loadAll:false,pageIndex:0}
+ tab3:{limit:10,loading:false,loadAll:false,pageIndex:0}
}
},
changeTab(event){
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index 1885cc2..9193943 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -14,7 +14,7 @@
@@ -41,7 +41,7 @@
-
+
暂无相关订单
@@ -49,8 +49,8 @@
@@ -82,7 +82,7 @@
-
+
暂无相关订单
@@ -90,8 +90,8 @@
@@ -116,7 +116,7 @@
-
+
暂无相关订单
diff --git a/pages/shop/detail/index.js b/pages/shop/detail/index.js
index 056e0cf..172b92c 100644
--- a/pages/shop/detail/index.js
+++ b/pages/shop/detail/index.js
@@ -48,7 +48,6 @@ Page({
data.items.map((item)=>{
item.tags = item.tags.split(',')
})
- data.items = data.items;
this.setData({
productList:data.items
});
diff --git a/pages/shop/detail/index.wxml b/pages/shop/detail/index.wxml
index 909f7fc..e5e5ddf 100644
--- a/pages/shop/detail/index.wxml
+++ b/pages/shop/detail/index.wxml
@@ -5,7 +5,7 @@
{{detail.name}}
营业时间 {{detail.business_hours}}
-
+
diff --git a/pages/shop/detail/index.wxss b/pages/shop/detail/index.wxss
index edad673..8a867ff 100644
--- a/pages/shop/detail/index.wxss
+++ b/pages/shop/detail/index.wxss
@@ -42,6 +42,7 @@
}
.shop-info .head .image{
width:180rpx;height:180rpx;
+ margin-left:20rpx;
}
.shop-info .address{
display: flex;
@@ -49,11 +50,11 @@
.shop-info .name{
font-weight: 600;
font-size: 40rpx;
- margin-top:10rpx;
+ line-height: 50rpx;
}
.shop-info .time{
font: 25rpx;
- margin-top:24rpx;
+ margin-top:19rpx;
}
.shop-info .spliter{
margin:20rpx 0 24rpx 0;
diff --git a/pages/shop/success/index.js b/pages/shop/success/index.js
index 3c0b16f..6543627 100644
--- a/pages/shop/success/index.js
+++ b/pages/shop/success/index.js
@@ -7,21 +7,69 @@ Page({
* 页面的初始数据
*/
data: {
- shopList:[]
+ shopList:[],
+ lng:0,
+ lat:0,
+ scrollViewHeight:0,
+ pager:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ const windowInfo = wx.getWindowInfo();
+ console.log(windowInfo);
+ this.setData({
+ scrollViewHeight:windowInfo.screenHeight-372
+ })
app.getLocation().then((res)=>{
- this.getProductList(res.longitude,res.latitude);
+ this.setData({
+ lng:res.longitude,
+ lat:res.latitude
+ });
+ this.getProductList();
}).catch(()=>{
this.getProductList();
})
},
- getProductList(lng,lat){
- shopApi.list(null,lng,lat).then((data)=>{
+ refreshList(){
+ this.data.pager.pageIndex = 0;
+ this.data.pager.loadAll = false;
+ this.setData({
+ pager:this.data.pager
+ });
+ this.getProductList();
+ },
+ getProductList(){
+ if(this.data.pager.loading||this.data.pager.loadAll){
+ return;
+ }
+ this.data.pager.loading = true;
+ this.setData({
+ pager:this.data.pager
+ });
+ const data = {
+ skip:this.data.pager.pageIndex*this.data.pager.limit,
+ limit:this.data.pager.limit
+ }
+ if(this.data.lng&&this.data.lat){
+ data.longitude = this.data.lng;
+ data.latitude = this.data.lat;
+ }
+ shopApi.list(data).then((data)=>{
+ if(this.data.pager.pageIndex==0){
+ this.data.shopList = data.items;
+ }else{
+ this.data.shopList = this.data.shopList.concat(data.items);
+ }
+ this.data.pager.loading = false;
+ this.data.pager.pageIndex++;
+ this.data.pager.refreshTrigger = false;
+ if(data.items.length{
if(item.distance){
if(item.distance>=1000){
@@ -32,7 +80,8 @@ Page({
}
});
this.setData({
- shopList:data.items
+ shopList:this.data.shopList,
+ pager:this.data.pager
});
})
},
diff --git a/pages/shop/success/index.json b/pages/shop/success/index.json
index 77378a6..c5c43ec 100644
--- a/pages/shop/success/index.json
+++ b/pages/shop/success/index.json
@@ -1,6 +1,7 @@
{
"usingComponents": {
- "shop-item":"/components/shopItem"
+ "shop-item":"/components/shopItem",
+ "list-view":"/components/listView"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/shop/success/index.wxml b/pages/shop/success/index.wxml
index ca14604..7b597c8 100644
--- a/pages/shop/success/index.wxml
+++ b/pages/shop/success/index.wxml
@@ -3,8 +3,12 @@
支付成功
-
+
-
\ No newline at end of file
+
\ No newline at end of file