build(deps): update deps
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-09-24 16:02:44 +08:00
parent 097029128c
commit 8e119162f1
22 changed files with 2212 additions and 377 deletions

View File

@@ -1,10 +1,10 @@
<script setup lang="ts">
import { ref } from 'vue';
import {ref} from 'vue';
import Taro from '@tarojs/taro';
import { addCart, getCart, clearCart } from '@/api/cart';
import { Plus, Minus } from '@nutui/icons-vue-taro';
import { createActiveOrder } from '@/api/goods';
import { createAfterOrder, getUserPoint } from '@/api/admin';
import {addCart, getCart, clearCart} from '@/api/cart';
import {Plus, Minus} from '@nutui/icons-vue-taro';
import {createActiveOrder} from '@/api/goods';
import {createAfterOrder, getUserPoint} from '@/api/admin';
import Pay from '@/components/Pay.vue';
interface CardList {
@@ -201,7 +201,8 @@ defineExpose({
<view class="container flex items-center">
<!-- <view>购物车数量: {{ cartInfo.count }}</view> -->
<view class="cardImg">
<image src="http://p1.meituan.net/csc/929f447a96a44b09a09b2e0055433222717.png">
<image
src="http://p1.meituan.net/csc/929f447a96a44b09a09b2e0055433222717.png">
</image>
<view class="count-text" v-if="cartInfo.count > 0">
<text>{{ cartInfo.count }}</text>
@@ -209,20 +210,30 @@ defineExpose({
</view>
<view class="ml-1 text-[28px]">
<text>总金额: {{ cartInfo.discount_price.toFixed(2) }}</text>
<text v-if="!IsPendingOrder">积分抵扣: {{ cartInfo.discount_integral.toFixed(2) }}
<text v-if="!IsPendingOrder"
>积分抵扣: {{ cartInfo.discount_integral.toFixed(2) }}
</text>
</view>
</view>
<view v-if="cartInfo.count > 0" class="payBtn" @click.stop="create_order">去结算
<view v-if="cartInfo.count > 0" class="payBtn" @click.stop="create_order"
>去结算
</view>
</view>
<!-- 购物车弹窗 -->
<nut-popup :style="{ padding: '15px' }" round position="bottom" z-index="1" :catch-move="true"
:safe-area-inset-bottom="true" v-model:visible="show">
<nut-popup
:style="{padding: '15px'}"
round
position="bottom"
z-index="1"
:catch-move="true"
:safe-area-inset-bottom="true"
v-model:visible="show">
<view class="list-header">
<view class="left" @click.stop="clear_cart">
<!-- <Del2 color="#666666" /> -->
<image class="w-[20px] h-[20px]" src="http://p0.meituan.net/csc/db4d11fd744b69435c6ffdc6bfc868c5684.png" />
<image
class="w-[20px] h-[20px]"
src="http://p0.meituan.net/csc/db4d11fd744b69435c6ffdc6bfc868c5684.png" />
<text class="text-[20px]" style="color: #666666">清空购物车</text>
</view>
</view>
@@ -235,11 +246,17 @@ defineExpose({
<view class="price flex">
<view>现金:{{ item.price }}</view>
<view v-if="item.discount_integral > 0" class="ml-2">积分:{{ item.discount_integral }}</view>
<view v-if="item.discount_integral > 0" class="ml-2"
>积分:{{ item.discount_integral }}</view
>
</view>
</view>
</view>
<nut-input-number v-model="item.number" readonly :min="-1" @add="() => onAdd(item)"
<nut-input-number
v-model="item.number"
readonly
:min="-1"
@add="() => onAdd(item)"
@reduce="() => onReduce(item)">
<template #left-icon>
<view class="btn" @click.stop="onReduce(item)">
@@ -257,7 +274,11 @@ defineExpose({
<view style="height: 140px"></view>
</nut-popup>
<!-- 支付 -->
<Pay :is-show-pay="isShowPay" v-model:jfInfo="orderData" @closePay="closePay" @successPay="closePay" />
<Pay
:is-show-pay="isShowPay"
v-model:jfInfo="orderData"
@closePay="closePay"
@successPay="closePay" />
</view>
</template>