Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app
This commit is contained in:
@@ -12,11 +12,11 @@
|
||||
</view>
|
||||
<view class="title">{{$t('order.pointsRecord')}}</view>
|
||||
<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index" @click="toDetails(item)">
|
||||
<view class="recharge-record-block-row">{{item.remark.slice(0, (item.remark.indexOf(',')))}}<text
|
||||
<view class="recharge-record-block-row">{{item.relationId ? item.remark.slice(0, (item.remark.indexOf(','))) : $t('user.backEnd')}}<text
|
||||
:class="item.actType === 1 ? 'text1' : 'text2'">{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}}</text>
|
||||
</view>
|
||||
<view class="time">{{item.createTime}}</view>
|
||||
<view style="font-size: 24rpx;">{{item.remark.slice((item.remark.indexOf(','))+1)}}<wd-icon name="file-copy"
|
||||
<view style="font-size: 24rpx;" v-if="item.relationId">{{item.remark.slice((item.remark.indexOf(','))+1)}}<wd-icon name="file-copy"
|
||||
size="14px" color="#65A1FA" style="margin-left: 10rpx;" @click="copyToClipboard()"></wd-icon></view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -69,10 +69,14 @@
|
||||
* 跳转订单详情
|
||||
*/
|
||||
const toDetails = (order: IOrder) => {
|
||||
console.log(order.relationId, "order");
|
||||
uni.navigateTo({
|
||||
url: '/pages/user/order/details?orderId=' + order.relationId
|
||||
})
|
||||
if (order.relationId) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/user/order/details?orderId=' + order.relationId
|
||||
})
|
||||
} else {
|
||||
uni.showToast({ title: t('user.cannotView'), icon: 'none' });
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
:class="item.orderType !== '充值' ? 'text1' : 'text2'">{{item.orderType !== '充值' ? '' : '+'}}{{item.changeAmount}}</text>
|
||||
</view>
|
||||
<view class="recharge-record-block-row_">{{item.productName}}</view>
|
||||
<view class="recharge-record-block-row_">{{$t('user.orderSn')}}:{{item.payNo}}<wd-icon name="file-copy"
|
||||
<view class="recharge-record-block-row_" v-if="item.relationId">{{$t('user.orderSn')}}:{{item.payNo}}<wd-icon name="file-copy"
|
||||
size="14px" color="#65A1FA" style="margin-left: 10rpx;" @click="copyToClipboard()"></wd-icon>
|
||||
</view>
|
||||
<view class="time">{{item.createTime}}</view>
|
||||
@@ -75,10 +75,14 @@
|
||||
* 跳转订单详情
|
||||
*/
|
||||
const toDetails = (order: IOrder) => {
|
||||
console.log(order.relationId, "order");
|
||||
uni.navigateTo({
|
||||
url: '/pages/user/order/details?orderId=' + order.relationId
|
||||
})
|
||||
if (order.relationId) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/user/order/details?orderId=' + order.relationId
|
||||
})
|
||||
} else {
|
||||
uni.showToast({ title: t('user.cannotView'), icon: 'none' });
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user