Feat:抽奖2.0(查漏补缺)
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user