From 8b9514d161497ff5e964dcba5550904d0ac4743d Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Sat, 11 Jan 2025 03:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/api/news.js                            |  23 +
 jiuyi2/api/shop.js                            |  69 +-
 jiuyi2/components/mine/payPwd.vue             |  49 +-
 .../public/jy-commodity-address/index.vue     |  86 ++-
 .../regionSelection/regionSelection.vue       |  32 +-
 jiuyi2/pages.json                             |  23 +-
 jiuyi2/pages/mine/delivery-address/index.vue  | 612 ++++++++++--------
 jiuyi2/pages/news/addFriend.vue               |   1 +
 jiuyi2/pages/news/chatGroup.vue               |  30 +-
 jiuyi2/pages/news/group-chat/index.vue        | 108 +++-
 .../components/jy-commodity-foot/index.vue    |   4 +-
 jiuyi2/pages/shop/commodity/history.vue       |  20 +
 jiuyi2/pages/shop/commodity/index.vue         |  60 +-
 jiuyi2/pages/shop/continue-pay/index.vue      |   1 +
 jiuyi2/pages/shop/settle.vue                  |  97 +--
 jiuyi2/pages/shop/store/index.vue             | 159 ++---
 jiuyi2/pages/shop/store/order.vue             | 173 +++++
 jiuyi2/readme.md                              |   8 +-
 jiuyi2/static/customer-service1.png           | Bin 352 -> 653 bytes
 jiuyi2/static/share2.png                      | Bin 245 -> 441 bytes
 jiuyi2/vite.config.js                         |  12 +-
 21 files changed, 1060 insertions(+), 507 deletions(-)
 create mode 100644 jiuyi2/pages/shop/commodity/history.vue
 create mode 100644 jiuyi2/pages/shop/store/order.vue

diff --git a/jiuyi2/api/news.js b/jiuyi2/api/news.js
index 0e7bb9f2..ce8609ac 100644
--- a/jiuyi2/api/news.js
+++ b/jiuyi2/api/news.js
@@ -88,6 +88,29 @@ export const news = {
 		})
 	},
 
+	/**
+	 * 创建群聊
+	 * @param {Object} param
+	 */
+	addChatGroup(param) {
+		return util.request({
+			url: `/user/chat/group/addChatGroup`,
+			data: param.data,
+			method: 'POST',
+		})
+	},
+
+	/**
+	 * 获取群聊列表
+	 * @param {Object} param
+	 */
+	myGroups(param) {
+		return util.request({
+			url: `/user/chat/group/myGroups`,
+			method: 'GET',
+		})
+	},
+
 	/**
 	 * 商品列表
 	 * @param {Object} param
diff --git a/jiuyi2/api/shop.js b/jiuyi2/api/shop.js
index b41a3f70..adc6dd22 100644
--- a/jiuyi2/api/shop.js
+++ b/jiuyi2/api/shop.js
@@ -59,7 +59,7 @@ const shop = {
 	},
 
 	/**
-	 * 获取商家申请信息
+	 * 退还押金接口
 	 * @param {Object} param
 	 */
 	outDepositsPay(param) {
@@ -69,13 +69,24 @@ const shop = {
 		})
 	},
 
+	/**
+	 * 商家发布商品
+	 * @param {Object} param
+	 */
+	releaseProduct(param) {
+		return util.request({
+			url: `/shopify/`,
+			method: 'POST',
+		})
+	},
+
 	/**
 	 * 商品列表
 	 * @param {Object} param
 	 */
 	getProduct(param) {
 		return util.request({
-			url: `/appProductionApi/getProductionList`,
+			url: `/shopify/appProductionApi/getProductionList`,
 			method: 'GET',
 			data: param.data
 		})
@@ -87,7 +98,7 @@ const shop = {
 	 */
 	getCategory(param) {
 		return util.request({
-			url: `/appProductionApi/getProductCategory`,
+			url: `/shopify/appProductionApi/getProductCategory`,
 			method: 'GET',
 			query: param.query,
 		})
@@ -99,11 +110,61 @@ const shop = {
 	 */
 	productDetail(param) {
 		return util.request({
-			url: `/appProductionApi/getProductionDetail`,
+			url: `/shopify/appProductionApi/getProductionDetail`,
 			method: 'GET',
 			query: param.query,
 		})
 	},
+
+	/**
+	 * 添加商品浏览记录
+	 * @param {Object} param
+	 */
+	addBrowsing(param) {
+		return util.request({
+			url: `/shopify/system/addBrowsing`,
+			method: 'PUT',
+			data: param.data,
+		})
+	},
+
+	/**
+	 * 获取收货地址
+	 * @param {Object} param
+	 */
+	getAddressList(param) {
+		return util.request({
+			url: `/shopify/appAddress/getList`,
+			method: 'GET',
+			query: param.query,
+		})
+	},
+
+	/**
+	 * 保存地址
+	 * @param {Object} param
+	 */
+	saveOrUpdate(param) {
+		return util.request({
+			url: `/shopify/appAddress/saveOrUpdate`,
+			method: 'POST',
+			data: param.data,
+		})
+	},
+
+	/**
+	 * 删除收货地址
+	 * @param {Object} param
+	 */
+	removeAddressById(param) {
+		return util.request({
+			url: `/shopify/appAddress/deleteById`,
+			method: 'DELETE',
+			query: param.query,
+		})
+	},
+	
+	
 }
 
 export default shop
\ No newline at end of file
diff --git a/jiuyi2/components/mine/payPwd.vue b/jiuyi2/components/mine/payPwd.vue
index b3d48ca3..137d9615 100644
--- a/jiuyi2/components/mine/payPwd.vue
+++ b/jiuyi2/components/mine/payPwd.vue
@@ -10,16 +10,27 @@
 	import {
 		useStore
 	} from 'vuex'
+	// 工具库
 	import util from '@/common/js/util.js'
+	// api
+	import api from '@/api/index.js'
 	// 加密
 	import CryptoJS from 'crypto-js';
+	// 
+	const props = defineProps({
+		// 是否验证
+		check: {
+			type: Boolean,
+			default: false
+		}
+	})
 
 	// 
 	const {
 		proxy
 	} = getCurrentInstance()
-	// 
-	const emit = defineEmits(['defineEmits'])
+	// 触发父组件事件
+	const emits = defineEmits(['confirm'])
 	// 仓库
 	const store = useStore()
 	// 密码
@@ -43,7 +54,12 @@
 
 	// 关闭弹窗
 	function close() {
-		proxy.$refs.pwdRef.open()
+		proxy.$refs.pwdRef.close()
+
+		setTimeout(() => {
+			// 清空二级密码
+			pwd.value = ''
+		}, 500)
 	}
 
 	// 确认
@@ -52,8 +68,31 @@
 			util.alert('二级密码不正确')
 			return
 		}
-		// md5加密
-		emit('confirm', CryptoJS.MD5(pwd.value).toString())
+		// 加密后的密码
+		let password = CryptoJS.MD5(pwd.value).toString()
+		// 
+		if (!props.check) {
+			// 验证
+			emits('confirm', password)
+			close()
+			return
+		}
+		// 验证二级密码
+		api.mine.checkSecondLevelCipher({
+			data: {
+				secondLevelCipher: password,
+			}
+		}).then(rs => {
+			if (rs.code == 200) {
+				emits('confirm', password)
+				close()
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		})
 	}
 
 	// 
diff --git a/jiuyi2/components/public/jy-commodity-address/index.vue b/jiuyi2/components/public/jy-commodity-address/index.vue
index 11ca4914..a8c03730 100644
--- a/jiuyi2/components/public/jy-commodity-address/index.vue
+++ b/jiuyi2/components/public/jy-commodity-address/index.vue
@@ -1,3 +1,59 @@
+<script setup>
+	// 
+	import util from '@/common/js/util.js'
+	// 
+	import {
+		ref,
+		reactive,
+		computed,
+		watch,
+		onMounted,
+		onUnmounted
+	} from 'vue'
+
+	const props = defineProps({
+		shopEdit: {
+			type: Boolean,
+			default: true
+		},
+		address: {
+			type: Object,
+			default: () => ({})
+		}
+	})
+
+	onMounted(() => {
+	// 开启监听
+addListener()
+	})
+	
+	onUnmounted(() => {
+	// 移除监听
+		removeListener()
+	})
+
+	// 开启监听
+	function addListener() {
+		// 选择收货地址
+		uni.$on('selectAddress', (event) => {
+			emit('update:value', event.target.value);
+		})
+	}
+
+	// 移除监听
+	function removeListener() {
+		// 移除收货地址
+		uni.$off('selectAddress')
+	}
+
+	// 跳转
+	function link(url) {
+		uni.navigateTo({
+			url
+		})
+	}
+</script>
+
 <template>
 	<view class="address df aic jcc">
 		<!-- 图标 -->
@@ -18,36 +74,12 @@
 		</view>
 
 		<!-- 选择地址 -->
-		<view v-if="shopEdit" class="btn ti warmHollow plr20 ml20"
-			@click="util.checkLink('/pages/mine/delivery-address/index')">
+		<view v-if="shopEdit" class="btn ti warmHollow plr20 ml20" @click="link('/pages/mine/delivery-address/index')">
 			<text class="cFF9B27">选择地址</text>
 		</view>
 	</view>
 </template>
-<script setup>
-	// 
-	import util from '@/common/js/util.js'
-	const props = defineProps({
-		shopEdit: {
-			type: Boolean,
-			default: true
-		},
-		address: {
-			type: Object,
-			default: () => ({})
-		}
-	})
-	const goto = (url) => {
-		uni.navigateTo({
-			url
-		})
-	}
-</script>
-<style lang="scss" scoped>
-	.address {
 
-		.edit-address {
-			overflow: visible;
-		}
-	}
+<style lang="scss" scoped>
+	// 
 </style>
\ No newline at end of file
diff --git a/jiuyi2/components/public/regionSelection/regionSelection.vue b/jiuyi2/components/public/regionSelection/regionSelection.vue
index 4f96395a..0c00af3b 100644
--- a/jiuyi2/components/public/regionSelection/regionSelection.vue
+++ b/jiuyi2/components/public/regionSelection/regionSelection.vue
@@ -23,13 +23,13 @@
 	// 传参
 	const props = defineProps({
 		province: {
-			type: [String,Number],
+			type: [String, Number],
 		},
 		city: {
-			type: [String,Number],
+			type: [String, Number],
 		},
 		area: {
-			type: [String,Number],
+			type: [String, Number],
 		},
 	})
 	// 地区
@@ -60,17 +60,17 @@
 
 	// 初始化地区下标
 	function initRegionIndex() {
-		console.log('props', props)
 		if (props.province) {
-			const provinceIndex = region.findIndex(item => item.id == props.province);
+			const provinceIndex = region.findIndex(item => item.regionName == props.province);
 			regionIndex[0] = provinceIndex;
 
 			if (props.city) {
-				const cityIndex = region[provinceIndex].children.findIndex(item => item.id == props.city);
+				const cityIndex = region[provinceIndex].children.findIndex(item => item.regionName == props.city);
 				regionIndex[1] = cityIndex;
 
 				if (props.area) {
-					const areaIndex = region[provinceIndex].children[cityIndex].children.findIndex(item => item.id ==
+					const areaIndex = region[provinceIndex].children[cityIndex].children.findIndex(item => item
+						.regionName ==
 						props.area);
 					regionIndex[2] = areaIndex;
 				}
@@ -159,14 +159,16 @@
 </script>
 
 <template>
-	<template v-if="province">
-		<text>{{province.regionName}}</text>
-		<text>{{city.regionName}}</text>
-		<text>{{area.regionName}}</text>
-	</template>
-	<template v-else>
-		<text class="placeholderStyle">请选择产品所在地</text>
-	</template>
+	<text @click="$refs.selection.open()">
+		<template v-if="province">
+			<text v-if="province.regionName">{{province.regionName}}</text>
+			<text v-if="city && city.regionName">{{city.regionName}}</text>
+			<text v-if="area && area.regionName">{{area.regionName}}</text>
+		</template>
+		<template v-else>
+			<text class="placeholderStyle">请选择产品所在地</text>
+		</template>
+	</text>
 	<uni-popup ref="selection" type="bottom">
 		<view class="selectionAlt popBot bfff">
 			<view class="header rows plr30">
diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json
index 07de32c7..2c9e38bb 100644
--- a/jiuyi2/pages.json
+++ b/jiuyi2/pages.json
@@ -38,14 +38,6 @@
 				"navigationBarBackgroundColor": "#fff"
 			}
 		},
-		{
-			"path": "pages/merchant/business-operator/index",
-			"style": {
-				"navigationBarTitleText": "商家管理",
-				"onReachBottomDistance": 100,
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/merchant/order/index",
 			"style": {
@@ -718,6 +710,21 @@
 				"navigationBarTitleText": "群聊列表",
 				"navigationBarBackgroundColor": "#fff"
 			}
+		},
+		{
+			"path" : "pages/shop/commodity/history",
+			"style" : 
+			{
+				"navigationBarTitleText" : "商品修改历史"
+			}
+		},
+		{
+			"path" : "pages/shop/store/order",
+			"style" : 
+			{
+				"navigationBarTitleText" : "商家订单",
+				"navigationStyle": "custom"
+			}
 		}
 	],
 
diff --git a/jiuyi2/pages/mine/delivery-address/index.vue b/jiuyi2/pages/mine/delivery-address/index.vue
index 87a9170e..2291fa93 100644
--- a/jiuyi2/pages/mine/delivery-address/index.vue
+++ b/jiuyi2/pages/mine/delivery-address/index.vue
@@ -1,252 +1,387 @@
-<template>
-	<view class="app">
-		<!-- 头部 -->
-		<!-- <JyCommonHead title="收获地址" :isRight="false"></JyCommonHead> -->
-
-		<view class="page-wrapper oh">
-			<view v-for="addressItem in addressData" :key="addressItem.id" class="address-item mb20 ptb20 plr20 bfff"
-				@click="emit('choose', addressItem)" :class="{'active': addressItem.isDefault}">
-				<view class="top-area">
-					<text class="name">{{ addressItem.name }}</text>
-					<text class="phone">{{ addressItem.phone }}</text>
-				</view>
-				<view class="address-text">{{ addressItem.address }}</view>
-				<view class="bottom-area mt20">
-					<label>
-						<checkbox @click.stop="emit('setDefault', addressItem)" color="#f60" disabled
-							style="transform:scale(0.8)" :class="[addressItem.isDefault && 'isDefault']"
-							:checked="addressItem.isDefault" />
-						<text @click.stop="emit('setDefault', addressItem)" class="set-def-text">设为默认</text>
-					</label>
-					<view class="operation-btns">
-						<uni-tag class="mlr10" @click.stop="emit('edit', addressItem)" :inverted="true" text="复制"
-							type="warning" size="small"></uni-tag>
-						<uni-tag class="mlr1" @click.stop="copyText(addressItem)" :inverted="true" text="修改"
-							type="warning" size="small"></uni-tag>
-					</view>
-				</view>
-
-				<uni-icons class="delete" type="closeempty" color="#999" @click.stop="emit('delete', addressItem)" />
-			</view>
-		</view>
-
-		<view class="footer plr30 shadow bfff">
-			<view class="btn lg primary" @click="openPopup">添加地址</view>
-		</view>
-	</view>
-	<JyPopup ref="addressPopup" title="添加收货地址" type="center">
-		<view class="p25">
-			<uni-forms :modelValue="formData">
-				<uni-forms-item label="收货人" name="recipientName">
-					<input type="text" v-model="formData.recipientName" placeholder="请输入姓名" />
-				</uni-forms-item>
-				<uni-forms-item label="手机号" name="phoneNumber">
-					<input type="text" v-model="formData.phoneNumber" placeholder="请输入手机号" />
-				</uni-forms-item>
-				<uni-forms-item label="邮编" name="postalCode">
-					<input type="text" v-model="formData.postalCode" placeholder="请输入邮编" />
-				</uni-forms-item>
-				<uni-forms-item label="地区" name="areas">
-					<input @click="onhideShow" type="text" v-model="formData.areas" placeholder="请输入地区" />
-				</uni-forms-item>
-				<uni-forms-item label="详细地址" name="addressDetail">
-					<uni-easyinput type="textarea" autoHeight v-model="formData.addressDetail"
-						placeholder="如街道，门牌号，小区，乡镇，村等"></uni-easyinput>
-				</uni-forms-item>
-			</uni-forms>
-			<pickRegions :province="add.province" :city="add.city" :area="add.area" :show="show"
-				@changeClick="changeClick" @sureSelectArea="onsetCity" @hideShow="onhideShow"></pickRegions>
-			<button class="add-address-btn" @click="saveApi">保存</button>
-		</view>
-	</JyPopup>
-</template>
-
 <script setup>
+	// 收货地址
 	import {
 		ref,
 		getCurrentInstance,
-		reactive
+		reactive,
+		computed,
 	} from 'vue'
 	import {
 		onLoad,
+		onPullDownRefresh,
+		onReachBottom
 	} from '@dcloudio/uni-app';
-	import JyPopup from '@/components/public/jy-popup'
-	import JyCommonHead from '@/components/public/jy-common-head'
-	import pickRegions from './components/jy-pick-regions'
-	import JyBottomBtn from '@/components/public/jy-bottom-button'
+	// 
+	import {
+		useStore
+	} from 'vuex'
+	// 
+	import api from '@/api/index.js'
+	// 省市区联动
+	import regionSelection from '@/components/public/regionSelection/regionSelection.vue'
+	// 
+	import util from '@/common/js/util.js'
 
 	const {
 		proxy
 	} = getCurrentInstance()
-	const show = ref(false)
-	// 打开弹窗
-	const onhideShow = () => {
-		show.value = true
-	}
-	const changeClick = (value, value2, value3, value4) => {
-		console.log('地址选择器 = ' + value + value2 + value3 + value4);
-	}
-	//选中省市区
-	const onsetCity = (e) => {
-		console.log('====================================');
-		console.log(e);
-		console.log('====================================');
-		show.value = false
-	}
-	const formData = reactive({
-		recipientName: undefined,
-		phoneNumber: undefined,
-		district: undefined,
-		postalCode: undefined,
-		city: undefined,
-		province: undefined,
-		addressDetail: undefined,
+	const store = useStore()
+	// 列表
+	const list = reactive({
+		data: [],
+		pageNum: 1,
+		pageSize: 10,
+		total: 0,
 	})
-	const setDefault = () => {
-		console.log('setDefault')
+	//收货地址主键
+	const formData = reactive({
+		id: '',
+		//用户id
+		uid: '',
+		//收货人姓名
+		name: '',
+		//收货人电话
+		mobile: '',
+		//是否默认地址
+		isDefault: true,
+		//省
+		province: '',
+		//市
+		city: '',
+		//区
+		country: '',
+		//详细地址
+		detail: '',
+	})
+	// 是否选择
+	const select = ref('')
+	// 用户信息
+	const userinfo = computed(() => store.state.userinfo)
+
+	onLoad((option) => {
+		// 是否选择
+		if (option.select) select.value = option.select
+		// 获取地址列表
+		getList()
+	})
+
+	onPullDownRefresh(() => {
+		// 重载收货地址
+		refreshList()
+	})
+
+	onReachBottom(() => {
+		// 加载更多收货地址
+		getMoreList()
+	})
+
+	// 重载列表
+	function refreshList() {
+		list.pageNum = 1
+		getList()
 	}
 
-	const add = () => {
-		uni.navigateTo({
-			url: '/pages/mine/address-add'
+	// 加载更多列表
+	function getMoreList() {
+		if (list.data.length >= list.total) return
+		list.pageNum++
+		getList()
+	}
+
+	// 获取收货地址
+	function getList() {
+		// 获取收货地址
+		api.shop.getAddressList({
+			query: {
+				pageNum: list.pageNum,
+				pageSize: list.pageSize,
+			},
+		}).then(rs => {
+			if (rs.code == 200) {
+				if (list.pageNum == 1) list.data.length = 0
+				list.data.push(...rs.rows)
+				list.total = rs.total
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		}).finally(() => {
+			uni.stopPullDownRefresh()
 		})
 	}
 
-	const validateForm = () => {
-		if (!formData.recipientName) {
-			uni.showToast({
-				title: '请输入收货人',
-				icon: 'none'
-			});
-			return false;
-		}
-		if (!formData.phoneNumber || !/^1[3-9]\d{9}$/.test(formData.phoneNumber)) {
-			uni.showToast({
-				title: '请输入正确的手机号',
-				icon: 'none'
-			});
-			return false;
-		}
-		// 其他字段验证...
-		return true;
-	}
-
-	// 保存方法
-	function saveApi() {
-		if (validateForm()) {
-			// 实现保存逻辑
-			console.log('保存地址:', formData);
+	/**
+	 * 选择地址
+	 * @param {Object} item
+	 */
+	function handleChoose(item) {
+		if (select.value == 1) {
+			uni.$emit('selectAddress', item)
+			uni.navigateBack()
+			return
 		}
 	}
 
-	const addressData = ref([{
-			name: '上官婉儿',
-			phone: '13800138000',
-			address: '北京市海淀区中关村软件园',
-			isDefault: false,
-			isCompany: true,
-			id: Math.random().toString(36).substring(2, 9),
-		},
-		{
-			name: '司空震',
-			phone: '13800138000',
-			address: '江西省吉安市吉水县东山中央首府11栋',
-			isDefault: true,
-			isHome: true,
-			id: Math.random().toString(36).substring(2, 9),
-		},
-		{
-			name: '苏烈',
-			phone: '13800138000',
-			address: '广东省深圳市南山区粤海街道109号6楼601',
-			isDefault: false,
-			id: Math.random().toString(36).substring(2, 9),
-		},
-	])
+	// 提交
+	function handleSubmit() {
+		// 
+		const data = {
+			...formData
+		}
+		console.log('data', data)
 
-	function copyText(item) {
-		uni.setClipboardData({
-			data: item.address,
-			success: () => {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'success'
-				});
-			},
-			fail: () => {
-				uni.showToast({
-					title: '复制失败',
-					icon: 'none'
-				});
+		// 验证必填项
+		if (!data.name) {
+			util.alert('收货人姓名不能为空')
+			return
+		}
+		if (!data.mobile) {
+			util.alert('收货人电话不能为空')
+			return
+		}
+		if (!data.province) {
+			util.alert('请选择省')
+			return
+		}
+		if (!data.detail) {
+			util.alert('详细地址不能为空')
+			return
+		}
+
+		// 用户id
+		data.uid = userinfo.value.id
+
+		// 
+		api.shop.saveOrUpdate({
+			data,
+		}).then(rs => {
+			if (rs.code == 200) {
+				// 关闭弹窗
+				proxy.$refs.add.close()
+				// 重载收货地址
+				refreshList()
+				return
 			}
-		});
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		})
 	}
 
-	function openPopup() {
-		this.$refs.addressPopup.open()
+	/**
+	 * 复制收货地址
+	 * @param {Object} item
+	 */
+	function copyText(item) {
+		util.copyText(`${item.name} ${item.mobile} ${item.province}${item.city}${item.country} ${item.detail}`)
 	}
 
-	function init() {
-		this.getData({
-			api: 'address',
-			fn: 'list'
-		}, {});
-		console.log('====================================');
-		console.log(this.listProperty);
-		console.log('====================================');
+	// 收货地址切换
+	function handleAddChange(ev) {
+		if (ev.show) return
+
+		formData.id = ''
+		//用户id
+		formData.uid = ''
+		//收货人姓名
+		formData.name = ''
+		//收货人电话
+		formData.mobile = ''
+		//是否默认地址
+		formData.isDefault = false
+		//省
+		formData.province = ''
+		//市
+		formData.city = ''
+		//区
+		formData.country = ''
+		//详细地址
+		formData.detail = ''
 	}
 
-	function onReachBottomHandler() {
-		this.listProperty.params.pageNum++;
-		this.init();
+	/**
+	 * 设为默认
+	 * @param {Object} item 点击的列表项
+	 */
+	function handleDefault(item) {
+		// 
+		api.shop.saveOrUpdate({
+			data: {
+				id: item.id,
+				isDefault: true,
+			},
+		}).then(rs => {
+			if (rs.code == 200) {
+				// 重载收货地址
+				refreshList()
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		})
 	}
 
-	function onPullDownRefreshHandler() {
-		this.listProperty.params.pageNum = 1
-		this.getData({
-			api: 'address',
-			fn: 'list'
-		}, {}, true);
+	/**
+	 * 更新收货地址信息
+	 * @param {Object} item 点击的列表项
+	 */
+	function handleUpdate(item) {
+		console.log(item)
+		// 
+		formData.id = item.id
+		//用户id
+		formData.uid = item.uid
+		//收货人姓名
+		formData.name = item.name
+		//收货人电话
+		formData.mobile = item.mobile
+		//省
+		formData.province = item.province
+		//市
+		formData.city = item.city
+		//区
+		formData.country = item.country
+		//详细地址
+		formData.detail = item.detail
+		// 打开省市区弹窗
+		proxy.$refs.add.open()
+	}
+
+	/**
+	 * 选择省市区
+	 * @param {Object} ev 选择地区
+	 */
+	function handleRegion(ev) {
+		formData.province = ev.province.regionName
+		formData.city = ev.city.regionName
+		formData.country = ev.area.regionName
+	}
+
+	/**
+	 * 删除收货地址
+	 * @param {Object} item 点击的列表项
+	 * @param {Object} index 点击的列表下标
+	 */
+	function handleRemove(item, index) {
+		util.alert({
+			title: '确认删除？',
+			content: '删除后不可恢复，确定删除该收货地址吗？',
+			success: (res) => {
+				if (!res.confirm) return
+				api.shop.removeAddressById({
+					query: {
+						id: item.id
+					}
+				}).then(rs => {
+					if (rs.code == 200) {
+						list.data.splice(index, 1)
+						return
+					}
+					util.alert({
+						content: rs.msg,
+						showCancel: false,
+					})
+				})
+			}
+		})
 	}
 </script>
 
+<template>
+	<view class="app">
+		<view class="listBox oh c333">
+			<view v-for="(item,index) in list.data" :key="item.id" class="item pr mb20 ptb20 plr20 bfff"
+				@click="handleChoose(item)" :class="{'active': item.isDefault}">
+
+				<view class="top-area f30 mtb10">
+					<text class="name">{{ item.name }}</text>
+					<text class="phone">{{ item.mobile }}</text>
+				</view>
+
+				<view class="address-text f30 mtb10">
+					<text>{{item.province}}</text>
+					<text>{{item.city}}</text>
+					<text>{{item.country}}</text>
+					<text>{{item.detail}}</text>
+				</view>
+
+				<view class="rows mt20 c999 f28">
+					<label class="rows" @click.stop="handleDefault(item)">
+						<uni-icons type="circle" color="#999" size="40rpx" v-if="!item.isDefault" />
+						<uni-icons type="checkbox-filled" color="#F8BA4D" size="40rpx" v-else />
+						<text class="ml10">设为默认</text>
+					</label>
+
+					<view class="btns df aic">
+						<view class="btn ti warmHollow plr10" @click.stop="copyText(item)">复制</view>
+						<view class="btn ti warmHollow plr10" @click.stop="handleUpdate(item)">修改</view>
+					</view>
+				</view>
+
+				<view class="pa t0 r0 pt30 pr30" @click.stop="handleRemove(item,index)">
+					<uni-icons type="closeempty" color="#999" />
+				</view>
+			</view>
+		</view>
+
+		<view class="fill" style="height: 210rpx;"></view>
+
+		<view class="footer plr30 shadow bfff">
+			<view class="btn lg primary" @click="$refs.add.open()">添加地址</view>
+		</view>
+	</view>
+
+	<!-- 新增收货地址 -->
+	<uni-popup ref="add" type="center" @change="handleAddChange">
+		<view class="addAddressAlt popMid bfff">
+			<view class="header rows ptb30 plr30">
+				<view class="c333 f30">收货地址</view>
+				<uni-icons type="closeempty" @click="$refs.add.close()" />
+			</view>
+
+			<view class="plr25">
+				<uni-forms :modelValue="formData" label-position="top">
+					<uni-forms-item label="收货人" name="name">
+						<input type="text" v-model="formData.name" placeholder="请输入收货人姓名"
+							placeholder-class="placeholderStyle" />
+					</uni-forms-item>
+					<uni-forms-item label="手机号" name="mobile">
+						<input type="text" v-model="formData.mobile" placeholder="请输入手机号"
+							placeholder-class="placeholderStyle" />
+					</uni-forms-item>
+					<uni-forms-item label="地区" name="areas">
+						<regionSelection :province="formData.province" :city="formData.city" :area="formData.country"
+							@change="handleRegion">
+						</regionSelection>
+					</uni-forms-item>
+					<uni-forms-item label="详细地址" name="addressDetail">
+						<uni-easyinput type="textarea" autoHeight v-model="formData.detail"
+							placeholder="如街道，门牌号，小区，乡镇，村等"></uni-easyinput>
+					</uni-forms-item>
+				</uni-forms>
+			</view>
+
+			<view class="btn primary mtb30 mlr30" @click="handleSubmit">保存</view>
+		</view>
+	</uni-popup>
+</template>
+
 <style lang="scss" scoped>
 	$text-color1: #333333;
 	$text-color2: #666;
 
-	::v-deep .uni-checkbox-input-disabled {
-		border-radius: 50% !important;
-		background-color: #ffffff !important;
-
-	}
-
-	::v-deep .isDefault {
-		.uni-checkbox-input {
-			background-color: #F8BA4D !important;
-			border-color: #F8BA4D !important;
-		}
-
-		path {
-			fill: #fff;
-		}
-	}
-
 	.page-wrapper {
-		// padding: 20rpx;
 		overflow-y: scroll;
 		height: calc(100vh - 200rpx - 110rpx);
 
 		.address-item {
 			position: relative;
 
-			.delete {
-				position: absolute;
-				top: 15rpx;
-				right: 15rpx;
-				width: 26rpx;
-				height: 26rpx;
-			}
-
 			.top-area {
 				font-size: 28rpx;
 				margin: 10rpx 0;
@@ -273,75 +408,6 @@
 				text-overflow: ellipsis;
 				/* 使用省略号替代溢出部分 */
 			}
-
-			.bottom-area {
-				display: flex;
-				padding-right: 0rpx;
-				justify-content: space-between;
-				justify-items: center;
-
-				.set-def-text {
-					font-size: 14px;
-					color: $text-color2;
-				}
-			}
 		}
-
-		.add-address-btn {
-			position: fixed;
-			z-index: 99;
-			bottom: 120rpx;
-			width: calc(100% - 30rpx);
-			margin: auto;
-			height: 80rpx;
-			border-radius: 15rpx;
-			background-color: #f60;
-			color: #fff;
-			font-size: 22px;
-			text-align: center;
-			line-height: 80rpx;
-			letter-spacing: 4rpx;
-		}
-	}
-
-	.jy-pay-popup {
-		width: 100%;
-		height: 800rpx;
-		border-radius: 30rpx;
-
-		.title {
-			width: 100%;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			padding: 20rpx 0;
-			// 底部边框显示
-			color: #3D3D3D;
-			font-size: 32rpx;
-			border-bottom: 1px solid #E5E5E5;
-		}
-
-		.close-btn {
-			position: absolute;
-			top: 0;
-			right: 0;
-			height: 52rpx;
-			line-height: 52rpx;
-			width: 52rpx;
-			background: #D8D8D8;
-			font-size: 30rpx;
-			border-radius: 50%;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			transform: translate(50%, -50%);
-		}
-	}
-
-	.add-address-btn {
-		background: linear-gradient(270deg, #FF9B27 20%, #FDC123 103%);
-		font-size: 32rpx;
-		color: #FFFFFF;
-		width: 100%;
 	}
 </style>
\ No newline at end of file
diff --git a/jiuyi2/pages/news/addFriend.vue b/jiuyi2/pages/news/addFriend.vue
index 4278effe..08902e05 100644
--- a/jiuyi2/pages/news/addFriend.vue
+++ b/jiuyi2/pages/news/addFriend.vue
@@ -147,6 +147,7 @@
 		}).then(rs => {
 			if (rs.code == 200) {
 				util.alert('已发送好友申请，请等待对方同意')
+				proxy.$refs.friendRef.close()
 				return
 			}
 			util.alert({
diff --git a/jiuyi2/pages/news/chatGroup.vue b/jiuyi2/pages/news/chatGroup.vue
index 4b92899a..95fdaa1e 100644
--- a/jiuyi2/pages/news/chatGroup.vue
+++ b/jiuyi2/pages/news/chatGroup.vue
@@ -16,6 +16,8 @@
 	// 腾讯云聊天
 	import TencentCloudChat from '@tencentcloud/chat';
 	// 
+	import api from '@/api/index.js'
+	// 
 	const {
 		proxy
 	} = getCurrentInstance()
@@ -33,7 +35,7 @@
 
 	onLoad(() => {
 		// 
-		getGroupList()
+		// getGroupList()
 		// 开启监听
 		addListener()
 	})
@@ -46,35 +48,31 @@
 	// 开启监听
 	function addListener() {
 		let onFriendListUpdated = function(event) {
+			console.log('onFriendListUpdated')
 			getGroupList()
 		}
 
-		uni.$chat.on(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED, onFriendListUpdated);
+		uni.$chat.on(TencentCloudChat.EVENT.GROUP_LIST_UPDATED, onFriendListUpdated);
 	}
 
 	// 移除监听
 	function removeListener() {
-		uni.$chat.off(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED);
+		uni.$chat.off(TencentCloudChat.EVENT.GROUP_LIST_UPDATED);
 	}
 
 	// 获取群组列表
 	function getGroupList() {
-		// 验证sdk是否准备完毕
-		let isReady = uni.$chat.isReady();
-
-		if (!isReady) {
-			setTimeout(function() {
-				getGroupList()
-			}, 200);
-			return
-		}
-
-		uni.$chat.getGroupList().then(rs => {
-			if (rs.code == 0) {
+ 		api.news.myGroups().then(rs => {
+			if (rs.code == 200) {
 				list.length = 0
-				list.push(...rs.data.groupList)
+				list.push(...rs.data)
 				console.log('group list', list)
+				return
 			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false
+			})
 		})
 	}
 
diff --git a/jiuyi2/pages/news/group-chat/index.vue b/jiuyi2/pages/news/group-chat/index.vue
index 6ecd73ef..3f294bc8 100644
--- a/jiuyi2/pages/news/group-chat/index.vue
+++ b/jiuyi2/pages/news/group-chat/index.vue
@@ -24,9 +24,13 @@
 
 	const store = useStore()
 	// 已选择的用户id
-	const ids = reactive([])
-	// 名称
-	const name = ref('')
+	const ids = ref([])
+	// 表单
+	const form = reactive({
+		name: '',
+		groupFaceUrl: '',
+		type: 'Public',
+	})
 	// 列表
 	const list = reactive([])
 	// 用户信息
@@ -62,49 +66,79 @@
 	 * @param {Object} item 当前用户信息
 	 */
 	function handleUser(item) {
-		const findIndex = ids.value.findIndex(node => node == item.userId)
-		if (findIndex >= 0) ids.value.splice(findIndex, 1)
+		const find_index = ids.value.findIndex(node => node == item.userId)
+		console.log(find_index)
+		if (find_index >= 0) ids.value.splice(find_index, 1)
 		else ids.value.push(item.userId)
 	}
 
 	// 新建群组
 	function handleCreateGroup() {
-		if (!name.value) {
+		const data = {
+			...form
+		}
+
+		if (!data.name) {
 			util.alert('群聊名称不能为空')
 			return
 		}
+		if (!data.groupFaceUrl) {
+			util.alert('群聊头像不能为空')
+			return
+		}
 		if (ids.length < 2) {
 			util.alert('请至少选择两名用户')
 			return
 		}
-		// 成员列表
-		const memberList = [{
-				userID: userinfo.value.userId,
+		// 群成员
+		data.groupUsers = [
+			{
+				userId: userinfo.value.id
 			},
-			...ids.map(item => {
+			...ids.value.map(item => {
 				return {
-					userID: item
+					userId: item
 				}
 			})
 		]
 
 		// 创建好友工作群
-		uni.$chat.createGroup({
-			type: TencentCloudChat.TYPES.GRP_WORK,
-			name: name.value,
-			memberList,
+		api.news.addChatGroup({
+			data: data
 		}).then(rs => {
-			console.log('createGroup success', rs)
-			util.alert('创建成功')
-		}).catch(rs => {
-			console.log('createGroup catch', rs);
+			if (rs.code == 200) {
+				util.alert('创建成功')
+				return
+
+				// 
+				setTimeout(() => {
+					form.name = ''
+					form.groupFaceUrl = ''
+					uni.navigateBack()
+				}, 2000)
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		})
+	}
+
+	// 上传图片
+	function uploadImg() {
+		util.upload_image({
+			type: 1,
+			success: (res) => {
+				form.groupFaceUrl = res.value
+			}
 		})
 	}
 </script>
 
 <template>
 	<view class="app">
-		<uni-search-bar placeholder="请输入群聊名称" v-model="name" style="background: #fff;" />
+		<!-- <uni-search-bar placeholder="请输入群聊名称" v-model="name" style="background: #fff;" /> -->
 
 		<view class="jy-chat-box mt30">
 			<view class="firendBox pr">
@@ -114,7 +148,7 @@
 							<image class="wh80 avatar  cir" :src="item.avatar" mode="aspectFill" />
 							<view class="name thd f1 ml20 c333 f32">{{item.remark || item.userNickname}}</view>
 							<uni-icons type="circle-filled" size="40rpx" color="#20D200"
-								v-if="ids.includes(item.userID)" />
+								v-if="ids.includes(item.userId)" />
 							<uni-icons type="circle" size="40rpx" color="#ccc" v-else />
 						</view>
 					</view>
@@ -127,9 +161,39 @@
 		<view class="fill" style="height: 120rpx;"></view>
 
 		<view class="footer plr30 bfff shadow">
-			<view class="btn lg colourful" @click="handleCreateGroup">新建群聊</view>
+			<view class="btn lg colourful" @click="$refs.groupAlt.open() ">下一步</view>
 		</view>
 	</view>
+
+	<!-- 群聊表单信息 -->
+	<uni-popup ref="groupAlt" type="bottom">
+		<view class="groupAlt popBot ptb30 plr30 bfff">
+			<view class="header rows">
+				<view class="">新建群聊</view>
+				<uni-icons type="closeempty" size="40rpx" color="#333" />
+			</view>
+
+			<!--  -->
+			<view class="main">
+				<view class="txtplus inputBox mtb30 ptb20 plr20 br10">
+					<input type="text" v-model="form.name" placeholder="群聊名称" />
+				</view>
+
+				<view class="imgList">
+					<view class="imgs wh200" v-if="form.groupFaceUrl" @click="uploadImg">
+						<image class="wh200 br20" :src="form.groupFaceUrl" mode="aspectFill" />
+					</view>
+					<view class="imgs wh200 fmid bf8f8f8 br20" v-else @click="uploadImg">
+						<uni-icons type="plusempty" color="#999" size="50rpx" />
+					</view>
+				</view>
+			</view>
+
+			<view class="btn">
+				<view class="btn lg colourful" @click="handleCreateGroup">新建群聊</view>
+			</view>
+		</view>
+	</uni-popup>
 </template>
 
 <style scoped lang="scss">
diff --git a/jiuyi2/pages/shop/commodity/components/jy-commodity-foot/index.vue b/jiuyi2/pages/shop/commodity/components/jy-commodity-foot/index.vue
index 8a937a13..9f396af2 100644
--- a/jiuyi2/pages/shop/commodity/components/jy-commodity-foot/index.vue
+++ b/jiuyi2/pages/shop/commodity/components/jy-commodity-foot/index.vue
@@ -28,6 +28,8 @@
 			default: () => ({})
 		},
 	})
+	// 地址
+	const address = reactive({})
 
 	// 规格
 	const spec = reactive([{
@@ -129,7 +131,7 @@
 	<uni-popup type="bottom" ref="popup">
 		<view class="buy popBot plr20 bfff">
 			<view class="address mtb40">
-				<JyCommodityAddress></JyCommodityAddress>
+				<JyCommodityAddress :address="address"></JyCommodityAddress>
 			</view>
 
 			<!-- 商品图 价格 明细 数量 -->
diff --git a/jiuyi2/pages/shop/commodity/history.vue b/jiuyi2/pages/shop/commodity/history.vue
new file mode 100644
index 00000000..99a17114
--- /dev/null
+++ b/jiuyi2/pages/shop/commodity/history.vue
@@ -0,0 +1,20 @@
+<script setup>
+	// 商品修改历史
+
+	import {
+		ref,
+		reactive,
+		watch,
+		computed
+	} from 'vue'
+</script>
+
+<template>
+	<view class="app">
+		<view class=""></view>
+	</view>
+</template>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/jiuyi2/pages/shop/commodity/index.vue b/jiuyi2/pages/shop/commodity/index.vue
index 1a5a9a86..65377cc4 100644
--- a/jiuyi2/pages/shop/commodity/index.vue
+++ b/jiuyi2/pages/shop/commodity/index.vue
@@ -27,13 +27,11 @@
 	const {
 		proxy
 	} = getCurrentInstance()
+	const store = useStore()
 	// 产品详情
 	const detail = reactive({})
 	// 产品id
 	const id = ref('')
-	const {
-		userinfo
-	} = useStore().state
 	// 轮播图详情
 	const bannerIndex = ref(0)
 	// 详情
@@ -42,11 +40,17 @@
 		if (detail.sliderImage) result = detail.sliderImage.split(',')
 		return result
 	})
+	// 当前登录的用户信息
+	const userinfo = computed(() => {
+		return store.state.userinfo
+	})
 
 	onLoad(option => {
 		if (option.productId) id.value = option.productId
 		// 获取产品详情
 		getDetail()
+		// 添加商品浏览记录
+		addBrowsing()
 	})
 
 	onReady(() => {
@@ -58,6 +62,26 @@
 		else proxy.$refs.apexRef.headerActive = false
 	})
 
+	// 添加商品浏览记录
+	function addBrowsing() {
+		// 验证登录
+		util.isLogin(() => {
+			try {
+				// 添加浏览记录
+				api.shop.addBrowsing({
+					data: {
+						userId: userinfo.value.id,
+						goodsId: id.value
+					},
+				}).then(rs => {
+					if (rs.code != 200) console.log('addbrows err', rs.msg)
+				})
+			} catch (ev) {
+				console.log('addBrowsing', ev)
+			}
+		})
+	}
+
 	// 获取详情
 	function getDetail() {
 		api.shop.productDetail({
@@ -86,6 +110,11 @@
 			url,
 		})
 	}
+
+	// 收藏店铺
+	function handleCollectStore() {
+		// 
+	}
 </script>
 
 <template>
@@ -120,7 +149,7 @@
 			</view>
 
 			<!-- 优惠券 -->
-			<view class="coupon df fdr fww f26 mtb20 cFF9B27">
+			<view class="coupon df fdr fww f26 mtb20 cFF9B27" v-if="0">
 				<view class="item">
 					<text>限时直降0.5元</text>
 				</view>
@@ -142,12 +171,6 @@
 
 			<!-- 福利政策 -->
 			<view class="gift df fdr fww c999 f24 mtb20">
-				<view class="item">
-					<text>全场包邮</text>
-				</view>
-				<view class="item">
-					<text>48h内发货</text>
-				</view>
 				<view class="item">
 					<text>假一赔十</text>
 				</view>
@@ -155,6 +178,12 @@
 					<text>7天无理由退货</text>
 				</view>
 				<view class="item">
+					<text>全场包邮</text>
+				</view>
+				<view class="item">
+					<text>48h内发货</text>
+				</view>
+				<view class="item" v-if="0">
 					<text>支持先用后付</text>
 				</view>
 			</view>
@@ -216,14 +245,14 @@
 				<view class="info f1 mlr20">
 					<!-- 店铺名称 -->
 					<view class="name thd">
-						<text class="f34 c333">家纺专营店</text>
+						<text class="f34 c333">{{detail.merName}}</text>
 					</view>
 					<view class="line df dfr aic mt10">
 						<!-- 评分 -->
-						<view class="item f24 c666 df aic ">
+						<!-- <view class="item f24 c666 df aic ">
 							<uni-rate class="mr10" :value="4.5" :size="12" activeColor="#FF9B27" readonly />
 							<text>4.5</text>
-						</view>
+						</view> -->
 						<!-- 关注数量 -->
 						<view class="item follow c666 f24">
 							<text>123关注</text>
@@ -233,7 +262,7 @@
 			</view>
 
 			<!-- 关注按钮 -->
-			<view @click="followButton" class="btn sm warm plr30">
+			<view @click="handleCollectStore" class="btn sm warm plr30">
 				<uni-icons class="mr10" color="#fff" type="plusempty" size="13" v-if="1" />
 				<text class="cfff" v-else>已</text>
 				<text class="cfff">关注</text>
@@ -247,8 +276,7 @@
 			</view>
 			<!-- 商品详情 -->
 			<view class="content mt30">
-				<rich-text
-					nodes="<p><img src='https://img30.360buyimg.com/popWareDetail/jfs/t1/124291/22/31317/138753/6449f30dF90683c84/4fee5d1a337f7b90.jpg.avif' width='100%' /></p>" />
+				<rich-text :nodes="detail.intro" />
 			</view>
 		</view>
 
diff --git a/jiuyi2/pages/shop/continue-pay/index.vue b/jiuyi2/pages/shop/continue-pay/index.vue
index ecd88964..9971a0ba 100644
--- a/jiuyi2/pages/shop/continue-pay/index.vue
+++ b/jiuyi2/pages/shop/continue-pay/index.vue
@@ -17,6 +17,7 @@
 	const paytype = ref('1')
 
 	// 支付方式列表
+	// 要么先用积分 要么用余额 不够的话 全部的积分和剩下的余额 在个人中心增加一个优先支付的选项
 	const paytypeList = [{
 			name: '微信支付',
 			value: '1',
diff --git a/jiuyi2/pages/shop/settle.vue b/jiuyi2/pages/shop/settle.vue
index 36efdb4f..7da00928 100644
--- a/jiuyi2/pages/shop/settle.vue
+++ b/jiuyi2/pages/shop/settle.vue
@@ -27,6 +27,8 @@
 	import util from '@/common/js/util.js'
 	// 选择省市区
 	import regionSelection from '@/components/public/regionSelection/regionSelection.vue';
+	// 二级密码验证
+	import payPwd from '@/components/mine/payPwd.vue'
 	// 
 	const store = useStore()
 	const {
@@ -49,6 +51,8 @@
 	const dictList = reactive([])
 	// 选择下标分类
 	const dictIndex = ref('')
+	// 二级密码回调
+	const pwdCb = ref('')
 	// 用户信息
 	const userinfo = computed(() => {
 		return store.state.userinfo
@@ -60,7 +64,8 @@
 	})
 
 	onReady(() => {
-		// proxy.$refs.regionSelectionRef.open()
+		// 测试缴纳接口
+		callPwd('depositsPay')
 	})
 
 	// 获取表单信息
@@ -173,24 +178,8 @@
 		})
 	}
 
-	// 商家取消押金
-	function depositsCancel() {
-		api.shop.depositsCancel().then(rs => {
-			if (rs.code == 200) {
-				// 修改状态 变为待缴纳
-				mode.code = 0
-				return
-			}
-			util.alert({
-				showCancel: false,
-				content: rs.msg,
-			})
-		})
-	}
-
 	// 获取文章
 	function getarticle() {
-
 		api.getArticle({
 			query: {
 				agreementId: 4,
@@ -221,9 +210,7 @@
 						form[key] = rs.value
 						break
 					case 2:
-						console.log('form[key]', form[key])
 						form[key].push(rs.value)
-						console.log('form[key]', form[key])
 						break
 				}
 			},
@@ -249,9 +236,9 @@
 	 */
 	function handleRegion(ev) {
 		console.log('handleRegion', ev)
-		form.province = ev.province.id
-		form.city = ev.city.id
-		form.district = ev.area.id
+		form.province = ev.province.regionName
+		form.city = ev.city.regionName
+		form.district = ev.area.regionName
 	}
 
 	/**
@@ -336,24 +323,52 @@
 	}
 
 	// 退出缴纳押金
-	function outDepositsPay() {
+	function outDepositsPayAlt() {
 		util.alert({
 			content: '确认缴纳押金并放弃商家身份？',
 		}).then(rs => {
-			if (rs.confirm) return
-			api.shop.outDepositsPay().then(rs => {
-				if (rs.code == 200) {
-					// 修改状态 变为待缴纳
-					handleModeCode(0)
-					return
-				}
-				util.alert({
-					showCancel: false,
-					content: rs.msg,
-				})
+			if (!rs.confirm) return
+			// 调用二级密码
+			callPwd('outDepositsPay')
+		})
+	}
+
+	// 商家退出押金
+	function outDepositsPay() {
+		// 商家退出押金
+		api.shop.outDepositsPay().then(rs => {
+			if (rs.code == 200) {
+				// 修改状态 变为待缴纳
+				handleModeCode(0)
+				return
+			}
+			util.alert({
+				showCancel: false,
+				content: rs.msg,
 			})
 		})
 	}
+
+	/**
+	 * 调用二级密码
+	 * @param {Object} key 后续方法key
+	 */
+	function callPwd(key) {
+		pwdCb.value = {
+			// 缴纳押金
+			'depositsPay': depositsPay,
+			// 取消押金并退出商家身份
+			'outDepositsPay': outDepositsPay,
+		} [key]
+		// 拉起弹窗
+		proxy.$refs.payPwdRef.open()
+	}
+
+	// 二级密码验证
+	function handlePayPwd() {
+		// 执行二级密码确认回调	
+		pwdCb.value()
+	}
 </script>
 
 <template>
@@ -374,11 +389,11 @@
 			<view class="footer plr30 bfff shadow">
 				<!-- 未缴纳押金 -->
 				<template v-if="mode.code == 0">
-					<view class="btn black" @click="depositsPay">缴纳押金</view>
+					<view class="btn black" @click="$refs.payPwdRef.open()">缴纳押金</view>
 				</template>
 				<template v-else>
 					<view class="rows">
-						<view class="btn cancel plr30" @click="outDepositsPay">退回押金</view>
+						<view class="btn cancel plr30" @click="outDepositsPayAlt">退回押金</view>
 						<view class="btn colourful f1" @click="handleModeCode('form')">申请入驻</view>
 					</view>
 				</template>
@@ -400,7 +415,7 @@
 			<view class="fill" style="height: 160rpx;"></view>
 
 			<view class="footer rows plr30 bfff shadow">
-				<view class="btn cancel f1" @click="outDepositsPay">取消申请并退回押金</view>
+				<view class="btn cancel f1" @click="outDepositsPayAlt">取消申请并退回押金</view>
 			</view>
 		</view>
 	</template>
@@ -423,7 +438,7 @@
 			<view class="fill" style="height: 160rpx;"></view>
 
 			<view class="footer rows plr30 bfff shadow">
-				<view class="btn cancel plr30" @click="outDepositsPay">退回押金</view>
+				<view class="btn cancel plr30" @click="outDepositsPayAlt">退回押金</view>
 				<view class="btn colourful f1" @click="handleModeCode('form')">修改信息</view>
 			</view>
 		</view>
@@ -440,7 +455,7 @@
 			<view class="fill" style="height: 160rpx;"></view>
 
 			<view class="footer plr30 bfff shadow">
-				<view class="btn cancel plr30" @click="outDepositsPay">退回押金并放弃商家身份</view>
+				<view class="btn cancel plr30" @click="outDepositsPayAlt">退回押金并放弃商家身份</view>
 			</view>
 		</view>
 	</template>
@@ -550,12 +565,14 @@
 
 		<view class="footer plr30 bfff shadow">
 			<view class="rows">
-				<view class="btn cancel plr30" @click="outDepositsPay">退回押金</view>
+				<view class="btn cancel plr30" @click="outDepositsPayAlt">退回押金</view>
 				<view class="btn colourful f1" @click="handleSubmit">申请入驻</view>
 			</view>
 		</view>
 	</template>
 
+	<!-- 二级密码 -->
+	<payPwd ref="payPwdRef" :check="true" @confirm="handlePayPwd" />
 </template>
 
 <style lang="scss">
diff --git a/jiuyi2/pages/shop/store/index.vue b/jiuyi2/pages/shop/store/index.vue
index b52aa356..678a3638 100644
--- a/jiuyi2/pages/shop/store/index.vue
+++ b/jiuyi2/pages/shop/store/index.vue
@@ -1,65 +1,17 @@
-<template>
-	<view class="jy-store-detail">
-		<JyStoreHead></JyStoreHead>
-		<!-- <JyStore cardMod="store"></JyStore> -->
-
-		<!-- 店铺卡片 -->
-		<view class="jy-shop-card df aic jcsb p25 mt40 bfff">
-			<view class="jy-shop-card-header">
-				<!-- 店铺头像 -->
-				<image class="jy-shop-card-header-img" src="" mode="aspectFill"></image>
-				<!-- 店铺信息 名称 评分 关注数量 -->
-				<view class="jy-shop-card-header-info">
-					<!-- 店铺名称 -->
-					<view class="jy-shop-card-header-info-name">
-						<text>店铺名称</text>
-					</view>
-					<view class="df aic">
-						<!-- 评分 -->
-						<view class="f24 c666 df aic ">
-							<uni-rate class="mr10" :value="4.5" :size="12" activeColor="#FF9B27" disabled
-								:showScore="true"></uni-rate>
-							<text>4.5</text>
-						</view>
-						<!-- 垂直分割线 -->
-						<view class="jy-shop-card-header-info-line"></view>
-						<!-- 关注数量 -->
-						<view class="c666 f24">
-							<text>123关注</text>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<view v-if="cardMod == 'store'" class="jy-shop-card-header-follow-g">
-				<view class="btn" @click="followButton">
-					<uni-icons class="mr10" color="#FF9B27" type="plusempty" size="13" />
-					<text>关注</text>
-				</view>
-				<view class="btn df aic">
-					<image class="kefu" :src="customerService" /><text>客服</text>
-				</view>
-			</view>
-		</view>
-
-		<view class="bfff content">
-			<!-- 筛选 -->
-			<!-- <JyScreen @status="statusScreening" :filteredList="filteredList"></JyScreen> -->
-			<!-- 内容 -->
-			<JyContent :conditions="conditions"></JyContent>
-			<!-- 筛选详情弹窗 -->
-		</view>
-	</view>
-</template>
 <script setup>
+	// 店铺首页
 	import {
 		ref
 	} from 'vue'
-	import JyStoreHead from './components/jy-store-head'
-	// import JyContent from '@/components/public/jy-shop-content'
-	// import JyScreen from '../search/components/jy-screen'
-	// import JyStore from '../commodity/components/jy-store'
-	const conditions = ref({})
+	import {
+		onLoad,
+		onPageScroll
+	} from '@dcloudio/uni-app';
+
+	// 顶部
+	import apex from '@/components/header/apex.vue'
+	// 商品列表
+	import productList from '@/components/shop/productList/productList'
 
 	const filteredList = ref([{
 		label: '默认',
@@ -82,20 +34,83 @@
 		isUpDown: true,
 		slot: null
 	}])
-	const statusScreening = (val) => {
-		conditions.value = val
-		conditions.value.currentId = val.label
-		val.fun && fun[val.fun]()
-	}
-</script>
-<style lang="scss" scoped>
-	.jy-store-detail {
-		height: auto;
-		background: linear-gradient(50deg, #DBFCE9 -7%, #FFFBF3 50%, #FEEEDB 82%, #FEE3CD 102%);
+	// 顶部导航背景颜色
+	const apexBgColor = ref('#ffffff00')
 
-		.content {
-			border-top-left-radius: 40rpx;
-			border-top-right-radius: 40rpx;
-		}
+	onPageScroll((ev) => {
+		apexBgColor.value = ev.scrollTop > 44 ? '#fff' : '#ffffff00'
+	})
+</script>
+
+<template>
+	<view class="app">
+		<!-- 个人中心 我的卡片 -->
+		<apex :bgColor="apexBgColor" mode="flex">
+			<template #content>
+				<view class="search df jcr">
+					<view class="">
+						<image class="wh50" src="/static/share2.png" mode="aspectFit" />
+					</view>
+				</view>
+			</template>
+		</apex>
+
+		<!--  -->
+		<view class="shopHeaderBg"></view>
+
+		<!-- 店铺卡片 -->
+		<view class="store pr rows ptb25 plr25 mt40">
+			<!-- 店铺头像 -->
+			<image class="wh120 fs0 br10" src="/static/logo.png" mode="aspectFill" />
+			<!-- 店铺信息 名称 评分 关注数量 -->
+			<view class="info f1 ml20">
+				<!-- 店铺名称 -->
+				<view class="c333 f28">
+					<text>店铺名称</text>
+				</view>
+
+				<view class="df aic mt10">
+					<!-- 评分 -->
+					<view class="f24 c666 df aic" v-if="0">
+						<uni-rate class="mr10" :value="4.5" :size="12" activeColor="#FF9B27" readonly
+							:showScore="true"></uni-rate>
+						<text>4.5</text>
+					</view>
+					<!-- 关注数量 -->
+					<view class="c666 f24">
+						<text>123关注</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 按钮区 -->
+			<view class="btns w150">
+				<view>
+					<view class="btn ti warmHollow fmid" @click="followButton">
+						<uni-icons class="mr10" color="#FF9B27" type="plusempty" size="13" />
+						<text>关注</text>
+					</view>
+				</view>
+
+				<view class="mt10">
+					<view class="btn ti warmHollow fmid">
+						<image class="kefu wh30" src="/static/customer-service1.png" mode="aspectFit" />
+						<text>客服</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 商品列表 -->
+		<view class="product oh ptb30 plr30">
+			<productList ref="product" />
+		</view>
+	</view>
+</template>
+
+<style lang="scss" scoped>
+	// 
+	.store {
+		// margin-top: -50rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/jiuyi2/pages/shop/store/order.vue b/jiuyi2/pages/shop/store/order.vue
new file mode 100644
index 00000000..0757d2e1
--- /dev/null
+++ b/jiuyi2/pages/shop/store/order.vue
@@ -0,0 +1,173 @@
+<script setup>
+	// 商家订单
+	import {
+		ref,
+		reactive
+	} from 'vue'
+	import {
+		onLoad,
+		onPageScroll
+	} from '@dcloudio/uni-app';
+	// 顶部
+	import apex from '@/components/header/apex.vue'
+	//顶部条件栏
+	import JyShopNavigation from '@/components/public/jy-shop-navigation'
+	// 产品图片
+	// import JyOrderCard from '@/components/public/jy-order-card'
+	import orderItem from '@/components/shop/order/item.vue';
+	// 工具库
+	import util from '@/common/js/util';
+
+	// tabs
+	const tabs = reactive([{
+			id: '',
+			name: '全部'
+		},
+		{
+			id: 2,
+			name: '待付款'
+		},
+		{
+			id: 3,
+			name: '待发货'
+		},
+		{
+			id: 4,
+			name: '待收货'
+		},
+		{
+			id: 6,
+			name: '售后/退款'
+		}
+	])
+
+	// 列表
+	const list = reactive({
+		data: [{
+			status: 1,
+			status_text: '待付款',
+		}, {
+			status: 2,
+			status_text: '待发货',
+		}, {
+			status: 3,
+			status_text: '待收货',
+		}, {
+			status: 6,
+			status_text: '售后中',
+		}],
+	})
+	// 
+	const params = reactive({
+		currentTab: 0,
+		search: ''
+	})
+	// 顶部导航背景颜色
+	const apexBgColor = ref('#ffffff00')
+
+	onLoad((options) => {
+		// this.params.currentTab = options.currentTab / 1
+	})
+
+	onPageScroll((ev) => {
+		apexBgColor.value = ev.scrollTop > 44 ? '#fff' : '#ffffff00'
+	})
+
+	/**
+	 * 点击订单列表项
+	 * @param {Object} ev 订单列表项
+	 */
+	function handleItem(ev) {
+		uni.navigateTo({
+			url: util.setUrl('/pages/shop/order/detail')
+		})
+	}
+</script>
+
+<template>
+	<apex :bgColor="apexBgColor" mode="flex">
+		<template #content>
+			<view class="search rows f1 mr30 plr20 bf8f8f8 br10">
+				<uni-icons type="search" color="#999" />
+				<input class="input ml20" type="text" placeholder="搜索内容" />
+			</view>
+		</template>
+	</apex>
+
+	<view class="app">
+		<view class="shopHeaderBg bgColor"></view>
+
+		<view class="f1 pr">
+			<JyShopNavigation :current="params.currentTab" :list="tabs" @tabItemClick="itemClick" marright="25px"
+				activeWeight='600' activeColor="#333333" activeBarColor="initial" />
+		</view>
+
+		<view class="product mlr20 pr">
+			<!-- 订单列表 -->
+			<view class="order">
+				<template v-for="(item,index) in list.data" :key="index">
+					<view class="mtb30">
+						<orderItem :item="item" mode="mine" @item="handleItem">
+							<template #menu="scope">
+								<!-- 收货地址 -->
+								<view class="menu rows ptb20" v-if="[2,3,4,5,6].includes(scope.item.status)">
+									<view class="key fs0 c333">收货地址</view>
+									<view class="value f1 ml20">
+										<view class="c333 f28">收货地址</view>
+										<view class="mt10 c666 f24">
+											<text>姓名</text>
+											<text>1397897890</text>
+										</view>
+									</view>
+								</view>
+								<!-- 退款原因 -->
+								<view class="menu rows ptb20" v-if="[6].includes(scope.item.status)">
+									<view class="key fs0 c333">退款原因</view>
+									<view class="value f1 ml20">
+										<view class="c333 f28">不想要了</view>
+										<view class="imgList mt10 c666 f24">
+											<template v-for="(item,index) in 3" :key="index">
+												<image class="imgs wh80 br10" src="/static/logo.png" mode="aspectFill" />
+											</template>
+										</view>
+									</view>
+								</view>
+								<!-- 操作按钮 -->
+								<view class="menu ptb20 df jcr" v-if="[1,2,6].includes(scope.item.status)">
+									<template v-if="scope.item.status == 1">
+										<view class="btn bar warmHollow plr30">修改价格</view>
+									</template>
+									<template v-if="scope.item.status == 2">
+										<view class="btn bar warmHollow plr30">发货</view>
+									</template>
+									<template v-if="scope.item.status == 6">
+										<view class="btn bar closeHollow plr30">拒绝退款</view>
+										<view class="btn bar closeHollow plr30">同意退款</view>
+										<view class="btn bar warmHollow plr30">联系用户</view>
+									</template>
+								</view>
+							</template>
+						</orderItem>
+					</view>
+				</template>
+			</view>
+			<!-- <JyOrderCard v-for="(item, index) in 10" type="user_order"></JyOrderCard> -->
+		</view>
+	</view>
+</template>
+
+<style scoped lang="scss">
+	// 搜索
+	.search {
+		height: 30px;
+	}
+
+	// 背景颜色
+	.bgColor {
+		height: 300rpx;
+	}
+
+	.menu {
+		border-top: 2rpx solid #eee;
+	}
+</style>
\ No newline at end of file
diff --git a/jiuyi2/readme.md b/jiuyi2/readme.md
index b7fcff28..5d1d0c16 100644
--- a/jiuyi2/readme.md
+++ b/jiuyi2/readme.md
@@ -59,7 +59,7 @@ updateVideo 触发视频修改
 collectsVideo 收藏夹视频端
 commentVideo 视频评论
 deleteVideo 删除视频
-
+selectAddress 选择地址
 
 缓存
 ---
@@ -69,6 +69,7 @@ alarmAlt 闹铃
 
 
 
+
 gitlab
 ---
 前端地址
@@ -376,8 +377,11 @@ call_type 通话类型 2为视频，1是音频
 "likeStatus": "1" // 1 公开赞  2私有赞 0 没有赞
 
 
-
 type
 0 非好友
 1 好友
 
+生成订单到平台客服 平台客服去跟进订单
+
+
+
diff --git a/jiuyi2/static/customer-service1.png b/jiuyi2/static/customer-service1.png
index ae2eeb6f13e310110360145ab554f30ff3deb134..ab3623e9026c4b8ed98762ab8251a3fe5bd571d1 100644
GIT binary patch
delta 635
zcmV->0)+kG0*wVBiBL{Q4GJ0x0000DNk~Le0000P0000L2nGNE0JAGa7?B|#e*!m2
zL_t(YiLI4QQW{Ydg}?IvopyH63`A#<6{ssny91~Sq#S8h0Ia~u$Wl@TSwV0GAu9;Z
z04Hw;VH(r)&EO%L01DAFeEse@@7%sW;u+XwDIv!@O#5IlD8ldnh#u%#wPF7$4y`1=
z+NpqR0N|`oX5X2bhrEY0CZ`yue*=sJ<jJh1598k2BG%qL2hPBn<nKPI>L)87(}^R}
zt<!K{UDZY(pB1ssr4E@6nd(R<L%)iAA?{)?CTHJp*4O)S_3=0Nw}VmxBiU2{Kqo`b
zR7Yeww05bn)Jd?t{gcd&SLJpc*ws!2xelp{_YZw=l5U-1_?HL(sD9hUfAAEtxtmAn
zQW8q?6(D+{<QGINMi$w{Ui=dNhj^Rw$S(F`^7eJsXdc)HYpOPGZ7k3(H9$=ak1PTW
zNL6*S+)Y#)zfo;e1|5N#c3Da`5(xLtu&k{5s7U^<h%up%H5^8QWnbpj!iebObg+>P
zrvs2z{dNEl8aTVgNE|3ye;OoPe!dFf{*uX{$SoeeJ{&MW?(O}7b>awYAJff7Or{%*
zIK<Boc>9`nsL?|<z*GUC@T>gPU|i7X#1X%@e*|*tB4SJxOjQ>;G%F)KB8IG``lz^x
z01zgIh;i1R2~0>;RDIZ8xla~e+TJ|}tIP|<@Sqk<neQF4mg=|NQGa9eYYAMI60izs
zb{v)#khfE?4(2>$EvC7?PHz3O__ag=6p_zE3go6ys2Q73xO?{B{eQY(@YKqEj6X<d
V{P=O;BPsv@002ovPDHLkV1myjAiMwo

delta 332
zcmV-S0ki&%1>gc9iBL{Q4GJ0x0000DNk~Le0000C0000B2nGNE084OeUy&gne*p?f
zL_t(2k#&%<N<wiM#ed)R4mWTV8f*}Z`@e_}&=~Xz4GnIo`4B-pK#)Ts`4?Jp>ji>d
zpxqFIpa%$C931k08musHp7EUDIedJ^n&e#r(-E=-0H%asPu8A}*pz&FBkvk{-!<gj
z^<Q(~I`Zx~xAL2(CmOiUdf{Okf4s>=>Sq;9WeuzKt?;l~$5d87t3<@=VucopFVw3Q
zb8xR#B*d3kp+&52glT5Y$(W!QqEO1sN1=o?w&rAvX%<72tODDGF#o48UuA%7Cn79I
z^3EfBwzJm{0Nth~`Tf1`LIPwOrgtdZTkd9`9fD3V-jN+3y&;|djK%q%B782OkRU3E
eM{7^7*3&OUKyU<BPX3Mn0000<MNUMnLSTYhmyTZm

diff --git a/jiuyi2/static/share2.png b/jiuyi2/static/share2.png
index d12cd89770b6b5986fb4f8cffee17fd4a619da46..2537d1c10ab80b83213eee05bd7416495aab2da3 100644
GIT binary patch
delta 421
zcmV;W0b2g`0l5PqiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj#4e*t4j
zL_t(&f$f>?ZG$irMUOfGBX|Tx@CNM&86g`mLPqEa?FNj{Zjfw{Y|#Dy%g6$oNA22?
z-jOVjc((5af5;C|6h+yf13rK&VCqVd(*a+=&s?6$L@55LOf1D;f&1dVc@v>{gBRYf
zJZp+I@!$=ZNKAEN!j=YH?E6M+e>E)If<glhXX0E|+I}qSZ*$84z#G#SX_}aUEW8Ng
z4KU(`Ez2lu>m1a-&utVNR$+&08&yc`3tS>?Nnb{ie$n`_A!rTB5bBubh1>iFsmK^^
z)wl@j9hn0bKcup8bTa<6UY`owJBgiun^4G6TtCTWR=Nr`hZ?Aj8mLWadjp?LE6SsA
zKS|s!{9lZ7e>N4UL#Q@tpf+ltHfo?YYM?fI4Sdhn<Pk3uX1?B1fqM<OhF;}b#8@T+
z4>BHM4ad?d5<1|7KhS4Sa1F#0TRDp~eX|>j|8bXFv`a0XN{Lq#r9plHX(X(&r7s^o
P00000NkvXXu0mjfS7fgo

delta 224
zcmV<603ZLk1N8wRiBL{Q4GJ0x0000DNk~Le0000F0000J2nGNE08heKs*xcde*m9J
zL_t(Ijm^`s4Z<)Gh2c*j1rwl@8H9?8fhZ8mQ6jdWV+co>#z81xJ1LNOl4a}e{&!dS
z$ZLyxx)*5#<5Gk7j&aEZ-J~#147)i7qhclw8uU0Lq~c4)bf5Ae)%Vilfc6Uzzr<P`
z6DMTA96TC?Qb9G>6p~fd;9Je0HZ)q1`{~$!3=i_3B&Rio6?WL*ipLDF#VIxZSd7|v
aEyfetW-)OW)XT;I0000<MNUMnLSTZ=zFMvT

diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index 5f1de332..739ef151 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -10,32 +10,32 @@ export default defineConfig({
 		port: 5173,
 		proxy: {
 			"/system": {
-				// target: "http://192.168.0.104:8080",
+				// target: "http://192.168.0.189:8080",
 				target: "http://192.168.0.107:8080",
 				changeOrigin: true,
 			},
 			"/shopify": {
-				// target: "http://192.168.0.104:8080",
+				// target: "http://192.168.0.189:8080",
 				target: "http://192.168.0.107:8080",
 				changeOrigin: true,
 			},
 			"/user": {
-				// target: "http://192.168.0.104:8080",
+				// target: "http://192.168.0.189:8080",
 				target: "http://192.168.0.107:8080",
 				changeOrigin: true,
 			},
 			"/coreplay": {
-				// target: "http://192.168.0.104:8080",
+				// target: "http://192.168.0.189:8080",
 				target: "http://192.168.0.107:8080",
 				changeOrigin: true,
 			},
 			"/file": {
-				// target: "http://192.168.0.104:8080",
+				// target: "http://192.168.0.189:8080",
 				target: "http://192.168.0.107:8080",
 				changeOrigin: true,
 			},
 			"/video": {
-				// target: "http://192.168.0.104:8080",
+				// target: "http://192.168.0.189:8080",
 				target: "http://192.168.0.107:8080",
 				changeOrigin: true,
 			},