更新:天医币、积分列表增加跳转订单详情页。修改活动说明字体样式
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
<text class="text-red-500 text-lg font-bold">{{ `- ${order.jfDeduction}` }}</text>
|
||||
</wd-cell>
|
||||
<wd-cell title="实付金额">
|
||||
<text class="text-red-500 text-lg font-bold">{{ `${order.realMoney}` }}</text> {{ $t('global.coin') }}
|
||||
<text class="text-red-500 text-lg font-bold">{{ `${order.realMoney}` }}</text> {{ order.orderType === 'point' ? 'NZ$' : $t('global.coin') }}
|
||||
</wd-cell>
|
||||
</wd-cell-group>
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
<wd-icon name="file-copy" size="14px" color="#65A1FA" class="ml-1!" @click="copyToClipboard(order.orderSn)"></wd-icon>
|
||||
</wd-cell>
|
||||
<wd-cell title="创建时间" :value="order.createTime" />
|
||||
<wd-cell title="付款时间" :value="order.paymentDate" />
|
||||
<wd-cell title="付款时间" :value="order.paymentDate" v-if="order.paymentDate"/>
|
||||
</wd-cell-group>
|
||||
</view>
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<view><wd-icon name="arrow-right" size="16px" color="#fff" /></view>
|
||||
</view>
|
||||
<view class="title">{{$t('order.pointsRecord')}}</view>
|
||||
<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
|
||||
<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
|
||||
:class="item.actType === 1 ? 'text1' : 'text2'">{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}}</text>
|
||||
</view>
|
||||
@@ -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
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@@ -8,16 +8,17 @@
|
||||
<view class="recharge_block" @click="chosPric(item)"
|
||||
:class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''"
|
||||
v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId">
|
||||
<view class="recharge_money">¥{{item.realMoney}}</view>
|
||||
<view class="recharge_money">NZ${{item.realMoney}}</view>
|
||||
<view style="font-size: 26rpx;">{{item.money}}{{ $t('global.coin') }}</view>
|
||||
<!-- 红框位置的618活动标签 -->
|
||||
<!-- <view class="activity-tag">618活动</view> -->
|
||||
<span class="activity-label" v-if="item.givejf >0">{{item.description}}</span>
|
||||
<text class="recharge_give" v-if="item.givejf >0">({{$t('order.give')}}{{item.givejf}}{{$t('order.points')}})</text>
|
||||
<text class="recharge_give"
|
||||
v-if="item.givejf >0">({{$t('order.give')}}{{item.givejf}}{{$t('order.points')}})</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="activity-container">
|
||||
<view class="active_block" v-if="remark?.remark">
|
||||
<view v-html="remark.remark"></view>
|
||||
</view>
|
||||
<view class="cha_fangsh">
|
||||
@@ -100,7 +101,7 @@
|
||||
const popup = ref(null)
|
||||
const agreemenState = ref(false)
|
||||
// 协议id
|
||||
const id = ref(101)
|
||||
const id = ref(116)
|
||||
|
||||
const richTextContent = ref('');
|
||||
// 协议数据
|
||||
@@ -347,8 +348,7 @@
|
||||
try {
|
||||
const text = ref(await getActivityDescription())
|
||||
remark.value = text.value.res[0]
|
||||
// console.log(remark.value, '活动说明内容');
|
||||
|
||||
console.log(remark.value, '活动说明内容');
|
||||
} catch (error) {
|
||||
console.error('获取协议数据:', error)
|
||||
}
|
||||
@@ -542,4 +542,38 @@
|
||||
overflow-y: scroll
|
||||
}
|
||||
}
|
||||
|
||||
.active_block {
|
||||
background-color: rgba(37, 143, 235, 0.2);
|
||||
margin: 0 30rpx 20rpx 30rpx;
|
||||
border-radius: 10rpx;
|
||||
padding: 15rpx;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
::v-deep.active_block span {
|
||||
color: red;
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
padding: 0 5rpx;
|
||||
color: red;
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
::v-deep.active_block span:first-child {
|
||||
padding: 0 5rpx 0 0;
|
||||
}
|
||||
|
||||
::v-deep.active_block p {
|
||||
padding-top: 10rpx;
|
||||
color: #666;
|
||||
font-size: 24rpx;
|
||||
line-height: 34rpx;
|
||||
}
|
||||
|
||||
::v-deep.active_block p span {
|
||||
padding: 0 5rpx !important;
|
||||
}
|
||||
</style>
|
||||
@@ -14,7 +14,7 @@
|
||||
<view><wd-icon name="arrow-right" size="16px" color="#fff" /></view>
|
||||
</view>
|
||||
<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
|
||||
<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
|
||||
<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index" @click="toDetails(item)">
|
||||
<view class="recharge-record-block-row">{{item.orderType}}<text
|
||||
:class="item.orderType !== '充值' ? 'text1' : 'text2'">{{item.orderType !== '充值' ? '' : '+'}}{{item.changeAmount}}</text>
|
||||
</view>
|
||||
@@ -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
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
Reference in New Issue
Block a user