diff --git a/locale/en.json b/locale/en.json
index d769df8..30d1266 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -496,7 +496,9 @@
"valueAddedServices": "Value-added services",
"readAgree": "I have read and agreed",
"readAgreeServices": "Please read and agree to the value-added services first",
- "orderDetails": "Order Details"
+ "orderDetails": "Order Details",
+ "pointsRecord": "Points consumption record",
+ "unusable": "The billing service cannot be used on the device"
},
"vip": {
"courseVip": "Course VIP",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index eda61ad..b05fa49 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -497,7 +497,8 @@
"readAgree": "我已阅读并同意",
"readAgreeServices": "请先阅读并同意增值服务",
"orderDetails": "订单详情",
- "pointsRecord": "积分消费记录"
+ "pointsRecord": "积分消费记录",
+ "unusable": "设备上无法使用计费服务"
},
"vip": {
"courseVip": "课程VIP",
diff --git a/pages/user/points/index.vue b/pages/user/points/index.vue
index 74a1855..51294a2 100644
--- a/pages/user/points/index.vue
+++ b/pages/user/points/index.vue
@@ -1,5 +1,6 @@
-
+
@@ -7,13 +8,16 @@
{{$t('order.recharge')}}
-
+
{{$t('order.pointsRecord')}}
- {{item.remark.slice(0, (item.remark.indexOf(',')))}}{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}}
+ {{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)}}
@@ -24,6 +28,7 @@
import { useI18n } from 'vue-i18n'
import { useUserStore } from '@/stores/user'
import { getPointsData } from '@/api/modules/user'
+ import { copyToClipboard } from '@/utils/index'
const { t } = useI18n()
const paging = ref()
@@ -50,7 +55,7 @@
loading.value = false
}
}
-
+
/**
* 跳转充值页面
*/
@@ -73,8 +78,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;
@@ -82,12 +87,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;
@@ -96,9 +103,9 @@
.recharge-record-block {
border-bottom: 1px solid #e0e0e0;
padding: 20rpx;
-
- .time{
- font-size: 20rpx;
+
+ .time {
+ font-size: 24rpx;
margin-bottom: 20rpx;
}
@@ -106,35 +113,36 @@
display: flex;
justify-content: space-between;
margin-bottom: 20rpx;
-
- .text1{
+ font-weight: 700;
+ .text1 {
color: #ff0000;
}
- .text2{
+
+ .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
diff --git a/pages/user/recharge/index.vue b/pages/user/recharge/index.vue
index c634f57..b88fd8a 100644
--- a/pages/user/recharge/index.vue
+++ b/pages/user/recharge/index.vue
@@ -224,6 +224,10 @@
// 初始化成功
} else {
console.log('init失败了');
+ uni.showToast({
+ title: '设备上无法使用计费服务',
+ icon: 'fail'
+ })
// 初始化失败
isConnected.value = false;
}
@@ -424,13 +428,13 @@
}
.recharge-button {
- width: 100%;
+ width: 60%;
height: 50rpx;
line-height: 50rpx;
background-color: #007bff;
color: #ffffff;
- font-size: 18rpx;
- border-radius: 25rpx;
+ font-size: 30rpx;
+ border-radius: 30rpx;
border: none;
}
@@ -460,7 +464,7 @@
}
.cha_fangsh {
- padding: 20rpx 20rpx 60rpx 20rpx;
+ padding: 20rpx;
.cf_title {
font-size: 30rpx;
@@ -506,7 +510,7 @@
display: flex;
padding: 20rpx 20rpx 160rpx 20rpx;
color: #aaa;
- font-size: 18rpx;
+ font-size: 26rpx;
align-items: center;
.highlight {
diff --git a/pages/user/virtual/index.vue b/pages/user/virtual/index.vue
index f9f7187..6403ca2 100644
--- a/pages/user/virtual/index.vue
+++ b/pages/user/virtual/index.vue
@@ -5,6 +5,9 @@
+
+ {{goBuyTitle}}
+
{{$t('order.recharge')}}
@@ -16,7 +19,9 @@
:class="item.orderType !== '充值' ? 'text1' : 'text2'">{{item.orderType !== '充值' ? '' : '+'}}{{item.changeAmount}}
{{item.productName}}
- {{$t('user.orderSn')}}：{{item.payNo}}
+ {{$t('user.orderSn')}}：{{item.payNo}}
+
{{item.createTime}}
@@ -28,6 +33,7 @@
import { useI18n } from 'vue-i18n'
import { useUserStore } from '@/stores/user'
import { getTransactionDetailsList } from '@/api/modules/user'
+ import { copyToClipboard } from '@/utils/index'
const { t } = useI18n()
const paging = ref()
@@ -37,6 +43,7 @@
const bookList = ref([])
const loading = ref(false)
const firstLoad = ref(true)
+ const goBuyTitle = ref('【天医币】仅为我平台支付使用币种，仅为了方便用户支付使用。【天医币】可以用于在我平台支付书籍或课程使用。【天医币】这个名称是为适应我们平台的定位属性，所起名称。与区块链虚拟货币无任何关系。')
// 充值记录列表
async function rechargeList(pageNo : number, pageSize : number) {
@@ -109,14 +116,14 @@
}
.time {
- font-size: 20rpx;
+ font-size: 22rpx;
}
.recharge-record-block-row {
display: flex;
justify-content: space-between;
margin-bottom: 20rpx;
-
+ font-weight: 700;
.text1 {
color: #ff0000;
}