diff --git a/api/config.ts b/api/config.ts index f437afb..24e0a21 100644 --- a/api/config.ts +++ b/api/config.ts @@ -7,7 +7,7 @@ export const ENV = process.env.NODE_ENV || 'development'; */ const BASE_URL_MAP = { development: { - // MAIN: 'http://192.168.110.100:9300/pb/', // 张川川 + //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/order/details.vue b/pages/user/order/details.vue index f81dab3..3794704 100644 --- a/pages/user/order/details.vue +++ b/pages/user/order/details.vue @@ -23,7 +23,7 @@ {{ `- ${order.jfDeduction}` }} - {{ `${order.realMoney}` }} {{ $t('global.coin') }} + {{ `${order.realMoney}` }} {{ order.orderType === 'point' ? 'NZ$' : $t('global.coin') }} @@ -36,7 +36,7 @@ - + diff --git a/pages/user/points/index.vue b/pages/user/points/index.vue index 51294a2..91cc2e2 100644 --- a/pages/user/points/index.vue +++ b/pages/user/points/index.vue @@ -11,7 +11,7 @@ {{$t('order.pointsRecord')}} - + {{item.remark.slice(0, (item.remark.indexOf(':')))}}{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}} @@ -64,6 +64,16 @@ url: '/pages/user/recharge/index' }) } + + /** + * 跳转订单详情 + */ + const toDetails = (order: IOrder) => { + console.log(order.relationId, "order"); + uni.navigateTo({ + url: '/pages/user/order/details?orderId=' + order.relationId + }) + } \ No newline at end of file diff --git a/pages/user/virtual/index.vue b/pages/user/virtual/index.vue index 6403ca2..2e1cf01 100644 --- a/pages/user/virtual/index.vue +++ b/pages/user/virtual/index.vue @@ -14,7 +14,7 @@ {{$t('order.rechargeConsumptionList')}} - + {{item.orderType}}{{item.orderType !== '充值' ? '' : '+'}}{{item.changeAmount}} @@ -70,6 +70,16 @@ url: '/pages/user/recharge/index' }) } + + /** + * 跳转订单详情 + */ + const toDetails = (order: IOrder) => { + console.log(order.relationId, "order"); + uni.navigateTo({ + url: '/pages/user/order/details?orderId=' + order.relationId + }) + }