HandOver-liuwu
/
mobileclient
mirror of https://codeup.aliyun.com/lsxd/marketing/mobileclient.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into card-pwd

This commit is contained in:
zhangds 2024-03-19 19:47:44 +08:00
parent 7aa65f4dd4 1b9a52c844
commit 21cb27d619
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coupon/details.html
View File

@ -351,9 +351,11 @@
let detailsConfig = JSON.parse(localStorage.getItem('product_detail'));
goodsCount = localStorage.getItem('goodsCount');
this.backAble = goodsCount > 1;//多个商品才有返回
if (detailsConfig) {
this.bgcolor = detailsConfig.button_color;
this.ftColor = detailsConfig.font_color;
this.describe = detailsConfig.describe;
}
//商品详情
goodsDetail = JSON.parse(localStorage.getItem('goodsInfo'));

15
coupon/myOrder.html
View File

@ -28,7 +28,8 @@
<img v-show='!!loadShowHeight' class='img-lodging'
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/img-logding.png" alt="">
<div class="content" slot="content" @scroll="scrollBottom($event)">
<div class="content-item" v-for="item in orderList" :key="item.order_number" @click="toDetails(item)">
<div class="content-item" v-for="item in orderList" :key="item.order_number"
@click.stop="toDetails(item)">
<div class="top">
<p class="time">{{item.update_time}}</p>
<p class="status" :style="{color:statusColor(item.status)}">{{item.status_text}}
@ -48,19 +49,19 @@
<p class="money">实付金额：￥<span>{{item.pay_amount}}</span></p>
<!-- 立即支付 -->
<div v-if="item.status==6" class="cancel-pay">
<p class="button" @click="immediatelyCancel(item)">取消订单</p>
<p class="button" @click="immediatelyPay(item)">立即支付</p>
<p class="button" @click.stop="immediatelyCancel(item)">取消订单</p>
<p class="button" @click.stop="immediatelyPay(item)">立即支付</p>
</div>
<template v-if="item.type==2">
<!-- 立减金待领取 -->
<p class="button" @click="receiveFn(item)" v-if="item.status==0">去兑换</p>
<p class="button" @click.stop="receiveFn(item)" v-if="item.status==0">去兑换</p>
<!-- 立减金领取过期 -->
<p class="button filter" @click="receiveFn(item)" v-if="item.status==5">去兑换
<p class="button filter" @click.stop="receiveFn(item)" v-if="item.status==5">去兑换
</p>
</template>
<template v-if="item.type==1">
<!-- 查看卡密 -->
<p class="button-card" @click="lookCard(item)"
<p class="button-card" @click.stop="lookCard(item)"
v-if="item.status==2&&item.goods.product_type==2&&item.goods.card_show==2">查看卡密</p>
<!-- 款项状态 -->
<p class="pay_status" v-if="[2,3].includes(item.pay_status)&&item.status==3">
@ -192,6 +193,8 @@
/*跳转详情*/
toDetails(order) {
if (order.status === 4 || order.status === 6) return;
sessionStorage.setItem('orderNumber', order.order_number);
switch (order.goods.product_type) {
case 1: