Skip to content

X
xzf_uniapp-wechat-web
Commit c0da685e authored by 李智书's avatar 李智书
Browse files
Options

1.缴费进度;

parent d9ae1c4c
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 38 deletions
src/pages/StudentPayment/PayProgress/PayProgress.vue
View file @ c0da685e
......@@ -6,8 +6,8 @@
<van-tab :title="vanTab[0]" title-class="PayProjectTab PayProjectList">
<!-- 收费项目 -->
<view class="ListBox">
<view class="" v-if="PayProjectList.length>0">
<view class="container ProjectList" v-for="(item,index) in PayProjectList" :key="index"
<view class="" v-if="ChargePaymentPageList.length>0">
<view class="container ProjectList" v-for="(item,index) in ChargePaymentPageList" :key="index"
@tap="PayProgressDetails(item)">
<view class="listitem top">
<view class="title">
......@@ -39,20 +39,20 @@
<van-tab :title="vanTab[1]" title-class="PayProjectTab PayProjectHistory">
<!-- 缴费历史 -->
<view class="ListBox">
<view class="" v-if="PayProjectHistory.length>0">
<view class="container ProjectHistory" v-for="(item,index) in PayProjectHistory" :key="index"
<view class="" v-if="ChargeEndPageList.length>0">
<view class="container ProjectHistory" v-for="(item,index) in ChargeEndPageList" :key="index"
@tap="PayProgressDetails(item)">
<view class="listitem top">
<view class="title">
2022高一春季收费
{{item.chargeName}}
</view>
<view class="money" v-if="false">
100.00
{{item.amountMust}}
</view>
</view>
<view class="listitem center">
<text class="describe">
本次收费需要收取高一春季开学相关费用，并根据
{{item.descInfo||""}}
</text>
</view>
<view class="listitem botto" style="align-items: baseline;">
......@@ -65,8 +65,8 @@
<view class="noData" v-else>
<image style="width: 290rpx;height: 242rpx;" :src="ImgUrl+'StudentPayment/development.png'"
mode='widthFix'></image>
<view>程序员正在玩命开发</view>
<view class="bottomtxt">详情请联系客服</view>
<view>程序员正在玩命加载</view>
<view class="bottomtxt">暂无数据</view>
</view>
</view>
</van-tab>
......@@ -85,8 +85,8 @@
ImgUrl: this.$ImgUrl,
active: 0,
vanTab: ['交费中', '已结束'],
PayProjectList: [],
PayProjectHistory: [1, 2, 3, 4, 5, 6, 7],
ChargePaymentPageList: [],
ChargeEndPageList: [],
pageCurrent: 1,
pageSize: 10,
total: 0,
......@@ -107,7 +107,7 @@
let personalInfo = uni.getStorageSync("personalInfo")
this.allData = Object.assign(options, personalInfo)
}
this.getPayProject()
this.queryChargePaymentPage()
},
onPullDownRefresh: function(e) {
console.log("onPullDownRefresh", e);
......@@ -116,27 +116,30 @@
console.log("onReachBottom", e);
this.pageCurrent = this.pageCurrent + 1
if (this.active == 0) {
this.getPayProject()
this.queryChargePaymentPage()
return
}
this.queryChargeEndPage()
},
methods: {
// 切换tab
async PayProjectTab(index) {
try {
if (index > 0) {
this.queryChargeEndPage(index)
return
}
this.getPayProject(index)
this.queryChargePaymentPage(index)
} catch (e) {
//TODO handle the exception
console.log(e);
}
},
// 交费项目信息分页查询
async getPayProject(index) {
// 交费中项目信息分页查询
async queryChargePaymentPage(index) {
try {
let data = await this.$http.post({
url: orderApi + '/order-charge/app/charge/project/queryChargeProjectPage'
url: orderApi + '/order-charge/teacher/charge/queryChargePaymentPage'
}, {
"pageCurrent": this.pageCurrent,
"pageSize": this.pageSize,
......@@ -149,7 +152,7 @@
mask: true,
title: data.msg
})
this.PayProjectList = []
this.ChargePaymentPageList = []
return
}
......@@ -157,26 +160,67 @@
let tmp = data.data.records;
let newArr = []
for (let s of tmp) {
let diffTime = dayjs(s.endTime).diff(new Date(), 'hour');
if (diffTime > 24) {
diffTime = dayjs(s.endTime).diff(new Date(), 'day');
s.diffTime = diffTime + ' 天后'
newArr.push(s)
}
if (this.pageCurrent == 1) {
this.ChargePaymentPageList = newArr
return
}
if (this.pageCurrent > 1) {
this.ChargePaymentPageList.push(...newArr)
return
}
} else {
s.diffTime = 1 + ' 天后'
this.ChargePaymentPageList = []
}
} catch (e) {
//TODO handle the exception
console.log(e);
uni.showToast({
icon: "none",
mask: true,
title: e.message
})
}
s.amountMust = (s.amountMust / 100).toFixed(2)
},
// 交费项目已结束信息分页查询
async queryChargeEndPage(index) {
try {
let data = await this.$http.post({
url: orderApi + '/order-charge/teacher/charge/queryChargeEndPage'
}, {
"pageCurrent": this.pageCurrent,
"pageSize": this.pageSize,
"schoolId": this.allData.schoolId,
"userId": this.allData.userId || this.allData.userID
})
if (data.code != 200) {
uni.showToast({
icon: "none",
mask: true,
title: data.msg
})
this.ChargeEndPageList = []
return
}
if (data.data.records && Array.isArray(data.data.records)) {
let tmp = data.data.records;
let newArr = []
for (let s of tmp) {
newArr.push(s)
}
if (this.pageCurrent == 1) {
this.PayProjectList = newArr
this.ChargeEndPageList = newArr
return
}
if (this.pageCurrent > 1) {
this.PayProjectList.push(...newArr)
this.ChargeEndPageList.push(...newArr)
return
}
} else {
this.PayProjectList = []
this.ChargeEndPageList = [1, 2, 3, 4, 5]
}
} catch (e) {
......
src/pages/StudentPayment/PayProject/PayProject.vue
View file @ c0da685e
......@@ -44,19 +44,24 @@
@tap="PayOrderDetails(item)">
<view class="listitem top">
<view class="title">
2022高一春季收费
{{item.chargeName}}
</view>
<view class="money" v-if="false">
100.00
{{item.amountMust}}
</view>
</view>
<view class="listitem center">
<text class="describe">
本次收费需要收取高一春季开学相关费用，并根据
{{item.descInfo||""}}
</text>
</view>
<view class="listitem botto" style="align-items: baseline;">
<van-icon name="clock-o" /> <text class="Tips">5天后收费结束</text>
<span>实交金额:</span>
<view style="margin-left: 26rpx;margin-right: 26rpx;width: 50rpx;text-align: center;">
{{item.realAmount/100||""}}
</view>
<span>交费时间:</span>
<view style="margin-left: 26rpx;margin-right: 26rpx;">{{item.payTime||""}}</view>
</view>
</view>
<view class="bottomtxt">已经到底啦~</view>
......@@ -65,8 +70,8 @@
<view class="noData" v-else>
<image style="width: 290rpx;height: 242rpx;" :src="ImgUrl+'StudentPayment/development.png'"
mode='widthFix'></image>
<view>程序员正在玩命开发</view>
<view class="bottomtxt">详情请联系客服</view>
<view>正在玩命加载</view>
<view class="bottomtxt">暂无历交费项目</view>
</view>
</view>
</van-tab>
......@@ -86,7 +91,7 @@
active: 0,
vanTab: ['收费项目', '交费历史'],
PayProjectList: [],
PayProjectHistory: [1, 2, 3, 4, 5, 6, 7],
PayProjectHistory: [],
pageCurrent: 1,
pageSize: 10,
total: 0,
......@@ -117,13 +122,16 @@
this.pageCurrent = this.pageCurrent + 1
if (this.active == 0) {
this.getPayProject()
return
}
this.queryChargeHistoryPage()
},
methods: {
// 切换tab
async PayProjectTab(index) {
try {
if (index > 0) {
this.queryChargeHistoryPage(index)
return
}
this.getPayProject(index)
......@@ -132,6 +140,56 @@
console.log(e);
}
},
// 交费历史记录分页查询
async queryChargeHistoryPage() {
try {
let data = await this.$http.post({
url: orderApi + '/order-charge/app/charge/project/queryChargeHistoryPage'
}, {
"pageCurrent": this.pageCurrent,
"pageSize": this.pageSize,
"schoolId": this.allData.schoolId,
"userId": this.allData.userId || this.allData.userID
})
if (data.code != 200) {
uni.showToast({
icon: "none",
mask: true,
title: data.msg
})
this.PayProjectHistory = []
return
}
if (data.data.records && Array.isArray(data.data.records)) {
let tmp = data.data.records;
let newArr = []
for (let s of tmp) {
s.payTime = dayjs(s.payTime).format("YYYY-MM-DD HH:mm:ss");
newArr.push(s)
}
if (this.pageCurrent == 1) {
this.PayProjectHistory = newArr
return
}
if (this.pageCurrent > 1) {
this.PayProjectHistory.push(...newArr)
return
}
} else {
this.PayProjectHistory = []
}
} catch (e) {
//TODO handle the exception
console.log(e);
uni.showToast({
icon: "none",
mask: true,
title: e.message
})
}
},
// 交费项目信息分页查询
async getPayProject(index) {
try {
......@@ -189,13 +247,19 @@
})
}
},
// 收费项目详情
// 收费项目详情/历史详情
async PayOrderDetails(data) {
try {
console.log(data);
uni.setStorageSync("PayOrderDetails", data)
let url = "../PayOrderDetails/PayOrderDetails?chargeId=" + data.id || ''
if (this.active == 0) {
url = "../PayOrderDetails/PayOrderDetails?chargeId=" + data.id || ''
} else {
url = "../PayProjectHistoryDetails/PayProjectHistoryDetails?chargeId=" + data.id || ''
}
uni.navigateTo({
url: "../PayOrderDetails/PayOrderDetails?chargeId=" + data.id || ''
url
})
} catch (e) {
//TODO handle the exception
......@@ -300,6 +364,11 @@
.Tips {
padding-left: 10rpx;
}
span {
color: #333333;
font-size: 30rpx;
}
}
}
......
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