代客下单问题修复,积分上传问题修复

This commit is contained in:
2025-12-12 17:56:26 +08:00
parent 9a0164eff6
commit 6f1864771d
29 changed files with 12071 additions and 7571 deletions

View File

@@ -33,7 +33,7 @@
<view class="u-flex">
<view class="color-666 no-wrap">领取方式</view>
<view class="u-m-l-16" v-if="item.goodsCategory=='优惠券'">系统发放</view>
<view class="u-m-l-16" v-else>店内自</view>
<view class="u-m-l-16" v-else>需前往店铺自行兑换领</view>
</view>
<view class="u-flex u-m-t-16 u-col-baseline" v-if="item.goodsCategory=='优惠券'">
<view class="color-666 no-wrap">特别说明</view>
@@ -53,9 +53,12 @@
</view>
</view>
<view style="height: 100px"></view>
<view style="height: 140px"></view>
<view class="fixed-bottom u-flex u-row-center">
<view class="btn" @click="exchangeClick" :class="[isCanExchange?'':'gray']">
<view v-if="isCanExchange" class="btn" @click="exchangeClick" >
{{returnBtmText}}
</view>
<view class="btn gray" v-else >
{{returnBtmText}}
</view>
</view>
@@ -77,7 +80,7 @@
<view class="popup-content-top">
<text class="color-666">领取方式</text>
<text class="u-m-l-16" v-if="item.goodsCategory=='优惠券'">系统发放</text>
<text class="u-m-l-16" v-else>店内自</text>
<text class="u-m-l-16" v-else>需前往店铺自行兑换领</text>
</view>
<view class="goods-info">
<view class="u-flex">
@@ -414,7 +417,7 @@
background-color: #fff;
left: 0;
right: 0;
padding-bottom: calc(env(safe-area-inset-bottom) + 2rpx);
padding-bottom: 40px;
padding-top: 32rpx;
background-color: #fff;
bottom: 0;

View File

@@ -3,10 +3,10 @@
<view v-for="(item, index) in list" :key="index" @click="toDetail(item)">
<template v-if="layout === 'list'">
<view class="item">
<view class="img coupon" v-if="item.goodsCategory=='优惠券'&&item.couponInfo">
<view class="img coupon" v-if="item.goodsCategory=='优惠券'&&item.couponInfo" style="width: 142rpx;">
<couponIcon :item="item.couponInfo" typeKey="couponType" />
</view>
<image class="img" v-else lazy-load :src="item.goodsImageUrl" mode="aspectFill"></image>
<image class="img" v-else lazy-load :src="item.goodsImageUrl" mode="aspectFill"></image>
<view class="info">
<view>
<view class="name u-line-1">{{item.goodsName}}</view>

View File

@@ -7,7 +7,7 @@
</view>
<view class="u-m-t-22 u-flex u-col-center">
<up-image width="132rpx" height="132rpx" :src="item.goodsImageUrl" v-if="item.goodsCategory!='优惠券'"></up-image>
<view class="img" v-else>
<view class="img" style="width: 138rpx;" v-else>
<couponIcon :item="item.couponInfo" typeKey="couponType" />
</view>
<view class="u-p-l-36">

View File

@@ -10,13 +10,17 @@
<view class="u-p-l-28 u-flex-1">
<view class="font-bold">{{item.pointsGoodsName}}</view>
<view class="u-flex u-row-between u-m-t-8">
<text class="color1 font-bold">{{item.spendPoints}}积分</text>
<view class="u-flex color1 font-bold">
<text >{{item.spendPoints}}积分</text>
<text v-if="item.extraPaymentAmount">+ {{item.extraPaymentAmount}}</text>
</view>
<text class="status " :class="[returnStatusClass(item)]">{{item.status}}</text>
</view>
<view class="u-m-t-8 font-bold color1"> X{{item.number}} </view>
</view>
</view>
<template v-if="item.goodsCategory=='其它商品'&&item.status!='已退款'">
<template v-if="item.goodsCategory=='其它商品'&&item.status!='已退款'&&item.status!='已完成'">
<view class="u-m-t-16">
<view class="u-flex u-row-center">
<up-qrcode cid="ex1" :size="104" :val="qrcode"></up-qrcode>

View File

@@ -13,7 +13,7 @@
<up-loadmore :status="isEnd?'nomore':'loadmore'"></up-loadmore>
</view>
<modal v-model="modalData.show" title="立即兑换确认" :showBottom="false">
<modal v-model="modalData.show" title="查看券码" :showBottom="false">
<view class="u-p-28">
<view class="u-flex u-row-center">
<up-qrcode cid="ex1" :size="104" :val="qrcode"></up-qrcode>