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/components/book/BookPrice.vue b/components/book/BookPrice.vue
new file mode 100644
index 0000000..9306db0
--- /dev/null
+++ b/components/book/BookPrice.vue
@@ -0,0 +1,49 @@
+
+
+ 已购买
+ 免费
+ VIP免费
+ {{ item.minPrice }} {{ $t('global.coin') }}
+
+ {{ `${data.readCount}${$t('bookHome.readingCount')}` }}
+ {{ `${data.buyCount}${$t('bookHome.purchased')}` }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/course/ChapterList.vue b/components/course/ChapterList.vue
index e13d742..d6eeaf9 100644
--- a/components/course/ChapterList.vue
+++ b/components/course/ChapterList.vue
@@ -14,13 +14,13 @@
课程有效期截止到:{{ catalogue.endTime }}
-
续费
-
+ -->
diff --git a/components/order/Confirm.vue b/components/order/Confirm.vue
index f96747e..3bfabfb 100644
--- a/components/order/Confirm.vue
+++ b/components/order/Confirm.vue
@@ -62,7 +62,7 @@
- {{ $t('order.maxPoints', { max: pointsUsableMax }) }}
+ {{ $t('order.maxPoints').replace('max', pointsUsableMax) }}
(), {
goodsList: () => [],
userInfo: () => ({}),
- allowPointPay: () => false,
- orderType: () => '',
- backStep: () => 1
+ allowPointPay: true,
+ orderType: 'order',
+ backStep: 1
})
// 订单备注
diff --git a/components/order/ProductInfo.vue b/components/order/ProductInfo.vue
index 0831111..87677e1 100644
--- a/components/order/ProductInfo.vue
+++ b/components/order/ProductInfo.vue
@@ -33,6 +33,8 @@ const productImg = computed(() => {
return props.data?.images || ''
case 'vip':
return '/static/vip.png'
+ case 'abroadVip':
+ return '/static/vip.png'
case 'point':
return '/static/jifen.png'
default:
@@ -47,6 +49,8 @@ const title = computed(() => {
return props.data?.name || ''
case 'vip':
return props.data?.title + '(' + props.data?.year + '年)' || ''
+ case 'abroadVip':
+ return '电子书VIP' + props.data?.title + '(' + props.data?.days + '天)' || ''
case 'point':
return ''
default:
@@ -61,6 +65,8 @@ const price = computed(() => {
return props.data?.abroadPrice || 0
case 'vip':
return props.data?.fee || 0
+ case 'abroadVip':
+ return props.data?.money || 0
case 'point':
return ''
default:
diff --git a/locale/en.json b/locale/en.json
index b296474..7a8d9c4 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -298,7 +298,9 @@
"listen": {
"title": "Audio Book",
"speed": "Playback Speed",
- "chapterList": "Chapter List"
+ "chapterList": "Chapter List",
+ "isLast": "Last Chapter",
+ "isFirst": "First Chapter"
},
"workOrder": {
"submit_success": "Submitted successfully"
@@ -443,7 +445,7 @@
"notUseCoupon": "Don't use coupon",
"reselect": "Reselect",
"selected": "Confirm",
- "maxPoints": "Available Points ({max} pts)",
+ "maxPoints": "Available Points (max pts)",
"pointsPlaceholder": "Enter points",
"allPoints": "Total Points",
"insufficientBalance": "Insufficient virtual coin balance",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index a44eaf5..25c4fcf 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -298,7 +298,9 @@
"listen": {
"title": "听书",
"speed": "播放速度",
- "chapterList": "章节列表"
+ "chapterList": "章节列表",
+ "isLast": "已到最后一章",
+ "isFirst": "已到第一章"
},
"workOrder": {
"submit_success": "提交成功"
@@ -443,7 +445,7 @@
"notUseCoupon": "不使用优惠券",
"reselect": "重新选择",
"selected": "选好了",
- "maxPoints": "可用积分({max}分)",
+ "maxPoints": "可用积分(max分)",
"pointsPlaceholder": "请输入积分",
"allPoints": "全部积分",
"insufficientBalance": "天医币余额不足",
diff --git a/pages.json b/pages.json
index 73a6a30..c090a83 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,5 @@
{
- "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+ "pages": [
{
"path": "pages/course/index",
"style": {
diff --git a/pages/book/detail.vue b/pages/book/detail.vue
index 831a519..0c4220f 100644
--- a/pages/book/detail.vue
+++ b/pages/book/detail.vue
@@ -114,31 +114,6 @@
@confirm="handlePurchase"
@close="closePurchasePopup"
/>
-
diff --git a/pages/book/index.vue b/pages/book/index.vue
index 1a570a7..9a7e60b 100644
--- a/pages/book/index.vue
+++ b/pages/book/index.vue
@@ -162,10 +162,7 @@
>
{{ item.name }}
- {{ item.minPrice }} {{ t('global.coin') }}
- {{
- formatStats(item)
- }}
+
{{ $t('global.dataNull') }}
@@ -177,9 +174,9 @@
-
-
diff --git a/pages/order/goodsConfirm.vue b/pages/order/goodsConfirm.vue
index 1997420..8d5d702 100644
--- a/pages/order/goodsConfirm.vue
+++ b/pages/order/goodsConfirm.vue
@@ -4,7 +4,7 @@
-
+