diff --git a/http/api/cateGory.js b/http/api/cateGory.js
index f0fa636..b35c16d 100644
--- a/http/api/cateGory.js
+++ b/http/api/cateGory.js
@@ -14,6 +14,16 @@ export function categoryPage(data, urlType = 'product') {
 		}
 	})
 }
+/**
+ * 获取分类详情
+ * @returns
+ */
+export function getCategoryDetail(id, urlType = 'product') {
+	return request({
+		url: `${urlType}/admin/prod/category/`+id,
+		method: "GET",
+	})
+}
 
 /**
  * 分类添加
diff --git a/http/api/cons.js b/http/api/cons.js
index db30404..a9812ca 100644
--- a/http/api/cons.js
+++ b/http/api/cons.js
@@ -14,7 +14,19 @@ export function getConsPage(data, urlType = 'product') {
 		}
 	})
 }
-
+/**
+ * 耗材库存列表接口
+ * @returns
+ */
+export function getConsStock(data, urlType = 'product') {
+	return request({
+		url: `${urlType}/admin/product/cons/consStock`,
+		method: "GET",
+		data: {
+			...data
+		}
+	})
+}
 /**
  * 获取耗材列表
  * @returns
diff --git a/pageCategory/edit-category/edit-category.vue b/pageCategory/edit-category/edit-category.vue
index 4311a81..971dd65 100644
--- a/pageCategory/edit-category/edit-category.vue
+++ b/pageCategory/edit-category/edit-category.vue
@@ -13,15 +13,22 @@
 						</view>
 						<view class="">
 							<uni-forms-item label="分类名称" required name="name">
-								<uni-easyinput padding-none :placeholderStyle="'font-size:28rpx;'"
-									:inputBorder="false" v-model="category.name" placeholder="输入分类名称" />
+								<uni-easyinput padding-none :placeholderStyle="'font-size:28rpx;'" :inputBorder="false"
+									v-model="category.name" placeholder="输入分类名称" />
+							</uni-forms-item>
+						</view>
+						<view class="">
+							<uni-forms-item label="退菜是否退库存" required name=" refundMode">
+								<up-radio-group v-model="category.refundMode" placement="row">
+									<up-radio v-for="(item, index) in refundModes" :key="index" :label="item.name"
+										:name="item.value" activeColor="rgb(49, 138, 254)"></up-radio>
+								</up-radio-group>
 							</uni-forms-item>
 						</view>
 						<template v-if="option.type==='edit'">
 							<uni-forms-item label="排序" required name="sort">
-								<uni-easyinput padding-none :placeholderStyle="'font-size:28rpx;'"
-									:inputBorder="false" v-model="category.sort" type="number"
-									placeholder="排序越小越靠前" />
+								<uni-easyinput padding-none :placeholderStyle="'font-size:28rpx;'" :inputBorder="false"
+									v-model="category.sort" type="number" placeholder="排序越小越靠前" />
 							</uni-forms-item>
 						</template>
 						<uni-forms-item label="">
@@ -34,7 +41,7 @@
 						</uni-forms-item>
 
 					</view>
-					
+
 				</uni-forms>
 			</view>
 
@@ -42,23 +49,44 @@
 				<button class="save-btn" hover-class="btn-hover-class" @click="save">保存</button>
 			</view>
 		</view>
- 
-		
+
+
 
 
 	</view>
 </template>
 
 <script setup>
-	import { reactive, ref } from 'vue';
+	import {
+		reactive,
+		ref
+	} from 'vue';
 	import go from '@/commons/utils/go.js';
 	import infoBox from '@/commons/utils/infoBox.js';
 	import mySwitch from '@/components/my-components/my-switch'
 	import myUploadFile from '@/components/my-components/my-upload-file'
-	import { onLoad, onReady } from '@dcloudio/uni-app';
-	import { addCategory, putCategory } from '@/http/api/cateGory.js'
-	
-	
+	import {
+		onLoad,
+		onReady
+	} from '@dcloudio/uni-app';
+	import {
+		addCategory,
+		putCategory
+	} from '@/http/api/cateGory.js'
+	const refundModes = [{
+			name: "退菜退库存",
+			value: 1
+		},
+		{
+			name: "仅退菜不退库存",
+			value: 2
+		},
+		{
+			name: "每次询问-退菜后弹窗提示",
+			value: 3
+		},
+	]
+
 	// 构造分类的基础数据
 	const category = reactive({
 		name: '',
@@ -96,7 +124,7 @@
 			title: option.type === 'add' ? '添加分类' : '编辑分类'
 		})
 	})
-	
+
 	/**
 	 * 校验是否有值
 	 * @param {Object} obj
@@ -121,6 +149,7 @@
 				}
 			}
 		}
+
 		function validateFunc(key, value) {
 			if (validateFuncObj.hasOwnProperty(key)) {
 				const func = validateFuncObj[key]
@@ -137,7 +166,7 @@
 		resultArr = resultArr.filter(v => !v.pass)
 		return resultArr
 	}
-	
+
 	/**
 	 * 图片选择
 	 * @param {Object} val
@@ -147,7 +176,7 @@
 	function onfileChange(val, data, key) {
 		data[key] = val
 	}
-	
+
 	/**
 	 * 保存
 	 */
@@ -157,7 +186,7 @@
 		const formRules = {}
 		const result = []
 		result.push(...returnValidateResult(category))
-	
+
 		if (result.length) {
 			return infoBox.showToast(result[0].errMeessage)
 		}
@@ -178,7 +207,7 @@
 			uni.$emit('update:pageCategoryIndex')
 			go.back()
 		}, 500);
-		
+
 
 	}
 </script>
diff --git a/pageConsumables/addConsumables.vue b/pageConsumables/addConsumables.vue
index cdd5a1d..ed03caa 100644
--- a/pageConsumables/addConsumables.vue
+++ b/pageConsumables/addConsumables.vue
@@ -18,6 +18,12 @@
 				<view>预警值</view>
 				<view><input type="number" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id="" /></view>
 			</view>
+			<view>
+				<view>是否检测耗材</view>
+				<up-switch size="20" :inactive-value="0" :active-value="1" v-model="datas.form.isStock"></up-switch>
+			</view>
+
+
 			<view v-if="!datas.form.id" style="justify-content: space-between">
 				<view>耗材类型</view>
 				<view style="width: 54%" @tap="datas.show = !datas.show">
@@ -55,7 +61,8 @@
 					<view class="label">默认入库单位</view>
 					<view class="ipt">
 						<u-radio-group v-model="datas.form.defaultUnit">
-							<u-radio :name="item" :label="item" v-for="(item, index) in unitList" :key="index"></u-radio>
+							<u-radio :name="item" :label="item" v-for="(item, index) in unitList"
+								:key="index"></u-radio>
 						</u-radio-group>
 					</view>
 				</view>
@@ -63,226 +70,252 @@
 		</view>
 	</template>
 	<view class="bottombutton">
-		<up-button type="primary" style="background-color: #318afe; color: #fff" @tap="sumbit" :plain="true" text="保存"></up-button>
+		<up-button type="primary" style="background-color: #318afe; color: #fff" @tap="sumbit" :plain="true"
+			text="保存"></up-button>
 	</view>
-	<up-picker :show="datas.show" :columns="datas.typeList" keyName="name" @cancel="datas.show = false" @confirm="confirmConsGroup"></up-picker>
+	<up-picker :show="datas.show" :columns="datas.typeList" keyName="name" @cancel="datas.show = false"
+		@confirm="confirmConsGroup"></up-picker>
 	<!-- 消息提示 -->
 	<up-toast ref="uToastRef"></up-toast>
 	<u-picker :show="unitShow" :columns="unitList"></u-picker>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
+	import {
+		ref,
+		reactive
+	} from 'vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
 
-import { getConsGrpupList, addCons, editCons } from '@/http/api/cons.js';
+	import {
+		getConsGrpupList,
+		addCons,
+		editCons
+	} from '@/http/api/cons.js';
 
-let datas = reactive({
-	show: false,
-	form: {
-		conUnit: '',
-		conName: '',
-		price: '',
-		conWarning: 999,
-		consGroupId: null,
-		conUnitTwo: '', // 第二单位
-		conUnitTwoConvert: '', // 第二单位转换数量
-		defaultUnit: ''
-	},
-	consGroupName: '',
-	typeList: []
-});
-
-onLoad((options) => {
-	if (options && options.item) {
-		let obj = JSON.parse(decodeURIComponent(options.item));
-		datas.form = obj;
-
-		unitList.value = [];
-		if (datas.form.conUnit !== '') {
-			unitList.value.push(datas.form.conUnit);
-		}
-		if (datas.form.conUnitTwo !== '') {
-			unitList.value.push(datas.form.conUnitTwo);
-		}
-		console.log('datas.form', datas.form);
-		console.log('unitList.value', unitList.value);
-	} else {
-		gettbConsTypeList();
-	}
-	uni.setNavigationBarTitle({
-		title: !datas.form.id ? '添加耗材' : '编辑耗材'
+	let datas = reactive({
+		show: false,
+		form: {
+			conUnit: '',
+			conName: '',
+			price: '',
+			conWarning: 999,
+			consGroupId: null,
+			conUnitTwo: '', // 第二单位
+			conUnitTwoConvert: '', // 第二单位转换数量
+			defaultUnit: '',
+			isStock: 1,
+		},
+		consGroupName: '',
+		typeList: []
 	});
-});
 
-/**
- * 获取耗材类别
- */
-let gettbConsTypeList = () => {
-	getConsGrpupList({
-		page: 1,
-		size: 30
-	}).then((res) => {
-		datas.typeList = [res];
+	onLoad((options) => {
+		if (options && options.item) {
+			let obj = JSON.parse(decodeURIComponent(options.item));
+			datas.form = obj;
+
+			unitList.value = [];
+			if (datas.form.conUnit !== '') {
+				unitList.value.push(datas.form.conUnit);
+			}
+			if (datas.form.conUnitTwo !== '') {
+				unitList.value.push(datas.form.conUnitTwo);
+			}
+			console.log('datas.form', datas.form);
+			console.log('unitList.value', unitList.value);
+		} else {
+			gettbConsTypeList();
+		}
+		uni.setNavigationBarTitle({
+			title: !datas.form.id ? '添加耗材' : '编辑耗材'
+		});
 	});
-};
 
-function confirmConsGroup(e) {
-	datas.show = false;
-	datas.form.consGroupId = e.value[0].id;
-	datas.consGroupName = e.value[0].name;
-}
+	/**
+	 * 获取耗材类别
+	 */
+	let gettbConsTypeList = () => {
+		getConsGrpupList({
+			page: 1,
+			size: 30
+		}).then((res) => {
+			datas.typeList = [res];
+		});
+	};
 
-let sumbit = async () => {
-	let conUnitdata = datas.form.conUnit.replace(/(^\s*)|(\s*$)/g, '');
-	if (!conUnitdata) {
-		uni.$utils.showToast('单位不能为空');
-		return;
+	function confirmConsGroup(e) {
+		datas.show = false;
+		datas.form.consGroupId = e.value[0].id;
+		datas.consGroupName = e.value[0].name;
 	}
-	if (!datas.form.price) {
-		uni.$utils.showToast('价格不能为空');
-		return;
-	}
-	if (!datas.form.consGroupId) {
-		uni.$utils.showToast('耗材类型不能为空');
-		return;
-	}
-	if (!datas.form.id) {
-		await addCons({ ...datas.form });
-	} else {
-		await editCons({ ...datas.form });
-	}
-	uni.navigateBack();
-};
 
-// 显示选择单位
-const unitShow = ref(false);
-// 单位列表
-const unitList = ref([]);
+	let sumbit = async () => {
+		let conUnitdata = datas.form.conUnit.replace(/(^\s*)|(\s*$)/g, '');
+		if (!conUnitdata) {
+			uni.$utils.showToast('单位不能为空');
+			return;
+		}
+		if (!datas.form.price) {
+			uni.$utils.showToast('价格不能为空');
+			return;
+		}
+		if (!datas.form.consGroupId) {
+			uni.$utils.showToast('耗材类型不能为空');
+			return;
+		}
+		if (!datas.form.id) {
+			await addCons({
+				...datas.form
+			});
+		} else {
+			await editCons({
+				...datas.form
+			});
+		}
+		uni.navigateBack();
+	};
+
+	// 显示选择单位
+	const unitShow = ref(false);
+	// 单位列表
+	const unitList = ref([]);
 </script>
 <style>
-page {
-	background-color: #f9f9f9;
-}
+	page {
+		background-color: #f9f9f9;
+	}
 </style>
 <style scoped lang="less">
-.topTitle {
-	font-weight: 400;
-	font-size: 32rpx;
-	color: #333333;
-	margin: 32rpx 28rpx;
-}
+	.topTitle {
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #333333;
+		margin: 32rpx 28rpx;
+	}
 
-.addConsumables {
-	width: 694rpx;
-	background: #ffffff;
-	border-radius: 18rpx 18rpx 18rpx 18rpx;
-	margin: 32rpx;
-	padding: 24rpx;
-	box-sizing: border-box;
+	.addConsumables {
+		width: 694rpx;
+		background: #ffffff;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		margin: 32rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
 
-	> view {
-		> view {
-			width: 646rpx;
-			height: 84rpx;
-			background: #fcfcfc;
-			border: 2rpx solid #f9f9f9;
-			margin-top: 32rpx;
-			.df;
-
-			> view:first-child {
-				width: 190rpx;
+		>view {
+			>view {
+				width: 646rpx;
 				height: 84rpx;
-				line-height: 84rpx;
-				// text-align: left;
-				padding-left: 24rpx;
-				background: #f9f9f9;
-				border-radius: 8rpx 0rpx 0rpx 8rpx;
+				background: #fcfcfc;
 				border: 2rpx solid #f9f9f9;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 32rpx;
-				color: #333333;
+				margin-top: 32rpx;
+				.df;
+
+				>view:first-child {
+					width: 240rpx;
+					height: 84rpx;
+					line-height: 84rpx;
+					// text-align: left;
+					padding-left: 24rpx;
+					background: #f9f9f9;
+					border-radius: 8rpx 0rpx 0rpx 8rpx;
+					border: 2rpx solid #f9f9f9;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 32rpx;
+					color: #333333;
+				}
 			}
 		}
 	}
-}
 
-.bottombutton {
-	margin-top: 84rpx;
-	padding: 0 24rpx;
+	.bottombutton {
+		margin-top: 84rpx;
+		padding: 0 24rpx;
 
-	> button {
-		width: 530rpx;
-		height: 80rpx;
-		border-radius: 56rpx 56rpx 56rpx 56rpx;
-	}
-}
-
-.status {
-	margin: 0 32rpx;
-	position: absolute;
-	// top: 100%;
-	left: 0;
-	right: 0;
-	z-index: 10;
-	background-color: #fff;
-}
-
-.df() {
-	display: flex;
-	align-items: center;
-}
-.tips-wrap {
-	--pColor: #e6a23c;
-	--iColor: #fdf6ec;
-	padding: 0 28upx;
-	.content {
-		display: flex;
-		align-items: center;
-		padding: 28upx;
-		background-color: var(--iColor);
-
-		.info {
-			display: flex;
-			flex-direction: column;
-			padding-left: 10px;
-			gap: 8upx;
-			.t1 {
-				font-size: 32upx;
-				color: var(--pColor);
-			}
-			.t2 {
-				font-size: 24upx;
-				color: var(--pColor);
-			}
+		>button {
+			width: 530rpx;
+			height: 80rpx;
+			border-radius: 56rpx 56rpx 56rpx 56rpx;
 		}
 	}
-}
-.form-wrap {
-	padding: 28upx 28upx 0;
-	.form {
-		padding: 28upx;
+
+	.status {
+		margin: 0 32rpx;
+		position: absolute;
+		// top: 100%;
+		left: 0;
+		right: 0;
+		z-index: 10;
 		background-color: #fff;
-		border-radius: 16upx;
 	}
-	.row {
-		height: 84upx;
+
+	.df() {
 		display: flex;
-		gap: 20upx;
 		align-items: center;
-		background-color: #fcfcfc;
-		padding: 0 20upx;
-		&:not(:last-child) {
-			margin-bottom: 28upx;
-		}
-		.label {
-			font-size: 32upx;
-			color: #333;
-		}
-		.ipt {
-			flex: 1;
+	}
+
+	.tips-wrap {
+		--pColor: #e6a23c;
+		--iColor: #fdf6ec;
+		padding: 0 28upx;
+
+		.content {
+			display: flex;
+			align-items: center;
+			padding: 28upx;
+			background-color: var(--iColor);
+
+			.info {
+				display: flex;
+				flex-direction: column;
+				padding-left: 10px;
+				gap: 8upx;
+
+				.t1 {
+					font-size: 32upx;
+					color: var(--pColor);
+				}
+
+				.t2 {
+					font-size: 24upx;
+					color: var(--pColor);
+				}
+			}
 		}
 	}
-}
-</style>
+
+	.form-wrap {
+		padding: 28upx 28upx 0;
+
+		.form {
+			padding: 28upx;
+			background-color: #fff;
+			border-radius: 16upx;
+		}
+
+		.row {
+			height: 84upx;
+			display: flex;
+			gap: 20upx;
+			align-items: center;
+			background-color: #fcfcfc;
+			padding: 0 20upx;
+
+			&:not(:last-child) {
+				margin-bottom: 28upx;
+			}
+
+			.label {
+				font-size: 32upx;
+				color: #333;
+			}
+
+			.ipt {
+				flex: 1;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pageConsumables/warehouseEntry.vue b/pageConsumables/warehouseEntry.vue
index 61222f7..f773c7e 100644
--- a/pageConsumables/warehouseEntry.vue
+++ b/pageConsumables/warehouseEntry.vue
@@ -11,26 +11,26 @@
 			</view>
 			<view>
 				<view> <text style="color: red;">*</text> 入库时间 </view>
-				<view > 	
-					 <up-datetime-picker
-						hasInput
-					    v-model="datas.form.inOutDate"
-					    mode="date"
-						
-					    ></up-datetime-picker>
+				<view>
+					<up-datetime-picker hasInput v-model="datas.form.inOutDate" mode="date"></up-datetime-picker>
 				</view>
 			</view>
 			<view>
 				<view> <text style="color: red;">*</text> 入库数量 </view>
-				<view> <input type="number" placeholder="请输入数量" v-model="datas.form.bodyList.inOutNumber" @change="datas.form.bodyList.inOutNumber = $utils.isNumber(datas.form.bodyList.inOutNumber)" name="" id=""> </view>
+				<view> <input type="number" placeholder="请输入数量" v-model="datas.form.bodyList.inOutNumber"
+						@change="datas.form.bodyList.inOutNumber = $utils.isNumber(datas.form.bodyList.inOutNumber)"
+						name="" id=""> </view>
 			</view>
 			<view>
 				<view> <text style="color: red;">*</text>单价 </view>
-				<view> <input type="number" placeholder="请输入单价(元)" v-model="datas.form.bodyList.purchasePrice" @change="datas.form.bodyList.purchasePrice = $utils.isMoney(datas.form.bodyList.purchasePrice)" name="" id=""> </view>
+				<view> <input type="number" placeholder="请输入单价(元)" v-model="datas.form.bodyList.purchasePrice"
+						@change="datas.form.bodyList.purchasePrice = $utils.isMoney(datas.form.bodyList.purchasePrice)"
+						name="" id=""> </view>
 			</view>
 			<view style="justify-content: space-between;">
 				<view> 单位 </view>
-				<view> <input type="text" placeholder="请输入单位" v-model="datas.form.bodyList.conUnit" name="" id=""> </view>
+				<view> <input type="text" placeholder="请输入单位" v-model="datas.form.bodyList.conUnit" name="" id="">
+				</view>
 			</view>
 			<view>
 				<view> 应付金额 </view>
@@ -43,7 +43,8 @@
 			<view style="justify-content: space-between;align-items: center;">
 				<view> 供应商 </view>
 				<picker @change="changeNowStatusIndex" :value="nowStatusIndex" :range="datas.status">
-					<view class="color-333" style="height: 84rpx;line-height: 84rpx;">{{datas.status[nowStatusIndex]}}</view>
+					<view class="color-333" style="height: 84rpx;line-height: 84rpx;">{{datas.status[nowStatusIndex]}}
+					</view>
 				</picker>
 				<uni-icons type="bottom" size="16"></uni-icons>
 				<view style="color: #318AFE;width: 80rpx;text-align: center;" @tap="toggle"> 新增 </view>
@@ -57,21 +58,32 @@
 		<up-button type="primary" style="background-color:  #318AFE;color: #fff;width: 100%!important;" @tap="sumbit"
 			:plain="true" text="保存"></up-button>
 	</view>
-	
+
 	<!-- 消息提示 -->
 	<up-toast ref="uToastRef"></up-toast>
 </template>
 
 
 <script setup>
-	import { ref, computed, reactive } from 'vue';
-	import { onShow, onLoad } from '@dcloudio/uni-app';
+	import {
+		ref,
+		computed,
+		reactive
+	} from 'vue';
+	import {
+		onShow,
+		onLoad
+	} from '@dcloudio/uni-app';
 	import go from '@/commons/utils/go.js';
 	import dayjs from 'dayjs';
-	
-	import { getVendorPage } from '@/http/api/vendor.js';
-	import { consStockIn } from '@/http/api/cons.js';
-	
+
+	import {
+		getVendorPage
+	} from '@/http/api/vendor.js';
+	import {
+		consStockIn
+	} from '@/http/api/cons.js';
+
 	let showStatus = ref(false)
 	let datas = reactive({
 		show: false,
@@ -89,13 +101,13 @@
 		},
 		item: ""
 	})
-	
+
 	onLoad((options) => {
 		console.log(options)
 		datas.item = JSON.parse(options.item)
 		datas.form = Object.assign(datas.form, datas.item)
 		// 单位列表
-		datas.unitList = [ datas.form.conUnit, datas.form.conUnitTwo]
+		datas.unitList = [datas.form.conUnit, datas.form.conUnitTwo]
 		datas.form.bodyList.unit = datas.form.defaultUnit
 		datas.form.bodyList.conName = datas.form.conName
 		datas.form.bodyList.unitName = datas.form.unitName
@@ -107,7 +119,7 @@
 	function toggle() {
 		go.to('PAGES_ADD_SUPPLIER')
 	}
-	
+
 	/**
 	 * 获取供应商列表
 	 */
@@ -122,9 +134,9 @@
 			})
 		})
 	}
-	
+
 	let nowStatusIndex = ref(0)
-	
+
 	/**
 	 * 入库时间
 	 * @param {Object} i
@@ -132,7 +144,7 @@
 	function inOutDateChange(i) {
 		datas.inOutDate = dayjs(datas.form.inOutDate).format('YYYY-MM-DD')
 	}
-	
+
 	/**
 	 * 供应商选择
 	 * @param {Object} i
@@ -153,14 +165,15 @@
 			uni.$utils.showToast("请输入必填项")
 			return
 		}
-	
+		
 		datas.form.bodyList.conId = datas.item.id
 		datas.form.bodyList = [datas.form.bodyList]
 		datas.form.inOutDate = dayjs(datas.form.inOutDate).format('YYYY-MM-DD')
+
 		consStockIn({
 			...datas.form,
 			// 供应商id
-			vendorId: datas.list[nowStatusIndex.value].id,
+			vendorId: datas.list[nowStatusIndex.value]?datas.list[nowStatusIndex.value].id:'',
 			amountPayable: datas.form.bodyList[0].inOutNumber * datas.form.bodyList[0].purchasePrice,
 		}).then(res => {
 			uni.$utils.showToast("保存成功")
@@ -168,7 +181,7 @@
 				go.back()
 			}, 1000)
 		})
-	},1000)
+	}, 1000)
 	// 获取供应商
 	const statusHeight = computed(() => {
 		return 30 * datas.status.length + 14 + 'px'
@@ -194,9 +207,11 @@
 		list-style: none;
 		padding: 0;
 	}
-	::v-deep.u-input{
-		border: none!important;
+
+	::v-deep.u-input {
+		border: none !important;
 	}
+
 	.status {
 		margin: 0 32rpx;
 		position: absolute;
diff --git a/pageMarket/packagePopularize/selectGoods.vue b/pageMarket/packagePopularize/selectGoods.vue
index 3f17408..1793054 100644
--- a/pageMarket/packagePopularize/selectGoods.vue
+++ b/pageMarket/packagePopularize/selectGoods.vue
@@ -42,7 +42,7 @@ async function getProductListAjax() {
 			mask: true
 		});
 		const res = await getProductList();
-		list.value = res;
+		list.value = res.productList;
 	} catch (error) {
 		console.log(error);
 	}
diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index af4826f..bde46cc 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -4,15 +4,16 @@
 			<my-tabs :list="tabsList" v-model="tabsCurrent"></my-tabs>
 		</up-sticky>
 		<view class="box">
-			<template v-if="tabsCurrent === 0">
-				<view class="basic">
-					<uni-forms :model="FormData" :rules="rules" :border="true" label-position="top" err-show-type="toast" validateTrigger="submit" label-width="350" ref="Forms">
+				<view class="basic" v-show="tabsCurrent === 0">
+					<uni-forms :model="FormData" :rules="rules" :border="true" label-position="top"
+						err-show-type="toast" validateTrigger="submit" label-width="350" ref="Forms">
 						<view class="block">
 							<view class="border-top-0 typeEnum">
 								<uni-forms-item label="商品类型" required showRequired>
 									<up-radio-group v-model="FormData.type" @change="changeFormDatatype">
 										<view style="display: flex; flex-wrap: wrap; justify-content: flex-start">
-											<view v-for="(item, index) in pageData.types" :key="index" style="margin-right: 30rpx">
+											<view v-for="(item, index) in pageData.types" :key="index"
+												style="margin-right: 30rpx">
 												<up-radio :label="item.name" :name="item.value"></up-radio>
 											</view>
 										</view>
@@ -23,65 +24,45 @@
 							<view class="" v-if="FormData.type === 'package'">
 								<uni-forms-item label="套餐商品">
 									<up-radio-group v-model="FormData.groupType" placement="row">
-										<up-radio
-											:custom-style="{ marginRight: '30px' }"
-											v-for="(item, index) in packageType.list"
-											:key="index"
-											:label="item.name"
-											:name="item.value"
-										></up-radio>
+										<up-radio :custom-style="{ marginRight: '30px' }"
+											v-for="(item, index) in packageType.list" :key="index" :label="item.name"
+											:name="item.value"></up-radio>
 									</up-radio-group>
 								</uni-forms-item>
 							</view>
 							<uni-forms-item required name="name" label="商品名称" showRequired>
-								<uni-easyinput
-									:paddingNone="inputPaddingNone"
-									:placeholderStyle="placeholderStyle"
-									:inputBorder="inputBorder"
-									v-model="FormData.name"
-									placeholder="请输入商品名称"
-								/>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.name" placeholder="请输入商品名称" />
 							</uni-forms-item>
 							<uni-forms-item ref="fileItem" label="图片" required showRequired>
-								<my-upload-file ref="refFile" :images="FormData.images" :imageStyles="imageStyles"></my-upload-file>
+								<my-upload-file ref="refFile" :images="FormData.images"
+									:imageStyles="imageStyles"></my-upload-file>
 								<view class="u-m-t-16 color-999 u-font-24">注:第一张图为商品封面图，图片尺寸为750x750</view>
 							</uni-forms-item>
 							<view class="u-relative">
 								<uni-forms-item label="商品分类" required showRequired name="categoryId">
-									<uni-data-picker
-										:clear-icon="false"
-										:map="{ text: 'name', value: 'id' }"
-										placeholder="请选择商品分类"
-										popup-title="请选择商品分类"
-										:localdata="pageData.category"
-										v-model="FormData.categoryId"
-									></uni-data-picker>
+									<uni-data-picker :clear-icon="false" :map="{ text: 'name', value: 'id' }"
+										placeholder="请选择商品分类" popup-title="请选择商品分类" :localdata="pageData.category"
+										v-model="FormData.categoryId"></uni-data-picker>
 								</uni-forms-item>
-								<view class="zhezhao u-absolute position-all" @click="canEditGoodsCategory(true)" v-if="option.type == 'edit' && disabledChangeCategory"></view>
+								<view class="zhezhao u-absolute position-all" @click="canEditGoodsCategory(true)"
+									v-if="option.type == 'edit' && disabledChangeCategory"></view>
 							</view>
 							<view class="">
 								<uni-forms-item label="单位" required showRequired name="units">
-									<uni-data-picker
-										:clear-icon="false"
-										@change="unitIdChange"
-										:map="{ text: 'name', value: 'id' }"
-										placeholder="请选择单位"
-										popup-title="请选择单位"
-										:localdata="pageData.units"
-										v-model="FormData.unitId"
-									></uni-data-picker>
+									<uni-data-picker :clear-icon="false" @change="unitIdChange"
+										:map="{ text: 'name', value: 'id' }" placeholder="请选择单位" popup-title="请选择单位"
+										:localdata="pageData.units" v-model="FormData.unitId"></uni-data-picker>
 								</uni-forms-item>
 							</view>
 							<template v-if="FormData.type === 'package'">
 								<view class="border-top" v-if="FormData.proGroupVo">
-									<view
-										class=""
-										v-if="
+									<view class="" v-if="
 											(FormData.groupType == 1 && FormData.proGroupVo.length) ||
 											(FormData.groupType == 0 && FormData.proGroupVo.length && FormData.proGroupVo[0].goods.length)
-										"
-									>
-										<view class="border-bottom u-p-b-32" v-for="(item, index) in FormData.proGroupVo" :key="index">
+										">
+										<view class="border-bottom u-p-b-32"
+											v-for="(item, index) in FormData.proGroupVo" :key="index">
 											<view class="u-p-t-24" v-if="FormData.groupType == 1">
 												<view class="u-flex u-row-between">
 													<view class="u-flex">
@@ -90,14 +71,17 @@
 													</view>
 
 													<view class="u-flex color-999" @tap="delproGroupVo(index)">
-														<uni-icons type="minus-filled" :size="16" :color="$utils.ColorRed"></uni-icons>
+														<uni-icons type="minus-filled" :size="16"
+															:color="$utils.ColorRed"></uni-icons>
 														<view class="u-m-l-10">删除套餐组</view>
 													</view>
 												</view>
 												<view class="u-flex u-m-t-16">
 													<up-input v-model="item.title" placeholder="请输入套餐名称"></up-input>
-													<view class="u-flex color-main u-font-24 u-m-l-24" @click="proGroupVoAddGoods(index, item.goods)">
-														<up-icon name="plus" :size="12" :color="$utils.ColorMain"></up-icon>
+													<view class="u-flex color-main u-font-24 u-m-l-24"
+														@click="proGroupVoAddGoods(index, item.goods)">
+														<up-icon name="plus" :size="12"
+															:color="$utils.ColorMain"></up-icon>
 														<view class="font-bold">添加商品</view>
 													</view>
 												</view>
@@ -113,19 +97,25 @@
 															<view class="u-p-r-40">数量</view>
 														</view>
 													</view>
-													<view class="u-flex row u-p-24 u-row-between" v-for="(product, goodsIndex) in item.goods" :key="goodsIndex">
+													<view class="u-flex row u-p-24 u-row-between"
+														v-for="(product, goodsIndex) in item.goods" :key="goodsIndex">
 														<view class="u-flex u-flex-1">
 															<view class="  ">
 																{{ product.name || product.proName }}
 															</view>
 														</view>
 														<view class="u-flex u-row-center u-flex-1">
-															<view @click="refChooseGuigeOpen(product.skuList, index, goodsIndex)" class="">
-																<template v-if="!product.skuName && product.type == 'sku'">
-																	<up-button type="primary" size="mini">设置规格</up-button>
+															<view
+																@click="refChooseGuigeOpen(product.skuList, index, goodsIndex)"
+																class="">
+																<template
+																	v-if="!product.skuName && product.type == 'sku'">
+																	<up-button type="primary"
+																		size="mini">设置规格</up-button>
 																</template>
 																<template v-else>
-																	<text class="color-main">{{ product.skuName }}</text>
+																	<text
+																		class="color-main">{{ product.skuName }}</text>
 																</template>
 															</view>
 														</view>
@@ -136,7 +126,8 @@
 														</view>
 														<view class="u-flex u-text-right u-flex-1 u-row-right">
 															<view class="u-flex u-p-r-30">
-																<up-number-box :button-size="14" integer v-model="product.number">
+																<up-number-box :button-size="14" integer
+																	v-model="product.number">
 																	<template #minus>
 																		<view class="minus">
 																			<up-icon name="minus" size="12"></up-icon>
@@ -149,7 +140,9 @@
 																	</template>
 																</up-number-box>
 															</view>
-															<up-icon @click="proGroupVoGoodsDel(index, goodsIndex)" size="14" name="trash" :color="$utils.ColorMain"></up-icon>
+															<up-icon @click="proGroupVoGoodsDel(index, goodsIndex)"
+																size="14" name="trash"
+																:color="$utils.ColorMain"></up-icon>
 														</view>
 													</view>
 												</view>
@@ -160,20 +153,24 @@
 													<text class="font-bold">几选几</text>
 												</view>
 												<view class="u-flex u-m-t-16">
-													<uni-number-box :min="1" :max="item.goods.length" :width="200" v-model="item.number" placeholder="几选几"></uni-number-box>
+													<uni-number-box :min="1" :max="item.goods.length" :width="200"
+														v-model="item.number" placeholder="几选几"></uni-number-box>
 												</view>
 											</template>
 										</view>
 									</view>
 									<template v-if="FormData.groupType == 1">
 										<view class="bg-fff u-flex u-p-t-24 u-p-b-24 border-r-12" @tap="proGroupVoPush">
-											<uni-icons type="plus-filled" :color="$utils.ColorMain" :size="20"></uni-icons>
+											<uni-icons type="plus-filled" :color="$utils.ColorMain"
+												:size="20"></uni-icons>
 											<view class="u-m-l-16">添加套餐组</view>
 										</view>
 									</template>
 									<template v-else>
-										<view class="bg-fff u-flex u-p-t-24 u-p-b-24 border-r-12" @tap="proGroupVoAddGoods()">
-											<uni-icons type="plus-filled" :color="$utils.ColorMain" :size="20"></uni-icons>
+										<view class="bg-fff u-flex u-p-t-24 u-p-b-24 border-r-12"
+											@tap="proGroupVoAddGoods()">
+											<uni-icons type="plus-filled" :color="$utils.ColorMain"
+												:size="20"></uni-icons>
 											<view class="u-m-l-16">添加商品</view>
 										</view>
 									</template>
@@ -182,13 +179,8 @@
 
 							<view class="">
 								<uni-forms-item label="商品描述">
-									<uni-easyinput
-										:paddingNone="inputPaddingNone"
-										:placeholderStyle="placeholderStyle"
-										type="textarea"
-										v-model="FormData.shortTitle"
-										placeholder="请填写商品简述"
-									/>
+									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										type="textarea" v-model="FormData.shortTitle" placeholder="请填写商品简述" />
 								</uni-forms-item>
 							</view>
 						</view>
@@ -222,7 +214,8 @@
 											<text>原价</text>
 										</view>
 										<view class="u-m-t-16">
-											<price-number-box placeholder="请输入原价" v-model="sku.originPrice"></price-number-box>
+											<price-number-box placeholder="请输入原价"
+												v-model="sku.originPrice"></price-number-box>
 										</view>
 									</view>
 									<view class="u-flex-1">
@@ -231,7 +224,8 @@
 											<text>售价</text>
 										</view>
 										<view class="u-m-t-16">
-											<price-number-box placeholder="请输入售价" v-model="sku.salePrice"></price-number-box>
+											<price-number-box placeholder="请输入售价"
+												v-model="sku.salePrice"></price-number-box>
 										</view>
 									</view>
 								</view>
@@ -242,7 +236,8 @@
 											<text>会员价</text>
 										</view>
 										<view class="u-m-t-16">
-											<price-number-box placeholder="请输入会员价（元）" v-model="sku.memberPrice"></price-number-box>
+											<price-number-box placeholder="请输入会员价（元）"
+												v-model="sku.memberPrice"></price-number-box>
 										</view>
 									</view>
 									<view class="u-flex-1">
@@ -251,7 +246,8 @@
 											<text>成本价</text>
 										</view>
 										<view class="u-m-t-16">
-											<price-number-box placeholder="请输入成本价" v-model="sku.costPrice"></price-number-box>
+											<price-number-box placeholder="请输入成本价"
+												v-model="sku.costPrice"></price-number-box>
 										</view>
 									</view>
 								</view>
@@ -261,7 +257,8 @@
 										<text>起售数量</text>
 									</view>
 									<view class="u-m-t-16">
-										<price-number-box inputType="number" placeholder="请输入起售数量" v-model="sku.suitNum"></price-number-box>
+										<price-number-box inputType="number" placeholder="请输入起售数量"
+											v-model="sku.suitNum"></price-number-box>
 									</view>
 								</view>
 								<view class="u-m-t-24">
@@ -314,11 +311,12 @@
 									<uni-forms-item label="">
 										<view class="u-flex u-row-between">
 											<view class="label-title">上架</view>
-											<my-switch disabled :openDisabledClass="false" @click="isGroundingChange" v-model="FormData.isSale"></my-switch>
+											<my-switch disabled :openDisabledClass="false" @click="isGroundingChange"
+												v-model="FormData.isSale"></my-switch>
 										</view>
 									</uni-forms-item>
 								</view>
-								<uni-forms-item label="">
+								<!-- <uni-forms-item label="">
 									<view class="u-flex u-row-between">
 										<view class="label-title">库存开关</view>
 										<my-switch v-model="FormData.isStock"></my-switch>
@@ -341,7 +339,7 @@
 										</uni-forms-item>
 										<view class="u-absolute position-all" v-if="disabledStock" @click="canEditGoodsStock(true)"></view>
 									</view>
-								</template>
+								</template> -->
 
 								<uni-forms-item label="">
 									<view class="u-flex u-row-between">
@@ -351,77 +349,30 @@
 								</uni-forms-item>
 
 								<uni-forms-item label="打包费">
-									<uni-easyinput
-										@blur="priceFormat(FormData, 'packFee')"
-										:paddingNone="inputPaddingNone"
-										:placeholderStyle="placeholderStyle"
-										:inputBorder="inputBorder"
-										v-model="FormData.packFee"
-										type="digit"
-										placeholder="请输入打包费"
-									/>
+									<uni-easyinput @blur="priceFormat(FormData, 'packFee')"
+										:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="FormData.packFee" type="digit"
+										placeholder="请输入打包费" />
 								</uni-forms-item>
 
 								<template v-if="option.type === 'edit'">
 									<uni-forms-item label="排序">
-										<uni-easyinput
-											@blur="priceFormat(FormData, 'sort')"
-											:paddingNone="inputPaddingNone"
-											:placeholderStyle="placeholderStyle"
-											:inputBorder="inputBorder"
-											v-model="FormData.sort"
-											type="digit"
-											placeholder="请输入排序"
-										/>
+										<uni-easyinput @blur="priceFormat(FormData, 'sort')"
+											:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+											:inputBorder="inputBorder" v-model="FormData.sort" type="digit"
+											placeholder="请输入排序" />
 									</uni-forms-item>
 								</template>
 
-								<uni-forms-item label="关联推荐商品">
-									<view class="tips">
-										<text class="t">设置商品后，用户可以在商品详情页中看到推荐商品，最多设置{{ goodsListMax }}个商品</text>
-									</view>
-									<view class="table">
-										<view class="tabhead">
-											<view class="tr">
-												<view class="td">
-													<text class="t">图片</text>
-												</view>
-												<view class="td">
-													<text class="t">商品名称</text>
-												</view>
-												<view class="td">
-													<text class="t">操作</text>
-												</view>
-											</view>
-										</view>
-										<view class="tbbody">
-											<view class="tr" v-for="(item, index) in FormData.relatedRecommendJson" :key="index">
-												<view class="td">
-													<image class="cover" :src="item.coverImg" mode="aspectFill"></image>
-												</view>
-												<view class="td">
-													<text class="t">{{ item.name }}</text>
-												</view>
-												<view class="td">
-													<u-text type="error" text="删除" @click="FormData.relatedRecommendJson.splice(index, 1)"></u-text>
-												</view>
-											</view>
-											<view class="table-tips" v-if="!FormData.relatedRecommendJson.length">
-												<text class="t">暂无数据</text>
-											</view>
-										</view>
-									</view>
-									<view class="add-goods" v-if="FormData.relatedRecommendJson.length < goodsListMax">
-										<view class="btn">
-											<u-text type="primary" text="添加商品" prefixIcon="plus" iconStyle="color:#409EFF;" @click="toSelectGoodsPage"></u-text>
-										</view>
-									</view>
-								</uni-forms-item>
+
+
+
 							</view>
 						</template>
 					</uni-forms>
 					<view style="height: 100rpx"></view>
-					<view style="padding-left: 110rpx; padding-right: 110rpx" class="u-m-t-20" v-if="option.type === 'edit'" @click="delModelShow">
+					<view style="padding-left: 110rpx; padding-right: 110rpx" class="u-m-t-20"
+						v-if="option.type === 'edit'" @click="delModelShow">
 						<my-button bgColor="#F9F9F9" shape="circle" type="cancel">
 							<view class="color-red">删除该商品</view>
 						</my-button>
@@ -432,1244 +383,1359 @@
 						</view>
 					</view>
 				</view>
-			</template>
 			<template v-if="tabsCurrent === 1">
-				<edit-haocai @updateGoods="updateGoodsDetail" :goods="FormData" @cancel="changeTabsCurrent(0)"></edit-haocai>
+				<edit-haocai @updateGoods="updateGoodsDetail" :goods="FormData"
+					v-model:isAutoSoldStock="FormData.isAutoSoldStock"
+					v-model:refundMode="FormData.refundMode"
+				
+					@cancel="changeTabsCurrent(0)"></edit-haocai>
+			</template>
+			<template v-if="tabsCurrent === 2">
+				<view class="link-goods">
+					<view class="font-bold">关联推荐商品</view>
+					<view class="tips u-m-t-10">
+						<text class="t">设置商品后，用户可以在商品详情页中看到推荐商品，最多设置{{ goodsListMax }}个商品</text>
+					</view>
+					<view class="table">
+						<view class="tabhead">
+							<view class="tr">
+								<view class="td">
+									<text class="t">图片</text>
+								</view>
+								<view class="td">
+									<text class="t">商品名称</text>
+								</view>
+								<view class="td">
+									<text class="t">操作</text>
+								</view>
+							</view>
+						</view>
+						<view class="tbbody">
+							<view class="tr" v-for="(item, index) in FormData.relatedRecommendJson" :key="index">
+								<view class="td">
+									<image class="cover" :src="item.coverImg" mode="aspectFill"></image>
+								</view>
+								<view class="td">
+									<text class="t">{{ item.name }}</text>
+								</view>
+								<view class="td">
+									<u-text type="error" text="删除"
+										@click="FormData.relatedRecommendJson.splice(index, 1)"></u-text>
+								</view>
+							</view>
+							<view class="table-tips" v-if="!FormData.relatedRecommendJson.length">
+								<text class="t">暂无数据</text>
+							</view>
+						</view>
+					</view>
+					<view class="add-goods" v-if="FormData.relatedRecommendJson.length < goodsListMax">
+						<view class="btn">
+							<u-text type="primary" text="添加商品" prefixIcon="plus" iconStyle="color:#409EFF;"
+								@click="toSelectGoodsPage"></u-text>
+						</view>
+					</view>
+				</view>
+
 			</template>
 		</view>
 		<!-- 删除弹窗 -->
 		<my-model @confirm="delmodelConfirm" ref="delModel" desc="确认删除"></my-model>
 		<!-- 选择商品 -->
-		<choose-goods ref="refChooseGoods" @confirm="refChooseGoodsConfirm" :category="pageData.category"></choose-goods>
+		<choose-goods ref="refChooseGoods" @confirm="refChooseGoodsConfirm"
+			:category="pageData.category"></choose-goods>
 		<!-- 选择规格 -->
 		<choose-guige ref="refChooseGuige" @confirm="refChooseGuigeConfirm"></choose-guige>
 	</view>
 </template>
 
 <script setup>
-import { computed, onBeforeUnmount, reactive, ref, watch, nextTick } from 'vue';
-import { onLoad, onShow, onReady } from '@dcloudio/uni-app';
+	import {
+		computed,
+		onBeforeUnmount,
+		reactive,
+		ref,
+		watch,
+		nextTick
+	} from 'vue';
+	import {
+		onLoad,
+		onShow,
+		onReady
+	} from '@dcloudio/uni-app';
 
-import dayjs from 'dayjs';
-import { formatPrice } from '@/commons/utils/format.js';
+	import dayjs from 'dayjs';
+	import {
+		formatPrice
+	} from '@/commons/utils/format.js';
 
-import go from '@/commons/utils/go.js';
+	import go from '@/commons/utils/go.js';
 
-import chooseGoods from './components/choose-goods';
-import chooseGuige from './components/choose-guige';
-import editHaocai from './components/edit-haocai.vue';
-import chooseGroupCategory from './components/choose-coupon-category';
-import priceNumberBox from './components/price-number-box';
+	import linkGoods from './components/link-goods.vue';
+	import chooseGoods from './components/choose-goods';
+	import chooseGuige from './components/choose-guige';
+	import editHaocai from './components/edit-haocai.vue';
+	import chooseGroupCategory from './components/choose-coupon-category';
+	import priceNumberBox from './components/price-number-box';
 
-import infoBox from '@/commons/utils/infoBox.js';
+	import infoBox from '@/commons/utils/infoBox.js';
 
-import { hasPermission } from '@/commons/utils/hasPermission.js';
+	import {
+		hasPermission
+	} from '@/commons/utils/hasPermission.js';
 
-import { $defaultSku } from '@/commons/goodsData.js';
+	import {
+		$defaultSku
+	} from '@/commons/goodsData.js';
 
-import { getCategoryList, getProdUnitList, getProductDetail, addProduct, updateProduct, delProduct, productBindCons } from '@/http/api/product.js';
-import { uploadFile } from '@/http/api/index.js';
+	import {
+		getCategoryList,
+		getProdUnitList,
+		getProductDetail,
+		addProduct,
+		updateProduct,
+		delProduct,
+		productBindCons
+	} from '@/http/api/product.js';
+	import {
+		uploadFile
+	} from '@/http/api/index.js';
 
-const imageStyles = reactive({
-	width: 82,
-	height: 82,
-	border: {
-		radius: '4px'
-	}
-});
-
-let option = reactive({
-	type: 'add',
-	productId: ''
-});
-
-// 表单样式
-//可以不使用ref，但是小程序一堆wraning ，烦，改为了ref
-const placeholderStyle = ref('font-size:28rpx;');
-const inputPaddingNone = ref(true);
-
-// ================== 关联商品 start
-const goodsListMax = ref(9);
-
-// 跳转去选择商品
-function toSelectGoodsPage() {
-	uni.navigateTo({
-		url: '/pageMarket/packagePopularize/selectGoods'
+	const imageStyles = reactive({
+		width: 82,
+		height: 82,
+		border: {
+			radius: '4px'
+		}
 	});
-}
 
-// 从本地获取选择的商品
-function getLocalSelectGoods() {
-	let res = uni.getStorageSync('packageSelectGoods');
-	if (res && res.id) {
-		if (res.id === FormData.id) {
-			uni.showToast({
-				title: '不能选择当前商品',
-				icon: 'none'
-			});
-			return;
-		}
+	let option = reactive({
+		type: 'add',
+		productId: ''
+	});
 
-		let obj = FormData.relatedRecommendJson.find((item) => item.id == res.id);
-		if (obj && obj.id) {
-			uni.showToast({
-				title: '该商品已选择',
-				icon: 'none'
-			});
-			return;
-		}
-		FormData.relatedRecommendJson.push({ ...res });
+	// 表单样式
+	//可以不使用ref，但是小程序一堆wraning ，烦，改为了ref
+	const placeholderStyle = ref('font-size:28rpx;');
+	const inputPaddingNone = ref(true);
+
+	// ================== 关联商品 start
+	const goodsListMax = ref(9);
+
+	// 跳转去选择商品
+	function toSelectGoodsPage() {
+		uni.navigateTo({
+			url: '/pageMarket/packagePopularize/selectGoods'
+		});
 	}
-	uni.setStorageSync('packageSelectGoods', '');
-}
-// ================== 关联商品 end
 
-//表单边框
-const inputBorder = ref(false);
-const FormData = reactive({
-	id: '',
-	name: '', //商品名称
-	shortTitle: '', //商品介绍
-	unitId: '', //单位id
-	categoryId: '', //商品分类id
-	coverImg: '', //封面图url
-	images: [], //详情图urls
-	type: 'single', //商品类型single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-	specId: '', //规格ID
-	skuList: [], //规格数据
-	groupType: null, //套餐类型
-	proGroupVo: [], //套餐数据
-	weight: 0, //重量
-	isAllowTempModifyPrice: 1, //是否允许改价
-	days: 'Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday', //定时上下架周期
-	startTime: '00:00:00', //开始时间
-	endTime: '23:59:00', //结束时间
-	isSale: 1, //是否上架
-	isStock: 0, //是否开启库存
-	isHot: 0, //设为推荐
-	stockNumber: 0, //库存数量
-	packFee: 0, //打包费
-	sort: 1, //排序值
-	specName: '', //规格模版名称
+	// 从本地获取选择的商品
+	function getLocalSelectGoods() {
+		let res = uni.getStorageSync('packageSelectGoods');
+		if (res && res.id) {
+			if (res.id === FormData.id) {
+				uni.showToast({
+					title: '不能选择当前商品',
+					icon: 'none'
+				});
+				return;
+			}
 
-	unitName: '',
-	specificationsGroup: '',
-	relatedRecommendJson: [] // 关联商品
-});
-//页面全部数据
-const pageData = reactive({
-	// 商品类型
-	types: [
-		{
-			name: '单规格商品',
-			value: 'single'
-		},
-		{
-			name: '多规格商品',
-			value: 'sku'
-		},
-		{
-			name: '套餐商品',
-			value: 'package'
-		},
-		{
-			name: '称重商品',
-			value: 'weight'
+			let obj = FormData.relatedRecommendJson.find((item) => item.id == res.id);
+			if (obj && obj.id) {
+				uni.showToast({
+					title: '该商品已选择',
+					icon: 'none'
+				});
+				return;
+			}
+			FormData.relatedRecommendJson.push({
+				...res
+			});
 		}
-		// {
-		// 	name: '团购券',
-		// 	value: 'coupon'
-		// },
-	],
-	// 单位
-	units: [],
-	// 分类
-	category: [],
-	//库存
-	skuList: []
-});
-const skuList = reactive({
-	list: [
-		{
+		uni.setStorageSync('packageSelectGoods', '');
+	}
+	// ================== 关联商品 end
+
+	//表单边框
+	const inputBorder = ref(false);
+	const FormData = reactive({
+		id: '',
+		name: '', //商品名称
+		shortTitle: '', //商品介绍
+		unitId: '', //单位id
+		categoryId: '', //商品分类id
+		coverImg: '', //封面图url
+		images: [], //详情图urls
+		type: 'single', //商品类型single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+		specId: '', //规格ID
+		skuList: [], //规格数据
+		groupType: null, //套餐类型
+		proGroupVo: [], //套餐数据
+		weight: 0, //重量
+		isAllowTempModifyPrice: 1, //是否允许改价
+		days: 'Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday', //定时上下架周期
+		startTime: '00:00:00', //开始时间
+		endTime: '23:59:00', //结束时间
+		isSale: 1, //是否上架
+		isStock: 0, //是否开启库存
+		isHot: 0, //设为推荐
+		stockNumber: 0, //库存数量
+		packFee: 0, //打包费
+		sort: 1, //排序值
+		specName: '', //规格模版名称
+		isAutoSoldStock:0,
+		isRefundStock:1,
+		unitName: '',
+		specificationsGroup: '',
+		relatedRecommendJson: [] // 关联商品
+	});
+	//页面全部数据
+	const pageData = reactive({
+		// 商品类型
+		types: [{
+				name: '单规格商品',
+				value: 'single'
+			},
+			{
+				name: '多规格商品',
+				value: 'sku'
+			},
+			{
+				name: '套餐商品',
+				value: 'package'
+			},
+			{
+				name: '称重商品',
+				value: 'weight'
+			}
+			// {
+			// 	name: '团购券',
+			// 	value: 'coupon'
+			// },
+		],
+		// 单位
+		units: [],
+		// 分类
+		category: [],
+		//库存
+		skuList: []
+	});
+	const skuList = reactive({
+		list: [{
 			...$defaultSku,
 			barCode: `${uni.getStorageSync('shopId')}${dayjs().valueOf()}`
-		}
-	]
-});
+		}]
+	});
 
-let $goodsData = {};
-// 商品图片组件
-const refFile = ref(null);
-/**
- * 监听商品类型变化
- */
-console.log(FormData);
-watch(
-	() => FormData.type,
-	(newval) => {
-		if (option.type == 'edit') {
-			FormData.specId = newval != 'sku' ? '' : $goodsData.specId || '';
-			console.log($goodsData);
-			if (newval == $goodsData.type) {
-				skuList.list = $goodsData.skuList;
-				if ($goodsData.groupSnap) {
-					FormData.proGroupVo = $goodsData.groupSnap || [];
+	let $goodsData = {};
+	// 商品图片组件
+	const refFile = ref(null);
+	/**
+	 * 监听商品类型变化
+	 */
+	console.log(FormData);
+	watch(
+		() => FormData.type,
+		(newval) => {
+			if (option.type == 'edit') {
+				FormData.specId = newval != 'sku' ? '' : $goodsData.specId || '';
+				console.log($goodsData);
+				if (newval == $goodsData.type) {
+					skuList.list = $goodsData.skuList;
+					if ($goodsData.groupSnap) {
+						FormData.proGroupVo = $goodsData.groupSnap || [];
+					} else {
+						initDefaultProGroupVo();
+					}
 				} else {
-					initDefaultProGroupVo();
-				}
-			} else {
-				if (newval != 'sku') {
-					skuList.list = [
-						{
+					if (newval != 'sku') {
+						skuList.list = [{
 							...$defaultSku,
 							barCode: `${uni.getStorageSync('shopId')}${dayjs().valueOf()}`
-						}
-					];
+						}];
+					} else {
+						skuList.list = [];
+					}
+				}
+				if (FormData.groupType == null) {
+					FormData.groupType = 0;
+				}
+			} else {
+				FormData.specId = '';
+				if (newval != 'sku') {
+					skuList.list = [{
+						...$defaultSku,
+						barCode: `${uni.getStorageSync('shopId')}${dayjs().valueOf()}`
+					}];
 				} else {
 					skuList.list = [];
 				}
-			}
-			if (FormData.groupType == null) {
-				FormData.groupType = 0;
-			}
-		} else {
-			FormData.specId = '';
-			if (newval != 'sku') {
-				skuList.list = [
-					{
-						...$defaultSku,
-						barCode: `${uni.getStorageSync('shopId')}${dayjs().valueOf()}`
-					}
-				];
-			} else {
-				skuList.list = [];
-			}
-			if (newval == 'package') {
-				initDefaultProGroupVo();
-			}
-		}
-	}
-);
-
-/**
- * 监听套餐类型变化
- */
-watch(
-	() => FormData.groupType,
-	(newval) => {
-		if (newval == 0) {
-			return initDefaultProGroupVo();
-		}
-		if (option.type == 'edit') {
-			if (newval == $goodsData.groupType) {
-				FormData.proGroupVo = $goodsData.groupSnap;
-			}
-			return;
-		}
-		initDefaultProGroupVo();
-	}
-);
-watch(
-	() => pageData.types,
-	(newval) => {
-		Forms.value.setRules(rules);
-	}
-);
-watch(
-	() => skuList.list,
-	(newval) => {
-		console.log(newval);
-	}
-);
-
-onLoad((params) => {
-	if (params && JSON.stringify(params) !== '{}') {
-		option.type = params.type ? params.type : 'add';
-		option.productId = params.productId;
-	}
-	canEditGoodsCategory();
-	uni.setNavigationBarTitle({
-		title: option.type === 'add' ? '添加商品' : '编辑商品'
-	});
-	if (option.type === 'edit') {
-		getGoodsDetail();
-	}
-
-	getCategory();
-	getTbShopUnit();
-
-	uni.setStorageSync('packageSelectGoods', '');
-});
-onReady(() => {
-	Forms.value && Forms.value.setRules(rules);
-});
-onShow(() => {
-	watchSpecificationsSave();
-	watchTimerSave();
-	getLocalSelectGoods();
-});
-
-function getGoodsDetail() {
-	getProductDetail(option.productId).then((res) => {
-		res.images = res.images.map((v) => {
-			return {
-				url: v
-			};
-		});
-		res.consList.map((v) => {
-			const item = res.skuList.find((v) => v.productId == v.productId);
-			if (item) {
-				if (item.hasOwnProperty('haoCaiList')) {
-					item.haoCaiList.push(v);
-				} else {
-					item.haoCaiList = [v];
+				if (newval == 'package') {
+					initDefaultProGroupVo();
 				}
 			}
+		}
+	);
+
+	/**
+	 * 监听套餐类型变化
+	 */
+	watch(
+		() => FormData.groupType,
+		(newval) => {
+			if (newval == 0) {
+				return initDefaultProGroupVo();
+			}
+			if (option.type == 'edit') {
+				if (newval == $goodsData.groupType) {
+					FormData.proGroupVo = $goodsData.groupSnap;
+				}
+				return;
+			}
+			initDefaultProGroupVo();
+		}
+	);
+	watch(
+		() => pageData.types,
+		(newval) => {
+			Forms.value.setRules(rules);
+		}
+	);
+	watch(
+		() => skuList.list,
+		(newval) => {
+			console.log(newval);
+		}
+	);
+
+	onLoad((params) => {
+		if (params && JSON.stringify(params) !== '{}') {
+			option.type = params.type ? params.type : 'add';
+			option.productId = params.productId;
+		}
+		canEditGoodsCategory();
+		uni.setNavigationBarTitle({
+			title: option.type === 'add' ? '添加商品' : '编辑商品'
+		});
+		if (option.type === 'edit') {
+			getGoodsDetail();
+		}
+
+		getCategory();
+		getTbShopUnit();
+
+		uni.setStorageSync('packageSelectGoods', '');
+	});
+	onReady(() => {
+		Forms.value && Forms.value.setRules(rules);
+	});
+	onShow(() => {
+		watchSpecificationsSave();
+		watchTimerSave();
+		getLocalSelectGoods();
+	});
+
+	function getGoodsDetail() {
+		getProductDetail(option.productId).then((res) => {
+			res.images = res.images.map((v) => {
+				return {
+					url: v
+				};
+			});
+			res.consList.map((v) => {
+				const item = res.skuList.find((v) => v.productId == v.productId);
+				if (item) {
+					if (item.hasOwnProperty('haoCaiList')) {
+						item.haoCaiList.push(v);
+					} else {
+						item.haoCaiList = [v];
+					}
+				}
+			});
+
+			res.skuList = res.skuList.length ? res.skuList : [];
+
+			$goodsData = res;
+			skuList.list = res.skuList;
+			Object.assign(FormData, res);
+			//多规格
+			if (res.type == 'sku') {
+				FormData.specificationsGroup = {
+					specId: res.specId,
+					selectSpecInfo: res.selectSpecInfo,
+					result: res.skuList.map((v) => {
+						const names = v.specInfo.split(',').reduce((prve, cur) => {
+							let key;
+							for (var oe in res.selectSpecInfo) {
+								res.selectSpecInfo[oe].map((i) => {
+									if (i == cur) {
+										key = oe;
+									}
+								});
+							}
+							prve[key] = cur;
+							return prve;
+						}, {});
+						return {
+							skus: {
+								...v
+							},
+							names,
+							specInfo: v.specInfo,
+							coverImg: v.coverImg
+						};
+					})
+				};
+			} else {
+				// 单规格
+			}
+		});
+	}
+
+	/**
+	 * 获取分类
+	 */
+	function getCategory() {
+		getCategoryList({
+			page: 1,
+			size: 200
+		}).then((res) => {
+			pageData.category = res;
+		});
+	}
+
+	/**
+	 * 获取单位数据
+	 */
+	function getTbShopUnit() {
+		getProdUnitList().then((res) => {
+			pageData.units = res;
+		});
+	}
+
+	/**
+	 * 耗材取消监听
+	 * @param {Object} newval
+	 */
+	function changeTabsCurrent(newval) {
+		tabsCurrent.value = newval;
+	}
+
+	/**
+	 * 分类选择监听
+	 */
+	const changeFormDatatype = (e) => {
+		if (FormData.type == 'package') {
+			FormData.groupType = 0;
+		} else {
+			FormData.groupType = null;
+		}
+		console.log(FormData);
+	};
+
+	/**
+	 * 选择单位监听
+	 * @param {Object} e
+	 */
+	function unitIdChange(e) {
+		FormData.unitName = e.detail.value[0].text;
+	}
+
+	async function isGroundingChange(e) {
+		// if (option.type == 'add') {
+		// 	FormData.isSale = FormData.isSale ? 0 : 1
+		// 	return
+		// }
+		// const res = await hasPermission('允许上下架商品')
+		// if (!res) {
+		// 	return
+		// }
+		FormData.isSale = FormData.isSale ? 0 : 1;
+	}
+
+	/**
+	 * 固定套餐设置规格
+	 */
+	const refChooseGuige = ref(null);
+	let proGroupVoGoodsIndex = undefined;
+	/**
+	 * 规格打开
+	 * @param {Object} skuList
+	 * @param {Object} groupIndex
+	 * @param {Object} goodsIndex
+	 */
+	function refChooseGuigeOpen(skuList, groupIndex, goodsIndex) {
+		proGroupVoIndex = groupIndex;
+		proGroupVoGoodsIndex = goodsIndex;
+		console.log(skuList);
+		refChooseGuige.value.open(skuList);
+	}
+
+	/**
+	 * 规格确认
+	 * @param {Object} sku
+	 */
+	function refChooseGuigeConfirm(sku) {
+		FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuName = sku.specInfo || sku.name;
+		FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuId = sku.id;
+		proGroupVoIndex = undefined;
+		proGroupVoGoodsIndex = undefined;
+	}
+
+	/**
+	 * 套餐商品选择
+	 */
+	const refChooseGoods = ref(null);
+	let proGroupVoIndex = undefined;
+
+	/**
+	 * 添加商品
+	 * @param {Object} index
+	 * @param {Object} arr
+	 */
+	function proGroupVoAddGoods(index, arr) {
+		proGroupVoIndex = index;
+		if (!FormData.proGroupVo) {
+			initDefaultProGroupVo();
+		}
+		if (FormData.groupType == 0) {
+			const goods = FormData.proGroupVo[0].goods;
+			refChooseGoods.value.open(goods);
+		} else {
+			refChooseGoods.value.open(arr);
+		}
+	}
+
+	/**
+	 * 添加套餐组
+	 */
+	function proGroupVoPush() {
+		FormData.proGroupVo.push({
+			title: '',
+			count: 1,
+			goods: []
+		});
+		console.log(FormData.proGroupVo);
+	}
+
+	/**
+	 * 删除套餐组
+	 * @param {Object} index
+	 */
+	function delproGroupVo(index) {
+		FormData.proGroupVo.splice(index, 1);
+	}
+
+	/**
+	 * 删除套餐商品
+	 * @param {Object} index
+	 * @param {Object} goodsIndex
+	 */
+	function proGroupVoGoodsDel(index, goodsIndex) {
+		FormData.proGroupVo[index].goods.splice(goodsIndex, 1);
+	}
+
+	function refChooseGoodsClose() {
+		refChooseGoods.value.close();
+	}
+
+	/**
+	 * 套餐选择商品
+	 * @param {Object} arr
+	 */
+	function refChooseGoodsConfirm(arr) {
+		refChooseGoodsClose();
+		arr = arr.map((v) => {
+			const {
+				proId,
+				id,
+				name,
+				unitName,
+				lowPrice,
+				type,
+				skuList
+			} = v;
+			if (proId) {
+				return v;
+			}
+			return {
+				proId: id,
+				proName: name,
+				unitName,
+				price: lowPrice,
+				number: 1,
+				type,
+				skuList,
+				skuId: '',
+				skuName: ''
+			};
 		});
 
-		res.skuList = res.skuList.length ? res.skuList : [];
-
-		$goodsData = res;
-		skuList.list = res.skuList;
-		Object.assign(FormData, res);
-		//多规格
-		if (res.type == 'sku') {
-			FormData.specificationsGroup = {
-				specId: res.specId,
-				selectSpecInfo: res.selectSpecInfo,
-				result: res.skuList.map((v) => {
-					const names = v.specInfo.split(',').reduce((prve, cur) => {
-						let key;
-						for (var oe in res.selectSpecInfo) {
-							res.selectSpecInfo[oe].map((i) => {
-								if (i == cur) {
-									key = oe;
-								}
-							});
-						}
-						prve[key] = cur;
-						return prve;
-					}, {});
-					return {
-						skus: {
-							...v
-						},
-						names,
-						specInfo: v.specInfo,
-						coverImg: v.coverImg
-					};
-				})
-			};
-		} else {
-			// 单规格
+		if (FormData.groupType == 0) {
+			return (FormData.proGroupVo[0].goods = arr);
 		}
-	});
-}
-
-/**
- * 获取分类
- */
-function getCategory() {
-	getCategoryList({
-		page: 1,
-		size: 200
-	}).then((res) => {
-		pageData.category = res;
-	});
-}
-
-/**
- * 获取单位数据
- */
-function getTbShopUnit() {
-	getProdUnitList().then((res) => {
-		pageData.units = res;
-	});
-}
-
-/**
- * 耗材取消监听
- * @param {Object} newval
- */
-function changeTabsCurrent(newval) {
-	tabsCurrent.value = newval;
-}
-
-/**
- * 分类选择监听
- */
-const changeFormDatatype = (e) => {
-	if (FormData.type == 'package') {
-		FormData.groupType = 0;
-	} else {
-		FormData.groupType = null;
-	}
-	console.log(FormData);
-};
-
-/**
- * 选择单位监听
- * @param {Object} e
- */
-function unitIdChange(e) {
-	FormData.unitName = e.detail.value[0].text;
-}
-
-async function isGroundingChange(e) {
-	// if (option.type == 'add') {
-	// 	FormData.isSale = FormData.isSale ? 0 : 1
-	// 	return
-	// }
-	// const res = await hasPermission('允许上下架商品')
-	// if (!res) {
-	// 	return
-	// }
-	FormData.isSale = FormData.isSale ? 0 : 1;
-}
-
-/**
- * 固定套餐设置规格
- */
-const refChooseGuige = ref(null);
-let proGroupVoGoodsIndex = undefined;
-/**
- * 规格打开
- * @param {Object} skuList
- * @param {Object} groupIndex
- * @param {Object} goodsIndex
- */
-function refChooseGuigeOpen(skuList, groupIndex, goodsIndex) {
-	proGroupVoIndex = groupIndex;
-	proGroupVoGoodsIndex = goodsIndex;
-	console.log(skuList);
-	refChooseGuige.value.open(skuList);
-}
-
-/**
- * 规格确认
- * @param {Object} sku
- */
-function refChooseGuigeConfirm(sku) {
-	FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuName = sku.specInfo || sku.name;
-	FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuId = sku.id;
-	proGroupVoIndex = undefined;
-	proGroupVoGoodsIndex = undefined;
-}
-
-/**
- * 套餐商品选择
- */
-const refChooseGoods = ref(null);
-let proGroupVoIndex = undefined;
-
-/**
- * 添加商品
- * @param {Object} index
- * @param {Object} arr
- */
-function proGroupVoAddGoods(index, arr) {
-	proGroupVoIndex = index;
-	if (!FormData.proGroupVo) {
-		initDefaultProGroupVo();
-	}
-	if (FormData.groupType == 0) {
-		const goods = FormData.proGroupVo[0].goods;
-		refChooseGoods.value.open(goods);
-	} else {
-		refChooseGoods.value.open(arr);
-	}
-}
-
-/**
- * 添加套餐组
- */
-function proGroupVoPush() {
-	FormData.proGroupVo.push({
-		title: '',
-		count: 1,
-		goods: []
-	});
-	console.log(FormData.proGroupVo);
-}
-
-/**
- * 删除套餐组
- * @param {Object} index
- */
-function delproGroupVo(index) {
-	FormData.proGroupVo.splice(index, 1);
-}
-
-/**
- * 删除套餐商品
- * @param {Object} index
- * @param {Object} goodsIndex
- */
-function proGroupVoGoodsDel(index, goodsIndex) {
-	FormData.proGroupVo[index].goods.splice(goodsIndex, 1);
-}
-
-function refChooseGoodsClose() {
-	refChooseGoods.value.close();
-}
-
-/**
- * 套餐选择商品
- * @param {Object} arr
- */
-function refChooseGoodsConfirm(arr) {
-	refChooseGoodsClose();
-	arr = arr.map((v) => {
-		const { proId, id, name, unitName, lowPrice, type, skuList } = v;
-		if (proId) {
-			return v;
+		if (FormData.groupType == 1 && proGroupVoIndex !== undefined) {
+			return (FormData.proGroupVo[proGroupVoIndex].goods = arr);
 		}
-		return {
-			proId: id,
-			proName: name,
-			unitName,
-			price: lowPrice,
-			number: 1,
-			type,
-			skuList,
-			skuId: '',
-			skuName: ''
-		};
-	});
-
-	if (FormData.groupType == 0) {
-		return (FormData.proGroupVo[0].goods = arr);
+		FormData.proGroupVo.push({
+			title: '',
+			count: 1,
+			goods: arr
+		});
 	}
-	if (FormData.groupType == 1 && proGroupVoIndex !== undefined) {
-		return (FormData.proGroupVo[proGroupVoIndex].goods = arr);
+
+	/**
+	 * number类型数据限制
+	 * @param {Object} item
+	 * @param {Object} key
+	 */
+	function priceFormat(item, key) {
+		nextTick(() => {
+			const min = 0;
+			const max = 100000000;
+			if (item[key] === '') {
+				return;
+			}
+			const newval = formatPrice(item[key], min, max, true);
+			if (typeof newval !== 'number') {
+				item[key] = newval.value;
+				uni.showToast({
+					title: `请输入${min}到${max}范围内的数字`,
+					icon: 'none'
+				});
+			} else {
+				item[key] = newval;
+			}
+		});
 	}
-	FormData.proGroupVo.push({
-		title: '',
-		count: 1,
-		goods: arr
-	});
-}
 
-/**
- * number类型数据限制
- * @param {Object} item
- * @param {Object} key
- */
-function priceFormat(item, key) {
-	nextTick(() => {
-		const min = 0;
-		const max = 100000000;
-		if (item[key] === '') {
-			return;
-		}
-		const newval = formatPrice(item[key], min, max, true);
-		if (typeof newval !== 'number') {
-			item[key] = newval.value;
-			uni.showToast({
-				title: `请输入${min}到${max}范围内的数字`,
-				icon: 'none'
-			});
-		} else {
-			item[key] = newval;
-		}
-	});
-}
-
-/**
- * 套餐商品类型
- */
-const packageType = reactive({
-	list: [
-		{
-			name: '固定套餐',
-			value: 0
-		},
-		{
-			name: '可选套餐',
-			value: 1
-		}
-	],
-	sel: 0
-});
-
-const tabsList = ['基础设置', '耗材绑定'];
-let tabsCurrent = ref(0);
-const Forms = ref(null);
-const delModel = ref(null);
-const rules = {
-	images: {
-		rules: [
+	/**
+	 * 套餐商品类型
+	 */
+	const packageType = reactive({
+		list: [{
+				name: '固定套餐',
+				value: 0
+			},
 			{
-				validateFunction: function (rule, value, data, callback) {
+				name: '可选套餐',
+				value: 1
+			}
+		],
+		sel: 0
+	});
+
+	const tabsList = ['基础设置', '耗材设置', '关联推荐商品'];
+	let tabsCurrent = ref(0);
+	const Forms = ref(null);
+	const delModel = ref(null);
+	const rules = {
+		images: {
+			rules: [{
+				validateFunction: function(rule, value, data, callback) {
 					console.log(value);
 					if (value.length < 1) {
 						callback('请上传商品图片');
 					}
 					return true;
 				}
-			}
-		]
-	},
-	name: {
-		rules: [
-			{
-				required: true,
-				errorMessage: '请输入商品名称'
-			},
-			{
-				minLength: 1,
-				maxLength: 40,
-				errorMessage: '商品名称长度在 {minLength} 到 {maxLength} 个字符'
-			}
-		]
-	},
-	categoryId: {
-		rules: [
-			{
+			}]
+		},
+		name: {
+			rules: [{
+					required: true,
+					errorMessage: '请输入商品名称'
+				},
+				{
+					minLength: 1,
+					maxLength: 40,
+					errorMessage: '商品名称长度在 {minLength} 到 {maxLength} 个字符'
+				}
+			]
+		},
+		categoryId: {
+			rules: [{
 				required: true,
 				errorMessage: '请选择商品分类'
-			}
-		]
-	},
-	floorPrice: {
-		rules: [
-			{
+			}]
+		},
+		floorPrice: {
+			rules: [{
 				required: true,
 				errorMessage: '请填写商品底价'
-			}
-		]
+			}]
+		}
+	};
+
+	/**
+	 * 删除提示打开
+	 */
+	function delModelShow() {
+		delModel.value.open();
 	}
-};
 
-/**
- * 删除提示打开
- */
-function delModelShow() {
-	delModel.value.open();
-}
-
-/**
- * 删除商品
- */
-function delmodelConfirm() {
-	delProduct(option.productId).then((res) => {
-		uni.showToast({
-			icon: 'none',
-			title: '删除成功'
+	/**
+	 * 删除商品
+	 */
+	function delmodelConfirm() {
+		delProduct(option.productId).then((res) => {
+			uni.showToast({
+				icon: 'none',
+				title: '删除成功'
+			});
+			setTimeout(() => {
+				uni.$emit('del:productIndex', option.productId);
+				go.back();
+			}, 500);
 		});
-		setTimeout(() => {
-			uni.$emit('del:productIndex', option.productId);
-			go.back();
-		}, 500);
-	});
-}
-
-function updateGoodsDetail() {
-	getGoodsDetail();
-}
-
-let timer = null;
-
-function settimeoutBack(time) {
-	clearTimeout(timer);
-	timer = setTimeout(() => {
-		uni.$emit('update:productIndex');
-		uni.navigateBack();
-	}, time);
-}
-
-//保存
-async function save() {
-	const bol = await hasPermission('允许修改商品');
-	if (!bol) {
-		return;
 	}
-	Forms.value
-		.validate()
-		.then((res) => {
-			const { groupType, type } = FormData;
 
-			const images = refFile.value.getFileList();
-			if (images.length <= 0) {
-				return infoBox.showToast('请上传商品图片');
-			}
+	function updateGoodsDetail() {
+		// getGoodsDetail();
+		save()
+	}
 
-			let selectSpecInfo = $goodsData.selectSpecInfo;
-			if (FormData.specificationsGroup.specAllList) {
-				selectSpecInfo = {};
-				for (let i of FormData.specificationsGroup.selectSpecInfo) {
-					if (i.selectSpecResult.length) {
-						selectSpecInfo[i.name] = i.selectSpecResult;
-					}
-				}
-			}
+	let timer = null;
 
-			if (type != 'sku') {
-				let lowPrice = skuList.list[0] ? skuList.list[0].salePrice : FormData.salePrice;
-				let suitNum = skuList.list[0] ? skuList.list[0].suitNum : 0;
-				if (lowPrice === '') {
-					return infoBox.showToast('请输入售价');
+	function settimeoutBack(time) {
+		clearTimeout(timer);
+		timer = setTimeout(() => {
+			uni.$emit('update:productIndex');
+			uni.navigateBack();
+		}, time);
+	}
+
+	//保存
+	async function save() {
+		const bol = await hasPermission('允许修改商品');
+		if (!bol) {
+			return;
+		}
+		Forms.value
+			.validate()
+			.then((res) => {
+				const {
+					groupType,
+					type
+				} = FormData;
+
+				const images = refFile.value.getFileList();
+				if (images.length <= 0) {
+					return infoBox.showToast('请上传商品图片');
 				}
-				if (suitNum <= 0) {
-					return infoBox.showToast('起售数量不能小于0！');
-				}
-				if (FormData.stockNumber === '') {
-					return infoBox.showToast('请输入库存数量！');
-				}
-			}
-			if (type == 'sku') {
-				if (selectSpecInfo.length == 0 || JSON.stringify(selectSpecInfo) == '{}') {
-					return infoBox.showToast('请选择规格！');
-				}
-			}
-			if (type == 'package') {
-				if (groupType == 0 && FormData.proGroupVo[0].goods.length <= 0) {
-					// 固定套餐
-					return infoBox.showToast('套餐组合至少需要包含一种商品，请添加商品');
-				}
-				if (groupType == 1) {
-					let ispase = FormData.proGroupVo.length > 0 ? true : false;
-					let tips = ispase ? '' : '请添加至少一种套餐';
-					for (let i in FormData.proGroupVo) {
-						FormData.proGroupVo[i].count = FormData.proGroupVo[i].goods.length;
-						const item = FormData.proGroupVo[i];
-						if (item.goods.length <= 0) {
-							ispase = false;
-							tips = '套餐组合至少需要包含一种商品，请添加商品';
-							break;
-						}
-						if (!item.title) {
-							ispase = false;
-							tips = '请输入套餐名称';
-							break;
+
+				let selectSpecInfo = $goodsData.selectSpecInfo;
+				if (FormData.specificationsGroup.specAllList) {
+					selectSpecInfo = {};
+					for (let i of FormData.specificationsGroup.selectSpecInfo) {
+						if (i.selectSpecResult.length) {
+							selectSpecInfo[i.name] = i.selectSpecResult;
 						}
 					}
-					if (!ispase) {
-						return infoBox.showToast(tips);
+				}
+
+				if (type != 'sku') {
+					let lowPrice = skuList.list[0] ? skuList.list[0].salePrice : FormData.salePrice;
+					let suitNum = skuList.list[0] ? skuList.list[0].suitNum : 0;
+					if (lowPrice === '') {
+						return infoBox.showToast('请输入售价');
+					}
+					if (suitNum <= 0) {
+						return infoBox.showToast('起售数量不能小于0！');
+					}
+					if (FormData.stockNumber === '') {
+						return infoBox.showToast('请输入库存数量！');
 					}
-					// 可选套餐
-				} else {
-					FormData.proGroupVo[0].count = FormData.proGroupVo[0].goods.length;
-					FormData.proGroupVo[0].number = 1;
 				}
-			}
-			if (type == 'weight') {
-				if (!FormData.weight) {
-					return infoBox.showToast('请输入重量');
+				if (type == 'sku') {
+					if (selectSpecInfo.length == 0 || JSON.stringify(selectSpecInfo) == '{}') {
+						return infoBox.showToast('请选择规格！');
+					}
 				}
-			}
-			const submitData = {
-				...FormData,
-				proGroupVo: type != 'package' ? '' : FormData.proGroupVo,
-				images: images,
-				coverImg: images[0] || '',
-				skuList: skuList.list,
-				selectSpecInfo: selectSpecInfo
-			};
-			//编辑
-			if (option.type === 'edit') {
-				return updateProduct(submitData).then((res) => {
-					infoBox.showSuccessToast('更新成功');
+				if (type == 'package') {
+					if (groupType == 0 && FormData.proGroupVo[0].goods.length <= 0) {
+						// 固定套餐
+						return infoBox.showToast('套餐组合至少需要包含一种商品，请添加商品');
+					}
+					if (groupType == 1) {
+						let ispase = FormData.proGroupVo.length > 0 ? true : false;
+						let tips = ispase ? '' : '请添加至少一种套餐';
+						for (let i in FormData.proGroupVo) {
+							FormData.proGroupVo[i].count = FormData.proGroupVo[i].goods.length;
+							const item = FormData.proGroupVo[i];
+							if (item.goods.length <= 0) {
+								ispase = false;
+								tips = '套餐组合至少需要包含一种商品，请添加商品';
+								break;
+							}
+							if (!item.title) {
+								ispase = false;
+								tips = '请输入套餐名称';
+								break;
+							}
+						}
+						if (!ispase) {
+							return infoBox.showToast(tips);
+						}
+						// 可选套餐
+					} else {
+						FormData.proGroupVo[0].count = FormData.proGroupVo[0].goods.length;
+						FormData.proGroupVo[0].number = 1;
+					}
+				}
+				if (type == 'weight') {
+					if (!FormData.weight) {
+						return infoBox.showToast('请输入重量');
+					}
+				}
+				const submitData = {
+					...FormData,
+					proGroupVo: type != 'package' ? '' : FormData.proGroupVo,
+					images: images,
+					coverImg: images[0] || '',
+					skuList: skuList.list,
+					selectSpecInfo: selectSpecInfo
+				};
+				//编辑
+				if (option.type === 'edit') {
+					return updateProduct(submitData).then((res) => {
+						infoBox.showSuccessToast('更新成功');
+						settimeoutBack(1500);
+					});
+				}
+				// 如果套餐没选择规格,默认选中第一条
+				if (submitData.proGroupVo) {
+					submitData.proGroupVo.forEach((res, index) => {
+						submitData.proGroupVo[index].goods.forEach((ele) => {
+							if (!ele.skuId) {
+								ele.skuId = ele.skuList[0].id;
+								ele.skuName = ele.skuList[0].specInfo || ele.skuList[0].name;
+							}
+						});
+					});
+				}
+				addProduct(submitData).then((res) => {
+					infoBox.showSuccessToast('添加成功');
 					settimeoutBack(1500);
 				});
-			}
-			// 如果套餐没选择规格,默认选中第一条
-			if (submitData.proGroupVo) {
-				submitData.proGroupVo.forEach((res, index) => {
-					submitData.proGroupVo[index].goods.forEach((ele) => {
-						if (!ele.skuId) {
-							ele.skuId = ele.skuList[0].id;
-							ele.skuName = ele.skuList[0].specInfo || ele.skuList[0].name;
-						}
-					});
-				});
-			}
-			addProduct(submitData).then((res) => {
-				infoBox.showSuccessToast('添加成功');
-				settimeoutBack(1500);
+			})
+			.catch((err) => {
+				console.log(err);
 			});
-		})
-		.catch((err) => {
-			console.log(err);
-		});
-}
-
-/**
- *  监听规格保存,拿到数据
- */
-
-function watchSpecificationsSave() {
-	uni.$off('emitspecificationsSave');
-	uni.$on('emitspecificationsSave', function (data) {
-		console.log(data);
-		FormData.specificationsGroup = data;
-		FormData.specId = data.specId;
-		FormData.specName = data.specName;
-		skuList.list = data.result.map((v) => {
-			return {
-				...v.skus,
-				...v.names,
-				specInfo: v.specInfo,
-				coverImg: v.coverImg || ''
-			};
-		});
-	});
-}
-
-/**
- * 编辑规格
- */
-function toGuige() {
-	console.log(FormData.specificationsGroup);
-	uni.setStorageSync('guige', FormData.specificationsGroup);
-	go.to('PAGES_PRODUCT_GUIGE_CHOOSE', {
-		emitName: 'emitspecificationsSave',
-		type: option.type
-	});
-}
-
-/**
- *  监听定时器保存,拿到数据
- * @param {Boolean} open //控制开启或关闭监听
- */
-function watchTimerSave(open = true) {
-	uni.$off('timerSave');
-	uni.$on('timerSave', function (timer) {
-		Object.assign(FormData, timer);
-	});
-}
-
-/**
- * 设置定时上下级
- */
-function toTimerPage() {
-	go.to('PAGES_PRODUCT_TIMER', {
-		days: FormData.days,
-		startTime: FormData.startTime,
-		endTime: FormData.endTime
-	});
-}
-
-const $week = {
-	Monday: '周一',
-	Tuesday: '周二',
-	Wednesday: '周三',
-	Thursday: '周四',
-	Friday: '周五',
-	Saturday: '周六',
-	Sunday: '周日'
-};
-
-/**
- * 定时数据显示处理
- */
-function returnTimerDayText() {
-	if (!FormData.days) {
-		return '';
 	}
-	return FormData.days
-		.split(',')
-		.filter((v) => v)
-		.map((v) => $week[v])
-		.join(',');
-	// return FormData.timer.length ? `当前有${FormData.timer.length}个定时器` : '没有定时器'
-}
 
-/**
- * 定时数据显示处理
- */
-function returnTimerTimeText() {
-	if (!FormData.startTime || !FormData.endTime) {
-		return '';
+	/**
+	 *  监听规格保存,拿到数据
+	 */
+
+	function watchSpecificationsSave() {
+		uni.$off('emitspecificationsSave');
+		uni.$on('emitspecificationsSave', function(data) {
+			console.log(data);
+			FormData.specificationsGroup = data;
+			FormData.specId = data.specId;
+			FormData.specName = data.specName;
+			skuList.list = data.result.map((v) => {
+				return {
+					...v.skus,
+					...v.names,
+					specInfo: v.specInfo,
+					coverImg: v.coverImg || ''
+				};
+			});
+		});
 	}
-	return FormData.startTime + '-' + FormData.endTime;
-}
 
-function initDefaultProGroupVo() {
-	FormData.proGroupVo = [
-		{
+	/**
+	 * 编辑规格
+	 */
+	function toGuige() {
+		console.log(FormData.specificationsGroup);
+		uni.setStorageSync('guige', FormData.specificationsGroup);
+		go.to('PAGES_PRODUCT_GUIGE_CHOOSE', {
+			emitName: 'emitspecificationsSave',
+			type: option.type
+		});
+	}
+
+	/**
+	 *  监听定时器保存,拿到数据
+	 * @param {Boolean} open //控制开启或关闭监听
+	 */
+	function watchTimerSave(open = true) {
+		uni.$off('timerSave');
+		uni.$on('timerSave', function(timer) {
+			Object.assign(FormData, timer);
+		});
+	}
+
+	/**
+	 * 设置定时上下级
+	 */
+	function toTimerPage() {
+		go.to('PAGES_PRODUCT_TIMER', {
+			days: FormData.days,
+			startTime: FormData.startTime,
+			endTime: FormData.endTime
+		});
+	}
+
+	const $week = {
+		Monday: '周一',
+		Tuesday: '周二',
+		Wednesday: '周三',
+		Thursday: '周四',
+		Friday: '周五',
+		Saturday: '周六',
+		Sunday: '周日'
+	};
+
+	/**
+	 * 定时数据显示处理
+	 */
+	function returnTimerDayText() {
+		if (!FormData.days) {
+			return '';
+		}
+		return FormData.days
+			.split(',')
+			.filter((v) => v)
+			.map((v) => $week[v])
+			.join(',');
+		// return FormData.timer.length ? `当前有${FormData.timer.length}个定时器` : '没有定时器'
+	}
+
+	/**
+	 * 定时数据显示处理
+	 */
+	function returnTimerTimeText() {
+		if (!FormData.startTime || !FormData.endTime) {
+			return '';
+		}
+		return FormData.startTime + '-' + FormData.endTime;
+	}
+
+	function initDefaultProGroupVo() {
+		FormData.proGroupVo = [{
 			title: '',
 			count: 1,
 			number: 1,
 			goods: []
-		}
-	];
-	console.log(FormData.proGroupVo);
-}
-
-/**
- * 权限start
- */
-
-// 允许修改商品库存
-let disabledStock = ref(false);
-async function canEditGoodsStock(tips = false) {
-	console.log(tips);
-	if (option.type === 'edit') {
-		const res = await hasPermission({
-			text: '允许修改商品库存',
-			tips: tips
-		});
-		disabledStock.value = !res;
+		}];
+		console.log(FormData.proGroupVo);
 	}
-}
-watch(
-	() => FormData.isStock,
-	(newval) => {
-		if (newval) {
-			canEditGoodsStock();
+
+	/**
+	 * 权限start
+	 */
+
+	// 允许修改商品库存
+	let disabledStock = ref(false);
+	async function canEditGoodsStock(tips = false) {
+		console.log(tips);
+		if (option.type === 'edit') {
+			const res = await hasPermission({
+				text: '允许修改商品库存',
+				tips: tips
+			});
+			disabledStock.value = !res;
 		}
 	}
-);
-// 允许修改商品分类
-let disabledChangeCategory = ref(false);
-async function canEditGoodsCategory(tips = false) {
-	if (option.type === 'edit') {
-		const res = await hasPermission({
-			text: '允许修改分类',
-			tips
-		});
-		disabledChangeCategory.value = !res;
-	}
-}
-
-const activeinHouseList = computed(() => {
-	try {
-		return pageData.units.filter((item) => {
-			if (item.id == FormData.unitId) {
-				return item.name;
+	watch(
+		() => FormData.isStock,
+		(newval) => {
+			if (newval) {
+				canEditGoodsStock();
 			}
-		})[0].name;
-	} catch (error) {
-		//TODO handle the exception
+		}
+	);
+	// 允许修改商品分类
+	let disabledChangeCategory = ref(false);
+	async function canEditGoodsCategory(tips = false) {
+		if (option.type === 'edit') {
+			const res = await hasPermission({
+				text: '允许修改分类',
+				tips
+			});
+			disabledChangeCategory.value = !res;
+		}
 	}
-});
 
-/**
- * 销毁
- */
-onBeforeUnmount(() => {
-	clearTimeout(timer);
-});
+	const activeinHouseList = computed(() => {
+		try {
+			return pageData.units.filter((item) => {
+				if (item.id == FormData.unitId) {
+					return item.name;
+				}
+			})[0].name;
+		} catch (error) {
+			//TODO handle the exception
+		}
+	});
+
+	/**
+	 * 销毁
+	 */
+	onBeforeUnmount(() => {
+		clearTimeout(timer);
+	});
 </script>
 <style scoped>
-page {
-	background: #f9f9f9;
-}
+	page {
+		background: #f9f9f9;
+	}
 </style>
 <style lang="scss" scoped>
-.tips {
-	font-size: 28upx;
-	color: #999;
-}
-.barCode {
-	border: 1px solid #e5e5e5;
-	border-radius: 8rpx 8rpx 8rpx 8rpx;
-	padding: 22rpx 24rpx;
-	background: #fcfcfc;
-}
-
-.top {
-	position: fixed;
-	// left: 28rpx;
-	// right: 28rpx;
-	// /* #ifdef H5 */
-	// top: calc(44px + 24rpx);
-	// /* #endif */
-	// /* #ifndef H5 */
-	// top: calc(var(--status-bar-height) + 24rpx);
-	// /* #endif */
-	// z-index: 999;
-}
-
-::v-deep .uni-forms-item--border {
-	padding-top: 12px;
-	padding-bottom: 12px;
-}
-
-.stick-bottom {
-	top: 0;
-	z-index: 10;
-}
-
-::v-deep .stock .uni-data-checklist .checklist-group .checklist-box {
-	margin-right: 30rpx;
-}
-
-.stock .btns {
-	position: fixed;
-	bottom: 100rpx;
-	left: 110rpx;
-	right: 110rpx;
-	display: flex;
-	flex-direction: column;
-	gap: 20rpx;
-}
-
-.u-p-l-100 {
-	padding-left: 100rpx;
-}
-
-.bg-gray {
-	background: #f9f9f9;
-	padding: 0 20rpx;
-}
-
-.safe-page {
-	background: #f9f9f9;
-}
-
-.my-switch {
-	transform: scale(0.7);
-}
-
-.label-title {
-	font-size: 28rpx;
-	font-weight: bold;
-	font-family: Source Han Sans CN, Source Han Sans CN;
-}
-
-.lh40 {
-	line-height: 40rpx;
-}
-
-.bootom {
-	position: fixed;
-	left: 110rpx;
-	right: 110rpx;
-	bottom: 60px;
-	z-index: 9;
-}
-
-.minus {
-}
-
-.plus {
-}
-
-.box {
-	margin-top: 32rpx;
-	font-size: 28rpx;
-
-	.block {
-		background: #ffffff;
-		border-radius: 8rpx 18rpx 8rpx 18rpx;
-		padding: 12rpx 24rpx;
-		margin-bottom: 32rpx;
-	}
-}
-
-::v-deep.uni-forms-item {
-	align-items: inherit;
-}
-
-::v-deep .typeEnum .u-radio-group--row {
-	flex-wrap: nowrap;
-	justify-content: space-between;
-}
-
-::v-deep .typeEnum .u-checkbox-group--row {
-	flex-wrap: nowrap;
-	justify-content: space-between;
-}
-
-::v-deep .uni-forms-item .uni-forms-item__label {
-	text-indent: 0;
-	font-size: 28rpx !important;
-	font-weight: bold;
-	color: #333;
-}
-
-::v-deep .stock .uni-forms-item {
-	min-height: initial !important;
-}
-
-.gap-26 {
-	gap: 26rpx;
-}
-
-::v-deep .bg-gray .uni-forms-item {
-	background-color: transparent !important;
-}
-
-::v-deep .border-top-0 .uni-forms-item.is-direction-top {
-	border-color: transparent !important;
-}
-
-::v-deep .uni-data-checklist .checklist-group .checklist-box .checklist-content .checklist-text {
-	font-size: 28rpx;
-	color: #333;
-}
-
-::v-deep .none-label .uni-forms-item.is-direction-top {
-	padding: 0 !important;
-	min-height: initial !important;
-}
-
-::v-deep .uni-easyinput__content-input {
-	height: inherit;
-}
-
-::v-deep .none-label .uni-forms-item .uni-forms-item__label {
-	padding: 0 !important;
-}
-
-.save-btn {
-	background-color: $my-main-color;
-	color: #fff;
-	border-radius: 100rpx;
-	font-size: 28rpx;
-}
-
-.btn-hover-class {
-	opacity: 0.6;
-}
-
-.zuofa {
-	padding: 28rpx 0;
-	background: #f9f9f9;
-	padding-left: 42rpx;
-	border-radius: 14rpx 14rpx 14rpx 14rpx;
-}
-
-::v-deep .uni-input-placeholder {
-	font-size: 28rpx;
-}
-
-.table {
-	background: #f9f9f9;
-	border-radius: 8rpx;
-	overflow: hidden;
-
-	.title {
-		padding: 12rpx 24rpx 12rpx 24rpx;
-		background: #aebad2;
-		border-radius: 8rpx 8rpx 0rpx 0rpx;
-		color: #fff;
+	.tips {
+		font-size: 28upx;
+		color: #999;
 	}
 
-	.row:nth-of-type(2n + 1) {
-		background: #f0f0f0;
+	.barCode {
+		border: 1px solid #e5e5e5;
+		border-radius: 8rpx 8rpx 8rpx 8rpx;
+		padding: 22rpx 24rpx;
+		background: #fcfcfc;
 	}
-}
 
-.types {
-	.item {
-		padding: 6rpx 20rpx;
-		border: 1px solid #bbb;
-		border-radius: 8rpx;
+	.top {
+		position: fixed;
+		// left: 28rpx;
+		// right: 28rpx;
+		// /* #ifdef H5 */
+		// top: calc(44px + 24rpx);
+		// /* #endif */
+		// /* #ifndef H5 */
+		// top: calc(var(--status-bar-height) + 24rpx);
+		// /* #endif */
+		// z-index: 999;
+	}
+
+	::v-deep .uni-forms-item--border {
+		padding-top: 12px;
+		padding-bottom: 12px;
+	}
+
+	.stick-bottom {
+		top: 0;
+		z-index: 10;
+	}
+
+	::v-deep .stock .uni-data-checklist .checklist-group .checklist-box {
 		margin-right: 30rpx;
-		margin-bottom: 20rpx;
-		text-align: center;
-		position: relative;
+	}
 
-		.gou {
-			display: none;
-			position: absolute;
-			right: 0;
-			top: 0;
-			background-color: $my-main-color;
-			width: 32rpx;
-			height: 32rpx;
-			clip-path: polygon(100% 0, 0 0, 100% 100%);
+	.stock .btns {
+		position: fixed;
+		bottom: 100rpx;
+		left: 110rpx;
+		right: 110rpx;
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+
+	.u-p-l-100 {
+		padding-left: 100rpx;
+	}
+
+	.bg-gray {
+		background: #f9f9f9;
+		padding: 0 20rpx;
+	}
+
+	.safe-page {
+		background: #f9f9f9;
+	}
+
+	.my-switch {
+		transform: scale(0.7);
+	}
+
+	.label-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		font-family: Source Han Sans CN, Source Han Sans CN;
+	}
+
+	.lh40 {
+		line-height: 40rpx;
+	}
+
+	.bootom {
+		position: fixed;
+		left: 110rpx;
+		right: 110rpx;
+		bottom: 60px;
+		z-index: 9;
+	}
+
+	.minus {}
+
+	.plus {}
+
+	.box {
+		margin-top: 32rpx;
+		font-size: 28rpx;
+
+		.block {
+			background: #ffffff;
+			border-radius: 8rpx 18rpx 8rpx 18rpx;
+			padding: 12rpx 24rpx;
+			margin-bottom: 32rpx;
 		}
 	}
 
-	.active {
-		border-color: $my-main-color;
+	::v-deep.uni-forms-item {
+		align-items: inherit;
+	}
 
-		.gou {
-			display: flex;
-		}
+	::v-deep .typeEnum .u-radio-group--row {
+		flex-wrap: nowrap;
+		justify-content: space-between;
+	}
+
+	::v-deep .typeEnum .u-checkbox-group--row {
+		flex-wrap: nowrap;
+		justify-content: space-between;
+	}
+
+	::v-deep .uni-forms-item .uni-forms-item__label {
+		text-indent: 0;
+		font-size: 28rpx !important;
+		font-weight: bold;
+		color: #333;
+	}
+
+	.link-goods {
+		background-color: #fff;
+		padding: 32rpx 20rpx;
+	}
+
+	::v-deep .link-goods .uni-forms-item {
+		align-items: inherit;
+	}
+
+	::v-deep .link-goods .typeEnum .u-radio-group--row {
+		flex-wrap: nowrap;
+		justify-content: space-between;
+	}
+
+	::v-deep .link-goods .typeEnum .u-checkbox-group--row {
+		flex-wrap: nowrap;
+		justify-content: space-between;
+	}
+
+	::v-deep .link-goods .uni-forms-item .uni-forms-item__label {
+		text-indent: 0;
+		font-size: 28rpx !important;
+		font-weight: bold;
+		color: #333;
+	}
+
+	::v-deep .stock .uni-forms-item {
+		min-height: initial !important;
+	}
+
+	.gap-26 {
+		gap: 26rpx;
+	}
+
+	::v-deep .bg-gray .uni-forms-item {
+		background-color: transparent !important;
+	}
+
+	::v-deep .border-top-0 .uni-forms-item.is-direction-top {
+		border-color: transparent !important;
+	}
+
+	::v-deep .uni-data-checklist .checklist-group .checklist-box .checklist-content .checklist-text {
+		font-size: 28rpx;
+		color: #333;
+	}
+
+	::v-deep .none-label .uni-forms-item.is-direction-top {
+		padding: 0 !important;
+		min-height: initial !important;
+	}
+
+	::v-deep .uni-easyinput__content-input {
+		height: inherit;
+	}
+
+	::v-deep .none-label .uni-forms-item .uni-forms-item__label {
+		padding: 0 !important;
+	}
+
+	.save-btn {
+		background-color: $my-main-color;
+		color: #fff;
+		border-radius: 100rpx;
+		font-size: 28rpx;
+	}
+
+	.btn-hover-class {
+		opacity: 0.6;
+	}
+
+	.zuofa {
+		padding: 28rpx 0;
+		background: #f9f9f9;
+		padding-left: 42rpx;
+		border-radius: 14rpx 14rpx 14rpx 14rpx;
+	}
+
+	::v-deep .uni-input-placeholder {
+		font-size: 28rpx;
+	}
+
+	.table {
+		background: #f9f9f9;
+		border-radius: 8rpx;
+		overflow: hidden;
 
 		.title {
-			color: $my-main-color;
+			padding: 12rpx 24rpx 12rpx 24rpx;
+			background: #aebad2;
+			border-radius: 8rpx 8rpx 0rpx 0rpx;
+			color: #fff;
+		}
+
+		.row:nth-of-type(2n + 1) {
+			background: #f0f0f0;
 		}
 	}
 
-	&.disabled {
-		position: relative;
-
-		&::after {
-			position: absolute;
-			content: '';
-			display: block;
-			left: 0;
-			right: 0;
-			top: 0;
-			bottom: 0;
-		}
-
+	.types {
 		.item {
-			background-color: #f9f9f9;
-			border-color: #eee;
-
-			&.active {
-				border-color: rgba(49, 138, 254, 0.3);
-			}
+			padding: 6rpx 20rpx;
+			border: 1px solid #bbb;
+			border-radius: 8rpx;
+			margin-right: 30rpx;
+			margin-bottom: 20rpx;
+			text-align: center;
+			position: relative;
 
 			.gou {
-				opacity: 0.5;
+				display: none;
+				position: absolute;
+				right: 0;
+				top: 0;
+				background-color: $my-main-color;
+				width: 32rpx;
+				height: 32rpx;
+				clip-path: polygon(100% 0, 0 0, 100% 100%);
+			}
+		}
+
+		.active {
+			border-color: $my-main-color;
+
+			.gou {
+				display: flex;
 			}
 
 			.title {
+				color: $my-main-color;
+			}
+		}
+
+		&.disabled {
+			position: relative;
+
+			&::after {
+				position: absolute;
+				content: '';
+				display: block;
+				left: 0;
+				right: 0;
+				top: 0;
+				bottom: 0;
+			}
+
+			.item {
+				background-color: #f9f9f9;
+				border-color: #eee;
+
+				&.active {
+					border-color: rgba(49, 138, 254, 0.3);
+				}
+
+				.gou {
+					opacity: 0.5;
+				}
+
+				.title {
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.table {
+		border: 1px solid #ececec;
+		margin-top: 28upx;
+
+		.table-tips {
+			padding: 28upx;
+			display: flex;
+			justify-content: center;
+
+			.t {
+				font-size: 28upx;
 				color: #999;
 			}
 		}
+
+		.tabhead {
+			background-color: #f8f8f8;
+			border-bottom: 1px solid #ececec;
+
+			.t {
+				font-weight: bold;
+			}
+		}
+
+		.tr {
+			display: flex;
+
+			&:not(:last-child) {
+				border-bottom: 1px solid #ececec;
+			}
+
+			.td {
+				flex: 1;
+				min-height: 80upx;
+				display: flex;
+				align-items: center;
+				padding: 20upx;
+
+				&:not(:last-child) {
+					border-right: 1px solid #ececec;
+				}
+
+				&:nth-child(2) {
+					flex: 2;
+				}
+
+				.cover {
+					$size: 80upx;
+					width: $size;
+					height: $size;
+					border-radius: 8upx;
+				}
+
+				.t {
+					font-size: 28upx;
+					color: #333;
+				}
+			}
+		}
 	}
-}
-.table {
-	border: 1px solid #ececec;
-	margin-top: 28upx;
-	.table-tips {
-		padding: 28upx;
+
+	.add-goods {
 		display: flex;
 		justify-content: center;
-		.t {
-			font-size: 28upx;
-			color: #999;
-		}
+		padding-top: 28upx;
 	}
-	.tabhead {
-		background-color: #f8f8f8;
-		border-bottom: 1px solid #ececec;
-		.t {
-			font-weight: bold;
-		}
-	}
-	.tr {
-		display: flex;
-		&:not(:last-child) {
-			border-bottom: 1px solid #ececec;
-		}
-		.td {
-			flex: 1;
-			min-height: 80upx;
-			display: flex;
-			align-items: center;
-			padding: 20upx;
-			&:not(:last-child) {
-				border-right: 1px solid #ececec;
-			}
-			&:nth-child(2) {
-				flex: 2;
-			}
-			.cover {
-				$size: 80upx;
-				width: $size;
-				height: $size;
-				border-radius: 8upx;
-			}
-			.t {
-				font-size: 28upx;
-				color: #333;
-			}
-		}
-	}
-}
-.add-goods {
-	display: flex;
-	justify-content: center;
-	padding-top: 28upx;
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/edit-haocai.vue b/pageProduct/add-Product/components/edit-haocai.vue
index 7deaf7b..1b6b217 100644
--- a/pageProduct/add-Product/components/edit-haocai.vue
+++ b/pageProduct/add-Product/components/edit-haocai.vue
@@ -1,6 +1,7 @@
 <template>
 	<view>
 		<view class="default-box-padding bg-fff border-r-18">
+			<view class="font-bold u-m-b-32">绑定耗材</view>
 			<view class="u-flex u-row-between">
 				<view>商品名称</view>
 			</view>
@@ -38,14 +39,14 @@
 							</view>
 							<view class="u-flex u-m-t-16 u-font-24" v-if="item.stockNumber">
 								<view class="xuhao">
-				
+
 								</view>
 								<view class="u-flex u-flex-1 u-p-l-32 gap-20">库存：{{item.stockNumber}}
 									{{item.conUnit}}
 								</view>
 							</view>
 						</view>
-				
+
 					</view>
 				</view>
 				<view class="u-flex">
@@ -53,17 +54,34 @@
 						<up-icon :size="18" color="#318AFE" name="plus-circle-fill"></up-icon>
 						<view class="u-m-l-16">添加耗材</view>
 					</view>
-				
+
 				</view>
 
 			</view>
 		</view>
-		<view class="default-box-padding bg-fff border-r-18 u-flex u-row-between u-m-t-32">
-			<view>当某个耗材的使用库存不足时，商品自动售罄。</view>
-		
+		<view class="default-box-padding bg-fff border-r-18 u-m-t-32">
+			<view class="up-border-bottom u-p-b-32">
+				<view class="u-flex u-row-between   ">
+					<view class="font-bold"> 自动售罄</view>
+					<up-switch :size="16" v-model="isAutoSoldStock" :inactive-value="0" :active-value="1"></up-switch>
+				</view>
+				<view class=" u-m-t-10">当某个耗材的使用库存不足时，商品自动售罄。</view>
+			</view>
+
+			<view class="  u-p-t-32">
+				<view class="">
+					<view class="font-bold u-m-b-16"> 退菜是否退库存</view>
+					<up-radio-group v-model="refundMode">
+						<up-radio v-for="(item,index) in tuiStockTypes" :key="index" :label="item.label"
+							:name="item.key"></up-radio>
+					</up-radio-group>
+					<view class="color-red u-m-t-10">当前店铺退菜退库存规则：跟随商品分类</view>
+				</view>
+			</view>
+
 		</view>
 		<view class="bottom">
-			<my-button type="primary" shape="circle" font-weight="700"  @click="save">保存</my-button>
+			<my-button type="primary" shape="circle" font-weight="700" @click="save">保存</my-button>
 			<my-button bgColor="#F9F9F9" shape="circle" color="#999" @click="cancel">取消</my-button>
 		</view>
 
@@ -72,16 +90,43 @@
 </template>
 
 <script setup>
-	import { ref, reactive, watch, computed, onMounted } from 'vue';
+	import {
+		ref,
+		reactive,
+		watch,
+		computed,
+		onMounted
+	} from 'vue';
 
 	import infoBox from '@/commons/utils/infoBox.js'
 	import chooseHaocai from './choose-haocai.vue';
 	import chooseDanwei from './choose-danwei.vue';
-	import { hasPermission } from '@/commons/utils/hasPermission.js';
-	
-	import { getConsList } from '@/http/api/cons.js';
-	import { productBindCons } from '@/http/api/product.js';
-	
+	import {
+		hasPermission
+	} from '@/commons/utils/hasPermission.js';
+
+	import {
+		getConsList
+	} from '@/http/api/cons.js';
+	import {
+		productBindCons
+	} from '@/http/api/product.js';
+	const tuiStockTypes = ref([{
+			label: '退菜退库存',
+			key: 1
+		},
+		{
+			label: '仅退菜不退库存',
+			key: 2
+		},
+		{
+			label: '每次询问-退菜后弹窗提示，可手动选择',
+			key: 3
+		},
+	])
+	const isAutoSoldStock=defineModel('isAutoSoldStock',0)
+	const refundMode=defineModel('refundMode',1)
+
 	const emits = defineEmits(['cancel', 'updateGoods'])
 
 	const props = defineProps({
@@ -91,27 +136,30 @@
 				return {
 					consList: [],
 					skuList: [],
-					type: ''
+					type: '',
+					isAutoSoldStock:0,
+					isRefundStock:1,
 				}
 			}
 		}
 	})
-	
+
 	const pageData = reactive({
-		isBindGuige: false,   //是否绑定至规格
+		isBindGuige: false, //是否绑定至规格
 	})
-	
+
 	let haoCaiList = ref([])
 	let $haocaiMap = reactive({})
 	const skuList = ref(props.goods.skuList)
-	const consList = ref(props.goods.consList||[])
+	const consList = ref(props.goods.consList || [])
+	
 	watch(() => props.goods.consList, (newval) => {
 		consList.value = newval
 	})
 	watch(() => props.goods.skuList, (newval) => {
 		skuList.value = newval
 	})
-	
+
 	onMounted(() => {
 		init()
 	})
@@ -126,16 +174,16 @@
 			}
 			haoCaiList.value = res
 		})
-		
+
 	}
-	
+
 	/**
 	 * 取消耗材绑定
 	 */
 	function cancel() {
 		emits('cancel')
 	}
-	
+
 	/**
 	 * 耗材选择
 	 * @param {Object} newval
@@ -157,7 +205,7 @@
 			surplusStock: ''
 		})
 	}
-	
+
 	/**
 	 * 删除商品耗材
 	 * @param {Object} index
@@ -207,7 +255,6 @@
 		emits('updateGoods')
 		infoBox.showToast('修改成功')
 	}
-	
 </script>
 
 <style lang="scss" scoped>
diff --git a/pageProduct/add-Product/components/link-goods.vue b/pageProduct/add-Product/components/link-goods.vue
new file mode 100644
index 0000000..1369398
--- /dev/null
+++ b/pageProduct/add-Product/components/link-goods.vue
@@ -0,0 +1,11 @@
+<template>
+	<view>
+		<view></view>
+	</view>
+</template>
+
+<script setup>
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/pageProduct/index/components/goods.vue b/pageProduct/index/components/goods.vue
index 86e8090..f2e4c61 100644
--- a/pageProduct/index/components/goods.vue
+++ b/pageProduct/index/components/goods.vue
@@ -6,10 +6,10 @@
 					<text class="">排序</text>
 					<text class="u-m-l-20">{{data.sort}}</text>
 				</view>
-				<view class="color-333 u-m-l-42 u-flex">
+				<!-- <view class="color-333 u-m-l-42 u-flex">
 					<text class="stock u-m-l-4">库存:{{data.stockNumber}}</text>
 					<up-icon @click="editStock" name="edit-pen" :size="16" :color="$utils.ColorMain"></up-icon>
-				</view>
+				</view> -->
 			</view>
 			<view>
 				<!-- <text class="u-font-28 color-666" @click="changePrice">改价</text> -->
diff --git a/pages/shopSetUp/index.vue b/pages/shopSetUp/index.vue
index 0763e02..0c9d350 100644
--- a/pages/shopSetUp/index.vue
+++ b/pages/shopSetUp/index.vue
@@ -1,132 +1,90 @@
 <template>
-  <view class="page-wrapper">
-    <view class="page-cell">
-      <view class="label">头像</view>
-      <view class="right">
-        <up-avatar
-          class="fileImg"
-          :src="vdata.shopInfo.coverImg ? vdata.shopInfo.coverImg : ''"
-          mode="aspectFill"
-        ></up-avatar>
-        <view class="file" @tap="chooseAndUploadAvatar('coverImg')"></view>
-      </view>
-    </view>
-    <!-- <view class="page-cell m" @tap="updateValue('商户名称','shopName',vdata.shopInfo.shopName)"> -->
-    <view
-      class="page-cell m"
-      @tap="
+	<view class="page-wrapper">
+		<view class="page-cell">
+			<view class="label">头像</view>
+			<view class="right">
+				<up-avatar class="fileImg" :src="vdata.shopInfo.coverImg ? vdata.shopInfo.coverImg : ''"
+					mode="aspectFill"></up-avatar>
+				<view class="file" @tap="chooseAndUploadAvatar('coverImg')"></view>
+			</view>
+		</view>
+		<!-- <view class="page-cell m" @tap="updateValue('商户名称','shopName',vdata.shopInfo.shopName)"> -->
+		<view class="page-cell m" @tap="
         go.to('PAGES_SHOP_EDITVAL', {
           name: 'shopName',
           value: vdata.shopInfo.shopName,
         })
-      "
-    >
-      <view class="label">商户名称</view>
-      <view class="right">
-        <view>{{ vdata.shopInfo.shopName }}</view>
-        <up-icon name="arrow-right" color="#999999" size="15"></up-icon>
-      </view>
-    </view>
-    <view
-      class="page-cell m"
-      @tap="
+      ">
+			<view class="label">商户名称</view>
+			<view class="right">
+				<view>{{ vdata.shopInfo.shopName }}</view>
+				<up-icon name="arrow-right" color="#999999" size="15"></up-icon>
+			</view>
+		</view>
+		<view class="page-cell m" @tap="
         go.to('PAGES_SHOP_EDITVAL', {
           name: 'phone',
           value: vdata.shopInfo.phone,
         })
-      "
-    >
-      <view class="label">商户电话</view>
-      <view class="right">
-        <view>{{ vdata.shopInfo.phone }}</view>
-        <up-icon name="arrow-right" color="#999999" size="15"></up-icon>
-      </view>
-    </view>
-    <!-- 	<view class="page-cell m" >
+      ">
+			<view class="label">商户电话</view>
+			<view class="right">
+				<view>{{ vdata.shopInfo.phone }}</view>
+				<up-icon name="arrow-right" color="#999999" size="15"></up-icon>
+			</view>
+		</view>
+		<!-- 	<view class="page-cell m" >
 		<view class="label">到期时间</view>
 		<view class="right"><view>{{ vdata.shopInfo.realname }}</view><up-icon name="arrow-right" color="#999999" size="15"></up-icon></view>
 	</view> -->
-    <view class="page-cell m">
-      <view class="label">营业状态</view>
-      <view class="right">
-        <up-switch
-          v-model="vdata.shopInfo.status"
-          size="20"
-          :inactiveValue="2"
-          :activeValue="1"
-          activeColor="#0FC161"
-          @change="switchChange('status')"
-        ></up-switch>
-      </view>
-    </view>
-    <view class="page-cell m" @tap="showMap">
-      <view class="label">门店详细地址</view>
-      <view class="right">
-        <view>{{ vdata.shopInfo.address }}</view>
-        <up-icon name="arrow-right" color="#999999" size="15"></up-icon>
-      </view>
-    </view>
-    <!-- <view class="page-cell">
+		<view class="page-cell m">
+			<view class="label">营业状态</view>
+			<view class="right">
+				<up-switch v-model="vdata.shopInfo.status" size="20" :inactiveValue="2" :activeValue="1"
+					activeColor="#0FC161" @change="switchChange('status')"></up-switch>
+			</view>
+		</view>
+		<view class="page-cell m" @tap="showMap">
+			<view class="label">门店详细地址</view>
+			<view class="right">
+				<view>{{ vdata.shopInfo.address }}</view>
+				<up-icon name="arrow-right" color="#999999" size="15"></up-icon>
+			</view>
+		</view>
+		<!-- <view class="page-cell">
 		<view class="label">堂食功能</view>
 		<view class="right"><up-switch v-model="vdata.dineIn" size="20" activeColor="#0FC161" @change="switchChange('eatModel')"></up-switch></view>	
 	</view> -->
-    <view class="page-cell">
-      <view class="label">允许打包</view>
-      <view class="right"
-        ><up-switch
-          v-model="vdata.takeout"
-          size="20"
-          activeColor="#0FC161"
-          @change="switchChange('eatModel')"
-        ></up-switch
-      ></view>
-    </view>
-    <view class="page-cell m">
-      <view class="label">是否开启会员余额支付</view>
-      <view class="right">
-        <up-switch
-          v-model="vdata.shopInfo.isAccountPay"
-          size="20"
-          :inactiveValue="0"
-          :activeValue="1"
-          activeColor="#0FC161"
-          @change="switchChange('isAccountPay')"
-        ></up-switch>
-      </view>
-    </view>
-	<view class="page-cell m">
-	  <view class="label">是否开启数签子</view>
-	  <view class="right">
-	    <up-switch
-	      v-model="vdata.shopInfo.isCountStick"
-	      size="20"
-	      :inactiveValue="0"
-	      :activeValue="1"
-	      activeColor="#0FC161"
-	      @change="switchChange('isCountStick')"
-	    ></up-switch>
-	  </view>
-	</view>
-    <view class="page-cell m" style="display: block">
-      <view class="u-flex u-row-between">
-        <view class="label">点餐电子围栏</view>
-        <view class="right"
-          ><up-switch
-            v-model="vdata.shopInfo.isOrderFence"
-            size="20"
-            :inactiveValue="0"
-            :activeValue="1"
-            activeColor="#0FC161"
-            @change="switchChange('isOrderFence')"
-          ></up-switch
-        ></view>
-      </view>
-      <view class="u-m-t-6 color-666 u-font-24"
-        >开启后，用户只能在店铺附近两公里范围内点餐</view
-      >
-    </view>
+		<view class="page-cell">
+			<view class="label">允许打包</view>
+			<view class="right"><up-switch v-model="vdata.takeout" size="20" activeColor="#0FC161"
+					@change="switchChange('eatModel')"></up-switch></view>
+		</view>
+		<view class="page-cell m">
+			<view class="label">是否开启会员余额支付</view>
+			<view class="right">
+				<up-switch v-model="vdata.shopInfo.isAccountPay" size="20" :inactiveValue="0" :activeValue="1"
+					activeColor="#0FC161" @change="switchChange('isAccountPay')"></up-switch>
+			</view>
+		</view>
+		<view class="page-cell m">
+			<view class="label">是否开启数签子</view>
+			<view class="right">
+				<up-switch v-model="vdata.shopInfo.isCountStick" size="20" :inactiveValue="0" :activeValue="1"
+					activeColor="#0FC161" @change="switchChange('isCountStick')"></up-switch>
+			</view>
+		</view>
+		<view class="page-cell m" style="display: block">
+			<view class="u-flex u-row-between">
+				<view class="label">点餐电子围栏</view>
+				<view class="right"><up-switch v-model="vdata.shopInfo.isOrderFence" size="20" :inactiveValue="0"
+						:activeValue="1" activeColor="#0FC161" @change="switchChange('isOrderFence')"></up-switch>
+				</view>
+			</view>
+			<view class="u-m-t-6 color-666 u-font-24">开启后，用户只能在店铺附近两公里范围内点餐</view>
+		</view>
 
-    <!-- <view class="page-cell m">
+		<!-- <view class="page-cell m">
 			<view class="label">是否开启会员价支付</view>
 			<view class="right">
 				<up-switch
@@ -139,37 +97,28 @@
 				></up-switch>
 			</view>
 		</view> -->
-    <view class="page-cell">
-      <view class="label">
-        桌位费
-        <view
-          v-if="!vdata.isTableFee"
-          class="tableFee"
-          @tap="
+		<view class="page-cell">
+			<view class="label">
+				桌位费
+				<view v-if="!vdata.isTableFee" class="tableFee" @tap="
             go.to('PAGES_SHOP_EDITVAL', {
               name: 'tableFee',
               value: vdata.shopInfo.tableFee,
             })
-          "
-        >
-          {{ vdata.shopInfo.tableFee }}
-        </view>
-      </view>
-      <view class="right">
-        <view>
-          <up-checkbox-group>
-            <up-checkbox
-              label="免桌位费"
-              v-model:checked="vdata.isTableFee"
-              activeColor="#0FC161"
-              shape="circle"
-              @change="isTableFeeChange"
-            ></up-checkbox>
-          </up-checkbox-group>
-        </view>
-      </view>
-    </view>
-    <!-- <view class="page-cell">
+          ">
+					{{ vdata.shopInfo.tableFee }}
+				</view>
+			</view>
+			<view class="right">
+				<view>
+					<up-checkbox-group>
+						<up-checkbox label="免桌位费" v-model:checked="vdata.isTableFee" activeColor="#0FC161"
+							shape="circle" @change="isTableFeeChange"></up-checkbox>
+					</up-checkbox-group>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="page-cell">
 			<view class="label">台桌清理类型</view>
 			<view class="right">
 				<up-radio-group v-model="vdata.shopInfo.tableClearType" placement="row" @change="tableClearChange">
@@ -186,526 +135,623 @@
 				
 			</view>
 		</view> -->
-    <view class="page-cell m">
-      <view class="label">付费模式</view>
-      <view class="right">
-        <up-radio-group v-model="vdata.shopInfo.registerType" placement="row">
-          <up-radio
-            :customStyle="{ marginRight: '10px' }"
-            v-for="(item, index) in vdata.registerTypeList"
-            :key="index"
-            :label="item.name"
-            :name="item.value"
-            activeColor="#0FC161"
-            @change="radioChange"
-          ></up-radio>
-        </up-radio-group>
-      </view>
-    </view>
-    <view
-      class="page-cell"
-      @tap="
+		<view class="page-cell">
+			<view class="label">付费模式</view>
+			<view class="right">
+				<up-radio-group v-model="vdata.shopInfo.registerType" placement="row">
+					<up-radio :customStyle="{ marginRight: '10px' }" v-for="(item, index) in vdata.registerTypeList"
+						:key="index" :label="item.name" :name="item.value" activeColor="#0FC161"
+						@change="radioChange"></up-radio>
+				</up-radio-group>
+			</view>
+		</view>
+		<view class="page-cell m">
+			<view class="label">退菜退库存模式</view>
+			<view class="right">
+				<up-radio-group v-model="vdata.shopInfo.refundMode" placement="row">
+					<up-radio v-for="(item, index) in vdata.refund_modes" :key="index" :label="item.name"
+						:name="item.value" activeColor="#0FC161" @change="refundModeChange"></up-radio>
+				</up-radio-group>
+			</view>
+		</view>
+
+		<view class="page-cell" @tap="
         go.to('PAGES_SHOP_QRCODE', {
           paymentQrcode: vdata.shopInfo.paymentQrcode,
         })
-      "
-    >
-      <view class="label">店铺收款码</view>
-      <view class="right"
-        ><up-icon name="arrow-right" color="#999999" size="15"></up-icon
-      ></view>
-    </view>
+      ">
+			<view class="label">店铺收款码</view>
+			<view class="right"><up-icon name="arrow-right" color="#999999" size="15"></up-icon></view>
+		</view>
 
-    <!-- <view class="cutShop" @tap="go.to('PAGES_SHOP_LIST')">切换门店</view> -->
-  </view>
+		<!-- <view class="cutShop" @tap="go.to('PAGES_SHOP_LIST')">切换门店</view> -->
+
+
+		<up-modal :show="refundMode.show" title="提示" asyncClose android-*=""
+		showCancelButton
+		@close="refundMode.show=false"
+		@cancel="refundModeCancel"
+		@confirm="refundModeConfirm"
+		>
+			<view>
+				<view class="u-font-28">
+					<text>当前操作：将《退菜退库存》模式切换为</text>
+					<text class="color-red">「{{refundMode.mode}}」</text>
+				</view>
+				<view class="u-font-28 color-666 u-m-t-12">
+					<text class="">修改后，可前往「商品管理-商品分类」中编辑/查看配置</text>
+				</view>
+				<view class="u-m-t-40 u-font-28 color-red">
+					本操作将会影响耗材库存数量的统计，请谨慎操作
+				</view>
+			</view>
+
+		</up-modal>
+	</view>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from "vue";
-import { onShow } from "@dcloudio/uni-app";
-import go from "@/commons/utils/go.js";
-import { uploadFile } from "@/http/api/index.js";
-import {
-  getShopInfo,
-  editShopInfo,
-  getShopExtend,
-  editShopExtend,
-} from "@/http/api/shop.js";
+	import {
+		ref,
+		reactive,
+		onMounted
+	} from "vue";
+	import {
+		onShow
+	} from "@dcloudio/uni-app";
+	import go from "@/commons/utils/go.js";
+	import {
+		uploadFile
+	} from "@/http/api/index.js";
+	import {
+		getShopInfo,
+		editShopInfo,
+		getShopExtend,
+		editShopExtend,
+	} from "@/http/api/shop.js";
 
-const vdata = reactive({
-  shopInfo: {
-    status: 2,
-    isAccountPay: 0,
-    isMemberPrice: 0,
-  },
-  extendList: [],
-  registerTypeList: [
-    { name: "先付费", value: "before" },
-    { name: "后付费", value: "after" },
-  ],
-  extendIndex: 0,
-  extendInfo: {},
-  dineIn: false,
-  takeout: false,
-  isTableFee: false,
-  label: "",
-  type: "",
-  inputValue: "",
-});
-onMounted(() => {
-  shopExtend();
-});
+	const refundMode = reactive({
+		show: false,
+		mode: ''
+	})
+	function refundModeCancel(){
+		vdata.shopInfo.refundMode=vdata.shopInfo.refundMode==1?2:1
+		refundMode.show = false
+	}
+	function refundModeConfirm(){
+		let params = {
+			id: vdata.shopInfo.id,
+			refundMode: vdata.shopInfo.refundMode,
+		};
+		updateShopInfo(params);
+		refundMode.show = false
+	}
+	function refundModeChange(e) {
+		console.log(e);
+		const item = vdata.refund_modes.find(v => v.value == e)
+		if (item) {
+			refundMode.mode = item.name
+		}
+		refundMode.show = true
+	}
 
-onShow(() => {
-  shopInfo();
-  uni.$on("refreshPreviousPage", (params) => {
-    // 这里执行刷新数据的操作，例如重新调用API获取数据
-    refreshData(params);
-  });
-});
+	const vdata = reactive({
+		shopInfo: {
+			status: 2,
+			isAccountPay: 0,
+			isMemberPrice: 0,
+		},
+		extendList: [],
+		registerTypeList: [{
+				name: "先付费",
+				value: "before"
+			},
+			{
+				name: "后付费",
+				value: "after"
+			},
+		],
+		refund_modes: [{
+				name: "跟随商品分类",
+				value: 1
+			},
+			{
+				name: "跟随单商品",
+				value: 2
+			},
+		],
+		extendIndex: 0,
+		extendInfo: {},
+		dineIn: false,
+		takeout: false,
+		isTableFee: false,
+		label: "",
+		type: "",
+		inputValue: "",
+	});
+	onMounted(() => {
+		shopExtend();
+	});
 
-/**
- * 输入内容修改
- */
-let refreshData = (e) => {
-  let params = {
-    id: vdata.shopInfo.id,
-  };
-  params[e.name] = e.value;
-  vdata.type = e.name;
-  vdata.inputValue = e.value;
-  updateShopInfo(params, "input");
-};
+	onShow(() => {
+		shopInfo();
+		uni.$on("refreshPreviousPage", (params) => {
+			// 这里执行刷新数据的操作，例如重新调用API获取数据
+			refreshData(params);
+		});
+	});
 
-/**
- * 获取店铺信息
- */
-const shopInfo = () => {
-  getShopInfo({ id: uni.getStorageSync("shopInfo").id }).then((res) => {
-    vdata.isTableFee = res.isTableFee == 1 ? true : false;
-    if (res.eatModel.split(",").indexOf("dine-in") != -1) {
-      vdata.dineIn = true;
-    }
-    if (res.eatModel.split(",").indexOf("take-out") != -1) {
-      vdata.takeout = true;
-    }
-    vdata.shopInfo = res;
-  });
-};
+	/**
+	 * 输入内容修改
+	 */
+	let refreshData = (e) => {
+		let params = {
+			id: vdata.shopInfo.id,
+		};
+		params[e.name] = e.value;
+		vdata.type = e.name;
+		vdata.inputValue = e.value;
+		updateShopInfo(params, "input");
+	};
 
-/**
- * 获取店铺图片
- */
-let shopExtend = () => {
-  getShopExtend().then((res) => {
-    if (res && res.length > 0) {
-      vdata.extendList = res;
-      vdata.extendIndex = 0;
-      vdata.extendInfo = res[0];
-    }
-  });
-};
+	/**
+	 * 获取店铺信息
+	 */
+	const shopInfo = () => {
+		getShopInfo({
+			id: uni.getStorageSync("shopInfo").id
+		}).then((res) => {
+			vdata.isTableFee = res.isTableFee == 1 ? true : false;
+			if (res.eatModel.split(",").indexOf("dine-in") != -1) {
+				vdata.dineIn = true;
+			}
+			if (res.eatModel.split(",").indexOf("take-out") != -1) {
+				vdata.takeout = true;
+			}
+			vdata.shopInfo = res;
+		});
+	};
 
-// 台桌清理模式修改
-function tableClearChange(n) {
-  let params = {
-    id: vdata.shopInfo.id,
-    tableClearType: n,
-  };
-  updateShopInfo(params);
-}
+	/**
+	 * 获取店铺图片
+	 */
+	let shopExtend = () => {
+		getShopExtend().then((res) => {
+			if (res && res.length > 0) {
+				vdata.extendList = res;
+				vdata.extendIndex = 0;
+				vdata.extendInfo = res[0];
+			}
+		});
+	};
 
-/**
- * 付费模式修改
- */
-let radioChange = (n) => {
-  let params = {
-    id: vdata.shopInfo.id,
-    registerType: n,
-  };
-  updateShopInfo(params);
-};
+	// 台桌清理模式修改
+	function tableClearChange(n) {
+		let params = {
+			id: vdata.shopInfo.id,
+			tableClearType: n,
+		};
+		updateShopInfo(params);
+	}
 
-/**
- * 修改
- */
-let updateShopInfo = (params, type) => {
-  editShopInfo(params).then((res) => {
-    if (res) {
-      uni.showToast({
-        title: "修改成功",
-        icon: "none",
-      });
-    } else {
-      uni.showToast({
-        title: "修改失败",
-        icon: "none",
-      });
-    }
-    if (type && type == "input") {
-      vdata.shopInfo[vdata.type] = vdata.inputValue;
-    }
-  });
-};
+	/**
+	 * 付费模式修改
+	 */
+	let radioChange = (n) => {
+		let params = {
+			id: vdata.shopInfo.id,
+			registerType: n,
+		};
+		updateShopInfo(params);
+	};
 
-/**
- * 修改店铺图片
- */
-let updateShopExtend = () => {
-  editShopExtend({
-    autokey: vdata.extendInfo.autoKey,
-    value: vdata.extendInfo.value,
-  }).then((res) => {});
-};
 
-/**
- * 上传头像
- */
-let chooseAndUploadAvatar = (type) => {
-  // 选择图片
-  uni.chooseImage({
-    count: 1, // 默认为1，只选择一张图片
-    sizeType: ["original", "compressed"], // 图片质量，原图或压缩
-    sourceType: ["album", "camera"], // 图片来源，相册或相机
-    success: (res) => {
-      let file = res.tempFiles[0];
-      uploadFile(file)
-        .then((res) => {
-          if (type == "coverImg") {
-            vdata.shopInfo.coverImg = res;
-            let params = {
-              id: vdata.shopInfo.id,
-              coverImg: vdata.shopInfo.coverImg,
-            };
-            updateShopInfo(params);
-          }
-          if (type == "extendUp") {
-            vdata.extendInfo.value = res;
-            updateShopExtend();
-          }
-        })
-        .catch((res) => {
-          if (res.errMsg) {
-            uni.showToast({
-              title: "图片大小超出限制",
-              icon: "error",
-            });
-          }
-        });
-    },
-    fail: (chooseImageError) => {
-      // 选择图片失败处理逻辑
-      console.log("choose image fail:", chooseImageError);
-    },
-  });
-};
+	/**
+	 * 修改
+	 */
+	let updateShopInfo = (params, type) => {
+		editShopInfo(params).then((res) => {
+			if (res) {
+				uni.showToast({
+					title: "修改成功",
+					icon: "none",
+				});
+			} else {
+				uni.showToast({
+					title: "修改失败",
+					icon: "none",
+				});
+			}
+			if (type && type == "input") {
+				vdata.shopInfo[vdata.type] = vdata.inputValue;
+			}
+		});
+	};
 
-/**
- * 店铺图片TAB切换
- */
-let extendTabClick = (item, index) => {
-  vdata.extendInfo = item;
-  vdata.extendIndex = index;
-};
+	/**
+	 * 修改店铺图片
+	 */
+	let updateShopExtend = () => {
+		editShopExtend({
+			autokey: vdata.extendInfo.autoKey,
+			value: vdata.extendInfo.value,
+		}).then((res) => {});
+	};
 
-/**
- * 是否免桌位费
- */
-let isTableFeeChange = (e) => {
-  if (e) {
-    vdata.isTableFee = true;
-  } else {
-    vdata.isTableFee = false;
-  }
-  switchChange("isTableFee");
-};
+	/**
+	 * 上传头像
+	 */
+	let chooseAndUploadAvatar = (type) => {
+		// 选择图片
+		uni.chooseImage({
+			count: 1, // 默认为1，只选择一张图片
+			sizeType: ["original", "compressed"], // 图片质量，原图或压缩
+			sourceType: ["album", "camera"], // 图片来源，相册或相机
+			success: (res) => {
+				let file = res.tempFiles[0];
+				uploadFile(file)
+					.then((res) => {
+						if (type == "coverImg") {
+							vdata.shopInfo.coverImg = res;
+							let params = {
+								id: vdata.shopInfo.id,
+								coverImg: vdata.shopInfo.coverImg,
+							};
+							updateShopInfo(params);
+						}
+						if (type == "extendUp") {
+							vdata.extendInfo.value = res;
+							updateShopExtend();
+						}
+					})
+					.catch((res) => {
+						if (res.errMsg) {
+							uni.showToast({
+								title: "图片大小超出限制",
+								icon: "error",
+							});
+						}
+					});
+			},
+			fail: (chooseImageError) => {
+				// 选择图片失败处理逻辑
+				console.log("choose image fail:", chooseImageError);
+			},
+		});
+	};
 
-/**
- * 修改
- */
-let switchChange = (type) => {
-  let params = {
-    id: vdata.shopInfo.id,
-  };
-  switch (type) {
-    case "address":
-      params.lng = vdata.shopInfo.lng;
-      params.lat = vdata.shopInfo.lat;
-      params.address = vdata.shopInfo.address;
-      break;
-    case "status":
-      params.status = vdata.shopInfo.status;
-      break;
-    case "eatModel":
-      params.eatModel = [];
-      if (vdata.dineIn) {
-        params.eatModel.push("dine-in");
-      }
-      if (vdata.takeout) {
-        params.eatModel.push("take-out");
-      }
-      params.eatModel = params.eatModel.join(",");
-      break;
-    case "isAccountPay":
-      params.isAccountPay = vdata.shopInfo.isAccountPay;
-      break;
-    case "isMemberPrice":
-      params.isMemberPrice = vdata.shopInfo.isMemberPrice;
-      break;
-    case "isTableFee":
-      if (vdata.isTableFee) {
-        params.isTableFee = 1;
-      } else {
-        params.isTableFee = 0;
-      }
-      break;
-    case "isOrderFence":
-      params.isOrderFence = vdata.shopInfo.isOrderFence;
-      break;
-	case "isCountStick":
-	  params.isCountStick = vdata.shopInfo.isCountStick;
-	  break;
-  }
-  updateShopInfo(params);
-};
+	/**
+	 * 店铺图片TAB切换
+	 */
+	let extendTabClick = (item, index) => {
+		vdata.extendInfo = item;
+		vdata.extendIndex = index;
+	};
 
-/**
- * 选择地图
- */
-let showMap = () => {
-  // 本地 测试选择
-  // 打开地图
+	/**
+	 * 是否免桌位费
+	 */
+	let isTableFeeChange = (e) => {
+		if (e) {
+			vdata.isTableFee = true;
+		} else {
+			vdata.isTableFee = false;
+		}
+		switchChange("isTableFee");
+	};
 
-  uni.chooseLocation({
-    // type: 'wgs84',
-    success: function (res) {
-      vdata.shopInfo.lng = res.longitude.toFixed(6); // IOS 小程序中：  经纬度12位。
-      vdata.shopInfo.lat = res.latitude.toFixed(6);
-      vdata.shopInfo.address = res.name;
-      switchChange("address");
-    },
-    fail: function (err) {
-      console.log(err);
-      // uni.showToast({
-      // 	title:err,
-      // 	icon:'error'
-      // })
-    },
-  });
-};
+	/**
+	 * 修改
+	 */
+	let switchChange = (type) => {
+		let params = {
+			id: vdata.shopInfo.id,
+		};
+		switch (type) {
+			case "address":
+				params.lng = vdata.shopInfo.lng;
+				params.lat = vdata.shopInfo.lat;
+				params.address = vdata.shopInfo.address;
+				break;
+			case "status":
+				params.status = vdata.shopInfo.status;
+				break;
+			case "eatModel":
+				params.eatModel = [];
+				if (vdata.dineIn) {
+					params.eatModel.push("dine-in");
+				}
+				if (vdata.takeout) {
+					params.eatModel.push("take-out");
+				}
+				params.eatModel = params.eatModel.join(",");
+				break;
+			case "isAccountPay":
+				params.isAccountPay = vdata.shopInfo.isAccountPay;
+				break;
+			case "isMemberPrice":
+				params.isMemberPrice = vdata.shopInfo.isMemberPrice;
+				break;
+			case "isTableFee":
+				if (vdata.isTableFee) {
+					params.isTableFee = 1;
+				} else {
+					params.isTableFee = 0;
+				}
+				break;
+			case "isOrderFence":
+				params.isOrderFence = vdata.shopInfo.isOrderFence;
+				break;
+			case "isCountStick":
+				params.isCountStick = vdata.shopInfo.isCountStick;
+				break;
+		}
+		updateShopInfo(params);
+	};
+
+	/**
+	 * 选择地图
+	 */
+	let showMap = () => {
+		// 本地 测试选择
+		// 打开地图
+
+		uni.chooseLocation({
+			// type: 'wgs84',
+			success: function(res) {
+				vdata.shopInfo.lng = res.longitude.toFixed(6); // IOS 小程序中：  经纬度12位。
+				vdata.shopInfo.lat = res.latitude.toFixed(6);
+				vdata.shopInfo.address = res.name;
+				switchChange("address");
+			},
+			fail: function(err) {
+				console.log(err);
+				// uni.showToast({
+				// 	title:err,
+				// 	icon:'error'
+				// })
+			},
+		});
+	};
 </script>
 
 <style lang="scss" scoped>
-.page-wrapper {
-  background-color: #f8f8f8;
-  padding-bottom: 32rpx;
-  .page-cell {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 32rpx 28rpx;
-    box-sizing: border-box;
-    background-color: #fff;
-    .label {
-      font-weight: bold;
-      font-size: 28rpx;
-      color: #333333;
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      margin-right: 20rpx;
-      .tableFee {
-        width: 186rpx;
-        height: 54rpx;
-        line-height: 54rpx;
-        margin-left: 10rpx;
-        font-size: 28rpx;
-        color: #333;
-        border-radius: 8rpx 8rpx 8rpx 8rpx;
-        border: 2rpx solid #e5e5e5;
-        text-align: left;
-        padding: 0 18rpx;
-        box-sizing: border-box;
-      }
-    }
-    .extendList {
-      width: 100%;
-      display: flex;
-      flex-direction: column;
-      margin-top: 24rpx;
-      .extendTab {
-        display: flex;
-        justify-content: flex-start;
-        .extendTab_item {
-          font-size: 24rpx;
-          font-weight: 400;
-          padding: 4rpx 12rpx;
-          border-radius: 4rpx;
-          border: 2rpx solid #e5e5e5;
-          margin-right: 20rpx;
-        }
-        .active {
-          background: #318afe;
-          border: 2rpx solid #318afe;
-          color: #fff;
-        }
-      }
-      .extend_content {
-        display: flex;
-        margin-top: 32rpx;
-        .preview {
-          min-width: 146rpx;
-          height: 342rpx;
-          position: relative;
-          margin-right: 32rpx;
-          background-color: #f7f7f7;
-          ::v-deep .bg,
-          ::v-deep .bg .u-image,
-          ::v-deep .bg .u-image__image {
-            width: 146rpx !important;
-            height: 342rpx !important;
-            position: absolute;
-            top: 0;
-          }
+	.page-wrapper {
+		background-color: #f8f8f8;
+		padding-bottom: 32rpx;
 
-          ::v-deep .index_bg .u-image,
-          ::v-deep .index_bg .u-image__image {
-            width: 146rpx !important;
-            height: 242rpx !important;
-            position: absolute;
-            top: 0;
-          }
+		.page-cell {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 32rpx 28rpx;
+			box-sizing: border-box;
+			background-color: #fff;
 
-          ::v-deep .my_bg .u-image,
-          ::v-deep .my_bg .u-image__image {
-            width: 146rpx !important;
-            height: 90rpx !important;
-            position: absolute;
-            top: 0;
-          }
+			.label {
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				flex-shrink: 0;
+				margin-right: 20rpx;
 
-          ::v-deep .member_bg .u-image,
-          ::v-deep .member_bg .u-image__image {
-            width: 34rpx !important;
-            height: 63rpx !important;
-            position: absolute;
-            top: 22rpx;
-            left: 0;
-            right: 0;
-            margin: auto;
-            border-radius: 5rpx !important;
-          }
+				.tableFee {
+					width: 186rpx;
+					height: 54rpx;
+					line-height: 54rpx;
+					margin-left: 10rpx;
+					font-size: 28rpx;
+					color: #333;
+					border-radius: 8rpx 8rpx 8rpx 8rpx;
+					border: 2rpx solid #e5e5e5;
+					text-align: left;
+					padding: 0 18rpx;
+					box-sizing: border-box;
+				}
+			}
 
-          ::v-deep .shopinfo_bg .u-image,
-          ::v-deep .shopinfo_bg .u-image__image {
-            width: 146rpx !important;
-            height: 50rpx !important;
-            position: absolute;
-            top: 0;
-          }
-          ::v-deep .bg.ticket_logo,
-          ::v-deep .bg.ticket_logo .u-image,
-          ::v-deep .bg.ticket_logo .u-image__image {
-            width: 359rpx !important;
-            height: 232rpx !important;
-            position: absolute;
-            top: 0;
-          }
-          ::v-deep .ticket_logo.img .u-image,
-          ::v-deep .ticket_logo.img .u-image__image {
-            width: 146rpx !important;
-            height: 50rpx !important;
-            position: absolute;
-            top: 0;
-            left: 10rpx;
-          }
+			.extendList {
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+				margin-top: 24rpx;
 
-          .shopinfo_bg_f {
-            width: 146rpx;
-            height: 290rpx;
-            position: absolute;
-            bottom: 0;
-            background-color: #fff;
-          }
-        }
-        .extend_img {
-          display: flex;
-          flex-direction: column;
-          .extend_title {
-            font-weight: 400;
-            font-size: 24rpx;
-            color: #333333;
-            margin-bottom: 16rpx;
-          }
-          .fileUp {
-            width: 148rpx;
-            height: 148rpx;
-            position: relative;
-            .file {
-              width: 148rpx;
-              height: 148rpx;
-              position: absolute;
-              top: 0;
-            }
-          }
-          ::v-deep .u-image,
-          ::v-deep .u-image__image {
-            width: 148rpx !important;
-            height: 148rpx !important;
-          }
-        }
-      }
-    }
-  }
-  .column {
-    flex-direction: column;
-    .label {
-      align-self: flex-start;
-    }
-  }
-  .m {
-    margin-bottom: 12rpx;
-  }
-  .cutShop {
-    width: 530rpx;
-    height: 80rpx;
-    line-height: 80rpx;
-    background: #318afe;
-    border-radius: 56rpx;
-    font-weight: 500;
-    font-size: 32rpx;
-    color: #ffffff;
-    margin: 48rpx auto 0 auto;
-    text-align: center;
-  }
+				.extendTab {
+					display: flex;
+					justify-content: flex-start;
 
-  .right {
-    display: flex;
-    align-items: center;
-    font-weight: 400;
-    font-size: 28rpx;
-    color: #999999;
-    position: relative;
+					.extendTab_item {
+						font-size: 24rpx;
+						font-weight: 400;
+						padding: 4rpx 12rpx;
+						border-radius: 4rpx;
+						border: 2rpx solid #e5e5e5;
+						margin-right: 20rpx;
+					}
 
-    .file {
-      width: 112rpx;
-      height: 112rpx;
-      line-height: 112rpx;
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      right: 0;
-      margin: auto;
-    }
+					.active {
+						background: #318afe;
+						border: 2rpx solid #318afe;
+						color: #fff;
+					}
+				}
 
-    .fileImg {
-      width: 112rpx !important;
-      height: 112rpx !important;
-      ::v-deep .u-avatar__image {
-        width: 112rpx !important;
-        height: 112rpx !important;
-      }
-    }
-  }
-}
-</style>
+				.extend_content {
+					display: flex;
+					margin-top: 32rpx;
+
+					.preview {
+						min-width: 146rpx;
+						height: 342rpx;
+						position: relative;
+						margin-right: 32rpx;
+						background-color: #f7f7f7;
+
+						::v-deep .bg,
+						::v-deep .bg .u-image,
+						::v-deep .bg .u-image__image {
+							width: 146rpx !important;
+							height: 342rpx !important;
+							position: absolute;
+							top: 0;
+						}
+
+						::v-deep .index_bg .u-image,
+						::v-deep .index_bg .u-image__image {
+							width: 146rpx !important;
+							height: 242rpx !important;
+							position: absolute;
+							top: 0;
+						}
+
+						::v-deep .my_bg .u-image,
+						::v-deep .my_bg .u-image__image {
+							width: 146rpx !important;
+							height: 90rpx !important;
+							position: absolute;
+							top: 0;
+						}
+
+						::v-deep .member_bg .u-image,
+						::v-deep .member_bg .u-image__image {
+							width: 34rpx !important;
+							height: 63rpx !important;
+							position: absolute;
+							top: 22rpx;
+							left: 0;
+							right: 0;
+							margin: auto;
+							border-radius: 5rpx !important;
+						}
+
+						::v-deep .shopinfo_bg .u-image,
+						::v-deep .shopinfo_bg .u-image__image {
+							width: 146rpx !important;
+							height: 50rpx !important;
+							position: absolute;
+							top: 0;
+						}
+
+						::v-deep .bg.ticket_logo,
+						::v-deep .bg.ticket_logo .u-image,
+						::v-deep .bg.ticket_logo .u-image__image {
+							width: 359rpx !important;
+							height: 232rpx !important;
+							position: absolute;
+							top: 0;
+						}
+
+						::v-deep .ticket_logo.img .u-image,
+						::v-deep .ticket_logo.img .u-image__image {
+							width: 146rpx !important;
+							height: 50rpx !important;
+							position: absolute;
+							top: 0;
+							left: 10rpx;
+						}
+
+						.shopinfo_bg_f {
+							width: 146rpx;
+							height: 290rpx;
+							position: absolute;
+							bottom: 0;
+							background-color: #fff;
+						}
+					}
+
+					.extend_img {
+						display: flex;
+						flex-direction: column;
+
+						.extend_title {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #333333;
+							margin-bottom: 16rpx;
+						}
+
+						.fileUp {
+							width: 148rpx;
+							height: 148rpx;
+							position: relative;
+
+							.file {
+								width: 148rpx;
+								height: 148rpx;
+								position: absolute;
+								top: 0;
+							}
+						}
+
+						::v-deep .u-image,
+						::v-deep .u-image__image {
+							width: 148rpx !important;
+							height: 148rpx !important;
+						}
+					}
+				}
+			}
+		}
+
+		.column {
+			flex-direction: column;
+
+			.label {
+				align-self: flex-start;
+			}
+		}
+
+		.m {
+			margin-bottom: 12rpx;
+		}
+
+		.cutShop {
+			width: 530rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			background: #318afe;
+			border-radius: 56rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #ffffff;
+			margin: 48rpx auto 0 auto;
+			text-align: center;
+		}
+
+		.right {
+			display: flex;
+			align-items: center;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #999999;
+			position: relative;
+
+			.file {
+				width: 112rpx;
+				height: 112rpx;
+				line-height: 112rpx;
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				right: 0;
+				margin: auto;
+			}
+
+			.fileImg {
+				width: 112rpx !important;
+				height: 112rpx !important;
+
+				::v-deep .u-avatar__image {
+					width: 112rpx !important;
+					height: 112rpx !important;
+				}
+			}
+		}
+	}
+
+	.color-red {
+		color: red;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesCreateOrder/index/components/list-goods-item.vue b/pagesCreateOrder/index/components/list-goods-item.vue
index 41c09ad..169eda0 100644
--- a/pagesCreateOrder/index/components/list-goods-item.vue
+++ b/pagesCreateOrder/index/components/list-goods-item.vue
@@ -3,7 +3,9 @@
 		<up-image :src="data.coverImg" mode="aspectFill" :width="img.width" :height="img.height"></up-image>
 		<view class="info u-flex u-row-between u-col-top u-flex-col">
 			<view class="limit-discount" v-if="is_time_discount">限时折扣</view>
-
+			<view class="nowStockerNumber" v-if="nowStockerNumber<=10">
+				剩余库存：{{nowStockerNumber}}
+			</view>
 			<view>
 				<view>
 					<text class="up-line-1">{{ data.name }}</text>
@@ -32,7 +34,7 @@
 								<image src="/pagesCreateOrder/static/images/icon-reduce.svg" class="icon" mode="">
 								</image>
 							</view>
-							<view class="u-font-32" >
+							<view class="u-font-32">
 								{{ data.chooseNumber.toFixed(2) }}
 							</view>
 
@@ -56,7 +58,7 @@
 				<view class="isSellout" v-else-if="data.isSoldStock == 1">
 					<image class="isSellout_icon" src="/pagesCreateOrder/static/images/no-sold.svg" mode=""></image>
 				</view>
-				<view class="isSellout" v-else-if="data.isStock == 1 && data.stockNumber <= 0">
+				<view class="isSellout" v-else>
 					<image class="isSellout_icon" src="/pagesCreateOrder/static/images/no-stock.svg" mode=""></image>
 				</view>
 			</template>
@@ -107,6 +109,10 @@
 				return {};
 			},
 		},
+		consStockList: {
+			type: Array,
+			default:[]
+		}
 	});
 
 	//判断是否是时间折扣商品
@@ -156,12 +162,64 @@
 			return false;
 		}
 		return (
-			(item.isStock == 1 && item.stockNumber <= 0) ||
+			!consStockisFull(item) ||
 			item.isSoldStock == 1 ||
 			item.isSale == 0 ||
 			!isProductAvailable(item.days, item.startTime, item.endTime)
 		);
 	});
+	const stockNumber=computed(()=>{
+		
+	})
+	
+	// 1. 筛选匹配的耗材列表
+	const conslist=computed(()=>{
+		if(props.consStockList.length<=0){
+			return []
+		}
+		return props.consStockList.filter(v => {
+			return props.data.consList.find(i =>{
+				return  i.consInfoId == v.consId
+			});
+		});
+	})
+	// 2. 找到 stockNumber 最小的那一项
+	const minConsItem=computed(()=>{
+		if(conslist.value.length<=0){
+			return null
+		}
+		return  conslist.value.reduce((prev, current) => {
+			return prev.stockNumber < current.stockNumber ? prev : current;
+		});
+	})
+	// 3. 找到和 minItem 的 consId 一样的那个消耗配置项
+	const targetCons=computed(()=>{
+		if(!minConsItem.value){
+			return null
+		}
+		return props.data.consList.find(i => i.consInfoId == minConsItem.value.consId);
+	})
+	const nowStockerNumber=computed(()=>{
+		if(!targetCons.value||!minConsItem.value){
+			return 9999
+		}
+		return Math.floor(minConsItem.value.stockNumber/targetCons.value.surplusStock) 
+	})
+	function consStockisFull(item) {
+		// 无数据直接返回 true（或按你需求返回 false）
+		if (!conslist.value.length) return true;
+		
+		if(!minConsItem.value)return true;
+		
+		if(!targetCons.value) return true;
+		
+		// 4. 判断：最小库存 > 每份消耗库存 → 返回 true，否则 false
+		if (nowStockerNumber.value>=1) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 	// 判断商品是否在可售时间内
 	function isProductAvailable(sellDaysStr, startTimeStr, endTimeStr) {
 		// 将后端返回的字符串转换为数组
@@ -306,4 +364,14 @@
 		color: rgba(255, 255, 255, 0.8);
 		text-decoration: line-through;
 	}
+	.nowStockerNumber{
+		position: absolute;
+		left: 24rpx;
+		bottom: 80rpx;
+		background-color: rgba(255, 255, 255, .8);
+		color: red;
+		padding: 4rpx 8rpx;
+		font-size: 24rpx;
+		border-radius: 4rpx ;
+	}
 </style>
\ No newline at end of file
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index ca872cc..b0aad30 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -36,9 +36,7 @@
 					</view>
 				</scroll-view>
 				<scroll-view :scroll-top="data.scrollRightTop" scroll-y scroll-with-animation class="right-box"
-					@scroll="rightScroll"
-					@scrolltoupper="scrolltoupper"
-					>
+					@scroll="rightScroll" @scrolltoupper="scrolltoupper">
 					<view class="page-view u-p-l-24">
 						<view class="list-tight-top">
 							<template v-if="lingshi.show">
@@ -62,7 +60,7 @@
 							<view class="item-container">
 								<view class="thumb-box" v-for="(goodsItem, goodsIndex) in item.foods" :key="goodsIndex">
 									<list-goods-item :limitTimeDiscount="data.limitTimeDiscount"
-										@chooseGuige="chooseGuige($event, index)"
+										:consStockList="consStockList" @chooseGuige="chooseGuige($event, index)"
 										@add="goodsUpdate($event, index, true)"
 										@reduce="goodsUpdate($event, index, false)" @tapweigh="tapweigh($event, index)"
 										:index="goodsIndex" :data="goodsItem"></list-goods-item>
@@ -81,8 +79,8 @@
 						<view class="u-flex u-m-t-20 u-flex-wrap u-row-between">
 							<view class="u-m-b-30" v-for="(goodsItem, goodsIndex) in searchResult" :key="goodsIndex">
 								<list-goods-item :img="{ width: '330rpx', height: '330rpx' }"
-									:limitTimeDiscount="data.limitTimeDiscount" 
-									@chooseGuige="chooseGuige(goodsItem.goodsIndex, goodsItem.index)" 
+									:consStockList="consStockList" :limitTimeDiscount="data.limitTimeDiscount"
+									@chooseGuige="chooseGuige(goodsItem.goodsIndex, goodsItem.index)"
 									@add="searchGoodsUpdate(goodsItem, goodsIndex, true)"
 									@reduce="searchGoodsUpdate(goodsItem, goodsIndex, false)"
 									@tapweigh="tapweigh(goodsItem.goodsIndex, goodsItem.index)"
@@ -98,8 +96,7 @@
 		<view class="bottom w-full">
 			<my-car :isCreateOrderToDetail="isCreateOrderToDetail" @updateNumber="carsNumberChange" :table="data.table"
 				:data="cars" :orderInfo="data.orderInfo" :limitTimeDiscount="data.limitTimeDiscount"
-				@changeNumber="goodsChangeNumber"
-				@clear="cleaCart"></my-car>
+				@changeNumber="goodsChangeNumber" @clear="cleaCart"></my-car>
 		</view>
 		<!-- 套餐选择规格 -->
 		<taocanModel ref="taocanModelRef" @confirm="taocanConfirm" :goodsData="selGoods"></taocanModel>
@@ -115,9 +112,10 @@
 			<text>历史订单</text>
 			<text class="num">{{ data.historyOrderNum }}</text>
 		</view>
-		
+
 		<!-- 修改购物车数量 -->
-		<popupChangeNumber v-model="popupChangeNumberData.show" :goods="popupChangeNumberData.data" @confirm="carsNumberChange"></popupChangeNumber>
+		<popupChangeNumber v-model="popupChangeNumberData.show" :goods="popupChangeNumberData.data"
+			@confirm="carsNumberChange"></popupChangeNumber>
 	</view>
 </template>
 <script setup>
@@ -144,12 +142,12 @@
 		stickCount
 	} from '@/http/api/product/stick.js'
 	import popupChangeNumber from './components/popup-change-number.vue'
-	
-	const popupChangeNumberData=reactive({
-		show:false,
-		data:null
+
+	const popupChangeNumberData = reactive({
+		show: false,
+		data: null
 	})
-	
+
 	import guigeModel from "./components/guige";
 	import taocanModel from "./components/taocanModel.vue";
 	import weighItem from "./components/weigh.vue";
@@ -174,8 +172,8 @@
 		limitTimeDiscount
 	} from "@/http/api/market/limitTimeDiscount.js";
 	provide("yskUtils", yskUtils);
-	const shopInfo = reactive({}) ;
-	Object.assign(shopInfo,uni.getStorageSync("shopInfo"))
+	const shopInfo = reactive({});
+	Object.assign(shopInfo, uni.getStorageSync("shopInfo"))
 	provide("shopInfo", uni.getStorageSync("shopInfo"));
 
 	import {
@@ -196,6 +194,9 @@
 		cancelOrder,
 		rmPlaceOrder,
 	} from "@/http/api/order.js";
+	import {
+		getConsStock
+	} from '@/http/api/cons.js'
 
 	const modal = reactive({
 		key: "",
@@ -293,7 +294,7 @@
 				})
 			);
 		}
-		
+
 
 		// init()
 		xiadanClick();
@@ -349,6 +350,24 @@
 	let $originGoods = [];
 	let $category = [];
 
+	const consStockList = ref([])
+
+	function getCons() {
+		return new Promise((resolve, reject) => {
+			try {
+				getConsStock({
+					shopId: uni.getStorageSync("shopInfo").id
+				}).then(res => {
+					consStockList.value = res || []
+					console.log('consStockList', consStockList.value);
+					resolve()
+				})
+			} catch (err) {
+				reject()
+			}
+
+		})
+	}
 	async function init() {
 		if (option.type == "add") {
 			setTabBar($category, $originGoods, []);
@@ -356,7 +375,7 @@
 		let shopInfoRes = await getShopInfo({
 			id: uni.getStorageSync("shopInfo").id
 		});
-		Object.assign(shopInfo,shopInfoRes)
+		Object.assign(shopInfo, shopInfoRes)
 		uni.setStorageSync("shopInfo", shopInfoRes);
 		// 获取分类数据
 		let categoryRes = await categoryPage({
@@ -364,6 +383,8 @@
 			size: 300
 		});
 		$category = categoryRes.records;
+		// 获取耗材数据
+		await getCons()
 		// 获取商品数据
 		const goodsRes = await getGoods();
 		const goods = goodsRes.filter((v) => {
@@ -386,7 +407,9 @@
 
 		initCart();
 	}
-
+	
+	
+	const allHistoryOrder=ref([])
 	/**
 	 * 获取订单详情
 	 */
@@ -409,13 +432,13 @@
 
 			console.log("data.historyOrder===", data.historyOrder);
 
-			let allHistoryOrder = data.historyOrder.map((item) => {
+			 allHistoryOrder.value = data.historyOrder.map((item) => {
 				return [...item.info];
-			});
+			}).flat();
 
 			// console.log('allHistoryOrder===', allHistoryOrder.flat());
 			data.historyOrderNum = 0;
-			allHistoryOrder.flat().map((item) => {
+			allHistoryOrder.value.map((item) => {
 				data.historyOrderNum += item.num;
 			});
 			// console.log('data.historyOrderNum===', data.historyOrderNum);
@@ -741,7 +764,22 @@
 		}
 		// initCart()
 	}
-
+	// 封装成 Promise 的确认弹窗
+	const showConfirmModal = (title, content) => {
+		return new Promise((resolve) => {
+			uni.showModal({
+				title: title,
+				content: content,
+				showCancel: true,
+				cancelText: '取消添加',
+				confirmText: '继续',
+				success(res) {
+					// 确认返回 true，取消/关闭返回 false
+					resolve(res.confirm === true);
+				}
+			});
+		});
+	};
 	/**
 	 * 菜品操作
 	 * @param {Object} foodsindex
@@ -800,6 +838,29 @@
 				//更新
 				let cartItem = cars[goodsInCarIndex];
 				let number = isAdd ? cartItem.number + 1 : +cartItem.number - 1;
+				if(isAdd){
+					if (number == 2 ) {
+						// 等待用户点击
+						const isConfirm = await showConfirmModal(
+							'购物车已有该商品，请确认是否重复',
+							'菜名名称：《' + $goods.name + '》'
+						);
+						if (!isConfirm) {
+							return
+						}
+					}
+					if(allHistoryOrder.value.find(v=>v.productId==$goods.id)){
+						// 等待用户点击
+						const isConfirm = await showConfirmModal(
+							'该商品已下单过，请确认是否重复',
+							'菜名名称：《' + $goods.name + '》'
+						);
+						if (!isConfirm) {
+							return
+						}
+					}
+				}
+				
 				if (!isAdd) {
 					if (number === 0 || number < suitNum) {
 						//移除
@@ -828,6 +889,7 @@
 				data.isGoodsAdd = false;
 				setSearchGoods(searchGoodsIndex, number);
 			} else {
+				
 				// 不影响之前的代码  称重suit单独处理
 				if ($goods.type == "weight" && showCurrentInput) {
 					suitNum = showCurrentInput;
@@ -839,6 +901,16 @@
 						return;
 					}
 				}
+				if(allHistoryOrder.value.find(v=>v.productId==$goods.id)){
+					// 等待用户点击
+					const isConfirm = await showConfirmModal(
+						'该商品已下单过，请确认是否重复',
+						'菜名名称：《' + $goods.name + '》'
+					);
+					if (!isConfirm) {
+						return
+					}
+				}
 				// 套餐和单规格
 				if ($goods.groupType != 1) {
 					//增加
@@ -858,17 +930,17 @@
 			return;
 		}
 	}
-	
-	
-	
-	
-	function goodsChangeNumber(e){
+
+
+
+
+	function goodsChangeNumber(e) {
 		console.log(e);
-		popupChangeNumberData.data=e;
-		popupChangeNumberData.show=true
+		popupChangeNumberData.data = e;
+		popupChangeNumberData.show = true
 	}
-	
-	
+
+
 	/**
 	 * socket通知购物车商品数量修改处理
 	 */
@@ -937,8 +1009,7 @@
 						tabbarItem.foods.find((v) => v.id == e.goods.product_id);
 				}
 			});
-			$sku = !e.goods.product_id ?
-				{
+			$sku = !e.goods.product_id ? {
 					suitNum: 1
 				} :
 				$goods.skuList.find((v) => v.id == e.goods.sku_id);
@@ -1018,13 +1089,22 @@
 	 * @param {Object} skuList
 	 */
 	function returnSelGoodsSkuList(selectSpecInfo) {
+		// 👇 修复：如果是字符串，转成对象
+		if (typeof selectSpecInfo === 'string') {
+			selectSpecInfo = JSON.parse(selectSpecInfo);
+		}
+
 		let specInfo = [];
+		console.log('selectSpecInfo', selectSpecInfo);
+
 		for (var key in selectSpecInfo) {
+			console.log('key', key); // 现在会正确打印：口味、汤
 			specInfo.push({
 				name: key,
 				value: selectSpecInfo[key],
 			});
 		}
+
 		let result = specInfo.map((v, index) => {
 			return {
 				...v,
@@ -1062,9 +1142,31 @@
 			} = res;
 			let carGoods = cars[index];
 			let cartId = carGoods.id;
-			let newNumber = carGoods.number * 1 + suitNum;
 			let suitNum = goods.skuList[0].suitNum || 1;
-
+			let newNumber = carGoods.number * 1 + suitNum;
+			if (newNumber == 2&&carGoods.number<newNumber) {
+				// 等待用户点击
+				const isConfirm = await showConfirmModal(
+					'请确认当前菜品是否已上菜?',
+					'菜名名称：《' + goods.name + '》'
+				);
+				if (!isConfirm) {
+					return
+				}
+				
+				if(allHistoryOrder.value.find(v=>v.productId==goods.id)){
+					// 等待用户点击
+					const isConfirm = await showConfirmModal(
+						'该商品已下单过，请确认是否重复',
+						'菜名名称：《' + goods.name + '》'
+					);
+					if (!isConfirm) {
+						return
+					}
+				}
+				
+				
+			}
 			editCart({
 					id: cartId,
 					number: newNumber,
@@ -1079,6 +1181,17 @@
 			);
 			data.isGoodsAdd = false;
 		} else {
+			
+			if(allHistoryOrder.value.find(v=>v.productId==goods.id)){
+				// 等待用户点击
+				const isConfirm = await showConfirmModal(
+					'该商品已下单过，请确认是否重复',
+					'菜名名称：《' + goods.name + '》'
+				);
+				if (!isConfirm) {
+					return
+				}
+			}
 			//添加
 			editCart({
 					number: suitNum,
@@ -1106,8 +1219,7 @@
 			return carsGoods.sku_id == sku_id && carsGoods.product_id == product_id;
 		});
 		const carGoods = cars[goodsInCarIndex];
-		return carGoods ?
-			{
+		return carGoods ? {
 				index: goodsInCarIndex,
 				carGoods,
 			} :
@@ -1359,39 +1471,39 @@
 
 	function toStick() {
 		uni.chooseImage({
-		  count: 1, //默认9
-		  sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
-		  sourceType: ["album", "camera "],
-		  success: async function (res) {
-		    uni.showLoading({
-		      title: "上传中",
-		    });
-		    console.log(res);
-		    const fileRes = await stickCount(res.tempFiles[0]);
-			console.log(fileRes)
-		    uni.hideLoading();
-		    if (fileRes) {
-				uni.setStorageSync('stickData',{
-					table:data.table,
-					orderInfo:data.orderInfo,
-					limitTimeDiscount:data.limitTimeDiscount
-				})
-				go.to("PAGES_CREATE_ORDER_STICK", {
-					tableCode: data.table.tableCode,
-					number:fileRes,
-					isCreateOrderToDetail:isCreateOrderToDetail.value,
+			count: 1, //默认9
+			sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
+			sourceType: ["album", "camera "],
+			success: async function(res) {
+				uni.showLoading({
+					title: "上传中",
 				});
-				
-				
-		    } else {
-		      uni.showToast({
-		        title: "上传失败",
-		        icon: "none",
-		      });
-		    }
-		  },
+				console.log(res);
+				const fileRes = await stickCount(res.tempFiles[0]);
+				console.log(fileRes)
+				uni.hideLoading();
+				if (fileRes) {
+					uni.setStorageSync('stickData', {
+						table: data.table,
+						orderInfo: data.orderInfo,
+						limitTimeDiscount: data.limitTimeDiscount
+					})
+					go.to("PAGES_CREATE_ORDER_STICK", {
+						tableCode: data.table.tableCode,
+						number: fileRes,
+						isCreateOrderToDetail: isCreateOrderToDetail.value,
+					});
+
+
+				} else {
+					uni.showToast({
+						title: "上传失败",
+						icon: "none",
+					});
+				}
+			},
 		});
-		
+
 	}
 
 	/**
@@ -1425,7 +1537,7 @@
 	 * @param {Object} index
 	 */
 	async function swichMenu(index) {
-		if (data.arr.length !=data.tabbar.length) {
+		if (data.arr.length != data.tabbar.length) {
 			await getMenuItemTop();
 		}
 		if (index == data.current) return;
@@ -1438,10 +1550,10 @@
 		// 	data.current = index;
 		// 	leftMenuStatus(index);
 		// });
-		
-		
+
+
 		data.scrollRightTop = data.arr[index] + data.topZhanwei;
-		console.log('scrollRightTop',data.scrollRightTop );
+		console.log('scrollRightTop', data.scrollRightTop);
 		data.current = index;
 		leftMenuStatus(index);
 	}
@@ -1518,29 +1630,29 @@
 						arr.push(rect.top - rects[0].top);
 					});
 					data.arr = arr;
-					console.log('每一项高度',data.arr);
+					console.log('每一项高度', data.arr);
 					resolve();
 				})
 				.exec();
 		});
 	}
-	
-	
-	function scrolltoupper(){
+
+
+	function scrolltoupper() {
 		data.current = 0;
 	}
-	
+
 	/**
 	 * 右边菜单滚动
 	 * @param {Object} e
 	 */
 	async function rightScroll(e) {
-	
+
 		data.oldScrollTop = e.detail.scrollTop;
-		if(e.detail.scrollTop<=0||e.detail.scrollTop<data.arr[1]){
+		if (e.detail.scrollTop <= 0 || e.detail.scrollTop < data.arr[1]) {
 			data.current = 0;
 			isTabClickOver = true;
-			return 
+			return
 		}
 		if (data.arr.length == 0) {
 			await getMenuItemTop();
diff --git a/pagesOrder/detail/components/tuicai.vue b/pagesOrder/detail/components/tuicai.vue
index d475321..6f051df 100644
--- a/pagesOrder/detail/components/tuicai.vue
+++ b/pagesOrder/detail/components/tuicai.vue
@@ -1,65 +1,87 @@
 <template>
-	<my-model title="退菜" ref="model" @close="onModelClose" @open="onModelOpen">
-		<template #desc>
-			<view class="u-p-30 u-text-left">
-				<view>
-					{{data.productName}}
-				</view>
-				<view class="u-flex  u-m-t-32" :class="{'gray':data.productId=='-999'}">
-					<up-number-box :min="0" :max="maxNum" :buttonSize="44" v-model="number" integer
-						:disabled="data.productId=='-999'">
-						<template #minus>
-							<view class="minus number-box-btn"></view>
-						</template>
-						<template #input>
-							<view class="u-flex-1 u-row-center u-text-center input">
-								<up-input :disabled="data.productId=='-999'" @change="parseIntNumber($event,false)"
-									@blur="parseIntNumber($event,true)" v-model="number" border="none"
-									type="digit"></up-input>
-							</view>
-						</template>
-						<template #plus>
-							<view class="plus number-box-btn">
-								<up-icon v-if="data.productId=='-999'" name="plus" color="#ccc" size="16"
-									bold></up-icon>
-								<up-icon v-else name="plus" color="#999" size="16" bold></up-icon>
-							</view>
-						</template>
-					</up-number-box>
-				</view>
-				<view class="u-m-t-32">
-					<view class="u-font-24">
-						<text class="color-999">退菜理由</text>
-						<text class="color-red">*</text>
+	<view>
+		<my-model title="退菜" ref="model" @close="onModelClose" @open="onModelOpen">
+			<template #desc>
+				<view class="u-p-30 u-text-left">
+					<view>
+						{{data.productName}}
 					</view>
-					<view class="u-flex u-flex-wrap u-m-t-24">
-						<view class="u-flex u-m-r-16 u-m-b-16" v-for="(item,index) in tags" :key="index">
-							<up-tag @click="changeTagSel(item)" :text="item.label" plain borderColor="#E6FOFF"
-								color="#318AFE" v-if="item.checked"> </up-tag>
-							<up-tag @click="changeTagSel(item)" borderColor="#E5E5E5" color="#666" :text="item.label"
-								plain v-else> </up-tag>
+					<view class="u-flex  u-m-t-32" :class="{'gray':data.productId=='-999'}">
+						<up-number-box :min="0" :max="maxNum" :buttonSize="44" v-model="number" integer
+							:disabled="data.productId=='-999'">
+							<template #minus>
+								<view class="minus number-box-btn"></view>
+							</template>
+							<template #input>
+								<view class="u-flex-1 u-row-center u-text-center input">
+									<up-input :disabled="data.productId=='-999'" @change="parseIntNumber($event,false)"
+										@blur="parseIntNumber($event,true)" v-model="number" border="none"
+										type="digit"></up-input>
+								</view>
+							</template>
+							<template #plus>
+								<view class="plus number-box-btn">
+									<up-icon v-if="data.productId=='-999'" name="plus" color="#ccc" size="16"
+										bold></up-icon>
+									<up-icon v-else name="plus" color="#999" size="16" bold></up-icon>
+								</view>
+							</template>
+						</up-number-box>
+					</view>
+					<view class="u-m-t-32">
+						<view class="u-font-24">
+							<text class="color-999">退菜理由</text>
+							<text class="color-red">*</text>
+						</view>
+						<view class="u-flex u-flex-wrap u-m-t-24">
+							<view class="u-flex u-m-r-16 u-m-b-16" v-for="(item,index) in tags" :key="index">
+								<up-tag @click="changeTagSel(item)" :text="item.label" plain borderColor="#E6FOFF"
+									color="#318AFE" v-if="item.checked"> </up-tag>
+								<up-tag @click="changeTagSel(item)" borderColor="#E5E5E5" color="#666"
+									:text="item.label" plain v-else> </up-tag>
+							</view>
+						</view>
+						<view class="u-m-t-24">
+							<up-textarea v-model="form.note" placeholder="备注"></up-textarea>
 						</view>
 					</view>
-					<view class="u-m-t-24">
-						<up-textarea v-model="form.note" placeholder="备注"></up-textarea>
+				</view>
+			</template>
+			<template #btn>
+				<view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-10">
+					<my-button box-shadow shape="circle" @tap="confirm">确认退菜</my-button>
+					<view class="u-m-t-10">
+						<my-button @tap="onModelClose" shape="circle" bgColor="#fff" type="cancel"
+							box-shadow>取消</my-button>
 					</view>
 				</view>
-			</view>
-		</template>
-		<template #btn>
-			<view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-10">
-				<my-button box-shadow shape="circle" @tap="confirm">确认退菜</my-button>
-				<view class="u-m-t-10">
-					<my-button @tap="onModelClose" shape="circle" bgColor="#fff" type="cancel" box-shadow>取消</my-button>
+
+			</template>
+		</my-model>
+
+		<up-modal :show="confirmModal.show" title="提示" @close="confirmModalClose" @cancel="confirmModalClose"
+			@confirm="confirmModalConfirm" showCancelButton>
+			<view>
+				<view>
+					<up-radio-group v-model="confirmModal.selRefundStock">
+						<up-radio v-for="(item,index) in confirmModal.refundStocks" :key="index" :label="item.name"
+							:name="item.key"></up-radio>
+					</up-radio-group>
 				</view>
 			</view>
+		</up-modal>
+
+
+	</view>
 
-		</template>
-	</my-model>
 </template>
 
 <script setup>
-	import { reactive, ref, watch } from 'vue';
+	import {
+		reactive,
+		ref,
+		watch
+	} from 'vue';
 	import infoBox from '@/commons/utils/infoBox.js'
 	const emits = defineEmits(['update:show', 'confirm'])
 	const props = defineProps({
@@ -76,6 +98,22 @@
 			default: false
 		}
 	})
+	const confirmModal = reactive({
+		show: false,
+		selRefundStock: false,
+		refundStocks: [{
+			name: '已上菜(仅退菜不退库存)',
+			key: false
+		}, {
+			name: '未上菜(退菜后退库存)',
+			key: true,
+		}]
+	})
+
+	function confirmModalClose() {
+		confirmModal.show = false
+		confirmModal.selRefundStock = false
+	}
 	const form = reactive({
 		note: ''
 	})
@@ -83,7 +121,7 @@
 	let modelShow = ref(props.show)
 	let number = ref(0)
 	let maxNum = ref(0)
-	
+
 	const tags = ref([{
 		label: "点错",
 		checked: false
@@ -109,14 +147,14 @@
 			close()
 		}
 	})
-	
+
 	function parseIntNumber(val, isNow) {
 		console.log(val)
 		let newval = val * 1
 		if (newval > props.data.num - props.data.returnNum) {
 			newval = props.data.num - props.data.returnNum
 		}
-		
+
 		if (isNow) {
 			number.value = newval * 1
 			return
@@ -129,7 +167,7 @@
 	function changeTagSel(item) {
 		item.checked = !item.checked
 	}
-	
+
 	function toggleModelShow(show) {
 		modelShow.value = show ? true : false
 	}
@@ -157,11 +195,51 @@
 		})
 		form.note = ''
 	}
-	
+	import {
+		getProductDetail
+	} from '@/http/api/product.js'
+	import {
+		getCategoryDetail
+	} from '@/http/api/cateGory.js'
+	async function getGoodsCategory(goods) {
+		const res = await getProductDetail(goods.productId)
+		if (res) {
+			console.log('res', res);
+			const res1 = await getCategoryDetail(res.categoryId)
+			return res1
+		}
+		uni.showToast({
+			title: '获取该商品信息数据失败',
+			icon: 'none'
+		})
+		return null
+	}
+
+	function confirmModalConfirm() {
+		refundGoods()
+		confirmModalClose()
+	}
+
+	function refundGoods() {
+		const selTag = tags.value.filter(item => item.checked).map(item => item.label).join(",")
+		const note = selTag + (form.note.length > 0 ? "," + form.note : "");
+		let par = {
+			orderId: props.data.orderId,
+			refundAmount: number.value * props.data.unitPrice,
+			refundReason: note,
+			refundStock: confirmModal.selRefundStock,
+			refundDetails: [{
+				id: props.data.id,
+				returnAmount: number.value * props.data.unitPrice,
+				num: number.value,
+			}],
+		}
+		emits('confirm', par)
+	}
 	/**
 	 * 确认退菜
 	 */
-	function confirm() {
+	async function confirm() {
 		const selTag = tags.value.filter(item => item.checked).map(item => item.label).join(",")
 		const note = selTag + (form.note.length > 0 ? "," + form.note : "");
 		console.log({
@@ -171,17 +249,22 @@
 		if (!note) {
 			return infoBox.showToast("请输入退菜原因");
 		}
-		let par = {
-			orderId: props.data.orderId,
-			refundAmount: number.value * props.data.unitPrice,
-			refundReason: note,
-			refundDetails: [{
-				id: props.data.id,
-				returnAmount: number.value * props.data.unitPrice,
-				num: number.value,
-			}],
+		const shopInfo = uni.getStorageSync('shopInfo')
+		if (shopInfo.refundMode == 1) {
+			const res = await getGoodsCategory(props.data)
+			if (res.refundMode === 3) {
+				confirmModal.show = true
+				return
+			}
 		}
-		emits('confirm', par)
+		if (shopInfo.refundMode == 2) {
+			const res = await getProductDetail(props.data.productId)
+			if (res.refundMode === 3) {
+				confirmModal.show = true
+				return
+			}
+		}
+		refundGoods()
 	}
 </script>
 
diff --git a/pagesOrder/tuikuan/tuikuan.vue b/pagesOrder/tuikuan/tuikuan.vue
index 752f449..179b2fb 100644
--- a/pagesOrder/tuikuan/tuikuan.vue
+++ b/pagesOrder/tuikuan/tuikuan.vue
@@ -2,16 +2,19 @@
 	<view class="min-page bg-gray u-p-30">
 		<view class="bg-fff u-p-l-30 u-p-r-30 ">
 			<view class="myTabs u-m-t-20">
-				<my-tabs :list="pageData.tabsList" :modelValue="pageData.tabsIndex" :textKey="'label'" @change="tabsChange"></my-tabs>
+				<my-tabs :list="pageData.tabsList" :modelValue="pageData.tabsIndex" :textKey="'label'"
+					@change="tabsChange"></my-tabs>
 			</view>
-		
+
 		</view>
-		<view v-if="pageData.tabsIndex == 2" class="bg-fff u-p-24 border-r-12 u-flex u-row-between" style="margin-top: 30rpx;">
-			 <up-input type="digit" placeholder="请输入退款金额" @change="parseIntNumber($event)" border="surround" v-model="pageData.modify" >
+		<view v-if="pageData.tabsIndex == 2" class="bg-fff u-p-24 border-r-12 u-flex u-row-between"
+			style="margin-top: 30rpx;">
+			<up-input type="digit" placeholder="请输入退款金额" @change="parseIntNumber($event)" border="surround"
+				v-model="pageData.modify">
 				<template #prefix>
-			  		<up-text text="￥" margin="0 3px 0 0" type="tips" ></up-text>
-			  	</template>
-			  </up-input>
+					<up-text text="￥" margin="0 3px 0 0" type="tips"></up-text>
+				</template>
+			</up-input>
 		</view>
 		<view class="u-m-t-24 u-font-24 u-font-24">
 			<text class="color-red">*</text>
@@ -27,7 +30,7 @@
 				</view>
 				<template v-if="item.productId=='-999'">
 					<view class="u-flex">
-						<view class="color-red" >￥{{item.priceAmount}}</view>
+						<view class="color-red">￥{{item.priceAmount}}</view>
 						<view class="u-flex u-m-l-32 u-col-center">
 							<view class="u-m-l-28 u-m-r-28">x{{item.number}}</view>
 						</view>
@@ -47,33 +50,33 @@
 			</view>
 		</view>
 		<template v-if="!option.userCouponId">
-			<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between" >
+			<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between">
 				<view>支付金额</view>
 				<view>
 					{{to2(orderDetail.info.payAmount)}}元
 				</view>
 			</view>
-			<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between" >
+			<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between">
 				<view>剩余可退金额</view>
 				<view class="color-red">
 					{{to2(orderDetail.info.payAmount - orderDetail.info.refundAmount)}}元
 				</view>
 			</view>
-			<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between" >
+			<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between">
 				<view>退款金额</view>
 				<view class="color-red">
 					{{to2(pageData.tabsIndex == 1 ? alltuikuanPrice : (pageData.tabsIndex == 2 ? pageData.modify : tuikuanPrice))}}元
 				</view>
 			</view>
 		</template>
-		
+
 		<!-- <view class="bg-fff u-p-24 border-r-12  u-m-t-32">
 			<view>退回优惠券</view>
 			<view class="u-font-24 color-999 u-m-t-16" v-if="!option.userCouponId">
 				该订单未使用优惠券
 			</view>
 		</view> -->
-		
+
 		<view class="bg-fff u-p-24 border-r-12  u-m-t-32">
 			<view>
 				<text class="color-red">*</text>
@@ -96,35 +99,67 @@
 				:color="$utils.ColorMain"></up-button>
 		</view>
 		<confirmRefundPopup ref="refundPopup" />
-
+		<up-modal :show="confirmModal.show" title="提示" @close="confirmModalClose" @cancel="confirmModalClose"
+			@confirm="confirmModalConfirm" showCancelButton>
+			<view>
+				<view>
+					<up-radio-group v-model="confirmModal.selRefundStock">
+						<up-radio v-for="(item,index) in confirmModal.refundStocks" :key="index" :label="item.name"
+							:name="item.key"></up-radio>
+					</up-radio-group>
+				</view>
+			</view>
+		</up-modal>
 	</view>
 </template>
 
 <script setup>
-	import { computed, reactive, ref, watch } from 'vue';
-	import { onLoad, onShow } from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive,
+		ref,
+		watch
+	} from 'vue';
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app';
 	import confirmRefundPopup from './components/confirmRefundPopup.vue';
 
-	import {hasPermission} from '@/commons/utils/hasPermission.js'
-	import { refundOrder } from '@/http/api/order.js'
-	import { mathFloorPrice } from '@/commons/utils/goodsUtil.js'
+	import {
+		hasPermission
+	} from '@/commons/utils/hasPermission.js'
+	import {
+		refundOrder
+	} from '@/http/api/order.js'
+	import {
+		mathFloorPrice
+	} from '@/commons/utils/goodsUtil.js'
 	let note = ref('')
 	const tuikuan = reactive({
 		list: ['点错', '数量点错', '客人要求', '协商退费'],
 		sel: -1
 	})
 	const pageData = reactive({
-		tabsList: [
-			{label: '部分退款', value: 0},
-			{label: '全部退款', value: 1},
-			{label: '自定义退款', value: 2},
+		tabsList: [{
+				label: '部分退款',
+				value: 0
+			},
+			{
+				label: '全部退款',
+				value: 1
+			},
+			{
+				label: '自定义退款',
+				value: 2
+			},
 		],
 		tabsIndex: 0,
 		modify: '',
 	})
-	
-	const option=reactive({
-		productId:'-999'
+
+	const option = reactive({
+		productId: '-999'
 	})
 	const orderDetail = reactive({
 		goodsList: [],
@@ -134,46 +169,47 @@
 		}
 	})
 	const refundPopup = ref(null);
-	
+
 	onLoad((opt) => {
 		orderDetail.info = JSON.parse(opt.orderInfo)
 		orderDetail.goodsList = JSON.parse(opt.goodsList)
 		option.productId = orderDetail.goodsList[0].productId
 		option.orderId = orderDetail.goodsList[0].orderId
 	})
-	
+
 	/**
 	 * tabs切换
 	 * @param {Object} i
 	 */
 	function tabsChange(i) {
 		pageData.tabsIndex = pageData.tabsList[i].value
-		if( pageData.tabsIndex == 0){ // 部分退款
+		if (pageData.tabsIndex == 0) { // 部分退款
 			orderDetail.goodsList.map(v => {
 				v.number = '0.00'
 			})
 		}
-		if( pageData.tabsIndex == 1){ // 全部退款
+		if (pageData.tabsIndex == 1) { // 全部退款
 			orderDetail.goodsList.map(v => {
 				v.number = v.num.toFixed(2)
 			})
 		}
-		if( pageData.tabsIndex == 2){ // 自定义退款
+		if (pageData.tabsIndex == 2) { // 自定义退款
 			orderDetail.goodsList.map(v => {
 				v.number = '0.00'
 			})
 		}
 	}
-	
+
 	function changeTuiKuanSel(i) {
 		tuikuan.sel = i
 	}
-	function  parseIntNumber (e) {
-		if ( e > (orderDetail.info.payAmount - orderDetail.info.refundAmount) ) {
-			setTimeout(()=>{
+
+	function parseIntNumber(e) {
+		if (e > (orderDetail.info.payAmount - orderDetail.info.refundAmount)) {
+			setTimeout(() => {
 				pageData.modify = (orderDetail.info.payAmount - orderDetail.info.refundAmount).toFixed(2)
-			},100)
-		} 
+			}, 100)
+		}
 	}
 	/**
 	 * 菜品总数量
@@ -183,7 +219,7 @@
 			return prve + cur.num * 1
 		}, 0)
 	})
-	
+
 	/**
 	 * 退款菜品总数量
 	 */
@@ -192,49 +228,49 @@
 			return prve + cur.number * 1
 		}, 0)
 	})
-	
+
 	/**
 	 * 退款总金额
-	 */	
+	 */
 	const tuikuanPrice = computed(() => {
 		return orderDetail.goodsList.reduce((prve, cur) => {
-			const n= mathFloorPrice(cur.number * cur.unitPrice,cur)
+			const n = mathFloorPrice(cur.number * cur.unitPrice, cur)
 			return (parseFloat(prve) + parseFloat(n)).toFixed(2)
 		}, 0)
 	})
 
 	/**
 	 * 剩余退款金额
-	 */	
+	 */
 	const surplusRefundPrice = computed(() => {
 		return orderDetail.info.payAmount - orderDetail.goodsList.reduce((prve, cur) => {
-			const n = parseFloat( mathFloorPrice(cur.refundNum * cur.unitPrice,cur))
-			return (parseFloat(prve) + parseFloat(n)).toFixed(2)*1
+			const n = parseFloat(mathFloorPrice(cur.refundNum * cur.unitPrice, cur))
+			return (parseFloat(prve) + parseFloat(n)).toFixed(2) * 1
 		}, 0)
 	})
-	
+
 	/**
 	 * 退款总金额
-	 */	
+	 */
 	const alltuikuanPrice = computed(() => {
 		return orderDetail.info.payAmount - orderDetail.goodsList.reduce((prve, cur) => {
-			const n = parseFloat( mathFloorPrice(cur.refundNum * cur.unitPrice,cur))
-			return (parseFloat(prve) + parseFloat(n)).toFixed(2)*1
+			const n = parseFloat(mathFloorPrice(cur.refundNum * cur.unitPrice, cur))
+			return (parseFloat(prve) + parseFloat(n)).toFixed(2) * 1
 		}, 0)
 	})
-	
+
 	function to2(n) {
 		return Number(n).toFixed(2);
 	}
 
 	function changeItem(item, step) {
-		if( item.num  <= 0){
+		if (item.num <= 0) {
 			return
 		}
-		if(item.productId=='-999'){
+		if (item.productId == '-999') {
 			return
 		}
-		if( pageData.tabsIndex != 0) {
+		if (pageData.tabsIndex != 0) {
 			return;
 		}
 		let newval = item.number * 1 + step * 1;
@@ -249,65 +285,126 @@
 		item.number = newval.toFixed(2);
 		pageData.tabsIndex = totalNumber.value == tuikuanNumber.value ? 1 : 0;
 	}
-	
+
 	/**
 	 * 确认退款
 	 */
 	let params;
 	async function tuikuanConfirm() {
-		const canTuikuan=await hasPermission('允许退款')
-		if(!canTuikuan){
+		const canTuikuan = await hasPermission('允许退款')
+		if (!canTuikuan) {
 			return uni.$utils.showToast('您没有退款权限')
 		}
-		if (pageData.tabsIndex != 2&&tuikuanNumber.value <= 0) {
+		if (pageData.tabsIndex != 2 && tuikuanNumber.value <= 0) {
 			return uni.$utils.showToast('退款商品数量不能为0！')
 		}
-		
-		const selTag=tuikuan.list[tuikuan.sel]
-		const noteResult=`${selTag?selTag:''}${note.value?(','+note.value):''}` 
+
+		const selTag = tuikuan.list[tuikuan.sel]
+		const noteResult = `${selTag?selTag:''}${note.value?(','+note.value):''}`
 		if (!noteResult) {
 			return uni.$utils.showToast('请输入或选择退款原因！')
 		}
-		
+
 		params = {
 			orderId: option.orderId,
 			refundReason: noteResult,
-			refundDetails: orderDetail.goodsList.filter(v=>v.number*1).map(v=>{
+			refundStock: confirmModal.selRefundStock,
+			refundDetails: orderDetail.goodsList.filter(v => v.number * 1).map(v => {
 				return {
-					id:v.id,
+					id: v.id,
 					returnAmount: v.number * 1 * v.unitPrice,
 					num: v.number * 1
 				}
 			})
 		}
-		if( pageData.tabsIndex == 2){
+		if (pageData.tabsIndex == 2) {
 			params.modify = true
-			params.refundAmount = (pageData.modify*1).toFixed(2)
+			params.refundAmount = (pageData.modify * 1).toFixed(2)
 		} else {
 			params.modify = false
 			params.refundAmount = pageData.tabsIndex == 1 ? alltuikuanPrice.value : tuikuanPrice.value
 		}
-		if ( pageData.tabsIndex == 2 && params.refundAmount > orderDetail.info.payAmount){
+		if (pageData.tabsIndex == 2 && params.refundAmount > orderDetail.info.payAmount) {
 			return uni.$utils.showToast('退款金额不能大于付款金额！')
 		}
-		if( uni.getStorageSync("shopInfo").isReturnPwd == 1){
+		if (uni.getStorageSync("shopInfo").isReturnPwd == 1) {
 			refundPopup.value.open(params.refundAmount, refundPost);
 			return;
 		}
-		refundPost()	
+		refundPost()
 	}
-	
-	async function refundPost (payPassword) {
-		if( payPassword ){
+
+
+	import {
+		getProductList,
+		getCategoryList
+	} from '@/http/api/product.js'
+
+	const confirmModal = reactive({
+		show: false,
+		selRefundStock: false,
+		payPassword: '',
+		refundStocks: [{
+			name: '已上菜(仅退菜不退库存)',
+			key: false
+		}, {
+			name: '未上菜(退菜后退库存)',
+			key: true,
+		}]
+	})
+
+	function confirmModalClose() {
+		confirmModal.show = false
+		confirmModal.selRefundStock = false
+		confirmModal.payPassword = ''
+	}
+
+	function confirmModalConfirm() {
+		refundSubmit(confirmModal.payPassword)
+		confirmModalClose()
+	}
+
+	async function refundSubmit(payPassword) {
+		if (payPassword) {
 			params.pwd = payPassword
 		}
+		params.refundStock = confirmModal.selRefundStock
 		await refundOrder(params)
 		uni.$utils.showToast('退款请求提交成功')
-		setTimeout(()=>{
-			uni.navigateBack({delta:1})
-		},500)
+		setTimeout(() => {
+			uni.navigateBack({
+				delta: 1
+			})
+		}, 500)
+	}
+
+	async function refundPost(payPassword) {
+		confirmModal.payPassword = confirmModal.payPassword
+		const shopInfo = uni.getStorageSync('shopInfo')
+		if (pageData.tabsIndex != 2) {
+			if (shopInfo.refundMode == 1) {
+				const res = await getCategoryList()
+				for (let goods of res) {
+					if (goods.refundMode == 3) {
+						confirmModal.show = true
+						return
+					}
+				}
+
+			}
+			if (shopInfo.refundMode == 2) {
+				const res = await getProductList()
+				for (let goods of res) {
+					console.log(goods);
+					if (goods.refundMode == 3) {
+						confirmModal.show = true
+						return
+					}
+				}
+			}
+		}
+		refundSubmit(payPassword)
 	}
-	
 </script>
 
 <style lang="scss" scoped>