liangxin/xdd-uniapp-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat：抽奖2.0（查漏补缺）

Browse Source
This commit is contained in:
LinCyJang
2026-04-30 02:04:25 +08:00
parent 6cb403c5d5
commit c3c0483625
10 changed files with 515 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/order/MyOrder/index.vue
+91 -5
View File
@@ -186,6 +186,61 @@
</view>
</view>
</view>
<view v-else-if="order.isDrawOrder === 1">
<view class="item-info acea-row row-between row-top draw-order-info">
<view class="pictrue">
<image :src="order.drawOrderInfo && order.drawOrderInfo.prizeImage" />
</view>
<view class="text" style="margin-top: 0 !important;">
<view class="acea-row name-wrap" style="flex-wrap: nowrap">
<view class="name more-t v12-font-bold">{{ (order.drawOrderInfo && order.drawOrderInfo.prizeName) || '抽奖商品' }}</view>
<view class="money draw-price">
<view class="draw-price-origin">
<text class="v12-font-22">￥</text>
<text class="v12-font-28">{{ force2Decimal((order.drawOrderInfo && order.drawOrderInfo.prizePrice) || 0) }}</text>
</view>
<view class="v12-font-22 v12-secondary-dark-text draw-qty">x1</view>
</view>
</view>
</view>
</view>
<view class="totalPrice acea-row row-between row-middle" :style="{'padding-bottom': '0'}">
<view v-if="order.createTime">
<span class="orderTime v12-font-24 v12-dark1-text">{{ order.createTime }}</span>
</view>
<view class="v12-font-24 v12-dark1-text">
共{{ order.totalNum || 0 }}件商品
<text v-if="order.isGiftCardReceiveBlind === 0">
<text class="v12-dark-text v12-font-28 v12-font-bold">
，总金额
</text>
<text class="v12-font-22 v12-primary-text v12-font-bold">
￥
</text>
<text class="money font-color-lightred v12-font-28 v12-primary-text v12-font-bold">
{{ force2Decimal(order.payPrice) }}
</text>
</text>
</view>
</view>
<view class="v12-mt-3">
<u-line></u-line>
</view>
<view class="draw-code-row acea-row row-between row-middle">
<view class="v12-font-28 v12-dark-text">
抽奖码:
<text class="v12-primary-text v12-font-bold draw-ticket-code">
{{ order.drawOrderInfo && order.drawOrderInfo.ticketCode }}
</text>
</view>
<view
v-if="order.drawOrderInfo && order.drawOrderInfo.drawStatusName"
class="font-color-white statusTag v12-primary"
>
{{ order.drawOrderInfo.drawStatusName }}
</view>
</view>
</view>
<view v-else>
<view
v-for="(cart,cartInfoIndex) in order.cartInfo"
@@ -237,7 +292,7 @@
</view>
</view>
</view>
<view v-if="!order.experienceOrderInfo" class="totalPrice acea-row row-between row-middle" :style="{'padding-bottom': order.isTravelGroup === 1 ? '0rpx !important' : '30rpx'}">
<view v-if="!order.experienceOrderInfo && order.isDrawOrder === 0" class="totalPrice acea-row row-between row-middle" :style="{'padding-bottom': order.isTravelGroup === 1 ? '0rpx !important' : '30rpx'}">
<view v-if="order.createTime">
<span class="orderTime v12-font-24 v12-dark1-text">{{ order.createTime }}</span>
</view>
@@ -293,8 +348,9 @@
v-if="!order.isGiftCardSend && !order.experienceOrderInfo"
class="bottom flex jc-between ai-center"
>
<view
v-if="[2, 3].includes(parseInt(order._status._type)) && order.isTickets === 0"
v-if="[2, 3].includes(parseInt(order._status._type)) && order.isTickets === 0 && order.isDrawOrder === 0"
class="group-btn"
>
<text
@@ -316,6 +372,11 @@
</view>
<template v-else>
<view class="v12-justify-between" style="width: 100%">
<view
v-if="order.isDrawOrder > 0"
class="bnt service"
>联系客服
</view>
<view>
<view
v-if="order.isGiftCardReceiveBlind === 0 &&
@@ -340,6 +401,7 @@
>删除订单</view>
</view>
</view>
</template>
<view class="flex">
<template v-if="parseInt(order._status._type) === 0">
@@ -348,7 +410,7 @@
@click="cancelOrder(order)"
>取消订单</view>
<view
v-if="order.isTravelGroup === 0"
v-if="order.isTravelGroup === 0 && order.isDrawOrder === 0"
class="bnt cancelBnt v12-dark-text v12-dark-border"
@click="addressTap(order)"
>修改地址</view>
@@ -369,7 +431,7 @@
@click="applyRefund(order)"
>{{ '申请退款' }}</view>
<view
v-if="canShowModifyAddress(order)"
v-if="canShowModifyAddress(order) && order.isDrawOrder === 0"
class="bnt service"
@click="addressTap(order)"
>修改地址</view>
@@ -404,7 +466,7 @@
</template>
<template v-if="parseInt(order._status._type) === 2 && order.isTickets === 0 && order.isTravelGroup === 0">
<view
v-if="order.isExtendedDelivery === 0"
v-if="order.isExtendedDelivery === 0 && order.isDrawOrder === 0"
class="bnt default"
@click="toDelay(order.orderId)"
>延长收货
@@ -1543,4 +1605,28 @@ page {
width: 160rpx !important;
height: 160rpx !important;
}
.draw-order-info .draw-price{
text-align: right;
}
.draw-order-info .draw-price-origin{
color: #999;
text-decoration: line-through;
}
.draw-order-info .draw-qty{
margin-top: 8rpx;
}
.draw-code-row{
margin: 0rpx 0rpx 20rpx 30rpx;
padding-top: 20rpx;
}
.draw-ticket-code{
margin-left: 8rpx;
}
.draw-status-tag{
color: #fff;
background: #c52733;
border-radius: 999rpx;
padding: 6rpx 24rpx;
line-height: 1.4;
}
</style>
pages/order/OrderDetails/index.vue
+24 -10
View File
@@ -70,7 +70,7 @@
</div>
<div class="v12-font-28 v12-secondary-dark-text v12-justify-between">
<text class=" more-t" style="flex: 2;">{{ orderInfo.userAddress }}</text>
<view v-if="canShowModifyAddress(orderInfo)" @click="goAddress" class="v12-btn cancel v12-dark-text v12-dark-border v12-radius-40" >修改地址</view>
<view v-if="canShowModifyAddress(orderInfo) && orderInfo.isDrawOrder === 0" @click="goAddress" class="v12-btn cancel v12-dark-text v12-dark-border v12-radius-40" >修改地址</view>
</div>
</template>
@@ -216,7 +216,7 @@
</view>
</view>
<view class="v12-justify-between v12-flex-column v12-dark-text v12-text-right">
<view class=" ">
<view class=" " v-if="orderInfo.isDrawOrder === 0">
<text class="v12-font-22">
￥
</text>
@@ -240,7 +240,7 @@
</view>
</view>
</view>
<view class="" v-if="orderInfo.cartInfo &&( d === orderInfo.cartInfo.length - 1)">
<view class="" v-if="orderInfo.cartInfo &&( d === orderInfo.cartInfo.length - 1) && orderInfo.isDrawOrder === 0">
<view class="v12-justify-between v12-align-center v12-mt-3 v12-dark-text" v-if="orderInfo.isGiftCardReceiveBlind === 0">
<view class="v12-font-24 v12-dark-text">
商品总价
@@ -312,6 +312,13 @@
</view>
</view>
</view>
<view>
<u-divider></u-divider>
<view>
<text class="v12-font-bold">抽奖码：</text>
<text class="v12-font-bold v12-primary-text">{{ orderInfo.drawOrderInfo.ticketCode }}</text>
</view>
</view>
</view>
</view>
@@ -482,11 +489,12 @@
<template v-if="status.type == 1" >
<view class="v12-justify-between " style="width: 100%">
<view class="v12-justify-between ">
<view v-if="orderInfo.isGiftCardReceiveBlind === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
<view class="bnt v12-dark-text v12-dark-border cancel" @click="delayOrder">催发货</view>
<view v-if="canShowModifyAddress(orderInfo)" class="bnt v12-dark-text v12-dark-border cancel" @click="goAddress">修改地址</view>
<view v-if="orderInfo.isDrawOrder > 0" class="bnt v12-dark-text v12-dark-border cancel">联系客服</view>
<view v-if="orderInfo.isGiftCardReceiveBlind === 0 && orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
<view v-if="orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="delayOrder">催发货</view>
<view v-if="canShowModifyAddress(orderInfo) && orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="goAddress">修改地址</view>
</view>
<view class="bnt v12-primary-text v12-primary-border cancel" @click="goGoodsReturn2(orderInfo)">申请退款</view>
<view v-if="orderInfo.isDrawOrder === 0" class="bnt v12-primary-text v12-primary-border cancel" @click="goGoodsReturn2(orderInfo)">申请退款</view>
</view>
</template>
<template v-if="status.type == 2">
@@ -495,7 +503,7 @@
<view class="" v-else></view>
<view class="v12-justify-between">
<view class="btn-more" style="position: relative">
<view class=" v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</view>
<view v-if="orderInfo.isDrawOrder === 0" class=" v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</view>
<view class="group-float" v-show="showMore" :style="{top: orderInfo.isExtendedDelivery==0 ? '-60px' : '-32px'}">
<view v-if="orderInfo.isExtendedDelivery==0" class="btn flex jc-center ai-center v12-font-24" @click="toDelay(orderInfo.orderId)">延长收货</view>
<view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view>
@@ -514,7 +522,7 @@
<view class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
<view class="v12-justify-between">
<view class="btn-more" style="position: relative">
<text class=" v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</text>
<text v-if="orderInfo.isDrawOrder === 0" class=" v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</text>
<view class="group-float" v-show="showMore" :style="{top: '-32px'}">
<view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view>
</view>
@@ -550,7 +558,10 @@
</view>
</template>
<template v-if="status.type == 4">
<view class="bnt v12-dark-text v12-dark-border cancel" @click="delOrder">删除订单</view>
<view class="v12-justify-between " style="width: 100%">
<view v-if="orderInfo.isDrawOrder > 0" class="bnt v12-dark-text v12-dark-border cancel" >联系客服</view>
<view class="bnt v12-dark-text v12-dark-border cancel" @click="delOrder">删除订单</view>
</view>
<!-- <view
v-if="orderInfo.isTickets !== 1"
class="bnt v12-dark-text v12-dark-border default"
@@ -1216,6 +1227,9 @@ export default {
} else if (this.orderInfo.isGiftCardReceive === 1 || this.orderInfo.isGiftCardSend === 1) {
this.orderTypeName = "礼包订单"
this.orderTypeNameStatus = false
}else if (this.orderInfo.isDrawOrder === 1) {
this.orderTypeName = "抽奖订单"
this.orderTypeNameStatus = false
}
this.system_store = res.data.systemStore || {}
this.mapKey = res.data.mapKay