diff --git a/api/config.ts b/api/config.ts index 741930c..21002b2 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/pages/user/points/index.vue b/pages/user/points/index.vue index 8b136ec..3e9f29c 100644 --- a/pages/user/points/index.vue +++ b/pages/user/points/index.vue @@ -16,7 +16,7 @@ :class="item.changeAmount < 0 ? 'text1' : 'text2'">{{item.changeAmount < 0 ? '' : '+'}}{{item.changeAmount}} {{item.createTime}} - {{item.remark.slice((item.remark.indexOf(','))+1)}}{{item.remark.slice((item.remark.indexOf(','))+1)}} @@ -120,7 +120,7 @@ .time { font-size: 24rpx; - margin-bottom: 20rpx; + } .recharge-record-block-row { diff --git a/pages/user/virtual/index.vue b/pages/user/virtual/index.vue index bb377e8..103d2ce 100644 --- a/pages/user/virtual/index.vue +++ b/pages/user/virtual/index.vue @@ -18,7 +18,7 @@ {{item.orderType}}{{item.changeAmount < 0 ? '' : '+'}}{{item.changeAmount}} - {{item.productName}} + {{ item.note ?? item.productName }} {{$t('user.orderSn')}}:{{item.payNo}} @@ -126,7 +126,7 @@ .recharge-record-block-row_ { font-size: 24rpx; - margin-bottom: 20rpx; + // margin-bottom: 20rpx; } .time { diff --git a/pages/vip/book.vue b/pages/vip/book.vue index 7273a05..f0bc9f5 100644 --- a/pages/vip/book.vue +++ b/pages/vip/book.vue @@ -12,7 +12,7 @@ - 畅享海量电子图书 + 畅享app内电子图书 @@ -80,7 +80,7 @@ const handlePurchase = (vip: any) => { productName: `${vip.title}`, price: vip.money, productImages: '/static/vip.png', - state: null, + state: 1, orderType: 'abroadVip' } uni.navigateTo({