Skip to content

7
7-Eleven
Commit 5c916155 by 高淑倩
Options

Merge branch 'dev' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev

parents a6226c87 a7c52287
Showing with 213 additions and 190 deletions
src/pages/IntegralMall/IntegralMall.js
......@@ -9,7 +9,11 @@ wxService.page({
* 页面的初始数据
*/
data: {
params: {
pageNo: '1',
pageSize: '10'
},
totalPages: ''
},
/**
......@@ -20,51 +24,62 @@ wxService.page({
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
this.initIntegralCouponList()
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
//获取消费列表
initIntegralCouponList(type) {
wx.showLoading({
title: '加载中'
})
wxService.get(`/coupon/pointsRedemptionCouponSetting/findPage?pageNo=${this.data.params.pageNo}&pageSize=${this.data.params.pageSize}`).then(res => {
let integralCouponList = [];
integralCouponList = this.data.params.pageNo == 1 ? res.data.data : this.data.integralCouponList.concat(res.data.data);
this.setData({
integralCouponList,
totalPages: res.data.data.totalPages,
})
wx.hideLoading();
if (type && type.pullDown) wx.stopPullDownRefresh();
}).finally(() => {
wx.hideLoading();
this.setData({
integralCouponList: ''
})
})
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
this.setData({
params: {
pageNo: 1,
pageSize: 10,
},
})
this.initIntegralCouponList({
pullDown: true
});
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
bindDownLoad: function () {
if (this.data.params.pageNo < this.data.totalPages) {
this.setData({
params: {
pageNo: this.data.params.pageNo + 1,
pageSize: 10
},
loadDataDone: true
})
this.initIntegralCouponList()
}
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
src/pages/IntegralMall/IntegralMall.wxml
<!--pages/userCenter.wxml-->
<view class='page-integral-mall'>
<navigator hover-class='none' url='/pages/memberRules/memberRules'> <view class='integral-vip-rules'>会员规则</view></navigator>
<view class='coupon-wrap'>
<view class='coupon-list'>
<navigator hover-class='none' url='/pages/couponDetail/couponDetail'>
<scroll-view scroll-y bindscrolltolower="bindDownLoad">
<view class='coupon-wrap'>
<view class='coupon-list'>
<navigator hover-class='none' url='/pages/couponDetail/couponDetail'>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image>
<view class='coupon-img'>
<image src='/assets/imgs/qr-code.png'></image>
</view>
<view class='coupon-info'>
<view class='coupon-name fs-28'>卡劵名称</view>
<view class='coupon-time fs-24'>时间</view>
<view class='coupon-desc fs-24'>查看详情</view>
</view>
<view class='coupon-code fs-24'>立即兑换</view>
</navigator>
</view>
<view class='coupon-list'>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image>
<view class='coupon-img'>
<image src='/assets/imgs/qr-code.png'></image>
......@@ -13,22 +27,11 @@
<view class='coupon-time fs-24'>时间</view>
<view class='coupon-desc fs-24'>查看详情</view>
</view>
<view class='coupon-code fs-24'>立即兑换</view>
</navigator>
</view>
<view class='coupon-list'>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image>
<view class='coupon-img'>
<image src='/assets/imgs/qr-code.png'></image>
<view class='coupon-code fs-24'>出示劵码</view>
</view>
<view class='coupon-info'>
<view class='coupon-name fs-28'>卡劵名称</view>
<view class='coupon-time fs-24'>时间</view>
<view class='coupon-desc fs-24'>查看详情</view>
</view>
<view class='coupon-code fs-24'>出示劵码</view>
</view>
</view>
</scroll-view>
<view class='empty-wrap'>
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png'></image>
......
src/pages/consumptionDetails/consumptionDetails.js
......@@ -34,13 +34,6 @@ wxService.page({
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
......@@ -48,38 +41,14 @@ wxService.page({
console.log('options',options.memberid)
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
initOrderDetail(){
wxService.post(`/order/findById?id=${id}`).then(res => {
this.setData({
orderDetail:res.data.ddat.content
})
}).finally(() => {
})
}
})
\ No newline at end of file
src/pages/couponDetail/couponDetail.js
......@@ -12,20 +12,7 @@ wxService.page({
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
......@@ -33,38 +20,15 @@ wxService.page({
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
// 查询单个优惠券
getCouponDetail(){
wxService.post(`/coupon/coupon/setting/get/${id}`).then(res => {
this.setData({
couponDetail: res.data.data.content
})
}).finally(() => {
})
}
})
\ No newline at end of file
src/pages/coupons/coupons.js
......@@ -18,8 +18,20 @@ wxService.page({
name:'已失效'
}
],
navIndex:'1'
navIndex:'1',
params:{
pageNo:1,
pageSize:10
},
queryData:{
query:{
"brandId": 0,
"couponSettingId": 0,
"status": 0,
"title": ""
}
},
totalPages:''
},
/**
......@@ -34,13 +46,73 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.queryData.setData({
'query.status': this.data.navIndex
})
this.getCouponList()
},
//切换tab
switchTab(e){
this.setData({
navIndex: e.currentTarget.dataset.index
navIndex: e.currentTarget.dataset.index,
'query.status': e.currentTarget.dataset.index
})
}
this.getCouponList()
},
//获取优惠券列表
getCouponList(type){
wx.showLoading({
title: '加载中'
})
this.queryData.setData({
'query.status': this.data.navIndex
})
wxService.post(`/coupon/coupon/setting/list?pageNo=${this.data.params.pageNo}&pageSize=${this.data.params.pageSize}`, this.queryData).then(res => {
let couponList = [];
couponList = this.data.params.pageNo == 1 ? res.data.data : this.data.couponList.concat(res.data.data);
this.setData({
couponList,
totalPages: res.data.data.totalPages,
})
wx.hideLoading();
if (type && type.pullDown) wx.stopPullDownRefresh();
}).finally(() => {
wx.hideLoading();
this.setData({
couponList: ''
})
})
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
this.setData({
params: {
pageNo: 1,
pageSize: 10,
},
})
this.getCouponList({
pullDown: true
});
},
/**
* 页面上拉触底事件的处理函数
*/
bindDownLoad: function () {
if (this.data.params.pageNo < this.data.totalPages) {
this.setData({
params: {
pageNo: this.data.params.pageNo + 1,
pageSize: 10
},
loadDataDone: true
})
this.getCouponList()
}
},
})
\ No newline at end of file
src/pages/coupons/coupons.wxml
......@@ -3,9 +3,27 @@
<view class='tabs-wrap'>
<view wx:for='{{nav}}' wx:key='{{index}}' class="tab-nav fs-25 {{navIndex == item.type ? 'nav-active' : ''}}" data-index='{{item.type}}' bindtap='switchTab'>{{item.name}}(0)</view>
</view>
<view class='coupon-wrap'>
<view class='coupon-list'>
<navigator hover-class='none' url='/pages/couponDetail/couponDetail'>
<scroll-view scroll-y bindscrolltolower="bindDownLoad">
<view class='coupon-wrap'>
<view class='coupon-list'>
<navigator hover-class='none' url='/pages/couponDetail/couponDetail'>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image>
<view class='coupon-img'>
<image src='/assets/imgs/qr-code.png'></image>
</view>
<view class='coupon-info'>
<view class='coupon-name fs-28'>卡劵名称</view>
<view class='coupon-time fs-24'>时间</view>
<view class='coupon-desc fs-24'>是个梵蒂冈设计费郭德纲发电机房</view>
</view>
<view class='coupon-code fs-24'>出示劵码</view>
</navigator>
</view>
<view class='coupon-list'>
<!-- 失效 -->
<view class='invalid-coupon'></view>
<image src='/assets/imgs/invalid.png' class='invalid-img'></image>
<!-- 未失效 -->
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image>
<view class='coupon-img'>
<image src='/assets/imgs/qr-code.png'></image>
......@@ -16,29 +34,13 @@
<view class='coupon-desc fs-24'>是个梵蒂冈设计费郭德纲发电机房</view>
</view>
<view class='coupon-code fs-24'>出示劵码</view>
</navigator>
</view>
<view class='coupon-list'>
<!-- 失效 -->
<view class='invalid-coupon'></view>
<image src='/assets/imgs/invalid.png' class='invalid-img'></image>
<!-- 未失效 -->
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image>
<view class='coupon-img'>
<image src='/assets/imgs/qr-code.png'></image>
</view>
<view class='coupon-info'>
<view class='coupon-name fs-28'>卡劵名称</view>
<view class='coupon-time fs-24'>时间</view>
<view class='coupon-desc fs-24'>是个梵蒂冈设计费郭德纲发电机房</view>
</view>
<view class='empty-wrap'>
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png'></image>
<view class='empty-text'>没有任何卡劵</view>
</view>
<view class='coupon-code fs-24'>出示劵码</view>
</view>
</view>
<view class='empty-wrap'>
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png'></image>
<view class='empty-text'>没有任何卡劵</view>
</view>
</view>
</view>
</scroll-view>
</view>
src/pages/integralMallDetail/integralMallDetail.js
......@@ -9,14 +9,6 @@ Page({
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
......@@ -28,5 +20,16 @@ Page({
this.setData({
isExchange :true
})
},
//获取积分兑换优惠券详情
getIntegralCouponDetail(){
wxService.get(`/coupon/pointsRedemptionCouponSetting/get/${id}`).then(res => {
this.setData({
integralCouponDetail: res.data.data.content
})
}).finally(() => {
})
}
})
\ No newline at end of file
src/pages/mySpend/mySpend.js
......@@ -35,7 +35,7 @@ wxService.page({
wx.showLoading({
title: '加载中'
})
wxService.post('/sale/order/list',this.data.params).then(res => {
wxService.post(`/sale/order/list?pageNo=${this.data.params.pageNo}&pageSize=${this.data.params.pageSize}`,{}).then(res => {
let orderList = [];
orderList = this.data.params.pageNo == 1 ? res.data.data : this.data.orderList.concat(res.data.data);
this.setData({
......
src/pages/mySpend/mySpend.wxml
<!--pages/userCenter.wxml-->
<view class='page-mySpend'>
<scroll-view scroll-y bindscrolltolower="bindDownLoad">
<view class='spend-wrap'>
<!-- <view class='spend-wrap' wx:for='{{orderList}}' wx:key='{{index}}'> -->
<navigator url='/pages/consumptionDetails/consumptionDetails' hover-class='none'>
<view class='spend-list'>
<view class='spend-id fs-22'>订单编号：8327878435</view>
<view class='spend-time fs-25'>消费时间：</view>
<view class='spend-shop fs-25'>消费门店：张江高科店</view>
<view class='spend-id fs-22'>订单编号：{{item.orderId}}</view>
<view class='spend-time fs-25'>消费时间：{{item.createTime}}</view>
<view class='spend-shop fs-25'>消费门店：{{item.storeName}}</view>
<view class="spend-status fs-22 {{true ? 'fail-status' : ''}}">交易成功</view>
</view>
</navigator>
</view>
<view class='spend-wrap'>
<view class='spend-list'>
<view class='spend-id fs-22'>订单编号：8327878435</view>
<view class='spend-time fs-25'>消费时间：</view>
<view class='spend-shop fs-25'>消费门店：张江高科店</view>
<view class='spend-status fs-22'>交易成功</view>
</view>
</view>
<!-- </view> -->
</scroll-view>
</view>
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