From fecbb7950820e4e7ffac8085c526319eb0f7b325 Mon Sep 17 00:00:00 2001
From: fuchao <2577131060@qq.com>
Date: Mon, 1 Dec 2025 18:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E9=87=91=E9=A2=9D=E5=88=97=E8=A1=A8=E5=92=8C=E7=A7=AF=E5=88=86?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/config.ts | 4 +-
locale/en.json | 3 +-
locale/zh-Hans.json | 3 +-
pages/user/points/index.vue | 6 +--
pages/user/virtual/index.vue | 80 +++++++++++++++++++++---------------
5 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/api/config.ts b/api/config.ts
index 741930c..f437afb 100644
--- a/api/config.ts
+++ b/api/config.ts
@@ -7,8 +7,8 @@ export const ENV = process.env.NODE_ENV || 'development';
*/
const BASE_URL_MAP = {
development: {
- MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
- // MAIN: 'https://global.nuttyreading.com/', // 线上
+ // MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
+ MAIN: 'https://global.nuttyreading.com/', // 线上
// PAYMENT: 'https://dev-pay.example.com', // 暂时用不到
// CDN: 'https://cdn-dev.example.com', // 暂时用不到
},
diff --git a/locale/en.json b/locale/en.json
index 0d4b3b0..45c650c 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -213,7 +213,8 @@
"days": "days",
"selectPackage": "Please select a package",
"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": {
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 496bc55..9a12652 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -483,7 +483,8 @@
"valueAddedServices": "增值服务",
"readAgree": "我已阅读并同意",
"readAgreeServices": "请先阅读并同意增值服务",
- "orderDetails": "订单详情"
+ "orderDetails": "订单详情",
+ "pointsRecord": "积分消费记录"
},
"vip": {
"courseVip": "课程VIP",
diff --git a/pages/user/points/index.vue b/pages/user/points/index.vue
index 90fe4a5..74a1855 100644
--- a/pages/user/points/index.vue
+++ b/pages/user/points/index.vue
@@ -9,11 +9,11 @@
{{$t('order.recharge')}}
- {{$t('order.rechargeConsumptionList')}}
+ {{$t('order.pointsRecord')}}
{{item.remark.slice(0, (item.remark.indexOf(',')))}}{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}}
{{item.createTime}}
- {{item.remark.slice((item.remark.indexOf(','))+1)}}
+ {{item.remark.slice((item.remark.indexOf(','))+1)}}
@@ -111,7 +111,7 @@
color: #ff0000;
}
.text2{
- color: #00ff00;
+ color: #228B22;
}
}
}
diff --git a/pages/user/virtual/index.vue b/pages/user/virtual/index.vue
index eccb8e7..f9f7187 100644
--- a/pages/user/virtual/index.vue
+++ b/pages/user/virtual/index.vue
@@ -1,5 +1,6 @@
-
+
@@ -7,11 +8,15 @@
{{$t('order.recharge')}}
-
+
{{$t('order.rechargeConsumptionList')}}
- {{item.orderType}}{{item.changeAmount}}
+ {{item.orderType}}{{item.orderType !== '充值' ? '' : '+'}}{{item.changeAmount}}
+
+ {{item.productName}}
+ {{$t('user.orderSn')}}:{{item.payNo}}
{{item.createTime}}
@@ -49,7 +54,7 @@
loading.value = false
}
}
-
+
/**
* 跳转充值页面
*/
@@ -72,8 +77,8 @@
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
// padding: 20rpx;
margin: 20rpx;
-
- .go-gecharge{
+
+ .go-gecharge {
//height: 100rpx;
background: linear-gradient(to right, #007bff, #17a2b8);
font-size: 30rpx;
@@ -81,12 +86,14 @@
color: #fff;
padding: 20rpx;
margin-bottom: 20rpx;
- display: flex;justify-content:space-between;align-items:center
+ display: flex;
+ justify-content: space-between;
+ align-items: center
}
-
+
.title {
font-size: 30rpx;
- padding-left:20rpx;
+ padding-left: 20rpx;
margin-bottom: 30rpx;
color: #007bff;
font-weight: bold;
@@ -95,8 +102,13 @@
.recharge-record-block {
border-bottom: 1px solid #e0e0e0;
padding: 20rpx;
-
- .time{
+
+ .recharge-record-block-row_ {
+ font-size: 24rpx;
+ margin-bottom: 20rpx;
+ }
+
+ .time {
font-size: 20rpx;
}
@@ -104,32 +116,36 @@
display: flex;
justify-content: space-between;
margin-bottom: 20rpx;
-
- .text{
- color: #007bff;
+
+ .text1 {
+ color: #ff0000;
+ }
+
+ .text2 {
+ color: #228B22;
}
}
}
}
}
+
.empty-state {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- padding-top: 200rpx;
-
- image {
- width: 400rpx;
- height: 300rpx;
- margin-bottom: 40rpx;
- }
-
- .empty-text {
- font-size: 28rpx;
- color: #999;
- margin-bottom: 50rpx;
- }
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding-top: 200rpx;
+
+ image {
+ width: 400rpx;
+ height: 300rpx;
+ margin-bottom: 40rpx;
+ }
+
+ .empty-text {
+ font-size: 28rpx;
+ color: #999;
+ margin-bottom: 50rpx;
+ }
}
-
\ No newline at end of file