更新:修改金额列表和积分列表显示细节
This commit is contained in:
@@ -7,8 +7,8 @@ export const ENV = process.env.NODE_ENV || 'development';
|
|||||||
*/
|
*/
|
||||||
const BASE_URL_MAP = {
|
const BASE_URL_MAP = {
|
||||||
development: {
|
development: {
|
||||||
MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
|
// MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
|
||||||
// MAIN: 'https://global.nuttyreading.com/', // 线上
|
MAIN: 'https://global.nuttyreading.com/', // 线上
|
||||||
// PAYMENT: 'https://dev-pay.example.com', // 暂时用不到
|
// PAYMENT: 'https://dev-pay.example.com', // 暂时用不到
|
||||||
// CDN: 'https://cdn-dev.example.com', // 暂时用不到
|
// CDN: 'https://cdn-dev.example.com', // 暂时用不到
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -213,7 +213,8 @@
|
|||||||
"days": "days",
|
"days": "days",
|
||||||
"selectPackage": "Please select a package",
|
"selectPackage": "Please select a package",
|
||||||
"consumptionRecord": "Consumption record",
|
"consumptionRecord": "Consumption record",
|
||||||
"returnMine": "I'm about to return to my page"
|
"returnMine": "I'm about to return to my page",
|
||||||
|
"pointsRecord": "Points consumption record"
|
||||||
|
|
||||||
},
|
},
|
||||||
"book": {
|
"book": {
|
||||||
|
|||||||
@@ -483,7 +483,8 @@
|
|||||||
"valueAddedServices": "增值服务",
|
"valueAddedServices": "增值服务",
|
||||||
"readAgree": "我已阅读并同意",
|
"readAgree": "我已阅读并同意",
|
||||||
"readAgreeServices": "请先阅读并同意增值服务",
|
"readAgreeServices": "请先阅读并同意增值服务",
|
||||||
"orderDetails": "订单详情"
|
"orderDetails": "订单详情",
|
||||||
|
"pointsRecord": "积分消费记录"
|
||||||
},
|
},
|
||||||
"vip": {
|
"vip": {
|
||||||
"courseVip": "课程VIP",
|
"courseVip": "课程VIP",
|
||||||
|
|||||||
@@ -9,11 +9,11 @@
|
|||||||
<view>{{$t('order.recharge')}}</view>
|
<view>{{$t('order.recharge')}}</view>
|
||||||
<view><wd-icon name="arrow-right" size="16px" color="#fff"/></view>
|
<view><wd-icon name="arrow-right" size="16px" color="#fff"/></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
|
<view class="title">{{$t('order.pointsRecord')}}</view>
|
||||||
<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
|
<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
|
||||||
<view class="recharge-record-block-row">{{item.remark.slice(0, (item.remark.indexOf(',')))}}<text :class="item.actType === 1 ? 'text1' : 'text2'" >{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}}</text></view>
|
<view class="recharge-record-block-row">{{item.remark.slice(0, (item.remark.indexOf(',')))}}<text :class="item.actType === 1 ? 'text1' : 'text2'" >{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}}</text></view>
|
||||||
<view class="time">{{item.createTime}}</view>
|
<view class="time">{{item.createTime}}</view>
|
||||||
<view>{{item.remark.slice((item.remark.indexOf(','))+1)}}</view>
|
<view style="font-size: 20rpx;">{{item.remark.slice((item.remark.indexOf(','))+1)}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</z-paging>
|
</z-paging>
|
||||||
@@ -111,7 +111,7 @@
|
|||||||
color: #ff0000;
|
color: #ff0000;
|
||||||
}
|
}
|
||||||
.text2{
|
.text2{
|
||||||
color: #00ff00;
|
color: #228B22;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<z-paging ref="paging" v-model="bookList" auto-show-back-to-top class="my-book-page" @query="rechargeList" :default-page-size="10">
|
<z-paging ref="paging" v-model="bookList" auto-show-back-to-top class="my-book-page" @query="rechargeList"
|
||||||
|
:default-page-size="10">
|
||||||
<template #top>
|
<template #top>
|
||||||
<!-- 自定义导航栏 -->
|
<!-- 自定义导航栏 -->
|
||||||
<nav-bar :title="$t('user.consumptionRecord')"></nav-bar>
|
<nav-bar :title="$t('user.consumptionRecord')"></nav-bar>
|
||||||
@@ -7,11 +8,15 @@
|
|||||||
<view class="recharge-record" v-if="(bookList && bookList.length > 0)">
|
<view class="recharge-record" v-if="(bookList && bookList.length > 0)">
|
||||||
<view class="go-gecharge" @click="goRecharge">
|
<view class="go-gecharge" @click="goRecharge">
|
||||||
<view>{{$t('order.recharge')}}</view>
|
<view>{{$t('order.recharge')}}</view>
|
||||||
<view><wd-icon name="arrow-right" size="16px" color="#fff"/></view>
|
<view><wd-icon name="arrow-right" size="16px" color="#fff" /></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
|
<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
|
||||||
<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
|
<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
|
||||||
<view class="recharge-record-block-row">{{item.orderType}}<text class="text">{{item.changeAmount}}</text></view>
|
<view class="recharge-record-block-row">{{item.orderType}}<text
|
||||||
|
:class="item.orderType !== '充值' ? 'text1' : 'text2'">{{item.orderType !== '充值' ? '' : '+'}}{{item.changeAmount}}</text>
|
||||||
|
</view>
|
||||||
|
<view class="recharge-record-block-row_">{{item.productName}}</view>
|
||||||
|
<view class="recharge-record-block-row_">{{$t('user.orderSn')}}:{{item.payNo}}</view>
|
||||||
<view class="time">{{item.createTime}}</view>
|
<view class="time">{{item.createTime}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -49,7 +54,7 @@
|
|||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 跳转充值页面
|
* 跳转充值页面
|
||||||
*/
|
*/
|
||||||
@@ -72,8 +77,8 @@
|
|||||||
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
|
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
|
||||||
// padding: 20rpx;
|
// padding: 20rpx;
|
||||||
margin: 20rpx;
|
margin: 20rpx;
|
||||||
|
|
||||||
.go-gecharge{
|
.go-gecharge {
|
||||||
//height: 100rpx;
|
//height: 100rpx;
|
||||||
background: linear-gradient(to right, #007bff, #17a2b8);
|
background: linear-gradient(to right, #007bff, #17a2b8);
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
@@ -81,12 +86,14 @@
|
|||||||
color: #fff;
|
color: #fff;
|
||||||
padding: 20rpx;
|
padding: 20rpx;
|
||||||
margin-bottom: 20rpx;
|
margin-bottom: 20rpx;
|
||||||
display: flex;justify-content:space-between;align-items:center
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center
|
||||||
}
|
}
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
padding-left:20rpx;
|
padding-left: 20rpx;
|
||||||
margin-bottom: 30rpx;
|
margin-bottom: 30rpx;
|
||||||
color: #007bff;
|
color: #007bff;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
@@ -95,8 +102,13 @@
|
|||||||
.recharge-record-block {
|
.recharge-record-block {
|
||||||
border-bottom: 1px solid #e0e0e0;
|
border-bottom: 1px solid #e0e0e0;
|
||||||
padding: 20rpx;
|
padding: 20rpx;
|
||||||
|
|
||||||
.time{
|
.recharge-record-block-row_ {
|
||||||
|
font-size: 24rpx;
|
||||||
|
margin-bottom: 20rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.time {
|
||||||
font-size: 20rpx;
|
font-size: 20rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,32 +116,36 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-bottom: 20rpx;
|
margin-bottom: 20rpx;
|
||||||
|
|
||||||
.text{
|
.text1 {
|
||||||
color: #007bff;
|
color: #ff0000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.text2 {
|
||||||
|
color: #228B22;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.empty-state {
|
.empty-state {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding-top: 200rpx;
|
padding-top: 200rpx;
|
||||||
|
|
||||||
image {
|
image {
|
||||||
width: 400rpx;
|
width: 400rpx;
|
||||||
height: 300rpx;
|
height: 300rpx;
|
||||||
margin-bottom: 40rpx;
|
margin-bottom: 40rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.empty-text {
|
.empty-text {
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: #999;
|
color: #999;
|
||||||
margin-bottom: 50rpx;
|
margin-bottom: 50rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
Reference in New Issue
Block a user