This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from "vue";
|
||||
import Taro from "@tarojs/taro";
|
||||
import { addCart, getCart, clearCart } from "@/api/cart";
|
||||
import { Del2 } from "@nutui/icons-vue-taro";
|
||||
import { createActiveOrder } from "@/api/goods";
|
||||
import { createAfterOrder, getUserPoint } from "@/api/admin";
|
||||
import Pay from "@/components/Pay.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 Pay from '@/components/Pay.vue';
|
||||
|
||||
interface CardList {
|
||||
name: string;
|
||||
@@ -30,7 +30,7 @@ const props = defineProps({
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(["updateCart"]);
|
||||
const emit = defineEmits(['updateCart']);
|
||||
|
||||
const openModal = async () => {
|
||||
await get_cart_list();
|
||||
@@ -47,13 +47,13 @@ const add_cart = async (item: CardList, num: number = 1) => {
|
||||
});
|
||||
Taro.showToast({
|
||||
title: res.msg,
|
||||
icon: "none",
|
||||
icon: 'none',
|
||||
});
|
||||
await get_cart_list();
|
||||
} catch (e) {
|
||||
Taro.showToast({
|
||||
title: e.msg,
|
||||
icon: "none",
|
||||
icon: 'none',
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -92,11 +92,11 @@ const get_cart_list = async () => {
|
||||
cartInfo.value.price += Number(item.price);
|
||||
cartInfo.value.exchange += Number(item.exchange);
|
||||
});
|
||||
emit("updateCart", res.data.data || []);
|
||||
emit('updateCart', res.data.data || []);
|
||||
} catch (e) {
|
||||
Taro.showToast({
|
||||
title: e.msg,
|
||||
icon: "none",
|
||||
icon: 'none',
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -110,7 +110,7 @@ const clear_cart = async () => {
|
||||
} catch (e) {
|
||||
Taro.showToast({
|
||||
title: e.msg,
|
||||
icon: "none",
|
||||
icon: 'none',
|
||||
});
|
||||
}
|
||||
show.value = false;
|
||||
@@ -124,7 +124,7 @@ const closePay = (val: boolean) => {
|
||||
isShowPay.value = val;
|
||||
orderData.value = [];
|
||||
Taro.redirectTo({
|
||||
url: "/pages/users/order_list/index?type=0",
|
||||
url: '/pages/users/order_list/index?type=0',
|
||||
});
|
||||
};
|
||||
|
||||
@@ -142,8 +142,8 @@ const create_order = async () => {
|
||||
url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${res.data.oid}&bid=${props.merInfo.bid}`,
|
||||
});
|
||||
} else {
|
||||
const mer_info = Taro.getStorageSync("mer_info");
|
||||
const user_info = Taro.getStorageSync("userInfo");
|
||||
const mer_info = Taro.getStorageSync('mer_info');
|
||||
const user_info = Taro.getStorageSync('userInfo');
|
||||
const data = await getUserPoint({
|
||||
phone: user_info.data.phone,
|
||||
bid: mer_info.bid,
|
||||
@@ -157,17 +157,20 @@ const create_order = async () => {
|
||||
jh_info: data.data,
|
||||
oid: res.data.oid,
|
||||
};
|
||||
isShowPay.value = true;
|
||||
// isShowPay.value = true;
|
||||
Taro.navigateTo({
|
||||
url: `/pages/goods/pay/index?oid=${res.data.oid}&bid=${mer_info.bid}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
Taro.showToast({
|
||||
title: res.msg,
|
||||
icon: "none",
|
||||
icon: 'none',
|
||||
});
|
||||
} catch (e) {
|
||||
Taro.showToast({
|
||||
title: e.msg,
|
||||
icon: "none",
|
||||
icon: 'none',
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -181,9 +184,17 @@ defineExpose({
|
||||
<template>
|
||||
<view>
|
||||
<view class="cart" @click.stop="openModal">
|
||||
<view class="container">
|
||||
<view>购物车数量: {{ cartInfo.count }}</view>
|
||||
<view v-if="cartInfo.count > 0">
|
||||
<view class="container flex items-center">
|
||||
<!-- <view>购物车数量: {{ cartInfo.count }}</view> -->
|
||||
<view class="cardImg">
|
||||
<image
|
||||
src="http://p1.meituan.net/csc/929f447a96a44b09a09b2e0055433222717.png">
|
||||
</image>
|
||||
<view class="count-text" v-if="cartInfo.count > 0">
|
||||
<text>{{ cartInfo.count }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="ml-1">
|
||||
<text>总金额: {{ cartInfo.price.toFixed(2) }}元</text>
|
||||
<text v-if="!IsPendingOrder"
|
||||
>,总积分: {{ cartInfo.exchange.toFixed(2) }}</text
|
||||
@@ -191,23 +202,25 @@ defineExpose({
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="cartInfo.count > 0" class="payBtn" @click.stop="create_order"
|
||||
>立即下单</view
|
||||
>去结算</view
|
||||
>
|
||||
</view>
|
||||
<!-- 购物车弹窗 -->
|
||||
<nut-popup
|
||||
:style="{ padding: '20rpx' }"
|
||||
:style="{padding: '15px'}"
|
||||
round
|
||||
position="bottom"
|
||||
z-index="1"
|
||||
:catch-move="true"
|
||||
:safe-area-inset-bottom="true"
|
||||
v-model:visible="show"
|
||||
>
|
||||
v-model:visible="show">
|
||||
<view class="list-header">
|
||||
<view class="left" @click.stop="clear_cart">
|
||||
<Del2 color="#666666" />
|
||||
<text style="color: #666666">清空购物车</text>
|
||||
<!-- <Del2 color="#666666" /> -->
|
||||
<image
|
||||
class="w-[20px] h-[20px]"
|
||||
src="http://p0.meituan.net/csc/db4d11fd744b69435c6ffdc6bfc868c5684.png" />
|
||||
<text class="text-[20px]" style="color: #666666">清空购物车</text>
|
||||
</view>
|
||||
</view>
|
||||
<scroll-view :scroll-y="true" class="cart-list">
|
||||
@@ -216,9 +229,10 @@ defineExpose({
|
||||
<image :src="item.cover" />
|
||||
<view class="center">
|
||||
<view class="name">{{ item.name }}</view>
|
||||
<view class="price">
|
||||
|
||||
<view class="price flex">
|
||||
<view>现金:{{ item.price }}</view>
|
||||
<view>积分:{{ item.exchange }}</view>
|
||||
<view class="ml-2">积分:{{ item.exchange }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -227,57 +241,90 @@ defineExpose({
|
||||
readonly
|
||||
:min="-1"
|
||||
@add="() => onAdd(item)"
|
||||
@reduce="() => onReduce(item)"
|
||||
/>
|
||||
@reduce="() => onReduce(item)">
|
||||
<template #left-icon>
|
||||
<view class="btn" @click.stop="onReduce(item)">
|
||||
<Minus />
|
||||
</view>
|
||||
</template>
|
||||
<template #right-icon>
|
||||
<view class="btn" @click.stop="onAdd(item)">
|
||||
<Plus />
|
||||
</view>
|
||||
</template>
|
||||
</nut-input-number>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view style="height: 140rpx"></view>
|
||||
<view style="height: 140px"></view>
|
||||
</nut-popup>
|
||||
<!-- 支付 -->
|
||||
<Pay
|
||||
:is-show-pay="isShowPay"
|
||||
v-model:jfInfo="orderData"
|
||||
@closePay="closePay"
|
||||
@successPay="closePay"
|
||||
/>
|
||||
@successPay="closePay" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
$h-border-radius: 50rpx;
|
||||
$h-border-radius: 50px;
|
||||
|
||||
.cart {
|
||||
position: fixed;
|
||||
bottom: 50rpx;
|
||||
bottom: 50px;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
z-index: 9999;
|
||||
width: 95%;
|
||||
background-color: red;
|
||||
background-color: #262323;
|
||||
border-radius: $h-border-radius;
|
||||
color: #fff;
|
||||
height: 100rpx;
|
||||
height: 100px;
|
||||
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
.container {
|
||||
margin-left: 30rpx;
|
||||
margin-left: 30px;
|
||||
|
||||
.cardImg {
|
||||
position: relative;
|
||||
image {
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.count-text {
|
||||
position: absolute;
|
||||
top: -10px;
|
||||
right: -10px;
|
||||
background-image: url('http://p0.meituan.net/csc/80b0e11d4270d09324df0b802d4c479b986.png');
|
||||
background-size: 100% 100%;
|
||||
// padding: 0 8px;
|
||||
width: 35px;
|
||||
height: 35px;
|
||||
text-align: center;
|
||||
line-height: 35px;
|
||||
text {
|
||||
margin: auto;
|
||||
font-size: 25px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.payBtn {
|
||||
width: 180rpx;
|
||||
height: 100rpx;
|
||||
line-height: 100rpx;
|
||||
width: 200px;
|
||||
height: 100px;
|
||||
line-height: 100px;
|
||||
text-align: center;
|
||||
background-color: #000;
|
||||
background-color: #f83d3d;
|
||||
border-radius: 0 $h-border-radius $h-border-radius 0;
|
||||
}
|
||||
}
|
||||
|
||||
.list-header {
|
||||
margin: 15rpx 0;
|
||||
margin: 15px 0;
|
||||
|
||||
.left {
|
||||
display: flex;
|
||||
@@ -286,37 +333,47 @@ $h-border-radius: 50rpx;
|
||||
}
|
||||
|
||||
.cart-list {
|
||||
height: 290rpx;
|
||||
height: 290px;
|
||||
|
||||
.item {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
margin-bottom: 10rpx;
|
||||
margin-bottom: 10px;
|
||||
justify-content: space-between;
|
||||
|
||||
.left {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
image {
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-right: 10rpx;
|
||||
width: 130px;
|
||||
height: 130px;
|
||||
border-radius: 15px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.center {
|
||||
height: 100%;
|
||||
height: 130px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
justify-content: space-between;
|
||||
|
||||
.price {
|
||||
color: red;
|
||||
margin-top: 20rpx;
|
||||
// margin-bottom: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btn {
|
||||
background-color: #ff0000;
|
||||
color: #fff;
|
||||
border-radius: 50%;
|
||||
text-align: center;
|
||||
line-height: 65px;
|
||||
width: 45px;
|
||||
height: 45px;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user