Skip to content

严立 / mini-shimao

Go to a project
Commit 9d452e3a by zqm
Options

MM - 积分模块

parent c40da588
Inline Side-by-side
Showing with 223 additions and 54 deletions
pages/mine/accumulate/accumulate.js
......@@ -2,32 +2,58 @@ let App = getApp()
Page({
data: {
imageResourcesBase: App.globalData.appResourcesBase,
showMenu: false,
menu: '全 部',
menuList: [
{id: 0, name: '全 部'},
{id: 1, name: '获 取'},
{id: 2, name: '已使用'}
menuList: [{
id: '',
name: '全 部'
},
{
id: 0,
name: '获 取'
},
{
id: 1,
name: '已使用'
}
],
pageNo: '1',
pageSize: '-1',
type: '', // "" 全部 0 获取 1消费(0 发放 1 兑换)
accumulateList: [],
selectedList: []
selectedList: [],
integral: '0',
type: ''
},
onLoad: function (options) {
let integral = options.integral
this.setData({
integral: integral
})
App.login({
timeout: 0,
success: (result) => {
this.getAccumulate()
},
})
},
// 获取积分列表
getAccumulate: function () {
wx.showLoading({
title: '加载中',
})
App.wxRequest({
url: '/api/v1/smUser/getIntegralDetails',
data: {
'pageNo': this.data.pageNo,
'pageSize': this.data.pageSize,
type: ''
type: this.data.type
},
success: (response) => {
wx.hideLoading({
success: (res) => {},
})
let accumulateList = response.data
let selectedList = accumulateList
this.setData({
......@@ -57,18 +83,23 @@ Page({
* @returns
*/
onTabMenu: function (event) {
let { index } = event.currentTarget.dataset
let {
index,
type
} = event.currentTarget.dataset
let menu = this.data.menuList[index].name
let selectedList = []
if (index === 0) {
selectedList = this.data.accumulateList
} else {
selectedList = selectedList.filter(v => v.type === index-1)
selectedList = selectedList.filter(v => v.type === index - 1)
}
this.setData({
menu,
selectedList
selectedList,
type: type
})
this.onHideMenu()
this.getAccumulate()
}
})
\ No newline at end of file
pages/mine/accumulate/accumulate.wxml
......@@ -2,10 +2,11 @@
<view class="container con-s" bindtap="onHideMenu">
<!-- 积分背景图 -->
<image class="banner" src=""></image>
<image class="banner" src="{{imageResourcesBase + 'mine/home/integral-bg.png'}}"></image>
<view class="opacity-cover"></view>
<view class="my-accumulate">
<text>1888</text>
<text>{{integral}}</text>
</view>
<view class="accumulate-tips">
......@@ -17,7 +18,8 @@
<image src="/image/icon/arrow-b-2.png"></image>
<view class="banner-menu-down col" wx:if="{{showMenu}}">
<block wx:for="{{menuList}}" wx:key="id">
<text class="{{menu === item.name ? 'selected' : ''}}" catchtap="onTabMenu" data-index="{{index}}">{{item.name}}</text>
<text class="{{menu === item.name ? 'selected' : ''}}" data-type="{{item.id}}" catchtap="onTabMenu"
data-index="{{index}}">{{item.name}}</text>
</block>
</view>
</view>
......
pages/mine/accumulate/accumulate.wxss
......@@ -9,6 +9,15 @@ page {
.banner {
position: fixed;
z-index: -2;
top: 0;
left: 0;
width: 750rpx;
height: 480rpx;
}
.opacity-cover {
position: fixed;
z-index: -1;
top: 0;
left: 0;
......@@ -54,11 +63,11 @@ page {
width: 166rpx;
height: 180rpx;
background: rgba(255, 255, 255, 0.95);
box-shadow: 10px 4px 40px 0px rgba(181,164,164,0.3);
box-shadow: 10px 4px 40px 0px rgba(181, 164, 164, 0.3);
border-radius: 4rpx;
}
.banner-menu-down text{
.banner-menu-down text {
flex: 1;
padding-left: 24rpx;
color: #959CA8;
......@@ -123,9 +132,11 @@ page {
font-size: 30rpx;
color: #E66060;
}
.accumulate-right text {
margin-left: 6rpx;
}
.accumulate-type-color {
color: #959DA9;
}
\ No newline at end of file
pages/mine/home/home.js
......@@ -8,6 +8,7 @@ Page({
data: {
isCheckPermission: false,
imageBase: App.globalData.appImageBase,
imageResourcesBase: App.globalData.appResourcesBase,
orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
......@@ -79,7 +80,8 @@ Page({
title: '日落观光游船体验活动之船行碧波共赏美景',
num: 3
}],
orderListBackup: []
orderListBackup: [],
integral: 0, //积分
},
close() {
......@@ -90,14 +92,7 @@ Page({
animation: true,
})
},
maskShow() {
this.setData({
mask: true
});
wx.hideTabBar({
animation: true,
})
},
/**
* 生命周期函数--监听页面加载
*/
......@@ -108,6 +103,13 @@ Page({
onShow: function () {
this.setUserInfo()
},
// 查看积分明细
goIntegralDetail(event) {
let integral = event.currentTarget.dataset.integral
wx.navigateTo({
url: '/pages/mine/accumulate/accumulate?integral=' + integral,
})
},
// 去核销
goCouponInput(event) {
wx.navigateTo({
......@@ -115,7 +117,7 @@ Page({
})
},
// 获取核销权限
// api/v1/login/getPermissions权限更上去了
getPermissions() {
let that = this
App.wxRequest({
......@@ -143,6 +145,23 @@ Page({
}
})
},
// 获取积分
getIntegral() {
let that = this
App.wxRequest({
url: '/api/v1/smUser/getIntegral', //api/v1/smUser/getIntegral
data: {},
success: function (res) {
let integral = res.data ? res.data.integral : '0'
that.setData({
integral: integral
})
}
})
},
//获取待使用订单
getWillUseOrders() {
let that = this
......@@ -227,10 +246,16 @@ Page({
isRegister: true,
userInfo: funcUserInfo
})
App.login({
timeout: 0,
success: (result) => {
this.getMyActivityList()
this.getCardList()
this.getWillUseOrders()
this.getPermissions()
this.getIntegral()
},
})
} else {
this.setData({
isRegister: false,
......
pages/mine/home/home.wxml
......@@ -9,12 +9,13 @@
</view>
<view wx:if="{{isRegister}}" class="mine-info col">
<view class="row align-c">
<view class="row align-c" style="height:76rpx">
<text>{{userInfo.name}}</text>
<image src="./image/inform.png" bindtap="goMyInfo"></image>
</view>
<view>
<text>{{userInfo.phone}}</text>
<view class="owner-tag">
<!-- <text>{{userInfo.phone}}</text> -->
<button class="user-type">游客</button>
</view>
</view>
<view wx:else class="mine-info col">
......@@ -22,27 +23,39 @@
<text style="color:#333333;font-weight:500;">登录/注册</text>
</view>
</view>
<view bindtap="goIntegralDetail" data-integral="{{integral}}" class="integral "
style="position:relative;z-index:2; flex:1">
<view class="integral-num">{{integral}}</view>
<view class="integral-title">我的积分 <image class="arrow-r"
src="{{imageResourcesBase+'mine/home/huise_arrow_right.png'}}"></image>
</view>
</view>
</view>
</view>
<view class="mine" style="height:512rpx" wx:if="{{type == 1}}">
<image class="background-image" style="height:512rpx;" src="http://upload.miaomiao-bao.com/8f046202008201043321555.jpg"></image>
<image class="background-image" style="height:512rpx;"
src="http://upload.miaomiao-bao.com/8f046202008201043321555.jpg"></image>
<view class="row align-c approve">
<view class="mine-avatar">
<l-avatar size="112" src="{{userInfo.avatar}}"/>
<l-avatar size="112" src="{{userInfo.avatar}}" />
</view>
<view class="mine-info col">
<view class="row align-c">
<text style="color:#F0DABB;font-weight:500;">{{userInfo.name}}</text>
<view class="row align-c" style="height:76rpx">
<text style="color:#F0DABB;font-weight:500;" class="padding-l-18">{{userInfo.name}}</text>
<image src="/image/inform-w.png" bindtap="goMyInfo"></image>
</view>
<view>
<text>{{userInfo.phone}}</text>
<view class="owner-tag">
<!-- <text>{{userInfo.phone}}</text> -->
<image mode="aspectFill" src="{{imageResourcesBase+'mine/home/ownerTag.png'}}"></image>
</view>
</view>
<view bindtap="goIntegralDetail" data-integral="{{integral}}" class=" integral glod"
style="position:relative;z-index:2; flex:1">
<view class="integral-num">{{integral}}</view>
<view class="integral-title">我的积分 <image class="arrow-r"
src="{{imageResourcesBase+'mine/home/glod_arrow_right.png'}}"></image>
</view>
<view bindtap="maskShow" class="align-c" style="positive:relative;margin-left:68rpx;display:flex;">
<image src="http://upload.miaomiao-bao.com/62e04202008201417045326.png" class="approve-icon"></image>
<view class="rule">园区业主</view>
</view>
</view>
</view>
......@@ -87,35 +100,40 @@
<view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c">
<image src="/image/audit-err.png"></image>
<view class="order-activity-badge {{ passBadge > 9 ? 'badge-widen' : ''}}" wx:if="{{passBadge > 0}}">{{passBadge > 99 ? '···' : passBadge}}</view>
<view class="order-activity-badge {{ passBadge > 9 ? 'badge-widen' : ''}}"
wx:if="{{passBadge > 0}}">{{passBadge > 99 ? '···' : passBadge}}</view>
</view>
<text>门票</text>
</view>
<view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c">
<image src="/image/audit-err.png"></image>
<view class="order-activity-badge {{ foodBadge > 9 ? 'badge-widen' : ''}}" wx:if="{{foodBadge > 0}}">{{foodBadge > 99 ? '···' : foodBadge}}</view>
<view class="order-activity-badge {{ foodBadge > 9 ? 'badge-widen' : ''}}"
wx:if="{{foodBadge > 0}}">{{foodBadge > 99 ? '···' : foodBadge}}</view>
</view>
<text>餐饮</text>
</view>
<view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c">
<image src="/image/audit-err.png"></image>
<view class="order-activity-badge {{ movieBadge > 9 ? 'badge-widen' : ''}}" wx:if="{{movieBadge > 0}}">{{movieBadge > 99 ? '···' : movieBadge}}</view>
<view class="order-activity-badge {{ movieBadge > 9 ? 'badge-widen' : ''}}"
wx:if="{{movieBadge > 0}}">{{movieBadge > 99 ? '···' : movieBadge}}</view>
</view>
<text>影票</text>
</view>
<view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c">
<image src="/image/audit-err.png"></image>
<view class="order-activity-badge {{ spaBadge > 9 ? 'badge-widen' : ''}}" wx:if="{{spaBadge > 0}}">{{spaBadge > 99 ? '···' : spaBadge}}</view>
<view class="order-activity-badge {{ spaBadge > 9 ? 'badge-widen' : ''}}"
wx:if="{{spaBadge > 0}}">{{spaBadge > 99 ? '···' : spaBadge}}</view>
</view>
<text>SPA</text>
</view>
<view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c">
<image src="/image/audit-err.png"></image>
<view class="order-activity-badge {{ artBadge > 9 ? 'badge-widen' : ''}}" wx:if="{{artBadge > 0}}">{{artBadge > 99 ? '···' : artBadge}}</view>
<view class="order-activity-badge {{ artBadge > 9 ? 'badge-widen' : ''}}"
wx:if="{{artBadge > 0}}">{{artBadge > 99 ? '···' : artBadge}}</view>
</view>
<text>文创</text>
</view>
......@@ -127,7 +145,10 @@
<view class="pass-bg-one" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-bg-two" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-logo-wrapper row align-c">
<view class="logo-box">
<image src="{{myOrder.passOrder[0].logo}}"></image>
</view>
<text>{{myOrder.passOrder[0].officeName}}</text>
</view>
<view class="pass-title">
......@@ -153,7 +174,8 @@
<text>{{item.officeName}}</text>
</view>
<view class="goods-content row align-c">
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k" wx:key="*this"></image>
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k" wx:key="*this">
</image>
<text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text>
</view>
<view class="goods-footer row align-c con-b">
......@@ -187,21 +209,24 @@
<view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c">
<image src="/image/audit-err.png"></image>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}">{{badge}}</view>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}">
{{badge}}</view>
</view>
<text>主题活动</text>
</view>
<view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c">
<image src="/image/audit-err.png"></image>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}">{{badge}}</view>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}">
{{badge}}</view>
</view>
<text>夜间入园预约</text>
</view>
<view class="order-activity-icon-wrapper col align-c">
<view class="order-activity-icon row con-c align-c">
<image src="/image/audit-err.png"></image>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}">{{badge}}</view>
<view class="order-activity-badge {{ badge > 9 ? 'badge-widen' : ''}}" wx:if="{{badge}}">
{{badge}}</view>
</view>
<text>看房预约</text>
</view>
......@@ -258,7 +283,8 @@
</view>
</view>
<view class="border-right"></view>
<view class="appointment-subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view>
<view class="appointment-subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证
</view>
</view>
</view>
<!-- 看房预约 -->
......@@ -273,7 +299,8 @@
</view>
</view>
<view class="border-right"></view>
<view class="appointment-subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view>
<view class="appointment-subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证
</view>
</view>
</view>
</view>
......@@ -300,7 +327,8 @@
<view class="row con-c">
<image src="http://upload.miaomiao-bao.com/ea238202008201146199955.png" class="mask-img"></image>
</view>
<image src="http://upload.miaomiao-bao.com/62e04202008201417045326.png" style="width:750rpx;height:458rpx;margin-left:-73.5rpx;"></image>
<image src="http://upload.miaomiao-bao.com/62e04202008201417045326.png"
style="width:750rpx;height:458rpx;margin-left:-73.5rpx;"></image>
<view class="row align-c con-c" style="margin-top:20rpx;">
<image src="/image/xingxing.png" class="mask-icon"></image>
<text class="mask-font">业主特权</text>
......@@ -311,6 +339,6 @@
</view>
</view>
<view class="close" bindtap="close">
<l-icon name="close" color="black" size="28"/>
<l-icon name="close" color="black" size="28" />
</view>
</l-mask>
\ No newline at end of file
pages/mine/home/home.wxss
......@@ -23,6 +23,26 @@
padding: 220rpx 0 0 48rpx;
}
.user-type {
width: 126rpx;
height: 40rpx;
font-weight: 500;
font-size: 22rpx;
color: #fff;
background-color: #6783AE;
text-align: center;
line-height: 40rpx;
border-radius: 4rpx;
letter-spacing: 10rpx;
margin-top: 20rpx;
}
.owner-tag {
height: 80rpx;
width: 142rpx;
/* margin-top: 8rpx!important; */
}
.mine-avatar {
z-index: 11;
margin-right: 32rpx;
......@@ -40,6 +60,43 @@
font-size: 42rpx;
font-weight: bolder;
}
.padding-l-18{
padding-left: 18rpx;
}
/* 积分 */
.integral {
color: #0D0D0E;
text-align: right;
}
.glod {
color: #F0DABB;
}
.integral-num {
font-size: 54rpx;
line-height: 76rpx;
padding-right: 80rpx;
}
.integral-title {
display: flex;
height: 80rpx;
align-items: center;
font-size: 26rpx;
line-height: 36rpx;
flex-direction: row;
justify-content: flex-end;
padding-right: 40rpx;
}
.arrow-r {
width: 32rpx;
height: 32rpx;
margin-left: 8rpx;
}
.mine-info view:nth-child(1) image {
z-index: 11;
......@@ -64,7 +121,7 @@
padding: 41rpx 32rpx;
background-color: #fff;
border-radius: 4rpx;
margin-top:48rpx;
margin-top: 48rpx;
}
.cpopon-info {
......@@ -557,8 +614,6 @@
border-radius: 4rpx;
}
.appointment-activity-content {}
.appointment-activity-img {
width: 140rpx;
height: 136rpx;
......@@ -643,3 +698,16 @@ image {
width: 100%;
height: 100%;
}
.logo-box {
width: 100rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
margin-right: 20rpx;
}
.logo-box image {
max-width: 100%!important;
max-height: 100%!important;
}
\ No newline at end of file
pages/mine/order/order.wxss
......@@ -344,10 +344,10 @@ page {
height: 80rpx;
line-height: 80rpx;
text-align: center;
margin-right: 20rpx;
}
.logo-box image {
max-width: 100%!important;
max-height: 100%!important;
}
\ No newline at end of file
pages/pay/order-detail/order-detail.wxss
......@@ -828,6 +828,7 @@ image {
height: 80rpx;
line-height: 80rpx;
text-align: center;
margin-right: 20rpx;
}
.logo-box image {
......
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 sign in to comment