qichexitong/car_client_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.29(天天打卡

Browse Source
This commit is contained in:
Hong
2024-02-29 19:56:24 +08:00
parent 1deca5fcb9
commit 9d18a88e40
5 changed files with 423 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
api/activity/activity.js
View File

@@ -1,59 +1,34 @@
import request from '@/utils/request'
import request from "@/utils/request.js";
/**
* 活动列表
*/
export function activityList(params) {
return request({
url: `/api/front/act/activity/list`,
method: 'get',
params
})
}
/**
* 一元活动详情
*/
export function oneDollarDetails() {
// 查询每日打卡列表
export function clockList(data) {
return request({
url: `/api/front/act/oneyuan/today`,
method: 'get',
})
}
/**
* 参加一元活动,直接唤起小程序微信支付
*/
export function payOneDollar(data) {
return request({
url: `/api/front/act/oneyuan/join?activityId=${data}`,
method: 'post',
})
}
//支付参加活动
export function paycardAPI(data) {
return request({
url: `/api/front/pay/payactive`,
method: 'post',
url: '/api/front/daily/check/in/page/list',
method: 'get',
data
})
}
//报名
/**
一元活动打卡
*/
export function oneYuanClock(id) {
export function DailyJoin(data) {
return request({
url: `/api/front/act/oneyuan/clock?activityId=${id}`,
method: 'post',
url: '/api/front/daily/check/in/join',
method: 'post',
data:data
})
}
/**
获取活动背景配置
*/
export function actGetConfig(params) {
return request({
url: `/api/front/act/get/config`,
method: 'get',
params
})
//支付
export function prepay(data) {
return request({
url: '/api/front/pay/paydaily',
method: 'post',
data:data
})
}
//参加每日打卡活动创建订单
export function DailyClock(dailyCheckId) {
return request({
url: '/api/front/daily/check/in/clock/' + dailyCheckId,
method: 'post'
})
}

528
pages/mine/every_day_card/every_day_card.vue
View File

@@ -1,123 +1,182 @@
<template>
<view>
<!-- 头部 -->
<u-navbar bgColor="rgba(0,0,0,0)" :safeAreaInsetTop="true">
<u-navbar bgColor="rgba(0,0,0,0)" safeAreaInsetTop>
<view class="u-nav-slot" slot="left" @click="navBackFb">
<!-- #ifdef MP-WEIXIN -->
<image style="width: 56rpx;height: 56rpx;"
:src="`${config.aliyunOssUrl}/static/images/app/activity/nav_back.png`" mode="">
</image>
<!-- #endif -->
<!-- #ifdef APP -->
<image style="width: 56rpx;height: 56rpx;" src="@/static/images/app/activity/nav_back.png" mode="">
</image>
<!-- #endif -->
</view>
<view class="u-nav-slot" slot="center">
<!-- #ifdef MP-WEIXIN -->
<image style="width: 280rpx;height: 32rpx;"
:src="`${config.aliyunOssUrl}/static/images/app/activity/title_bj.png`" mode="">
</image>
<!-- #endif -->
<!-- #ifdef APP -->
<image style="width: 280rpx;height: 32rpx;" src="@/static/images/app/activity/title_bj.png" mode="">
</image>
<!-- #endif -->
</view>
</u-navbar>
<view class="header-bj">
<!-- #ifdef MP-WEIXIN -->
<image :src="`${config.aliyunOssUrl}/static/images/app/activity/box_bj.png`" mode="">
</image>
<!-- #endif -->
<!-- #ifdef APP -->
<image class="" src="@/static/images/app/activity/box_bj.png" mode=""></image>
<!-- #endif -->
<view class="header-expect-num f-24 c333">
第20231023002期 | 2023-10-01 至 2023-10-11
第{{topCheckSn}}期 | {{topDaySn[0] | date('yyyy-mm-dd')}} 至 {{topDaySn[1] | date('yyyy-mm-dd')}}
</view>
<view class="header-bj-jackpot">
<!-- #ifdef MP-WEIXIN -->
<image :src="`${config.aliyunOssUrl}/static/images/app/activity/jackpot_bj.png`" mode="">
</image>
<!-- #endif -->
<!-- #ifdef APP -->
<image src="@/static/images/app/activity/jackpot_bj.png" mode="">
</image>
<!-- #endif -->
<text class="header-bj-jackpo-num">26484</text>
<text class="header-bj-jackpo-num">{{totalPrice?totalPrice:0}}</text>
</view>
<view class="header-bj-rule">
<view class="header-bj-rule-box" @click="navTextviewFn">
<!-- #ifdef MP-WEIXIN -->
<view class="header-bj-rule-box">
<image :src="`${config.aliyunOssUrl}/static/images/app/activity/guize.png`" mode="">
</image>
<!-- #endif -->
<!-- #ifdef APP -->
<image src="@/static/images/app/activity/guize.png" mode=""></image>
<!-- #endif -->
<text>规则</text>
</view>
<view class="header-bj-rule-box" style="margin-top: 44rpx;" @click="navPreviousListFn">
<!-- #ifdef MP-WEIXIN -->
<view class="header-bj-rule-box" style="margin-top: 44rpx;" @click="$tab.navigateTo('/pages/mine/every_day_card/previous_list')">
<image :src="`${config.aliyunOssUrl}/static/images/app/activity/guize.png`" mode="">
</image>
<!-- #endif -->
<!-- #ifdef APP -->
<image src="@/static/images/app/activity/guize.png" mode=""></image>
<!-- #endif -->
<text>往期</text>
</view>
</view>
</view>
<view class="list-box">
<z-paging use-page-scroll ref="paging" v-model="dataList" @query="queryList">
<view class="list-box-cont" :class="[index==0?'list-box-cont-bj':'']" v-for="(item,index) in dataList"
:key="index">
<u-cell :border="false" custom-style="margin-bottom:22rpx;border-radius:20rpx;">
<view slot="title" class="u-flex u-flex-between">
<view>
<u--text :text="item.activitySnName" size="15" color="#000" bold />
<view v-for="(items,indexs) in list" :key="items.id">
<view class="content-list"
v-if="(items.userDailyCheckOrder && items.userDailyCheckOrder.payStatus == 0) || items.userDailyCheckIn == null">
<view class="flex justify-between align-center">
<text class="c000 bold f-30">第{{items.dailyCheckSn}}期</text>
<text v-if="items.status == 0" class="c4B f24">未开始</text>
<text v-if="items.status == 3" class="c4B f24">已结束</text>
<text v-if="items.status == 2" class="c4B f24">开奖中</text>
<text
v-if="items.status == 1 && items.userDailyCheckIn == null && newTime<items.applicationStopTime"
class="c4B f24">未报名</text>
<text
v-if="items.status == 1 && items.userDailyCheckIn == null && newTime>items.applicationStopTime"
class="c4B f24">不在参与时间</text>
<text
v-if="items.status == 1 && items.userDailyCheckOrder && items.userDailyCheckOrder.payStatus == 0"
class="c4B f24">未支付</text>
<text
v-if="items.status == 1 && items.userDailyCheckIn && items.userDailyCheckOrder && items.userDailyCheckOrder.payStatus == 1"
class="c4B f24">已报名</text>
</view>
<view class="flex justify-between mt-4 align-center">
<view class="right">
<!-- 报名结束时间 -->
<view
v-if="(newTime<items.applicationStopTime && items.userDailyCheckIn == null && items.status == 1) || (items.userDailyCheckOrder && items.userDailyCheckOrder.payStatus == 0 && items.status != 2)">
<text class="c777 f-26 bold mr-2">报名结束时间</text>
<u-count-down :time="items.timeStart" format="HH:mm:ss"></u-count-down>
<!-- <u-count-down :timestamp="items.timeStart" :show-border="true" font-size="28"
color="#fff" height="47" bg-color="#FF404B" border-color="#FF404B"
separator-color="#FF404B"></u-count-down> -->
</view>
<view
v-if="(items.status == 1 || items.status == 0 || items.status == 3) && (items.userDailyCheckIn != null && items.userDailyCheckOrder && items.userDailyCheckOrder.payStatus == 1)">
<text class="f-28 c666 bold">支付{{items.joinPrice}}元参与报名</text>
</view>
<view
v-if="items.status == 1 && items.userDailyCheckIn == null && newTime>items.applicationStopTime">
<text class="f-28 c666 bold">支付{{items.joinPrice}}元参与报名</text>
</view>
<view v-if="items.status == 0">
<text class="f-28 c666 bold">支付{{items.joinPrice}}元参与报名</text>
</view>
<view v-if="items.status == 2">
<text class="f-28 c666 bold">开奖时间：{{items.lotteryTime}}</text>
</view>
</view>
<view>
<u--text :text="item.showText" size="12" color="#FF404B" align="right" />
<view class="left">
<text
v-if="items.userDailyCheckIn == null && newTime<items.applicationStopTime && items.status == 1"
class="apply" @click="SignNow(items.id)">立即报名</text>
<text
v-if="newTime<items.applicationStopTime && ( items.userDailyCheckOrder && items.userDailyCheckOrder.payStatus == 0)"
class="apply" @click="SignNowTo(items)">立即支付</text>
<!-- <text v-else>立即支付</text> -->
</view>
</view>
<view slot="label" class="u-flex u-flex-between u-flex-items-center"
style="padding-top: 20rpx;padding-bottom: 10rpx;">
<view>
<u--text v-if="item.status == 3" :text="'开奖时间：'+item.openPrizeTime" size="13"
color="#000" />
<u--text v-else :text="'支付'+item.joinPrice+'元参与报名'" size="13" color="#000" />
</view>
<!-- 支付成功 显示-->
<view v-if="items.userDailyCheckOrder && items.userDailyCheckOrder.payStatus == 1">
<view class="content-list" v-for="(item,index) in items.userDailyCheckSign" :key="index">
<view class="flex justify-between align-center">
<view class="flex">
<text class="c000 bold f-30 mr-2">第{{item.dailyCheckSn}}期</text>
<text class="c000 bold f-30">第{{index + 1}}天</text>
</view>
<text v-if="item.clockStatus == 0 && Time>item.clockTime" class="c4B f24">未打卡</text>
<text v-if="item.clockStatus == 0 && Time<item.clockTime" class="c4B f24">待打卡</text>
<text v-if="item.clockStatus == 1" class="c4B f24">已打卡</text>
<text v-if="items.status == 0" class="c4B f24">未开始</text>
</view>
<view v-if="item.showBtn !=0">
<u-button :color="item.showBtn==1?'#23C9C2':'#FF6736'"
:type="item.showBtn==1?'primary':'error'" customStyle="width:168rpx;height:66rpx;"
:hairline="false" shape="circle" :disabled="item.showBtn==2"
:text="item.showBtn==1?'立即报名':'打卡'" @click="handleClick(item.id,item.showBtn)" />
</view>
<view v-else-if="item.status == 3">
<u--text :text="item.winPrice||0" lines="1" prefixIcon="rmb"
iconStyle="color:#000;font-size:22rpx;font-weight: bold;padding-top:5rpx;" size="20"
color="#000" bold />
<u--text text="（已存入余额）" size="10" color="#999" />
<view class="flex justify-between mt-4 align-center">
<!-- 左边部分 -->
<view class="left">
<view
v-if="newTime<items.clockInStartTime && items.userDailyCheckIn && items.status == 1 && item.clockStatus == 0 && Time>item.clockTime">
<text class="c777 f-26 bold mr-2">距离打卡时间</text>
<u-count-down :timestamp="items.time" :show-border="true" font-size="28"
color="#fff" height="47" bg-color="#FF404B" border-color="#FF404B"
separator-color="#FF404B"></u-count-down>
</view>
<!-- 剩余打卡时间 -->
<view
v-if="item.clockStatus == 0 && Time>item.clockTime && items.number == 1 && items.clockInStartTime<newTime">
<text class="c777 f-26 bold mr-2">剩余打卡时间</text>
<u-count-down :time="items.Clocktime" format="HH:mm:ss"></u-count-down>
<!-- <u-count-down :timestamp="items.Clocktime" :show-border="true" font-size="28"
color="#fff" height="47" bg-color="#FF404B" border-color="#FF404B"
separator-color="#FF404B"></u-count-down> -->
</view>
<!-- 剩余打卡时间 -->
<view
v-if="item.clockStatus == 0 && Time>item.clockTime && items.number >1 && items.clockInStartTime<newTime && item.dayTime == '今天'">
<text class="c777 f-26 bold mr-2">剩余打卡时间</text>
<u-count-down :timestamp="surTime" :show-border="true" font-size="28"
color="#fff" height="47" bg-color="#FF404B" border-color="#FF404B"
separator-color="#FF404B"></u-count-down>
</view>
<!-- 等待开奖时间 -->
<view
v-if="items.userDailyCheckIn && items.userDailyCheckIn.openStatus == 0 && items.userDailyCheckIn.clockStatus == 1">
<text class="c777 f-26 bold mr-2">等待开奖时间</text>
<u-count-down :time="items.timeOut" format="HH:mm:ss"></u-count-down>
<!-- <u-count-down :timestamp="items.timeOut" :show-border="true" font-size="28"
color="#fff" height="47" bg-color="#FF404B" border-color="#FF404B"
separator-color="#FF404B"></u-count-down> -->
</view>
<!-- 开奖时间 -->
<view v-if=" items.userDailyCheckIn && items.userDailyCheckIn.openStatus == 1 ">
<text class="f-26 c777 bold">开奖时间：{{items.lotteryTime}}</text>
</view>
<!-- 打卡记录 -->
<view class="f-28 c666 bold">
<text v-if="item.length == 0">支付{{joinPrice}}元参与报名</text>
<text v-if="item.clockStatus == 0 && item.dayTime == '昨天'">您忘记打卡了</text>
<text v-if="item.clockStatus == 0 && Time<item.clockTime">还未到时间</text>
<text v-if="item.clockStatus == 1 && items.number > 1">您今天已打卡</text>
</view>
</view>
<!-- 右边部分 -->
<view class="right">
<!-- <text v-if="item.length == 0" class="apply" @click="SignNow(items.id)">立即报名</text> -->
<text
v-if="item.clockStatus == 0 && Time>item.clockTime && items.clockInStartTime<newTime && item.dayTime == '今天'"
class="applyRed" @click="clockIn(items.id)">打卡</text>
<!-- 瓜分奖池 -->
<view class="flex column"
v-if="newList.userDailyCheckIn && newList.userDailyCheckOrder && newList.userDailyCheckOrder.payStatus == 1 && newList.userDailyCheckIn.clockStatus == 1 && newList.userDailyCheckIn.openStatus == 1">
<text class="c000 f-20 bold">￥ <text
class="f-28">{{newList.userDailyCheckIn?newList.userDailyCheckIn.number:''}}</text>
</text>
<text class="c999 f-20 bold">(已存入余额)</text>
</view>
</view>
</view>
</view>
</u-cell>
<!-- <view class="flex justify-between">
<view class="flex flex-column justify-between" style="height: 108rpx;">
<view class="f-32 c333">{{item.activitySnName}}</view>
<view>支付{{item.joinPrice}}元参与报名</view>
</view>
<view class="flex flex-column justify-between" style="text-align: end;">
<view class="red f-28">{{item.joinStatus?'已报名':'未报名'}}</view>
<view>
<u-button @click="issueFn" shape="circle"
:customStyle="{width: '144rpx', height: '56rpx'}" color="#23C9C2">立即报名</u-button>
</view>
</view>
</view> -->
</view>
</view>
</z-paging>
</view>
@@ -201,32 +260,21 @@
<script>
import config from '@/config';
import {
activityList,
oneDollarDetails,
payOneDollar,
oneYuanClock,
actGetConfig,
paycardAPI
clockList,
DailyJoin,
prepay,
DailyClock
} from "@/api/activity/activity.js";
import {
getTimeType
} from "@/utils/index.js"
export default {
data() {
return {
//支付
topUpTypeShow: false,
topUpType: 'wx',
config,
navConfig: {
title: " ",
color: "#000",
fixedAssist: {
hide: true
},
transparent: {
initColor: '#fff'
}
},
Config: {},
dataList: [],
id: "",
topUpTypeShow: false, //支付弹窗
topUpType: 'ye',
payData: {
from: "",
orderNo: "",
@@ -234,39 +282,185 @@
payType: "yue",
scene: 0
},
Height: 0,
pageNum: 1,
pageSize: 10,
list: {}, //每日打卡活动列表
newList: {}, //新数据每日打卡活动列表
nowClock: {}, //当日打卡数据
yetClock: [], //已经打卡数据
surTime: '', //剩余打卡时间
Time: new Date().getTime(), //当前时间戳
newTime: getTimeType(new Date().getTime(), 0), //当前时间
payType: 'yue', //支付方式
payPrice: '', //支付余额
submitInfo: {}, //订单信息
totalPrice: '', //本期奖池
joinPrice: '', //参加金额
topCheckSn: '', //头部活动期
topDaySn: [], //头部活动天数
orderNo: '',
dayTime: '', //判断是否是今天的时间
}
},
onLoad() {
this.getConfig()
uni.getSystemInfo({
success: (e) => {
this.Height = e.statusBarHeight + 70
}
})
uni.showLoading({
title: '加载中'
})
},
onShow() {
this.pageNum = 1;
// this.getList()
},
// onPullDownRefresh() {
// this.pageNum = 1;
// this.getList()
// let time = getTimeType(new Date().getTime(), 0)
// let Time = new Date().getTime()
// this.newTime = time
// this.Time = Time
// },
methods: {
//规则 pages/common/textview/index
navTextviewFn(){
uni.navigateTo({
url: `/pages/common/textview/index?title=规则详情`
setTime() {
// setTimeout(()=>{
// this.getList()
// },1000)
},
queryList(pageNum, pageSize) {
clockList({
pageNum: pageNum,
pageSize: pageSize,
type: 3
}).then(res => {
// 已经打卡数据
this.yetClock = []
res.data.list.forEach((i, index) => {
let time = new Date().getTime()
i.time = (new Date(i.clockInStartTime).getTime() - this.Time)
i.timeOut = (new Date(i.lotteryTime).getTime() - this.Time)
i.timeStart = (new Date(i.applicationStopTime).getTime() - this.Time)
i.Clocktime = (new Date(i.clockInStopTime).getTime() - time)
// 奖金池、参与金额
if (index == 0) {
this.totalPrice = i.totalPrice
this.joinPrice = Math.trunc(i.joinPrice)
this.topCheckSn = i.dailyCheckSn
this.topDaySn[0] = i.applicationStartTime
this.topDaySn[1] = i.lotteryTime
}
if (i.userDailyCheckSign.length && i.status == 1) {
i.userDailyCheckSign.forEach(v => {
v.clockTime = new Date(v.clockTime).getTime() + 1000
v.dayTime = this.showText(v.clockTime)
console.log(v.dayTime);
})
}
// 今天打卡数据
if (i.userDailyCheckSign != null && i.status == 1) {
let arr = i.userDailyCheckSign;
let times = new Date();
times.setSeconds(59)
times.setMinutes(59)
times.setHours(23)
this.surTime = (times.getTime() - new Date().getTime()) / 1000
// console.log(this.surTime,'surTime');
}
});
this.list = res.data.list
this.setTime()
uni.hideLoading();
uni.stopPullDownRefresh()
})
},
//往期 pages/mine/every_day_card/previous_list
navPreviousListFn() {
uni.navigateTo({
url: `/pages/mine/every_day_card/previous_list`
})
},
// 去支付
payPopupBtn() {
console.log(this.payData, '去支付提交信息');
if (this.topUpType == 'ye') {
let obj = {
payType: 'yue',
activityOrderId: this.payData.id,
payChannel: 'yue',
// 判断时间是今天还是昨天
showText(timeString) {
let date = new Date(timeString);
let today = new Date();
today.setHours(0);
today.setMinutes(0);
today.setSeconds(0);
// today 为今天凌晨的时间
let dayTime = 24 * 60 * 60 * 1000;
let delta = today - date; // 得到相差的时间 ms
if (delta > 0) {
if (delta <= dayTime) {
return '昨天';
} else if (delta <= 2 * dayTime) {
return '前天';
}
paycardAPI(obj).then(res => {
this.topUpTypeShow = false
this.$refs.paging.refresh();
console.log(res, '支付返回数据');
}).catch(err => {
} else if (-delta < dayTime) {
return '今天';
} else {
return '明天';
}
// return timeString.slice(5, 11);
},
// 打卡
clockIn(id) {
DailyClock(id).then(res => {
if (res.code == 200) {
uni.showToast({
icon: 'success',
title: '打卡成功'
})
this.pageNum = 1;
this.$refs.paging.refresh();
}
})
},
// 立即报名
SignNow(id) {
DailyJoin({
dailyCheckId: id,
payType: this.payType
}).then(result => {
this.topUpTypeShow = true
this.orderNo = result.data.orderNo
this.payData.orderNo = result.data.orderNo
this.payPrice = result.data.payPrice
this.$refs.paging.refresh();
})
},
// 第二次支付报名
SignNowTo(item) {
console.log(item);
this.topUpTypeShow = true
this.orderNo = item.userDailyCheckOrder.orderNo
this.payData.orderNo = item.userDailyCheckOrder.orderNo
this.payPrice = item.userDailyCheckOrder.payPrice
// this.$refs.paging.refresh();
},
//支付类型
actTypeFn(type) {
this.topUpType = type
// 支付方式:weixin,alipay,yue
// 支付渠道：yue-余额，wechatIos-微信Ios，wechatAndroid-微信Android, alipay-支付包，alipayApp-支付宝App
},
// 去支付
payPopupBtn(e) {
uni.showLoading({
title: '支付中'
})
if (this.topUpType == 'ye') {
prepay(this.payData).then(res => {
uni.showToast({
icon: 'success',
title: '支付成功'
})
this.topUpTypeShow = false
uni.hideLoading()
this.$refs.paging.refresh();
}).catch(err => {
uni.navigateTo({
url: `/pages/serve/coupons/payresult?resultType=err`
})
})
} else {
uni.showToast({
@@ -276,51 +470,34 @@
});
}
},
//类型
actTypeFn(type) {
this.topUpType = type
// 支付方式:weixin,alipay,yue
// 支付渠道：yue-余额，wechatIos-微信Ios，wechatAndroid-微信Android, alipay-支付包，alipayApp-支付宝App
},
//初始化列表数据
queryList(pageNo, pageSize) {
this.$refs.paging.complete([{}, {}]);
activityList({
page: pageNo,
limit: pageSize,
activityType: 0
}).then(res => {
this.$refs.paging.complete(res.data.list);
});
},
getConfig() {
actGetConfig().then(res => {
this.Config = res.data;
})
},
//点击事件
handleClick(id, index) {
switch (index) {
case 1:
//去报名
payOneDollar(id).then(res => {
this.payData = res.data
console.log(this.payData, '创建订单');
this.topUpTypeShow = true
});
break;
case 3:
//去打卡
oneYuanClock(id).then(res => {
this.$refs.paging.reload();
});
break;
}
},
//返回
navBackFb() {
uni.navigateBack()
}
},
// 关闭支付弹窗
close() {
this.topUpTypeShow = false
},
async Refresh() {
this.pageNum = this.pageNum + 1;
let res = await clockList({
pageNum: this.pageNum,
pageSize: this.pageSize
});
if (res.rows.length == 0) {
return uni.showToast({
icon: 'none',
title: '没有更多数据了！'
})
} else {
this.list.push(...res.rows);
}
},
Back() {
uni.navigateBack({
delta: 1, //返回层数，2则上上页
})
},
}
}
</script>
@@ -367,25 +544,16 @@
.list-box {
width: 750rpx;
position: relative;
padding: 32rpx;
top: -32rpx;
border-radius: 32rpx 32rpx 0 0;
background: #FFF;
.list-box-cont-image {
width: 684rpx;
height: 178rpx;
}
.list-box-cont {
margin: 32rpx;
background: #F7F7F7;
// padding: 36rpx 24rpx;
// height: 178rpx;
border-radius: 8rpx;
.not-apply-view {
// height: 178rpx;
}
.content-list {
margin: 0 0 14px 0;
padding: 17px 13px;
border-radius: 10px;
background-color: #f5f5f5;
}
.list-box-cont-bj {

19
pages/mine/every_day_card/previous_list.vue
View File

@@ -4,12 +4,12 @@
<view v-for="(item,index) in dataList" :key="index">
<view class="flex justify-between prev-list">
<view class="flex flex-column justify-around">
<view class="f-32 c333 fw-b">第2期</view>
<view class="f-28 c999">开奖时间</view>
<view class="f-32 c333 fw-b">第{{item.dailyCheckSn}}期</view>
<view class="f-28 c999">开奖时间{{item.lotteryTime}}</view>
</view>
<view class="flex flex-column justify-around" style="text-align: end;">
<view class="f-28 red">已瓜分现金</view>
<view class="f-28 c333 fw-b">￥20.90</view>
<view class="f-28 c333 fw-b">￥{{item.userDailyCheckIn.number}}</view>
<view class="f-24 c999">（已存入余额）</view>
</view>
</view>
@@ -19,6 +19,9 @@
</template>
<script>
import {
clockList,
} from "@/api/activity/activity.js";
export default {
data() {
return {
@@ -26,8 +29,14 @@
}
},
methods: {
queryList() {
this.$refs.paging.complete([{},{},{}]);
queryList(pageNum,pageSize) {
clockList({
pageNum: pageNum,
pageSize: pageSize,
type: 4
}).then(res => {
this.$refs.paging.complete(res.data.list);
})
}
}
}

25
pages/mine/wallet/wallet.vue
View File

@@ -38,7 +38,7 @@
<view class="flex align-center justify-between mt-2 f-28 c666">
<view class="">
<text>支出:¥{{myWallet.monetary}}</text>
<text>收入:¥723.00</text>
<text>收入:¥{{myWallet.recharge}}</text>
</view>
<view class="">
余额:¥1234.00
@@ -51,36 +51,36 @@
<view style="height: 628rpx;" />
</view>
<view class="">
<z-paging :fixed="false" use-page-scroll v-model="dataList" @query="queryList">
<view class="amount-item flex" v-for="(item,index) in dataList" :key="item.id">
<z-paging :fixed="false" ref="paging" use-page-scroll v-model="dataList" @query="queryList">
<view v-if="item.type==1" class="amount-item flex" v-for="(item,index) in dataList" :key="item.id">
<image src="@/static/images/app/mine/collection.png" mode=""></image>
<view class="amount-item-info flex align-center justify-between">
<view class="">
<view class="f-30 c111">
消费
{{item.remark}}
</view>
<view class="f-24 c666">
2023-06-21 12:33:00
{{item.createTime}}
</view>
</view>
<view class="f-36 c111">
+100
+{{item.amount}}
</view>
</view>
</view>
<view class="amount-item flex">
<view v-else class="amount-item flex">
<image src="@/static/images/app/mine/pay.png" mode=""></image>
<view class="amount-item-info flex align-center justify-between">
<view class="">
<view class="f-30 c111">
消费
{{item.remark}}
</view>
<view class="f-24 c666">
2023-06-21 12:33:00
{{item.createTime}}
</view>
</view>
<view class="f-36 c111">
-100
-{{item.amount}}
</view>
</view>
</view>
@@ -152,9 +152,8 @@
background-size: cover;
// #endif
// #ifdef MP
background-image: url('../../../static/images/app/mine/wallet-bg.png');
background-image: url('https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/images/app/mine/wallet-bg.png');
background-size: cover;
// #endif
.navbar-title {
width: 750rpx;
@@ -182,7 +181,7 @@
margin: 0 24rpx;
padding: 32rpx 0 16rpx 0;
border-bottom: 1rpx solid #eee;
background: #fff;
image {
width: 32rpx;
height: 32rpx;

25
utils/index.js
View File

@@ -150,3 +150,28 @@ export function paymentFn(type, data) {
})
})
}
//获取固定格式时间
export const getTimeType = (time, type) => {
let date = new Date(parseInt(time));
let y = date.getFullYear();
let m = (date.getMonth() + 1 + '').padStart(2, '0');
let tom = (date.getMonth() + 1 + '');
let d = (date.getDate() + '').padStart(2, '0');
let tod = (date.getDate() + '');
let hh = (date.getHours() + '').padStart(2, '0');
let mm = (date.getMinutes() + '').padStart(2, '0');
let ss = (date.getSeconds() + '').padStart(2, '0');
if (type === 0) {
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`;
} else if (type === 1) {
return `${y}-${m}-${d} ${hh}:${mm}`;
} else if (type === 2) {
return `${y}.${m} ${hh}:${mm}`;
} else if (type === 3) {
return `${y}-${m}-${d}`;
} else if (type === 4) {
return `${y}-${m}`;
} else if (type === 5) {
return `${hh}:${mm}:${ss}`;
}
}