czg_team/cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into ymf

Browse Source
This commit is contained in:
YeMingfei666
2025-09-26 17:57:28 +08:00
parent 905d5404f6 c0f250789d
commit 7860992988
8 changed files with 3304 additions and 2798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/api/member.js
View File

@@ -113,3 +113,30 @@ export const APIshopUsercode = (data) => {
data: data data: data
}) })
} }
// 获取当前店铺会员信息
export const getCouponShops = (data) => {
return request({
url: urlMarket + '/user/coupon/shops',
method: 'get',
data: data
})
}
// 优惠券弹窗
export const getCouponPopup = (data) => {
return request({
url: urlMarket + '/user/coupon/popUp',
method: 'get',
data: data
})
}
// 优惠券弹窗领取
export const receivePopUp = (data) => {
return request({
url: urlMarket + '/user/coupon/receivePopUp',
method: 'get',
data: data
})
}

328
components/coupon-modal.vue Normal file
View File

@@ -0,0 +1,328 @@
<!-- 首页优惠券弹窗 -->
<template>
<up-popup :show="show" bgColor="transparent">
<view class="container">
<view class="content">
<image class="bg" src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/6520f3cfae594480aa2e612ff4ad121c.png" mode="widthFix"></image>
<view class="swiper-wrap">
<swiper class="swiper" @change="swiperChange">
<swiper-item class="swiper-item" v-for="(item, index) in couponList" :key="index">
<view class="item" v-for="val in item" :key="val.id">
<image
class="item-bg"
src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/105b29907c274f9e84e14b9ddb867356.png"
mode="aspectFill"
></image>
<view class="info-wrap">
<view class="info">
<view class="name name1" v-if="val.couponType == 1">
<text class="t1">￥{{ val.discountAmount }}</text>
<text class="t2">满{{ val.fullAmount }}可用</text>
</view>
<view class="name name2" v-if="val.couponType == 2">
<text class="t1">商品兑换{{ val.discountNum }}件</text>
<text class="t2">满{{ val.fullAmount }}可用</text>
</view>
<view class="name name2" v-if="val.couponType == 3">
<text class="t1">{{ val.discountRate }}折券</text>
<text class="t2">满{{ val.fullAmount }}可用</text>
</view>
<view class="name name2" v-if="val.couponType == 4">
<text class="t1">第二件半价券</text>
<text class="t2">满{{ val.fullAmount }}可用</text>
</view>
<view class="name name2" v-if="val.couponType == 6">
<text class="t1">买一送一券</text>
<text class="t2">满{{ val.fullAmount }}可用</text>
</view>
<view class="title">
{{ val.title }}
</view>
<view class="time">
<view class="row">
<text class="t">
有效期至：{{ dayjs(val.validStartTime).format('YYYY.M.D') }}-{{ dayjs(val.validEndTime).format('YYYY.M.D') }}
</text>
</view>
</view>
</view>
<view class="lq-btn">
<view class="lb" @click="getHandle">
<text class="t">立即</text>
<text class="t">领取</text>
</view>
</view>
</view>
</view>
</swiper-item>
</swiper>
<view class="dot-wrap">
<view class="page-btn">
<up-icon name="arrow-left" :color="swiperIndex == 0 ? '#fa746a' : '#f6171b'" size="16"></up-icon>
</view>
<view class="page-wrap">
<text class="t" :class="{ active: swiperIndex == index }" v-for="(item, index) in couponList.length" :key="index">{{ item }}</text>
</view>
<view class="page-btn">
<up-icon name="arrow-right" :color="swiperIndex == couponList.length - 1 ? '#fa746a' : '#f6171b'" size="16"></up-icon>
</view>
</view>
</view>
<view class="btn-wrap" @click="getHandle">
<image class="btn-img" src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/a7ea3211baf84cc8b77171d4f88c7f9e.png" mode="widthFix"></image>
<text class="t">全部领取（{{ couponCount }}张）</text>
</view>
<view class="close" @click="getHandle">
<up-icon name="close-circle" size="34" color="#fff"></up-icon>
</view>
</view>
</view>
</up-popup>
</template>
<script setup>
import _ from 'lodash';
import dayjs from 'dayjs';
import { onMounted, ref } from 'vue';
import { getCouponPopup, receivePopUp } from '@/common/api/member.js';
const couponCount = ref(0);
const swiperIndex = ref(0);
const couponList = ref([]);
const show = ref(false);
const props = defineProps({
getMode: {
type: String,
default: 'eat'
}
});
// 轮播图滑动
function swiperChange(e) {
swiperIndex.value = e.detail.current;
}
// 优惠券弹窗
async function getCouponPopupAjax() {
try {
const res = await getCouponPopup({ getMode: props.getMode });
if (res.length) {
res.map((item) => {
if (item.validType == 'fixed') {
item.validStartTime = dayjs().add(item.daysToTakeEffect, 'day').format('YYYY-MM-DD HH:mm:ss');
item.validEndTime = dayjs()
.add(+item.daysToTakeEffect + +item.validDays, 'day')
.format('YYYY-MM-DD HH:mm:ss');
}
});
console.log('res===', res);
show.value = true;
couponCount.value = res.length;
couponList.value = _.chunk(res, 3);
console.log('couponList.value===', couponList.value);
}
} catch (error) {
console.log(error);
}
}
// 领取
async function getHandle() {
try {
uni.showLoading({
title: '领取中...',
mask: true
});
const res = await receivePopUp({
getMode: props.getMode
});
show.value = false;
uni.showToast({
title: '已领取，请在我的优惠券中查看',
icon: 'none'
});
} catch (err) {
console.log(err);
}
uni.hideLoading();
}
onMounted(() => {
getCouponPopupAjax();
});
</script>
<style scoped lang="scss">
.container {
width: 100vw;
height: 100vh;
position: relative;
display: flex;
align-items: center;
justify-content: center;
.content {
width: 94vw;
position: relative;
padding-left: 24upx;
.close {
position: absolute;
left: 50%;
bottom: -100upx;
transform: translateX(-50%);
}
.bg {
width: 100%;
height: 100%;
}
.swiper-wrap {
width: 64%;
height: 70%;
position: absolute;
left: 18%;
top: 96upx;
.swiper {
width: 100%;
height: 90%;
background-color: #fff;
.swiper-item {
width: 100%;
height: 100%;
display: grid;
grid-template-columns: 1fr;
grid-template-rows: repeat(3, 1fr);
grid-column-gap: 0;
grid-row-gap: 12upx;
.item {
background-color: #e20410;
border-radius: 12upx;
padding: 12upx;
position: relative;
.item-bg {
width: 100%;
height: 100%;
}
.info-wrap {
width: 100%;
height: 100%;
padding: 20upx;
position: absolute;
top: 0;
left: 0;
display: flex;
align-items: center;
.info {
flex: 1;
display: flex;
flex-direction: column;
justify-content: space-between;
gap: 8upx;
padding-right: 20upx;
.name {
font-size: 32upx;
font-weight: bold;
color: #fff;
.t1 {
font-size: 32upx;
font-weight: bold;
color: #fff;
margin-right: 8upx;
}
.t2 {
font-size: 20upx;
color: #fff;
}
}
.title {
font-size: 28upx;
color: #fff;
font-weight: bold;
}
.time {
display: flex;
.row {
height: 30upx;
padding: 0 8upx;
background-color: #fff;
border-radius: 8upx;
display: flex;
align-items: center;
.t {
font-size: 10px;
color: #c50914;
}
}
}
}
.lq-btn {
.lb {
$size: 80upx;
width: $size;
height: $size;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
border-radius: 50%;
background-color: #fe413d;
.t {
color: #fff;
font-size: 20upx;
font-weight: bold;
}
}
}
}
}
}
}
.dot-wrap {
width: 100%;
height: 10%;
display: flex;
align-items: center;
justify-content: center;
gap: 20upx;
.page-wrap {
display: flex;
align-items: center;
gap: 20upx;
&.disabled {
.t {
color: #fa746a;
}
}
.t {
font-size: 28upx;
color: #fa746a;
&.active {
color: #f6171b;
font-weight: bold;
}
}
}
}
}
.btn-wrap {
width: 60%;
position: absolute;
left: 20%;
bottom: 38upx;
.btn-img {
width: 100%;
}
.t {
font-size: 42upx;
font-weight: bold;
color: #b43a14;
position: absolute;
top: 44%;
left: 54%;
white-space: nowrap;
transform: translate(-50%, -50%);
}
}
}
}
</style>

1
package.json
View File

@@ -3,6 +3,7 @@
"@dcloudio/uni-app": "^2.0.2-4040520250103001", "@dcloudio/uni-app": "^2.0.2-4040520250103001",
"dayjs": "^1.11.13", "dayjs": "^1.11.13",
"jsbarcode": "^3.11.6", "jsbarcode": "^3.11.6",
"lodash": "^4.17.21",
"pinia": "^2.3.1", "pinia": "^2.3.1",
"pinia-plugin-unistorage": "^0.1.2" "pinia-plugin-unistorage": "^0.1.2"
} }

358
pages/index/index.vue
View File

@@ -3,14 +3,13 @@
<Nav v-if="showindex == 'index'" /> <Nav v-if="showindex == 'index'" />
<view class="content" v-if="showindex == 'index'"> <view class="content" v-if="showindex == 'index'">
<!-- 轮播图 --> <!-- 轮播图 -->
<swipers :carousel='hometoplist.bannerList'></swipers> <swipers :carousel="hometoplist.bannerList"></swipers>
<!-- 广告 --> <!-- 广告 -->
<advertisement :bannervo='hometoplist.freeBannerList' :itemStyle='advertisementStyle' ref="refbannervo"> <advertisement :bannervo="hometoplist.freeBannerList" :itemStyle="advertisementStyle" ref="refbannervo"></advertisement>
</advertisement>
<!-- 金刚区 --> <!-- 金刚区 -->
<diamond :district='hometoplist.district'></diamond> <diamond :district="hometoplist.district"></diamond>
<!-- 今日上线 --> <!-- 今日上线 -->
<todaylist :todayList='hometoplist.todayProInfo' :salesList="hometoplist.hotRanking"></todaylist> <todaylist :todayList="hometoplist.todayProInfo" :salesList="hometoplist.hotRanking"></todaylist>
<!-- 类目 --> <!-- 类目 -->
<!-- <view :style="{'top':store.height+'px'}" class="fourcontent" id="fourcontent"> <!-- <view :style="{'top':store.height+'px'}" class="fourcontent" id="fourcontent">
<view class="flex-between" style="flex-wrap: inherit;"> <view class="flex-between" style="flex-wrap: inherit;">
@@ -126,107 +125,84 @@
<up-loadmore :status="formhomelist.status" fontSize="14" color="#999" iconSize="14" /> <up-loadmore :status="formhomelist.status" fontSize="14" color="#999" iconSize="14" />
</view> --> </view> -->
</view> </view>
<indexs v-if="showindex == 'shopIndex'" :shopExtend='orderVIP.shopExtendList'></indexs> <indexs v-if="showindex == 'shopIndex'" :shopExtend="orderVIP.shopExtendList"></indexs>
<!-- <CouponModal></CouponModal> -->
</view> </view>
</template> </template>
<script setup> <script setup>
import { import CouponModal from '@/components/coupon-modal.vue';
ref, import { ref, computed, onMounted, reactive, onBeforeUnmount, watch, getCurrentInstance, nextTick } from 'vue';
computed, import { onLoad, onReady, onShow, onReachBottom, onPageScroll } from '@dcloudio/uni-app';
onMounted, // 获取全局属性
reactive, const { proxy } = getCurrentInstance();
onBeforeUnmount, import swipers from './components/swiper.vue'; //引入轮播
watch, import advertisement from './components/advertisement.vue'; //广告
getCurrentInstance, import diamond from './components/diamond.vue'; //金刚区
nextTick import todaylist from './components/todaylist.vue'; //今日上线
} from "vue"; import indexs from './indexs.vue';
import { import AreaSelect from './components/AreaSelect.vue'; //城市联动
onLoad, import grouping from './components/grouping.vue'; //其他
onReady, import Nav from '@/components/indexnav.vue'; //导航栏
onShow, import { APIhomehomePageUp, APIhome } from '@/common/api/index/index.js';
onReachBottom, import { APIgeocodelocation } from '@/common/api/api.js';
onPageScroll import { useNavbarStore } from '@/stores/navbarStore';
} from '@dcloudio/uni-app' import { productStore } from '@/stores/user.js';
// 获取全局属性 const store = useNavbarStore();
const { const storeuser = productStore();
proxy store.updateNavbarConfig({
} = getCurrentInstance();
import swipers from './components/swiper.vue' //引入轮播
import advertisement from './components/advertisement.vue' //广告
import diamond from './components/diamond.vue' //金刚区
import todaylist from './components/todaylist.vue' //今日上线
import indexs from './indexs.vue';
import AreaSelect from './components/AreaSelect.vue'; //城市联动
import grouping from './components/grouping.vue'; //其他
import Nav from '@/components/indexnav.vue'; //导航栏
import {
APIhomehomePageUp,
APIhome
} from "@/common/api/index/index.js"
import {
APIgeocodelocation
} from "@/common/api/api.js"
import {
useNavbarStore
} from '@/stores/navbarStore';
import {
productStore
} from '@/stores/user.js';
const store = useNavbarStore();
const storeuser = productStore();
store.updateNavbarConfig({
showBack: true, //左边返回键 showBack: true, //左边返回键
rightText: '', //右边文字 rightText: '', //右边文字
showSearch: true, //true是标题其他事文字 showSearch: true, //true是标题其他事文字
title: '我的页面', title: '我的页面',
isTransparent: false, isTransparent: false,
hasPlaceholder: false //是否要占位符 hasPlaceholder: false //是否要占位符
}); });
// 显示 // 显示
const showindex = ref('index') const showindex = ref('index');
//计算广告图片的重合尺寸是位移 //计算广告图片的重合尺寸是位移
const getStyle = (e) => { const getStyle = (e) => {
if (e > hometoplist.freeBannerList.length / 2) { if (e > hometoplist.freeBannerList.length / 2) {
var right = hometoplist.freeBannerList.length - e var right = hometoplist.freeBannerList.length - e;
return { return {
transform: 'scale(' + (1) + ') translate(-' + (right * 20) + '%,0px)', transform: 'scale(' + 1 + ') translate(-' + right * 20 + '%,0px)',
zIndex: 9999 - right, zIndex: 9999 - right,
opacity: 1 opacity: 1
} };
} else { } else {
return { return {
transform: 'scale(' + (1) + ') translate(' + (e * 20) + '%,0px)', transform: 'scale(' + 1 + ') translate(' + e * 20 + '%,0px)',
zIndex: 9999 - e, zIndex: 9999 - e,
opacity: 1 opacity: 1
};
} }
} };
} const advertisementStyle = ref([]);
const advertisementStyle = ref([]) const refbannervo = ref(null);
const refbannervo = ref(null); //数据
//数据 const hometoplist = reactive({});
const hometoplist = reactive({ // 首页上面数据
const hometop = async () => {
})
// 首页上面数据
const hometop = async () => {
try { try {
let res = await APIhomehomePageUp() let res = await APIhomehomePageUp();
Object.assign(hometoplist, res) Object.assign(hometoplist, res);
hometoplist.freeBannerList.forEach((item, index) => { hometoplist.freeBannerList.forEach((item, index) => {
advertisementStyle.value.push(getStyle(index)) advertisementStyle.value.push(getStyle(index));
}) });
// 数据加载完后获取dom 高度 // 数据加载完后获取dom 高度
setTimeout(() => { setTimeout(() => {
const query = uni.createSelectorQuery().select('#fourcontent'); const query = uni.createSelectorQuery().select('#fourcontent');
query.boundingClientRect((rect) => { query
elementTop.value = rect.top - store.height .boundingClientRect((rect) => {
}).exec(); elementTop.value = rect.top - store.height;
}, 500) })
.exec();
}, 500);
} catch (e) {} } catch (e) {}
} };
// 下面初始数据 // 下面初始数据
const formhomelist = reactive({ //筛选 const formhomelist = reactive({
//筛选
address: '', //地址 address: '', //地址
categoryId: '1', //品类 categoryId: '1', //品类
orderType: '1', //1.理我最近 2.销量优先 3.价格优先 orderType: '1', //1.理我最近 2.销量优先 3.价格优先
@@ -236,47 +212,47 @@
status: 'loadmore', status: 'loadmore',
name: '1', name: '1',
list: [] list: []
}) });
// 使用 reactive 创建响应式对象 // 使用 reactive 创建响应式对象
const timeData = ref({}); const timeData = ref({});
// 定义 onChange 方法 // 定义 onChange 方法
const onChange = (e) => { const onChange = (e) => {
timeData.value = e; timeData.value = e;
}; };
const onLoadhome = async () => { const onLoadhome = async () => {
try { try {
let res = await APIhome(formhomelist) let res = await APIhome(formhomelist);
var dates = new Date().getTime(); var dates = new Date().getTime();
res.records.forEach((item, index) => { res.records.forEach((item, index) => {
var leftTime = item.endTime - dates; //计算两日期之间相差的毫秒数 var leftTime = item.endTime - dates; //计算两日期之间相差的毫秒数
if (leftTime >= 0) { if (leftTime >= 0) {
let d = Math.floor(leftTime / 1000 / 60 / 60 / 24); let d = Math.floor(leftTime / 1000 / 60 / 60 / 24);
let h = Math.floor(leftTime / 1000 / 60 / 60 % 24); let h = Math.floor((leftTime / 1000 / 60 / 60) % 24);
let m = Math.floor(leftTime / 1000 / 60 % 60); let m = Math.floor((leftTime / 1000 / 60) % 60);
let s = Math.floor(leftTime / 1000 % 60); let s = Math.floor((leftTime / 1000) % 60);
item.end_times = { item.end_times = {
d: d, d: d,
h: h, h: h,
m: m, m: m,
s: s s: s
} };
} else { } else {
item.end_times = 0 item.end_times = 0;
} }
}) });
if ((res.totalPage == 0 || res.totalPage == 1) && res.totalRow <= 10) { if ((res.totalPage == 0 || res.totalPage == 1) && res.totalRow <= 10) {
console.log(res) console.log(res);
formhomelist.status = 'nomore' formhomelist.status = 'nomore';
formhomelist.list = res.records formhomelist.list = res.records;
if (formhomelist.page == 1 && res.records.length == 0) { if (formhomelist.page == 1 && res.records.length == 0) {
formhomelist.list = [] formhomelist.list = [];
} }
return false; return false;
} else { } else {
formhomelist.status = 'loading'; formhomelist.status = 'loading';
if (formhomelist.page == 1) { if (formhomelist.page == 1) {
formhomelist.list = res.records formhomelist.list = res.records;
} else { } else {
formhomelist.list = [...formhomelist.list, ...res.records]; formhomelist.list = [...formhomelist.list, ...res.records];
} }
@@ -287,12 +263,11 @@
formhomelist.status = 'loading'; formhomelist.status = 'loading';
} }
} }
} catch (e) {} } catch (e) {}
} };
// /筛选数据处理 // /筛选数据处理
const init_fn = async () => { const init_fn = async () => {
formhomelist.list = [] formhomelist.list = [];
Object.assign(formhomelist, { Object.assign(formhomelist, {
address: uni.cache.get('getLocationstorage').address, //地址 address: uni.cache.get('getLocationstorage').address, //地址
lng: uni.cache.get('getLocationstorage').lng, lng: uni.cache.get('getLocationstorage').lng,
@@ -303,30 +278,30 @@
page: 1, //页数 page: 1, //页数
size: 10, //页容量 size: 10, //页容量
status: 'loadmore' status: 'loadmore'
}) });
onLoadhome() onLoadhome();
} };
const orderVIP = ref({ const orderVIP = ref({
shopExtendList:'' shopExtendList: ''
}) });
// 弹出层处理 // 弹出层处理
const showproductlist = ref(false); const showproductlist = ref(false);
// 定义方法 // 定义方法
const openproductlist = (e) => { const openproductlist = (e) => {
hometoplist.menuList[viewHistoryindex.value].name = e //下标更改name hometoplist.menuList[viewHistoryindex.value].name = e; //下标更改name
showproductlist.value = !showproductlist.value showproductlist.value = !showproductlist.value;
} };
// 存储每个元素距离顶部的距离 // 存储每个元素距离顶部的距离
const elementTop = ref(0); const elementTop = ref(0);
// 存储是否吸顶的状态 // 存储是否吸顶的状态
const isSticky = ref(true); const isSticky = ref(true);
//下标 //下标
const viewHistoryindex = ref(null) const viewHistoryindex = ref(null);
// 点击滑动元素 // 点击滑动元素
const viewHistory = async (item, index) => { const viewHistory = async (item, index) => {
if (isSticky) { if (isSticky) {
uni.pageScrollTo({ uni.pageScrollTo({
scrollTop: elementTop.value, scrollTop: elementTop.value,
@@ -335,97 +310,89 @@
} }
// 是否有弹出层 // 是否有弹出层
if (item.isChild) { if (item.isChild) {
showproductlist.value = showproductlist.value ? (viewHistoryindex.value == index ? false : true) : ! showproductlist.value = showproductlist.value ? (viewHistoryindex.value == index ? false : true) : !showproductlist.value;
showproductlist.value
} }
viewHistoryindex.value = index viewHistoryindex.value = index;
} };
// 滑动 // 滑动
onPageScroll((res) => { onPageScroll((res) => {
isSticky.value = res.scrollTop > elementTop.value ? true : false isSticky.value = res.scrollTop > elementTop.value ? true : false;
uni.$u.debounce(store.scrollTop = res.scrollTop, 500) uni.$u.debounce((store.scrollTop = res.scrollTop), 500);
}); });
onShow(async () => { onShow(async () => {
try { try {
uni.getLocation({ uni.getLocation({
type: 'wgs84', type: 'wgs84',
success: async (res) => { success: async (res) => {
let successres = await APIgeocodelocation({ let successres = await APIgeocodelocation({
lng: res.longitude, lng: res.longitude,
lat: res.latitude, lat: res.latitude
}) });
if (successres) { if (successres) {
let datastorage = { let datastorage = {
country: successres.addressComponent.country, // "中国" country: successres.addressComponent.country, // "中国"
province: successres.addressComponent province: successres.addressComponent.province, //province: "陕西省"
.province, //province: "陕西省"
address: successres.addressComponent.city, //district: "西安市" address: successres.addressComponent.city, //district: "西安市"
district: successres.addressComponent.district, //district: "未央区" district: successres.addressComponent.district, //district: "未央区"
lng: res.longitude, lng: res.longitude,
lat: res.latitude, lat: res.latitude
} };
uni.cache.set('getLocationstorage', datastorage); uni.cache.set('getLocationstorage', datastorage);
// 登录 // 登录
proxy.$isResolve() proxy.$isResolve();
}
} }
},
}); });
} catch (error) { } catch (error) {
try { try {
let successres = await APIgeocodelocation({ let successres = await APIgeocodelocation({
lng: '', lng: '',
lat: '', lat: ''
}) });
if (successres) { if (successres) {
let datastorage = { let datastorage = {
country: successres.addressComponent.country, // "中国" country: successres.addressComponent.country, // "中国"
province: successres.addressComponent province: successres.addressComponent.province, //province: "陕西省"
.province, //province: "陕西省"
address: successres.addressComponent.city, //district: "西安市" address: successres.addressComponent.city, //district: "西安市"
district: successres.addressComponent.district, //district: "未央区" district: successres.addressComponent.district, //district: "未央区"
lng: res.longitude, lng: res.longitude,
lat: res.latitude, lat: res.latitude
} };
uni.cache.set('getLocationstorage', datastorage); uni.cache.set('getLocationstorage', datastorage);
proxy.$isResolve() proxy.$isResolve();
}
} catch (error) {
} }
} catch (error) {}
} }
await proxy.$onLaunched; await proxy.$onLaunched;
if (uni.cache.get('shopId')) { if (uni.cache.get('shopId')) {
showindex.value = 'shopIndex' showindex.value = 'shopIndex';
await storeuser.actionsproductqueryProduct() await storeuser.actionsproductqueryProduct();
await nextTick() await nextTick();
orderVIP.value = uni.cache.get('orderVIP') orderVIP.value = uni.cache.get('orderVIP');
} else { } else {
showindex.value = 'index' showindex.value = 'index';
hometop() hometop();
init_fn() init_fn();
// 获取初始定位高度 // 获取初始定位高度
} }
}) });
onMounted(async () => { onMounted(async () => {});
}); onReachBottom(() => {
onLoadhome();
});
onReachBottom(() => { // 页面离开时清除定时器
onLoadhome() // onBeforeUnmount(() => {
}) // if (refbannervo.value) {
// refbannervo.value.clearTimer();
// 页面离开时清除定时器 // }
// onBeforeUnmount(() => { // });
// if (refbannervo.value) {
// refbannervo.value.clearTimer();
// }
// });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content { .content {
background: #F9F9F9; background: #f9f9f9;
.fourcontent { .fourcontent {
position: sticky; position: sticky;
@@ -456,7 +423,7 @@
flex-wrap: nowrap; flex-wrap: nowrap;
margin-left: 20rpx; margin-left: 20rpx;
padding: 10rpx 24rpx; padding: 10rpx 24rpx;
background: #FFFFFF; background: #ffffff;
border-radius: 8rpx 8rpx 8rpx 8rpx; border-radius: 8rpx 8rpx 8rpx 8rpx;
text { text {
@@ -473,8 +440,6 @@
// } // }
} }
.fivecontent { .fivecontent {
padding: 0 28rpx; padding: 0 28rpx;
height: 100vh; height: 100vh;
@@ -487,7 +452,7 @@
margin-top: 32rpx; margin-top: 32rpx;
padding: 24rpx 32rpx; padding: 24rpx 32rpx;
width: 100%; width: 100%;
background: #FFFFFF; background: #ffffff;
border-radius: 18rpx 18rpx 18rpx 18rpx; border-radius: 18rpx 18rpx 18rpx 18rpx;
.fivecontent_item_nav { .fivecontent_item_nav {
@@ -515,7 +480,7 @@
margin-left: 12rpx; margin-left: 12rpx;
width: max-content; width: max-content;
padding: 4rpx 10rpx; padding: 4rpx 10rpx;
background: #FFF9E1; background: #fff9e1;
border-radius: 4rpx 4rpx 4rpx 4rpx; border-radius: 4rpx 4rpx 4rpx 4rpx;
.fivecontent_item_nav_leftlangtext { .fivecontent_item_nav_leftlangtext {
@@ -523,7 +488,7 @@
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400; font-weight: 400;
font-size: 16rpx; font-size: 16rpx;
color: #F9A511; color: #f9a511;
} }
.fivecontent_item_nav_leftlangimage { .fivecontent_item_nav_leftlangimage {
@@ -536,13 +501,12 @@
margin-left: 0; margin-left: 0;
} }
} }
} }
} }
.fivecontent_item_box { .fivecontent_item_box {
margin-top: 20rpx; margin-top: 20rpx;
border-top: 2rpx solid #E5E5E5; border-top: 2rpx solid #e5e5e5;
padding-top: 14rpx; padding-top: 14rpx;
.fivecontent_item_boxitem { .fivecontent_item_boxitem {
@@ -584,7 +548,7 @@
margin-top: 8rpx; margin-top: 8rpx;
width: max-content; width: max-content;
padding: 4rpx 10rpx; padding: 4rpx 10rpx;
background: #FFF9E1; background: #fff9e1;
border-radius: 4rpx 4rpx 4rpx 4rpx; border-radius: 4rpx 4rpx 4rpx 4rpx;
.fivecontent_item_boxitemlefttowtext { .fivecontent_item_boxitemlefttowtext {
@@ -592,7 +556,7 @@
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400; font-weight: 400;
font-size: 16rpx; font-size: 16rpx;
color: #F9A511; color: #f9a511;
} }
.fivecontent_item_boxitemlefttowimage { .fivecontent_item_boxitemlefttowimage {
@@ -603,12 +567,11 @@
.fivecontent_item_boxitemlefttow:nth-child(1) { .fivecontent_item_boxitemlefttow:nth-child(1) {
margin-left: 0; margin-left: 0;
background: #FFD6D7; background: #ffd6d7;
border-radius: 4rpx 4rpx 4rpx 4rpx; border-radius: 4rpx 4rpx 4rpx 4rpx;
} }
} }
.indexboxitemleftthere { .indexboxitemleftthere {
position: relative; position: relative;
margin-top: 30rpx; margin-top: 30rpx;
@@ -617,8 +580,6 @@
background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/qinggou.png) no-repeat; background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/qinggou.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.indexboxitemleftthereabsolute { .indexboxitemleftthereabsolute {
position: absolute; position: absolute;
top: 14rpx; top: 14rpx;
@@ -626,7 +587,7 @@
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold; font-weight: bold;
font-size: 24rpx; font-size: 24rpx;
color: #FFFFFF; color: #ffffff;
} }
.indexboxitemlefttheretext { .indexboxitemlefttheretext {
@@ -646,14 +607,14 @@
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500; font-weight: 500;
font-size: 16rpx; font-size: 16rpx;
color: #FF7127; color: #ff7127;
} }
.flex_starttow { .flex_starttow {
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #FF7127; color: #ff7127;
} }
} }
@@ -661,11 +622,11 @@
margin-left: 4rpx; margin-left: 4rpx;
padding: 2rpx 10rpx; padding: 2rpx 10rpx;
border-radius: 4rpx 4rpx 4rpx 4rpx; border-radius: 4rpx 4rpx 4rpx 4rpx;
border: 2rpx solid #FF7127; border: 2rpx solid #ff7127;
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500; font-weight: 500;
font-size: 16rpx; font-size: 16rpx;
color: #FF7127; color: #ff7127;
} }
.fivecontent_item_boxitemlefthere_there { .fivecontent_item_boxitemlefthere_there {
@@ -699,7 +660,7 @@
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold; font-weight: bold;
font-size: 16rpx; font-size: 16rpx;
color: #FFFFFF; color: #ffffff;
.time { .time {
@include flex; @include flex;
@@ -741,7 +702,6 @@
} }
} }
} }
}
} }
}
</style> </style>

1510
pages/product/index.vue
View File

File diff suppressed because it is too large Load Diff

127
pages/user/components/coupon-icon.vue Normal file
View File

@@ -0,0 +1,127 @@
<!-- 优惠券图标 -->
<template>
<view class="container">
<view class="icon icon1" v-if="props.item.type == 1">
<view class="top">
<text class="i">￥</text>
<text class="num">{{ props.item.discountAmount }}</text>
</view>
<view class="intro">
<text class="t">满{{ props.item.fullAmount }}可用</text>
</view>
</view>
<view class="icon icon2" v-if="props.item.type == 2">
<view class="top">
<text class="i">{{ props.item.discountNum }}件</text>
<text class="num">商品兑换</text>
</view>
<view class="intro">
<text class="t">满{{ props.item.fullAmount }}可用</text>
</view>
</view>
<view class="icon icon3" v-if="props.item.type == 3">
<view class="top">
<text class="num">{{ props.item.discountRate }}折</text>
</view>
<view class="intro">
<text class="t">满{{ props.item.fullAmount }}可用</text>
</view>
</view>
<view class="icon icon2" v-if="props.item.type == 4">
<view class="top">
<text class="i">第二件</text>
<text class="num">半价券</text>
</view>
</view>
<view class="icon icon2" v-if="props.item.type == 6">
<view class="top">
<text class="i">买一送</text>
<text class="num">一券</text>
</view>
</view>
</view>
</template>
<script setup>
const props = defineProps({
item: {
type: Object,
default: {}
}
});
</script>
<style scoped lang="scss">
$color: #ff1c1c;
.container {
width: 100%;
height: 100%;
.icon {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
&.icon1 {
.top {
.i {
color: $color;
font-size: 24upx;
font-weight: bold;
}
.num {
color: $color;
font-size: 72upx;
font-weight: bold;
}
}
}
&.icon2 {
.top {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.i {
color: $color;
font-size: 34upx;
font-weight: bold;
}
.num {
color: $color;
font-size: 34upx;
font-weight: bold;
}
}
}
&.icon3 {
.top {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.i {
color: $color;
font-size: 34upx;
font-weight: bold;
}
.num {
color: $color;
font-size: 52upx;
font-weight: bold;
}
}
}
.intro {
display: flex;
justify-content: center;
.t {
font-size: 22upx;
color: #999;
}
}
}
}
</style>

189
pages/user/coupon.vue
View File

@@ -12,7 +12,7 @@
<view class="icon right"> <view class="icon right">
<u-icon name="arrow-right" size="16"></u-icon> <u-icon name="arrow-right" size="16"></u-icon>
</view> </view>
<input v-model="querForm.shopId" class="ipt right" type="text" placeholder="请选择" disabled /> <input v-model="querForm.shopName" class="ipt right" type="text" placeholder="请选择" disabled />
</view> </view>
</view> </view>
<view class="status-wrap"> <view class="status-wrap">
@@ -30,23 +30,26 @@
<view class="list-wrap"> <view class="list-wrap">
<view class="item" v-for="item in list.data" :key="item.id"> <view class="item" v-for="item in list.data" :key="item.id">
<view class="top"> <view class="top">
<view class="icon"></view> <view class="icon">
<couponIcon :item="item" />
</view>
<view class="info"> <view class="info">
<view class="view name"> <view class="view name">
<text class="t">{{ item.name }}</text> <text class="t">{{ item.name }}</text>
</view> </view>
<view class="view time"> <view class="view time">
<text class="t">{{ dayjs(item.effectStartTime).format('YYYY.MM.DD') }} - {{ dayjs(item.effectEndTime).format('YYYY.MM.DD') }}</text> <text class="t">{{ dayjs(item.effectStartTime).format('YYYY.M.D') }} - {{ dayjs(item.effectEndTime).format('YYYY.M.D') }}</text>
</view> </view>
</view> </view>
<view class="btn"> <view class="btn" v-if="item.status == 0" @click="toUseHandle(item)">
<text class="t">去使用</text> <text class="t">去使用</text>
</view> </view>
<view class="btn disabled" v-else>
<text class="t">{{ statusList.find((val) => val.value == item.status).label }}</text>
</view>
</view> </view>
<view class="btm"> <view class="btm">
<view class="left"> <view class="left">1、可适用门店：{{ item.useShops }} 2、可适用商品：{{ item.foods }}3、可使用类型：{{ convertValuesToLabels(item.useType) }}</view>
<text class="t">1、可适用门店：{{ item.useShops }} 2、可适用商品：{{ item.foods }}3、可使用类型：{{ convertValuesToLabels(item.useType) }}</text>
</view>
<view class="right" @click="showDetailHandle(item)"> <view class="right" @click="showDetailHandle(item)">
<text class="t">查看详情</text> <text class="t">查看详情</text>
</view> </view>
@@ -59,18 +62,10 @@
<view class="title"> <view class="title">
<text class="t">店铺列表</text> <text class="t">店铺列表</text>
</view> </view>
<scroll-view class="popup-list" direction="vertical"> <scroll-view class="popup-list" direction="vertical" @scrollend="scrollBottom">
<view class="item"> <view class="item" v-for="item in shopList" :key="item.shopId" @click="selectShopHandle(item)">
<text class="t">我是店铺1111</text> <text class="t">{{ item.shopName }}</text>
</view> <text class="intro">地址：{{ item.shopAddress }}</text>
<view class="item">
<text class="t">我是店铺2222</text>
</view>
<view class="item">
<text class="t">我是店铺3333</text>
</view>
<view class="item">
<text class="t">我是店铺4444</text>
</view> </view>
<u-loadmore status="nomore"></u-loadmore> <u-loadmore status="nomore"></u-loadmore>
</scroll-view> </scroll-view>
@@ -83,19 +78,7 @@
</view> </view>
<scroll-view class="popup-list" direction="vertical"> <scroll-view class="popup-list" direction="vertical">
<view class="ul"> <view class="ul">
<view class="li">1、可适用门店：{{ selectListItem.useShops }}</view> <view class="li" v-for="(item, index) in selectListItemDetails" :key="index">{{ index + 1 }}、{{ item }}</view>
<view class="li">2、可适用商品：{{ selectListItem.foods }}</view>
<view class="li" v-if="selectListItem.useType">3、可使用类型：{{ convertValuesToLabels(selectListItem.useType) }}</view>
<view class="li">
4、可用时间段：
<text class="t" v-if="selectListItem.useTimeType == 'all'">全段时间可用</text>
<text class="t" v-else>
{{ selectListItem.useStartTime - selectListItem.useEndTime }}
</text>
</view>
<view class="li">5、限量规则：{{ selectListItem.getLimit == -10086 ? '无限' : `${selectListItem.getLimit}张` }}</view>
<view class="li">6、同享规则：{{ selectListItem.vipPriceShare ? '与限时折扣同享、与会员价同享' : '不与限时折扣同享、与会员价同享' }}</view>
<view class="li">7、其它说明：{{ selectListItem.ruleDetails || '无' }}</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@@ -107,13 +90,15 @@
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { ref, reactive, onMounted } from 'vue'; import { ref, reactive, onMounted } from 'vue';
import { onLoad, onReady, onShow, onPageScroll, onReachBottom } from '@dcloudio/uni-app'; import { onLoad, onReady, onShow, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
import { APIcouponfindByUserId, APIfindCoupon } from '@/common/api/member.js'; import { APIcouponfindByUserId, APIfindCoupon, getCouponShops } from '@/common/api/member.js';
import couponIcon from './components/coupon-icon.vue';
const show = ref(false); const show = ref(false);
const querForm = ref({ const querForm = ref({
searchValue: '', searchValue: '',
shopId: '', shopId: '',
shopName: '',
statusActiveIndex: 0 statusActiveIndex: 0
}); });
@@ -142,26 +127,46 @@ const statusList = ref([
const list = reactive({ const list = reactive({
page: 1, page: 1,
size: 10, size: 10,
status: 'nomore', status: 'loading',
data: [] data: []
}); });
onReachBottom(() => { onReachBottom(() => {
console.log('到底了'); if (list.status != 'nomore') {
list.page++; list.page++;
getCouponList(); getCouponList();
}
}); });
const showDetail = ref(false); const showDetail = ref(false);
const selectListItem = ref(''); const selectListItem = ref('');
const selectListItemDetails = ref([]);
function showDetailHandle(item) { function showDetailHandle(item) {
showDetail.value = true; showDetail.value = true;
selectListItem.value = item; selectListItemDetails.value = [
`可适用门店：${item.useShops}`,
`可适用商品：${item.foods}`,
`可使用类型：${convertValuesToLabels(item.useType)}`,
`可用时间段：${item.useTimeType == 'all' ? '全段时间可用' : `${item.useStartTime} - ${item.useEndTime}`}`,
`限量规则：${item.getLimit == -10086 ? '无限' : `${item.getLimit}张`}`,
`同享规则：${item.vipPriceShare ? '与限时折扣同享、与会员价同享' : '不与限时折扣同享、与会员价同享'}`,
`其它说明：${item.ruleDetails || '无'}`
];
if (item.type == 2 || item.type == 4) {
selectListItemDetails.value.splice(2, 0, `使用规则：${item.useRule == 'price_asc' ? '从最低价开始抵扣' : '从最高价开始抵扣'}`);
}
if (item.type == 3) {
selectListItemDetails.value.unshift(`最高抵扣${item.maxDiscountAmount}元`);
// selectListItemDetails.value.splice(3, 0, `使用规则：${item.useRule == 'price_asc' ? '从最低价开始抵扣' : '从最高价开始抵扣'}`);
}
} }
// 搜索 // 搜索
function searchHandle() { function searchHandle() {
list.page = 1; list.page = 1;
list.status = 'loading';
getCouponList(); getCouponList();
} }
@@ -169,9 +174,19 @@ function searchHandle() {
function tabChange(index) { function tabChange(index) {
querForm.value.statusActiveIndex = index; querForm.value.statusActiveIndex = index;
list.page = 1; list.page = 1;
list.status = 'loading';
getCouponList(); getCouponList();
} }
// 去使用
function toUseHandle(item) {
console.log(item);
uni.cache.set('shopId', item.shopId);
uni.switchTab({
url: '/pages/index/index'
});
}
// 获取优惠券列表 // 获取优惠券列表
async function getCouponList() { async function getCouponList() {
try { try {
@@ -192,12 +207,21 @@ async function getCouponList() {
} else { } else {
list.data.push(...res.records); list.data.push(...res.records);
} }
if (res.pageNumber == res.totalPage || res.records.length == 0) {
list.status = 'nomore';
}
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
uni.hideLoading(); uni.hideLoading();
} }
// 店铺列表滚动到底部了
function scrollBottom() {
console.log('店铺列表滚动到底部了');
}
/** /**
* 将value数组字符串转换为对应的label拼接字符串 * 将value数组字符串转换为对应的label拼接字符串
* @param {Array} options - 包含value和label的选项数组，格式如[{value: 'xxx', label: 'xxx'}, ...] * @param {Array} options - 包含value和label的选项数组，格式如[{value: 'xxx', label: 'xxx'}, ...]
@@ -258,9 +282,32 @@ function convertValuesToLabels(valueStr, options, separator = '、') {
} }
} }
// 选择店铺
function selectShopHandle(item) {
querForm.value.shopId = item.shopId;
querForm.value.shopName = item.shopName;
list.page = 1;
show.value = false;
getCouponList();
}
// 获取当前店铺会员信息
const shopList = ref([]);
async function getCouponShopsAjax() {
try {
const res = await getCouponShops();
shopList.value = res;
} catch (error) {
console.log(error);
}
}
onShow(() => { onShow(() => {
getCouponList(); getCouponList();
}); });
onLoad(() => {
getCouponShopsAjax();
});
</script> </script>
<style> <style>
@@ -367,18 +414,29 @@ page {
align-items: center; align-items: center;
padding-bottom: 28upx; padding-bottom: 28upx;
.icon { .icon {
$size: 120upx; $size: 140upx;
width: $size; width: $size;
height: $size; height: $size;
background-color: #f7f7f7; margin-right: 28upx;
border-radius: 12upx;
} }
.info { .info {
flex: 1; flex: 1;
display: flex; display: flex;
justify-content: center;
flex-direction: column; flex-direction: column;
gap: 8upx; gap: 8upx;
padding-left: 28upx; padding-left: 28upx;
position: relative;
&::after {
$height: 100upx;
content: '';
height: $height;
border-left: 1upx solid #f7f7f7;
position: absolute;
top: 50%;
margin-top: $height * 0.5 * -1;
left: 0;
}
.view { .view {
flex: 1; flex: 1;
&.name { &.name {
@@ -405,6 +463,12 @@ page {
font-size: 24upx; font-size: 24upx;
color: #fff; color: #fff;
} }
&.disabled {
background-color: #f8f8f8;
.t {
color: #999999;
}
}
} }
} }
.btm { .btm {
@@ -418,15 +482,15 @@ page {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
.t {
font-size: 24upx; font-size: 24upx;
color: #999; color: #999;
} }
}
.right { .right {
flex: 1;
display: flex; display: flex;
align-items: center; align-items: center;
padding-left: 28upx; padding-left: 28upx;
justify-content: flex-end;
.t { .t {
font-size: 24upx; font-size: 24upx;
color: #333; color: #333;
@@ -451,16 +515,53 @@ page {
.popup-list { .popup-list {
max-height: 50vh; max-height: 50vh;
.item { .item {
height: 100upx; padding: 28upx;
border-radius: 12upx; border-radius: 12upx;
background-color: #f7f7f7; background-color: #f7f7f7;
margin-bottom: 28upx; margin-bottom: 28upx;
display: flex; display: flex;
align-items: center; flex-direction: column;
padding: 28upx; padding: 28upx;
.t { .t {
font-size: 28upx; font-size: 28upx;
color: #555; font-weight: bold;
color: #333;
/* 必须设置宽度 */
width: 600upx; /* 或具体像素值 */
/* 关键属性 */
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1; /* 显示2行 */
overflow: hidden;
/* 文本溢出省略号 */
text-overflow: ellipsis;
/* 可选：防止行高度，确保计算准确 */
line-height: 1.5;
word-break: break-all; /* 允许在单词内换行 */
word-wrap: break-word; /* 允许长单词或URL换行 */
}
.intro {
font-size: 28upx;
color: #999;
/* 必须设置宽度 */
width: 600upx; /* 或具体像素值 */
/* 关键属性 */
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2; /* 显示2行 */
overflow: hidden;
/* 文本溢出省略号 */
text-overflow: ellipsis;
/* 可选：防止行高度，确保计算准确 */
line-height: 1.5;
word-break: break-all; /* 允许在单词内换行 */
word-wrap: break-word; /* 允许长单词或URL换行 */
} }
} }
.ul { .ul {

24
pnpm-lock.yaml generated
View File

@@ -4,29 +4,25 @@ settings:
autoInstallPeers: true autoInstallPeers: true
excludeLinksFromLockfile: false excludeLinksFromLockfile: false
importers: dependencies:
.:
dependencies:
'@dcloudio/uni-app': '@dcloudio/uni-app':
specifier: ^2.0.2-4040520250103001 specifier: ^2.0.2-4040520250103001
version: 2.0.2-4070620250821001(@dcloudio/types@3.4.21)(@vue/composition-api@1.7.2(vue@3.5.22)) version: 2.0.2-4070620250821001(@dcloudio/types@3.4.21)(@vue/composition-api@1.7.2)
dayjs: dayjs:
specifier: ^1.11.13 specifier: ^1.11.13
version: 1.11.18 version: 1.11.18
jsbarcode: jsbarcode:
specifier: ^3.11.6 specifier: ^3.11.6
version: 3.12.1 version: 3.12.1
lodash:
specifier: ^4.17.21
version: 4.17.21
pinia: pinia:
specifier: ^2.3.1 specifier: ^2.3.1
version: 2.3.1(@vue/composition-api@1.7.2(vue@3.5.22))(vue@3.5.22) version: 2.3.1(@vue/composition-api@1.7.2)(vue@3.5.21)
pinia-plugin-unistorage: pinia-plugin-unistorage:
specifier: ^0.1.2 specifier: ^0.1.2
version: 0.1.2 version: 0.1.2
devDependencies:
copy-webpack-plugin:
specifier: ^12.0.2
version: 12.0.2(webpack@5.101.3)
packages: packages:
@@ -359,6 +355,13 @@ packages:
jsbarcode@3.12.1: jsbarcode@3.12.1:
resolution: {integrity: sha512-QZQSqIknC2Rr/YOUyOkCBqsoiBAOTYK+7yNN3JsqfoUtJtkazxNw1dmPpxuv7VVvqW13kA3/mKiLq+s/e3o9hQ==} resolution: {integrity: sha512-QZQSqIknC2Rr/YOUyOkCBqsoiBAOTYK+7yNN3JsqfoUtJtkazxNw1dmPpxuv7VVvqW13kA3/mKiLq+s/e3o9hQ==}
<<<<<<< HEAD
/lodash@4.17.21:
resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
dev: false
/magic-string@0.30.19:
=======
json-parse-even-better-errors@2.3.1: json-parse-even-better-errors@2.3.1:
resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
@@ -370,6 +373,7 @@ packages:
engines: {node: '>=6.11.5'} engines: {node: '>=6.11.5'}
magic-string@0.30.19: magic-string@0.30.19:
>>>>>>> a39c9f4d7228eb5bd0bda613fd326824fc7777ee
resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==} resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==}
merge-stream@2.0.0: merge-stream@2.0.0: