From 134facabb2f56a2379f60372e00301778b200f55 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Wed, 12 Mar 2025 22:11:26 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.12=20=E5=B7=A5=E4=BD=9C=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/api/shop.js                            |  24 ++
 jiuyi2/common/js/config.js                    |   2 +-
 jiuyi2/components/index/proDetailAlt.vue      |   3 +
 jiuyi2/components/shop/detail/detail.vue      |  23 +-
 jiuyi2/components/shop/detail/footerMenu.vue  | 212 +++++-----
 .../shop/productList/productList.vue          |  49 +--
 jiuyi2/pages.json                             |   3 +-
 jiuyi2/pages/index/durian.vue                 |   4 +-
 jiuyi2/pages/mine/mine.vue                    | 215 +++++-----
 jiuyi2/pages/mine/setting/bankCard.vue        |   3 +-
 jiuyi2/pages/mine/userinfo.vue                | 282 +++++++------
 jiuyi2/pages/shop/commodity/index.vue         |  24 +-
 jiuyi2/pages/shop/shop.vue                    |   2 +-
 jiuyi2/pages/shop/store/index.vue             | 392 +++++++++---------
 14 files changed, 633 insertions(+), 605 deletions(-)

diff --git a/jiuyi2/api/shop.js b/jiuyi2/api/shop.js
index 80c4d1a7..15e3744d 100644
--- a/jiuyi2/api/shop.js
+++ b/jiuyi2/api/shop.js
@@ -110,6 +110,18 @@ const shop = {
 		})
 	},
 
+	/**
+	 * 商品详情下面的商品推荐
+	 * @param {Object} param
+	 */
+	getInfoProductRecommendations(param) {
+		return util.request({
+			url: `/shopify/appProductionApi/infoProductRecommendations`,
+			method: 'GET',
+			query: param.query
+		})
+	},
+
 	/**
 	 * 商品分类列表
 	 * @param {Object} param
@@ -134,6 +146,18 @@ const shop = {
 		})
 	},
 
+	/**
+	 * 个人中心下面的商品推荐
+	 * @param {Object} param
+	 */
+	getMineUserProList(param) {
+		return util.request({
+			url: `/shopify/appProductionApi/personalCenterProductRecommendations`,
+			method: 'GET',
+			query: param.query,
+		})
+	},
+
 	/**
 	 * 添加商品浏览记录
 	 * @param {Object} param
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 7bba64c9..36cfa819 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -9,7 +9,7 @@ const config = {
 	host: 'http://91f.xyz:8080',
 	// #endif
 	// 是否vivo显示
-	showVivo: false,
+	showVivo: true,
 	// 支付方式配置
 	payType: {
 		score: {
diff --git a/jiuyi2/components/index/proDetailAlt.vue b/jiuyi2/components/index/proDetailAlt.vue
index 805c3530..a6ab7c5e 100644
--- a/jiuyi2/components/index/proDetailAlt.vue
+++ b/jiuyi2/components/index/proDetailAlt.vue
@@ -126,6 +126,9 @@
 				<view class="main">
 					<!-- 获取详情 -->
 					<proDetail :id="proId" :detail="detail" />
+
+					<!-- 填充 -->
+					<view class="fill" style="height: 180rpx;"></view>
 				</view>
 			</scroll-view>
 
diff --git a/jiuyi2/components/shop/detail/detail.vue b/jiuyi2/components/shop/detail/detail.vue
index f4d34dc3..569fe3ee 100644
--- a/jiuyi2/components/shop/detail/detail.vue
+++ b/jiuyi2/components/shop/detail/detail.vue
@@ -49,23 +49,6 @@
 	})
 	// 最近购买订单列表
 	const recentOrderList = ref([])
-	// 
-	const menuFn = {
-		// 店铺
-		store() {
-			link('/pages/shop/store/index')
-		},
-		// 客服
-		customerService() {
-			link('/pages/news/question-answer/index')
-		},
-		// 收藏
-		heibianStar() {
-			// 
-		}
-	}
-	// 编辑器上下文对象
-	const editorCtx = ref(null)
 	// 已选择的规格下标
 	const spaceIndex = ref(0)
 	// 数量
@@ -94,7 +77,6 @@
 		let result = ''
 		const richText = props.detail.infoRichText || ''
 		if (richText) result = decodeURIComponent(escape(atob(richText)))
-		console.log('richText', result, decodeURIComponent(escape(atob(richText))))
 		return result
 	})
 
@@ -378,12 +360,9 @@
 		<!-- 商品详情 -->
 		<view class="content mt30">
 			<!-- <rich-text :nodes="infoRichText" v-if="infoRichText" /> -->
-			<parseRichText :imageProp="{'mode': 'widthFix',}" :content="infoRichText" />
+			<parseRichText :imageProp="{'mode': 'widthFix',}" :content="infoRichText" v-if="infoRichText" />
 		</view>
 	</view>
-
-	<!-- 填充 -->
-	<view class="fill" style="height: 180rpx;"></view>
 </template>
 
 <style lang="scss">
diff --git a/jiuyi2/components/shop/detail/footerMenu.vue b/jiuyi2/components/shop/detail/footerMenu.vue
index 5b603a0f..9574cdae 100644
--- a/jiuyi2/components/shop/detail/footerMenu.vue
+++ b/jiuyi2/components/shop/detail/footerMenu.vue
@@ -1,113 +1,113 @@
 <script setup>
-// 店铺 客服 收藏 支付
-import {
-	ref,
-	reactive,
-	getCurrentInstance,
-	computed,
-	defineEmits,
-	onMounted
-} from 'vue'
-// 
-import util from '@/common/js/util.js'
-// 
-import api from '@/api/index.js'
-// 
-import {
-	useStore
-} from 'vuex'
+	// 店铺 客服 收藏 支付
+	import {
+		ref,
+		reactive,
+		getCurrentInstance,
+		computed,
+		defineEmits,
+		onMounted
+	} from 'vue'
+	// 
+	import util from '@/common/js/util.js'
+	// 
+	import api from '@/api/index.js'
+	// 
+	import {
+		useStore
+	} from 'vuex'
 
-const {
-	proxy
-} = getCurrentInstance()
-// 
-const store = useStore()
-// 
-const props = defineProps({
-	// 商品信息
-	detail: {
-		type: Object,
-		default: () => ({})
-	},
-})
-// 
-const emit = defineEmits(['update', 'buy'])
-// 用户信息
-const userinfo = computed(() => store.state.userinfo)
+	const {
+		proxy
+	} = getCurrentInstance()
+	// 
+	const store = useStore()
+	// 
+	const props = defineProps({
+		// 商品信息
+		detail: {
+			type: Object,
+			default: () => ({})
+		},
+	})
+	// 
+	const emit = defineEmits(['update', 'buy'])
+	// 用户信息
+	const userinfo = computed(() => store.state.userinfo)
 
-// 商品收藏
-function handleCollect() {
-	util.isLogin().then(rs => {
-		// 
-		api.shop.addProductCollect({
-			query: {
-				productId: props.detail.id,
-				type: {
-					0: 1,
-					1: 0,
-				}[props.detail.isCollect]
-			}
-		}).then(rs => {
-			if (rs.code == 200) {
-				// 关注状态
-				props.detail.isCollect = {
-					0: 1,
-					1: 0,
-				}[props.detail.isCollect]
-				// 关注数量
-				props.detail.collectNumber = rs.data
-				return
-			}
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
+	// 商品收藏
+	function handleCollect() {
+		util.isLogin().then(rs => {
+			// 
+			api.shop.addProductCollect({
+				query: {
+					productId: props.detail.id,
+					type: {
+						0: 1,
+						1: 0,
+					} [props.detail.isCollect]
+				}
+			}).then(rs => {
+				if (rs.code == 200) {
+					// 关注状态
+					props.detail.isCollect = {
+						0: 1,
+						1: 0,
+					} [props.detail.isCollect]
+					// 关注数量
+					props.detail.collectNumber = rs.data
+					return
+				}
+				util.alert({
+					content: rs.msg,
+					showCancel: false,
+				})
+			})
+		}).catch(() => {
+			// 登录
+			uni.navigateTo({
+				url: '/pages/login/loginPhone'
 			})
 		})
-	}).catch(() => {
-		// 登录
+	}
+
+	/**
+	 * 跳转
+	 * @param {Object} url 跳转路径
+	 */
+	function link(url) {
 		uni.navigateTo({
-			url: '/pages/login/loginPhone'
+			url,
 		})
-	})
-}
+	}
 
-/**
- * 跳转
- * @param {Object} url 跳转路径
- */
-function link(url) {
-	uni.navigateTo({
-		url,
-	})
-}
-
-// 商品购买
-function handleBuy() {
-	emit('buy')
-}
+	// 商品购买
+	function handleBuy() {
+		emit('buy')
+	}
 
 
-// 客服
-function toCustomer() {
-	// api.shop.getCustomerService({ merchantId: props.detail.merId }).then(rs => {
-	// 	if (rs.code == 200) {
-	// 		let param = {};
-	// 		param.type = 'C2C'
-	// 		param.name = `${props.detail.merName}`
-	// 		param.msgId = `${rs.data.serviceId}`
-	// 		param.isCustomer = true
+	// 客服
+	function toCustomer() {
+		// api.shop.getCustomerService({ merchantId: props.detail.merId }).then(rs => {
+		// 	if (rs.code == 200) {
+		// 		let param = {};
+		// 		param.type = 'C2C'
+		// 		param.name = `${props.detail.merName}`
+		// 		param.msgId = `${rs.data.serviceId}`
+		// 		param.isCustomer = true
 
-	// 		util.toChat(param)
+		// 		util.toChat(param)
 
-	// 		uni.navigateTo({
-	// 			url: util.setUrl('/pages/news/chat/chat', param)
-	// 		})
-	// 	} else {
-	// 		util.alert(rs.msg)
-	// 	}
-	// })
+		// 		uni.navigateTo({
+		// 			url: util.setUrl('/pages/news/chat/chat', param)
+		// 		})
+		// 	} else {
+		// 		util.alert(rs.msg)
+		// 	}
+		// })
 
-}
+	}
 </script>
 
 <template>
@@ -144,17 +144,17 @@ function toCustomer() {
 </template>
 
 <style scoped lang="scss">
-// 底部菜单
-.footerMneu {
+	// 底部菜单
+	.footerMneu {
 
-	// 选项
-	.option {
-		width: 80rpx;
+		// 选项
+		.option {
+			width: 80rpx;
 
-		.text {
-			color: #999;
-			font-size: 24rpx;
+			.text {
+				color: #999;
+				font-size: 24rpx;
+			}
 		}
 	}
-}
 </style>
\ No newline at end of file
diff --git a/jiuyi2/components/shop/productList/productList.vue b/jiuyi2/components/shop/productList/productList.vue
index c786f718..5d112806 100644
--- a/jiuyi2/components/shop/productList/productList.vue
+++ b/jiuyi2/components/shop/productList/productList.vue
@@ -16,24 +16,23 @@
 		choicenessTitle: {
 			type: Boolean,
 			default: false,
-		}
+		},
+		requestFn: {
+			type: Function,
+			default: (ev) => {
+				return api.shop.getProduct(ev)
+			}
+		},
 	})
 
-	// 参数
+	// 商品列表参数
 	const listPrototype = reactive({
 		pageSize: 10,
 		pageNum: 1,
 		total: 0,
-		// 搜索
-		searchValue: '',
-		// 商户主键
-		merId: '',
-		// 品牌主键
-		brandId: '',
-		// 分类code
-		categoryCode: '',
-		data: [],
 	})
+	// 商品列表
+	const list = reactive([])
 
 	/**
 	 * 点击列表项
@@ -43,7 +42,8 @@
 		// 
 		uni.navigateTo({
 			url: util.setUrl('/pages/shop/commodity/index', {
-				productId: item.id
+				productId: item.id,
+				categoryId: item.categoryId,
 			})
 		})
 	}
@@ -64,24 +64,18 @@
 
 	// 获取商品
 	function getList() {
-		api.shop.getProduct({
-			// 
+		console.log('listPrototype', listPrototype)
+		props.requestFn({
 			data: {
-				pageSize: listPrototype.pageSize,
-				pageNum: listPrototype.pageNum,
-				// 搜索
-				searchValue: listPrototype.searchValue,
-				// 商户主键
-				merId: listPrototype.merId,
-				// 品牌主键
-				brandId: listPrototype.brandId,
-				// 分类code
-				categoryCode: listPrototype.categoryCode,
+				...listPrototype,
+			},
+			query: {
+				...listPrototype,
 			},
 		}).then(rs => {
 			if (rs.code == 200) {
-				if (listPrototype.pageNum == 1) listPrototype.data.length = []
-				listPrototype.data.push(...rs.rows)
+				if (listPrototype.pageNum == 1) list.length = []
+				list.push(...rs.rows)
 				listPrototype.total = rs.total
 				return
 			}
@@ -111,8 +105,7 @@
 	</view>
 
 	<view class="list">
-		<view class="item oh bfff br20" v-for="(item, index) in listPrototype.data" :key="index"
-			@click="handleItem(item)">
+		<view class="item oh bfff br20" v-for="(item, index) in list" :key="index" @click="handleItem(item)">
 			<!-- 需要展示的图 -->
 			<image class="poster" :src="item.sliderImage.split(',')[0]" mode="aspectFill" />
 
diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json
index 781ae621..0b6dd18a 100644
--- a/jiuyi2/pages.json
+++ b/jiuyi2/pages.json
@@ -96,7 +96,8 @@
 			"path": "pages/mine/mine",
 			"style": {
 				"navigationBarTitleText": "我的",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
diff --git a/jiuyi2/pages/index/durian.vue b/jiuyi2/pages/index/durian.vue
index 4c591c8f..7dc97135 100644
--- a/jiuyi2/pages/index/durian.vue
+++ b/jiuyi2/pages/index/durian.vue
@@ -65,9 +65,7 @@
 		return result
 	})
 	// 我的钱包
-	const purse = computed(() => {
-		return store.state.purse || {}
-	})
+	const purse = computed(() => store.state.purse || {})
 
 	// 榴莲果配置
 	const configData = reactive({
diff --git a/jiuyi2/pages/mine/mine.vue b/jiuyi2/pages/mine/mine.vue
index 0035d409..10d358e9 100644
--- a/jiuyi2/pages/mine/mine.vue
+++ b/jiuyi2/pages/mine/mine.vue
@@ -1,59 +1,79 @@
 <script setup>
-/**
- * 个人中心 商城
- */
-// 底部菜单
-import {
-	ref,
-	computed,
-} from 'vue'
-import {
-	onReachBottom,
-	onPullDownRefresh,
-	onShow,
-	onLoad,
-	onPageScroll
-} from '@dcloudio/uni-app';
-import {
-	useStore
-} from 'vuex'
-// 顶部状态栏
-import statusBar from '@/components/header/statusBar'
-// 未登录状态
-import noLogin from '@/components/login/noLogin'
+	/**
+	 * 个人中心 商城
+	 */
+	// 底部菜单
+	import {
+		ref,
+		computed,
+		getCurrentInstance
+	} from 'vue'
+	import {
+		onReachBottom,
+		onPullDownRefresh,
+		onShow,
+		onLoad,
+		onReady,
+		onPageScroll,
+	} from '@dcloudio/uni-app';
+	import {
+		useStore
+	} from 'vuex'
+	// 顶部状态栏
+	import statusBar from '@/components/header/statusBar'
+	// 未登录状态
+	import noLogin from '@/components/login/noLogin'
 
-// 产品列表
-import productList from '@/components/shop/productList/productList';
-// 底部导航
-import footerMneu from '@/components/footerMenu/footerMenu'
-// 
-import util from '@/common/js/util';
-// 
-const store = useStore()
-// 用户信息
-const userinfo = computed(() => {
-	let result = store.state.userinfo || {}
-	return result
-})
-// 是否显示顶部
-const showHeader = ref(false)
+	// 产品列表
+	import productList from '@/components/shop/productList/productList';
+	// 底部导航
+	import footerMneu from '@/components/footerMenu/footerMenu'
+	// 工具库
+	import util from '@/common/js/util';
+	// 
+	import api from '@/api/index.js'
 
-onPageScroll((ev) => {
-	if (ev.scrollTop > 44) showHeader.value = true
-	else showHeader.value = false
-})
+	const {
+		proxy
+	} = getCurrentInstance()
+	// 
+	const store = useStore()
+	// 用户信息
+	const userinfo = computed(() => store.state.userinfo || {})
+	// 是否显示顶部
+	const showHeader = ref(false)
 
-// 跳转
-function link(url) {
-	uni.navigateTo({
-		url,
+	onReady(() => {
+		util.isLogin().then(rs => {
+			proxy.$refs.productListRef.getList()
+		})
 	})
-}
-function toCustomer() { 
-	uni.navigateTo({
-		url: util.setUrl('/pages/mine/setting/feedback')
+
+	onReachBottom(() => {
+		proxy.$refs.productListRef.getMoreList()
 	})
-}
+
+	onPullDownRefresh(() => {
+		proxy.$refs.productListRef.refreshList()
+	})
+
+	onPageScroll((ev) => {
+		if (ev.scrollTop > 44) showHeader.value = true
+		else showHeader.value = false
+	})
+
+	// 跳转
+	function link(url) {
+		uni.navigateTo({
+			url,
+		})
+	}
+
+	function toCustomer() {
+		uni.navigateTo({
+			url: util.setUrl('/pages/mine/setting/feedback')
+		})
+	}
 </script>
 
 <template>
@@ -211,7 +231,8 @@ function toCustomer() {
 
 		<!-- 精选 -->
 		<view class="recommend mtb20 mlr20">
-			<productList choicenessTitle="true"></productList>
+			<productList ref="productListRef" :choicenessTitle="true" :requestFn="api.shop.getMineUserProList">
+			</productList>
 		</view>
 	</view>
 
@@ -220,55 +241,55 @@ function toCustomer() {
 </template>
 
 <style lang="scss" scoped>
-// 
-.apex {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 10;
-	opacity: 0;
-	transition: .2s;
+	// 
+	.apex {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 10;
+		opacity: 0;
+		transition: .2s;
 
-	&.active {
-		opacity: 1;
-		background-color: #fff;
-	}
-}
-
-// 头部个人资料卡
-.header {
-	.avatar {
-		background: #D8D8D8;
-	}
-}
-
-// 我的钱包
-.wallet {
-	position: relative;
-
-	.right {
-
-		text {
-			font-size: 24rpx;
-			color: #999999;
-			margin-right: 20rpx;
+		&.active {
+			opacity: 1;
+			background-color: #fff;
 		}
 	}
-}
 
-// 模块
-.container {
-	position: relative;
-	overflow: hidden;
-	margin: 20rpx 20rpx;
-	padding: 0 20rpx;
-	background-color: #fff;
-	border-radius: 20rpx;
-
-	.main {
-		display: grid;
-		grid-template-columns: repeat(5, 1fr);
+	// 头部个人资料卡
+	.header {
+		.avatar {
+			background: #D8D8D8;
+		}
+	}
+
+	// 我的钱包
+	.wallet {
+		position: relative;
+
+		.right {
+
+			text {
+				font-size: 24rpx;
+				color: #999999;
+				margin-right: 20rpx;
+			}
+		}
+	}
+
+	// 模块
+	.container {
+		position: relative;
+		overflow: hidden;
+		margin: 20rpx 20rpx;
+		padding: 0 20rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+
+		.main {
+			display: grid;
+			grid-template-columns: repeat(5, 1fr);
+		}
 	}
-}
 </style>
\ No newline at end of file
diff --git a/jiuyi2/pages/mine/setting/bankCard.vue b/jiuyi2/pages/mine/setting/bankCard.vue
index 95e48fa7..c9de9b32 100644
--- a/jiuyi2/pages/mine/setting/bankCard.vue
+++ b/jiuyi2/pages/mine/setting/bankCard.vue
@@ -60,7 +60,8 @@
 	function getList() {
 		api.mine.getBankCards({}).then(rs => {
 			if (rs.code == 200) {
-				Object.assign(list, rs.data)
+				list.length = 0
+				list.push(...rs.data)
 				return
 			}
 			util.alert({
diff --git a/jiuyi2/pages/mine/userinfo.vue b/jiuyi2/pages/mine/userinfo.vue
index b442422f..3fcf31cb 100644
--- a/jiuyi2/pages/mine/userinfo.vue
+++ b/jiuyi2/pages/mine/userinfo.vue
@@ -1,144 +1,140 @@
 <script setup>
-/**
- * 个人信息
- */
-import {
-	ref,
-	computed,
-	reactive,
-} from 'vue'
-import {
-	onLoad,
-} from '@dcloudio/uni-app'
-import {
-	useStore
-} from 'vuex'
-// 工具库
-import util from '@/common/js/util';
-// 接口
-import api from '@/api';
+	/**
+	 * 个人信息
+	 */
+	import {
+		ref,
+		computed,
+		reactive,
+	} from 'vue'
+	import {
+		onLoad,
+	} from '@dcloudio/uni-app'
+	import {
+		useStore
+	} from 'vuex'
+	// 工具库
+	import util from '@/common/js/util';
+	// 接口
+	import api from '@/api';
 
-// vuex
-const store = useStore()
+	// vuex
+	const store = useStore()
 
-// 用户
-const user = reactive({})
+	// 用户
+	const user = reactive({})
 
-// 性别
-const gender = reactive([{
-	id: 0,
-	name: '男',
-},
-{
-	id: 1,
-	name: '女',
-}
-])
-// 性别下标
-const genderIndex = ref(0)
-
-onLoad(() => {
-	// 同步用户信息
-	syncInfo()
-})
-
-// 同步用户信息
-function syncInfo() {
-	// 用户信息
-	const userinfo = store.state.userinfo
-	user.background = userinfo.background
-	user.account = userinfo.account
-	user.userAccount = userinfo.userAccount
-	user.userNickname = userinfo.userNickname
-	user.homeTown = userinfo.homeTown
-	user.personalSignature = userinfo.personalSignature
-	user.id = userinfo.id + ''
-	user.birthday = userinfo.birthday
-	user.avatar = userinfo.avatar
-	user.email = userinfo.email
-	// 修改性别下标
-	genderIndex.value = gender.findIndex(item => item.id == userinfo.sex)
-}
-
-/**
- * 选择生日日期
- * @param {Object} ev 默认事件
- */
-function handleBirthday(ev) {
-	const value = ev.detail.value
-	if (user.birthday === value) return
-	user.birthday = value
-}
-
-/**
- * 选择性别
- * @param {Object} ev 默认事件
- */
-function handleGender(ev) {
-	const value = ev.detail.value
-	if (genderIndex.value === value) return
-	genderIndex.value = value
-}
-
-/**
- * 上传图片
- * @param {String} key 需要修改个人信息的字段
- */
-function uploadImg(key) {
-	util.upload_image({
-		value: user[key],
-		type: 1,
-		success: rs => {
-			// 同步值
-			user[key] = rs.value
-			console.log('user', user)
+	// 性别
+	const gender = reactive([{
+			id: 0,
+			name: '男',
+		},
+		{
+			id: 1,
+			name: '女',
 		}
+	])
+	// 性别下标
+	const genderIndex = ref(0)
+
+	onLoad(() => {
+		// 同步用户信息
+		syncInfo()
 	})
-}
 
-// 保存个人信息
-function handleSubmit() {
-	// 同步性别值
-	if (gender[genderIndex.value]) user.sex = gender[genderIndex.value].id
-
-	if (!IsEmail(user.email)) {
-		util.alert('邮箱格式不正确！')
-		return
+	// 同步用户信息
+	function syncInfo() {
+		// 用户信息
+		const userinfo = store.state.userinfo
+		user.background = userinfo.background
+		user.account = userinfo.account
+		user.userAccount = userinfo.userAccount
+		user.userNickname = userinfo.userNickname
+		user.homeTown = userinfo.homeTown
+		user.personalSignature = userinfo.personalSignature
+		user.id = userinfo.id + ''
+		user.birthday = userinfo.birthday
+		user.avatar = userinfo.avatar
+		user.email = userinfo.email
+		// 修改性别下标
+		genderIndex.value = gender.findIndex(item => item.id == userinfo.sex)
 	}
 
-	const data = {
-		...user,
+	/**
+	 * 选择生日日期
+	 * @param {Object} ev 默认事件
+	 */
+	function handleBirthday(ev) {
+		const value = ev.detail.value
+		if (user.birthday === value) return
+		user.birthday = value
 	}
 
-	// 去域名地址
-	// if(data.avatar) data.avatar = util.replace_url(data.avatar)
-	// if(data.background) data.background = util.replace_url(data.background)
+	/**
+	 * 选择性别
+	 * @param {Object} ev 默认事件
+	 */
+	function handleGender(ev) {
+		const value = ev.detail.value
+		if (genderIndex.value === value) return
+		genderIndex.value = value
+	}
 
-	// 
-	api.mine.updateUserInfo({
-		data,
-	}).then(rs => {
-		if (rs.code === 200) {
-			store.commit('setState', {
-				key: 'userinfo',
-				value: Object.assign(store.state.userinfo, user)
-			})
+	/**
+	 * 上传图片
+	 * @param {String} key 需要修改个人信息的字段
+	 */
+	function uploadImg(key) {
+		util.upload_image({
+			value: user[key],
+			type: 1,
+			success: rs => {
+				// 同步值
+				user[key] = rs.value
+				console.log('user', user)
+			}
+		})
+	}
 
-			util.alert('修改成功')
+	// 保存个人信息
+	function handleSubmit() {
+		// 同步性别值
+		if (gender[genderIndex.value]) user.sex = gender[genderIndex.value].id
+
+		if (user.email && !IsEmail(user.email)) {
+			util.alert('邮箱格式不正确！')
 			return
 		}
-		util.alert({
-			content: rs.msg,
-			showCancel: false,
-		})
-	})
-}
-// 校验邮箱地址
-function IsEmail(str) {
-	var reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
-	return reg.test(str);
-}
 
+		const data = {
+			...user,
+		}
+
+		// 
+		api.mine.updateUserInfo({
+			data,
+		}).then(rs => {
+			if (rs.code === 200) {
+				store.commit('setState', {
+					key: 'userinfo',
+					value: Object.assign(store.state.userinfo, user)
+				})
+
+				util.alert('修改成功')
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		})
+	}
+
+	// 校验邮箱地址
+	function IsEmail(str) {
+		var reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
+		return reg.test(str);
+	}
 </script>
 
 <template>
@@ -233,26 +229,26 @@ function IsEmail(str) {
 </template>
 
 <style lang="scss" scoped>
-// 背景
-.bgBox {
-	.content {
-		height: 400rpx;
+	// 背景
+	.bgBox {
+		.content {
+			height: 400rpx;
+		}
+
+		// 修改背景
+		.changeBg {
+			background-color: rgba(0, 0, 0, .3);
+		}
 	}
 
-	// 修改背景
-	.changeBg {
-		background-color: rgba(0, 0, 0, .3);
+	// 头像
+	.avatarBox {
+		padding: 2rpx;
+		background-color: #fff;
 	}
-}
 
-// 头像
-.avatarBox {
-	padding: 2rpx;
-	background-color: #fff;
-}
-
-// 资料
-.info {
-	margin-top: -20rpx;
-}
+	// 资料
+	.info {
+		margin-top: -20rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/jiuyi2/pages/shop/commodity/index.vue b/jiuyi2/pages/shop/commodity/index.vue
index 5856a830..ec7c25ee 100644
--- a/jiuyi2/pages/shop/commodity/index.vue
+++ b/jiuyi2/pages/shop/commodity/index.vue
@@ -39,13 +39,16 @@
 	const id = ref('')
 	// 产品详情
 	const detail = reactive({})
+	// 分类id
+	const categoryId = ref('')
 	// 当前登录的用户信息
-	const userinfo = computed(() => {
-		return store.state.userinfo
-	})
+	const userinfo = computed(() => store.state.userinfo)
 
 	onLoad(option => {
+		// 商品id
 		if (option.productId) id.value = option.productId
+		// 分类id
+		if (option.categoryId) categoryId.value = option.categoryId
 		// 获取产品详情
 		getDetail()
 		// 添加商品浏览记录
@@ -55,7 +58,13 @@
 	})
 
 	onReady(() => {
-		// 
+		// 分类id
+		if (categoryId.value) {
+			proxy.$refs.productListRef.listPrototype.categoryId = categoryId.value
+			proxy.$refs.productListRef.listPrototype.productId = id.value
+			// 获取推荐列表
+			proxy.$refs.productListRef.getList()
+		}
 	})
 
 	// 销毁监听
@@ -72,7 +81,6 @@
 	function addListener() {
 		// 监听商品详情
 		uni.$on('commodityDetail', (data) => {
-			// 
 			if (detail.id == data.id) getDetail()
 		})
 	}
@@ -186,9 +194,13 @@
 		<proDetail :id="id" :detail="detail" />
 		<!-- 精选 -->
 		<view class="recommend mlr20">
-			<productList :choicenessTitle="true" />
+			<productList ref="productListRef" :choicenessTitle="true"
+				:requestFn="api.shop.getInfoProductRecommendations" />
 		</view>
 
+		<!-- 填充 -->
+		<view class="fill" style="height: 180rpx;"></view>
+
 		<!-- 底部菜单 -->
 		<view class="footer plr20 shadow bfff">
 			<footerMenu :detail="detail" @update="handleDetail" @buy="showMakeOrder" />
diff --git a/jiuyi2/pages/shop/shop.vue b/jiuyi2/pages/shop/shop.vue
index a9398092..2385fc20 100644
--- a/jiuyi2/pages/shop/shop.vue
+++ b/jiuyi2/pages/shop/shop.vue
@@ -89,7 +89,7 @@
 		if (cateIndex.value === index) return
 		cateIndex.value = index
 		// 分类
-		proxy.$refs.product.listPrototype.categoryCode = cateList[index].categoryCode
+		proxy.$refs.product.listPrototype.categoryId = cateList[index].id
 		// 重载列表
 		proxy.$refs.product.refreshList()
 	}
diff --git a/jiuyi2/pages/shop/store/index.vue b/jiuyi2/pages/shop/store/index.vue
index 93bd251d..12608317 100644
--- a/jiuyi2/pages/shop/store/index.vue
+++ b/jiuyi2/pages/shop/store/index.vue
@@ -1,198 +1,198 @@
 <script setup>
-// 店铺首页
-import {
-	computed,
-	reactive,
-	ref,
-	defineExpose,
-} from 'vue'
-import {
-	onLoad,
-	onPageScroll
-} from '@dcloudio/uni-app';
+	// 店铺首页
+	import {
+		computed,
+		reactive,
+		ref,
+		defineExpose,
+	} from 'vue'
+	import {
+		onLoad,
+		onPageScroll
+	} from '@dcloudio/uni-app';
 
-// 工具库
-import util from '@/common/js/util.js'
-// 顶部
-import apex from '@/components/header/apex.vue'
-// 商品列表
-import productList from '@/components/shop/productList/productList'
+	// 工具库
+	import util from '@/common/js/util.js'
+	// 顶部
+	import apex from '@/components/header/apex.vue'
+	// 商品列表
+	import productList from '@/components/shop/productList/productList'
 
-import api from '@/api/index.js'
+	import api from '@/api/index.js'
 
-// 分类选项
-const filteredList = ref([{
-	label: '默认',
-	value: 1,
-	isUpDown: false,
-	slot: null
-}, {
-	label: '销量',
-	value: 2,
-	isUpDown: false,
-	slot: null
-}, {
-	label: '新品',
-	value: 3,
-	isUpDown: false,
-	slot: null
-}, {
-	label: '价格',
-	value: 4,
-	isUpDown: true,
-	slot: null
-}])
-// 顶部导航背景颜色
-const apexBgColor = ref('#ffffff00')
-// 店铺id
-const storeId = ref('')
-// 详情
-const detail = reactive({})
-// 参数
-const listPrototype = reactive({
-	pageSize: 10,
-	pageNum: 1,
-	total: 0,
-	// 商户主键
-	merId: '',
-	data: [],
-})
-
-// 用户信息
-const userinfo = computed(() => uni.$store.state.userinfo || {})
-onLoad((option) => {
-	if (option.storeId) storeId.value = option.storeId
-	getDetail()
-	listPrototype.merId = storeId.value
-	getList()
-})
-
-onPageScroll((ev) => {
-	apexBgColor.value = ev.scrollTop > 44 ? '#fff' : '#ffffff00'
-})
-
-// 获取店铺详情
-function getDetail() {
-	api.shop.merchant({
-		query: {
-			merId: storeId.value,
-			userId: userinfo.value.id,
-		}
-	}).then(rs => {
-		if (rs.code == 200) {
-			Object.assign(detail, {}, rs.data)
-			return
-		}
-		util.alert({
-			content: rs.msg,
-			showCancel: false
-		});
+	// 分类选项
+	const filteredList = ref([{
+		label: '默认',
+		value: 1,
+		isUpDown: false,
+		slot: null
+	}, {
+		label: '销量',
+		value: 2,
+		isUpDown: false,
+		slot: null
+	}, {
+		label: '新品',
+		value: 3,
+		isUpDown: false,
+		slot: null
+	}, {
+		label: '价格',
+		value: 4,
+		isUpDown: true,
+		slot: null
+	}])
+	// 顶部导航背景颜色
+	const apexBgColor = ref('#ffffff00')
+	// 店铺id
+	const storeId = ref('')
+	// 详情
+	const detail = reactive({})
+	// 参数
+	const listPrototype = reactive({
+		pageSize: 10,
+		pageNum: 1,
+		total: 0,
+		// 商户主键
+		merId: '',
+		data: [],
 	})
-}
-// 收藏店铺
-function handleCollectStore() {
-	api.shop.followShop({
-		data: {
-			shopId: storeId.value,
-			status: {
-				0: 1,
-				1: 0,
-			}[detail.isFollow]
-		}
-	}).then(rs => {
-		if (rs.code == 200) {
-			// 关注状态
-			detail.isFollow = {
-				0: 1,
-				1: 0,
-			}[detail.isFollow]
-			// 关注数量
-			detail.followNum = rs.data
 
-			getDetail()
-			return
-		}
-		util.alert({
-			content: rs.msg,
-			showCancel: false,
+	// 用户信息
+	const userinfo = computed(() => uni.$store.state.userinfo || {})
+	onLoad((option) => {
+		if (option.storeId) storeId.value = option.storeId
+		getDetail()
+		listPrototype.merId = storeId.value
+		getList()
+	})
+
+	onPageScroll((ev) => {
+		apexBgColor.value = ev.scrollTop > 44 ? '#fff' : '#ffffff00'
+	})
+
+	// 获取店铺详情
+	function getDetail() {
+		api.shop.merchant({
+			query: {
+				merId: storeId.value,
+				userId: userinfo.value.id,
+			}
+		}).then(rs => {
+			if (rs.code == 200) {
+				Object.assign(detail, {}, rs.data)
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false
+			});
 		})
-	})
-}
-// 客服
-function toCustomer() {
-	uni.navigateTo({
-		url: util.setUrl('/pages/mine/setting/feedback')
-	})
-	// api.shop.getCustomerService({ merchantId: storeId.value }).then(rs => {
-	// 	if (rs.code == 200) {
-	// 		let param = {};
-	// 		param.type = 'C2C'
-	// 		param.name = `${detail.name}`
-	// 		param.msgId = `${rs.data.serviceId}`
-	// 		param.isCustomer = true
+	}
+	// 收藏店铺
+	function handleCollectStore() {
+		api.shop.followShop({
+			data: {
+				shopId: storeId.value,
+				status: {
+					0: 1,
+					1: 0,
+				} [detail.isFollow]
+			}
+		}).then(rs => {
+			if (rs.code == 200) {
+				// 关注状态
+				detail.isFollow = {
+					0: 1,
+					1: 0,
+				} [detail.isFollow]
+				// 关注数量
+				detail.followNum = rs.data
 
-	// 		util.toChat(param)
-
-	// 		uni.navigateTo({
-	// 			url: util.setUrl('/pages/news/chat/chat', param)
-	// 		})
-	// 	} else {
-	// 		util.alert(rs.msg)
-	// 	}
-	// })
-
-}
-// 商品列表
-function getList() {
-
-	api.shop.getProduct({
-		data: {
-			pageSize: listPrototype.pageSize,
-			pageNum: listPrototype.pageNum,
-			// 商户主键
-			merId: listPrototype.merId,
-		},
-	}).then(rs => {
-		if (rs.code == 200) {
-			if (listPrototype.pageNum == 1) listPrototype.data.length = []
-			listPrototype.data.push(...rs.rows)
-			listPrototype.total = rs.total
-			return
-		}
-		util.alert({
-			content: rs.msg,
-			showCancel: false,
+				getDetail()
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
 		})
-	}).finally(rs => {
-		uni.stopPullDownRefresh()
-	})
-}
-// 点击列表项
-function handleItem(item) {
-	uni.navigateTo({
-		url: util.setUrl('/pages/shop/commodity/index', {
-			productId: item.id
+	}
+	// 客服
+	function toCustomer() {
+		uni.navigateTo({
+			url: util.setUrl('/pages/mine/setting/feedback')
 		})
+		// api.shop.getCustomerService({ merchantId: storeId.value }).then(rs => {
+		// 	if (rs.code == 200) {
+		// 		let param = {};
+		// 		param.type = 'C2C'
+		// 		param.name = `${detail.name}`
+		// 		param.msgId = `${rs.data.serviceId}`
+		// 		param.isCustomer = true
+
+		// 		util.toChat(param)
+
+		// 		uni.navigateTo({
+		// 			url: util.setUrl('/pages/news/chat/chat', param)
+		// 		})
+		// 	} else {
+		// 		util.alert(rs.msg)
+		// 	}
+		// })
+
+	}
+	// 商品列表
+	function getList() {
+
+		api.shop.getProduct({
+			data: {
+				pageSize: listPrototype.pageSize,
+				pageNum: listPrototype.pageNum,
+				// 商户主键
+				merId: listPrototype.merId,
+			},
+		}).then(rs => {
+			if (rs.code == 200) {
+				if (listPrototype.pageNum == 1) listPrototype.data.length = []
+				listPrototype.data.push(...rs.rows)
+				listPrototype.total = rs.total
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		}).finally(rs => {
+			uni.stopPullDownRefresh()
+		})
+	}
+	// 点击列表项
+	function handleItem(item) {
+		uni.navigateTo({
+			url: util.setUrl('/pages/shop/commodity/index', {
+				productId: item.id
+			})
+		})
+	}
+	// 重载列表
+	function refreshList() {
+		listPrototype.pageNum = 1
+		listPrototype.total = 0
+		getList()
+	}
+
+	// 加载更多列表
+	function getMoreList() {
+		if (listPrototype.total <= listPrototype.data.length) return
+		listPrototype.pageNum++
+		getList()
+	}
+
+	defineExpose({
+		refreshList,
+		getMoreList,
 	})
-}
-// 重载列表
-function refreshList() {
-	listPrototype.pageNum = 1
-	listPrototype.total = 0
-	getList()
-}
-
-// 加载更多列表
-function getMoreList() {
-	if (listPrototype.total <= listPrototype.data.length) return
-	listPrototype.pageNum++
-	getList()
-}
-
-defineExpose({
-	refreshList,
-	getMoreList,
-})
 </script>
 
 <template>
@@ -283,19 +283,19 @@ defineExpose({
 </template>
 
 <style lang="scss" scoped>
-// 卡片
-.list {
-	display: grid;
-	grid-template-columns: repeat(2, 1fr);
-	grid-gap: 20rpx;
+	// 卡片
+	.list {
+		display: grid;
+		grid-template-columns: repeat(2, 1fr);
+		grid-gap: 20rpx;
 
-	// 单个
-	.item {
-		.poster {
-			width: 100%;
-			height: 340rpx;
-			border-radius: 20rpx 20rpx 0 0;
+		// 单个
+		.item {
+			.poster {
+				width: 100%;
+				height: 340rpx;
+				border-radius: 20rpx 20rpx 0 0;
+			}
 		}
 	}
-}
 </style>
\ No newline at end of file