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 @@