补充收藏功能

src/api/index.ts

@@ -48,7 +48,10 @@ export const getCollectList = (data: any) => request('/wx/collect/list', 'GET',
 // 添加或取消收藏
 export const collectAddordelete = (data: any) => request('/wx/collect/addordelete', 'POST', data);
 
-// 添加或取消收藏
+// 删除收藏
+export const deleteCollect = (data: any) => request('/wx/collect/addordelete', 'POST', data);
+
+// 查询税率
 export const getTax = () => request('/wx/config/tax', 'GET');
 
 // 推送订单

src/components/goodsItem.vue

@@ -17,6 +17,12 @@
 				</text> -->
 			</view>
 		</view>
+		<view
+			v-if="isCollection"
+			style="width: 59%; height: 100%; display: flex; justify-content: flex-end; align-items: flex-end;"
+		>
+			<u-button size="mini" style="margin: 0;" @tap="tapCollection">删除</u-button>
+		</view>
 	</view>
 </template>
 
@@ -51,7 +57,19 @@ let props = defineProps({
 		type: Number,
 		default: 0,
 	},
+	// 删除收藏按钮
+	isCollection: {
+		type: Boolean,
+		default: false,
+	},
 });
+
+let emits = defineEmits(['tapDelCollection']);
+
+// 点击按钮
+let tapCollection = () => {
+	emits('tapDelCollection');
+};
 </script>
 
 <style lang="scss" scoped>

src/pages/cart/index.vue

@@ -379,7 +379,7 @@ const valChange = (e: any, item: any) => {
 
 // 初始化数据
 const initCartIndex = (types: number) => {
-	getCartIndex({ types }).then((res: any) => {
+	getCartIndex({ type: types }).then((res: any) => {
 		if (res.data.code === 200) {
 			cartList.value = res.data.data.cartList;
 			totalPrice.value = res.data.data.cartTotal.checkedGoodsAmount.toFixed(2);

src/pages/productLine/productLine.vue

@@ -49,7 +49,7 @@
 												  typeof scope.row.isSubmit === 'undefined'
 												? false
 												: !scope.row.isSubmit && !scope.row.deleted
-										"	
+										"
 										name="error-circle-fill"
 										color="#0055ff"
 										style="margin-right: 4rpx;"
@@ -175,18 +175,20 @@ let buttonGroup = ref([
 	},
 ]);
 
-let cartId = ref(); // 修改的产品线id
 let lineId = ref(); // 修改的产品线id
 
 onLoad((options: any) => {
 	// 修改产品线时使用
 	if (typeof options.cartId !== 'undefined') {
-		cartId.value = options.cartId;
 		flag.value = false;
 		lineId.value = options.id;
 		// 把加入购物车变成禁用状态
 		// buttonGroup.value[0].backgroundColor = '#ccc';
 		initProductLine(options.id);
+	} else if(typeof options.collectionId !== 'undefined') {
+		flag.value = false;
+		// 把加入购物车变成禁用状态
+		initProductLine(options.id);
 	} else {
 		flag.value = true;
 	}

src/pages/profile/collection.vue

@@ -9,6 +9,8 @@
 				:name="item.name"
 				:brief="item.brief"
 				:retailPrice="item.retailPrice"
+				:isCollection="true"
+				@tapDelCollection="delCollection(item)"
 				@tap="toGoods(item.valueId)"
 			/>
 		</view>
@@ -16,19 +18,23 @@
 			<view
 				v-for="item in collectList"
 				:key="item.id"
-				style="width: 100%; height: 80rpx; line-height: 80rpx; background-color: #fff; padding: 0 30rpx; margin-bottom: 4rpx;"
+				class="product-collection"
+				@tap="toProductLine(item.valueId)"
 			>
 				{{ item.name }}
+				<u-button size="mini" style="margin: 0;" @tap="delCollection(item)">删除</u-button>
 			</view>
 		</view>
 		<view style="padding: 20rpx;"><u-loadmore :status="status" icon-type="flower" /></view>
 	</view>
 	<u-empty v-else text="收藏为空" mode="list" style="margin: 200rpx auto;"></u-empty>
+
+	<u-modal v-model="show" show-cancel-button :content="content" @confirm="onConfirm"></u-modal>
 </template>
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import { getCollectList } from '@/api/index';
+import { getCollectList, deleteCollect } from '@/api/index';
 import { onReachBottom } from '@dcloudio/uni-app';
 import goodsItem from '@/components/goodsItem.vue';
 
@@ -42,6 +48,10 @@ let total = ref(0);
 
 let status = ref('loadmore');
 
+let show = ref(false);
+
+let content = ref('是否取消收藏该商品');
+
 let collectList = ref([] as any);
 
 let list = ref([
@@ -58,6 +68,12 @@ let list = ref([
 
 let current = ref(0);
 
+// 删除商品传入参数
+let delGoods = ref({
+	type: 0,
+	valueId: 0,
+});
+
 // 上拉加载数据
 onReachBottom(() => {
 	// 判断是否还有下一页数据
@@ -81,6 +97,30 @@ let toGoods = (id: number) => {
 	uni.navigateTo({ url: '/pages/goods/index?id=' + id });
 };
 
+let toProductLine = (id: any) => {
+	uni.reLaunch({
+		url: '../productLine/productLine?id=' + id + '&collectionId=0',
+	});
+};
+
+let delCollection = (item: any) => {
+	if (item.type === 0) content.value = '是否取消收藏该商品';
+	content.value = '是否取消收藏该产品线';
+	delGoods.value.type = item.type;
+	delGoods.value.valueId = item.valueId;
+	show.value = true;
+};
+
+// 确认删除
+let onConfirm = () => {
+	deleteCollect(delGoods.value).then((res: any) => {
+		if (res.data.code === 200) {
+			collectList.value = [];
+			init();
+		}
+	});
+};
+
 let init = () => {
 	status.value = 'loading';
 	getCollectList(collectQuery.value).then((res: any) => {
@@ -95,4 +135,16 @@ let init = () => {
 init();
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.product-collection {
+	width: 100%;
+	height: 80rpx;
+	line-height: 80rpx;
+	background-color: #fff;
+	padding: 0 30rpx;
+	margin-bottom: 4rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+</style>