From 2076d86ee495c5a28ded043a2cf03f20782404f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=9D=E5=86=9B=E5=8D=8E?= <kuangjh@3721zh.com>
Date: Tue, 15 Apr 2025 20:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/multi/multi.vue                    |  21 +-
 components/recomGoods/recomGoods.vue          |  36 +--
 order/assList/assList.vue                     |  17 +-
 order/assList/style.scss                      |  28 ++
 order/assedit/assedit.vue                     |   1 +
 order/orderList/orderList.vue                 |   2 +-
 order/orderevallist/orderevallist.vue         |   2 +-
 pages.json                                    |  13 +-
 pages/classify/classify.vue                   |   6 +-
 pages/classify/style.scss                     |   5 +-
 pages/index/style.scss                        |   2 +-
 pages/sidedish/sidedish.vue                   |  34 ++-
 pages/user/style.scss                         |   8 +-
 pages/user/user.vue                           |  48 ++--
 server/api.js                                 |   5 +
 server/config.js                              |   2 +-
 shopProDetail/detail/detail.vue               |  23 +-
 shopProDetail/detail/style.scss               |   5 +-
 shopProDetail/evallist/evallist.vue           | 100 +++++++-
 shopProDetail/evallist/style.scss             |   5 +-
 .../{Mask group@2x (12).png => collect.png}   | Bin
 .../Empty/{Mask group@2x.png => search.png}   | Bin
 static/addGroup.png                           | Bin 0 -> 805 bytes
 static/serv.png                               | Bin 0 -> 5565 bytes
 userserve/SearchList/SearchList.vue           | 220 +++++++---------
 userserve/SearchList/style.scss               | 242 ++++++++++--------
 userserve/SearchProduct/SearchProduct.vue     | 117 +++++----
 userserve/favorite/favorite.vue               |  28 +-
 userserve/useredit/useredit.vue               | 218 ++++++++++++++++
 29 files changed, 813 insertions(+), 375 deletions(-)
 rename static/Empty/{Mask group@2x (12).png => collect.png} (100%)
 rename static/Empty/{Mask group@2x.png => search.png} (100%)
 create mode 100644 static/addGroup.png
 create mode 100644 static/serv.png
 create mode 100644 userserve/useredit/useredit.vue

diff --git a/components/multi/multi.vue b/components/multi/multi.vue
index 6aee6e9..7afdb38 100644
--- a/components/multi/multi.vue
+++ b/components/multi/multi.vue
@@ -99,10 +99,6 @@
 		}
 		api_skudetail(specTypes,ids);
 	}
-	// 暴露方法给父组件
-	defineExpose({
-	  addCart
-	})
 	//购物车数量
 	const api_frontcartcount=()=>{
 		frontcartcount().then(({data}) => {cartcount.value = data.count;})
@@ -132,10 +128,7 @@
 	}
 	//选择多规格
 	const choose = (name,value)=>{
-		  selectedSpecs.value = { 
-		     ...selectedSpecs.value, 
-		     [name]: value 
-		   }
+		  selectedSpecs.value = {...selectedSpecs.value,[name]: value }
 		   const valuesArray = Object.values(selectedSpecs.value).toString();
 		   specValue.value = valuesArray;
 		   productValue.value.forEach(item=>{
@@ -200,6 +193,8 @@
 	}
 	//生命周期钩子
 	onMounted(() => {});
+	// 暴露方法给父组件
+	defineExpose({ addCart})
 </script>
 
 <style lang="scss">
@@ -359,13 +354,13 @@
 					}
 					.border_l{
 						border-left: 1px solid #E9E9E9;
-						border-top-left-radius: 50rpx;
-						border-bottom-left-radius: 50rpx;
+						border-top-left-radius: 10rpx;
+						border-bottom-left-radius: 10rpx;
 					}
 					.border_r{
 						border-right: 1px solid #E9E9E9;
-						border-top-right-radius: 50rpx;
-						border-bottom-right-radius: 50rpx;
+						border-top-right-radius: 10rpx;
+						border-bottom-right-radius: 10rpx;
 					}
 				}
 				.multishop_data_number{
@@ -380,7 +375,7 @@
 				}
 			}
 			.footer_multi_btn{
-				margin: 0 28rpx 0 28rpx;
+				margin: 0 15rpx 0 15rpx;
 				height:84rpx;
 				background-color: #FD3F3F;
 				display: flex;
diff --git a/components/recomGoods/recomGoods.vue b/components/recomGoods/recomGoods.vue
index 7734830..405af9f 100644
--- a/components/recomGoods/recomGoods.vue
+++ b/components/recomGoods/recomGoods.vue
@@ -78,7 +78,7 @@
 				</block>			
 			</view>
 		</view>
-		<view class="load_desc">{{decs}}</view>
+		<view class="load_desc">{{decs_com}}</view>
 	</view>
 </template>
 
@@ -94,10 +94,10 @@
 	//使用pinia：storeToRefs方法包裹(保持响应式更新，不使用视图无法更新)
 	const { token } = storeToRefs(counterStore);
 	const shopList = ref([]);
-	const total = ref(0);
-	const decs = ref('');
-	const pages = ref(0);
-	const limits = ref(10);
+	const total_com = ref(0);
+	const decs_com = ref('');
+	const pages_com = ref(0);
+	const limits_com = ref(10);
 	// 1. 定义可触发的事件名
 	const emit = defineEmits(['add-message']);
 	const props = defineProps({
@@ -107,24 +107,24 @@
 		}
 	})
 	const api_product=()=>{
-		pages.value = pages.value + 1;
-		decs.value = "—— 加载中... ——";
+		pages_com.value = pages_com.value + 1;
+		decs_com.value = "—— 加载中... ——";
 		const params = {
-			page:pages.value,
-			limit:limits.value
+			page:pages_com.value,
+			limit:limits_com.value
 		}
 		return frontproduct(props.apiType,params).then(({data}) => {
-			total.value = data.total;
-			decs.value = '—— 上拉加载更多 ——'
+			total_com.value = data.total;
+			decs_com.value = '—— 上拉加载更多 ——'
 			data.list.forEach((item,index)=>{
 				item.isEven = index % 2 === 0
 			})
-			if(data.list.length < 10){
-				decs.value = '—— 嗷呜，已经到底啦 ——';
-			}
 			shopList.value = shopList.value.concat(data.list);
+			if(data.list.length < 10){
+				decs_com.value = '—— 嗷呜，已经到底啦 ——';
+			}
 		}).catch(({message}) => {
-			decs.value = `—— ${message||'网络异常'} ——`;
+			decs_com.value = `—— ${message||'网络异常'} ——`;
 		})
 	}
 	
@@ -159,9 +159,9 @@
 	});
 	onPullDownRefresh(()=>{
 		shopList.value = [];
-		total.value = 0;
-		decs.value = '';
-		pages.value = 0;
+		total_com.value = 0;
+		decs_com.value = '';
+		pages_com.value = 0;
 		api_product();
 		uni.stopPullDownRefresh();
 	})
diff --git a/order/assList/assList.vue b/order/assList/assList.vue
index 72e603c..515b0e9 100644
--- a/order/assList/assList.vue
+++ b/order/assList/assList.vue
@@ -50,6 +50,12 @@
 		</view>
 		<view v-else class="load_desc">{{decs}}</view>
 	</view>
+	<view class="service">
+		<view class="service_cont">
+			<image class="service_img" src="../../static/serv.png" mode="widthFix"></image>
+			<view class="service_name">客服</view>
+		</view>
+	</view>
   </view>
 </template>
 
@@ -113,9 +119,14 @@ const api_orderlist=()=>{
 				}
 			})
 		list.value = list.value.concat(data.list);
-		if(pages.value == 1 && !data.list.length){
-			img_err.value = "../../static/Empty/order_lisr_img.png"
-			decs.value = "—— 暂无售后记录 ——"
+		if(!list.value.length){
+			if(active.value == 0){
+				img_err.value = "../../static/Empty/cart.png"
+				decs.value =`仅48小时内签收的订单支持退款哦～` 
+			}else{
+				img_err.value = "../../static/Empty/order_lisr_img.png"
+				decs.value ="—— 暂无售后记录 ——"
+			}
 		}else if(data.list.length < 10){
 			decs.value = '—— 嗷呜，已经到底啦 ——';
 		}
diff --git a/order/assList/style.scss b/order/assList/style.scss
index e8cd4d2..b531b73 100644
--- a/order/assList/style.scss
+++ b/order/assList/style.scss
@@ -236,6 +236,7 @@ page{
 			font-size: 28rpx;
 			color: #aaaaaa;
 			text-align: center;
+			margin: 0 70rpx 0 70rpx;
 		}
 		.empty_cont_btn{
 			margin: 0 auto;
@@ -251,4 +252,31 @@ page{
 			margin-top: 40rpx;
 		}
 	}
+}
+.service{
+	position: fixed;
+	right: 20rpx;
+	bottom: 300rpx;
+	width: 95rpx;
+	height: 95rpx;
+	background: rgba(230,7,3,0.1);
+	border-radius: 50rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	.service_cont{
+		.service_img{
+			width: 50rpx;
+			height: 50rpx;
+			margin: 0 auto;
+			display: block;
+		}
+		.service_name{
+			font-size: 20rpx;
+			color: #E60703;
+			text-align: center;
+			margin-top: 5rpx;
+		}
+	}
+	
 }
\ No newline at end of file
diff --git a/order/assedit/assedit.vue b/order/assedit/assedit.vue
index 1771d44..b81dc2d 100644
--- a/order/assedit/assedit.vue
+++ b/order/assedit/assedit.vue
@@ -74,6 +74,7 @@
 		</view>
 	</view>
 	<view style="height: 200rpx;"></view>
+	
 	<view class="footer">
 		<view class="footer_btn" :class="!btnShow ? 'opy':''" @click="api_returnreturnApply()">{{!count?"退款数量必须有一项大于0":"提交(共退款"+count+"件)"}}</view>
 	</view>
diff --git a/order/orderList/orderList.vue b/order/orderList/orderList.vue
index 5ca1ba6..162d716 100644
--- a/order/orderList/orderList.vue
+++ b/order/orderList/orderList.vue
@@ -186,7 +186,7 @@ const api_orderlist=()=>{
 			item.openShow = false;
 		})
 		shop_orderlist.value = shop_orderlist.value.concat(data.list);
-		if(pages.value == 1 && !data.list.length){
+		if(!shop_orderlist.value.length){
 			img_err.value = "../../static/Empty/order_lisr_img.png"
 			if(type.value == 0){
 				decs.value = "—— 暂无待支付记录 ——"
diff --git a/order/orderevallist/orderevallist.vue b/order/orderevallist/orderevallist.vue
index 40c9846..8b46e8d 100644
--- a/order/orderevallist/orderevallist.vue
+++ b/order/orderevallist/orderevallist.vue
@@ -116,7 +116,7 @@ const api_orderReplylist=()=>{
 			}
 		})
 		replyList.value = replyList.value.concat(data.list);
-		if(pages.value == 1 && !data.list.length){
+		if(!replyList.value.length){
 			img_err.value = "../../static/Empty/order_lisr_img.png"
 			decs.value = "—— 抱歉，该页面没有相关内容 ——"
 		}else if(data.list.length < 10){
diff --git a/pages.json b/pages.json
index 5092207..613c0f7 100644
--- a/pages.json
+++ b/pages.json
@@ -39,7 +39,8 @@
 			"style": {
 				"navigationBarTitleText": "我的",
 				"navigationBarBackgroundColor": "#f2f5f7",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		}
 	],
@@ -182,6 +183,13 @@
 						"enablePullDownRefresh": true
 				   }
 				},
+				{
+				   "path": "useredit/useredit",
+				   "style": {
+						"navigationBarTitleText": "个人资料",
+						"navigationBarBackgroundColor": "#FFFFFF"
+				   }
+				},
 				{
 				   "path": "SearchProduct/SearchProduct",
 				   "style": {
@@ -195,7 +203,8 @@
 				   "style": {
 						"navigationBarTitleText": "",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationStyle": "custom"
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
 				   }
 				},
 				{
diff --git a/pages/classify/classify.vue b/pages/classify/classify.vue
index b9fac7c..149b443 100644
--- a/pages/classify/classify.vue
+++ b/pages/classify/classify.vue
@@ -205,13 +205,13 @@ const api_frontproducts = (e,i) => {
 	return frontproducts(params).then(({data})=>{
 		if(i == 1){uni.hideLoading()}
 		decs.value = '—— 上拉加载更多 ——'
-		if(data.list.length < 10){
-			decs.value = '—— 嗷呜，已经到底啦 ——';
-		}
 		data.list.forEach((item,index)=>{
 			item.isEven = index % 2 === 0
 		})
 		productList.value = productList.value.concat(data.list);
+		if(productList.value.length < 10){
+			decs.value = '—— 嗷呜，已经到底啦 ——';
+		}
 	})
 	.catch(({message}) => {
 		if(i == 1){uni.hideLoading()}
diff --git a/pages/classify/style.scss b/pages/classify/style.scss
index f07817c..63f727f 100644
--- a/pages/classify/style.scss
+++ b/pages/classify/style.scss
@@ -285,9 +285,10 @@ page{
 		top:0;
 		z-index:99;
 		.nav_head{
-			border-bottom-left-radius: 20px;
-			border-bottom-right-radius: 20px;
+			border-bottom-left-radius: 10px;
+			border-bottom-right-radius: 10px;
 			background: linear-gradient(180deg,#FCF0F1 0%,#FFFFFF 60%);
+			padding-bottom: 8px;
 			.nav_head_class{
 				margin: 0 10px 0 10px;
 				height: 50px;
diff --git a/pages/index/style.scss b/pages/index/style.scss
index 074fe62..f574b5c 100644
--- a/pages/index/style.scss
+++ b/pages/index/style.scss
@@ -129,7 +129,7 @@ page{
 			.grid_wrap_l{
 				width: 338rpx;
 				height: 338rpx;
-				background-color: #999999;
+				background-color: #000000;
 				border-radius: 20rpx;
 				overflow: hidden;
 				position: relative;
diff --git a/pages/sidedish/sidedish.vue b/pages/sidedish/sidedish.vue
index 3c6e8e7..4349b78 100644
--- a/pages/sidedish/sidedish.vue
+++ b/pages/sidedish/sidedish.vue
@@ -25,7 +25,7 @@
 						<image class="content_head_img" src="../../static/sidedish/flame.png"></image>
 						<view class="content_head_title">{{list.title}}</view>
 					</view>
-					<view class="content_head_btn">
+					<view class="content_head_btn" @click="api_cartbatchSave(list)">
 						<image class="content_head_btnimg" src="../../static/sidedish/addCart.png"></image>
 					</view>
 				</view>
@@ -70,7 +70,7 @@ import { computed,ref } from 'vue';
 import { useCounterStore } from '@/store/counter'; // 引入 Pinia Store
 import { storeToRefs } from 'pinia';//实现解构付值
 import { onLoad,onShow,onPullDownRefresh,onReachBottom } from "@dcloudio/uni-app"
-import { frontindex,frontType,frontHome } from '@/server/api';
+import { frontindex,frontType,frontHome,cartbatchSave } from '@/server/api';
 const counterStore = useCounterStore(); // 使用 Store
 const pageWidth = ref(0);
 const navList = ref([]);
@@ -142,10 +142,10 @@ const api_frontHome = (e,i) => {
 	return frontHome(params).then(({data})=>{
 		if(i == 1){uni.hideLoading()}
 		decs.value = '—— 上拉加载更多 ——'
+		productList.value = productList.value.concat(data.list);
 		if(data.list.length < 10){
 			decs.value = '—— 嗷呜，已经到底啦 ——';
 		}
-		productList.value = productList.value.concat(data.list);
 	})
 	.catch(({message}) => {
 		if(i == 1){uni.hideLoading()}
@@ -155,6 +155,34 @@ const api_frontHome = (e,i) => {
 		})
 	})
 }
+//一键加购
+const api_cartbatchSave = (list) => {
+	//提取 cartNum\productAttrUnique\productId组成新数组
+	const request = list.items.map(item => ({
+	  cartNum:1,
+	  productAttrUnique:"",
+	  productId:item.jumpIds
+	}));
+	const params = {
+		business:list.id,//业务编号(cartType=setmeal，传 楼层id)
+		cartType: "setmeal",//业务类型(default 默认； setmeal 套餐)
+		cartList:request
+	}
+	loads('', true)
+	return cartbatchSave(params).then(({message})=>{
+		uni.hideLoading()
+		uni.showToast({
+			title:'一键加购成功',
+			icon:'none'
+		})
+	}).catch(({message}) => {
+		if(i == 1){uni.hideLoading()}
+		uni.showModal({
+			content:message,
+			showCancel: false
+		})
+	})
+}
 //跳转统一处理
 const JumpType=(item,type)=>{
 	const { jumpUrl,jumpIds,jumpType } = item;
diff --git a/pages/user/style.scss b/pages/user/style.scss
index 4b5b7d4..50c132b 100644
--- a/pages/user/style.scss
+++ b/pages/user/style.scss
@@ -16,13 +16,13 @@ page{
 				align-items: center;
 				.head_user_message_photo{
 					width: 119rpx;
-					height: 112rpx;
+					height: 119rpx;
 					border-radius: 100rpx;
-					background-color: #666666;
+					background-color: #f6f6f6;
 					overflow: hidden;
 					.head_user_message_photo_img{
-						width: 112rpx;
-						height: 112rpx;
+						width: 119rpx;
+						height: 119rpx;
 						display: block;
 					}
 				}
diff --git a/pages/user/user.vue b/pages/user/user.vue
index dbb9e5f..02053c4 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -3,13 +3,13 @@
 	<view class="head">
 		<view :style="{'height':headerHeight+45+'px'}"></view>
 		<view class="head_user_message">
-			<view class="head_user_message_l">
+			<view class="head_user_message_l" @click="useredit()">
 				<view class="head_user_message_photo">
-					<image class="head_user_message_photo_img" src="" mode="widthFix"></image>
+					<image class="head_user_message_photo_img" :src="user.avatar" mode="widthFix"></image>
 				</view>
 				<view class="head_user_message_text">
-					<view class="head_user_message_name">餐饮爱好者</view>
-					<view class="head_user_message_desc"><image class="head_user_message_desc_img" src="../../static/user/tel.png"></image>152****9869</view>
+					<view class="head_user_message_name">{{user.nickname}}</view>
+					<view class="head_user_message_desc" v-if="user.phone"><image class="head_user_message_desc_img" src="../../static/user/tel.png"></image>{{user.phone}}</view>
 				</view>
 			</view>
 			<image class="head_user_message_set" src="../../static/user/setting.png" mode="widthFix"></image>
@@ -18,7 +18,7 @@
 	<view class="user_account">
 		<view class="user_account_li" @click="goCoupon()">
 			<view class="user_account_message">
-				<view class="user_account_amount">5</view>
+				<view class="user_account_amount">{{user.couponCount}}</view>
 				<view class="user_account_name">优惠券</view>
 			</view>
 			<image class="user_account_img" src="../../static/user/coupon.png"  mode="widthFix"></image>
@@ -26,7 +26,7 @@
 		<view class="user_account_border"></view>
 		<view class="user_account_li">
 			<view class="user_account_message">
-				<view class="user_account_amount">0.00</view>
+				<view class="user_account_amount">{{user.nowMoney}}</view>
 				<view class="user_account_name">余额(元)</view>
 			</view>
 			<image class="user_account_img" src="../../static/user/purse.png"  mode="widthFix"></image>
@@ -59,9 +59,10 @@
 </template>
 
 <script setup>
+import { frontuser } from '@/server/api.js'
 import recomGoods from '@/components/recomGoods/recomGoods.vue';
 import multi from '@/components/multi/multi.vue'
-import { computed,ref } from 'vue';
+import { computed,ref,onMounted } from 'vue';
 import { useCounterStore } from '@/store/counter'; // 引入 Pinia Store
 import { storeToRefs } from 'pinia';//实现解构付值
 import { onLoad,onShow,onPullDownRefresh,onReachBottom } from "@dcloudio/uni-app"
@@ -69,6 +70,7 @@ const counterStore = useCounterStore(); // 使用 Store
 //使用pinia：storeToRefs方法包裹(保持响应式更新，不使用视图无法更新)
 const { statusHeight,headerHeight,token } = storeToRefs(counterStore);
 const shopData = ref({});
+const user = ref({});
 const order = ref([
 	{
 		id:1,
@@ -86,7 +88,8 @@ const order = ref([
 		id:4,
 		imgUrl:'../../static/user/evaluate.png',
 		name:'待评价',
-		url:'/order/orderevallist/orderevallist?type=0'
+		url:'/order/orderList/orderList?type=4'
+		// url:'/order/orderevallist/orderevallist?type=0'
 	},
 	{
 		id:5,
@@ -133,6 +136,17 @@ const contList = ref([
 		url:'/userserve/addressList/addressList'
 	}
 ])
+
+const api_frontuser = () => {
+	return frontuser().then(({data})=>{
+		user.value = data;
+	}).catch(({message}) => {
+		uni.showModal({
+			content:message,
+			showCancel: false
+		})
+	})
+}
 //加购物车
 const addCart=(i,type)=>{
 	shopData.value.addCart(i,type);
@@ -151,6 +165,11 @@ const goCoupon=()=>{
 		url:`/order/coupon/coupon`
 	})
 };
+const useredit=()=>{
+	uni.navigateTo({
+		url:`/userserve/useredit/useredit`
+	})
+}
 const goServe=(item,index)=>{
 	const { url } = item;
 	uni.navigateTo({url})
@@ -161,17 +180,10 @@ const orderList=(item)=>{
 	const { url } = item;
 	uni.navigateTo({url})
 }
-onLoad((options) => {
-
-});
-onShow(() => {
-  
-});
+onShow(() => {api_frontuser()});
 onPullDownRefresh(()=>{
-	
-})
-onReachBottom(()=>{
-	
+	api_frontuser();
+	uni.stopPullDownRefresh();
 })
 </script>
 
diff --git a/server/api.js b/server/api.js
index 868d29d..0a93035 100644
--- a/server/api.js
+++ b/server/api.js
@@ -276,3 +276,8 @@ export const frontcartcount = () => {
   const data = {numType:1,type:'total'}
   return request({url:`/api/front/cart/count`,method:'GET',data});
 }
+//购物车一键加购
+export const cartbatchSave = (data) => {
+  return request({url:`/api/front/cart/batchSave`,method:'POST',data});
+}
+
diff --git a/server/config.js b/server/config.js
index b6205fd..e6b2809 100644
--- a/server/config.js
+++ b/server/config.js
@@ -9,7 +9,7 @@ const type = 'dev'
   * prod生产
   */
 if(type === 'dev'){
-	url = "http://56w4qa.natappfree.cc";
+	url = " http://i44vgg.natappfree.cc";
 }
 if(type === 'test'){
 	url = "https://japiuat.3721zh.com/webapp";
diff --git a/shopProDetail/detail/detail.vue b/shopProDetail/detail/detail.vue
index a1ea7bc..ffdebe8 100644
--- a/shopProDetail/detail/detail.vue
+++ b/shopProDetail/detail/detail.vue
@@ -74,8 +74,8 @@
 				</view>
 			</view>
 			<view class="footer_r">
-				<view class="footer_btn border_l">加入购物车</view>
-				<view class="footer_btn footer_btn_bcg border_r" @click="orderConfirm">立即下单</view>
+				<view class="footer_btn footer_btn_bcg border_l"  @click.stop="addCartShop()">加入购物车</view>
+				<!-- <view class="footer_btn footer_btn_bcg border_r" @click="orderConfirm">立即下单</view> -->
 			</view>
 		</view>
 	</view>
@@ -162,18 +162,25 @@ const goCart=()=>{
 		url:`/pages/cart/cart`
 	})
 };
+const addCartShop = () =>{
+	const item = {
+		image:productInfo.value.image,
+		storeName:productInfo.value.storeName,
+		price:productInfo.value.price,
+		otPrice:productInfo.value.otPrice,
+		specType:productInfo.value.specType,
+		id:productInfo.value.id
+	}
+	shopData.value.addCart(item,1);
+}
 //加购物车
 const addCart=(i,type)=>{
 	shopData.value.addCart(i,type);
 }
 // 加入购物车成功回调
-const handleAddSuccess = (data) => {
-	
-}
+const handleAddSuccess = (data) => {}
 // 加入购物车失败回调
-const handleAddError = (error) => {
-  console.error('加入购物车失败回调:', error)
-}
+const handleAddError = (error) => {}
 const handleBack = () => {
   if (getPages()) {
     // 如果有上一页，返回上一页
diff --git a/shopProDetail/detail/style.scss b/shopProDetail/detail/style.scss
index 07afcc5..e551ca9 100644
--- a/shopProDetail/detail/style.scss
+++ b/shopProDetail/detail/style.scss
@@ -203,7 +203,7 @@ page{
 					align-items: center;
 					justify-content: space-between;
 					.footer_li{
-						width: 90rpx;
+						width: 110rpx;
 						.footer_icon{
 							margin: 0 auto;
 							width: 50rpx;
@@ -256,6 +256,7 @@ page{
 						align-items: center;
 						justify-content: center;
 						font-weight: 500;
+						flex: 1;
 					}
 					.footer_btn_bcg{
 						color: #FFFFFF;
@@ -263,7 +264,7 @@ page{
 					}
 					.border_l{
 						border-radius: 50rpx;
-						margin-right: 20rpx;
+						// margin-right: 20rpx;
 						// border-top-left-radius: 20rpx;
 						// border-bottom-left-radius: 20rpx;
 					}
diff --git a/shopProDetail/evallist/evallist.vue b/shopProDetail/evallist/evallist.vue
index 872602c..6021896 100644
--- a/shopProDetail/evallist/evallist.vue
+++ b/shopProDetail/evallist/evallist.vue
@@ -32,29 +32,36 @@
 		<view class="footer_cont">
 			<view class="footer_l">
 				<view class="footer_li">
-					<view class="footer_icon">
-						<image  class="footer_icon_img" src="../../static/shopdetail/collect.png" mode="widthFix"></image>
+					<view class="footer_icon"  @click="favorite">
+						<image  class="footer_icon_img" :src="productInfo.favor_img" mode="widthFix"></image>
 					</view>
 					<view class="footer_name">收藏</view>
 				</view>
 				<view class="footer_li" @click="goCart()">
 					<view class="footer_icon">
-						<view class="footer_amount">45</view>
+						<view class="footer_amount" v-if="cartcount > 0">{{cartcount}}</view>
 						<image  class="footer_icon_img" src="../../static/shopdetail/cart.png" mode="widthFix"></image>
 					</view>
 					<view class="footer_name">购物车</view>
 				</view>
 			</view>
 			<view class="footer_r">
-				<view class="footer_btn border_l">加入购物车</view>
-				<view class="footer_btn footer_btn_bcg border_r" @click="orderConfirm">立即下单</view>
+				<view class="footer_btn footer_btn_bcg border_l" @click="addCartShop()">加入购物车</view>
+				<!-- <view class="footer_btn footer_btn_bcg border_r" @click="orderConfirm">立即下单</view> -->
 			</view>
 		</view>
 	</view>
+	<multi
+	ref="shopData"
+	@add-success="handleAddSuccess"
+	@add-error="handleAddError"
+	></multi>
   </view>
 </template>
 
 <script setup>
+import { loads } from '@/utils/index.js'
+import multi from '@/components/multi/multi.vue'
 import { computed,ref,onMounted,onUnmounted,getCurrentInstance,nextTick } from 'vue';
 import { useCounterStore } from '@/store/counter'; // 引入 Pinia Store
 import { storeToRefs } from 'pinia';//实现解构付值
@@ -62,8 +69,8 @@ import { onLoad,onShow,onPullDownRefresh,onPageScroll,onReachBottom,onReady } fr
 const counterStore = useCounterStore(); // 使用 Store
 const { proxy } = getCurrentInstance();
 //使用pinia：storeToRefs方法包裹(保持响应式更新，不使用视图无法更新)
-const {statusHeight,headerHeight,statusBartop,token } = storeToRefs(counterStore);
-import { replyconfig,replylist } from '@/server/api'
+const {statusHeight,headerHeight,statusBartop,token,cartcount } = storeToRefs(counterStore);
+import { replyconfig,replylist,frontcartcount,frontdetail,collectcancel,collectadd } from '@/server/api'
 const productId = ref('');//产品id
 const havePics = ref('');//有图传1
 const latest = ref('');//查最新传1
@@ -78,6 +85,8 @@ const sumCount = ref('');
 const decs = ref('');
 const List = ref([]);
 const act = ref(0);
+const productInfo = ref({})
+const shopData = ref({});
 const referClick=(item,index)=>{
 	if(act.value == index) return false;
 	act.value = index;
@@ -108,6 +117,44 @@ const referClick=(item,index)=>{
 	pages.value = 0;
 	api_replylist()
 }
+const api_detail=()=>{
+	loads('', true);
+	return frontdetail(productId.value).then(({data}) => {
+		uni.hideLoading();
+		if(data.userCollect){
+			data.favor_img = "../../static/shopdetail/collect_acer.png"
+		}else{
+			data.favor_img = "../../static/shopdetail/collect.png"
+		}
+		productInfo.value = data;
+	})
+	.catch(({message}) => {
+		uni.hideLoading();
+		uni.showModal({
+			content:message,
+			showCancel: false
+		})
+	})
+}
+//购物车数量 
+const api_frontcartcount=()=>{
+	frontcartcount().then(({data}) => {cartcount.value = data.count;})
+}
+const addCartShop = () =>{
+	const item = {
+		image:productInfo.value.image,
+		storeName:productInfo.value.storeName,
+		price:productInfo.value.price,
+		otPrice:productInfo.value.otPrice,
+		specType:productInfo.value.specType,
+		id:productInfo.value.id
+	}
+	shopData.value.addCart(item,1);
+}
+// 加入购物车成功回调
+const handleAddSuccess = (data) => {}
+// 加入购物车失败回调
+const handleAddError = (error) => {}
 const api_replyconfig=()=>{
 		return replyconfig(productId.value).then(({data}) => {
 			let arr = [
@@ -131,6 +178,8 @@ const api_replyconfig=()=>{
 			sumCount.value = data.sumCount;
 		})
 		.then(()=>api_replylist())
+		.then(()=>api_detail())
+		.then(()=>api_frontcartcount())
 		.catch(({message}) => {
 			uni.showModal({
 				content:message,
@@ -201,6 +250,43 @@ const api_replylist=()=>{
 			})
 		})
 }
+const favorite = ()=>{
+	if(productInfo.value.userCollect){
+		api_collectcancel();
+	}else{
+		api_collectadd();
+	}
+}
+const api_collectadd=()=>{
+	loads('', true);
+	let data = {
+		category:"store",
+		id:productInfo.value.id
+	}
+	return collectadd(data).then(({message}) => {
+		uni.hideLoading();
+		api_detail();
+	}).catch(({message}) => {
+		uni.hideLoading();
+		uni.showModal({
+			content:message,
+			showCancel: false
+		})
+	})
+}
+const api_collectcancel=()=>{
+	loads('', true);
+	return collectcancel(productInfo.value.id).then(({message}) => {
+		uni.hideLoading();
+		api_detail();
+	}).catch(({message}) => {
+		uni.hideLoading();
+		uni.showModal({
+			content:message,
+			showCancel: false
+		})
+	})
+}
 onLoad((options) => {
 	if(options.productId){
 		productId.value = options.productId;
diff --git a/shopProDetail/evallist/style.scss b/shopProDetail/evallist/style.scss
index 24e4295..4cb0324 100644
--- a/shopProDetail/evallist/style.scss
+++ b/shopProDetail/evallist/style.scss
@@ -176,7 +176,7 @@ page{
 					align-items: center;
 					justify-content: space-between;
 					.footer_li{
-						width: 90rpx;
+						width: 110rpx;
 						.footer_icon{
 							margin: 0 auto;
 							width: 50rpx;
@@ -229,6 +229,7 @@ page{
 						align-items: center;
 						justify-content: center;
 						font-weight: 500;
+						flex: 1;
 					}
 					.footer_btn_bcg{
 						color: #FFFFFF;
@@ -236,7 +237,7 @@ page{
 					}
 					.border_l{
 						border-radius: 50rpx;
-						margin-right: 20rpx;
+						// margin-right: 20rpx;
 						// border-top-left-radius: 20rpx;
 						// border-bottom-left-radius: 20rpx;
 					}
diff --git a/static/Empty/Mask group@2x (12).png b/static/Empty/collect.png
similarity index 100%
rename from static/Empty/Mask group@2x (12).png
rename to static/Empty/collect.png
diff --git a/static/Empty/Mask group@2x.png b/static/Empty/search.png
similarity index 100%
rename from static/Empty/Mask group@2x.png
rename to static/Empty/search.png
diff --git a/static/addGroup.png b/static/addGroup.png
new file mode 100644
index 0000000000000000000000000000000000000000..56ef508aeac42dc9f282c28a71eb6b088956dc20
GIT binary patch
literal 805
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?skM2Ka=y0_p#h
zAO(g0>(~F^u;Ksy{r}&;|NsC0@+pFsfQE{c1o;Is2q+jh1jHxg7xYh<zhM1_{pat$
zH;~!k%fP^t<muuVl5y|otc%lDEAY5BJIQ7p*E-Vo>A!rH{H@5%R>6ksp6@H)oyzl2
zkZ@9&v~i#OGJ%;hlO@{kMLTaz*=6^E+gJR0$cA_B=Q7^(8RlI372B-+|8t`&SM0>U
z{U?${6><_h6b|w5yk=^-?W#B7250dzr@5}P*K@|KQHWS(_KC5z?EJq@{#RQj|EY<H
zyID7_;E~p?n5EOSSFW8u|9qGJ=Bpu_&&$NU-C-Pl<>&gpeXCEsWPKpmcE9_}$*HC*
z^aPAI*D|&IYFO~*z~_mIr3rD@N@jnw@Rpr%eM(SN`VH2V%<-B_r(9}sJLnnyHP3!+
zhElAf!=!(8H91Mwm^LsLi?H1}Z1alIEvL1BL0YBVi$S)m?@`0N4mDo~1*0{b3C>~S
z2`67O*?isA5LYKKm2uqxJ3S_!08>2%mabh59@e4}%Y5c8+smbMxoqyTyFe<4!QoB*
z^_M;q!aFudK6z^rEATshcBa)!w#qZIqMv=U>Sk{5=lXis@9&N<eT!GB!j^u82V7cQ
zB-vv&oL855z_DxlgNA3a)8iA=4>VLSzWjnwE_ZGqcfsFx!P$&5za+Vt>Sl3XGFUJ1
zVEOdimg$RC<M$ff6<Ej}p}kN$<N2BGF<(z@DPFMZ04tvW@7A~Rb>+UvvA^r%h333s
z5)7+Ixqm!AUpH9zE7OO0-|Du$OM7N}_WFkTwMRal`lh|+(!1*9YK`dR-~Z=Jb^3gq
z_ipKAU@Qs?R@}+wl5=6pxxiGa6!9Ze-q9uAWV(VYOT10nBbKQpTS{Dfr_0-Z6iv&J
v`u=m1tiZ2zk6QY^{xzuU|L=3)$9em-CYN1X>TlcvrbY%&S3j3^P6<r_8#iT<

literal 0
HcmV?d00001

diff --git a/static/serv.png b/static/serv.png
new file mode 100644
index 0000000000000000000000000000000000000000..585e4eff41b954f9d6eeeb5be7f42776c20b7725
GIT binary patch
literal 5565
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
LNkvXXu0mjf)Yk0-

literal 0
HcmV?d00001

diff --git a/userserve/SearchList/SearchList.vue b/userserve/SearchList/SearchList.vue
index 1940ebd..7086b6a 100644
--- a/userserve/SearchList/SearchList.vue
+++ b/userserve/SearchList/SearchList.vue
@@ -10,128 +10,38 @@
 				<input class="head_search_input"  type="text" v-model="searchtext" disabled="true" @click="handleBack()"/>
 			</view>
 		</view>
+		<view class="head_list">
+			<view class="head_item">价格</view>
+			<view class="head_item">销量</view>
+			<view class="head_item">折扣</view>
+		</view>
 	</view>
-	<view class="cont" :style="{'padding-top':statusHeight+headerHeight+19+'px'}">
+	<view class="cont" :style="{'padding-top':statusHeight+headerHeight+50+'px'}">
 		<!-- 商品区域 -->
-		<view class="shop_view">
-			<view class="shop_view_ul">
-				<view class="shop_view_li" @click="goDetail()">
-					<view class="shop_view_img">
-						<view class="shop_view_tag"><text class="shop_view_tag_text">够辣</text></view>
-						<view class="shop_view_img_u">
-							<image class="shop_view_img_url" src="../../static/Mask.png"></image>
-						</view>
-					</view>
-					<view class="shop_view_cont">
-						<view class="shop_view_cont_title">糖醋排骨</view>
-						<view class="shop_view_cont_desc">乡下土猪</view>
-						<view class="shop_view_cont_tag">
-							<view class="shop_view_cont_tag_text">仅剩3份</view>
-							<view class="shop_view_cont_tag_text">劲辣胃浓</view>
-						</view>
-						<view class="shop_view_cont_bottom">
-							<view class="shop_view_cont_price price">43.9<text class="market_name prices">59.9</text></view>
-							<view class="shop_view_cont_cart">
-								<image class="shop_view_cont_cart_img" src="../../static/oncatr02.png" mode="widthFix"></image>
-							</view>
-						</view>
-					</view>
+		<view class="cont_item" v-for="(item,index) in searchList" :key="index" @click="JumpType(item.id,1)">
+			<image class="item_imgUrl" :src="item.image" lazy-load="true" mode="widthFix"></image>
+			<view class="item_r">
+				<view class="item_title"><text>{{item.storeName}}</text></view>
+				<view class="item_desc"><text>{{item.storeInfo}}</text></view>
+				<view class="item_bottom">
+					<view class="item_price">{{item.price}}<text class="item_otPrice">{{item.otPrice}}</text></view>
+					<image class="item_addCart" src="../../static/addGroup.png" @click.stop="addCart(item,1)"></image>
 				</view>
-				<view class="shop_view_li" @click="goDetail()">
-					<view class="shop_view_img">
-						<view class="shop_view_tag"><text class="shop_view_tag_text">够辣</text></view>
-						<view class="shop_view_img_u">
-							<image class="shop_view_img_url" src="../../static/Mask.png"></image>
-						</view>
-					</view>
-					<view class="shop_view_cont">
-						<view class="shop_view_cont_title">糖醋排骨</view>
-						<view class="shop_view_cont_desc">乡下土猪</view>
-						<view class="shop_view_cont_tag">
-							<view class="shop_view_cont_tag_text">仅剩3份</view>
-							<view class="shop_view_cont_tag_text">劲辣胃浓</view>
-						</view>
-						<view class="shop_view_cont_bottom">
-							<view class="shop_view_cont_price price">43.9<text class="market_name prices">59.9</text></view>
-							<view class="shop_view_cont_cart">
-								<image class="shop_view_cont_cart_img" src="../../static/oncatr02.png" mode="widthFix"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="shop_view_li" @click="goDetail()">
-					<view class="shop_view_img">
-						<view class="shop_view_tag"><text class="shop_view_tag_text">香甜</text></view>
-						<view class="shop_view_img_u">
-							<image class="shop_view_img_url" src="../../static/Mask.png"></image>
-						</view>
-					</view>
-					<view class="shop_view_cont">
-						<view class="shop_view_cont_title">泡椒田鸡</view>
-						<view class="shop_view_cont_desc">超大只田鸡</view>
-						<view class="shop_view_cont_tag">
-							<view class="shop_view_cont_tag_text">仅剩3份</view>
-							<view class="shop_view_cont_tag_text">劲辣胃浓</view>
-							<view class="shop_view_cont_tag_text">劲辣胃浓</view>
-						</view>
-						<view class="shop_view_cont_bottom">
-							<view class="shop_view_cont_price price">43.9<text class="market_name prices">59.9</text></view>
-							<view class="shop_view_cont_cart">
-								<image class="shop_view_cont_cart_img" src="../../static/oncatr02.png" mode="widthFix"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="shop_view_ul">
-				<view class="shop_view_li" @click="goDetail()">
-					<view class="shop_view_img">
-						<view class="shop_view_tag"><text class="shop_view_tag_text">热销</text></view>
-						<view class="shop_view_img_u">
-							<image class="shop_view_img_url" src="../../static/Mask.png"></image>
-						</view>
-					</view>
-					<view class="shop_view_cont">
-						<view class="shop_view_cont_title">泡椒田鸡</view>
-						<view class="shop_view_cont_desc">超大只田鸡</view>
-						<view class="shop_view_cont_tag">
-							<view class="shop_view_cont_tag_text">仅剩3份</view>
-							<view class="shop_view_cont_tag_text">劲辣胃浓</view>
-						</view>
-						<view class="shop_view_cont_bottom">
-							<view class="shop_view_cont_price price">43.9<text class="market_name prices">59.9</text></view>
-							<view class="shop_view_cont_cart">
-								<image class="shop_view_cont_cart_img" src="../../static/oncatr02.png" mode="widthFix"></image>
-							</view>
-						</view>
-					</view>
-				</view>	
-				<view class="shop_view_li" @click="goDetail()">
-					<view class="shop_view_img">
-						<view class="shop_view_tag"><text class="shop_view_tag_text">新鲜</text></view>
-						<view class="shop_view_img_u">
-							<image class="shop_view_img_url" src="../../static/Mask.png"></image>
-						</view>
-					</view>
-					<view class="shop_view_cont">
-						<view class="shop_view_cont_title">泡椒田鸡</view>
-						<view class="shop_view_cont_desc">超大只田鸡</view>
-						<view class="shop_view_cont_tag">
-							<view class="shop_view_cont_tag_text">仅剩3份</view>
-							<view class="shop_view_cont_tag_text">劲辣胃浓</view>
-						</view>
-						<view class="shop_view_cont_bottom">
-							<view class="shop_view_cont_price price">43.9<text class="market_name prices">59.9</text></view>
-							<view class="shop_view_cont_cart">
-								<image class="shop_view_cont_cart_img" src="../../static/oncatr02.png" mode="widthFix"></image>
-							</view>
-						</view>
-					</view>
-				</view>			
 			</view>
 		</view>
-		
+		<view class="empty" v-if="img_err && decs">
+			<view class="empty_cont">
+				<image class="empty_cont_img" :src="img_err" lazy-load="true" mode="widthFix"></image>
+				<view class="empty_cont_title">{{decs}}</view>
+			</view>
+		</view>
 	</view>
+	<recomGoods  :apiType="5"  @add-message="addCart"></recomGoods>
+	<multi
+	ref="shopData"
+	@add-success="handleAddSuccess"
+	@add-error="handleAddError"
+	></multi>
   </view>
 </template>
 
@@ -139,6 +49,8 @@
 import { computed,ref,onMounted,onUnmounted,getCurrentInstance,nextTick } from 'vue';
 import { useCounterStore } from '@/store/counter'; // 引入 Pinia Store
 import { storeToRefs } from 'pinia';//实现解构付值
+import { frontproducts } from '@/server/api.js'
+import multi from '@/components/multi/multi.vue'
 import { onLoad,onShow,onPullDownRefresh,onPageScroll,onReachBottom,onReady } from "@dcloudio/uni-app"
 const counterStore = useCounterStore(); // 使用 Store
 const { proxy } = getCurrentInstance();
@@ -148,6 +60,20 @@ const {statusHeight,headerHeight,statusBartop,ButtonWidth,ButtonHeight } = store
 const pageWidth = ref(0);
 const searchtext = ref('');
 const searchList= ref([]);
+const decs = ref('');
+const pages = ref(0);
+const limits = ref(10);
+const type = ref("");
+const img_err = ref("");
+const shopData = ref({});
+//加购物车
+const addCart=(i,type)=>{
+	shopData.value.addCart(i,type);
+}
+// 加入购物车成功回调
+const handleAddSuccess = (data) => {}
+// 加入购物车失败回调
+const handleAddError = (error) => {}
 // 获取页面宽度
 const updatePageWidth = () => {
   const systemInfo = uni.getSystemInfoSync();
@@ -173,20 +99,72 @@ const handleBack = () => {
     });
   }
 };
-
-
+const api_frontproducts=()=>{
+	pages.value = pages.value + 1;
+	img_err.value = "";
+	decs.value = "—— 加载中... ——";
+	const params = {
+		page:pages.value,
+		limit:limits.value
+	}
+	if(searchtext.value){
+		params.keyword = searchtext.value
+	}
+	return frontproducts(params).then(({data}) => {
+		decs.value = '—— 上拉加载更多 ——';
+		searchList.value = searchList.value.concat(data.list);
+		if(!searchList.value.length){
+			img_err.value = "../../static/Empty/search.png"
+			decs.value = "抱歉，没有搜到相关商品"
+		}else if(data.list.length < 10){
+			decs.value = '—— 嗷呜，已经到底啦 ——';
+		}
+	}).catch(({message}) => {
+		img_err.value = "../../static/Empty/err.png"
+		decs.value = `—— ${message||'网络异常'} ——`;
+	})
+}
+//跳转统一处理
+const JumpType=(item,type)=>{
+	if(type == 1){
+		uni.navigateTo({
+			url:`/shopProDetail/detail/detail?id=${item}`//商品详情
+		})
+	}else{
+		const { jumpUrl,jumpIds,jumpType } = item;
+		if(jumpType == 0 || jumpType == 2 || jumpType == 4) return false;
+		let url = "";
+		if(jumpType == 1){
+			uni.navigateTo({
+				url:`/shopProDetail/detail/detail?id=${jumpIds}`//商品详情
+			})
+		}else if(jumpType == 3){
+			uni.switchTab({
+				url:`/pages/classify/classify`//商品列表
+			})
+		}
+	}	
+}
 onLoad((options) => {
 	const { text } = options;
-	
 	if(searchtext){
 		searchtext.value = text;
 	}
 	updatePageWidth();
+	api_frontproducts();
 });
 onShow(() => {});
 onReady(()=>{})
-onPullDownRefresh(()=>{})
-onReachBottom(()=>{})
+onPullDownRefresh(()=>{
+	searchList.value = [];
+	decs.value = '';
+	pages.value = 0;
+	api_frontproducts();
+	uni.stopPullDownRefresh();
+})
+onReachBottom(()=>{
+	api_frontproducts();
+})
 </script>
 
 <style lang="scss">
diff --git a/userserve/SearchList/style.scss b/userserve/SearchList/style.scss
index 4f6edb3..fb3900b 100644
--- a/userserve/SearchList/style.scss
+++ b/userserve/SearchList/style.scss
@@ -52,126 +52,105 @@ page{
 				}
 			}
 		}
+		.head_list{
+			display: flex;
+			justify-content:space-around;
+			align-items:center;
+			.head_item{
+				font-size: 28rpx;
+				color: #333333;
+				width: 200rpx;
+				height: 20px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				padding-top: 10px;
+			}
+		}
+		
 	}
 	.cont{
 		// 商品区域样式
-		.shop_view{
-			margin-top: 10rpx;
-			padding: 13rpx 20rpx 0rpx 20rpx;
+		.cont_item{
+			margin: 20rpx 20rpx 0 20rpx;
+			padding: 20rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
 			display: flex;
+			align-items: center;
 			justify-content: space-between;
-			.shop_view_ul{
-				width: 346rpx;
-				.shop_view_li{
-					background-color: #FFFFFF;
-					border-radius: 20rpx;
-					width: 100%;
-					box-shadow: 0 4rpx 8rpx rgba(0,0,0,.05);
-					margin-bottom: 20rpx;
-					.shop_view_li_swiper{
-						width: 100%;
-						height: 504rpx;
-						.shop_view_li_swiper_item{
-							width: 100%;
-							.shop_view_li_swiper_img_url{
-								width: 100%;
-								height: 504rpx;
-								display: block;
-								border-radius: 20rpx;
-							}
-						}
-					}
-					.shop_view_img{
-						width: 100%;
-						position: relative;
-						height: 320rpx;
-						.shop_view_tag{
-							width: 66rpx;
-							height: 42rpx;
-							position: absolute;
-							z-index: 2;
-							right: -15rpx;
-							top: 20rpx;
-							background: url(../../static/tag_img.png);
-							background-repeat: no-repeat;
-							background-size: 100% 100%;
-							.shop_view_tag_text{
-								font-size: 20rpx;
-								color: #FFFFFF;
-								height: 30rpx;
-								display: flex;
-								align-items: center;
-								justify-content: center;
-							}
-						}
-						.shop_view_img_u{
-							width: 300rpx;
-							position: absolute;
-							z-index: 1;
-							left: 20rpx;
-							top: 20rpx;
-							.shop_view_img_url{
-								width: 100%;
-								height: 300rpx;
-								display: block;
-							}
-						}
-					}
-					.shop_view_cont{
-						padding: 20rpx;
-						.shop_view_cont_title{
-							font-size: 28rpx;
-							font-weight: 500;
-							color: #000000;
-							min-height: 80rpx;
-						}
-						.shop_view_cont_desc{
-							color: #666666;
-							font-size: 24rpx;
-						}
-						.shop_view_cont_tag{
-							display: flex;
-							flex-wrap: wrap;
-							.shop_view_cont_tag_text{
-								border-radius: 6rpx;
-								border: 1px solid #FF6868;
-								padding: 0rpx 10rpx;
-								border-radius: 10rpx;
-								color: #ff6868;
-								font-size: 18rpx;
-								margin-top: 10rpx;
-								margin-right: 10rpx;
-							}
-						}
-					}
-					.shop_view_cont_bottom{
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						.shop_view_cont_price{
-							font-size: 32rpx;
-							color: red;
-							font-weight: 500;
-						}
-						.shop_view_cont_cart{
-							width: 65rpx;
-							height: 65rpx;
-							display: flex;
-							align-items: center;
-							justify-content: flex-end;
-							.shop_view_cont_cart_img{
-								width: 40rpx;
-								height: 40rpx;
-								display: block;
-							}
-						}
-					}
+			.item_imgUrl{
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 10rpx;
+			}
+			.item_r{
+				width: 450rpx;
+				.item_title{
+					color: #333333;
+					font-size: 28rpx;
+					font-weight: 500;
+					min-height: 80rpx;
 				}
-				.shop_view_bcg{
-					background-color: inherit;
+				.item_title text{
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					word-break: break-all;
+				}
+				.item_desc{
+					font-size: 22rpx;
+					color: #999999;
+					margin-top: 10rpx;
+				}
+				.item_desc text{
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+					word-break: break-all;
+				}
+				.item_bottom{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					.item_price{
+						font-size: 32rpx;
+						color: #FF0000;
+						font-weight: 500;
+						.item_otPrice{
+							font-size:26rpx;
+							color: #999999;
+							font-weight: 400;
+							text-decoration: line-through;
+							margin-left: 5rpx;
+						}
+						.item_otPrice::before{
+							content: "¥";
+							font-size: 20rpx;
+							margin-right: 5rpx;
+						}
+					}
+					.item_price::before{
+						content: "¥";
+						font-size: 24rpx;
+						margin-right: 5rpx;
+					}
+					.item_addCart{
+						width: 48rpx;
+						height: 48rpx;
+					}
 				}
 			}
 		}
+		
+		
+		
+
 	}
 	.price::before {
 		content: '¥';
@@ -191,4 +170,45 @@ page{
 		margin-left: 5rpx;
 		font-weight: 400;
 	}
+}
+.load_desc{
+	font-size: 28rpx;
+	color: #aaa;
+	text-align: center;
+	padding-top: 30rpx;
+	padding-bottom: 30rpx;
+}
+.empty{
+	height:480rpx;
+	margin:20rpx 20rpx 0rpx 20rpx;
+	border-radius: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	.empty_cont{
+		.empty_cont_img{
+			margin: 0 auto;
+			width: 355rpx;
+			height: 280rpx;
+			display: flex;
+		}
+		.empty_cont_title{
+			font-size: 28rpx;
+			color: #aaaaaa;
+			text-align: center;
+		}
+		.empty_cont_btn{
+			margin: 0 auto;
+			width: 154rpx;
+			height: 46rpx;
+			border-radius: 30rpx;
+			border: 1rpx solid #FF0000;
+			color: #FF0000;
+			line-height: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 40rpx;
+		}
+	}
 }
\ No newline at end of file
diff --git a/userserve/SearchProduct/SearchProduct.vue b/userserve/SearchProduct/SearchProduct.vue
index 2f3b02e..fef9333 100644
--- a/userserve/SearchProduct/SearchProduct.vue
+++ b/userserve/SearchProduct/SearchProduct.vue
@@ -14,30 +14,23 @@
 	<view class="cont" :style="{'padding-top':statusHeight+headerHeight+19+'px'}">
 		<block v-if="searchList.length">
 			<view class="cont_ul">
-				<view class="cont_li" v-for="(item,index) in searchList" :key="index" @click="onList(item.title)">{{item.title}}</view>
+				<view class="cont_li" v-for="(item,index) in searchList" :key="index" @click="goSearch(item.storeName)">{{item.storeName}}</view>
 			</view>
 		</block>
 		<block v-else>
-			<view class="cont_title">历史搜索</view>
-			<view class="cont_keyword">
-				<view class="cont_keyword_item">排骨</view>
-				<view class="cont_keyword_item">猪肉炖粉条</view>
-				<view class="cont_keyword_item">蚂蚁上树</view>
-			</view>
-			
-			<view class="cont_title">搜索发现</view>
-			<view class="cont_keyword">
-				<view class="cont_keyword_item">买1赠1起</view>
-				<view class="cont_keyword_item">水果半价日</view>
-				<view class="cont_keyword_item">海鲜5折抢</view>
-				<view class="cont_keyword_item">春菜</view>
-				<view class="cont_keyword_item">青团</view>
-				<view class="cont_keyword_item">虾</view>
-				<view class="cont_keyword_item">牛奶</view>
-				<view class="cont_keyword_item">矿泉水</view>
-			</view>
+			<block v-if="searchStorage.length">
+				<view class="cont_title">历史搜索</view>
+				<view class="cont_keyword">
+					<view class="cont_keyword_item" v-for="(item,index) in searchStorage" :key="index" @click="goSearch(item)">{{item}}</view>
+				</view>
+			</block>
+			<block v-if="keyList.length">
+				<view class="cont_title">搜索发现</view>
+				<view class="cont_keyword">
+					<view class="cont_keyword_item" v-for="(item,index) in keyList" :key="index" @click="goSearch(item.title)">{{item.title}}</view>
+				</view>
+			</block>
 		</block>
-		
 	</view>
   </view>
 </template>
@@ -47,6 +40,7 @@ import { computed,ref,onMounted,onUnmounted,getCurrentInstance,nextTick } from '
 import { useCounterStore } from '@/store/counter'; // 引入 Pinia Store
 import { storeToRefs } from 'pinia';//实现解构付值
 import { onLoad,onShow,onPullDownRefresh,onPageScroll,onReachBottom,onReady } from "@dcloudio/uni-app"
+import { searchkeyword,frontproducts } from '@/server/api'
 const counterStore = useCounterStore(); // 使用 Store
 const { proxy } = getCurrentInstance();
 //使用pinia：storeToRefs方法包裹(保持响应式更新，不使用视图无法更新)
@@ -56,6 +50,8 @@ const pageWidth = ref(0);
 const focus = ref(false);
 const searchtext = ref('');
 const searchList= ref([]);
+const keyList = ref([]);
+const searchStorage = ref([])
 // 获取页面宽度
 const updatePageWidth = () => {
   const systemInfo = uni.getSystemInfoSync();
@@ -81,50 +77,71 @@ const handleBack = () => {
     });
   }
 };
-
-const onKeyInput=()=>{
-	if(searchtext.value){
-		const list = [{
-			title:'啤酒'
-		},
-		{
-			title:'雪花啤酒'
-		},
-		{
-			title:'青岛啤酒装罐'
-		},
-		{
-			title:'百威啤酒'
-		},
-		{
-			title:'原浆啤酒'
-		},
-		{
-			title:'进口啤酒'
-		},
-		{
-			title:'燕京啤酒'
-		}]
-		searchList.value = list;
+const api_searchkeyword = () => {
+	return searchkeyword().then(({data})=>{
+		keyList.value = data;
+	}).catch(({message}) => {
+		uni.showModal({
+			content:message,
+			showCancel: false
+		})
+	})
+}
+const onKeyInput=(e)=>{
+	if(e.detail.value){
+		api_frontproducts()
 	}else{
-		searchList.value = [];
+		searchList.value = []
 	}
 };
-const onList=(name)=>{
+const api_frontproducts=()=>{
+	const params = {
+		page:1,
+		limit:10,
+		keyword:searchtext.value||""
+	}
+	return frontproducts(params).then(({data}) => {searchList.value = data.list;})
+}
+const goSearch=(name)=>{
 	uni.navigateTo({
 		url:`/userserve/SearchList/SearchList?text=${name}`
 	})
-};
+}
 const confirm=(e)=>{
+	let arr = searchStorage.value;
 	uni.navigateTo({
-		url:`/userserve/SearchList/SearchList?text=${searchtext.value}`
+		url:`/userserve/SearchList/SearchList?text=${searchtext.value}`,
+		success: () => {
+			arr.forEach((item,index)=>{
+				if(e.detail.value == item){
+					arr.splice(index,1)
+				}
+			})
+			if(e.detail.value){
+				arr.unshift(e.detail.value)  
+				uni.setStorage({
+				   key: 'searchStorage',
+				   data: arr
+				});
+			}
+		}
+		
 	})
 };
+const StorageList=()=>{
+	let getlist =  uni.getStorageSync('searchStorage');
+	if(getlist.length){
+		searchStorage.value = getlist;
+	}
+}
 onLoad((options) => {
 	focus.value = true;
 	updatePageWidth();
 });
-onShow(() => {});
+onShow(() => {
+	StorageList();
+	api_searchkeyword();
+});
 onReady(()=>{})
 onPullDownRefresh(()=>{})
 onReachBottom(()=>{})
diff --git a/userserve/favorite/favorite.vue b/userserve/favorite/favorite.vue
index 8c63a2f..f33c00c 100644
--- a/userserve/favorite/favorite.vue
+++ b/userserve/favorite/favorite.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="main">
-	 <view class="list" v-for="(item,index) in shop_list" :key="index">
+	 <view class="list" v-for="(item,index) in shop_list" :key="index" @click="shopDetail(item)">
 		 <view class="list_l">
 			 <image class="list_img" :src="item.image" mode="widthFix"></image>
 		 </view>
@@ -12,7 +12,7 @@
 			 </view> -->
 			 <view class="list_bottom">
 			 	<view class="list_price price">{{item.price}}</view>
-			 	<view class="list_shop_cart">
+			 	<view class="list_shop_cart" @click.stop="addCart(item,1)">
 			 		<image class="list_cart_img" src="../../static/oncatr01.png" mode="widthFix"></image>
 			 	</view>
 			 </view>
@@ -25,6 +25,11 @@
 		</view>
 	</view>
 	<view v-else class="load_desc">{{decs}}</view>
+	<multi
+	ref="shopData"
+	@add-success="handleAddSuccess"
+	@add-error="handleAddError"
+	></multi>
   </view>
 </template>
 
@@ -34,6 +39,7 @@ import { useCounterStore } from '@/store/counter'; // 引入 Pinia Store
 import { storeToRefs } from 'pinia';//实现解构付值
 import { onLoad,onShow,onPullDownRefresh,onPageScroll,onReachBottom,onReady } from "@dcloudio/uni-app"
 import { collectuser } from "@/server/api.js"
+import multi from '@/components/multi/multi.vue'
 const counterStore = useCounterStore(); // 使用 Store
 const { proxy } = getCurrentInstance();
 const shop_list = ref([])
@@ -41,6 +47,7 @@ const img_err = ref("");
 const decs = ref('');
 const pages = ref(0);
 const limits = ref(10);
+const shopData = ref({});
 //使用pinia：storeToRefs方法包裹(保持响应式更新，不使用视图无法更新)
 const {statusHeight,headerHeight,statusBartop,ButtonWidth,ButtonHeight } = storeToRefs(counterStore);
 const api_collectuser=()=>{
@@ -54,8 +61,8 @@ const api_collectuser=()=>{
 	return collectuser(params).then(({data}) => {
 		decs.value = '—— 上拉加载更多 ——';
 		shop_list.value = shop_list.value.concat(data.list);
-		if(pages.value == 1 && !data.list.length){
-			img_err.value = "../../static/Empty/order_lisr_img.png"
+		if(!shop_list.value.length){
+			img_err.value = "../../static/Empty/collect.png"
 			decs.value = "—— 暂无收藏记录 ——"
 		}else if(data.list.length < 10){
 			decs.value = '—— 嗷呜，已经到底啦 ——';
@@ -65,6 +72,19 @@ const api_collectuser=()=>{
 		decs.value = `—— ${message||'网络异常'} ——`;
 	})
 }
+//加购物车
+const addCart=(i,type)=>{
+	shopData.value.addCart(i,type);
+}
+const shopDetail = (item) =>{
+	uni.navigateTo({
+		url:`/shopProDetail/detail/detail?id=${item.productId}`//商品详情
+	})
+}
+// 加入购物车成功回调
+const handleAddSuccess = (data) => {}
+// 加入购物车失败回调
+const handleAddError = (error) => {}
 onLoad((options) => {
 	api_collectuser();
 });
diff --git a/userserve/useredit/useredit.vue b/userserve/useredit/useredit.vue
new file mode 100644
index 0000000..ac49528
--- /dev/null
+++ b/userserve/useredit/useredit.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="main">
+		<view class="list" @click="chooseImage()">
+			<view class="list_l">头像</view>
+			<view class="list_r list_arrow"><image class="list_img" :src="avatar" mode="widthFix"></image></view>
+		</view>
+		<view class="list">
+			<view class="list_l">昵称</view>
+			<view class="list_r">
+				<input class="list_input" type="text" v-model="nickname" placeholder="请输入昵称"/>
+			</view>
+		</view>
+		<view class="list">
+			<view class="list_l">手机号</view>
+			<view class="list_r">
+				<input class="list_input"  type="text" v-model="phone" placeholder="请输入手机号"/>
+			</view>
+		</view>
+		<view class="footer">
+			<view class="footer_btn" @click="api_useredit()">保存</view>
+		</view>
+	</view>
+</template>
+<script setup>
+import { url }  from '@/server/config.js'
+import { loads } from '@/utils/index.js'
+import { frontuser,useredit } from '@/server/api.js'
+import { computed,ref,onMounted } from 'vue';
+import { useCounterStore } from '@/store/counter'; // 引入 Pinia Store
+import { storeToRefs } from 'pinia';//实现解构付值
+import { onLoad,onShow,onPullDownRefresh,onReachBottom } from "@dcloudio/uni-app"
+const counterStore = useCounterStore(); // 使用 Store
+//使用pinia：storeToRefs方法包裹(保持响应式更新，不使用视图无法更新)
+const { statusHeight,headerHeight,token } = storeToRefs(counterStore);
+const user = ref(false);
+const avatar = ref("")
+const nickname = ref("")
+const phone = ref("");
+const api_frontuser = () => {
+	return frontuser().then(({data})=>{
+		avatar.value = data.avatar;
+		nickname.value = data.nickname;
+		phone.value = data.phone;
+	}).catch(({message}) => {
+		uni.showModal({
+			content:message,
+			showCancel: false
+		})
+	})
+}
+//选择图片
+const chooseImage = () => {
+  uni.chooseImage({
+    count: 1, // 最多选择1张
+    sizeType: ['original', 'compressed'], // 可选择原图或压缩图
+    sourceType: ['album', 'camera'], // 可从相册或相机选择
+    success: (res) => {
+	  api_uploadimage(res.tempFilePaths);
+    },
+    fail: (err) => {
+      console.error('选择图片失败:', err);
+    }
+  });
+}
+//接口上传图片拿到图片url
+const api_uploadimage = (tempFilePaths) =>{
+  console.log('地址',url);
+  loads('上传中', true)
+  uni.uploadFile({
+    url:url+'/api/front/user/upload/image', // 替换为你的接口地址
+    filePath: tempFilePaths[0], // 图片临时路径
+    name: 'multipart', // 后端接收文件的字段名
+	header: {
+		'Authori-zation':token.value// 身份令牌
+	},
+    formData: { // 附加的其他参数
+      model: 'wechat',
+      pid: '8'
+    },
+    success: (res) => {
+	  uni.hideLoading()
+      const data = JSON.parse(res.data); // 解析后端返回的数据
+	  avatar.value = data.data.url;
+    },
+    fail: (err) => {
+	  uni.hideLoading()
+      console.error('上传失败:', err);
+    }
+  })
+}
+const api_useredit = () => {
+	const params = {
+		avatar:avatar.value,
+		nickname:nickname.value,
+		phone:phone.value
+	}
+	loads('', true)
+	return useredit(params).then(({message})=>{
+		uni.hideLoading();
+		uni.showToast({
+			title:message,
+			icon:'success',
+			success: () => {
+				setTimeout(()=>{
+					uni.navigateBack({
+						delta:1
+					})
+				},1400)
+			}
+		})
+	}).catch(({message}) => {
+		uni.hideLoading();
+		uni.showModal({
+			content:message,
+			showCancel: false
+		})
+	})
+}
+//生命周期钩子
+onMounted(() => {
+	api_frontuser();
+});
+onLoad((options) => {
+	
+});
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #f6f6f6;
+	}
+	.main{
+		margin: 20rpx 0 0 0;
+		background-color: #FFFFFF;
+		.list{
+			margin: 0 20rpx 0 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 1rpx solid #f6f6f6;
+			padding-top: 15rpx;
+			padding-bottom: 15rpx;
+			.list_l{
+				font-size: 28rpx;
+				color: #333333;
+				height: 100%;
+				display: flex;
+				align-items: center;
+			}
+			.list_r{
+				.list_img{
+					width: 130rpx;
+					height: 130rpx;
+					background-color: #f6f6f6;
+					border-radius: 80rpx;
+					display: block;
+				}
+				.list_input{
+					width: 200rpx;
+					height: 80rpx;
+					display: flex;
+					align-items: center;
+					text-align: right;
+				}
+			}
+			.list_arrow{
+				margin-right: 20rpx;
+				position: relative;
+			}
+			.list_arrow::after{
+				content: "";
+				position: absolute;
+				top: 50%;
+				left: 100%;
+				transform: translate3d(0,-50%,0) rotate(45deg);
+				width: 20rpx;
+				height: 20rpx;
+				border-top: 3rpx solid #999999;
+				border-right: 3rpx solid #999999;
+				border-top-width: 1px;
+				border-top-style: solid;
+				border-top-color: rgb(153, 153, 153);
+				border-right-width: 1px;
+				border-right-style: solid;
+				border-right-color: rgb(153, 153, 153);
+			}
+		}
+		.footer {
+		    position: fixed;
+		    left: 0;
+		    right: 0;
+		    bottom: 0;
+		    z-index: 160;
+		    background: #FFFFFF;
+		    font-size: 30rpx;
+		    padding-bottom: env(safe-area-inset-bottom);
+		    display: flex;
+		    justify-content: space-between;
+		    align-items: center;
+		    padding-top: 20rpx;
+		    padding-left: 20rpx;
+		    padding-right: 20rpx;
+		    border-top: 1rpx solid #efefef;
+			.footer_btn {
+			    width: 100%;
+			    height: 85rpx;
+			    background-color: #fd3f3f;
+			    border-radius: 50rpx;
+			    color: #fff;
+			    display: flex;
+			    align-items: center;
+			    justify-content: center;
+			    font-weight: 500;
+			    font-size: 28rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file