s-coupon-get.vue，detail-tabbar.vue，详情加入购物车，其他模块优化

pages/coupon/list.vue

@@ -148,11 +148,20 @@
 		});
 		if (res.code === 0) {
 			// 拦截修改数据
+			let obj2 = {
+				2: '折扣',
+				1: '满减'
+			}
 			let obj = {
 				1: '可用',
 				2: '已用',
 				3: '过期'
 			}
+			let obj3 = {
+				1: '已领取',
+				2: '已使用',
+				3: '已过期'
+			}
 			res.data.list = res.data.list.map(item => {
 				return {
 					...item,
@@ -160,7 +169,8 @@
 					amount: (item.discountPrice / 100).toFixed(2),
 					use_start_time: sheep.$helper.timeFormat(item.validStartTime, 'yyyy-mm-dd hh:MM:ss'),
 					use_end_time: sheep.$helper.timeFormat(item.validEndTime, 'yyyy-mm-dd hh:MM:ss'),
-					status_text: obj[item.status]
+					status_text: obj[item.status],
+					type_text: obj2[item.discountType]
 				}
 			});
 			if (page >= 2) {

pages/goods/components/detail/detail-tabbar.vue

@@ -1,171 +1,165 @@
 <template>
-  <su-fixed bottom placeholder bg="bg-white">
-    <view class="ui-tabbar-box">
-      <view class="ui-tabbar ss-flex ss-col-center ss-row-between">
-        <view
-          v-if="collectIcon"
-          class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-          @tap="onFavorite"
-        >
-          <block v-if="modelValue.favorite">
-            <image
-              class="item-icon"
-              :src="sheep.$url.static('/static/img/shop/goods/collect_1.gif')"
-              mode="aspectFit"
-            ></image>
-            <view class="item-title">已收藏</view>
-          </block>
-          <block v-else>
-            <image
-              class="item-icon"
-              :src="sheep.$url.static('/static/img/shop/goods/collect_0.png')"
-              mode="aspectFit"
-            ></image>
-            <view class="item-title">收藏</view>
-          </block>
-        </view>
-        <view
-          v-if="serviceIcon"
-          class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-          @tap="onChat"
-        >
-          <image
-            class="item-icon"
-            :src="sheep.$url.static('/static/img/shop/goods/message.png')"
-            mode="aspectFit"
-          ></image>
-          <view class="item-title">客服</view>
-        </view>
-        <view
-          v-if="shareIcon"
-          class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-          @tap="showShareModal"
-        >
-          <image
-            class="item-icon"
-            :src="sheep.$url.static('/static/img/shop/goods/share.png')"
-            mode="aspectFit"
-          ></image>
-          <view class="item-title">分享</view>
-        </view>
-        <slot></slot>
-      </view>
-    </view>
-  </su-fixed>
+	<su-fixed bottom placeholder bg="bg-white">
+		<view class="ui-tabbar-box">
+			<view class="ui-tabbar ss-flex ss-col-center ss-row-between">
+				<view v-if="collectIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
+					@tap="onFavorite">
+					<block v-if="modelValue.favorite">
+						<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/collect_1.gif')"
+							mode="aspectFit"></image>
+						<view class="item-title">已收藏</view>
+					</block>
+					<block v-else>
+						<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/collect_0.png')"
+							mode="aspectFit"></image>
+						<view class="item-title">收藏</view>
+					</block>
+				</view>
+				<view v-if="serviceIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
+					@tap="onChat">
+					<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/message.png')"
+						mode="aspectFit"></image>
+					<view class="item-title">客服</view>
+				</view>
+				<view v-if="shareIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
+					@tap="showShareModal">
+					<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/share.png')"
+						mode="aspectFit"></image>
+					<view class="item-title">分享</view>
+				</view>
+				<slot></slot>
+			</view>
+		</view>
+	</su-fixed>
 </template>
 
 <script setup>
-  /**
-   *
-   * 底部导航
-   *
-   * @property {String} bg 			 			- 背景颜色Class
-   * @property {String} ui 			 			- 自定义样式Class
-   * @property {Boolean} noFixed 		 			- 是否定位
-   * @property {Boolean} topRadius 		 		- 上圆角
-   *
-   *
-   */
+	/**
+	 *
+	 * 底部导航
+	 *
+	 * @property {String} bg 			 			- 背景颜色Class
+	 * @property {String} ui 			 			- 自定义样式Class
+	 * @property {Boolean} noFixed 		 			- 是否定位
+	 * @property {Boolean} topRadius 		 		- 上圆角
+	 *
+	 *
+	 */
 
-  import { computed, reactive } from 'vue';
-  import sheep from '@/sheep';
-  import { showShareModal } from '@/sheep/hooks/useModal';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import sheep from '@/sheep';
+	import {
+		showShareModal
+	} from '@/sheep/hooks/useModal';
 
-  // 数据
-  const state = reactive({});
+	// 数据
+	const state = reactive({});
 
-  // 接收参数
-  const props = defineProps({
-    modelValue: {
-      type: Object,
-      default() {},
-    },
-    bg: {
-      type: String,
-      default: 'bg-white',
-    },
-    bgStyles: {
-      type: Object,
-      default() {},
-    },
-    ui: {
-      type: String,
-      default: '',
-    },
+	// 接收参数
+	const props = defineProps({
+		modelValue: {
+			type: Object,
+			default () {},
+		},
+		bg: {
+			type: String,
+			default: 'bg-white',
+		},
+		bgStyles: {
+			type: Object,
+			default () {},
+		},
+		ui: {
+			type: String,
+			default: '',
+		},
 
-    noFixed: {
-      type: Boolean,
-      default: false,
-    },
-    topRadius: {
-      type: Number,
-      default: 0,
-    },
-    collectIcon: {
-      type: Boolean,
-      default: true,
-    },
-    serviceIcon: {
-      type: Boolean,
-      default: true,
-    },
-    shareIcon: {
-      type: Boolean,
-      default: true,
-    },
-  });
-  const elStyles = computed(() => {
-    return {
-      'border-top-left-radius': props.topRadius + 'rpx',
-      'border-top-right-radius': props.topRadius + 'rpx',
-      overflow: 'hidden',
-    };
-  });
+		noFixed: {
+			type: Boolean,
+			default: false,
+		},
+		topRadius: {
+			type: Number,
+			default: 0,
+		},
+		collectIcon: {
+			type: Boolean,
+			default: true,
+		},
+		serviceIcon: {
+			type: Boolean,
+			default: true,
+		},
+		shareIcon: {
+			type: Boolean,
+			default: true,
+		},
+	});
+	const elStyles = computed(() => {
+		return {
+			'border-top-left-radius': props.topRadius + 'rpx',
+			'border-top-right-radius': props.topRadius + 'rpx',
+			overflow: 'hidden',
+		};
+	});
 
-  const tabbarheight = (e) => {
-    uni.setStorageSync('tabbar', e);
-  };
-  async function onFavorite() {
-    const { error } = await sheep.$api.user.favorite.do(props.modelValue.id);
-    if (error === 0) {
-      if (props.modelValue.favorite) {
-        props.modelValue.favorite = 0;
-      } else {
-        props.modelValue.favorite = 1;
-      }
-    }
-  }
+	const tabbarheight = (e) => {
+		uni.setStorageSync('tabbar', e);
+	};
+	async function onFavorite() {
+		// const { error } = await sheep.$api.user.favorite.do(props.modelValue.id);
+		// if (error === 0) {
+		//   if (props.modelValue.favorite) {
+		//     props.modelValue.favorite = 0;
+		//   } else {
+		//     props.modelValue.favorite = 1;
+		//   }
+		// }
+		let data;
+		if (props.modelValue.favorite) {
+			data = await sheep.$api.user.favorite.dos(props.modelValue.id);
+		} else {
+			data = await sheep.$api.user.favorite.do(props.modelValue.id);
+		}
+		if (data.data) {
+			props.modelValue.favorite = !props.modelValue.favorite;
+		}
+	}
 
-  const onChat = () => {
-    sheep.$router.go('/pages/chat/index', {
-      id: props.modelValue.id,
-    });
-  };
+	const onChat = () => {
+		sheep.$router.go('/pages/chat/index', {
+			id: props.modelValue.id,
+		});
+	};
 </script>
 
 <style lang="scss" scoped>
-  .ui-tabbar-box {
-    box-shadow: 0px -6px 10px 0px rgba(51, 51, 51, 0.2);
-  }
-  .ui-tabbar {
-    display: flex;
-    height: 50px;
-    background: #fff;
+	.ui-tabbar-box {
+		box-shadow: 0px -6px 10px 0px rgba(51, 51, 51, 0.2);
+	}
 
-    .detail-tabbar-item {
-      width: 100rpx;
+	.ui-tabbar {
+		display: flex;
+		height: 50px;
+		background: #fff;
 
-      .item-icon {
-        width: 40rpx;
-        height: 40rpx;
-      }
+		.detail-tabbar-item {
+			width: 100rpx;
 
-      .item-title {
-        font-size: 20rpx;
-        font-weight: 500;
-        line-height: 20rpx;
-        margin-top: 12rpx;
-      }
-    }
-  }
-</style>
+			.item-icon {
+				width: 40rpx;
+				height: 40rpx;
+			}
+
+			.item-title {
+				font-size: 20rpx;
+				font-weight: 500;
+				line-height: 20rpx;
+				margin-top: 12rpx;
+			}
+		}
+	}
+</style>

pages/goods/index.vue

@@ -13,7 +13,7 @@
 				<view class="detail-swiper-selector">
 					<!-- 商品轮播图  -->
 					<su-swiper class="ss-m-b-14" isPreview :list="formatGoodsSwiper(state.goodsInfo.sliderPicUrls)"
-                     dotStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
+						dotStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
 
 					<!-- 价格+标题 -->
 					<view class="title-card detail-card ss-p-y-40 ss-p-x-20">
@@ -31,16 +31,17 @@
 							</view>
 						</view>
 						<view class="discounts-box ss-flex ss-row-between ss-m-b-28">
-              <!-- 满减送/限时折扣活动的提示 TODO 芋艿：promos 未写 -->
-              <div class="tag-content">
+							<!-- 满减送/限时折扣活动的提示 TODO 芋艿：promos 未写 -->
+							<div class="tag-content">
 								<view class="tag-box ss-flex">
-									<view class="tag ss-m-r-10" v-for="promos in state.goodsInfo.promos" :key="promos.id" @tap="onActivity">
+									<view class="tag ss-m-r-10" v-for="promos in state.goodsInfo.promos"
+										:key="promos.id" @tap="onActivity">
 										{{ promos.title }}
 									</view>
 								</view>
 							</div>
 
-              <!-- 优惠劵 -->
+							<!-- 优惠劵 -->
 							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="state.showModel = true"
 								v-if="state.couponInfo.length">
 								<view class="discounts-title ss-m-r-8">领券</view>
@@ -54,15 +55,15 @@
 					<!-- 功能卡片 -->
 					<view class="detail-cell-card detail-card ss-flex-col">
 						<detail-cell-sku v-model="state.selectedSku.goods_sku_text" :sku="state.selectedSku"
-                             @tap="state.showSelectSku = true" />
-            <!-- TODO 芋艿：可能暂时不考虑使用 -->
+							@tap="state.showSelectSku = true" />
+						<!-- TODO 芋艿：可能暂时不考虑使用 -->
 						<detail-cell-service v-if="state.goodsInfo.service" v-model="state.goodsInfo.service" />
 						<detail-cell-params v-if="state.goodsInfo.params" v-model="state.goodsInfo.params" />
 					</view>
 
 					<!-- 规格与数量弹框 -->
 					<s-select-sku :goodsInfo="state.goodsInfo" :show="state.showSelectSku" @addCart="onAddCart"
-                        @buy="onBuy" @change="onSkuChange" @close="state.showSelectSku = false" />
+						@buy="onBuy" @change="onSkuChange" @close="state.showSelectSku = false" />
 				</view>
 
 				<!-- 评价 -->
@@ -88,25 +89,35 @@
 					</view>
 				</detail-tabbar>
 
-        <!-- 优惠劵弹窗 -->
+				<!-- 优惠劵弹窗 -->
 				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
-                      @get="onGet" />
+					@get="onGet" />
 
-        <!-- 满减送/限时折扣活动弹窗 -->
+				<!-- 满减送/限时折扣活动弹窗 -->
 				<s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
-                        @close="state.showActivityModel = false" />
+					@close="state.showActivityModel = false" />
 			</block>
 		</s-layout>
 	</view>
 </template>
 
 <script setup>
-	import { reactive, computed } from 'vue';
-	import { onLoad, onPageScroll } from '@dcloudio/uni-app';
+	import {
+		reactive,
+		computed
+	} from 'vue';
+	import {
+		onLoad,
+		onPageScroll
+	} from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
-  import CouponApi from '@/sheep/api/promotion/coupon';
-  import ActivityApi from '@/sheep/api/promotion/activity';
-  import { formatSales, formatGoodsSwiper, fen2yuan, } from '@/sheep/hooks/useGoods';
+	import CouponApi from '@/sheep/api/promotion/coupon';
+	import ActivityApi from '@/sheep/api/promotion/activity';
+	import {
+		formatSales,
+		formatGoodsSwiper,
+		fen2yuan,
+	} from '@/sheep/hooks/useGoods';
 	import detailNavbar from './components/detail/detail-navbar.vue';
 	import detailCellSku from './components/detail/detail-cell-sku.vue';
 	import detailCellService from './components/detail/detail-cell-service.vue';
@@ -116,7 +127,9 @@
 	import detailCommentCard from './components/detail/detail-comment-card.vue';
 	import detailContentCard from './components/detail/detail-content-card.vue';
 	import detailActivityTip from './components/detail/detail-activity-tip.vue';
-	import { isEmpty } from 'lodash';
+	import {
+		isEmpty
+	} from 'lodash';
 
 	onPageScroll(() => {});
 
@@ -130,7 +143,7 @@
 		couponInfo: [], // 可领取的 Coupon 优惠劵的列表
 		showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
 		activityInfo: [], // 【满减送/限时折扣】可参与的 Activity 营销活动的列表
-    activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
+		activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
 	});
 
 	// 规格变更
@@ -140,6 +153,7 @@
 
 	// 添加购物车  TODO 芋艿：待测试
 	function onAddCart(e) {
+		console.log(e, '加入购物车');
 		sheep.$store('cart').add(e);
 	}
 
@@ -166,10 +180,10 @@
 	// 立即领取  TODO 芋艿：待测试
 	async function onGet(id) {
 		const {
-			error,
+			code,
 			msg
 		} = await sheep.$api.coupon.get(id);
-		if (error === 0) {
+		if (code === 0) {
 			uni.showToast({
 				title: msg,
 			});
@@ -179,7 +193,7 @@
 		}
 	}
 
-  //  TODO 芋艿：待测试
+	//  TODO 芋艿：待测试
 	const shareInfo = computed(() => {
 		if (isEmpty(state.goodsInfo)) return {};
 		return sheep.$platform.share.getShareInfo({
@@ -207,32 +221,75 @@
 		}
 		state.goodsId = options.id;
 		// 1. 加载商品信息
-		sheep.$api.goods.detail(state.goodsId).then((res) => {
-      // 未找到商品
-      if (res.code !== 0 || !res.data) {
-        state.goodsInfo = null;
-        return;
-      }
+		sheep.$api.goods.detail(state.goodsId).then(async (res) => {
+			// 未找到商品
+			if (res.code !== 0 || !res.data) {
+				state.goodsInfo = null;
+				return;
+			}
 			// 加载到商品
 			state.skeletonLoading = false;
-      state.goodsInfo = res.data;
+			// 获取收藏信息
+			let dasa = await sheep.$api.goods.exits(options.id);
+			res.data.favorite = dasa.data;
+			state.goodsInfo = res.data;
+			console.log(state.goodsInfo, '商品信息');
+
+			// 此处调试默认弹出可以修改为点击弹出
+			// 2. 加载优惠劵信息
+			CouponApi.getCouponTemplateList({
+				price: state.goodsInfo.price,
+				spuIds: [state.goodsInfo.id],
+				skuIds: state.goodsInfo.skus.map(item => item.id),
+				// 先写死
+				categoryIds: [52]
+			}).then((res) => {
+				console.log(res, '优惠券信息进行对接')
+				if (res.code !== 0) {
+					return;
+				}
+				// 拦截修改数据
+				let obj2 = {
+					2: '折扣',
+					1: '满减'
+				}
+				let obj = {
+					1: '可用',
+					2: '已用',
+					3: '过期'
+				}
+				let obj3 = {
+					1: '已领取',
+					2: '已使用',
+					3: '已过期'
+				}
+				res.data = res.data.map(item => {
+					return {
+						...item,
+						enough: (item.usePrice / 100).toFixed(2),
+						amount: (item.discountPrice / 100).toFixed(2),
+						use_start_time: sheep.$helper.timeFormat(item
+							.validStartTime,
+							'yyyy-mm-dd hh:MM:ss'),
+						use_end_time: sheep.$helper.timeFormat(item.validEndTime,
+							'yyyy-mm-dd hh:MM:ss'),
+						status_text: obj[item.status],
+						type_text: obj2[item.discountType],
+						get_status_text: obj3[item.status],
+						type_text: obj2[item.discountType]
+					}
+				});
+				state.couponInfo = res.data;
+			});
+		});
+		// return;
+		// 3. 加载营销活动信息
+		ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
+			if (res.code !== 0) {
+				return;
+			}
+			state.activityList = res.data;
 		});
-
-    // 2. 加载优惠劵信息
-    CouponApi.getCouponTemplateList(state.goodsId,2, 10).then((res) => {
-      if (res.code !== 0) {
-        return;
-      }
-      state.couponInfo = res.data;
-    });
-
-    // 3. 加载营销活动信息
-    ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
-      if (res.code !== 0) {
-        return;
-      }
-      state.activityList = res.data;
-    });
 	});
 </script>
 

pages/order/confirm.vue

@@ -281,7 +281,7 @@
 	}
 
 	onLoad(async (options) => {
-		console.log(options)
+		console.log(options, '确认订单启动参数')
 		if (options.data) {
 			state.orderPayload = JSON.parse(options.data);
 			changeConsignee();

sheep/api/cart.js

@@ -12,8 +12,8 @@ export default {
 			},
 		}),
 	append: (data) =>
-		request({
-			url: 'cart',
+		request2({
+			url: '/app-api/trade/cart/add',
 			method: 'POST',
 			custom: {
 				showSuccess: true,
@@ -21,9 +21,22 @@ export default {
 			},
 			data: {
 				...data,
-				type: 'inc',
+				// type: 'inc',
 			},
 		}),
+	// append: (data) =>
+	// 	request({
+	// 		url: 'cart',
+	// 		method: 'POST',
+	// 		custom: {
+	// 			showSuccess: true,
+	// 			successMsg: '已添加到购物车~',
+	// 		},
+	// 		data: {
+	// 			...data,
+	// 			type: 'inc',
+	// 		},
+	// 	}),
 	// 删除购物车
 	delete: (ids) =>
 		request2({

sheep/api/coupon.js

@@ -33,10 +33,21 @@ export default {
 			},
 		}),
 	get: (id) =>
-		request({
-			url: 'coupon/get/' + id,
+		request2({
+			url: 'promotion/coupon/take',
 			method: 'POST',
+			data: {
+				templateId: id
+			},
+			params: {
+				templateId: id
+			},
 		}),
+	// get: (id) =>
+	// 	request({
+	// 		url: 'coupon/get/' + id,
+	// 		method: 'POST',
+	// 	}),
 	listByGoods: (id) =>
 		request({
 			url: 'coupon/listByGoods/' + id,

sheep/api/goods.js

@@ -2,79 +2,85 @@ import request from '@/sheep/request';
 import request2 from '@/sheep/request2';
 
 export default {
-  // 商品详情
-  detail: (id, params = {}) =>
-    request2({
-      url: 'product/spu/get-detail?id=' + id,
-      method: 'GET',
-      params,
-      custom: {
-        showLoading: false,
-        showError: false,
-      },
-    }),
+	// 商品详情
+	detail: (id, params = {}) =>
+		request({
+			url: '/app-api/product/spu/get-detail?id=' + id,
+			method: 'GET',
+			params,
+			custom: {
+				showLoading: false,
+				showError: false,
+			},
+		}),
 
-  // 商品列表
-  list: (params) =>
-    request2({
-      url: 'product/spu/page',
-      method: 'GET',
-      params,
-      custom: {
-        showLoading: false,
-        showError: false,
-      },
-    }),
+	// 商品列表
+	list: (params) =>
+		request({
+			url: '/app-api/product/spu/page',
+			method: 'GET',
+			params,
+			custom: {
+				showLoading: false,
+				showError: false,
+			},
+		}),
 
-  // 商品查询
-  ids: (params = {}) =>
-    request({
-      url: 'goods/goods/ids',
-      method: 'GET',
-      params,
-      custom: {
-        showLoading: false,
-        showError: false,
-      },
-    }),
+	// 商品查询
+	ids: (params = {}) =>
+		request({
+			url: 'goods/goods/ids',
+			method: 'GET',
+			params,
+			custom: {
+				showLoading: false,
+				showError: false,
+			},
+		}),
 
-  // 商品评价列表
-  comment: (id, params = {}) =>
-    request2({
-      url: 'product/comment/list?spuId=' + id,
-      method: 'GET',
-      params,
-      custom: {
-        showLoading: false,
-        showError: false,
-      },
-    }),
-  // 商品评价类型
-  getType: (id) =>
-    request({
-      url: 'goods/comment/getType/' + id,
-      method: 'GET',
-      custom: {
-        showLoading: false,
-        showError: false,
-      },
-    }),
-  // 活动商品查询
-  // 商品查询
-  activity: (params = {}) =>
-    request({
-      url: 'goods/goods/activity',
-      method: 'GET',
-      params,
-      custom: {
-        showLoading: false,
-        showError: false,
-      },
-    }),
-  activityList: (params = {}) =>
-    request({
-      url: 'goods/goods/activityList',
-      method: 'GET',
-      params,
-    }),
-};
+	// 商品评价列表
+	comment: (id, params = {}) =>
+		request({
+			url: '/app-api/product/comment/list?spuId=' + id,
+			method: 'GET',
+			params,
+			custom: {
+				showLoading: false,
+				showError: false,
+			},
+		}),
+	// 商品评价类型
+	getType: (id) =>
+		request({
+			url: 'goods/comment/getType/' + id,
+			method: 'GET',
+			custom: {
+				showLoading: false,
+				showError: false,
+			},
+		}),
+	// 活动商品查询
+	// 商品查询
+	activity: (params = {}) =>
+		request({
+			url: 'goods/goods/activity',
+			method: 'GET',
+			params,
+			custom: {
+				showLoading: false,
+				showError: false,
+			},
+		}),
+	activityList: (params = {}) =>
+		request({
+			url: 'goods/goods/activityList',
+			method: 'GET',
+			params,
+		}),
+	// 检查是否收藏商品
+	exits: (id) =>
+		request({
+			url: '/app-api/product/favorite/exits?spuId=' + id,
+			method: 'GET',
+		}),
+};

sheep/api/order.js

@@ -65,18 +65,24 @@ export default {
 		// 解决 SpringMVC 接受 List<Item> 参数的问题
 		delete data2.items
 		for (let i = 0; i < data.items.length; i++) {
-			// data2['items[' + i + '' + '].skuId'] = data.items[i].skuId + '';
-			// data2['items[' + i + '' + '].count'] = data.items[i].count + '';
-			// data2['items[' + i + '' + '].cartId'] = data.items[i].cartId + '';
-			data2['items' + `%5B${i}%5D` + '.skuId'] = data.items[i].skuId + '';
-			data2['items' + `%5B${i}%5D` + '.count'] = data.items[i].count + '';
-			data2['items' + `%5B${i}%5D` + '.cartId'] = data.items[i].cartId + '';
+			// 此处转码问题,待解决方案
+			// data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
+			// data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
+			// data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
+
+			// data2['items' + `[${i}]` + '.skuId'] = data.items[i].skuId + '';
+			// data2['items' + `[${i}]` + '.count'] = data.items[i].count + '';
+			// data2['items' + `[${i}]` + '.cartId'] = data.items[i].cartId + '';
+
+			// data2['items' + `%5B${i}%5D` + '.skuId'] = data.items[i].skuId + '';
+			// data2['items' + `%5B${i}%5D` + '.count'] = data.items[i].count + '';
+			// data2['items' + `%5B${i}%5D` + '.cartId'] = data.items[i].cartId + '';
 		}
-		console.log(data2, '对比数据')
+		console.log(data2, '手动转码的参数')
 		return request2({
 			url: 'trade/order/settlement',
 			method: 'GET',
-			// data,
+			// data: data2,
 			params: data2
 		})
 	},

sheep/api/product/comment.js

@@ -1,18 +1,18 @@
 import request from '@/sheep/request';
 
 const CommentApi = {
-  // 获得商品评价分页
-  getCommentPage: (spuId, pageNo, pageSize, type) => {
-    return request({
-      url: '/app-api/product/comment/page',
-      method: 'GET',
-      params: {
-        spuId,
-        pageNo,
-        pageSize,
-        type
-      },
-    });
-  },
+	// 获得商品评价分页
+	getCommentPage: (spuId, pageNo, pageSize, type) => {
+		return request({
+			url: '/app-api/product/comment/page',
+			method: 'GET',
+			params: {
+				spuId,
+				pageNo,
+				pageSize,
+				type
+			},
+		});
+	},
 };
-export default CommentApi;
+export default CommentApi;

sheep/api/promotion/coupon.js

@@ -1,20 +1,30 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
-  // 获得优惠劵模板列表
-  getCouponTemplateListByIds: (ids) => {
-    return request({
-      url: '/app-api/promotion/coupon-template/list-by-ids',
-      method: 'GET',
-      params: { ids },
-    });
-  },
-  // 获得优惠劵模版列表
-  getCouponTemplateList: (spuId, productScope, count) => {
-    return request({
-      url: '/app-api/promotion/coupon-template/list',
-      method: 'GET',
-      params: { spuId, productScope, count },
-    });
-  },
-};
+	// 获得优惠劵模板列表
+	getCouponTemplateListByIds: (ids) => {
+		return request({
+			url: '/app-api/promotion/coupon-template/list-by-ids',
+			method: 'GET',
+			params: {
+				ids
+			},
+		});
+	},
+	// 获得优惠劵模版列表
+	getCouponTemplateList: (params) => {
+		return request2({
+			url: `promotion/coupon/match-list?price=${params.price}&spuIds=${params.spuIds}&skuIds=${params.skuIds}&categoryIds=${params.categoryIds}`,
+			method: 'GET',
+			// params,
+		});
+	},
+	// getCouponTemplateList: (spuId, productScope, count) => {
+	//   return request({
+	//     url: '/app-api/promotion/coupon-template/list',
+	//     method: 'GET',
+	//     params: { spuId, productScope, count },
+	//   });
+	// },
+};

sheep/api/user.js

@@ -1,11 +1,10 @@
 import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
 import $platform from '@/sheep/platform';
 
 export default {
 	getUnused: () =>
-		request2({
-			url: 'promotion/coupon/get-unused-count',
+		request({
+			url: '/app-api/promotion/coupon/get-unused-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -13,8 +12,8 @@ export default {
 			},
 		}),
 	profile: () =>
-		request2({
-			url: 'member/user/get',
+		request({
+			url: '/app-api/member/user/get',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -22,7 +21,7 @@ export default {
 			},
 		}),
 	balance: () =>
-		request2({
+		request({
 			url: '/app-api/pay/wallet/get',
 			method: 'GET',
 			custom: {
@@ -30,28 +29,9 @@ export default {
 				auth: true,
 			},
 		}),
-	// profile: () =>
-	//   request({
-	//     url: '/user/api/user/profile',
-	//     method: 'GET',
-	//     custom: {
-	//       showLoading: false,
-	//       auth: true,
-	//     },
-	//   }),
-	// update: (data) =>
-	//   request({
-	//     url: '/user/api/user/update',
-	//     method: 'POST',
-	//     custom: {
-	//       showSuccess: true,
-	//       auth: true,
-	//     },
-	//     data,
-	//   }),
 	update: (data) =>
-		request2({
-			url: 'member/user/update',
+		request({
+			url: '/app-api/member/user/update',
 			method: 'PUT',
 			custom: {
 				showSuccess: true,
@@ -196,90 +176,48 @@ export default {
 		}),
 
 	address: {
-		// default: () =>
-		// 	request({
-		// 		url: 'user/address/default',
-		// 		method: 'GET',
-		// 		custom: {
-		// 			showError: false,
-		// 		},
-		// 	}),
 		default: () =>
-			request2({
-				url: 'member/address/get-default',
+			request({
+				url: '/app-api/member/address/get-default',
 				method: 'GET',
 				custom: {
 					showError: false,
 				},
 			}),
 		list: () =>
-			request2({
-				url: 'member/address/list',
+			request({
+				url: '/app-api/member/address/list',
 				method: 'GET',
 				custom: {},
 			}),
-		// list: () =>
-		//   request({
-		//     url: 'user/address',
-		//     method: 'GET',
-		//     custom: {},
-		//   }),
 		create: (data) =>
-			request2({
-				url: 'member/address/create',
+			request({
+				url: '/app-api/member/address/create',
 				method: 'POST',
 				data,
 				custom: {
 					showSuccess: true,
 				},
 			}),
-		// create: (data) =>
-		//   request({
-		//     url: 'user/address',
-		//     method: 'POST',
-		//     data,
-		//     custom: {
-		//       showSuccess: true,
-		//     },
-		//   }),
 		update: (data) =>
-			request2({
-				url: 'member/address/update',
+			request({
+				url: '/app-api/member/address/update',
 				method: 'PUT',
 				data,
 				custom: {
 					showSuccess: true,
 				},
 			}),
-		// update: (id, data) =>
-		// 	request({
-		// 		url: 'user/address/' + id,
-		// 		method: 'PUT',
-		// 		data,
-		// 		custom: {
-		// 			showSuccess: true,
-		// 		},
-		// 	}),
 		detail: (id) =>
-			request2({
-				url: 'member/address/get?id=' + id,
+			request({
+				url: '/app-api/member/address/get?id=' + id,
 				method: 'GET',
 			}),
-		// detail: (id) =>
-		//   request({
-		//     url: 'user/address/' + id,
-		//     method: 'GET',
-		//   }),
 		delete: (id) =>
-			request2({
-				url: 'member/address/delete?id=' + id,
+			request({
+				url: '/app-api/member/address/delete?id=' + id,
 				method: 'DELETE',
 			}),
-		// delete: (id) =>
-		// 	request({
-		// 		url: 'user/address/' + id,
-		// 		method: 'DELETE',
-		// 	}),
 	},
 	invoice: {
 		list: () =>
@@ -319,17 +257,29 @@ export default {
 	},
 	favorite: {
 		list: (params) =>
-			request2({
-				url: 'product/favorite/page',
+			request({
+				url: '/app-api/product/favorite/page',
 				method: 'GET',
 				params,
 			}),
 		do: (id) =>
 			request({
-				url: 'user/goodsLog/favorite',
+				url: '/app-api/product/favorite/create',
 				method: 'POST',
 				data: {
-					goods_id: id,
+					spuId: id,
+				},
+				custom: {
+					showSuccess: true,
+					auth: true,
+				},
+			}),
+		dos: (id) =>
+			request({
+				url: '/app-api/product/favorite/delete',
+				method: 'DELETE',
+				data: {
+					spuId: id,
 				},
 				custom: {
 					showSuccess: true,
@@ -338,8 +288,8 @@ export default {
 			}),
 		// 取消收藏
 		cancel: (id) =>
-			request2({
-				url: 'product/favorite/delete-list',
+			request({
+				url: '/app-api/product/favorite/delete-list',
 				method: 'DELETE',
 				data: {
 					spuIds: id.split(',').map(item => item * 1),
@@ -350,18 +300,6 @@ export default {
 					auth: true,
 				},
 			}),
-		// cancel: (id) =>
-		//   request({
-		//     url: 'user/goodsLog/favorite',
-		//     method: 'POST',
-		//     data: {
-		//       goods_ids: id,
-		//     },
-		//     custom: {
-		//       showSuccess: true,
-		//       auth: true,
-		//     },
-		//   }),
 	},
 	view: {
 		list: (params) =>
@@ -383,28 +321,21 @@ export default {
 	},
 	wallet: {
 		log: (params) =>
-			request2({
+			request({
 				// url: 'member/point/record/page',
-				url: 'pay/wallet-transaction/page',
+				url: '/app-api/pay/wallet-transaction/page',
 				method: 'GET',
 				params,
 				custom: {},
 			}),
 		log2: (params) =>
-			request2({
-				url: 'member/point/record/page',
+			request({
+				url: '/app-api/member/point/record/page',
 				// url: 'pay/wallet-transaction/page',
 				method: 'GET',
 				params,
 				custom: {},
 			}),
-		// log: (params) =>
-		// request({
-		// 	url: '/user/api/walletLog',
-		// 	method: 'GET',
-		// 	params,
-		// 	custom: {},
-		// }),
 	},
 	account: {
 		info: (params) =>
@@ -429,18 +360,9 @@ export default {
 			}),
 	},
 	//数量接口
-	// data: () =>
-	//   request({
-	//     url: 'user/user/data',
-	//     method: 'GET',
-	//     custom: {
-	//       showLoading: false,
-	//       auth: true,
-	//     },
-	//   }),
 	data: () =>
-		request2({
-			url: 'trade/order/get-count',
+		request({
+			url: '/app-api/trade/order/get-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -448,8 +370,8 @@ export default {
 			},
 		}),
 	data2: () =>
-		request2({
-			url: 'trade/after-sale/get-applying-count',
+		request({
+			url: '/app-api/trade/after-sale/get-applying-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,

sheep/components/s-coupon-get/s-coupon-get.vue

@@ -1,108 +1,104 @@
 <template>
-  <su-popup
-    :show="show"
-    type="bottom"
-    round="20"
-    @close="emits('close')"
-    showClose
-    backgroundColor="#f2f2f2"
-  >
-    <view class="model-box">
-      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠券</view>
-      <scroll-view
-        class="model-content"
-        scroll-y
-        :scroll-with-animation="false"
-        :enable-back-to-top="true"
-      >
-        <view class="subtitle ss-m-l-20">可使用优惠券</view>
-        <view v-for="item in state.couponInfo" :key="item.id">
-          <s-coupon-list :data="item">
-            <template #default>
-              <button
-                class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center"
-                :class="
+	<su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose backgroundColor="#f2f2f2">
+		<view class="model-box">
+			<view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠券</view>
+			<scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
+				<view class="subtitle ss-m-l-20">可使用优惠券</view>
+				<view v-for="item in state.couponInfo" :key="item.id">
+					<s-coupon-list :data="item">
+						<template #default>
+							<button class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center" :class="
                   item.get_status != 'can_get' && item.get_status != 'can_use' ? 'boder-btn' : ''
-                "
-                @click.stop="getBuy(item.id)"
-                :disabled="item.get_status != 'can_get' && item.get_status != 'can_use'"
-              >
-                {{ item.get_status_text }}
-              </button>
-            </template>
-          </s-coupon-list>
-        </view>
-      </scroll-view>
-    </view>
-  </su-popup>
+                " @click.stop="getBuy(item.id)">
+								<!-- 此处对接领取优惠券先将限制解除 -->
+								<!-- :disabled="item.get_status != 'can_get' && item.get_status != 'can_use'" -->
+								{{ item.get_status_text }}
+							</button>
+						</template>
+					</s-coupon-list>
+				</view>
+			</scroll-view>
+		</view>
+	</su-popup>
 </template>
 <script setup>
-  import { computed, reactive } from 'vue';
-  const props = defineProps({
-    modelValue: {
-      type: Object,
-      default() {},
-    },
-    show: {
-      type: Boolean,
-      default: false,
-    },
-  });
-  const emits = defineEmits(['get', 'close']);
-  const state = reactive({
-    couponInfo: computed(() => props.modelValue),
-    currentValue: -1,
-    couponId: '',
-  });
-  const getBuy = (id) => {
-    emits('get', id);
-  };
-  //立即领取
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	const props = defineProps({
+		modelValue: {
+			type: Object,
+			default () {},
+		},
+		show: {
+			type: Boolean,
+			default: false,
+		},
+	});
+	const emits = defineEmits(['get', 'close']);
+	const state = reactive({
+		couponInfo: computed(() => props.modelValue),
+		currentValue: -1,
+		couponId: '',
+	});
+	const getBuy = (id) => {
+		console.log('应该是详情页领取优惠券')
+		emits('get', id);
+	};
+	//立即领取
 </script>
 <style lang="scss" scoped>
-  .model-box {
-    height: 60vh;
-    .title {
-      font-size: 36rpx;
-      height: 80rpx;
-      font-weight: bold;
-      color: #333333;
-    }
-    .subtitle {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #333333;
-    }
-  }
-  .model-content {
-    height: 54vh;
-  }
-  .modal-footer {
-    width: 100%;
-    height: 120rpx;
-    background: #fff;
-  }
-  .confirm-btn {
-    width: 710rpx;
-    margin-left: 20rpx;
-    height: 80rpx;
-    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-    border-radius: 40rpx;
-    color: #fff;
-  }
-  // 优惠券按钮
-  .card-btn {
-    // width: 144rpx;
-    padding: 0 16rpx;
-    height: 50rpx;
-    border-radius: 40rpx;
-    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-    color: #ffffff;
-    font-size: 24rpx;
-    font-weight: 400;
-  }
-  .boder-btn {
-    background: linear-gradient(90deg, var(--ui-BG-Main-opacity-4), var(--ui-BG-Main-light));
-    color: #fff !important;
-  }
-</style>
+	.model-box {
+		height: 60vh;
+
+		.title {
+			font-size: 36rpx;
+			height: 80rpx;
+			font-weight: bold;
+			color: #333333;
+		}
+
+		.subtitle {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #333333;
+		}
+	}
+
+	.model-content {
+		height: 54vh;
+	}
+
+	.modal-footer {
+		width: 100%;
+		height: 120rpx;
+		background: #fff;
+	}
+
+	.confirm-btn {
+		width: 710rpx;
+		margin-left: 20rpx;
+		height: 80rpx;
+		background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+		border-radius: 40rpx;
+		color: #fff;
+	}
+
+	// 优惠券按钮
+	.card-btn {
+		// width: 144rpx;
+		padding: 0 16rpx;
+		height: 50rpx;
+		border-radius: 40rpx;
+		background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+		color: #ffffff;
+		font-size: 24rpx;
+		font-weight: 400;
+	}
+
+	.boder-btn {
+		background: linear-gradient(90deg, var(--ui-BG-Main-opacity-4), var(--ui-BG-Main-light));
+		color: #fff !important;
+	}
+</style>

sheep/components/s-coupon-list/s-coupon-list.vue

@@ -1,13 +1,9 @@
 <template>
 	<view class="ss-m-20" :style="{ opacity: disabled ? '0.5' : '1' }">
 		<view class="content">
-			<!--      <view
-        class="tag ss-flex ss-row-center"
-        :class="
+			<view class="tag ss-flex ss-row-center" :class="
           data.status == 'expired' || data.status == 'used' ? 'disabled-bg-color' : 'info-bg-color'
-        "
-        >{{ data.type_text }}</view
-      > -->
+        ">{{ data.type_text }}</view>
 			<view class="title ss-m-x-30 ss-p-t-18">
 				<view class="ss-flex ss-row-between">
 					<view class="value-text ss-flex-1 ss-m-r-10" :class="

sheep/request2/index.js

@@ -55,7 +55,8 @@ const http = new Request({
 	method: 'GET',
 	header: {
 		Accept: 'text/json',
-		'Content-Type': 'application/json;charset=UTF-8',
+		'Content-Type': 'application/json',
+		// ;charset=UTF-8
 		platform: $platform.name,
 	},
 	// #ifdef APP-PLUS
@@ -97,6 +98,7 @@ http.interceptors.request.use(
 			config.header['tenant-id'] = '1';
 			config.header['Authorization'] = 'Bearer test247';
 		}
+		// console.log(config, '看参数')
 		return config;
 	},
 	(error) => {

sheep/store/cart.js

@@ -1,108 +1,120 @@
-import { defineStore } from 'pinia';
+import {
+	defineStore
+} from 'pinia';
 import cartApi from '@/sheep/api/cart';
 
 const cart = defineStore({
-  id: 'cart',
-  state: () => ({
-    list: [], // 购物车列表
-    selectedIds: [], // 已选列表
-    isAllSelected: false, //是否全选
-    cartSelectedTotalPrice: '0.00', // 选中项总金额
-  }),
-  getters: {
-    totalPriceSelected: (state) => {
-      let price = 0;
-      if (!state.selectedIds.length) return price.toFixed(2);
-      state.list.forEach((item) => {
-        price += state.selectedIds.includes(item.id)
-          ? Number(item.sku.price/100) * item.count
-          : 0;
-      });
-      return price.toFixed(2);
-    },
-  },
-  actions: {
-    // 获取购物车列表
-    async getList() {
-      const { data, code } = await cartApi.list();
-      if (code === 0) {
-        this.list = data.validList;
-      }
-    },
-    // 添加购物车
-    async add(goodsInfo) {
-      const { error } = await cartApi.append({
-        goods_id: goodsInfo.goods_id,
-        goods_num: goodsInfo.goods_num,
-        goods_sku_price_id: goodsInfo.id,
-      });
-      if (error === 0) {
-        this.getList();
-      }
-    },
+	id: 'cart',
+	state: () => ({
+		list: [], // 购物车列表
+		selectedIds: [], // 已选列表
+		isAllSelected: false, //是否全选
+		cartSelectedTotalPrice: '0.00', // 选中项总金额
+	}),
+	getters: {
+		totalPriceSelected: (state) => {
+			let price = 0;
+			if (!state.selectedIds.length) return price.toFixed(2);
+			state.list.forEach((item) => {
+				price += state.selectedIds.includes(item.id) ?
+					Number(item.sku.price / 100) * item.count :
+					0;
+			});
+			return price.toFixed(2);
+		},
+	},
+	actions: {
+		// 获取购物车列表
+		async getList() {
+			const {
+				data,
+				code
+			} = await cartApi.list();
+			if (code === 0) {
+				this.list = data.validList;
+			}
+		},
+		// 添加购物车
+		async add(goodsInfo) {
+			console.log()
+			const {
+				code
+			} = await cartApi.append({
+				// goods_id: goodsInfo.goods_id,
+				// goods_num: goodsInfo.goods_num,
+				// goods_sku_price_id: goodsInfo.id,
+				count: goodsInfo.goods_num,
+				skuId: goodsInfo.id,
+			});
+			if (code === 0) {
+				this.getList();
+			}
+		},
 
-    // 更新购物车
-    async update(goodsInfo) {
-      const { error } = await cartApi.update({
-        id: goodsInfo.goods_id,
-        count: goodsInfo.goods_num,
-        goods_sku_price_id: goodsInfo.goods_sku_price_id,
-      });
-      if (error === 0) {
-        // this.getList();
-      }
-    },
+		// 更新购物车
+		async update(goodsInfo) {
+			const {
+				error
+			} = await cartApi.update({
+				id: goodsInfo.goods_id,
+				count: goodsInfo.goods_num,
+				goods_sku_price_id: goodsInfo.goods_sku_price_id,
+			});
+			if (error === 0) {
+				// this.getList();
+			}
+		},
 
-    // 移除购物车
-    async delete(ids) {
-      if (typeof ids === 'array') {
-        ids = ids.join(',');
-      }
-      const { code } = await cartApi.delete(ids);
-      if (code === 0) {
-        this.selectAll(false);
-        this.getList();
-      }
-    },
+		// 移除购物车
+		async delete(ids) {
+			if (typeof ids === 'array') {
+				ids = ids.join(',');
+			}
+			const {
+				code
+			} = await cartApi.delete(ids);
+			if (code === 0) {
+				this.selectAll(false);
+				this.getList();
+			}
+		},
 
-    // 选择购物车商品
-    selectSingle(goodsId) {
-      if (!this.selectedIds.includes(goodsId)) {
-        this.selectedIds.push(goodsId);
-      } else {
-        this.selectedIds.splice(this.selectedIds.indexOf(goodsId), 1);
-      }
-      this.isAllSelected = this.selectedIds.length === this.list.length;
-    },
+		// 选择购物车商品
+		selectSingle(goodsId) {
+			if (!this.selectedIds.includes(goodsId)) {
+				this.selectedIds.push(goodsId);
+			} else {
+				this.selectedIds.splice(this.selectedIds.indexOf(goodsId), 1);
+			}
+			this.isAllSelected = this.selectedIds.length === this.list.length;
+		},
 
-    // 全选
-    selectAll(flag) {
-      this.isAllSelected = flag;
-      if (!flag) {
-        this.selectedIds = [];
-      } else {
-        this.list.forEach((item) => {
-          this.selectedIds.push(item.id);
-        });
-      }
-    },
+		// 全选
+		selectAll(flag) {
+			this.isAllSelected = flag;
+			if (!flag) {
+				this.selectedIds = [];
+			} else {
+				this.list.forEach((item) => {
+					this.selectedIds.push(item.id);
+				});
+			}
+		},
 
-    // 清空购物车
-    emptyList() {
-      this.list = [];
-      this.selectedIds = [];
-      this.isAllSelected = false;
-      this.cartSelectedTotalPrice = '0.00';
-    },
-  },
-  persist: {
-    enabled: true,
-    strategies: [
-      {
-        key: 'cart-store',
-      },
-    ],
-  },
+		// 清空购物车
+		emptyList() {
+			this.list = [];
+			this.selectedIds = [];
+			this.isAllSelected = false;
+			this.cartSelectedTotalPrice = '0.00';
+		},
+	},
+	persist: {
+		enabled: true,
+		strategies: [{
+			key: 'cart-store',
+		}, ],
+	},
 });
 
-export default cart;
+export default cart;

vite.config.js

@@ -1,4 +1,6 @@
-import { loadEnv } from 'vite';
+import {
+	loadEnv
+} from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 import path from 'path';
 // import viteCompression from 'vite-plugin-compression';
@@ -31,4 +33,4 @@ export default (command, mode) => {
 			},
 		},
 	};
-};
+};