From fbe170b25486cf2a7bdee20e2f32cf29a75ea806 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 25 Dec 2025 15:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8B=BC=E5=9B=A2/=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90=E5=88=86=E4=BA=AB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my-components/my-footer-btn.vue    |   23 +-
 http/api/product.js                           |   38 +-
 http/api/vendor.js                            |   15 +-
 http/api/ware.js                              |   26 +
 pageConsumables/batch_in.vue                  |  773 ++++++
 pageConsumables/components/select-cons.vue    |   52 +
 pageConsumables/components/select-vendor.vue  |   56 +
 pageConsumables/index.vue                     |  746 ++---
 .../groupGoods/components/goodsList.vue       |   17 +
 pageMarket/groupGoods/index.vue               |   24 +-
 pageMarket/groupGoods/share.vue               |  531 ++++
 .../components/goodsList.vue                  |   16 +
 pageMarket/packagePopularize/index.vue        |   22 +-
 pageMarket/packagePopularize/selectGoods.vue  |    1 +
 pageMarket/packagePopularize/share.vue        |  528 ++++
 pageProduct/add-Product/add-Product.vue       | 2402 +++++++++--------
 pages.json                                    |   20 +
 utils/index.js                                |   31 +-
 18 files changed, 3789 insertions(+), 1532 deletions(-)
 create mode 100644 pageConsumables/batch_in.vue
 create mode 100644 pageConsumables/components/select-cons.vue
 create mode 100644 pageConsumables/components/select-vendor.vue
 create mode 100644 pageMarket/groupGoods/share.vue
 create mode 100644 pageMarket/packagePopularize/share.vue

diff --git a/components/my-components/my-footer-btn.vue b/components/my-components/my-footer-btn.vue
index 3bca82f..196e71d 100644
--- a/components/my-components/my-footer-btn.vue
+++ b/components/my-components/my-footer-btn.vue
@@ -1,8 +1,8 @@
 <template>
-	<view class="fixed-wrap" :style="{ '--num': `${numValue}px` }" v-if="isShow">
+	<view class="fixed-wrap" :style="{ '--num': `${numValue}px` }">
 		<view class="fixed-btn" :class="[type]" id="targetRef">
 			<div class="btn">
-				<u-button type="primary" :shape="shape" size="large" @click="emits('confirm')">{{ confirmText }}</u-button>
+				<u-button type="primary" :color="confirmColor" :shape="shape" size="large" @click="emits('confirm')">{{ confirmText }}</u-button>
 			</div>
 			<div class="btn" v-if="showCancel">
 				<u-button :shape="shape" size="large" @click="emits('cancel')">取消</u-button>
@@ -13,7 +13,7 @@
 
 <script setup>
 import { ref, onMounted, nextTick, getCurrentInstance, computed } from 'vue';
-import { isMainShop } from '@/store/account.js';
+// import { isMainShop } from '@/store/account.js';
 
 const props = defineProps({
 	type: {
@@ -28,6 +28,10 @@ const props = defineProps({
 		type: String,
 		default: '保存'
 	},
+	confirmColor: {
+		type: String,
+		default: '#3C9CFF'
+	},
 	showCancel: {
 		type: Boolean,
 		default: false
@@ -37,12 +41,13 @@ const props = defineProps({
 		default: 'circle' // squre circle
 	}
 });
-const isShow = computed(() => {
-	if (props.isOpenPermission) {
-		return isMainShop();
-	}
-	return true;
-});
+
+// const isShow = computed(() => {
+// 	if (props.isOpenPermission) {
+// 		return isMainShop();
+// 	}
+// 	return true;
+// });
 
 const numValue = computed(() => {
 	let num = 0;
diff --git a/http/api/product.js b/http/api/product.js
index b7d9f55..77b3d3c 100644
--- a/http/api/product.js
+++ b/http/api/product.js
@@ -5,7 +5,7 @@ const request = http.request
  * 获取商品分页
  * @returns
  */
-export function getProductPage(data, urlType = 'product' ,showLoading) {
+export function getProductPage(data, urlType = 'product', showLoading) {
 	return request({
 		url: `${urlType}/admin/product/page`,
 		method: "GET",
@@ -20,7 +20,7 @@ export function getProductPage(data, urlType = 'product' ,showLoading) {
  * 获取商品列表
  * @returns
  */
-export function getProductList(data, urlType = 'product' ,showLoading) {
+export function getProductList(data, urlType = 'product', showLoading) {
 	return request({
 		url: `${urlType}/admin/product/list`,
 		method: "GET",
@@ -36,11 +36,11 @@ export function getProductList(data, urlType = 'product' ,showLoading) {
  * 获取商品详情
  * @returns
  */
-export function getProductDetail (id, urlType = 'product') {
+export function getProductDetail(id, urlType = 'product') {
 	return request({
 		url: `${urlType}/admin/product/${id}`,
 		method: "GET",
-		
+
 	})
 }
 
@@ -73,7 +73,7 @@ export function delProduct(id, urlType = 'product') {
  * 商品上下架
  * @returns
  */
-export function productOnOff (data, urlType = 'product') {
+export function productOnOff(data, urlType = 'product') {
 	return request({
 		url: `${urlType}/admin/product/onOff`,
 		method: "POST",
@@ -87,7 +87,7 @@ export function productOnOff (data, urlType = 'product') {
  * 商品售罄
  * @returns
  */
-export function productMarkIsSoldOut (data, urlType = 'product') {
+export function productMarkIsSoldOut(data, urlType = 'product') {
 	return request({
 		url: `${urlType}/admin/product/markIsSoldOut`,
 		method: "POST",
@@ -262,7 +262,7 @@ export function delSpec(id, urlType = 'product') {
 	return request({
 		url: `${urlType}/admin/prod/spec/${id}`,
 		method: "DELETE",
-		
+
 	})
 }
 
@@ -343,4 +343,28 @@ export function delProdGroup(id, urlType = 'product') {
 		url: `${urlType}/admin/prod/group/${id}`,
 		method: "DELETE",
 	})
+}
+
+/**
+ * 入库单识别
+ * @returns
+ */
+export function stockOcr(data, urlType = 'product') {
+	return request({
+		url: `${urlType}/admin/product/stock/ocr`,
+		method: "post",
+		data
+	})
+}
+
+/**
+ * ocr识别结果
+ * @returns
+ */
+export function ocrResult(data, urlType = 'product') {
+	return request({
+		url: `${urlType}/admin/product/stock/ocrResult`,
+		method: "get",
+		data
+	})
 }
\ No newline at end of file
diff --git a/http/api/vendor.js b/http/api/vendor.js
index 3617433..3c4e10d 100644
--- a/http/api/vendor.js
+++ b/http/api/vendor.js
@@ -15,6 +15,18 @@ export function getVendorPage(data, urlType = 'product') {
 	})
 }
 
+
+/**
+ * 获取供应商列表/无分页
+ * @returns
+ */
+export function getVendorList(urlType = 'product') {
+	return request({
+		url: `${urlType}/admin/product/vendor/list`,
+		method: "GET"
+	})
+}
+
 /**
  * 添加供应商
  * @returns
@@ -52,5 +64,4 @@ export function delVendor(id, urlType = 'product') {
 		url: `${urlType}/admin/product/vendor/${id}`,
 		method: "DELETE",
 	})
-}
-
+}
\ No newline at end of file
diff --git a/http/api/ware.js b/http/api/ware.js
index 50c903e..11fcdd4 100644
--- a/http/api/ware.js
+++ b/http/api/ware.js
@@ -122,6 +122,17 @@ export function checkout(data) {
 	})
 }
 
+/**
+ * 拼团商品:拼团商品详情
+ * @param {Object} data
+ */
+export function wareDetail(data) {
+	return request({
+		url: `${ORDER_URL}/admin/ware/ware/detail`,
+		method: "get",
+		data
+	})
+}
 
 /**
  * 套餐推广:添加套餐
@@ -274,4 +285,19 @@ export function packageCheckout(data) {
 		method: 'post',
 		data
 	});
+}
+
+/**
+ * 套餐推广:获取套餐详情
+ * @param {*} data 
+ * @returns 
+ */
+export function packageDetail(data) {
+	return request({
+		url: `${Market_BaseUrl}/admin/package/detail/${data.id}`,
+		method: 'GET',
+		data: {
+			shopId: data.shopId
+		}
+	});
 }
\ No newline at end of file
diff --git a/pageConsumables/batch_in.vue b/pageConsumables/batch_in.vue
new file mode 100644
index 0000000..2ce1352
--- /dev/null
+++ b/pageConsumables/batch_in.vue
@@ -0,0 +1,773 @@
+<template>
+	<view class="container">
+		<u-form ref="formRef" :model="form" :rules="rules" label-position="top">
+			<view class="card">
+				<u-form-item>
+					<view class="switch-wrap">
+						<view class="top">
+							<text class="t">第一步：上传图片</text>
+							<view class="btn">
+								<u-button type="primary" :disabled="!img" shape="circle" text="开始解析" @click="startCheckOcrRes"></u-button>
+							</view>
+						</view>
+						<view class="info">
+							<my-upload-img v-model="img"></my-upload-img>
+						</view>
+					</view>
+				</u-form-item>
+			</view>
+			<view class="card" v-if="form.bodyList">
+				<u-form-item>
+					<view class="switch-wrap">
+						<view class="top">
+							<text class="t">第二步：编辑信息</text>
+						</view>
+						<view class="top" style="margin-top: 10px">
+							<text class="t">供应商信息</text>
+						</view>
+						<view class="info">
+							<view style="flex: 1">
+								<selectVendor v-model="form.vendorId" />
+							</view>
+						</view>
+					</view>
+				</u-form-item>
+				<u-form-item>
+					<view class="switch-wrap">
+						<view class="top">
+							<text class="t">耗材信息</text>
+							<view class="btn">
+								<u-button type="primary" shape="circle" text="选择耗材" @click="openSelectCons" v-if="!stockInStatus"></u-button>
+							</view>
+						</view>
+						<view class="info">
+							<view class="list-wrap">
+								<view class="top-tips">
+									<text class="tb">共{{ form.bodyList.length }}种耗材，</text>
+									<text class="tb">
+										金额合计：￥{{
+											multiplyAndFormat(
+												form.bodyList.reduce((sum, item) => sum + (item.purchasePrice || 0) * (item.inOutNumber || 0), 0),
+												1
+											)
+										}}
+									</text>
+								</view>
+								<view class="item" v-for="(item, index) in form.bodyList" :key="index">
+									<view class="name">
+										<text class="t">{{ item.conName }}</text>
+										<view class="error-text" v-if="stockInStatus">
+											<u-text type="success" v-if="item.conId" text="入库成功" size="12"></u-text>
+											<u-text v-else type="error" :text="`入库失败：${item.failReason}`" size="12"></u-text>
+										</view>
+									</view>
+									<view class="content">
+										<view class="ctt-item">
+											<text class="t1">单价</text>
+											<text class="t2">{{ item.purchasePrice }}</text>
+										</view>
+										<view class="ctt-item">
+											<text class="t1">单位</text>
+											<text class="t2">{{ item.unitName }}</text>
+										</view>
+										<view class="ctt-item">
+											<text class="t1">数量</text>
+											<text class="t2">{{ item.inOutNumber }}</text>
+										</view>
+										<view class="ctt-item">
+											<text class="t1">小计</text>
+											<text class="t2">{{ multiplyAndFormat(item.purchasePrice || 0, item.inOutNumber || 0) }}</text>
+										</view>
+									</view>
+									<view class="footer-btn-wrap">
+										<view>
+											<u-text type="primary" text="编辑" @click="editorFormHandle(item, index)"></u-text>
+										</view>
+										<view>
+											<u-text type="error" text="删除" @click="form.bodyList.splice(index, 1)"></u-text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</u-form-item>
+				<u-form-item>
+					<view class="result_wrap" v-if="stockInStatus">
+						上传完成 共{{ form.bodyList.length }}条数据，其中成功
+						<u-text type="success" :text="form.bodyList.filter((item) => item.conId).length"></u-text>
+						条，失败
+						<u-text type="error" :text="form.bodyList.filter((item) => !item.conId).length"></u-text>
+						条
+					</view>
+				</u-form-item>
+			</view>
+		</u-form>
+		<u-popup :show="showEditorPopup" round="20" closeable @close="showEditorPopup = false">
+			<view class="editor-popup" v-if="form.bodyList && form.bodyList.length">
+				<view class="title">
+					<text class="t">{{ form.bodyList[editorIndex].conName }}</text>
+				</view>
+				<view class="form">
+					<u-form ref="editorFormRef" :model="editorForm" :rules="editorFormRules" label-width="60px">
+						<u-form-item label="名称" prop="conName" required>
+							<u-input v-model="editorForm.conName" :maxlength="50" placeholder="请输入耗材名称"></u-input>
+						</u-form-item>
+						<u-form-item label="单价" prop="purchasePrice" required>
+							<u-input
+								v-model="editorForm.purchasePrice"
+								placeholder="请输入耗材单价"
+								:maxlength="8"
+								@change="
+									(e) =>
+										mySetTimeout(() => {
+											editorForm.purchasePrice = filterNumberInput(e);
+										}, 50)
+								"
+							>
+								<template #suffix>
+									<text>元</text>
+								</template>
+							</u-input>
+						</u-form-item>
+						<u-form-item label="单位" prop="unitName" required>
+							<u-input v-model="editorForm.unitName" :maxlength="20" placeholder="请选择耗材单位"></u-input>
+						</u-form-item>
+						<u-form-item label="数量" prop="inOutNumber" required>
+							<u-input
+								v-model="editorForm.inOutNumber"
+								placeholder="请输入耗材数量"
+								:maxlength="8"
+								@change="
+									(e) =>
+										mySetTimeout(() => {
+											editorForm.inOutNumber = filterNumberInput(e, 1);
+										}, 50)
+								"
+							></u-input>
+						</u-form-item>
+					</u-form>
+				</view>
+				<view class="footer">
+					<view class="btn">
+						<u-button style="width: 100%" shape="circle" @click="showEditorPopup = false">取消</u-button>
+					</view>
+					<view class="btn">
+						<u-button type="primary" style="width: 100%" shape="circle" @click="editorFormSubmitHandle">确认</u-button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<my-footer-btn type="horizontal" showCancel @confirm="submitHandle" @cancel="backHandle"></my-footer-btn>
+		<!-- 选择耗材 -->
+		<selectCons ref="selectConsRef" @success="selectConsSuccess" />
+		<view class="loading-page" v-if="checkLoading">
+			<view class="loader"></view>
+			<text class="t">{{ loadingText }}</text>
+			<view class="btn">
+				<u-button type="primary" @click="closeCheckOcrHandle">取消查询</u-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import _ from 'lodash';
+import { ref, computed } from 'vue';
+import { multiplyAndFormat, filterNumberInput } from '@/utils/index.js';
+import { stockOcr, ocrResult } from '@/http/api/product.js';
+import { consStockIn } from '@/http/api/cons.js';
+import selectVendor from './components/select-vendor.vue';
+import selectCons from './components/select-cons.vue';
+
+const selectConsRef = ref(null);
+function selectConsSuccess(e) {
+	console.log('selectVendorHandle===', e);
+	let arr = e.map((item) => ({
+		id: item.id,
+		conId: item.id,
+		conName: item.conName,
+		purchasePrice: item.price,
+		unitName: item.conUnit,
+		inOutNumber: 1
+	}));
+	form.value.bodyList.push(...arr);
+}
+
+function openSelectCons() {
+	const comp = selectConsRef.value;
+	if (comp && typeof comp.show === 'function') {
+		comp.show();
+	} else {
+		console.warn('selectConsRef not ready or show() not available', comp);
+	}
+}
+
+// 封装全局定时器，适配多端
+const mySetTimeout = (fn, delay) => {
+	if (typeof uni !== 'undefined') {
+		return setTimeout(fn, delay); // 小程序
+	} else {
+		return window.setTimeout(fn, delay); // H5
+	}
+};
+
+// 编辑耗材 start
+const showEditorPopup = ref(false);
+const editorFormRef = ref(null);
+const editorIndex = ref(0);
+const editorForm = ref({
+	conName: '',
+	purchasePrice: '',
+	unitName: '',
+	inOutNumber: ''
+});
+const editorFormRules = ref({
+	conName: [
+		{
+			required: true,
+			validator: (rule, value, callback) => {
+				if (editorForm.value.conName === '') {
+					return callback(new Error('请输入耗材名称'));
+				} else {
+					return true;
+				}
+			}
+		}
+	],
+	purchasePrice: [
+		{
+			required: true,
+			validator: (rule, value, callback) => {
+				if (editorForm.value.purchasePrice === '') {
+					return callback(new Error('请输入耗材单价'));
+				} else {
+					return true;
+				}
+			}
+		}
+	],
+	unitName: [
+		{
+			required: true,
+			validator: (rule, value, callback) => {
+				if (editorForm.value.unitName === '') {
+					return callback(new Error('请选择耗材单位'));
+				} else {
+					return true;
+				}
+			}
+		}
+	],
+	inOutNumber: [
+		{
+			required: true,
+			validator: (rule, value, callback) => {
+				if (editorForm.value.inOutNumber === '') {
+					return callback(new Error('请输入耗材数量'));
+				} else {
+					return true;
+				}
+			}
+		}
+	]
+});
+
+// 显示编辑
+function editorFormHandle(item, index) {
+	editorForm.value = _.cloneDeep(item);
+	editorIndex.value = index;
+	showEditorPopup.value = true;
+}
+
+function editorFormSubmitHandle() {
+	editorFormRef.value
+		.validate()
+		.then(() => {
+			form.value.bodyList[editorIndex.value] = _.cloneDeep(editorForm.value);
+			showEditorPopup.value = false;
+		})
+		.catch(() => {});
+}
+// 编辑耗材 end
+
+const resId = ref(null);
+const img = ref('');
+const stockInStatus = ref(false);
+const form = ref({});
+// const form = ref({
+// 	actualPaymentAmount: null,
+// 	amountPayable: 1680,
+// 	batchNo: 'XS25110410003',
+// 	bodyList: [
+// 		{ conId: '', conName: '哈根达斯-小杯(草莓)', failReason: '', inOutNumber: 24, purchasePrice: 35, subTotal: 840, unitName: '杯' },
+// 		{ conId: '', conName: '哈根达斯-小杯(香草)', failReason: '', inOutNumber: 24, purchasePrice: 35, subTotal: 840, unitName: '杯' },
+// 		{ conId: '', conName: '哈根达斯-小杯(比利时巧克力)', failReason: '', inOutNumber: 12, purchasePrice: 0, subTotal: 0, unitName: '杯' },
+// 		{ conId: '', conName: '哈根达斯-小杯(夏威夷果仁)', failReason: '', inOutNumber: 12, purchasePrice: 0, subTotal: 0, unitName: '杯' }
+// 	],
+// 	inOutDate: '2025-11-04',
+// 	ocrSaleOrder: {
+// 		customerName: '大客河景餐厅',
+// 		date: '2025-11-04',
+// 		documentType: '销售单',
+// 		items: [
+// 			{ conName: '哈根达斯-小杯(草莓)', inOutNumber: '24', purchasePrice: '35', spec: '81g', subTotal: '840', unitName: '杯' },
+// 			{ conName: '哈根达斯-小杯(香草)', inOutNumber: '24', purchasePrice: '35', spec: '81g', subTotal: '840', unitName: '杯' },
+// 			{ conName: '哈根达斯-小杯(比利时巧克力)', inOutNumber: '12', purchasePrice: '0', spec: '81g', subTotal: '0', unitName: '杯' },
+// 			{ conName: '哈根达斯-小杯(夏威夷果仁)', inOutNumber: '12', purchasePrice: '0', spec: '81g', subTotal: '0', unitName: '杯' }
+// 		],
+// 		operator: '陈钦楠',
+// 		orderNumber: 'XS25110410003',
+// 		remark: '',
+// 		totalAmount: '1680'
+// 	},
+// 	paymentDate: null,
+// 	remark: '',
+// 	unInCons: [],
+// 	vendorId: null
+// });
+
+const rules = ref({});
+
+// 查询OCR结果
+async function startCheckOcrRes() {
+	try {
+		resId.value = await stockOcr({ url: img.value });
+		stockInStatus.value = false;
+		startQueryInterval()
+			.then((res) => {
+				// console.log('查询成功', JSON.stringify(res));
+				form.value = res;
+			})
+			.catch((error) => {
+				console.error('查询失败', error);
+			});
+	} catch (error) {
+		console.log(error);
+	}
+}
+
+// 开始查询ocr结果
+// 启动查询方法，每5秒查询一次，五分钟后超时停止查询
+const checkLoading = ref(false);
+const speed = 10000; // 查询间隔时间，单位毫秒
+const timeout = 300000; // 超时时间，单位毫秒
+// const timeout = 15000; // 超时时间，单位毫秒
+const interval = ref(null);
+const checkNumber = ref(0);
+const loadingText = computed(() => `每${speed / 1000}秒查询1次，已查询：${checkNumber.value}次`);
+function startQueryInterval() {
+	return new Promise((resolve, reject) => {
+		if (!resId.value) {
+			reject(new Error('无效的 resId，无法查询'));
+			return;
+		}
+
+		// 重置计数并显示 loading
+		checkNumber.value = 0;
+		checkLoading.value = true;
+
+		const startTime = Date.now();
+		interval.value = null;
+
+		async function checkOnce() {
+			try {
+				checkNumber.value++;
+				console.log('ocr checkNumber:', checkNumber.value);
+				checkLoading.value = true;
+				const res = await ocrResult({ id: resId.value });
+				if (res && res.batchNo) {
+					uni.showToast({
+						title: '查询成功',
+						icon: 'none'
+					});
+					setTimeout(() => {
+						checkLoading.value = false;
+					}, 1000);
+					clearInterval(interval.value);
+					resolve(res);
+					return;
+				}
+
+				// 如果还未超时，则继续等待下一轮查询
+				if (Date.now() - startTime >= timeout) {
+					setTimeout(() => {
+						checkLoading.value = false;
+					}, 1000);
+					uni.showToast({
+						title: '查询超时',
+						icon: 'none'
+					});
+					clearInterval(interval.value);
+					reject(new Error('查询超时'));
+				}
+			} catch (error) {
+				uni.showToast({
+					title: '查询失败',
+					icon: 'none'
+				});
+				setTimeout(() => {
+					checkLoading.value = false;
+				}, 1000);
+				clearInterval(interval.value);
+				reject(error);
+			}
+		}
+
+		// 立即执行一次查询，然后按间隔继续查询
+		checkOnce();
+		interval.value = setInterval(checkOnce, speed);
+	});
+}
+
+// 取消查询
+function closeCheckOcrHandle() {
+	checkLoading.value = false;
+	clearInterval(interval.value);
+}
+
+// 提交批量入库
+async function submitHandle() {
+	try {
+		console.log('submitHandle', form.value);
+		uni.showLoading({
+			title: '提交中...',
+			mask: true
+		});
+		const res = await consStockIn(form.value);
+		form.value = res;
+		stockInStatus.value = true;
+		setTimeout(() => {
+			uni.showToast({
+				title: '提交成功',
+				icon: 'none'
+			});
+		}, 100);
+	} catch (error) {
+		console.log(error);
+	}
+	uni.hideLoading();
+}
+
+// 返回
+function backHandle() {
+	uni.navigateBack();
+}
+</script>
+
+<style>
+page {
+	background-color: #f8f8f8;
+}
+</style>
+<style scoped lang="scss">
+.container {
+	padding: 28upx;
+}
+.card {
+	background-color: #fff;
+	border-radius: 20px;
+	padding: 28upx;
+	&:not(:last-child) {
+		margin-bottom: 28upx;
+	}
+}
+.switch-wrap {
+	flex: 1;
+	width: 100%;
+	.top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		&.column {
+			align-items: flex-start;
+			flex-direction: column;
+		}
+		.two {
+			display: flex;
+			flex-direction: column;
+			padding-right: 28upx;
+		}
+		.t {
+			font-size: 32upx;
+			color: #333;
+			font-weight: bold;
+		}
+		.tips {
+			font-size: 24upx;
+			color: #666;
+		}
+	}
+	.info {
+		padding-top: 16upx;
+		display: flex;
+		align-items: center;
+		gap: 16upx;
+		.i {
+			font-size: 28upx;
+			color: #666;
+		}
+		.ipt {
+			flex: 1;
+		}
+		.t {
+			font-size: 24upx;
+			color: #666;
+		}
+		.list-wrap {
+			flex: 1;
+			.top-tips {
+				.t {
+					font-size: 28upx;
+					color: #333;
+				}
+			}
+			.item {
+				margin-top: 28upx;
+				background-color: #f8f8f8;
+				border-radius: 12upx;
+				padding: 20upx;
+				.name {
+					display: flex;
+					flex-direction: column;
+					.t {
+						font-size: 28upx;
+						color: #333;
+					}
+					.error-text {
+						display: flex;
+					}
+				}
+				.content {
+					display: flex;
+					padding: 28upx 0;
+
+					.ctt-item {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						&:last-child {
+							align-items: flex-end;
+						}
+						.t1 {
+							color: #666;
+							font-size: 28upx;
+						}
+						.t2 {
+							color: #333;
+							font-size: 28upx;
+						}
+					}
+				}
+				.footer-btn-wrap {
+					display: flex;
+					gap: 28upx;
+					justify-content: flex-end;
+					.btn {
+						width: 160upx;
+					}
+				}
+			}
+		}
+		.package-wrap {
+			flex: 1;
+			.list {
+				.item {
+					border: 1px solid #ececec;
+					border-radius: 12upx;
+					padding: 20upx;
+					&:not(:first-child) {
+						margin-top: 28upx;
+					}
+					.header {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						padding-bottom: 20upx;
+						.t {
+							font-size: 28upx;
+							color: #333;
+						}
+						.del {
+							display: flex;
+							align-items: center;
+							gap: 12upx;
+						}
+					}
+					.input-wrap {
+						display: flex;
+						gap: 20upx;
+						padding-bottom: 20upx;
+						.btn {
+							display: flex;
+							align-items: center;
+							gap: 12upx;
+							.t {
+								color: #318afe;
+							}
+						}
+					}
+					.table-wrap {
+						padding-bottom: 20upx;
+						margin-bottom: 20upx;
+						.tab-head {
+							background-color: #f8f8f8;
+						}
+						.tr {
+							display: flex;
+							gap: 12upx;
+							padding: 20upx;
+							border-bottom: 1px solid #ececec;
+							.td {
+								flex: 1;
+								&:nth-child(1) {
+									flex: 2;
+								}
+								&:last-child {
+									flex: 0.5;
+									display: flex;
+									align-items: center;
+									justify-content: flex-end;
+								}
+								.t {
+									font-size: 28upx;
+									color: #333;
+								}
+								.del {
+									color: red;
+									font-size: 28upx;
+								}
+							}
+						}
+					}
+					.select_num_wrap {
+						padding-bottom: 28upx;
+						.label {
+							padding-bottom: 20upx;
+							.t {
+								color: #333;
+								font-size: 32upx;
+							}
+						}
+					}
+				}
+			}
+			.package-wrap-btn {
+				display: flex;
+				justify-content: center;
+				padding-top: 28upx;
+				.btn {
+					display: flex;
+					gap: 8upx;
+					align-items: center;
+					.t {
+						font-size: 28upx;
+						color: #318afe;
+						font-weight: bold;
+					}
+				}
+			}
+		}
+		.step-wrap {
+			flex: 1;
+			.table-wrap {
+				padding-bottom: 20upx;
+				margin-bottom: 20upx;
+				.tab-head {
+					background-color: #f8f8f8;
+				}
+				.tr {
+					display: flex;
+					gap: 12upx;
+					padding: 20upx;
+					border-bottom: 1px solid #ececec;
+					.td {
+						flex: 1;
+						display: flex;
+						gap: 20upx;
+						align-items: center;
+						&:last-child {
+							flex: 0.6;
+						}
+						.t {
+							font-size: 28upx;
+							color: #333;
+						}
+						.edit {
+							color: #318afe;
+							font-size: 28upx;
+						}
+						.del {
+							color: red;
+							font-size: 28upx;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+.editor-popup {
+	padding: 0 28upx;
+	.title {
+		padding: 28upx 0;
+		display: flex;
+		justify-content: center;
+		.t {
+			font-size: 32upx;
+			font-weight: bold;
+		}
+	}
+	.form {
+		padding: 28upx;
+	}
+	.footer {
+		display: flex;
+		gap: 28upx;
+		.btn {
+			flex: 1;
+		}
+	}
+}
+.result_wrap {
+	display: flex;
+}
+.loading-page {
+	width: 100vw;
+	height: 100vh;
+	display: flex;
+	gap: 20upx;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #fff;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	padding-bottom: 10vh;
+	.loader {
+		width: 50px;
+		aspect-ratio: 1;
+		border-radius: 50%;
+		background: radial-gradient(farthest-side, #ffa516 94%, #0000) top/8px 8px no-repeat, conic-gradient(#0000 30%, #ffa516);
+		-webkit-mask: radial-gradient(farthest-side, #0000 calc(100% - 8px), #000 0);
+		animation: l13 1s infinite linear;
+	}
+	@keyframes l13 {
+		100% {
+			transform: rotate(1turn);
+		}
+	}
+	.t {
+		font-size: 28upx;
+		color: #666;
+	}
+	.btn {
+		position: absolute;
+		bottom: 10%;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+</style>
diff --git a/pageConsumables/components/select-cons.vue b/pageConsumables/components/select-cons.vue
new file mode 100644
index 0000000..48954dd
--- /dev/null
+++ b/pageConsumables/components/select-cons.vue
@@ -0,0 +1,52 @@
+<template>
+	<u-picker
+		title="选择耗材"
+		:show="visable"
+		:columns="columns"
+		keyName="conName"
+		@close="visable = false"
+		closeOnClickOverlay
+		@cancel="visable = false"
+		@confirm="confirmHandle"
+	></u-picker>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import { getConsList } from '@/http/api/cons.js';
+
+const visable = ref(false);
+
+const columns = ref([]);
+
+const emits = defineEmits(['success']);
+
+function confirmHandle(e) {
+	emits('success', e.value);
+	visable.value = false;
+}
+
+// 获取耗材列表
+async function getConsListAjax() {
+	try {
+		const res = await getConsList();
+		columns.value = [res];
+	} catch (error) {
+		console.log(error);
+	}
+}
+
+function show() {
+	visable.value = true;
+}
+
+defineExpose({
+	show
+});
+
+onMounted(() => {
+	getConsListAjax();
+});
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/pageConsumables/components/select-vendor.vue b/pageConsumables/components/select-vendor.vue
new file mode 100644
index 0000000..24f09d7
--- /dev/null
+++ b/pageConsumables/components/select-vendor.vue
@@ -0,0 +1,56 @@
+<!-- 选择供应商 -->
+<template>
+	<view class="container">
+		<view @click="show = true">
+			<u-input v-model="vendorName" readonly suffixIcon="arrow-down" placeholder="请选择供应商"></u-input>
+		</view>
+		<u-picker
+			title="选择供应商"
+			:show="show"
+			:columns="columns"
+			keyName="name"
+			@close="show = false"
+			closeOnClickOverlay
+			@cancel="show = false"
+			@confirm="confirmHandle"
+		></u-picker>
+	</view>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import { getVendorList } from '@/http/api/vendor.js';
+
+const vendorName = ref('');
+
+const vendorId = defineModel({
+	type: [String, Number],
+	default: ''
+});
+
+const show = ref(false);
+const columns = ref([]);
+
+function confirmHandle(e) {
+	let data = e.value[0];
+	vendorId.value = data.id;
+	vendorName.value = data.name;
+	show.value = false;
+}
+
+// 获取供应商列表
+async function getVendorListAjax() {
+	try {
+		const res = await getVendorList();
+		columns.value = [res];
+	} catch (error) {
+		console.log(error);
+	}
+}
+
+onMounted(() => {
+	getVendorListAjax();
+});
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/pageConsumables/index.vue b/pageConsumables/index.vue
index fdb51b5..231798f 100644
--- a/pageConsumables/index.vue
+++ b/pageConsumables/index.vue
@@ -1,453 +1,479 @@
 <template>
 	<view class="ConsumablesTop">
-		<view @tap="pageData.show = !pageData.show" style="display: flex;align-items: center;">
-			{{pageData.title}}<up-icon name="arrow-down" size="12"></up-icon>
+		<view @tap="pageData.show = !pageData.show" style="display: flex; align-items: center">
+			{{ pageData.title }}
+			<up-icon name="arrow-down" size="12"></up-icon>
 		</view>
 		<view>
 			<input v-model="pageData.query.conName" @input="inputEvent" type="text" placeholder="请输入耗材名称" />
 		</view>
-		<view @tap="toUrl('PAGES_ADD_TYPE') ">
-			新增类别
-		</view>
+		<view @tap="toUrl('PAGES_ADD_TYPE')">新增类别</view>
 	</view>
 
 	<view class="ConsumablesConent" v-if="pageData.list.length">
-		<view v-for="(item,index) in pageData.list" :key="index">
-			<view> {{item.conName}}
-				<view> {{item.consGroupName}} </view>
+		<view v-for="(item, index) in pageData.list" :key="index">
+			<view>
+				{{ item.conName }}
+				<view>{{ item.consGroupName }}</view>
 			</view>
 			<view>
 				<view>
-					<view style="color: #333333;"> {{item.conUnit}} </view>
-					<view> 耗材单位 </view>
+					<view style="color: #333333">{{ item.conUnit }}</view>
+					<view>耗材单位</view>
 				</view>
 				<view>
-					<view style="color: #318AFE;"> {{item.stockNumber}} </view>
-					<view> 剩余库存 </view>
+					<view style="color: #318afe">{{ item.stockNumber }}</view>
+					<view>剩余库存</view>
 				</view>
 			</view>
 			<view>
-				<view style="background-color: #fff;" @tap="show=true;showData = filtersSproductId(item.productList)">
+				<view
+					style="background-color: #fff"
+					@tap="
+						show = true;
+						showData = filtersSproductId(item.productList);
+					"
+				>
 					所属商品:
-					{{ filtersSproductId(item.productList).length>7?filtersSproductId(item.productList).substring(0,6)+'...':filtersSproductId(item.productList)}}
+					{{ filtersSproductId(item.productList).length > 7 ? filtersSproductId(item.productList).substring(0, 6) + '...' : filtersSproductId(item.productList) }}
 				</view>
 				<view class="">
-					<up-button shape="circle" type="primary" size="mini" color="#999"
-						@tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})" :plain="true"
-						text="查看记录"></up-button>&nbsp;&nbsp;
-					<up-button type="primary" shape="circle" size="mini" @click="toggle(item)" :plain="true"
-						text="更多操作"></up-button>
+					<up-button
+						shape="circle"
+						type="primary"
+						size="mini"
+						color="#999"
+						@tap="toUrl('PAGES_VIEWRECORDS', { item: JSON.stringify(item) })"
+						:plain="true"
+						text="查看记录"
+					></up-button>
+					&nbsp;&nbsp;
+					<up-button type="primary" shape="circle" size="mini" @click="toggle(item)" :plain="true" text="更多操作"></up-button>
 				</view>
 			</view>
 		</view>
-		<view style="background-color: rgba(0,0,0,0); height: 200rpx;"></view>
+		<view style="background-color: rgba(0, 0, 0, 0); height: 200rpx"></view>
 	</view>
-	<view v-else style="text-align: center;">
-		<image src="./bg.png" style="width: 325rpx;height: 335rpx;" mode=""></image>
-		<view style="font-size: 28rpx;color: #999;">暂无数据</view>
+	<view v-else style="text-align: center">
+		<image src="./bg.png" style="width: 325rpx; height: 335rpx" mode=""></image>
+		<view style="font-size: 28rpx; color: #999">暂无数据</view>
 	</view>
 	<view class="ConsumablesBottom">
-		<view @tap="toUrl('PAGES_ADD_CONSUMABLES')"> 新增耗材 </view>
-		<view @tap="toUrl('PAGES_SUPPLIER')"> 供应商管理 </view>
+		<view @tap="toUrl('PAGES_ADD_CONSUMABLES')">新增耗材</view>
+		<view @tap="toUrl('PAGES_SUPPLIER')">供应商管理</view>
 	</view>
 	<my-reportDamage ref="reportDamage" title="耗材报损" :item="report.data" @affirm="affirm"></my-reportDamage>
-
-	<up-popup :show="show" :round="18" mode="center" >
+	<up-popup :show="show" :round="18" mode="center">
 		<view class="zhezhaopop">
 			<view class="">
 				<span></span>
 				<span></span>
-				<up-icon @tap="show=false" name="close-circle-fill"></up-icon>
+				<up-icon @tap="show = false" name="close-circle-fill"></up-icon>
 			</view>
 			<view class="">
-				{{showData}}
+				{{ showData }}
 			</view>
 		</view>
 	</up-popup>
-	<up-action-sheet :round="10" @select="actionSelect" @close="actions.show = false" cancelText="取消" :actions="actions.list"
-		:show="actions.show"></up-action-sheet>
-	<up-picker :show="pageData.show" :columns="pageData.typeList" keyName="name" @cancel="pageData.show=false" @confirm="confirmConsGroup" ></up-picker>
+	<up-action-sheet :round="10" @select="actionSelect" @close="actions.show = false" cancelText="取消" :actions="actions.list" :show="actions.show"></up-action-sheet>
+	<up-picker :show="pageData.show" :columns="pageData.typeList" keyName="name" @cancel="pageData.show = false" @confirm="confirmConsGroup"></up-picker>
+	<!-- 批量入库悬浮按钮 -->
+	<view class="fixed-in-btn" @click="toBatchPage">
+		<image class="img" src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/bd8cde310fc247f6855ad39fbda4d75d.png" mode="widthFix"></image>
+	</view>
 </template>
 
 <script setup>
-	import { onShow, onLoad } from '@dcloudio/uni-app'
-	import { ref, reactive, computed } from 'vue';
-	import myReportDamage from './components/my-reportDamage';
+import { onShow, onLoad } from '@dcloudio/uni-app';
+import { ref, reactive, computed } from 'vue';
+import myReportDamage from './components/my-reportDamage';
 
-	import go from '@/commons/utils/go.js';
-	import { hasPermission } from '@/commons/utils/hasPermission.js';
-	import { getConsPage,getConsGrpupList } from '@/http/api/cons.js';
-	
-	let reportDamage = ref(null)
-	let show = ref(false)
-	let showData = ref()
-	const report = reactive({
-		data: {
-			name: "美式咖啡",
-			unit: "杯",
-		},
-	})
-	let pageData = reactive({
-		show: false,
-		query: {
-			conName: '',
-			consGroupId: '',
-			size: 100,
-			page: 1
-		},
-		list: [],
-		// 类型列表
-		typeList: [],
-		title: '耗材类型'
-	})
+import go from '@/commons/utils/go.js';
+import { hasPermission } from '@/commons/utils/hasPermission.js';
+import { getConsPage, getConsGrpupList } from '@/http/api/cons.js';
 
-	/**
-	 * 更多操作列表
-	 */
-	const actions = reactive({
-		list: [
-			{ name: '报损', color: 'red', fontSize: '16' }, 
-			{ name: '编辑', color: '#333', fontSize: '16' },
-			{ name: '清点', color: '#333', fontSize: '16' },
-			{ name: '入库', color: '#333', fontSize: '16' },
-			{ name: '出库', color: '#333', fontSize: '16' },
-		],
-		data: null,
-		show: false,
-	})
+let reportDamage = ref(null);
+let show = ref(false);
+let showData = ref();
+const report = reactive({
+	data: {
+		name: '美式咖啡',
+		unit: '杯'
+	}
+});
+let pageData = reactive({
+	show: false,
+	query: {
+		conName: '',
+		consGroupId: '',
+		size: 100,
+		page: 1
+	},
+	list: [],
+	// 类型列表
+	typeList: [],
+	title: '耗材类型'
+});
 
-	onShow(() => {
-		getList()
-		gettbConsTypeList()
-	})
+/**
+ * 更多操作列表
+ */
+const actions = reactive({
+	list: [
+		{ name: '报损', color: 'red', fontSize: '16' },
+		{ name: '编辑', color: '#333', fontSize: '16' },
+		{ name: '清点', color: '#333', fontSize: '16' },
+		{ name: '入库', color: '#333', fontSize: '16' },
+		{ name: '出库', color: '#333', fontSize: '16' }
+	],
+	data: null,
+	show: false
+});
 
-	/**
-	 * 获取耗材列表
-	 */
-	async function getList() {
-		getConsPage(pageData.query).then(res => {
-			pageData.list = res.records
-		})
-	}
-	
-	/**
-	 * 获取耗材类别
-	 */
-	let gettbConsTypeList = () => {
-		getConsGrpupList({
-			page: 1,
-			size: 30,
-		}).then(res => {
-			pageData.typeList = [[{name:'全部',id:''},...res]]
-		})
-	}
-	
-	function confirmConsGroup(e){
-		pageData.show = false
-		pageData.query.consGroupId = e.value[0].id
-		pageData.title = e.value[0].name
-		getList()
-	}
+onShow(() => {
+	getList();
+	gettbConsTypeList();
+});
 
-	/**
-	 * 报损确认
-	 */
-	function affirm() {
-		uni.showToast({
-			title:'操作成功',
-			icon:'none'
-		})
-		getList()
-		// 获取分类列表
-		gettbConsTypeList()
-	}
+// 跳转去批量入库
+function toBatchPage() {
+	uni.navigateTo({
+		url: '/pageConsumables/batch_in'
+	});
+}
 
-	let toggle = (d) => {
-		// refMoreSheet.value.open()
-		actions.show = true;
-		actions.actions = d
-		report.data.consId = d.id
-	}
+/**
+ * 获取耗材列表
+ */
+async function getList() {
+	getConsPage(pageData.query).then((res) => {
+		pageData.list = res.records;
+	});
+}
 
-	let actionSelect = ( e ) => {
-		if ( e.name == '报损' ) {
-			// 权限
-			hasPermission('允许提交报损').then(ele => {
-				if (ele) {
-					//打开报损弹窗
-					reportDamage.value.open(actions.actions.id);
-					report.data.name = actions.actions.conName
-					report.data.unit = actions.actions.conUnit
-				}
-			})
-		} else if ( e.name == '编辑' ) {
-			toUrl('PAGES_ADD_CONSUMABLES', {
-				item: JSON.stringify(actions.actions)
-			})
-		} else if ( e.name == '清点' ) {
-			hasPermission('允许耗材盘点').then(ele => {
-				if (ele) {
-					toUrl('PAGES_SALES_INVENTORYCHECK', {
-						item: JSON.stringify(actions.actions)
-					})
-				}
-			})
-		} else if ( e.name == '入库' ) {
-			hasPermission('允许耗材入库').then(ele => {
-				if (ele) {
-					toUrl('PAGES_SALES_WAREHOUSEENTRY', {
-						consId: actions.actions.id,
-						item: JSON.stringify(actions.actions)
-					})
-				}
-			})
-		} else if ( e.name == '出库' ) {
-			hasPermission('允许耗材出库').then(ele => {
-				if (ele) {
-					toUrl('PAGES_SALES_OUTBOUND', {
-						consId: actions.actions.id,
-						item: JSON.stringify(actions.actions)
-					})
-				}
-			})
-		}
-	}
-	
-	function inputEvent(d) {
-		pageData.query.conName = d.detail.value.replace(/\s*/g, "");
-		getList()
-	}
+/**
+ * 获取耗材类别
+ */
+let gettbConsTypeList = () => {
+	getConsGrpupList({
+		page: 1,
+		size: 30
+	}).then((res) => {
+		pageData.typeList = [[{ name: '全部', id: '' }, ...res]];
+	});
+};
 
-	function filtersSproductId(d) {
-		if (!d) return ''
-		// const dataArr = d.split(',')
-		let str = ''
-		d.forEach(ele => {
-			// str += ele.name
-			// const startIndex = ele.indexOf('_')
-			// const productId = ele.slice(0, startIndex)
-			// const productName = ele.slice(startIndex + 1, ele.length)
-			str = ele.name + ',' + str
-		})
-		return str
-	}
-	let toUrl = (url, d) => {
-		go.to(url, d)
+function confirmConsGroup(e) {
+	pageData.show = false;
+	pageData.query.consGroupId = e.value[0].id;
+	pageData.title = e.value[0].name;
+	getList();
+}
+
+/**
+ * 报损确认
+ */
+function affirm() {
+	uni.showToast({
+		title: '操作成功',
+		icon: 'none'
+	});
+	getList();
+	// 获取分类列表
+	gettbConsTypeList();
+}
+
+let toggle = (d) => {
+	// refMoreSheet.value.open()
+	actions.show = true;
+	actions.actions = d;
+	report.data.consId = d.id;
+};
+
+let actionSelect = (e) => {
+	if (e.name == '报损') {
+		// 权限
+		hasPermission('允许提交报损').then((ele) => {
+			if (ele) {
+				//打开报损弹窗
+				reportDamage.value.open(actions.actions.id);
+				report.data.name = actions.actions.conName;
+				report.data.unit = actions.actions.conUnit;
+			}
+		});
+	} else if (e.name == '编辑') {
+		toUrl('PAGES_ADD_CONSUMABLES', {
+			item: JSON.stringify(actions.actions)
+		});
+	} else if (e.name == '清点') {
+		hasPermission('允许耗材盘点').then((ele) => {
+			if (ele) {
+				toUrl('PAGES_SALES_INVENTORYCHECK', {
+					item: JSON.stringify(actions.actions)
+				});
+			}
+		});
+	} else if (e.name == '入库') {
+		hasPermission('允许耗材入库').then((ele) => {
+			if (ele) {
+				toUrl('PAGES_SALES_WAREHOUSEENTRY', {
+					consId: actions.actions.id,
+					item: JSON.stringify(actions.actions)
+				});
+			}
+		});
+	} else if (e.name == '出库') {
+		hasPermission('允许耗材出库').then((ele) => {
+			if (ele) {
+				toUrl('PAGES_SALES_OUTBOUND', {
+					consId: actions.actions.id,
+					item: JSON.stringify(actions.actions)
+				});
+			}
+		});
 	}
+};
+
+function inputEvent(d) {
+	pageData.query.conName = d.detail.value.replace(/\s*/g, '');
+	getList();
+}
+
+function filtersSproductId(d) {
+	if (!d) return '';
+	// const dataArr = d.split(',')
+	let str = '';
+	d.forEach((ele) => {
+		// str += ele.name
+		// const startIndex = ele.indexOf('_')
+		// const productId = ele.slice(0, startIndex)
+		// const productName = ele.slice(startIndex + 1, ele.length)
+		str = ele.name + ',' + str;
+	});
+	return str;
+}
+let toUrl = (url, d) => {
+	go.to(url, d);
+};
 </script>
 <style>
-	page {
-		background-color: #f9f9f9;
-	}
+page {
+	background-color: #f9f9f9;
+}
 </style>
 <style scoped lang="less">
-	ul,
-	li {
-		list-style: none;
-		padding: 0;
+ul,
+li {
+	list-style: none;
+	padding: 0;
+}
+
+.ConsumablesTop {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	padding-bottom: 22rpx;
+	background-color: #fff;
+
+	> view:first-child,
+	> view:last-child {
+		font-size: 24rpx;
+		font-family: Source Han Sans CN, Source Han Sans CN;
+		font-weight: 500;
+		color: #333333;
 	}
 
-	.ConsumablesTop {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		padding-bottom: 22rpx;
-		background-color: #fff;
+	> view:last-child {
+		color: #318afe;
+	}
 
-		>view:first-child,
-		>view:last-child {
-			font-size: 24rpx;
+	> view:nth-child(2) {
+		width: 414rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		display: flex;
+		align-items: center;
+
+		background: #f9f9f9;
+		border-radius: 32rpx 32rpx 32rpx 32rpx;
+
+		font-family: Source Han Sans CN, Source Han Sans CN;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #999999;
+	}
+}
+
+.ConsumablesConent {
+	min-height: 80vh;
+	background-color: #f9f9f9;
+	padding-top: 1rpx;
+
+	> view {
+		width: 694rpx;
+		height: 332rpx;
+		background: #ffffff;
+		border-radius: 10rpx 10rpx 10rpx 10rpx;
+		padding: 32rpx 16rpx;
+		box-sizing: border-box;
+		margin: 32rpx auto;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+
+		> view:first-child {
 			font-family: Source Han Sans CN, Source Han Sans CN;
 			font-weight: 500;
+			font-size: 24rpx;
 			color: #333333;
-		}
+			.df;
 
-		>view:last-child {
-			color: #318AFE;
-		}
-
-		>view:nth-child(2) {
-			width: 414rpx;
-			height: 60rpx;
-			line-height: 60rpx;
-			display: flex;
-			align-items: center;
-
-			background: #F9F9F9;
-			border-radius: 32rpx 32rpx 32rpx 32rpx;
-
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #999999;
-
-		}
-	}
-
-	.ConsumablesConent {
-		min-height: 80vh;
-		background-color: #f9f9f9;
-		padding-top: 1rpx;
-
-		>view {
-			width: 694rpx;
-			height: 332rpx;
-			background: #FFFFFF;
-			border-radius: 10rpx 10rpx 10rpx 10rpx;
-			padding: 32rpx 16rpx;
-			box-sizing: border-box;
-			margin: 32rpx auto;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-
-			>view:first-child {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #333333;
-				.df;
-
-				>view {
-					// width: 90rpx;
-					padding: 2rpx 10rpx;
-					height: 36rpx;
-					line-height: 36rpx;
-					background: #EBF4FC;
-					border-radius: 4rpx 4rpx 4rpx 4rpx;
-					text-align: center;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #318AFE;
-					margin-left: 12rpx;
-				}
-			}
-
-			>view:nth-child(2) {
-				width: 662rpx;
-				height: 128rpx;
-				background: #F9F9F9;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				.df;
-				justify-content: space-around;
+			> view {
+				// width: 90rpx;
+				padding: 2rpx 10rpx;
+				height: 36rpx;
+				line-height: 36rpx;
+				background: #ebf4fc;
+				border-radius: 4rpx 4rpx 4rpx 4rpx;
 				text-align: center;
-
 				font-family: Source Han Sans CN, Source Han Sans CN;
 				font-weight: 400;
 				font-size: 24rpx;
-				color: #666666;
+				color: #318afe;
+				margin-left: 12rpx;
 			}
+		}
 
-			>view:last-child {
+		> view:nth-child(2) {
+			width: 662rpx;
+			height: 128rpx;
+			background: #f9f9f9;
+			border-radius: 12rpx 12rpx 12rpx 12rpx;
+			.df;
+			justify-content: space-around;
+			text-align: center;
+
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #666666;
+		}
+
+		> view:last-child {
+			.df;
+			justify-content: space-between;
+
+			> view:last-child {
 				.df;
-				justify-content: space-between;
 
-				>view:last-child {
-					.df;
+				> button {
+					width: 128rpx;
+					height: 48rpx;
+					background: #ffffff;
+					// border-radius: 28rpx 28rpx 28rpx 28rpx;
+				}
 
-					>button {
-						width: 128rpx;
-						height: 48rpx;
-						background: #FFFFFF;
-						// border-radius: 28rpx 28rpx 28rpx 28rpx;
-					}
-
-					>button:last-child {
-						margin-left: 24rpx;
-					}
+				> button:last-child {
+					margin-left: 24rpx;
 				}
 			}
 		}
 	}
+}
 
-	.ConsumablesBottom {
-		.df;
-		position: fixed;
-		bottom: 20rpx;
-		left: 50%;
-		transform: translateX(-50%);
+.ConsumablesBottom {
+	.df;
+	position: fixed;
+	bottom: 20rpx;
+	left: 50%;
+	transform: translateX(-50%);
 
-		>view {
-			width: 346rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			border: 2rpx solid #318AFE;
+	> view {
+		width: 346rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		border: 2rpx solid #318afe;
 
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 500;
-			font-size: 32rpx;
-		}
-
-		>view:first-child {
-			border-radius: 56rpx 0rpx 0rpx 56rpx;
-			color: #318AFE;
-			background-color: #fff;
-		}
-
-		>view:last-child {
-			border-radius: 0 56rpx 56rpx 0;
-			background-color: #318AFE;
-			color: #fff;
-		}
+		font-family: Source Han Sans CN, Source Han Sans CN;
+		font-weight: 500;
+		font-size: 32rpx;
 	}
 
-	.popup-content {
-		padding: 15px;
+	> view:first-child {
+		border-radius: 56rpx 0rpx 0rpx 56rpx;
+		color: #318afe;
 		background-color: #fff;
-		margin: 0 auto;
+	}
 
-		>view {
+	> view:last-child {
+		border-radius: 0 56rpx 56rpx 0;
+		background-color: #318afe;
+		color: #fff;
+	}
+}
+
+.popup-content {
+	padding: 15px;
+	background-color: #fff;
+	margin: 0 auto;
+
+	> view {
+		height: 88rpx;
+		line-height: 88rpx;
+		width: 660rpx;
+		border-top: 10rpx solid #f9f9f9;
+		text-align: center;
+	}
+
+	.operate {
+		> view {
 			height: 88rpx;
 			line-height: 88rpx;
-			width: 660rpx;
-			border-top: 10rpx solid #f9f9f9;
 			text-align: center;
-		}
-
-		.operate {
-			>view {
-				height: 88rpx;
-				line-height: 88rpx;
-				text-align: center;
-				width: 660rpx;
-				border-bottom: 2rpx solid #E5E5E5;
-
-			}
+			width: 660rpx;
+			border-bottom: 2rpx solid #e5e5e5;
 		}
 	}
+}
 
-	.status {
-		position: absolute;
-		// top: 100%;
-		left: 0;
-		right: 0;
-		z-index: 10;
-		background-color: #fff;
-	}
+.status {
+	position: absolute;
+	// top: 100%;
+	left: 0;
+	right: 0;
+	z-index: 10;
+	background-color: #fff;
+}
 
-	.zhezhaopop {
-		padding: 34rpx 32rpx;
-		width: 594rpx;
+.zhezhaopop {
+	padding: 34rpx 32rpx;
+	width: 594rpx;
 
-		>view:first-child {
+	> view:first-child {
+		.df;
+		justify-content: space-between;
 
-			.df;
-			justify-content: space-between;
-
-			>span:nth-child(2) {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #333333;
-			}
+		> span:nth-child(2) {
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #333333;
 		}
-
 	}
+}
 
-	.df() {
-		display: flex;
-		align-items: center;
+.df() {
+	display: flex;
+	align-items: center;
+}
+.fixed-in-btn {
+	position: fixed;
+	right: 20upx;
+	bottom: 20%;
+	z-index: 999;
+	.img {
+		width: 120upx;
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/pageMarket/groupGoods/components/goodsList.vue b/pageMarket/groupGoods/components/goodsList.vue
index c967cec..89f3ff1 100644
--- a/pageMarket/groupGoods/components/goodsList.vue
+++ b/pageMarket/groupGoods/components/goodsList.vue
@@ -42,6 +42,9 @@
 					</view>
 				</view>
 				<view class="footer-wrap" v-if="item.shopId == shopInfo.id">
+					<view class="btn">
+						<button class="wx-btn" type="primary" open-type="share" @click="setShareOptions(item)">分享</button>
+					</view>
 					<template v-if="!item.onlineStatus">
 						<view class="btn">
 							<u-button shape="circle" @click="delHandle(item)">删除</u-button>
@@ -77,6 +80,13 @@
 <script setup>
 import { onMounted, reactive, ref } from 'vue';
 import { getGbWarePage, editOnlineStatus, deleteGbWare } from '@/http/api/ware.js';
+
+const emits = defineEmits(['share']);
+function setShareOptions(item) {
+	item.wareImgs = item.wareImgs.split(',');
+	emits('share', item);
+}
+
 const shopInfo = ref('');
 
 const props = defineProps({
@@ -281,6 +291,13 @@ onMounted(() => {
 			gap: 28upx;
 			.btn {
 				width: 140upx;
+				.wx-btn {
+					border-radius: 100px;
+					height: 40px;
+					line-height: 40px;
+					font-size: 28upx;
+					background-color: #318afe;
+				}
 			}
 		}
 	}
diff --git a/pageMarket/groupGoods/index.vue b/pageMarket/groupGoods/index.vue
index 1ecd346..025ff6e 100644
--- a/pageMarket/groupGoods/index.vue
+++ b/pageMarket/groupGoods/index.vue
@@ -18,7 +18,7 @@
 			</view>
 		</view>
 		<view class="content">
-			<goodsList ref="goodsListRef" name="goodsList" key="goodsList" :top="headHeight + 54" v-if="tabsActive == 0" />
+			<goodsList ref="goodsListRef" name="goodsList" key="goodsList" :top="headHeight + 54" v-if="tabsActive == 0" @share="shareCallback" />
 			<orderList ref="orderListRef" name="orderList" key="orderList" :top="headHeight + 54" v-if="tabsActive == 1" />
 		</view>
 		<my-footer-btn confirmText="添加" v-if="tabsActive == 0" @confirm="toAdd"></my-footer-btn>
@@ -27,13 +27,33 @@
 
 <script setup>
 import { ref, watch } from 'vue';
-import { onLoad, onShow, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
+import { onLoad, onShow, onReachBottom, onPullDownRefresh, onShareAppMessage } from '@dcloudio/uni-app';
 import goodsList from './components/goodsList.vue';
 import orderList from './components/orderList.vue';
 import { upShopConfig } from '@/http/api/ware.js';
 import { getShopInfo } from '@/http/api/shop.js';
 import { isMainShop } from '@/store/account.js';
 
+const path = '/pageMarket/groupGoods/share';
+const shareOptions = ref({
+	title: '',
+	path: '',
+	imageUrl: ''
+});
+
+onShareAppMessage(() => {
+	console.log(shareOptions.value);
+	return shareOptions.value;
+});
+
+function shareCallback(item) {
+	console.log('shareCallback', item);
+
+	shareOptions.value.title = item.wareName;
+	shareOptions.value.path = `${path}?shopId=${item.shopId}&id=${item.id}`;
+	shareOptions.value.imageUrl = item.wareImgs[0];
+}
+
 const goodsListRef = ref(null);
 const orderListRef = ref(null);
 
diff --git a/pageMarket/groupGoods/share.vue b/pageMarket/groupGoods/share.vue
new file mode 100644
index 0000000..5503a32
--- /dev/null
+++ b/pageMarket/groupGoods/share.vue
@@ -0,0 +1,531 @@
+<!-- 套餐分享页 -->
+<template>
+	<view class="color-333 u-font-28 min-page bg-f7" v-if="item.id">
+		<view class="relative">
+			<up-swiper height="428rpx" :list="item.wareImgs.split(',')" @click="prveImg"></up-swiper>
+			<view class="share-box">
+				分享
+				<button class="share" open-type="share" @click="shareCallback">分享</button>
+			</view>
+		</view>
+		<view class="sku">
+			<view class="u-flex u-col-center">
+				<text class="price">¥{{ item.groupPrice }}</text>
+				<text class="old-price">¥{{ item.originalPrice }}</text>
+			</view>
+			<view>
+				<view class="u-m-t-16 text" v-if="item.limitBuyNum">限购{{ item.limitBuyNum }}份</view>
+				<view class="text u-m-t-10">已售：{{ item.saleNum || 0 }}</view>
+			</view>
+		</view>
+		<view class="goods">
+			<view class="goods-name">{{ item.wareName }}</view>
+			<!-- <view class="u-m-t-20 color-666">
+				{{ item.description }}
+			</view> -->
+		</view>
+		<view class="bg-f7" style="height: 32rpx"></view>
+		<view class="desc">
+			<view class="u-flex">
+				<view class="color-666 no-wrap" style="min-width: 180rpx">可核销门店：</view>
+				<view class="">{{ item.shopName }}</view>
+			</view>
+			<view class="u-flex u-m-t-16 u-col-baseline">
+				<view class="color-666 no-wrap" style="min-width: 180rpx">门店地址：</view>
+				<view class="">{{ item.shopAddress }}</view>
+			</view>
+		</view>
+		<!-- <template v-if="flase">
+			<view class="bg-f7" style="height: 32rpx"></view>
+			<view class="groups">
+				<view class="color-000 u-m-b-28 u-font-32 font-700">立即拼团</view>
+				<view class="item u-flex" v-for="(item, index) in item.gbOrderList" :key="index">
+					<up-avatar size="76rpx" :src="item.avatar"></up-avatar>
+					<view class="u-flex u-flex-1 u-p-l-22 u-col-center u-row-between">
+						<view>
+							<view class="color-000 u-line-1" style="max-width: 180rpx">{{ item.nickName }}</view>
+							<view class="main-color u-m-t-2">差{{ returnNeedPerpole(item) }}人拼成</view>
+						</view>
+						<view class="u-m-t-22">
+							<text class="color-666">剩余：</text>
+							<text class="main-color">{{ getRemainingHMS(item) }}</text>
+						</view>
+
+						<view class="btn" @click="fastBuy(item)">快速拼成</view>
+					</view>
+				</view>
+			</view>
+		</template> -->
+		<!-- <view class="bg-f7" style="height: 24rpx"></view>
+		<view class="goods-group">
+			<view class="u-flex u-row-between">
+				<view class="name">套餐商品</view>
+				<view class="u-flex color-666" @click="showGroup = !showGroup" style="align-items: baseline">
+					<text class="u-m-r-18">{{ showGroup ? '收起' : '展开' }}</text>
+					<view class="guodu" :class="{ rotate: !showGroup }">
+						<up-icon name="arrow-down" bold></up-icon>
+					</view>
+				</view>
+			</view>
+			<view class="" v-if="showGroup">
+				<view class="u-m-t-48" v-for="(item, index) in item.packageContent" :key="index">
+					<view class="font-bold">
+						<text class="">{{ item.name }}</text>
+						<text class="u-m-l-30">{{ item.packageProducts.length }}选{{ item.num }}</text>
+					</view>
+					<view class="">
+						<view class="u-flex u-m-t-24 u-row-between" v-for="(goods, goodsIndex) in item.packageProducts" :key="goodsIndex">
+							<text>{{ goods.name }}</text>
+							<view class="u-flex text-right">
+								<text class="color-666 u-m-r-42">x{{ goods.num }}</text>
+								<view style="min-width: 110rpx">¥{{ goods.price }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="desc" v-if="item.tieredDiscount && item.tieredDiscount.length > 0">
+			<view class="u-flex u-row-between">
+				<view class="name">分享说明</view>
+				<view class="u-flex color-666" @click="showDesc = !showDesc" style="align-items: baseline">
+					<text class="u-m-r-18">{{ showDesc ? '收起' : '展开' }}</text>
+					<view class="guodu" :class="{ rotate: !showDesc }">
+						<up-icon name="arrow-down" bold></up-icon>
+					</view>
+				</view>
+			</view>
+			<template v-if="showDesc">
+				<view class="u-m-t-26 text-center table">
+					<view class="u-flex header color-666">
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">分享人数</view>
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">购买价格（元）</view>
+					</view>
+					<view class="u-flex row" v-for="(step, index) in item.tieredDiscount" :key="index">
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">{{ step.peopleNum }}</view>
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">¥{{ step.price }}</view>
+					</view>
+				</view>
+
+				<view class="u-m-t-26">
+					<view>分享期限（小时）：{{ item.expireHours }}</view>
+					<view class="u-m-t-10">规定期限内的助力才会被计入</view>
+					<view class="u-m-t-40">如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可</view>
+				</view>
+			</template>
+		</view>
+		<view class="desc">
+			<view class="u-flex u-row-between">
+				<view class="name">使用说明</view>
+				<view class="u-flex color-666" @click="useDescShow = !useDescShow" style="align-items: baseline">
+					<text class="u-m-r-18">{{ useDescShow ? '收起' : '展开' }}</text>
+					<view class="guodu" :class="{ rotate: !useDescShow }">
+						<up-icon name="arrow-down" bold></up-icon>
+					</view>
+				</view>
+			</view>
+			<template v-if="useDescShow">
+				<view class="u-m-t-16 color-666">
+					<view>1、可用时间段：{{ canuseTime }}</view>
+					<view v-if="item.otherDesc">2、其他使用说明：{{ item.otherDesc }}</view>
+				</view>
+			</template>
+		</view> -->
+		<view class="goods-detail">
+			<view class="u-flex u-row-center">
+				<view class="title">商品详情</view>
+			</view>
+			<view class="u-m-t-32">
+				<image class="w-full" v-for="(item, index) in item.wareCommentImgs.split(',')" :key="index" mode="widthFix" :src="item"></image>
+			</view>
+		</view>
+		<my-footer-btn confirmColor="#E3AD7F" confirmText="立即参加" @confirm="toMiniApp"></my-footer-btn>
+	</view>
+</template>
+<script setup>
+import { ref, computed, reactive } from 'vue';
+import { onLoad, onShareAppMessage } from '@dcloudio/uni-app';
+import { wareDetail } from '@/http/api/ware.js';
+
+const showGroup = ref(true);
+const showDesc = ref(true);
+const useDescShow = ref(true);
+
+const canuseTime = computed(() => {
+	return item.useWeeks.join('、') + ' ' + item.useTimes;
+});
+
+function prveImg(index) {
+	uni.previewImage({
+		urls: coverImgs.value,
+		current: index
+	});
+}
+
+const query = reactive({
+	shopId: '',
+	id: ''
+});
+
+const coverImgs = ref([]);
+const item = reactive({
+	goodsDescription: []
+});
+
+function getDetail() {
+	wareDetail({
+		shopId: query.shopId,
+		wareId: query.id
+	}).then((res) => {
+		Object.assign(item, res);
+		coverImgs.value = res.images;
+	});
+}
+
+onLoad((options) => {
+	if (options.id) {
+		query.id = options.id;
+		query.shopId = options.shopId;
+		getDetail();
+	}
+});
+
+const path = '/pageMarket/packagePopularize/share';
+const shareOptions = ref({
+	title: '',
+	path: '',
+	imageUrl: ''
+});
+
+function shareCallback() {
+	shareOptions.value.title = item.packageName;
+	shareOptions.value.path = `${path}?shopId=${item.shopId}&id=${item.id}`;
+	shareOptions.value.imageUrl = item.images[0];
+}
+
+onShareAppMessage(() => {
+	console.log('onShareAppMessage', shareOptions.value);
+	return shareOptions.value;
+});
+
+// 跳转到用户小程序
+function toMiniApp() {
+	uni.navigateToMiniProgram({
+		appId: 'wxd88fffa983758a30',
+		path: `/groupBuying/goodsDetail/goodsDetail?wareId=${query.id}&shopId=${query.shopId}`,
+		envVersion: 'release', // 环境版本：release(正式版)、trial(体验版)、develop(开发版)
+		success: () => {},
+		fail: () => {}
+	});
+}
+</script>
+
+<style lang="scss" scoped>
+$topHeight: 350rpx;
+
+.top-img {
+	width: 750rpx;
+	height: $topHeight;
+}
+
+.top {
+	margin: 14rpx 18rpx;
+	background-size: cover;
+	height: $topHeight;
+	box-sizing: border-box;
+	padding-left: 70rpx;
+	padding-top: 95rpx;
+
+	.name {
+		color: #000000;
+		font-size: 36rpx;
+		font-weight: 700;
+	}
+
+	.info {
+		color: #333333;
+		font-size: 48rpx;
+		font-weight: 700;
+		margin-top: 62rpx;
+	}
+}
+
+.sku {
+	display: flex;
+	justify-content: space-between;
+	padding: 20rpx 36rpx;
+	align-items: center;
+	background: linear-gradient(90deg, #ff4a63 0%, #fd1f48 100%);
+
+	.price {
+		color: #fff;
+		font-weight: 700;
+		font-size: 40rpx;
+	}
+
+	.old-price {
+		margin-left: 16rpx;
+		color: #e7e7e7;
+		opacity: 0.85;
+		font-weight: 700;
+		text-decoration: line-through;
+	}
+
+	.text {
+		color: #fff;
+		font-size: 28rpx;
+	}
+}
+
+.goods {
+	padding: 20rpx 28rpx;
+	background: #fff;
+
+	.goods-name {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #333;
+	}
+}
+
+.desc {
+	padding: 32rpx 28rpx;
+	background-color: #fff;
+}
+
+.goods-detail {
+	padding: 32rpx;
+
+	.title {
+		position: relative;
+		padding: 0 22rpx;
+
+		&::before {
+			content: '';
+			display: block;
+			position: absolute;
+			right: 100%;
+			width: 70rpx;
+			height: 2rpx;
+			top: 50%;
+			transform: translateY(-50%);
+			background: linear-gradient(90deg, #f7f8f9 0%, #c9cbcc 100%);
+		}
+
+		&::after {
+			left: 100%;
+			content: '';
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			display: block;
+			width: 70rpx;
+			height: 2rpx;
+			background: linear-gradient(90deg, #c9cbcc 0%, #f7f8f9 100%);
+		}
+	}
+}
+
+.fixed-bottom {
+	position: fixed;
+	left: 98rpx;
+	right: 98rpx;
+	padding-bottom: 30px;
+	padding-top: 32rpx;
+	bottom: 0;
+	z-index: 10;
+
+	.btn {
+		padding: 22rpx;
+		border-radius: 200rpx;
+		font-size: 32rpx;
+		color: #fff;
+		width: 556rpx;
+		text-align: center;
+		background-color: #e8ad7b;
+		border: 1px solid transparent;
+
+		&.gray {
+			background: #fff;
+			color: #e8ad7b;
+			border-color: #e8ad7b;
+		}
+	}
+}
+
+.waring {
+	background-color: rgba(255, 204, 0, 0.09);
+	padding: 32rpx 24rpx;
+	color: #ff8d28;
+}
+
+.popup-content {
+	font-size: 28rpx;
+	min-height: 300px;
+
+	.popup-content-top {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.goods-info {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+
+		.cover {
+			width: 184rpx;
+			height: 184rpx;
+			border-radius: 16rpx;
+			background: #d9d9d9;
+
+			&.bg-fff {
+				background-color: #fff;
+			}
+		}
+
+		.price {
+			font-size: 32rpx;
+			font-weight: 700;
+			color: #ed5a2e;
+			line-height: 46rpx;
+		}
+
+		.old-price {
+			font-size: 32rpx;
+			color: #999;
+			text-decoration-line: line-through;
+			line-height: 48rpx;
+		}
+
+		.limitBuyNum {
+			color: #666;
+			line-height: 42rpx;
+		}
+	}
+
+	.bottom {
+		padding: 20rpx;
+		border-bottom: 1px solid #ededed;
+
+		.price {
+			color: #ed5a2e;
+			font-size: 32rpx;
+			font-weight: 700;
+		}
+	}
+
+	.btn {
+		display: flex;
+		padding: 22rpx 214rpx;
+		align-items: flex-start;
+		gap: 20rpx;
+		border-radius: 66rpx;
+		background: #e8ad7b;
+		font-size: 32rpx;
+		color: #fff;
+		font-size: 700;
+	}
+}
+
+.w-full {
+	width: 100%;
+}
+
+.groups {
+	padding: 28rpx 22rpx;
+	background-color: #fff;
+
+	.item {
+		padding: 28rpx 0;
+		border-bottom: 2rpx solid #ededed;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.main-color {
+			color: #ed5a2e;
+		}
+
+		.btn {
+			padding: 8rpx 26rpx;
+			border-radius: 36rpx;
+			background: #e8ad7b;
+			font-weight: 700;
+			color: #fff;
+		}
+	}
+}
+
+.share-box {
+	top: 0;
+	position: absolute;
+	right: 0;
+	padding: 4rpx 30rpx;
+	border-radius: 0 0 0 24rpx;
+	color: #ed5a2e;
+	font-weight: 700;
+	background: #fff;
+	overflow: hidden;
+
+	.share {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		opacity: 0;
+	}
+}
+
+.goods-group {
+	padding: 32rpx 46rpx;
+	background-color: #fff;
+
+	.name {
+		font-weight: 700;
+		font-size: 32rpx;
+	}
+
+	.rotate {
+		transform: rotate(-90deg);
+	}
+}
+
+.desc {
+	padding: 32rpx 46rpx;
+	background-color: #fff;
+	margin-top: 32rpx;
+
+	.name {
+		font-weight: 700;
+		font-size: 32rpx;
+	}
+
+	.table {
+		border: 2rpx solid #ededed;
+		border-radius: 8rpx;
+		margin: 0 52rpx;
+
+		.header {
+			background: #f8f8f88f;
+		}
+
+		.row {
+			border-top: 2rpx solid #ededed;
+
+			&:first-child {
+				border-top: none;
+			}
+		}
+	}
+
+	.rotate {
+		transform: rotate(-90deg);
+	}
+}
+
+.guodu {
+	transition: all 0.3s;
+}
+</style>
diff --git a/pageMarket/packagePopularize/components/goodsList.vue b/pageMarket/packagePopularize/components/goodsList.vue
index 678b458..676574b 100644
--- a/pageMarket/packagePopularize/components/goodsList.vue
+++ b/pageMarket/packagePopularize/components/goodsList.vue
@@ -45,6 +45,9 @@
 					</view>
 				</view>
 				<view class="footer-wrap" v-if="item.shopId == shopInfo.id">
+					<view class="btn">
+						<button class="wx-btn" type="primary" open-type="share" @click="setShareOptions(item)">分享</button>
+					</view>
 					<template v-if="!item.onlineStatus">
 						<view class="btn">
 							<u-button shape="circle" @click="delHandle(item)">删除</u-button>
@@ -80,6 +83,12 @@
 <script setup>
 import { onMounted, reactive, ref } from 'vue';
 import { packageGet, packageOnline, packageDel } from '@/http/api/ware.js';
+
+const emits = defineEmits(['share']);
+function setShareOptions(item) {
+	emits('share', item);
+}
+
 const shopInfo = ref('');
 
 const props = defineProps({
@@ -290,6 +299,13 @@ onMounted(() => {
 			gap: 28upx;
 			.btn {
 				width: 140upx;
+				.wx-btn {
+					border-radius: 100px;
+					height: 40px;
+					line-height: 40px;
+					font-size: 28upx;
+					background-color: #318afe;
+				}
 			}
 		}
 	}
diff --git a/pageMarket/packagePopularize/index.vue b/pageMarket/packagePopularize/index.vue
index 6f3af5e..c55c233 100644
--- a/pageMarket/packagePopularize/index.vue
+++ b/pageMarket/packagePopularize/index.vue
@@ -19,7 +19,7 @@
 			</view>
 		</view>
 		<view class="content">
-			<goodsList ref="goodsListRef" name="goodsList" key="goodsList" :top="headHeight + 54" v-if="tabsActive == 0" />
+			<goodsList ref="goodsListRef" name="goodsList" key="goodsList" :top="headHeight + 54" v-if="tabsActive == 0" @share="shareCallback" />
 			<orderList ref="orderListRef" name="orderList" key="orderList" :top="headHeight + 54" v-if="tabsActive == 1" />
 		</view>
 		<my-footer-btn confirmText="添加" v-if="tabsActive == 0" @confirm="toAdd"></my-footer-btn>
@@ -28,11 +28,29 @@
 
 <script setup>
 import { ref, watch } from 'vue';
-import { onLoad, onShow, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
+import { onLoad, onShow, onReachBottom, onPullDownRefresh, onShareAppMessage } from '@dcloudio/uni-app';
 import goodsList from './components/goodsList.vue';
 import orderList from './components/orderList.vue';
 import { packageSwitchGet, packageSwitchPut } from '@/http/api/ware.js';
 
+const path = '/pageMarket/packagePopularize/share';
+const shareOptions = ref({
+	title: '',
+	path: '',
+	imageUrl: ''
+});
+
+onShareAppMessage(() => {
+	console.log(shareOptions.value);
+	return shareOptions.value;
+});
+
+function shareCallback(item) {
+	shareOptions.value.title = item.packageName;
+	shareOptions.value.path = `${path}?shopId=${item.shopId}&id=${item.id}`;
+	shareOptions.value.imageUrl = item.images[0];
+}
+
 const goodsListRef = ref(null);
 const orderListRef = ref(null);
 
diff --git a/pageMarket/packagePopularize/selectGoods.vue b/pageMarket/packagePopularize/selectGoods.vue
index 34eb245..3f17408 100644
--- a/pageMarket/packagePopularize/selectGoods.vue
+++ b/pageMarket/packagePopularize/selectGoods.vue
@@ -21,6 +21,7 @@ const list = ref([]);
 // 选择商品
 function selectGoods(item) {
 	uni.setStorageSync('packageSelectGoods', {
+		id: item.id,
 		coverImg: item.coverImg,
 		name: item.name,
 		price: returnPrice(item.skuList)
diff --git a/pageMarket/packagePopularize/share.vue b/pageMarket/packagePopularize/share.vue
new file mode 100644
index 0000000..d3978fe
--- /dev/null
+++ b/pageMarket/packagePopularize/share.vue
@@ -0,0 +1,528 @@
+<!-- 套餐分享页 -->
+<template>
+	<view class="color-333 u-font-28 min-page bg-f7" v-if="item.id">
+		<view class="relative">
+			<up-swiper height="428rpx" :list="item.images" @click="prveImg"></up-swiper>
+			<view class="share-box">
+				分享
+				<button class="share" open-type="share" @click="shareCallback">分享</button>
+			</view>
+		</view>
+		<view class="sku">
+			<view class="u-flex u-col-center">
+				<text class="price">¥{{ item.price }}</text>
+				<text class="old-price">¥{{ item.originPrice }}</text>
+			</view>
+			<view>
+				<view class="u-m-t-16 text" v-if="item.limitBuyNum">限购{{ item.limitBuyNum }}份</view>
+				<view class="text u-m-t-10">已售：{{ item.saleNum || 0 }}</view>
+			</view>
+		</view>
+		<view class="goods">
+			<view class="goods-name">{{ item.packageName }}</view>
+			<view class="u-m-t-20 color-666">
+				{{ item.description }}
+			</view>
+		</view>
+		<view class="bg-f7" style="height: 32rpx"></view>
+		<view class="desc">
+			<view class="u-flex">
+				<view class="color-666 no-wrap" style="min-width: 180rpx">可核销门店：</view>
+				<view class="">{{ item.shopName }}</view>
+			</view>
+			<view class="u-flex u-m-t-16 u-col-baseline">
+				<view class="color-666 no-wrap" style="min-width: 180rpx">门店地址：</view>
+				<view class="">{{ item.shopAddress }}</view>
+			</view>
+		</view>
+		<!-- <template v-if="flase">
+			<view class="bg-f7" style="height: 32rpx"></view>
+			<view class="groups">
+				<view class="color-000 u-m-b-28 u-font-32 font-700">立即拼团</view>
+				<view class="item u-flex" v-for="(item, index) in item.gbOrderList" :key="index">
+					<up-avatar size="76rpx" :src="item.avatar"></up-avatar>
+					<view class="u-flex u-flex-1 u-p-l-22 u-col-center u-row-between">
+						<view>
+							<view class="color-000 u-line-1" style="max-width: 180rpx">{{ item.nickName }}</view>
+							<view class="main-color u-m-t-2">差{{ returnNeedPerpole(item) }}人拼成</view>
+						</view>
+						<view class="u-m-t-22">
+							<text class="color-666">剩余：</text>
+							<text class="main-color">{{ getRemainingHMS(item) }}</text>
+						</view>
+
+						<view class="btn" @click="fastBuy(item)">快速拼成</view>
+					</view>
+				</view>
+			</view>
+		</template> -->
+		<view class="bg-f7" style="height: 24rpx"></view>
+		<view class="goods-group">
+			<view class="u-flex u-row-between">
+				<view class="name">套餐商品</view>
+				<view class="u-flex color-666" @click="showGroup = !showGroup" style="align-items: baseline">
+					<text class="u-m-r-18">{{ showGroup ? '收起' : '展开' }}</text>
+					<view class="guodu" :class="{ rotate: !showGroup }">
+						<up-icon name="arrow-down" bold></up-icon>
+					</view>
+				</view>
+			</view>
+			<view class="" v-if="showGroup">
+				<view class="u-m-t-48" v-for="(item, index) in item.packageContent" :key="index">
+					<view class="font-bold">
+						<text class="">{{ item.name }}</text>
+						<text class="u-m-l-30">{{ item.packageProducts.length }}选{{ item.num }}</text>
+					</view>
+					<view class="">
+						<view class="u-flex u-m-t-24 u-row-between" v-for="(goods, goodsIndex) in item.packageProducts" :key="goodsIndex">
+							<text>{{ goods.name }}</text>
+							<view class="u-flex text-right">
+								<text class="color-666 u-m-r-42">x{{ goods.num }}</text>
+								<view style="min-width: 110rpx">¥{{ goods.price }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="desc" v-if="item.tieredDiscount && item.tieredDiscount.length > 0">
+			<view class="u-flex u-row-between">
+				<view class="name">分享说明</view>
+				<view class="u-flex color-666" @click="showDesc = !showDesc" style="align-items: baseline">
+					<text class="u-m-r-18">{{ showDesc ? '收起' : '展开' }}</text>
+					<view class="guodu" :class="{ rotate: !showDesc }">
+						<up-icon name="arrow-down" bold></up-icon>
+					</view>
+				</view>
+			</view>
+			<template v-if="showDesc">
+				<view class="u-m-t-26 text-center table">
+					<view class="u-flex header color-666">
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">分享人数</view>
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">购买价格（元）</view>
+					</view>
+					<view class="u-flex row" v-for="(step, index) in item.tieredDiscount" :key="index">
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">{{ step.peopleNum }}</view>
+						<view class="u-flex-1 u-p-t-32 u-p-b-32">¥{{ step.price }}</view>
+					</view>
+				</view>
+
+				<view class="u-m-t-26">
+					<view>分享期限（小时）：{{ item.expireHours }}</view>
+					<view class="u-m-t-10">规定期限内的助力才会被计入</view>
+					<view class="u-m-t-40">如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可</view>
+				</view>
+			</template>
+		</view>
+		<view class="desc">
+			<view class="u-flex u-row-between">
+				<view class="name">使用说明</view>
+				<view class="u-flex color-666" @click="useDescShow = !useDescShow" style="align-items: baseline">
+					<text class="u-m-r-18">{{ useDescShow ? '收起' : '展开' }}</text>
+					<view class="guodu" :class="{ rotate: !useDescShow }">
+						<up-icon name="arrow-down" bold></up-icon>
+					</view>
+				</view>
+			</view>
+			<template v-if="useDescShow">
+				<view class="u-m-t-16 color-666">
+					<view>1、可用时间段：{{ canuseTime }}</view>
+					<view v-if="item.otherDesc">2、其他使用说明：{{ item.otherDesc }}</view>
+				</view>
+			</template>
+		</view>
+		<view class="goods-detail" v-if="item.goodsCategory != '优惠券'">
+			<view class="u-flex u-row-center">
+				<view class="title">商品详情</view>
+			</view>
+			<view class="u-m-t-32">
+				<image class="w-full" v-for="(item, index) in item.detailImages" :key="index" mode="widthFix" :src="item"></image>
+			</view>
+		</view>
+		<my-footer-btn confirmColor="#E3AD7F" confirmText="立即参加" @confirm="toMiniApp"></my-footer-btn>
+	</view>
+</template>
+<script setup>
+import { ref, computed, reactive } from 'vue';
+import { onLoad, onShareAppMessage } from '@dcloudio/uni-app';
+import { packageDetail } from '@/http/api/ware.js';
+
+const showGroup = ref(true);
+const showDesc = ref(true);
+const useDescShow = ref(true);
+
+const canuseTime = computed(() => {
+	return item.useWeeks.join('、') + ' ' + item.useTimes;
+});
+
+function prveImg(index) {
+	uni.previewImage({
+		urls: coverImgs.value,
+		current: index
+	});
+}
+
+const query = reactive({
+	shopId: '',
+	id: ''
+});
+
+const coverImgs = ref([]);
+const item = reactive({
+	goodsDescription: []
+});
+
+function getDetail() {
+	packageDetail(query).then((res) => {
+		Object.assign(item, res);
+		coverImgs.value = res.images;
+	});
+}
+
+onLoad((options) => {
+	if (options.id) {
+		query.id = options.id;
+		query.shopId = options.shopId;
+		getDetail();
+	}
+});
+
+const path = '/pageMarket/packagePopularize/share';
+const shareOptions = ref({
+	title: '',
+	path: '',
+	imageUrl: ''
+});
+
+function shareCallback() {
+	shareOptions.value.title = item.packageName;
+	shareOptions.value.path = `${path}?shopId=${item.shopId}&id=${item.id}`;
+	shareOptions.value.imageUrl = item.images[0];
+}
+
+onShareAppMessage(() => {
+	console.log('onShareAppMessage', shareOptions.value);
+	return shareOptions.value;
+});
+
+// 跳转到用户小程序
+function toMiniApp() {
+	uni.navigateToMiniProgram({
+		appId: 'wxd88fffa983758a30',
+		path: `/userPackage/goodsDetail/goodsDetail?id=${query.id}&shopId=${query.shopId}`,
+		envVersion: 'release', // 环境版本：release(正式版)、trial(体验版)、develop(开发版)
+		success: () => {},
+		fail: () => {}
+	});
+}
+</script>
+
+<style lang="scss" scoped>
+$topHeight: 350rpx;
+
+.top-img {
+	width: 750rpx;
+	height: $topHeight;
+}
+
+.top {
+	margin: 14rpx 18rpx;
+	background-size: cover;
+	height: $topHeight;
+	box-sizing: border-box;
+	padding-left: 70rpx;
+	padding-top: 95rpx;
+
+	.name {
+		color: #000000;
+		font-size: 36rpx;
+		font-weight: 700;
+	}
+
+	.info {
+		color: #333333;
+		font-size: 48rpx;
+		font-weight: 700;
+		margin-top: 62rpx;
+	}
+}
+
+.sku {
+	display: flex;
+	justify-content: space-between;
+	padding: 20rpx 36rpx;
+	align-items: center;
+	background: linear-gradient(90deg, #ff4a63 0%, #fd1f48 100%);
+
+	.price {
+		color: #fff;
+		font-weight: 700;
+		font-size: 40rpx;
+	}
+
+	.old-price {
+		margin-left: 16rpx;
+		color: #e7e7e7;
+		opacity: 0.85;
+		font-weight: 700;
+		text-decoration: line-through;
+	}
+
+	.text {
+		color: #fff;
+		font-size: 28rpx;
+	}
+}
+
+.goods {
+	padding: 20rpx 28rpx;
+	background: #fff;
+
+	.goods-name {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #333;
+	}
+}
+
+.desc {
+	padding: 32rpx 28rpx;
+	background-color: #fff;
+}
+
+.goods-detail {
+	padding: 32rpx;
+
+	.title {
+		position: relative;
+		padding: 0 22rpx;
+
+		&::before {
+			content: '';
+			display: block;
+			position: absolute;
+			right: 100%;
+			width: 70rpx;
+			height: 2rpx;
+			top: 50%;
+			transform: translateY(-50%);
+			background: linear-gradient(90deg, #f7f8f9 0%, #c9cbcc 100%);
+		}
+
+		&::after {
+			left: 100%;
+			content: '';
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			display: block;
+			width: 70rpx;
+			height: 2rpx;
+			background: linear-gradient(90deg, #c9cbcc 0%, #f7f8f9 100%);
+		}
+	}
+}
+
+.fixed-bottom {
+	position: fixed;
+	left: 98rpx;
+	right: 98rpx;
+	padding-bottom: 30px;
+	padding-top: 32rpx;
+	bottom: 0;
+	z-index: 10;
+
+	.btn {
+		padding: 22rpx;
+		border-radius: 200rpx;
+		font-size: 32rpx;
+		color: #fff;
+		width: 556rpx;
+		text-align: center;
+		background-color: #e8ad7b;
+		border: 1px solid transparent;
+
+		&.gray {
+			background: #fff;
+			color: #e8ad7b;
+			border-color: #e8ad7b;
+		}
+	}
+}
+
+.waring {
+	background-color: rgba(255, 204, 0, 0.09);
+	padding: 32rpx 24rpx;
+	color: #ff8d28;
+}
+
+.popup-content {
+	font-size: 28rpx;
+	min-height: 300px;
+
+	.popup-content-top {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+	}
+
+	.goods-info {
+		padding: 32rpx 28rpx;
+		border-bottom: 1px solid #ededed;
+
+		.cover {
+			width: 184rpx;
+			height: 184rpx;
+			border-radius: 16rpx;
+			background: #d9d9d9;
+
+			&.bg-fff {
+				background-color: #fff;
+			}
+		}
+
+		.price {
+			font-size: 32rpx;
+			font-weight: 700;
+			color: #ed5a2e;
+			line-height: 46rpx;
+		}
+
+		.old-price {
+			font-size: 32rpx;
+			color: #999;
+			text-decoration-line: line-through;
+			line-height: 48rpx;
+		}
+
+		.limitBuyNum {
+			color: #666;
+			line-height: 42rpx;
+		}
+	}
+
+	.bottom {
+		padding: 20rpx;
+		border-bottom: 1px solid #ededed;
+
+		.price {
+			color: #ed5a2e;
+			font-size: 32rpx;
+			font-weight: 700;
+		}
+	}
+
+	.btn {
+		display: flex;
+		padding: 22rpx 214rpx;
+		align-items: flex-start;
+		gap: 20rpx;
+		border-radius: 66rpx;
+		background: #e8ad7b;
+		font-size: 32rpx;
+		color: #fff;
+		font-size: 700;
+	}
+}
+
+.w-full {
+	width: 100%;
+}
+
+.groups {
+	padding: 28rpx 22rpx;
+	background-color: #fff;
+
+	.item {
+		padding: 28rpx 0;
+		border-bottom: 2rpx solid #ededed;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.main-color {
+			color: #ed5a2e;
+		}
+
+		.btn {
+			padding: 8rpx 26rpx;
+			border-radius: 36rpx;
+			background: #e8ad7b;
+			font-weight: 700;
+			color: #fff;
+		}
+	}
+}
+
+.share-box {
+	top: 0;
+	position: absolute;
+	right: 0;
+	padding: 4rpx 30rpx;
+	border-radius: 0 0 0 24rpx;
+	color: #ed5a2e;
+	font-weight: 700;
+	background: #fff;
+	overflow: hidden;
+
+	.share {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		opacity: 0;
+	}
+}
+
+.goods-group {
+	padding: 32rpx 46rpx;
+	background-color: #fff;
+
+	.name {
+		font-weight: 700;
+		font-size: 32rpx;
+	}
+
+	.rotate {
+		transform: rotate(-90deg);
+	}
+}
+
+.desc {
+	padding: 32rpx 46rpx;
+	background-color: #fff;
+	margin-top: 32rpx;
+
+	.name {
+		font-weight: 700;
+		font-size: 32rpx;
+	}
+
+	.table {
+		border: 2rpx solid #ededed;
+		border-radius: 8rpx;
+		margin: 0 52rpx;
+
+		.header {
+			background: #f8f8f88f;
+		}
+
+		.row {
+			border-top: 2rpx solid #ededed;
+
+			&:first-child {
+				border-top: none;
+			}
+		}
+	}
+
+	.rotate {
+		transform: rotate(-90deg);
+	}
+}
+
+.guodu {
+	transition: all 0.3s;
+}
+</style>
diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index ef6346b..af4826f 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -1,141 +1,142 @@
 <template>
 	<view class="u-p-30 safe-page min-page">
-		<up-sticky v-if="option.type==='edit'" offset-top="20" zIndex="99">
+		<up-sticky v-if="option.type === 'edit'" offset-top="20" zIndex="99">
 			<my-tabs :list="tabsList" v-model="tabsCurrent"></my-tabs>
 		</up-sticky>
 		<view class="box">
-
-			<template v-if="tabsCurrent===0">
+			<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">
+					<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 style="display: flex; flex-wrap: wrap; justify-content: flex-start">
+											<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>
-
 									</up-radio-group>
 								</uni-forms-item>
 							</view>
 
-							<view class="" v-if="FormData.type==='package'">
+							<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>
-								<view class="u-m-t-16 color-999 u-font-24">
-									注:第一张图为商品封面图，图片尺寸为750x750
-								</view>
+								<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'">
+							<template v-if="FormData.type === 'package'">
 								<view class="border-top" v-if="FormData.proGroupVo">
-									<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=" u-p-t-24" v-if="FormData.groupType==1">
+									<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="u-p-t-24" v-if="FormData.groupType == 1">
 												<view class="u-flex u-row-between">
 													<view class="u-flex">
 														<text class="color-red">*</text>
 														<text class="font-bold">套餐名称</text>
 													</view>
 
-													<view class="u-flex color-999 " @tap="delproGroupVo(index)">
-														<uni-icons type="minus-filled" :size="16"
-															:color="$utils.ColorRed"></uni-icons>
+													<view class="u-flex color-999" @tap="delproGroupVo(index)">
+														<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>
 											</view>
-											<view class="u-m-t-24" v-if="item.goods.length>0">
+											<view class="u-m-t-24" v-if="item.goods.length > 0">
 												<!-- <view class="font-bold">商品信息</view> -->
-												<view class="  u-font-24 table">
+												<view class="u-font-24 table">
 													<view class="u-flex title">
-														<view class="u-flex-1 ">名称</view>
+														<view class="u-flex-1">名称</view>
 														<view class="u-flex-1 u-text-center">规格</view>
 														<view class="u-flex-1 u-text-center">价格</view>
-														<view class=" u-flex-1 u-text-right">
+														<view class="u-flex-1 u-text-right">
 															<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 u-flex-1">
+													<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}}
+																{{ 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 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>
 																</template>
 																<template v-else>
-																	<text class="color-main">{{product.skuName}}</text>
+																	<text class="color-main">{{ product.skuName }}</text>
 																</template>
 															</view>
 														</view>
-														<view class=" u-flex u-flex-1 u-row-center">
-															<view class="  u-text-center ">
-																{{product.lowPrice||product.price}}
+														<view class="u-flex u-flex-1 u-row-center">
+															<view class="u-text-center">
+																{{ product.lowPrice || product.price }}
 															</view>
 														</view>
-														<view class=" u-flex u-text-right u-flex-1 u-row-right">
+														<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>
@@ -148,66 +149,59 @@
 																	</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>
-
 											</view>
-											<template v-if="FormData.groupType==1">
+											<template v-if="FormData.groupType == 1">
 												<view class="u-m-t-24">
 													<text class="color-red">*</text>
 													<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>
+									<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>
 											<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>
 								</view>
-
 							</template>
 
 							<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>
 						<template v-if="FormData.type == 'sku'">
 							<view class="block border-top-0 u-p-t-32 u-p-b-32">
-								<view class="u-flex u-row-between ">
+								<view class="u-flex u-row-between">
 									<view class="color-333 font-bold">
 										<text v-if="!skuList.list.length">选择规格</text>
 										<text v-else>编辑规格</text>
 									</view>
 									<view class="u-flex u-col-center" @tap="toGuige">
 										<view>
-											<text v-if="FormData.specName">{{FormData.specName}}</text>
+											<text v-if="FormData.specName">{{ FormData.specName }}</text>
 											<text class="color-999" v-else>请选择</text>
 										</view>
 										<view class="u-flex u-p-t-2">
@@ -215,15 +209,12 @@
 										</view>
 									</view>
 								</view>
-
 							</view>
-
 						</template>
 
-
 						<template v-if="FormData.type != 'sku'">
-							<view class="block u-p-t-32 u-p-b-32" v-for="(sku,index) in skuList.list" :key="index">
-								<view class=" font-bold u-m-b-32  u-text-center">规格属性</view>
+							<view class="block u-p-t-32 u-p-b-32" v-for="(sku, index) in skuList.list" :key="index">
+								<view class="font-bold u-m-b-32 u-text-center">规格属性</view>
 								<view class="u-flex w-full gap-26 u-row-between">
 									<view class="u-flex-1">
 										<view>
@@ -231,8 +222,7 @@
 											<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">
@@ -241,11 +231,9 @@
 											<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>
 								<view class="u-flex w-full gap-26 u-row-between u-m-t-24">
 									<view class="u-flex-1">
@@ -254,8 +242,7 @@
 											<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">
@@ -264,8 +251,7 @@
 											<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>
@@ -275,21 +261,16 @@
 										<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">
-									<view class="">
-										商品条形码
-									</view>
+									<view class="">商品条形码</view>
 									<view class="u-m-t-16 barCode color-999">
-										{{sku.barCode}}
+										{{ sku.barCode }}
 									</view>
 								</view>
-
 							</view>
-
 						</template>
 						<template v-if="FormData.type == 'weight'">
 							<view class="block u-p-t-32 u-p-b-32">
@@ -297,10 +278,10 @@
 									<text class="color-red">*</text>
 									<text>单位</text>
 								</view>
-								<view class=" u-m-t-16">
+								<view class="u-m-t-16">
 									<up-input v-model="FormData.weight">
 										<template #suffix>
-											<view class="bg-gray">{{activeinHouseList}}</view>
+											<view class="bg-gray">{{ activeinHouseList }}</view>
 										</template>
 									</up-input>
 									<view class="u-m-t-16 color-999 u-font-24">用于快递或配送运费计重</view>
@@ -308,20 +289,20 @@
 							</view>
 						</template>
 
-						<template v-if="FormData.type!='group'">
-							<view class="block ">
+						<template v-if="FormData.type != 'group'">
+							<view class="block">
 								<view>
 									<uni-forms-item label="">
 										<view class="u-flex u-row-between" @tap="toTimerPage">
-											<view style="display: flex;">
+											<view style="display: flex">
 												<text class="color-red">*</text>
 												<view class="label-title">定时上下架</view>
 											</view>
 											<view class="u-flex u-font-24">
 												<view>
-													<view class="color-666">{{returnTimerDayText()}}</view>
+													<view class="color-666">{{ returnTimerDayText() }}</view>
 													<view class="color-666 u-m-t-4" v-if="FormData.days">
-														{{returnTimerTimeText()}}
+														{{ returnTimerTimeText() }}
 													</view>
 												</view>
 												<uni-icons type="right"></uni-icons>
@@ -333,8 +314,7 @@
 									<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>
@@ -348,14 +328,18 @@
 								<template v-if="FormData.isStock">
 									<view class="u-relative">
 										<uni-forms-item label="库存数量">
-											<uni-easyinput @blur="priceFormat(FormData,'stockNumber')"
-												:paddingNone="inputPaddingNone" :disabled="disabledStock"
-												:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
-												v-model="FormData.stockNumber" type="digit" placeholder="请输入库存数量" />
+											<uni-easyinput
+												@blur="priceFormat(FormData, 'stockNumber')"
+												:paddingNone="inputPaddingNone"
+												:disabled="disabledStock"
+												:placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder"
+												v-model="FormData.stockNumber"
+												type="digit"
+												placeholder="请输入库存数量"
+											/>
 										</uni-forms-item>
-										<view class="u-absolute position-all" v-if="disabledStock"
-											@click="canEditGoodsStock(true)">
-										</view>
+										<view class="u-absolute position-all" v-if="disabledStock" @click="canEditGoodsStock(true)"></view>
 									</view>
 								</template>
 
@@ -365,28 +349,79 @@
 										<my-switch v-model="FormData.isHot"></my-switch>
 									</view>
 								</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'">
+
+								<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="height: 100rpx"></view>
+					<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>
@@ -396,721 +431,731 @@
 							<my-button fontWeight="700" shape="circle" @tap="save">保存</my-button>
 						</view>
 					</view>
-
 				</view>
 			</template>
-
-			<template v-if="tabsCurrent===1">
-				<edit-haocai @updateGoods="updateGoodsDetail" :goods="FormData"
-					@cancel="changeTabsCurrent(0)"></edit-haocai>
+			<template v-if="tabsCurrent === 1">
+				<edit-haocai @updateGoods="updateGoodsDetail" :goods="FormData" @cancel="changeTabsCurrent(0)"></edit-haocai>
 			</template>
 		</view>
-
-
 		<!-- 删除弹窗 -->
-		<my-model @confirm="delmodelConfirm" ref="delModel" desc="确认删除">
-		</my-model>
+		<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 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'
+	}
+});
 
-	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'
+	});
+}
+
+// 从本地获取选择的商品
+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: ''
-	})
-	
-	// 表单样式 
-	//可以不使用ref，但是小程序一堆wraning ，烦，改为了ref
-	const placeholderStyle = ref('font-size:28rpx;')
-	const inputPaddingNone = ref(true)
-	
-	
-	//表单边框
-	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: '',	//规格模版名称
-		
-		unitName: "",
-		specificationsGroup: '',
-	
-		
-	})
-	//页面全部数据
-	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: [{
+		let obj = FormData.relatedRecommendJson.find((item) => item.id == res.id);
+		if (obj && obj.id) {
+			uni.showToast({
+				title: '该商品已选择',
+				icon: 'none'
+			});
+			return;
+		}
+		FormData.relatedRecommendJson.push({ ...res });
+	}
+	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: '', //规格模版名称
+
+	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) => {
+			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)
+			FormData.specId = newval != 'sku' ? '' : $goodsData.specId || '';
+			console.log($goodsData);
 			if (newval == $goodsData.type) {
-				skuList.list = $goodsData.skuList
+				skuList.list = $goodsData.skuList;
 				if ($goodsData.groupSnap) {
-					FormData.proGroupVo = $goodsData.groupSnap || []
+					FormData.proGroupVo = $goodsData.groupSnap || [];
 				} else {
-					initDefaultProGroupVo()
+					initDefaultProGroupVo();
 				}
 			} else {
 				if (newval != 'sku') {
-					skuList.list = [{
-						...$defaultSku,
-						barCode: `${uni.getStorageSync("shopId")}${dayjs().valueOf()}`
-					}]
+					skuList.list = [
+						{
+							...$defaultSku,
+							barCode: `${uni.getStorageSync('shopId')}${dayjs().valueOf()}`
+						}
+					];
 				} else {
-					skuList.list = []
+					skuList.list = [];
 				}
 			}
 			if (FormData.groupType == null) {
-				FormData.groupType = 0
+				FormData.groupType = 0;
 			}
 		} else {
-			FormData.specId = ''
+			FormData.specId = '';
 			if (newval != 'sku') {
-				skuList.list = [{
-					...$defaultSku,
-					barCode: `${uni.getStorageSync("shopId")}${dayjs().valueOf()}`
-				}]
+				skuList.list = [
+					{
+						...$defaultSku,
+						barCode: `${uni.getStorageSync('shopId')}${dayjs().valueOf()}`
+					}
+				];
 			} else {
-				skuList.list = []
+				skuList.list = [];
 			}
 			if (newval == 'package') {
-				initDefaultProGroupVo()
+				initDefaultProGroupVo();
 			}
 		}
-	})
-	
-	/**
-	 * 监听套餐类型变化
-	 */
-	watch(() => FormData.groupType, (newval) => {
+	}
+);
+
+/**
+ * 监听套餐类型变化
+ */
+watch(
+	() => FormData.groupType,
+	(newval) => {
 		if (newval == 0) {
-			return initDefaultProGroupVo()
+			return initDefaultProGroupVo();
 		}
 		if (option.type == 'edit') {
 			if (newval == $goodsData.groupType) {
-				FormData.proGroupVo = $goodsData.groupSnap
+				FormData.proGroupVo = $goodsData.groupSnap;
 			}
-			return
+			return;
 		}
-		initDefaultProGroupVo()
-
-	})
-	watch(() => pageData.types, (newval) => {
-		Forms.value.setRules(rules)
-	})
-	watch(() => skuList.list, (newval) => {
+		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()
-	})
-	onReady(() => {
-		Forms.value && Forms.value.setRules(rules)
-	})
-	onShow(() => {
-		watchSpecificationsSave()
-		watchTimerSave()
-	})
-	
-	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
-		})
+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();
 	}
 
-	/**
-	 * 获取单位数据
-	 */
-	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)
-	}
+	getCategory();
+	getTbShopUnit();
 
-	/**
-	 * 选择单位监听
-	 * @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
-	}
+	uni.setStorageSync('packageSelectGoods', '');
+});
+onReady(() => {
+	Forms.value && Forms.value.setRules(rules);
+});
+onShow(() => {
+	watchSpecificationsSave();
+	watchTimerSave();
+	getLocalSelectGoods();
+});
 
-
-
-	/**
-	 * 固定套餐设置规格
-	 */
-	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
-			}
+function getGoodsDetail() {
+	getProductDetail(option.productId).then((res) => {
+		res.images = res.images.map((v) => {
 			return {
-				proId: id,
-				proName: name,
-				unitName,
-				price: lowPrice,
-				number: 1,
-				type,
-				skuList,
-				skuId: '',
-				skuName: ''
+				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 (FormData.groupType == 0) {
-			return FormData.proGroupVo[0].goods = arr
-		}
-		if (FormData.groupType == 1 && proGroupVoIndex !== undefined) {
-			return FormData.proGroupVo[proGroupVoIndex].goods = arr
-		}
-		FormData.proGroupVo.push({
-			title: '',
-			count: 1,
-			goods: arr
-		})
-	}
+		res.skuList = res.skuList.length ? res.skuList : [];
 
-
-
-	/**
-	 * 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'
+		$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 {
-				item[key] = newval
-			}
-		})
-	}
+			};
+		} else {
+			// 单规格
+		}
+	});
+}
 
-	/**
-	 * 套餐商品类型
-	 */
-	const packageType = reactive({
-		list: [{
+/**
+ * 获取分类
+ */
+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: ''
+		};
+	});
+
+	if (FormData.groupType == 0) {
+		return (FormData.proGroupVo[0].goods = arr);
+	}
+	if (FormData.groupType == 1 && proGroupVoIndex !== undefined) {
+		return (FormData.proGroupVo[proGroupVoIndex].goods = arr);
+	}
+	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: [{
-				validateFunction: function(rule, value, data, callback) {
+		}
+	],
+	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('请上传商品图片')
+						callback('请上传商品图片');
 					}
-					return true
+					return true;
 				}
-			}]
-		},
-		name: {
-			rules: [{
-					required: true,
-					errorMessage: '请输入商品名称',
-				},
-				{
-					minLength: 1,
-					maxLength: 40,
-					errorMessage: '商品名称长度在 {minLength} 到 {maxLength} 个字符',
-				}
-			]
-		},
-		categoryId: {
-			rules: [{
-				required: true,
-				errorMessage: '请选择商品分类',
-			}]
-		},
-		floorPrice: {
-			rules: [{
-				required: true,
-				errorMessage: '请填写商品底价',
-			}]
-		}
-	}
-
-	
-	
-	/**
-	 * 删除提示打开
-	 */
-	function delModelShow() {
-		delModel.value.open()
-	}
-	
-	/**
-	 * 删除商品
-	 */
-	function delmodelConfirm() {
-		delProduct(option.productId).then(res => {
-			uni.showToast({
-				icon: 'none',
-				title: '删除成功'
-			})
-			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('请上传商品图片')
 			}
-			
-			
-			let selectSpecInfo = $goodsData.selectSpecInfo
+		]
+	},
+	name: {
+		rules: [
+			{
+				required: true,
+				errorMessage: '请输入商品名称'
+			},
+			{
+				minLength: 1,
+				maxLength: 40,
+				errorMessage: '商品名称长度在 {minLength} 到 {maxLength} 个字符'
+			}
+		]
+	},
+	categoryId: {
+		rules: [
+			{
+				required: true,
+				errorMessage: '请选择商品分类'
+			}
+		]
+	},
+	floorPrice: {
+		rules: [
+			{
+				required: true,
+				errorMessage: '请填写商品底价'
+			}
+		]
+	}
+};
+
+/**
+ * 删除提示打开
+ */
+function delModelShow() {
+	delModel.value.open();
+}
+
+/**
+ * 删除商品
+ */
+function delmodelConfirm() {
+	delProduct(option.productId).then((res) => {
+		uni.showToast({
+			icon: 'none',
+			title: '删除成功'
+		});
+		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('请上传商品图片');
+			}
+
+			let selectSpecInfo = $goodsData.selectSpecInfo;
 			if (FormData.specificationsGroup.specAllList) {
-				selectSpecInfo = {}
+				selectSpecInfo = {};
 				for (let i of FormData.specificationsGroup.selectSpecInfo) {
 					if (i.selectSpecResult.length) {
-						selectSpecInfo[i.name] = i.selectSpecResult
+						selectSpecInfo[i.name] = i.selectSpecResult;
 					}
 				}
 			}
-			
+
 			if (type != 'sku') {
-				let lowPrice = skuList.list[0] ? skuList.list[0].salePrice : FormData.salePrice
-				let suitNum = skuList.list[0] ? skuList.list[0].suitNum : 0
+				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('请输入售价')
+					return infoBox.showToast('请输入售价');
 				}
 				if (suitNum <= 0) {
-					return infoBox.showToast('起售数量不能小于0！')
+					return infoBox.showToast('起售数量不能小于0！');
 				}
 				if (FormData.stockNumber === '') {
-					return infoBox.showToast('请输入库存数量！')
+					return infoBox.showToast('请输入库存数量！');
 				}
 			}
 			if (type == 'sku') {
-				if ( selectSpecInfo.length ==0 || JSON.stringify(selectSpecInfo) == '{}') {
-					return infoBox.showToast('请选择规格！')
+				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('套餐组合至少需要包含一种商品，请添加商品')
+					return infoBox.showToast('套餐组合至少需要包含一种商品，请添加商品');
 				}
 				if (groupType == 1) {
-					let ispase = FormData.proGroupVo.length > 0 ? true : false
-					let tips = ispase ? '' : '请添加至少一种套餐'
+					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]
+						FormData.proGroupVo[i].count = FormData.proGroupVo[i].goods.length;
+						const item = FormData.proGroupVo[i];
 						if (item.goods.length <= 0) {
-							ispase = false
-							tips = '套餐组合至少需要包含一种商品，请添加商品'
-							break
+							ispase = false;
+							tips = '套餐组合至少需要包含一种商品，请添加商品';
+							break;
 						}
 						if (!item.title) {
-							ispase = false
-							tips = '请输入套餐名称'
-							break
+							ispase = false;
+							tips = '请输入套餐名称';
+							break;
 						}
 					}
 					if (!ispase) {
-						return infoBox.showToast(tips)
+						return infoBox.showToast(tips);
 					}
 					// 可选套餐
 				} else {
-					FormData.proGroupVo[0].count = FormData.proGroupVo[0].goods.length
-					FormData.proGroupVo[0].number = 1
+					FormData.proGroupVo[0].count = FormData.proGroupVo[0].goods.length;
+					FormData.proGroupVo[0].number = 1;
 				}
 			}
 			if (type == 'weight') {
 				if (!FormData.weight) {
-					return infoBox.showToast('请输入重量')
+					return infoBox.showToast('请输入重量');
 				}
 			}
 			const submitData = {
@@ -1120,452 +1165,511 @@
 				coverImg: images[0] || '',
 				skuList: skuList.list,
 				selectSpecInfo: selectSpecInfo
-			}
+			};
 			//编辑
 			if (option.type === 'edit') {
-				return updateProduct(submitData).then(res => {
-					infoBox.showSuccessToast('更新成功')
-					settimeoutBack(1500)
-				})
+				return updateProduct(submitData).then((res) => {
+					infoBox.showSuccessToast('更新成功');
+					settimeoutBack(1500);
+				});
 			}
 			// 如果套餐没选择规格,默认选中第一条
 			if (submitData.proGroupVo) {
 				submitData.proGroupVo.forEach((res, index) => {
-					submitData.proGroupVo[index].goods.forEach(ele => {
+					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
+							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 => {
+			addProduct(submitData).then((res) => {
+				infoBox.showSuccessToast('添加成功');
+				settimeoutBack(1500);
+			});
+		})
+		.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 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 returnTimerTimeText() {
+	if (!FormData.startTime || !FormData.endTime) {
+		return '';
 	}
+	return FormData.startTime + '-' + FormData.endTime;
+}
 
-	/**
-	 * 编辑规格
-	 */
-	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 = [{
+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);
+}
+
+/**
+ * 权限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;
 	}
-	watch(() => FormData.isStock, (newval) => {
+}
+watch(
+	() => FormData.isStock,
+	(newval) => {
 		if (newval) {
-			canEditGoodsStock()
-		}
-	})
-	// 允许修改商品分类
-	let disabledChangeCategory = ref(false)
-	async function canEditGoodsCategory(tips = false) {
-		if (option.type === 'edit') {
-			const res = await hasPermission({
-				text: '允许修改分类',
-				tips
-			})
-			disabledChangeCategory.value = !res
+			canEditGoodsStock();
 		}
 	}
+);
+// 允许修改商品分类
+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
-				}
-			})[0].name
-		} catch (error) {
-			//TODO handle the exception
-		}
-	});
-	
-	
-	/**
-	 * 销毁
-	 */
-	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>
-	.barCode {
-		border: 1px solid #E5E5E5;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		padding: 22rpx 24rpx;
-		background: #FCFCFC;
+.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;
 	}
 
-	.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;
+	.row:nth-of-type(2n + 1) {
+		background: #f0f0f0;
 	}
+}
 
-	::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 {
+.types {
+	.item {
+		padding: 6rpx 20rpx;
+		border: 1px solid #bbb;
+		border-radius: 8rpx;
 		margin-right: 30rpx;
-	}
+		margin-bottom: 20rpx;
+		text-align: center;
+		position: relative;
 
-	.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;
+		.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%);
 		}
 	}
 
+	.active {
+		border-color: $my-main-color;
 
-	::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: .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;
+		.gou {
+			display: flex;
+		}
 
 		.title {
-			padding: 12rpx 24rpx 12rpx 24rpx;
-			background: #AEBAD2;
-			border-radius: 8rpx 8rpx 0rpx 0rpx;
-			color: #fff;
-		}
-
-		.row:nth-of-type(2n+1) {
-			background: #F0F0F0;
+			color: $my-main-color;
 		}
 	}
 
-	.types {
-		.item {
-			padding: 6rpx 20rpx;
-			border: 1px solid #bbb;
-			border-radius: 8rpx;
-			margin-right: 30rpx;
-			margin-bottom: 20rpx;
-			text-align: center;
-			position: relative;
+	&.disabled {
+		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%);
-			}
+		&::after {
+			position: absolute;
+			content: '';
+			display: block;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
 		}
 
-		.active {
-			border-color: $my-main-color;
+		.item {
+			background-color: #f9f9f9;
+			border-color: #eee;
+
+			&.active {
+				border-color: rgba(49, 138, 254, 0.3);
+			}
 
 			.gou {
-				display: flex;
+				opacity: 0.5;
 			}
 
 			.title {
-				color: $my-main-color;
+				color: #999;
 			}
 		}
-
-		&.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, .3);
-				}
-
-				.gou {
-					opacity: .5;
-				}
-
-				.title {
-					color: #999;
-				}
-			}
-
-		}
 	}
-</style>
\ No newline at end of file
+}
+.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;
+			}
+		}
+	}
+}
+.add-goods {
+	display: flex;
+	justify-content: center;
+	padding-top: 28upx;
+}
+</style>
diff --git a/pages.json b/pages.json
index 50485c9..9284c86 100644
--- a/pages.json
+++ b/pages.json
@@ -533,6 +533,12 @@
 				"style": {
 					"navigationBarTitleText": "账单付款记录"
 				}
+			}, {
+				"pageId": "PAGES_BATCH_IN",
+				"path": "batch_in",
+				"style": {
+					"navigationBarTitleText": "批量入库"
+				}
 			}]
 		},
 		{
@@ -838,6 +844,13 @@
 						"navigationBarTitleText": "拼团商品"
 					}
 				},
+				{
+					"pageId": "PAGES_MARKET_GROUP_GOODS_SHARE",
+					"path": "groupGoods/share",
+					"style": {
+						"navigationBarTitleText": "分享"
+					}
+				},
 				{
 					"pageId": "PAGES_MARKET_GROUP_GOODS_ADDGOODS",
 					"path": "groupGoods/addGoods",
@@ -872,6 +885,13 @@
 					"style": {
 						"navigationBarTitleText": "选择商品"
 					}
+				},
+				{
+					"pageId": "PAGES_MARKET_PACKAGE_POPULARIZE_SHARE",
+					"path": "packagePopularize/share",
+					"style": {
+						"navigationBarTitleText": "分享"
+					}
 				}
 			]
 		},
diff --git a/utils/index.js b/utils/index.js
index 29a93c1..7a9a7bd 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -1,6 +1,9 @@
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 dayjs.extend(customParseFormat); // 注册插件
+import {
+	BigNumber
+} from "bignumber.js";
 
 /**
  * 过滤输入，只允许数字和最多两位小数
@@ -114,4 +117,30 @@ export function includesString(target, searchStr, options = {}) {
 
 	// 4. 执行包含判断
 	return processedTarget.includes(processedSearch);
-}
\ No newline at end of file
+}
+
+/**
+ * 乘法计算并格式化结果
+ * @param {string|number} num1 - 第一个乘数
+ * @param {string|number} num2 - 第二个乘数
+ * @returns {string} 保留两位小数的结果（不四舍五入，补零）
+ */
+export const multiplyAndFormat = (num1, num2) => {
+	try {
+		// 转换为BigNumber（使用字符串构造避免精度问题）
+		const bigNum1 = new BigNumber(num1.toString());
+		const bigNum2 = new BigNumber(num2.toString());
+
+		// 1. 乘法计算
+		const product = bigNum1.multipliedBy(bigNum2);
+
+		// 2. 截断到两位小数（不四舍五入）
+		const truncated = product.decimalPlaces(2, BigNumber.ROUND_DOWN);
+
+		// 3. 格式化保留两位小数（补零）
+		return truncated.toFixed(2);
+	} catch (error) {
+		console.error('计算错误:', error);
+		return '0.00'; // 出错时返回默认值
+	}
+};
\ No newline at end of file