Commit 2d2fffa7 by 高淑倩

集点

parent b7bf8464
{"undefined::component2":false,"undefined::_enableAutoPush":false,"undefined::_appIdList":[],"undefined::uploadTime":"","undefined::packageSize":0,"tinyType":"alipay","tinyCnName":"支付宝","tinyProjectType":"alipay-mini","alipay:alipay-mini:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/rcwFIauzePpMqlTzzanK.svg","alipay:alipay-mini:auditLink":null,"alipay:alipay-mini:whiteListLink":null,"alipay:alipay-mini:createLink":null,"alipay:alipay-mini:component2":true,"alipay:alipay-mini:_enableAutoPush":true,"alipay:alipay-mini:_appIdList":[{"appid":"2019071665852502","name":"daqian_01"}],"alipay:alipay-mini:uploadTime":"","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"_userInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/TB1IDu6XSFP81Jk6XeCXXcswpXa","city":"上海市","countryCode":"CN","gender":"f","nickName":"大倩。","province":"上海"},"_loginCode":"577fdba733eb4a98a5391c000555PX16","reLoginErr":""},"alipay:alipay-mini:_appId":"2019071665852502","alipay:alipay-mini:_appName":"daqian_01","alipay:alipay-mini:remoteVersion":"0.0.0","alipay:alipay-mini:currentVersion":"0.0.1","alipay:alipay-mini:whiteList":[],"alipay:alipay-mini:h5WhiteList":[],"alipay:alipay-mini:appLogo":"https://appstoreisvpic.alipayobjects.com/prod/eebdb2f7-2747-499e-9a22-2b89664d7739.png","alipay:alipay-mini:userAuthorization":["userInfo","phoneNumber"],"isSimulatorOpen":false,"isNotFirstToggleSimulator":true,"compilerList":[{"title":"普通编译","query":"","page":""},{"title":"积分商城","page":"pages/IntegralMall/IntegralMall"},{"title":"我的消费","page":"pages/mySpend/mySpend"},{"title":"动态子页面_pageId","page":"subPackage/page/pages/subPage/subPage"}],"compilerIndex":0}
{"undefined::component2":false,"undefined::_enableAutoPush":false,"undefined::_appIdList":[],"undefined::uploadTime":"","undefined::packageSize":0,"tinyType":"alipay","tinyCnName":"支付宝","tinyProjectType":"alipay-mini","alipay:alipay-mini:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/rcwFIauzePpMqlTzzanK.svg","alipay:alipay-mini:auditLink":null,"alipay:alipay-mini:whiteListLink":null,"alipay:alipay-mini:createLink":null,"alipay:alipay-mini:component2":true,"alipay:alipay-mini:_enableAutoPush":true,"alipay:alipay-mini:_appIdList":[{"appid":"2019071665852502","name":"daqian_01"}],"alipay:alipay-mini:uploadTime":"","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"_userInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/TB1IDu6XSFP81Jk6XeCXXcswpXa","city":"上海市","countryCode":"CN","gender":"f","nickName":"大倩。","province":"上海"},"_loginCode":"577fdba733eb4a98a5391c000555PX16","reLoginErr":false},"alipay:alipay-mini:_appId":"2019071665852502","alipay:alipay-mini:_appName":"daqian_01","alipay:alipay-mini:remoteVersion":"0.0.0","alipay:alipay-mini:currentVersion":"0.0.1","alipay:alipay-mini:whiteList":[],"alipay:alipay-mini:h5WhiteList":[],"alipay:alipay-mini:appLogo":"https://appstoreisvpic.alipayobjects.com/prod/eebdb2f7-2747-499e-9a22-2b89664d7739.png","alipay:alipay-mini:userAuthorization":["userInfo","phoneNumber"],"isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"compilerList":[{"title":"普通编译","query":"","page":""},{"title":"积分商城","page":"pages/IntegralMall/IntegralMall"},{"title":"我的消费","page":"pages/mySpend/mySpend"},{"title":"动态子页面_pageId","page":"subPackage/page/pages/subPage/subPage"}],"compilerIndex":0}
\ No newline at end of file
{"tabs":["file:///f%3A/code/7_Eleven_Alipay/component/authorization-modal/authorization-modal.axml","file:///f%3A/code/7_Eleven_Alipay/component/authorization-modal/authorization-modal.js","file:///f%3A/code/7_Eleven_Alipay/utils/wxService.js","file:///f%3A/code/7_Eleven_Alipay/utils/util.js"],"current":"file:///f%3A/code/7_Eleven_Alipay/component/authorization-modal/authorization-modal.axml"}
{"tabs":["file:///f%3A/code/7_Eleven_Alipay/app.json"],"current":"file:///f%3A/code/7_Eleven_Alipay/app.json"}
\ No newline at end of file
......@@ -23,5 +23,7 @@ require('../../pages/consumptionDetails/consumptionDetails');
require('../../pages/IntegralMall/IntegralMall');
require('../../pages/integralMallDetail/integralMallDetail');
require('../../pages/activateCard/activateCardCallback');
require('../../pages/pointList/pointList');
require('../../pages/pointDetail/pointDetail');
require('../../subPackage/page/pages/subPage/subPage');
require('../../subPackage/page/pages/h5/h5page');
......@@ -40,6 +40,8 @@ require('../../pages/consumptionDetails/consumptionDetails');
require('../../pages/IntegralMall/IntegralMall');
require('../../pages/integralMallDetail/integralMallDetail');
require('../../pages/activateCard/activateCardCallback');
require('../../pages/pointList/pointList');
require('../../pages/pointDetail/pointDetail');
require('../../subPackage/page/pages/subPage/subPage');
require('../../subPackage/page/pages/h5/h5page');
}
......
{"files":["f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.json","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\wx2my.js","f:\\code\\7_Eleven_Alipay\\project.config.json","f:\\code\\7_Eleven_Alipay\\package-lock.json","f:\\code\\7_Eleven_Alipay\\Behavior.js","f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7-Eleven\\src_output\\utils\\util.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7-Eleven\\src_output\\pages\\userCenter\\userCenter.js","f:\\code\\7-Eleven\\src_output\\utils\\wxService.js","f:\\code\\7-Eleven\\src_output\\app.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.axml","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.acss","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.js","f:\\code\\7-Eleven\\src_output\\utils\\common.js","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.axml","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.json","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.js","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.axml","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.acss","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.js","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.axml","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.acss","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.acss","f:\\code\\7-Eleven\\src_output\\app.json","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.json","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.axml","f:\\code\\7-Eleven\\src_output\\pages\\coupons\\coupons.acss","f:\\code\\7-Eleven\\src_output\\component\\picNav\\picNav.js","f:\\code\\7-Eleven\\src_output\\utils\\Http.js","f:\\code\\7-Eleven\\src_output\\component\\noMore\\noMore.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7-Eleven\\src_output\\pages\\userCenter\\userCenter.axml","f:\\code\\7-Eleven\\src_output\\pages\\userCenter\\userCenter.acss","f:\\code\\7-Eleven\\src_output\\component\\picNav\\picNav.axml","f:\\code\\7-Eleven\\src_output\\codeUtils\\qrcode.js","f:\\code\\7-Eleven\\src_output\\utils\\renderPage.js","f:\\code\\7-Eleven\\src_output\\lib\\bluebird.js","f:\\code\\7-Eleven\\src_output\\codeUtils\\barcode.js","f:\\code\\7-Eleven\\src_output\\component\\picNav\\picNav.acss","f:\\code\\7-Eleven\\src_output\\pages\\deliveryService\\deliveryService.js"]}
{"files":["f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\utils\\Http.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.json","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\wx2my.js","f:\\code\\7_Eleven_Alipay\\project.config.json","f:\\code\\7_Eleven_Alipay\\package-lock.json","f:\\code\\7_Eleven_Alipay\\Behavior.js","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7-Eleven\\src_output\\utils\\util.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7-Eleven\\src_output\\pages\\userCenter\\userCenter.js","f:\\code\\7-Eleven\\src_output\\utils\\wxService.js","f:\\code\\7-Eleven\\src_output\\app.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.axml","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.acss","f:\\code\\7-Eleven\\src_output\\component\\bottom\\bottom.js","f:\\code\\7-Eleven\\src_output\\utils\\common.js","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.axml","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\h5\\h5page.json","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.js","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.axml","f:\\code\\7-Eleven\\src_output\\component\\imageSwiper\\imageSwiper.acss","f:\\code\\7-Eleven\\src_output\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.js","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.axml","f:\\code\\7-Eleven\\src_output\\pages\\mySpend\\mySpend.acss","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.acss","f:\\code\\7-Eleven\\src_output\\app.json","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.json","f:\\code\\7-Eleven\\src_output\\pages\\IntegralMall\\IntegralMall.axml","f:\\code\\7-Eleven\\src_output\\pages\\coupons\\coupons.acss","f:\\code\\7-Eleven\\src_output\\component\\picNav\\picNav.js","f:\\code\\7-Eleven\\src_output\\utils\\Http.js","f:\\code\\7-Eleven\\src_output\\component\\noMore\\noMore.js","f:\\code\\7-Eleven\\src_output\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7-Eleven\\src_output\\pages\\userCenter\\userCenter.axml","f:\\code\\7-Eleven\\src_output\\pages\\userCenter\\userCenter.acss","f:\\code\\7-Eleven\\src_output\\component\\picNav\\picNav.axml","f:\\code\\7-Eleven\\src_output\\codeUtils\\qrcode.js","f:\\code\\7-Eleven\\src_output\\utils\\renderPage.js","f:\\code\\7-Eleven\\src_output\\lib\\bluebird.js","f:\\code\\7-Eleven\\src_output\\codeUtils\\barcode.js","f:\\code\\7-Eleven\\src_output\\component\\picNav\\picNav.acss"]}
\ No newline at end of file
......@@ -12,7 +12,9 @@
"pages/consumptionDetails/consumptionDetails",
"pages/IntegralMall/IntegralMall",
"pages/integralMallDetail/integralMallDetail",
"pages/activateCard/activateCardCallback"
"pages/activateCard/activateCardCallback",
"pages/pointList/pointList",
"pages/pointDetail/pointDetail"
],
"subPackages": [
{
......
/* pages/userCenter.wxss */
@import './../../base/base.acss';
page{
background-color: #ffffff;
}
.page-mySpend{
padding: 0 32rpx;
}
.spend-wrap{
padding: 28rpx 0;
border-bottom: 1px solid #e5e5e5;
}
.spend-id{
color: #999999;
}
.spend-time,.spend-shop{
color: #666666;
}
.spend-list{
position: relative;
}
.spend-status{
color: #05c35b;
position: absolute;
right: 0;
bottom: 0;
}
.fail-status{
color: #999999;
}
.no-bottom {
margin: 50rpx 0;
}
.detail-list-no {
padding-top: 200rpx;
text-align: center;
color: #cccccc;
font-size: 28rpx;
}
<!--pages/userCenter.axml-->
<view a:if="{{!orderList.length}}" class="detail-list-no">还没有任何消费记录</view>
<view class="page-mySpend" a:if="{{orderList.length}}">
<scroll-view scroll-y onScrollToLower="bindDownLoad">
<view
class="spend-wrap"
a:for="{{orderList}}"
a:for-item="item"
a:for-index="k"
a:key="{{k}}"
>
<view
class="spend-list"
data-order-no="{{item.orderNo}}"
onTap="goDetail"
>
<view class="spend-id fs-22">订单编号:{{item.orderNo}}</view>
<view class="spend-time fs-25">消费时间:{{item.payTime}}</view>
<view class="spend-shop fs-25">消费门店:{{item.storeName}}</view>
<view class="spend-status fs-22">交易成功</view>
</view>
</view>
</scroll-view>
<view class="no-bottom">
<no-more a:if="{{noMore}}"/>
</view>
</view>
\ No newline at end of file
const wx2my = require('../../wx2my');
const Behavior = require('../../Behavior');
// pages/userCenter.js
const app = getApp();
const wxService = require('../../utils/wxService');
const utils = require('../../utils/util');
const envInfo = require('../../config/index').envInfo;
wxService.page({
/**
* 页面的初始数据
*/
data: {
pageNo: 1,
pageSize: 10,
totalPages: '',
orderList: [],
noMore: false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) { },
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
// const { orderNo } = this.options
this.initOrderList(this.data.pageNo, this.data.pageSize);
},
goDetail(e) {
const {
orderNo
} = e.currentTarget.dataset; // pages/consumptionDetails/consumptionDetails
wxService.router(`/pages/consumptionDetails/consumptionDetails?orderNo=${orderNo}`);
},
//获取消费列表
initOrderList(pageNo, pageSize) {
wx2my.showLoading({
title: '加载中'
}); // 取会员id
const {
memberId
} = wx2my.getStorageSync('_baseUserInfo');
const params = {
memberId
};
wxService.post(`/sale/order/list?pageNo=${pageNo}&pageSize=${pageSize}`, params).then(res => {
if (res) {
const {
result,
data
} = res.data;
if (result == 0) {
wx2my.hideLoading(); // 数量
this.setData({
orderList: this.data.pageNo == 1 ? [...data.content] : [...this.data.orderList, ...data.content],
totalPages: data.totalPages
});
}
}
}).finally(() => {
wx2my.hideLoading();
});
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() { },
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
if (this.data.pageNo < this.data.totalPages) {
this.setData({
pageNo: this.data.pageNo + 1,
pageSize: 10,
noMore: true
}); //
this.initOrderList(this.data.pageNo, this.data.pageSize);
} else {
this.setData({
noMore: true
});
}
}
});
\ No newline at end of file
{
"usingComponents": {
"no-more": "/component/noMore/noMore"
},
"defaultTitle": "我的消费",
"pullRefresh": true
}
\ No newline at end of file
/* pages/userCenter.wxss */
@import './../../base/base.acss';
page{
background-color: #ffffff;
}
.page-mySpend{
padding: 0 32rpx;
}
.spend-wrap{
padding: 28rpx 0;
border-bottom: 1px solid #e5e5e5;
}
.spend-id{
color: #999999;
}
.spend-time,.spend-shop{
color: #666666;
}
.spend-list{
position: relative;
}
.spend-status{
color: #05c35b;
position: absolute;
right: 0;
bottom: 0;
}
.fail-status{
color: #999999;
}
.no-bottom {
margin: 50rpx 0;
}
.detail-list-no {
padding-top: 200rpx;
text-align: center;
color: #cccccc;
font-size: 28rpx;
}
<!--pages/userCenter.axml-->
<view a:if="{{!orderList.length}}" class="detail-list-no">还没有任何消费记录</view>
<view class="page-mySpend" a:if="{{orderList.length}}">
<scroll-view scroll-y onScrollToLower="bindDownLoad">
<view
class="spend-wrap"
a:for="{{orderList}}"
a:for-item="item"
a:for-index="k"
a:key="{{k}}"
>
<view
class="spend-list"
data-order-no="{{item.orderNo}}"
onTap="goDetail"
>
<view class="spend-id fs-22">订单编号:{{item.orderNo}}</view>
<view class="spend-time fs-25">消费时间:{{item.payTime}}</view>
<view class="spend-shop fs-25">消费门店:{{item.storeName}}</view>
<view class="spend-status fs-22">交易成功</view>
</view>
</view>
</scroll-view>
<view class="no-bottom">
<no-more a:if="{{noMore}}"/>
</view>
</view>
\ No newline at end of file
const wx2my = require('../../wx2my');
const Behavior = require('../../Behavior');
// pages/userCenter.js
const app = getApp();
const wxService = require('../../utils/wxService');
const utils = require('../../utils/util');
const envInfo = require('../../config/index').envInfo;
wxService.page({
/**
* 页面的初始数据
*/
data: {
pageNo: 1,
pageSize: 10,
totalPages: '',
orderList: [],
noMore: false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) { },
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
// const { orderNo } = this.options
this.initOrderList(this.data.pageNo, this.data.pageSize);
},
goDetail(e) {
const {
orderNo
} = e.currentTarget.dataset; // pages/consumptionDetails/consumptionDetails
wxService.router(`/pages/consumptionDetails/consumptionDetails?orderNo=${orderNo}`);
},
//获取消费列表
initOrderList(pageNo, pageSize) {
wx2my.showLoading({
title: '加载中'
}); // 取会员id
const {
memberId
} = wx2my.getStorageSync('_baseUserInfo');
const params = {
memberId
};
wxService.post(`/sale/order/list?pageNo=${pageNo}&pageSize=${pageSize}`, params).then(res => {
if (res) {
const {
result,
data
} = res.data;
if (result == 0) {
wx2my.hideLoading(); // 数量
this.setData({
orderList: this.data.pageNo == 1 ? [...data.content] : [...this.data.orderList, ...data.content],
totalPages: data.totalPages
});
}
}
}).finally(() => {
wx2my.hideLoading();
});
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() { },
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
if (this.data.pageNo < this.data.totalPages) {
this.setData({
pageNo: this.data.pageNo + 1,
pageSize: 10,
noMore: true
}); //
this.initOrderList(this.data.pageNo, this.data.pageSize);
} else {
this.setData({
noMore: true
});
}
}
});
\ No newline at end of file
{
"usingComponents": {
"no-more": "/component/noMore/noMore"
},
"defaultTitle": "我的消费",
"pullRefresh": true
}
\ No newline at end of file
......@@ -60,13 +60,14 @@ class Http {
}
},
complete: function(data) {
that.state = 'loaded';
if (complete) {
reject(data);
} else {
reject(data);
} // complete ? complete.apply(this, arguments) : reject(data)
// that.state = 'loaded';
// if (complete) {
// reject(data);
// } else {
// reject(data);
// }
// complete ? complete.apply(this, arguments) : reject(data)
}
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment