From edcf844adb2e88d00aac7b9c40783f182846d1ab Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 23 Sep 2024 17:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BB=A3?=
 =?UTF-8?q?=E5=AE=A2=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/utils/returrn-data.js                 |    3 +-
 components/my-components/my-steps-item.vue    |  334 ---
 components/my-components/my-steps.vue         |   90 -
 http/yskApi/goods.js                          |    5 +
 http/yskApi/user.js                           |   25 +
 .../add-Product/add-Product-9-19-back.vue     | 2026 +++++++++++++++++
 pageProduct/add-Product/add-Product.vue       |  227 +-
 .../add-Product/components/choose-danwei.vue  |  159 ++
 .../components/choose-haocai - 副本.vue       |   57 +
 .../add-Product/components/choose-haocai.vue  |  149 ++
 .../add-Product/components/edit-haocai.vue    |  359 +++
 .../add-specifications - 副本 (2).vue         |  499 ++++
 .../add-specifications/add-specifications.vue |  217 +-
 pageProduct/index/components/baosun.vue       |  134 ++
 pageProduct/index/components/edit-guige.vue   |  141 ++
 pageProduct/index/components/edit-price.vue   |  186 ++
 pageProduct/index/components/edit-stock.vue   |  235 ++
 pageProduct/index/components/goods.vue        |  165 +-
 pageProduct/index/index.vue                   |  214 +-
 pageProduct/util.js                           |   41 +
 pageTable/index/components/table-item.vue     |   13 +-
 pages.json                                    |   16 +
 pages/index/index.vue                         |    3 +-
 pagesCreateOrder/components/edit-discount.vue |   19 +-
 .../confirm-order/confirm-order.vue           |  197 +-
 pagesCreateOrder/index/index.vue              |   61 +-
 pagesOrder/detail/components/list.vue         |   55 +-
 pagesOrder/detail/components/order.vue        |    6 +-
 pagesOrder/detail/components/step.vue         |   14 +-
 pagesOrder/detail/components/user.vue         |   32 +-
 pagesOrder/detail/detail.vue                  |  117 +-
 pagesOrder/index/compoents/order-item.vue     |   63 +-
 pagesOrder/index/compoents/order-list.vue     |    7 +-
 pagesOrder/index/index.vue                    |   39 +-
 pagesOrder/pay-order/pay-order.vue            |  320 +++
 pagesOrder/tuikuan/tuikuan.vue                |   22 +
 36 files changed, 5301 insertions(+), 949 deletions(-)
 delete mode 100644 components/my-components/my-steps-item.vue
 delete mode 100644 components/my-components/my-steps.vue
 create mode 100644 http/yskApi/user.js
 create mode 100644 pageProduct/add-Product/add-Product-9-19-back.vue
 create mode 100644 pageProduct/add-Product/components/choose-danwei.vue
 create mode 100644 pageProduct/add-Product/components/choose-haocai - 副本.vue
 create mode 100644 pageProduct/add-Product/components/choose-haocai.vue
 create mode 100644 pageProduct/add-Product/components/edit-haocai.vue
 create mode 100644 pageProduct/add-specifications/add-specifications - 副本 (2).vue
 create mode 100644 pageProduct/index/components/baosun.vue
 create mode 100644 pageProduct/index/components/edit-guige.vue
 create mode 100644 pageProduct/index/components/edit-price.vue
 create mode 100644 pageProduct/index/components/edit-stock.vue
 create mode 100644 pageProduct/util.js
 create mode 100644 pagesOrder/pay-order/pay-order.vue
 create mode 100644 pagesOrder/tuikuan/tuikuan.vue

diff --git a/commons/utils/returrn-data.js b/commons/utils/returrn-data.js
index 6cb574f..3619e8e 100644
--- a/commons/utils/returrn-data.js
+++ b/commons/utils/returrn-data.js
@@ -1,6 +1,7 @@
-export const objToArrary = (obj) => {
+export const objToArrary = (obj,keyNewName) => {
 	return Object.entries(obj).map(([key, value]) => ({
 		key,
+		[keyNewName]:key,
 		...value,
 	}))
 }
\ No newline at end of file
diff --git a/components/my-components/my-steps-item.vue b/components/my-components/my-steps-item.vue
deleted file mode 100644
index d0eeb65..0000000
--- a/components/my-components/my-steps-item.vue
+++ /dev/null
@@ -1,334 +0,0 @@
-<template>
-	<view class="u-steps-item" ref="u-steps-item" :class="[`u-steps-item--${parentData.direction}`]">
-		<view class="u-steps-item__line" v-if="index + 1 < childLength"
-			:class="[`u-steps-item__line--${parentData.direction}`]" :style="[lineStyle]"></view>
-		<view class="u-steps-item__wrapper"
-			:class="[`u-steps-item__wrapper--${parentData.direction}`, parentData.dot && `u-steps-item__wrapper--${parentData.direction}--dot`]"
-			:style="[itemStyleInner]">
-			<slot name="icon">
-				<view class="u-steps-item__wrapper__dot" v-if="parentData.dot" :style="{
-						backgroundColor: statusColor
-					}">
-
-				</view>
-				<view class="u-steps-item__wrapper__icon" v-else-if="parentData.activeIcon || parentData.inactiveIcon">
-					<u-icon :name="index <= parentData.current ? parentData.activeIcon : parentData.inactiveIcon"
-						:size="iconSize"
-						:color="index <= parentData.current ? parentData.activeColor : parentData.inactiveColor">
-					</u-icon>
-				</view>
-				<view v-else :style="{
-						backgroundColor: statusClass === 'process' ? parentData.activeColor : 'transparent',
-						borderColor: statusColor
-					}" class="u-steps-item__wrapper__circle">
-					<text v-if="statusClass === 'process' || statusClass === 'wait'"
-						class="u-steps-item__wrapper__circle__text" :style="{
-							color: index == parentData.current ? '#ffffff' : parentData.inactiveColor
-						}">{{ index + 1}}</text>
-					<u-icon v-else :color="statusClass === 'error' ? 'error' : parentData.activeColor" size="12"
-						:name="statusClass === 'error' ? 'close' : 'checkmark'"></u-icon>
-				</view>
-			</slot>
-		</view>
-		<view class="u-steps-item__content" :class="[`u-steps-item__content--${parentData.direction}`]"
-			:style="[contentStyle]">
-			<u-text :text="title" :type="parentData.current == index ? 'primary' : 'content'" lineHeight="20px"
-				:size="parentData.current == index ? 14 : 13"></u-text>
-			<slot name="desc">
-				<view class="u-p-b-20">
-					<u-text :text="desc" :type="parentData.current == index ? 'primary' : 'content'" size="14"></u-text>
-				</view>
-			</slot>
-		</view>
-		<!-- <view
-		    class="u-steps-item__line"
-		    v-if="showLine && parentData.direction === 'column'"
-			:class="[`u-steps-item__line--${parentData.direction}`]"
-		    :style="[lineStyle]"
-		></view> -->
-	</view>
-</template>
-
-<script>
-	import { props } from './prop/steps-item.js';
-	import { mpMixin } from './libs/mixin/mpMixin';
-	import { mixin } from './libs/mixin/mixin';
-	import { sleep, error } from './libs/function/index';
-	import color from './libs/config/color';
-	// #ifdef APP-NVUE
-	const dom = uni.requireNativePlugin('dom')
-	// #endif
-	/**
-	 * StepsItem 步骤条的子组件
-	 * @description 本组件需要和u-steps配合使用
-	 * @tutorial https://uview-plus.jiangruyi.com/components/steps.html
-	 * @property {String}			title			标题文字
-	 * @property {String}			current			描述文本
-	 * @property {String | Number}	iconSize		图标大小  (默认 17 )
-	 * @property {Boolean}			error			当前步骤是否处于失败状态  (默认 false )
-	 * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
-	 */
-	export default {
-		name: 'u-steps-item',
-		mixins: [mpMixin, mixin, props],
-		data() {
-			return {
-				index: 0,
-				childLength: 0,
-				showLine: false,
-				size: {
-					height: 0,
-					width: 0
-				},
-				parentData: {
-					direction: 'row',
-					current: 0,
-					activeColor: '',
-					inactiveColor: '',
-					activeIcon: '',
-					inactiveIcon: '',
-					dot: false
-				}
-			}
-		},
-		watch: {
-			'parentData'(newValue, oldValue) {
-			}
-		},
-		created() {
-			this.init()
-		},
-		// #ifdef MP-TOUTIAO
-		options: {
-			virtualHost: false
-		},
-		// #endif
-		computed: {
-			lineStyle() {
-				const style = {}
-				if (this.parentData.direction === 'row') {
-					style.width = this.size.width + 'px'
-					style.left = this.size.width / 2 + 'px'
-				} else {
-					style.height = this.size.height + 'px'
-					// style.top = this.size.height / 2 + 'px'
-				}
-				style.backgroundColor = this.parent.children?.[this.index + 1]?.error ? color.error : this.index <
-					this
-					.parentData
-					.current ? this.parentData.activeColor : this.parentData.inactiveColor
-				return style
-			},
-			itemStyleInner() {
-				return {
-					...this.itemStyle
-				}
-			},
-			statusClass() {
-				const {
-					index,
-					error
-				} = this
-				const {
-					current
-				} = this.parentData
-				if (current == index) {
-					return error === true ? 'error' : 'process'
-				} else if (error) {
-					return 'error'
-				} else if (current > index) {
-					return 'finish'
-				} else {
-					return 'wait'
-				}
-			},
-			statusColor() {
-				let colorTmp = ''
-				switch (this.statusClass) {
-					case 'finish':
-						colorTmp = this.parentData.activeColor
-						break
-					case 'error':
-						colorTmp = color.error
-						break
-					case 'process':
-						colorTmp = this.parentData.dot ? this.parentData.activeColor : 'transparent'
-						break
-					default:
-						colorTmp = this.parentData.inactiveColor
-						break
-				}
-				return colorTmp
-			},
-			contentStyle() {
-				const style = {}
-				if (this.parentData.direction === 'column') {
-					style.marginLeft = this.parentData.dot ? '2px' : '6px'
-					style.marginTop = this.parentData.dot ? '0px' : '6px'
-				} else {
-					style.marginTop = this.parentData.dot ? '2px' : '6px'
-					style.marginLeft = this.parentData.dot ? '2px' : '6px'
-				}
-
-				return style
-			}
-		},
-		mounted() {
-			this.parent && this.parent.updateFromChild()
-			sleep().then(() => {
-				this.getStepsItemRect()
-			})
-		},
-		methods: {
-			init() {
-				// 初始化数据
-				this.updateParentData()
-				if (!this.parent) {
-					return error('u-steps-item必须要搭配u-steps组件使用')
-				}
-				this.index = this.parent.children.indexOf(this)
-				this.childLength = this.parent.children.length
-			},
-			updateParentData() {
-				// 此方法在mixin中
-				this.getParentData('u-steps')
-			},
-			// 父组件数据发生变化
-			updateFromParent() {
-				this.init()
-			},
-			// 获取组件的尺寸，用于设置横线的位置
-			getStepsItemRect() {
-				// #ifndef APP-NVUE
-				this.$uGetRect('.u-steps-item').then(size => {
-					this.size = size
-				})
-				// #endif
-
-				// #ifdef APP-NVUE
-				dom.getComponentRect(this.$refs['u-steps-item'], res => {
-					const {
-						size
-					} = res
-					this.size = size
-				})
-				// #endif
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "./libs/css/components.scss";
-
-	.u-steps-item {
-		flex: 1;
-		@include flex;
-
-		&--row {
-			flex-direction: column;
-			align-items: center;
-			position: relative;
-		}
-
-		&--column {
-			position: relative;
-			flex-direction: row;
-			justify-content: flex-start;
-			padding-bottom: 5px;
-		}
-
-		&__wrapper {
-			@include flex;
-			justify-content: center;
-			align-items: center;
-			position: relative;
-			background-color: #fff;
-			border-radius: 50px;
-
-			&--column {
-				width: 20px;
-				height: 20px;
-
-				&--dot {
-					height: 20px;
-					width: 20px;
-				}
-			}
-
-			&--row {
-				width: 20px;
-				height: 20px;
-
-				&--dot {
-					width: 20px;
-					height: 20px;
-				}
-			}
-
-			&__circle {
-				width: 20px;
-				height: 20px;
-				/* #ifndef APP-NVUE */
-				box-sizing: border-box;
-				flex-shrink: 0;
-				/* #endif */
-				border-radius: 100px;
-				border-width: 1px;
-				border-color: $u-tips-color;
-				border-style: solid;
-				@include flex(row);
-				align-items: center;
-				justify-content: center;
-				transition: background-color 0.3s;
-
-				&__text {
-					color: $u-tips-color;
-					font-size: 11px;
-					@include flex(row);
-					align-items: center;
-					justify-content: center;
-					text-align: center;
-					line-height: 11px;
-				}
-			}
-
-			&__dot {
-				width: 10px;
-				height: 10px;
-				border-radius: 100px;
-				background-color: $u-content-color;
-			}
-		}
-
-		&__content {
-			@include flex;
-			flex: 1;
-
-			&--row {
-				flex-direction: column;
-				align-items: center;
-			}
-
-			&--column {
-				flex-direction: column;
-				margin-left: 6px;
-			}
-		}
-
-		&__line {
-			position: absolute;
-			background: $u-tips-color;
-
-			&--row {
-				top: 10px;
-				height: 1px;
-			}
-
-			&--column {
-				width: 1px;
-				left: 10px;
-			}
-		}
-	}
-</style>
diff --git a/components/my-components/my-steps.vue b/components/my-components/my-steps.vue
deleted file mode 100644
index bf912b7..0000000
--- a/components/my-components/my-steps.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-	<view
-	    class="u-steps"
-	    :class="[`u-steps--${direction}`]"
-	>
-		<slot></slot>
-	</view>
-</template>
-
-<script>
-	import { props } from './prop/steps.js';
-	import { mpMixin } from './libs/mixin/mpMixin';
-	import { mixin } from './libs/mixin/mixin';
-	import test from './libs/function/test';
-	/**
-	 * Steps 步骤条
-	 * @description 该组件一般用于完成一个任务要分几个步骤，标识目前处于第几步的场景。
-	 * @tutorial https://uview-plus.jiangruyi.com/components/steps.html
-	 * @property {String}			direction		row-横向，column-竖向 (默认 'row' )
-	 * @property {String | Number}	current			设置当前处于第几步 (默认 0 )
-	 * @property {String}			activeColor		激活状态颜色 (默认 '#3c9cff' )
-	 * @property {String}			inactiveColor	未激活状态颜色 (默认 '#969799' )
-	 * @property {String}			activeIcon		激活状态的图标
-	 * @property {String}			inactiveIcon	未激活状态图标 
-	 * @property {Boolean}			dot				是否显示点类型 (默认 false )
-	 * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
-	 */
-	export default {
-		name: 'u-steps',
-		mixins: [mpMixin, mixin, props],
-		data() {
-			return {
-			}
-		},
-		watch: {
-			children() {
-				this.updateChildData()
-			},
-			parentData() {
-				this.updateChildData()
-			}
-		},
-		computed: {
-			// 监听参数的变化，通过watch中，手动去更新子组件的数据，否则子组件不会自动变化
-			parentData() {
-				return [this.current, this.direction, this.activeColor, this.inactiveColor, this.activeIcon, this.inactiveIcon, this.dot]
-			}
-		},
-		methods: {
-			// 更新子组件的数据
-			updateChildData() {
-				this.children.map(child => {
-					// 先判断子组件是否存在对应的方法
-					test.func((child || {}).updateFromParent()) && child.updateFromParent()
-				})
-			},
-			// 接受子组件的通知，去修改其他子组件的数据
-			updateFromChild() {
-				this.updateChildData()
-			}
-		},
-		created() {
-			this.children = []
-		},
-		options: {
-			virtualHost: false
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "./libs/css/components.scss";
-
-	.u-steps {
-		@include flex;
-
-		&--column {
-			flex-direction: column
-		}
-
-		&--row {
-			flex-direction: row;
-			flex: 1;
-			/* #ifdef MP */
-			display: grid;
-			grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
-			/* #endif */
-		}
-	}
-</style>
diff --git a/http/yskApi/goods.js b/http/yskApi/goods.js
index 8f66df3..05a7af4 100644
--- a/http/yskApi/goods.js
+++ b/http/yskApi/goods.js
@@ -128,4 +128,9 @@ export function $tbProductV2(data) {
 export function $tbProskuConV2(data) {
 	return http.req('/api/tbProskuCon/V2', data, 'POST')
 }
+
+/* 修改商品相关(快捷接口） */
+export function $updateProductData(data) {
+	return http.req('/api/stock/updateProductData', data, 'POST')
+}
 // v2 api end
\ No newline at end of file
diff --git a/http/yskApi/user.js b/http/yskApi/user.js
new file mode 100644
index 0000000..1b46450
--- /dev/null
+++ b/http/yskApi/user.js
@@ -0,0 +1,25 @@
+import http from './http.js'
+const request=http.request
+/**
+ * 用户详情
+ * @returns
+ */
+export function tbShopInfo(shopId) {
+	const _shopId=uni.getStorageSync('shopId')
+    return request({
+        url: `/api/tbShopInfo/${shopId||_shopId}`,
+        method: 'get'
+    })
+}
+
+/**
+ * 修改店铺信息
+ * @returns
+ */
+export function tbShopInfoPut(data) {
+    return request({
+        url: `/api/tbShopInfo`,
+        method: 'put',
+        data
+    })
+}
\ No newline at end of file
diff --git a/pageProduct/add-Product/add-Product-9-19-back.vue b/pageProduct/add-Product/add-Product-9-19-back.vue
new file mode 100644
index 0000000..5dc1ade
--- /dev/null
+++ b/pageProduct/add-Product/add-Product-9-19-back.vue
@@ -0,0 +1,2026 @@
+<template>
+	<view class="u-p-30 safe-page">
+		<up-sticky v-if="option.type==='edit'" offset-top="20" zIndex="99">
+			<myTabs :list="tabsList" @change="tabsChange"></myTabs>
+		</up-sticky>
+
+		<view class="box">
+			<template v-if="tabsCurrent===0">
+				<view class="basic">
+					<uni-forms :model="FormData" :rules="rules" :border="true" label-position="top"
+						err-show-type="toast" validateTrigger="submit" label-width="350" ref="Forms">
+						<view class="block">
+							<uni-forms-item label="商品类型" required showRequired>
+								<view class="u-flex u-flex-wrap types " :class="{disabled:option.productId!==''}">
+									<view class="item" @tap="changeFormData('typeEnum',item.value)"
+										:class="{active:FormData.typeEnum===item.value}"
+										v-for="(item,index) in pageData.types" :key="index">
+										<!-- <view class="gou u-flex u-row-right u-col-top u-p-t-4 u-p-r-4">
+											<uni-icons type="checkmarkempty" :size="8" color="#fff"></uni-icons>
+										</view> -->
+										<view class="title">{{item.title}}</view>
+										<view class="u-font-24 color-999 u-m-t-10">
+											{{item.desc}}
+										</view>
+									</view>
+								</view>
+
+							</uni-forms-item>
+							<uni-forms-item ref="fileItem" label="图片">
+								<my-upload-file ref="refFile" :images="FormData.images"></my-upload-file>
+								<view class="u-m-t-16 color-999 u-font-24">
+									注:第一张图为商品封面图，图片尺寸为750x750
+								</view>
+							</uni-forms-item>
+							<uni-forms-item required name="name" label="商品名称" showRequired>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.name" placeholder="请输入商品名称" />
+							</uni-forms-item>
+							<template v-if="FormData.typeEnum!='group'">
+								<uni-forms-item label="所属分类" required showRequired name="categoryId">
+									<!-- <picker @change="bindPickerChange" 
+									range-key="name"
+									:value="pageData.category" :range="pageData.category">
+										<view class="uni-input">请选择分类</view>
+									</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>
+							</template>
+
+							<!-- <uni-forms-item label="产品编码">
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.goodsCode" placeholder="请输入商品编码" />
+							</uni-forms-item> -->
+							<view class="border-top-0">
+								<uni-forms-item label="商品描述">
+									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										type="textarea" v-model="FormData.shortTitle" placeholder="请填写商品简述" />
+								</uni-forms-item>
+							</view>
+
+							<!-- <uni-forms-item label="商品详情" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									type="textarea" v-model="FormData.goodsDetail" placeholder="请填写商品详情" />
+							</uni-forms-item> -->
+
+							<!-- <view class="">
+								<uni-forms-item label="规格模式" required>
+									<uni-data-checkbox v-model="FormData.specificationsPattern"
+										:localdata="specificationMode" />
+								</uni-forms-item>
+							</view> -->
+							<view class="border-top-0">
+								<uni-forms-item label="单位" required showRequired name="categoryId">
+
+									<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 class="" v-if="FormData.typeEnum==='group'">
+								<view class="border-top-0">
+									<uni-forms-item label="团购券分类" required showRequired name="categoryId">
+										<view class="u-p-30 bg-gray u-m-b-20" v-if="FormData.groupCategoryId.length">
+											<view class="u-flex">
+												<view class="u-flex-1 u-p-r-30">名称</view>
+												<view class=" u-flex-1 u-p-l-30">操作</view>
+											</view>
+											<view class="u-flex u-m-t-20 u-row-between"
+												v-for="(item,index) in FormData.groupCategoryId" :key="index"
+												@tap="groupCategoryIdDel(index)">
+												<view class="u-flex-1 u-flex u-p-r-30">
+													<view class="bg-fff u-flex-1 u-p-10">
+														{{item.name}}
+													</view>
+												</view>
+												<view class="u-flex u-flex-1 u-p-l-30">
+													<uni-icons type="minus-filled" :size="26"
+														:color="color.ColorRed"></uni-icons>
+												</view>
+											</view>
+										</view>
+										<view class=" u-flex " @tap="refChooseGroupCategoryOpen">
+											<uni-icons type="plus-filled" :color="color.ColorMain"
+												:size="26"></uni-icons>
+											<view class="u-m-l-16">添加团购券分类</view>
+										</view>
+									</uni-forms-item>
+								</view>
+
+								<!-- 选择团购券分类 -->
+								<choose-group-category @confirm="refChooseCouponCategoryConfirm"
+									ref="refChooseGroupCategory"></choose-group-category>
+							</template>
+
+
+							<!-- <view class="">
+								<uni-forms-item label=" " required>
+									<view class="u-flex u-row-between zuofa" @tap="toGuige ">
+										<view class="color-333">{{returnSpecificationsGroup }}</view>
+										<uni-icons type="right"></uni-icons>
+									</view>
+								</uni-forms-item>
+							</view> -->
+
+
+							<!-- <uni-forms-item label="底价（元）" name="floorPrice" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.floorPrice" placeholder="请输入底价（元）" />
+							</uni-forms-item> -->
+							<!-- <uni-forms-item label="售卖方式" required>
+								<view style="display: none;"><uni-easyinput :paddingNone="inputPaddingNone"
+										:inputBorder="inputBorder" v-model="FormData.salesMethod"
+										placeholder="请选择售卖方式" />
+								</view>
+								<picker @change="salesMethodChange" :value="salesMethod.defaultIndex"
+									:range="salesMethod.list">
+									<view class="u-flex u-row-between lh40" v-if="FormData.salesMethod===0">
+										<view class="color-333">{{salesMethod.list[FormData.salesMethod]||'售卖方式'}}
+										</view>
+										<uni-icons type="right"></uni-icons>
+									</view>
+									<view class="u-flex u-row-between lh40" v-if="FormData.salesMethod===1">
+										<view class="u-flex">
+											<text
+												class="color-333">{{salesMethod.list[FormData.salesMethod]||'售卖方式'}}</text>
+											<view class="u-flex color-999">
+												<text>(</text>
+												<text class="color-red">*</text>
+												<text class="u-font-24">注意:预售商品不支持堂食</text>
+												<text>)</text>
+											</view>
+										</view>
+										<uni-icons type="right"></uni-icons>
+									</view>
+									<view class="u-flex u-row-between lh40" v-if="FormData.salesMethod===2">
+										<view class="u-flex">
+											<text
+												class="color-333">{{salesMethod.list[FormData.salesMethod]||'售卖方式'}}</text>
+											<view class="u-flex color-999">
+												<text>(</text>
+												<text class="color-red">*</text>
+												<text class="u-font-24">注意:该商品仅作展示，无法进行下单</text>
+												<text>)</text>
+											</view>
+										</view>
+										<uni-icons type="right"></uni-icons>
+									</view>
+								</picker>
+							</uni-forms-item> -->
+							<!-- <template v-if="FormData.salesMethod==1">
+								<view class="bg-gray border-top-0">
+									<uni-forms-item label="交货时间" required>
+										<radio-group @change="DeliveryTimeChange">
+											<label class="u-flex " :class="{
+											'u-m-b-40':index===0
+										}" v-for="(item, index) in DeliveryTime" :key="item.value">
+												<view>
+													<radio :color="ColorMain" :value="item.value"
+														:checked="index === DeliveryTimeCurrent" />
+												</view>
+												<view class="u-flex-1">
+													<template v-if="index===0">
+														<uni-datetime-picker v-model="FormData.startTime"
+															:hide-second="true" :end="limitDayTime">
+															<view class="u-flex u-row-between">
+																<view>
+																	<text></text>
+																	<text
+																		class="color-999">{{FormData.startTime||'选择开始时间'}}</text>
+																</view>
+																<uni-icons type="right" color="#999"></uni-icons>
+															</view>
+														</uni-datetime-picker>
+
+													</template>
+													<template v-if="index===1">
+														<view class="u-flex ">
+															<view>
+																付款成功
+															</view>
+															<uni-easyinput :paddingNone="inputPaddingNone"
+																:placeholderStyle="placeholderStyle"
+																:inputBorder="false"
+																v-model="FormData.paySuccessAfterDay" type="number"
+																placeholder="请填写天数" />
+
+
+															<view>
+																天后交货
+															</view>
+														</view>
+													</template>
+												</view>
+
+											</label>
+										</radio-group>
+									</uni-forms-item>
+								</view>
+								<view class="color-999 u-font-24 u-m-t-20 u-p-b-30">
+									<text class="color-red">*</text> 注意: 只允许设置{{limitDay}}天内的发货时间，请务必按照约定时间发货以免引起客户投诉
+								</view>
+								<view class="">
+									<uni-forms-item label="" required>
+										<slot name="label">
+											<view class="class">
+												<text class="label-title u-m-r-6">预售可预约天数</text>
+												<uni-icons @click="showModel('help')" color="#999"
+													type="help"></uni-icons>
+											</view>
+										</slot>
+										<view class="u-flex">
+											<uni-easyinput :paddingNone="inputPaddingNone" :min="1" :max="15"
+												:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+												v-model="FormData.discountPrice" type="number" placeholder="填写天数" />
+											<text>天</text>
+										</view>
+									</uni-forms-item>
+								</view>
+							</template> -->
+							<!-- <uni-forms-item label="" required>
+								<view class="u-flex u-row-between lh40">
+									<view class="label-title">库存</view>
+									<my-switch v-model="FormData.isStock"></my-switch>
+								</view>
+							</uni-forms-item>
+							<view class="border-top-0 none-label" v-if="FormData.isStock">
+								<uni-forms-item label="" required>
+									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="FormData.stockNumber" type="number"
+										placeholder="请填写库存" />
+								</uni-forms-item>
+							</view> -->
+
+						</view>
+
+						<template v-if="FormData.typeEnum==='sku' ">
+							<!-- <view class="block border-top-0">
+								<uni-forms-item label="选择规格" required name="categoryId">
+
+									<uni-data-picker :clear-icon="false" @change="specIdChange"
+										:map="{text:'name',value:'id'}" placeholder="请选择规格" popup-title="请选择规格"
+										:localdata="pageData.specList" v-model="FormData.specId">
+									</uni-data-picker>
+								</uni-forms-item>
+							</view> -->
+							<view class="block border-top-0">
+								<uni-forms-item label=" ">
+									<view class="u-flex u-row-between " @tap="toGuige">
+										<view class="color-333 font-bold">
+											<text v-if="!skuList.length">选择规格</text>
+											<text v-else>编辑规格</text>
+										</view>
+										<uni-icons type="right"></uni-icons>
+									</view>
+								</uni-forms-item>
+								<template v-if="skuList.length">
+									<view class="u-text-center">
+										<view class="u-flex font-bold u-m-b-12">
+											<view class="u-flex-1">组合名称</view>
+											<view class="u-flex-1">售价</view>
+											<view class="u-flex-1">库存数量</view>
+										</view>
+										<view class="u-flex u-p-b-12 u-p-t-12" v-for="(item,index) in skuList"
+											:key="index">
+											<view class="u-flex-1">{{item.specSnap}}</view>
+											<view class="u-flex-1">{{item.salePrice}}</view>
+											<view class="u-flex-1">{{item.stockNumber}}</view>
+										</view>
+									</view>
+
+								</template>
+
+							</view>
+
+						</template>
+
+						<template v-if="FormData.typeEnum==='group' ">
+							<!-- <view class="block border-top-0">
+								<uni-forms-item label="选择规格" required name="categoryId">
+						
+									<uni-data-picker :clear-icon="false" @change="specIdChange"
+										:map="{text:'name',value:'id'}" placeholder="请选择规格" popup-title="请选择规格"
+										:localdata="pageData.specList" v-model="FormData.specId">
+									</uni-data-picker>
+								</uni-forms-item>
+							</view> -->
+							<view class="font-bold u-m-t-32 u-m-b-32">套餐商品 </view>
+							<view class="  " v-if="FormData.groupSnap.length">
+								<view class="u-m-t-30 block border-top-0" v-for="(item,index) in FormData.groupSnap"
+									:key="index">
+
+									<uni-forms-item label="套餐名称" showRequired required>
+										<uni-easyinput :paddingNone="inputPaddingNone"
+											:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+											v-model="item.title" placeholder="请输入套餐名称" />
+									</uni-forms-item>
+									<view>
+										<view class="font-bold">商品信息</view>
+										<view class="u-p-30 bg-gray u-m-t-20">
+											<view class="u-flex">
+												<view class="u-flex-1">名称</view>
+												<view class="u-flex-1 ">数量</view>
+												<view class=" ">操作</view>
+											</view>
+											<view class="u-flex u-m-t-20 u-row-between"
+												v-for="(product,goodsIndex) in item.goods" :key="goodsIndex"
+												@tap="groupSnapGoodsDel(index,goodsIndex)">
+												<view class="u-flex-1 u-flex u-p-r-60">
+													<view class="bg-fff u-flex-1 u-p-10">
+														{{product.name}}
+													</view>
+												</view>
+												<view class="u-flex-1 u-flex u-p-r-60">
+													<view class="bg-fff u-flex-1 u-p-10">
+														x1
+													</view>
+												</view>
+												<view class="u-flex">
+													<uni-icons type="minus-filled" :size="26"
+														:color="color.ColorRed"></uni-icons>
+												</view>
+											</view>
+											<view class="u-flex u-m-t-30" @tap="groupSnapAddGoods(index,item.goods)">
+												<uni-icons type="plus-filled" :color="color.ColorMain"
+													:size="26"></uni-icons>
+												<view class="u-m-l-16">添加商品</view>
+											</view>
+										</view>
+
+									</view>
+									<uni-forms-item label="几选几" showRequired required>
+										<uni-number-box :max="item.goods.length" :width="200" v-model="item.number"
+											placeholder="几选几"></uni-number-box>
+									</uni-forms-item>
+
+									<view class="u-flex u-m-t-30 u-m-b-20" @tap="delGroupSnap(index)">
+										<uni-icons type="minus-filled" :size="26" :color="color.ColorRed"></uni-icons>
+										<view class="u-m-l-16">删除分组</view>
+									</view>
+								</view>
+							</view>
+
+							<view class="bg-fff u-flex u-m-t-32 border-r-12 default-box-padding"
+								@tap="refChooseGoodsOpen">
+								<uni-icons type="plus-filled" :color="color.ColorMain" :size="26"></uni-icons>
+								<view class="u-m-l-16">添加分组</view>
+							</view>
+						</template>
+
+						<template v-if="FormData.typeEnum!=='sku'">
+							<view class="u-m-t-32 u-font-32 u-m-l-10 u-m-b-32">规格属性</view>
+							<view class="block" v-for="(sku,index) in skuList" :key="index">
+								<view class="border-top-0">
+									<uni-forms-item label="售价">
+										<uni-easyinput :paddingNone="inputPaddingNone"
+											@blur="priceFormat(sku,'salePrice')" :placeholderStyle="placeholderStyle"
+											:inputBorder="inputBorder" v-model="sku.salePrice" type="digit"
+											placeholder="请输入售价（元）" />
+									</uni-forms-item>
+								</view>
+
+								<uni-forms-item label="会员价（元）">
+									<uni-easyinput @blur="priceFormat(sku,'memberPrice')"
+										:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="sku.memberPrice" type="digit"
+										placeholder="请输入会员价（元）" />
+								</uni-forms-item>
+								<uni-forms-item label="成本价（元）">
+									<uni-easyinput @blur="priceFormat(sku,'costPrice')" :paddingNone="inputPaddingNone"
+										:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+										v-model="sku.costPrice" type="digit" placeholder="请输入成本价（元）" />
+								</uni-forms-item>
+								<uni-forms-item label="原价（元）">
+									<uni-easyinput @blur="priceFormat(sku,'originPrice')"
+										:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="sku.originPrice" type="digit"
+										placeholder="请输入原价（元）" />
+								</uni-forms-item>
+								<uni-forms-item label="起售数量">
+									<uni-easyinput @blur="priceFormat(sku,'suit')" :paddingNone="inputPaddingNone"
+										:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+										v-model="sku.suit" type="digit" placeholder="请输入起售数量" />
+								</uni-forms-item>
+								<uni-forms-item label="库存数量">
+									<uni-easyinput @blur="priceFormat(sku,'stockNumber')"
+										:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="sku.stockNumber" type="digit"
+										placeholder="请输入库存数量" />
+								</uni-forms-item>
+								<uni-forms-item label="分销金额">
+									<uni-easyinput :paddingNone="inputPaddingNone"
+										@blur="priceFormat(sku,'firstShared')" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="sku.firstShared" type="digit"
+										placeholder="请输入起售数量" />
+								</uni-forms-item>
+								<uni-forms-item label="商品条码">
+									<uni-easyinput disabled :paddingNone="inputPaddingNone"
+										:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+										v-model="sku.barCode" placeholder="请输入起售数量" />
+								</uni-forms-item>
+							</view>
+						</template>
+
+						<template v-if="FormData.typeEnum==='group'">
+							<view class="block">
+								<view class="border-top-0">
+									<uni-forms-item label="使用日期说明" required showRequired>
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.dateUsed"
+												placeholder="请输入使用日期说明" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="可用时间说明" required showRequired>
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.availableTime"
+												placeholder="请输入可用时间说明" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="预约方式" required showRequired>
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.bookingType"
+												placeholder="请输入预约方式" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="退款说明" required showRequired>
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.refundPolicy"
+												placeholder="请输入退款说明" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="团购价说明">
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.groupPurInfo"
+												placeholder="请输入团购价说明" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="门市价/划线价说明">
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.marketPriceInfo"
+												placeholder="请输入门市价/划线价说明" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="折扣说明">
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.discountInfo"
+												placeholder="请输入折扣说明" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="发票说明">
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.invoiceInfo"
+												placeholder="请输入发票说明" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="使用规则">
+										<view class="bg-gray">
+											<uni-easyinput type="textarea"
+												:styles="{backgroundColor:'rgb(246,246,246)'}"
+												:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+												:inputBorder="inputBorder" v-model="FormData.notices.usageRules"
+												placeholder="请输入使用规则" />
+										</view>
+
+									</uni-forms-item>
+								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="排序">
+										<uni-easyinput @blur="priceFormat(FormData,'sort')"
+											:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+											:inputBorder="inputBorder" v-model="FormData.sort" type="digit"
+											placeholder="请输入排序" />
+									</uni-forms-item>
+								</view>
+
+							</view>
+						</template>
+
+						<template v-if="FormData.typeEnum!='group'">
+							<view class="block">
+								<view class="border-top-0">
+									<uni-forms-item label="上架区域">
+										<view class="u-flex">
+											<view class="u-m-r-30">
+												<my-radio text="收银台" v-model="FormData.isShowCash"></my-radio>
+											</view>
+											<my-radio text="小程序商城" v-model="FormData.isShowMall"></my-radio>
+										</view>
+									</uni-forms-item>
+								</view>
+								<uni-forms-item label="">
+									<view class="u-flex u-row-between">
+										<view class="label-title">库存开关</view>
+										<my-switch v-model="FormData.isStock"></my-switch>
+									</view>
+									<view class="color-999 u-m-t-16 u-font-24">注：关闭则不计算出入库数据</view>
+								</uni-forms-item>
+								<uni-forms-item label="">
+									<view class="u-flex u-row-between">
+										<view class="label-title">标签打印</view>
+										<my-switch v-model="FormData.enableLabel"></my-switch>
+									</view>
+									<view class="color-999 u-m-t-16 u-font-24">开启后: 收银完成后会自动打印对应数量的标签数</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-forms-item>
+								<uni-forms-item label="虚拟销量">
+									<uni-easyinput @blur="priceFormat(FormData,'baseSalesNumber')"
+										:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="FormData.baseSalesNumber" type="digit"
+										placeholder="请输入虚拟销量" />
+								</uni-forms-item>
+								<template v-if="option.type==='edit'">
+									<uni-forms-item label="排序">
+										<uni-easyinput @blur="priceFormat(FormData,'sort')"
+											:paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+											:inputBorder="inputBorder" v-model="FormData.sort" type="digit"
+											placeholder="请输入排序" />
+									</uni-forms-item>
+								</template>
+							</view>
+						</template>
+
+
+
+
+						<!-- <view class="block">
+							<view class="border-top-0">
+								<uni-forms-item label="" required>
+									<view class="u-flex u-row-between lh40">
+										<view class="label-title">打折设置</view>
+										<my-switch v-model="FormData.openDiscount"
+											@change="openDiscountChange"></my-switch>
+									</view>
+								</uni-forms-item>
+							</view>
+							<view class="border-top-0 none-label" v-if="FormData.openDiscount">
+								<uni-forms-item label="" required>
+									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="FormData.discountPrice" type="digit"
+										placeholder="请填写折后价" />
+								</uni-forms-item>
+							</view>
+							<uni-forms-item label="" required>
+								<view class="u-flex u-row-between lh40">
+									<view class="label-title">不参与会员折扣</view>
+									<my-switch v-model="FormData.isVipDiscount"></my-switch>
+								</view>
+							</uni-forms-item>
+							<uni-forms-item label="会员价（元）" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.vipPrice" type="digit"
+									placeholder="请输入会员价（元）" />
+							</uni-forms-item>
+							<uni-forms-item label="包装费（元）" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.packagingFee" type="digit"
+									placeholder="请输入包装费（元）" />
+							</uni-forms-item>
+							<uni-forms-item label="重量（千克）" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.weight" type="digit"
+									placeholder="请输入重量（千克）" />
+							</uni-forms-item>
+							<uni-forms-item label="赠送积分" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.integral" type="digit"
+									placeholder="请输入赠送积分" />
+							</uni-forms-item>
+
+						</view> -->
+
+						<!-- <view class="block">
+							<view class="border-top-0 ">
+								<uni-forms-item label="" required>
+									<view class="u-flex u-row-between lh40">
+										<view class="label-title">每日销量上限</view>
+										<my-switch v-model="FormData.openDailySalesLimit"></my-switch>
+									</view>
+								</uni-forms-item>
+							</view>
+							<view class="border-top-0 none-label" v-if="FormData.openDailySalesLimit">
+								<uni-forms-item label="" required>
+									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="FormData.dailySalesLimit" type="digit"
+										placeholder="请填写每日销量上限" />
+								</uni-forms-item>
+							</view>
+							<uni-forms-item label="" required>
+								<view class="u-flex u-row-between lh40">
+									<view class="label-title">每单限购</view>
+									<my-switch v-model="FormData.openOrderBuyLimit"></my-switch>
+								</view>
+							</uni-forms-item>
+							<view class="border-top-0 none-label" v-if="FormData.openOrderBuyLimit">
+								<uni-forms-item label="" required>
+									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="FormData.orderBuyLimit" type="digit"
+										placeholder="请填写每单限购" />
+								</uni-forms-item>
+							</view>
+							<uni-forms-item label="" required>
+								<view class="u-flex u-row-between lh40">
+									<view class="label-title">每人限购</view>
+									<my-switch v-model="FormData.openEveryoneBuyLimit"></my-switch>
+								</view>
+							</uni-forms-item>
+							<view class="border-top-0 none-label" v-if="FormData.openEveryoneBuyLimit">
+								<uni-forms-item label="" required>
+									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="FormData.everyoneBuyLimit" type="digit"
+										placeholder="请填写每人限购" />
+								</uni-forms-item>
+							</view>
+							<uni-forms-item label="最低起售（件）" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.minBuyLimit" type="number"
+									placeholder="请输入最低起售（件）" />
+							</uni-forms-item>
+							<uni-forms-item label="包装费（元）" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.packagingFee" type="digit"
+									placeholder="请输入包装费（元）" />
+							</uni-forms-item>
+							<uni-forms-item label="">
+								<view class="u-flex u-row-between" @tap="toTimerPage">
+									<view>
+										<view class="label-title">定时上下架</view>
+									</view>
+									<view class="u-flex">
+										<view class="color-666">{{returnTimerText()}}</view>
+										<uni-icons type="right"></uni-icons>
+									</view>
+								</view>
+							</uni-forms-item>
+
+							<uni-forms-item label="虚拟销量" required>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.virtualSales" type="number"
+									placeholder="虚拟销量" />
+							</uni-forms-item>
+							<uni-forms-item label="" required>
+								<view class="u-flex u-row-between lh40">
+									<view class="label-title">设为推荐</view>
+									<my-switch v-model="FormData.isRecommend"></my-switch>
+								</view>
+							</uni-forms-item>
+
+						</view> -->
+
+					</uni-forms>
+					<view style="height: 200rpx;"></view>
+					<view class="bootom">
+						<view class="save-btn-box">
+							<my-button shape="circle" @tap="save">保存</my-button>
+						</view>
+						<view class="u-m-t-20" v-if="option.type==='edit'" @click="delModelShow">
+							<my-button bgColor="#fff" shape="circle" type="cancel" >
+								<view class="color-red">删除该商品</view>
+							</my-button>
+						</view>
+					</view>
+					
+				</view>
+			</template>
+
+			<template v-if="tabsCurrent===1">
+				<view class="stock">
+					<uni-forms :border="false" err-show-type="toast" validateTrigger="submit" ref="Forms1">
+						<!-- <view class="block ">
+							<uni-forms-item label="" required>
+								<view class="u-flex">
+									<view class="label-title">库存模式</view>
+									<view class="u-flex-1 u-p-l-100">
+										<uni-data-checkbox v-model="stockData.inventoryMode"
+											:localdata="InventoryModeData"></uni-data-checkbox>
+									</view>
+								</view>
+							</uni-forms-item>
+						</view> -->
+						<view class="block ">
+							<uni-forms-item label="">
+								<view class="u-flex u-row-between">
+									<view class="label-title">库存开关</view>
+									<my-switch v-model="FormData.isStock"
+										@change="updateProductStatus(FormData.id,'isStock')"></my-switch>
+								</view>
+							</uni-forms-item>
+						</view>
+						<view class="block ">
+							<uni-forms-item label="">
+								<view class="u-flex u-row-between">
+									<view class="label-title">共享库存</view>
+									<my-switch v-model="FormData.isDistribute"
+										@change="updateProductStatus(FormData.id,'isDistribute')"></my-switch>
+								</view>
+							</uni-forms-item>
+						</view>
+						<view class="block ">
+							<uni-forms-item label="">
+								<view class="u-flex u-row-between">
+									<view class="label-title">售罄</view>
+									<my-switch v-model="FormData.isPauseSale"
+										@change="updateProductStatus(FormData.id,'isPauseSale')"></my-switch>
+								</view>
+							</uni-forms-item>
+						</view>
+
+						<template v-if="FormData.typeEnum!=='sku'">
+							<view class="block ">
+								<uni-forms-item label="">
+									<view class="u-flex u-row-between">
+										<view class="label-title">上架</view>
+										<my-switch v-model="FormData.isGrounding"
+											@change="updateProductStatus(FormData.id,'isGrounding')"></my-switch>
+									</view>
+								</uni-forms-item>
+							</view>
+							<view class="block default-box-padding">
+								<view class="u-flex">
+									<view class="">
+										<my-button @tap="toRecoders" :height="60">库存记录</my-button>
+									</view>
+									<view class="u-m-l-40">
+										<my-button :height="60" @tap="toCheck">库存盘点</my-button>
+									</view>
+								</view>
+							</view>
+						</template>
+
+
+						<template v-else>
+							<view class="block default-box-padding">
+								<view class="u-flex">
+									<view class="">
+										<my-button @tap="toRecoders" :height="60">库存记录</my-button>
+									</view>
+								</view>
+							</view>
+							<view class="u-text-center block">
+								<view class="u-flex font-bold u-m-t-30 u-m-b-20">
+									<!-- <view class="u-flex-1">商品信息</view> -->
+									<view class="u-flex-1">规格</view>
+									<view class="u-flex-1">库存</view>
+									<view class="u-flex-1">售罄</view>
+									<view class="u-flex-1">上架</view>
+									<view class="u-flex-1">操作</view>
+								</view>
+								<view class="" v-for="(item,index) in pageData.skuList" :key="index">
+									<view class="u-flex u-p-b-12 u-p-t-12 ">
+										<view class="u-flex-1">{{item.specSnap}}</view>
+										<!-- <view class="u-flex-1">{{item.salePrice}}</view> -->
+										<view class="u-flex-1">{{item.stockNumber}}{{item.unitName}}</view>
+										<view class="u-flex-1 u-flex u-row-center"><my-switch v-model="item.isPauseSale"
+												@change="updateProductStatus(item.skuId,'isPauseSale')"></my-switch>
+										</view>
+										<view class="u-flex-1 u-flex u-row-center"><my-switch v-model="item.isGrounding"
+												@change="updateProductStatus(item.skuId,'isGrounding')"></my-switch>
+										</view>
+										<view class="u-flex u-row-center">
+											<my-button @tap="skuToCheck(item)" :width="120" :height="40">
+												<view class="u-font-24 no-wrap">库存盘点</view>
+											</my-button>
+											<!-- <my-button @tap="moreShow(item,index)" :width="100" :height="40">
+												<view class="u-font-24 no-wrap">更多</view>
+											</my-button> -->
+										</view>
+									</view>
+
+								</view>
+							</view>
+
+						</template>
+
+						<!-- <view class="block ">
+							<uni-forms-item label="" required>
+								<view class="u-flex">
+									<view class="label-title">剩余库存数量</view>
+									<view class="u-flex-1 u-p-l-40">
+										<uni-easyinput :paddingNone="inputPaddingNone"
+											:placeholderStyle="placeholderStyle" type="number"
+											:inputBorder="inputBorder" v-model="FormData.stockNumber"
+											placeholder="填写库存" />
+									</view>
+								</view>
+							</uni-forms-item>
+						</view> -->
+						<!-- <view class="block ">
+							<uni-forms-item label="" required>
+								<view class="u-flex">
+									<view class="label-title">库存模式</view>
+									<view class="u-flex-1 u-p-l-100">
+										<uni-data-checkbox v-model="stockData.inventoryReset"
+											:localdata="InventoryReset"></uni-data-checkbox>
+									</view>
+								</view>
+							</uni-forms-item>
+						</view> -->
+					</uni-forms>
+
+					<view class="btns">
+						<my-button shape="circle">保存</my-button>
+						<my-button shape="circle" type="default" @tap="back">取消</my-button>
+					</view>
+				</view>
+			</template>
+		</view>
+
+		<my-model @confirm="modelConfirm" :showIcon="modelProps.showIcon" ref="model" :desc="modelProps.desc">
+			<template #btn>
+				<slot name="btn">
+					<view class="u-flex u-row-center u-p-b-40">
+						<my-button @click="closeModel" :width="500">确定</my-button>
+					</view>
+				</slot>
+			</template>
+		</my-model>
+
+
+
+
+	</view>
+
+	<!-- 删除弹窗 -->
+	<my-model @confirm="delmodelConfirm" ref="delModel" desc="确认删除">
+	</my-model>
+	<!-- 选择商品 -->
+	<choose-goods ref="refChooseGoods" @confirm="refChooseGoodsConfirm" :category="pageData.category"></choose-goods>
+	<!-- 更多操作 -->
+	<my-action-sheet @itemClick="actionSheetClick" ref="refMoreSheet" :list="actionSheet.list"></my-action-sheet>
+</template>
+
+<script setup>
+	import {
+		ColorMain
+	} from '@/commons/color.js'
+	import dayjs from "dayjs";
+	import {
+		formatPrice
+	} from "@/commons/utils/format.js";
+
+	import go from '@/commons/utils/go.js';
+	import color from '@/commons/color.js';
+
+	import myModel from '@/components/my-components/my-model'
+	import chooseGoods from './components/choose-goods'
+	import chooseGroupCategory from './components/choose-coupon-category'
+	import myRadio from '@/components/my-components/my-radio'
+	import myUploadFile from '@/components/my-components/my-upload-file'
+	import myTabs from '@/components/my-components/my-tabs'
+	import myButton from '@/components/my-components/my-button'
+	import mySwitch from '@/components/my-components/my-switch.vue'
+	import infoBox from "@/commons/utils/infoBox.js"
+	import {
+		$types,
+		$defaultSku
+	} from '../goodsData.js'
+	import {
+		$getProductDetail,
+		$tbShopCategory,
+		$tbShopUnit,
+		$addProduct,
+		$updateProduct,
+		$delProduct,
+		$productSpec,
+		$updateProductStatus,
+		$updateGrounding
+	} from '@/http/yskApi/goods.js'
+
+	import {
+		$getProductSku
+	} from '@/http/yskApi/sku.js'
+	import {
+		onLoad,
+		onShow,
+		onReady
+	} from '@dcloudio/uni-app';
+
+	import {
+		computed,
+		onBeforeUnmount,
+		onUnmounted,
+		reactive,
+		ref,
+		watch,
+		nextTick
+	} from 'vue';
+
+	function toRecoders() {
+		go.to('PAGES_PRODUCT_INVOICING_LIST', {
+			productId: FormData.id
+		})
+	}
+
+	function toCheck() {
+		go.to('PAGES_PRODUCT_INVOICING_CHECK', {
+			productId: $goodsData.id,
+			name: $goodsData.name,
+			skuId: $goodsData.skuList[0].id
+		})
+	}
+
+	function skuToCheck(item) {
+		go.to('PAGES_PRODUCT_INVOICING_CHECK', {
+			productId: $goodsData.id,
+			name: $goodsData.name,
+			skuId: $goodsData.skuList[0].id,
+			stock: item.stockNumber,
+			price: item.salePrice
+		})
+	}
+
+	// 更新库存设置
+	function updateProductStatus(id, key) {
+		if (key === 'isGrounding') {
+			return $updateGrounding({
+				skuId: id,
+				isGrounding: FormData[key] === 1
+			}).then(res => {
+				infoBox.showSuccessToast('更新成功')
+			})
+		}
+		const updateKey = key.replace('is', '')
+		$updateProductStatus({
+			updateKey: updateKey.substr(0, 1).toLowerCase() + updateKey.substr(1, updateKey.length),
+			updateValue: FormData[key],
+			targetId: id
+		}).then(res => {
+			infoBox.showSuccessToast('更新成功')
+		})
+	}
+
+	// 选择团购券分类	
+	const refChooseGroupCategory = ref(null)
+
+	function refChooseCouponCategoryConfirm(arr) {
+		arr = arr.map(v => {
+			return {
+				name: v.name,
+				id: v.id
+			}
+		})
+		refChooseGroupCategoryClose()
+		FormData.groupCategoryId = arr
+	}
+
+	function groupCategoryIdDel(index) {
+		FormData.groupCategoryId.splice(index, 1)
+	}
+
+	function refChooseGroupCategoryOpen() {
+		refChooseGroupCategory.value.open()
+	}
+
+	function refChooseGroupCategoryClose() {
+		refChooseGroupCategory.value.close()
+	}
+
+	//套餐商品选择
+	const refChooseGoods = ref(null)
+	let groupSnapIndex = undefined
+
+	function groupSnapAddGoods(index, arr) {
+		console.log(arr);
+		groupSnapIndex = index
+		refChooseGoods.value.open(arr.map(v => v.id))
+	}
+
+	function refChooseGoodsOpen() {
+		groupSnapIndex = undefined
+		refChooseGoods.value.open()
+	}
+
+	function refChooseGoodsClose() {
+		refChooseGoods.value.close()
+	}
+
+	function refChooseGoodsConfirm(arr) {
+		console.log(arr);
+		refChooseGoodsClose()
+		arr = arr.map(v => {
+			const {
+				id,
+				name,
+				groupNum,
+				unitName,
+				categoryId
+			} = v
+			return {
+				id,
+				name,
+				groupNum,
+				unitName,
+				categoryId
+			}
+		})
+		if (groupSnapIndex !== undefined) {
+			return FormData.groupSnap[groupSnapIndex].goods = arr
+		}
+		FormData.groupSnap.push({
+			title: '',
+			number: 1,
+			goods: arr
+		})
+	}
+
+	function groupSnapGoodsDel(index, goodsIndex) {
+		FormData.groupSnap[index].goods.splice(goodsIndex, 1)
+	}
+
+	function delGroupSnap(index) {
+		FormData.groupSnap.splice(index, 1)
+	}
+
+
+	function back() {
+		uni.navigateBack()
+	}
+
+	// 商品图片组件
+	const refFile = ref(null)
+
+
+
+
+	//表单相关事件
+	function changeFormData(key, val) {
+		FormData[key] = val
+	}
+
+
+	function unitIdChange(e) {
+		console.log(e);
+		FormData.unitName = e.detail.value[0].text
+	}
+
+	function specIdChange(e) {
+
+	}
+
+
+	//number类型数据限制
+	function priceFormat(item, key) {
+		nextTick(() => {
+			const min = 0;
+			const max = 100000000;
+			console.log(item[key]);
+			const newval = formatPrice(item[key], min, max, true)
+			console.log(newval)
+			if (typeof newval !== 'number') {
+				item[key] = newval.value
+				uni.showToast({
+					title: `请输入${min}到${max}范围内的数字`,
+					icon: 'none'
+				})
+			} else {
+				item[key] = newval
+			}
+			console.log(item);
+		})
+	}
+
+
+	// 库存模式
+	const InventoryModeData = [{
+			text: '传统模式',
+			value: 0
+		},
+		{
+			text: '进销存模式',
+			value: 1
+		}
+	]
+	const InventoryReset = [{
+			text: '不重置',
+			value: 0
+		},
+		{
+			text: '每天重置',
+			value: 1
+		}
+	]
+	const model = ref(null)
+	const delModel = ref(null)
+	const rules = {
+		images: {
+			rules: [{
+				validateFunction: function(rule, value, data, callback) {
+					console.log(value);
+					if (value.length < 1) {
+						callback('请上传商品图片')
+					}
+					return true
+				}
+			}]
+		},
+		name: {
+			rules: [{
+					required: true,
+					errorMessage: '请输入商品名称',
+				},
+				{
+					minLength: 1,
+					maxLength: 20,
+					errorMessage: '商品名称长度在 {minLength} 到 {maxLength} 个字符',
+				}
+			]
+		},
+		categoryId: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择商品分类',
+			}]
+		},
+		floorPrice: {
+			rules: [{
+				required: true,
+				errorMessage: '请填写商品底价',
+			}]
+		}
+	}
+	let modelProps = {
+		desc: '1为只能预约当天，大于1为今天及往后几天，最多15天',
+		showIcon: false
+	}
+
+	function delmodelConfirm() {
+		console.log('delmodelConfirm');
+		$delProduct([option.productId]).then(res => {
+			uni.showToast({
+				icon: 'none',
+				title: '删除成功'
+			})
+			setTimeout(() => {
+				go.back()
+			}, 1000)
+		})
+	}
+
+	function delModelShow() {
+		delModel.value.open()
+	}
+
+
+	function showModel(type) {
+		if (type === 'help') {
+			modelProps = {
+				desc: '1为只能预约当天，大于1为今天及往后几天，最多15天',
+				showIcon: false
+			}
+			model.value.open()
+		}
+		if (type === 'stockTips') {
+			modelProps = {
+				desc: '清先保存商品基础信息',
+				showIcon: false
+			}
+			model.value.open()
+		}
+	}
+
+	function modelConfirm() {
+		console.log('modelConfirm');
+	}
+
+	function closeModel() {
+		model.value.close()
+		if (tabsCurrent.value === 1) {
+			go.back()
+		}
+	}
+	// 售卖方式时间
+	const DeliveryTime = [{
+		value: '1',
+		name: '时间'
+	}, {
+		value: '2',
+		name: '付款'
+	}]
+
+	//返回当前时间多少天后的时间戳
+	function nowDateAfterDayTemp(day) {
+		const daytem = 1000 * 60 * 60 * 24
+		return Date.now() + daytem * day
+	}
+
+	const limitDay = 90
+	const limitDayTime = nowDateAfterDayTemp(limitDay)
+
+
+	let DeliveryTimeCurrent = ref(0)
+
+	function DeliveryTimeChange(e) {
+		console.log(e.detail.value);
+
+	}
+
+
+	const tabsList = ['基础设置', '库存设置']
+	const Forms = ref(null)
+
+
+	// 表单样式 
+	//可以不使用ref，但是小程序一堆wraning ，烦，改为了ref
+	const placeholderStyle = ref('font-size:28rpx;')
+	const inputPaddingNone = ref(true)
+
+	//规格模板类型
+	const specificationMode = [{
+			text: '普通',
+			value: '普通'
+		},
+		{
+			text: '图片式',
+			value: '图片式'
+		},
+		{
+			text: '规格模版',
+			value: '规格模版'
+		}
+	]
+	let myTest = ref(false)
+	//表单边框
+	const inputBorder = ref(false)
+	//商品表单数据
+	// const FormData = reactive({
+	// 	images: [],
+	// 	name: '',
+	// 	goodsCode: '',
+	// 	shortTitle: '',
+	// 	goodsDetail: '',
+	// 	goodsDetail: '',
+	// 	categoryId: '',
+	// 	salesMethod: 0,
+	// 	startTime: '',
+	// 	isStock: false,
+	// 	isVipDiscount: false,
+	// 	packagingFee: 0,
+	// 	weight: 0,
+	// 	integral: 0,
+	// 	openDailySalesLimit: false,
+	// 	dailySalesLimit: '',
+	// 	openOrderBuyLimit: false,
+	// 	orderBuyLimit: 0,
+	// 	openEveryoneBuyLimit: false,
+	// 	everyoneBuyLimit: 0,
+	// 	minBuyLimit: 0,
+	// 	specificationsPattern: '',
+	// 	specificationsGroup: '',
+	// 	paySuccessAfterDay: '',
+	// 	openDiscount: false,
+	// 	discountPrice: 0,
+	// 	isVipDiscount: false,
+	// 	vipPrice: 0,
+	// 	packagingFee: 0,
+	// 	virtualSales: 0,
+	// 	isRecommend: false,
+	// 	timer: [],
+	// 	isShowCash: 1,
+	// 	isShowMall: 1,
+	// })
+	const FormData = reactive({
+		id: "",
+		typeEnum: "normal",
+		specificationsGroup: '',
+		name: "",
+		shortTitle: "", //商品介绍
+		unitId: "",
+		unitName: "",
+		categoryId: "", // 商品分类id
+		coverImg: "",
+		images: [],
+		shopId: uni.getStorageSync('shopId'),
+		lowPrice: "",
+		skuList: [],
+		isShowMall: 1,
+		isShowCash: 1,
+		isStock: 0,
+		packFee: 0,
+		specId: "",
+		baseSalesNumber: 0,
+		sort: 0,
+		groupSnap: [],
+		specInfo: [],
+		selectSpec: [],
+		specTableHeaders: [],
+		skuSnap: "",
+		groupCategoryId: [],
+		notices: {
+			availableTime: "",
+			bookingType: "",
+			dateUsed: "",
+			discountInfo: "",
+			groupPurInfo: "",
+			invoiceInfo: "",
+			marketPriceInfo: "",
+			platformTips: "",
+			refundPolicy: "",
+			usageRules: ""
+		}
+	})
+	const skuList = reactive([{
+		...$defaultSku,
+		barCode: `${uni.getStorageSync("shopId")}${dayjs().valueOf()}`
+	}])
+	//库存表单数据
+	const stockData = reactive({
+		inventoryMode: 0,
+		isStock: false,
+		stockNumbers: 0,
+		inventoryReset: 0
+	})
+
+	//售卖方式
+	const salesMethod = reactive({
+		list: ['现货', '预售', '仅展示商品'],
+		defaultIndex: 0,
+	})
+
+	function salesMethodChange(e) {
+		FormData.salesMethod = e.detail.value
+		salesMethod.defaultIndex = e.detail.value
+	}
+
+	// 判断是否为一个空对象
+	function isEmpty(obj) {
+		return obj && JSON.stringify(obj) !== '{}'
+	}
+	let option = reactive({
+		type: 'add',
+		productId: ''
+	})
+
+	let $goodsData = {}
+
+	function getGoodsDetail() {
+		$getProductDetail(option.productId).then(res => {
+			res.images = res.images.map(v => {
+				return {
+					url: v
+				}
+			})
+			$goodsData = res
+			Object.assign(FormData, res)
+			if (res.skuList.length) {
+				for (let i in res.skuList) {
+					skuList[i] = res.skuList[i]
+				}
+			}
+			//多规格
+			if (res.typeEnum === 'sku') {
+				const selectSpec = JSON.parse(res.selectSpec)
+				// const specInfo=JSON.parse(res.specInfo)
+				console.log(selectSpec);
+				// console.log(specInfo);
+				const specMap = selectSpec.reduce((prve, cur) => {
+					cur.value.map(v => {
+						prve[typeof v === 'string' ? v : v.text] = cur.name
+					})
+					return prve
+				}, {})
+				console.log(specMap);
+				FormData.specificationsGroup = {
+					specId: res.specId,
+					selectSpec: selectSpec.map(s => {
+						return {
+							...s,
+							// value: s.value.map(v => {
+							// 	return {
+							// 		text: v,
+							// 		value: v
+							// 	}
+							// })
+
+						}
+					}),
+					result: res.skuList.map(v => {
+						const names = v.specSnap.split(',').reduce((prve, cur) => {
+							const key = specMap[cur]
+							prve[key] = cur
+							return prve
+						}, {})
+						return {
+							skus: {
+								...v
+							},
+							names,
+							specSnap: v.specSnap
+						}
+					}),
+					specList: [],
+				}
+			}
+
+		})
+	}
+
+	//获取分类
+	function getCategory() {
+		$tbShopCategory({
+			page: 0,
+			size: 200
+		}).then(res => {
+			pageData.category = res.content.reduce((prve, cur) => {
+				prve.push(...[{
+					...cur,
+					name: '' + cur.name
+				}, ...cur.childrenList.map(v => {
+					return {
+						...v,
+						name: '' + v.name
+					}
+				})])
+				return prve
+			}, [])
+			// pageData.category = res.content.map(v => {
+			// 	return {
+			// 		...v,
+			// 		children: v.childrenList,
+			// 		childrenList: undefined,
+			// 	}
+			// })
+
+		})
+	}
+
+	//默认值表单初始化
+	function defaultValueInit() {
+		if (option.productId === '') {
+			// FormData.typeEnum = pageData.types[0].value
+			FormData.barCode = `${uni.getStorageSync('shopId')}${dayjs().valueOf()}`
+		}
+	}
+
+	//获取单位数据
+	function getTbShopUnit() {
+		$tbShopUnit({
+			page: 0,
+			size: 200,
+			sort: "id"
+		}).then(res => {
+			pageData.units = res.content.map(v => {
+				return {
+					...v,
+					children: v.childrenList,
+					childrenList: undefined,
+				}
+			})
+		})
+	}
+	//获取规格数据
+	function getTbProductSpec() {
+		$productSpec.get({
+			page: 0,
+			size: 200,
+			sort: "id"
+		}).then(res => {
+			pageData.specList = res.content.map(v => {
+				return {
+					...v,
+					children: v.childrenList,
+					childrenList: undefined,
+				}
+			})
+		})
+	}
+	//页面全部数据
+	const pageData = reactive({
+		// 商品类型
+		types: $types,
+		// 单位
+		units: [],
+		// 分类
+		category: [],
+		// 规格
+		specList: [],
+		//库存
+		skuList: []
+	})
+	//查询商品库存
+	function getProductSku() {
+		$getProductSku(option.productId).then(res => {
+			pageData.skuList = res
+		})
+	}
+	onLoad((params) => {
+		if (isEmpty(params)) {
+			option.type = params.type ? params.type : 'add'
+			option.productId = params.productId
+
+			// getGoodsDetail()
+			// getProductSku()
+		}
+
+		console.log(option.type);
+		uni.setNavigationBarTitle({
+			title: option.type === 'add' ? '添加商品' : '编辑商品'
+		})
+		defaultValueInit()
+		getCategory()
+		getTbShopUnit()
+		getTbProductSpec()
+	})
+
+	onShow(() => {
+		if (option.type === 'edit') {
+			getGoodsDetail()
+			getProductSku()
+		}
+	})
+
+
+
+
+	function openDiscountChange() {
+
+	}
+
+
+
+
+	let tabsCurrent = ref(0)
+
+	function tabsChange(i) {
+		tabsCurrent.value = i
+		// if (tabsCurrent.value === 1 && option.type === 'add') {
+		// 	showModel('stockTips')
+		// }
+	}
+
+	let timer = null
+
+	function settimeoutBack(time) {
+		clearTimeout(timer)
+		timer = setTimeout(() => {
+			uni.navigateBack()
+		}, time)
+	}
+
+	//保存
+	function save() {
+		Forms.value.validate().then(res => {
+			const {
+				typeEnum,
+				groupCategoryId
+			} = FormData
+			if (typeEnum === 'group' && !groupCategoryId.length) {
+				return infoBox.showToast('请选择团购券分类')
+			}
+			// if(typeEnum==='sku'){
+			// 	return infoBox.showErrorToast('请选择规格')
+			// }
+			const images = refFile.value.getFileList()
+			const skuSnap = []
+			const submitSkuList = FormData.specificationsGroup ? skuList : [{
+				...$defaultSku,
+				barCode: `${uni.getStorageSync("shopId")}${dayjs().valueOf()}`
+			}]
+			if (FormData.specificationsGroup) {
+				for (let i of FormData.specificationsGroup.selectSpec) {
+					if (i.selectSpecResult.length) {
+						skuSnap.push({
+							label: i.name,
+							value: i.selectSpecResult.join(',')
+						})
+					}
+				}
+			}
+
+			const submitData = {
+				...FormData,
+				images: images,
+				coverImg: images[0] || '',
+				skuList: submitSkuList,
+				specInfo: JSON.stringify(submitSkuList),
+				lowPrice: submitSkuList[0].salePrice,
+				specificationsGroup: undefined,
+				selectSpec: JSON.stringify(FormData.specificationsGroup.selectSpec),
+				skuSnap: JSON.stringify(skuSnap)
+			}
+			//编辑
+			if (option.type === 'edit') {
+				return $updateProduct(submitData).then(res => {
+					infoBox.showSuccessToast('更新成功')
+					settimeoutBack(1500)
+				})
+			}
+			submitData.selectSpec =
+				$addProduct(submitData).then(res => {
+					infoBox.showSuccessToast('添加成功')
+					settimeoutBack(1500)
+				})
+		}).catch(err => {
+			console.log(err);
+		})
+	}
+
+
+	const returnSpecificationsGroup = computed(() => {
+
+		if (!FormData.specificationsGroup.length) {
+			return '添加规格组'
+		}
+		if (FormData.specificationsGroup.length) {
+			let result = FormData.specificationsGroup.reduce((prve, cur) => {
+				return prve + cur.GroupName + '、'
+			}, '')
+			return result.replace(/.$/, "")
+		}
+	})
+
+	/**
+	 *  监听规格保存,拿到数据
+	 * @param {Boolean} open //控制开启或关闭监听
+	 */
+	function watchSpecificationsSave(open = true) {
+		if (open) {
+			uni.$on('emitspecificationsSave', function(data) {
+				FormData.specificationsGroup = data
+				skuList.length = data.result.length
+				for (let i in data.result) {
+					const v = data.result[i]
+					skuList[i] = {
+						...v.skus,
+						...v.names,
+						specSnap: v.specSnap,
+					}
+				}
+				console.log(skuList);
+			})
+		} else {
+			uni.$off('emitspecificationsSave', function(data) {
+				console.log('emitspecificationsSave remove');
+			})
+		}
+
+	}
+
+	function toGroup() {
+		// go.to('PAGES_PRODUCT_GUIGE_CHOOSE', {
+		// 	productId: option.productId
+		// })
+	}
+
+	function toGuige() {
+		uni.setStorageSync('guige', FormData.specificationsGroup)
+		go.to('PAGES_PRODUCT_GUIGE_CHOOSE', {
+			emitName: 'emitspecificationsSave',
+			productId: option.productId
+		})
+		// go.to('PAGES_PRODUCT_GUIGE_ADD', {
+		// 	emitName: 'emitspecificationsSave',
+		// })
+	}
+
+	/**
+	 *  监听定时器保存,拿到数据
+	 * @param {Boolean} open //控制开启或关闭监听
+	 */
+	function watchTimerSave(open = true) {
+		if (open) {
+			uni.$on('timerSave', function(timer) {
+				console.log('timerSave get');
+				console.log(timer);
+				FormData.timer = timer
+			})
+		} else {
+			uni.$off('timerSave', function(data) {
+				console.log('timerSave remove');
+			})
+		}
+
+	}
+
+	function toTimerPage() {
+		uni.setStorageSync('timer', FormData.timer)
+		go.to('PAGES_PRODUCT_TIMER')
+	}
+
+	function returnTimerText() {
+		return FormData.timer.length ? `当前有${FormData.timer.length}个定时器` : '没有定时器'
+	}
+
+
+	// 更多操作
+	const refMoreSheet = ref(null)
+	let selItem = {
+		data: '',
+		index: ''
+	}
+	const actionSheet = reactive({
+		list: ['库存记录', '库存盘点']
+	})
+
+	function moreShow(item, index) {
+		refMoreSheet.value.open()
+		selItem.data = item
+		selItem.index = index
+	}
+
+	function actionSheetClick(index) {
+		console.log(index);
+		if (index === 0) {
+			return go.to('PAGES_PRODUCT_INVOICING_LIST', {
+				productId: FormData.id
+			})
+
+		}
+		if (index === 1) {
+			return
+		}
+	}
+
+
+	watch(() => FormData.typeEnum, (newval) => {
+		if (option.type === 'add') {
+			if (newval === 'sku') {
+				skuList.length = 0
+			} else {
+				skuList[0] = {
+					...$defaultSku,
+					barCode: `${uni.getStorageSync("shopId")}${dayjs().valueOf()}`
+				}
+			}
+		}
+	})
+	watchSpecificationsSave()
+	watchTimerSave()
+	onBeforeUnmount(() => {
+		watchSpecificationsSave(false)
+		watchTimerSave(false)
+	})
+	onReady(() => {
+		Forms.value.setRules(rules)
+	})
+	watch(() => pageData.types, (newval) => {
+		Forms.value.setRules(rules)
+	})
+</script>
+<style scoped>
+	page {
+		background: #F9F9F9;
+	}
+</style>
+<style lang="scss" scoped>
+	.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;
+	}
+
+	.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: 10px;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.box {
+		margin-top: 36rpx;
+		font-size: 28rpx;
+		.block {
+			background: #FFFFFF;
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
+			padding: 12rpx 24rpx;
+			margin-bottom: 32rpx;
+		}
+	}
+
+
+	::v-deep.uni-forms-item {
+		align-items: inherit;
+	}
+
+	::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;
+	}
+
+	::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 .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;
+	}
+
+	.types {
+		.item {
+			padding: 6rpx 20rpx;
+			border: 1px solid #bbb;
+			border-radius: 8rpx;
+			margin-right: 30rpx;
+			margin-bottom: 20rpx;
+			text-align: center;
+			position: relative;
+
+			.gou {
+				display: none;
+				position: absolute;
+				right: 0;
+				top: 0;
+				background-color: $my-main-color;
+				width: 32rpx;
+				height: 32rpx;
+				clip-path: polygon(100% 0, 0 0, 100% 100%);
+			}
+		}
+
+		.active {
+			border-color: $my-main-color;
+
+			.gou {
+				display: flex;
+			}
+
+			.title {
+				color: $my-main-color;
+			}
+		}
+
+		&.disabled {
+			position: relative;
+
+			&::after {
+				position: absolute;
+				content: '';
+				display: block;
+				left: 0;
+				right: 0;
+				top: 0;
+				bottom: 0;
+			}
+
+			.item {
+				background-color: #f9f9f9;
+				border-color: #eee;
+
+				&.active {
+					border-color: rgba(49, 138, 254, .3);
+				}
+
+				.gou {
+					opacity: .5;
+				}
+
+				.title {
+					color: #999;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index b13bd6f..a954931 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="u-p-30 safe-page">
 		<up-sticky v-if="option.type==='edit'" offset-top="20" zIndex="99">
-			<myTabs :list="tabsList" @change="tabsChange"></myTabs>
+			<myTabs :list="tabsList"  v-model="tabsCurrent"></myTabs>
 		</up-sticky>
 
 		<view class="box">
@@ -11,19 +11,30 @@
 						err-show-type="toast" validateTrigger="submit" label-width="350" ref="Forms">
 						<view class="block">
 							<uni-forms-item label="商品类型" required showRequired>
-								<view class="u-flex u-flex-wrap types " :class="{disabled:option.productId!==''}">
+								 <up-radio-group
+								 :disabled="option.type=='edit'"
+								    v-model="FormData.typeEnum"
+								    placement="row"
+								  >
+								    <up-radio
+								      :customStyle="{marginRight: '30px'}"
+								      v-for="(item, index) in pageData.types"
+								      :key="index"
+								      :label="item.name"
+								      :name="item.value"
+								    >
+								    </up-radio>
+								  </up-radio-group>
+								<!-- <view class="u-flex u-flex-wrap types " :class="{disabled:option.productId!==''}">
 									<view class="item" @tap="changeFormData('typeEnum',item.value)"
 										:class="{active:FormData.typeEnum===item.value}"
 										v-for="(item,index) in pageData.types" :key="index">
-										<!-- <view class="gou u-flex u-row-right u-col-top u-p-t-4 u-p-r-4">
-											<uni-icons type="checkmarkempty" :size="8" color="#fff"></uni-icons>
-										</view> -->
 										<view class="title">{{item.title}}</view>
 										<view class="u-font-24 color-999 u-m-t-10">
 											{{item.desc}}
 										</view>
 									</view>
-								</view>
+								</view> -->
 
 							</uni-forms-item>
 							<uni-forms-item ref="fileItem" label="图片">
@@ -38,11 +49,6 @@
 							</uni-forms-item>
 							<template v-if="FormData.typeEnum!='group'">
 								<uni-forms-item label="所属分类" required showRequired name="categoryId">
-									<!-- <picker @change="bindPickerChange" 
-									range-key="name"
-									:value="pageData.category" :range="pageData.category">
-										<view class="uni-input">请选择分类</view>
-									</picker> -->
 									<uni-data-picker :clear-icon="false" :map="{text:'name',value:'id'}"
 										placeholder="请选择分类" popup-title="请选择分类" :localdata="pageData.category"
 										v-model="FormData.categoryId">
@@ -50,10 +56,6 @@
 								</uni-forms-item>
 							</template>
 
-							<!-- <uni-forms-item label="产品编码">
-								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
-									:inputBorder="inputBorder" v-model="FormData.goodsCode" placeholder="请输入商品编码" />
-							</uni-forms-item> -->
 							<view class="border-top-0">
 								<uni-forms-item label="商品描述">
 									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
@@ -726,161 +728,27 @@
 
 					</uni-forms>
 					<view style="height: 200rpx;"></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>
+					</view>
 					<view class="bootom">
 						<view class="save-btn-box">
 							<my-button shape="circle" @tap="save">保存</my-button>
 						</view>
-
-						<view class="u-m-t-20" v-if="option.type==='edit'" @click="delModelShow">
-							<my-button shape="circle" type="cancel" bgColor="#fff">
+						<!-- <view class="u-m-t-20" v-if="option.type==='edit'" @click="delModelShow">
+							<my-button bgColor="#fff" shape="circle" type="cancel" >
 								<view class="color-red">删除该商品</view>
 							</my-button>
-							<!-- <text>删除该商品</text> -->
-						</view>
+						</view> -->
 					</view>
-
+					
 				</view>
 			</template>
 
 			<template v-if="tabsCurrent===1">
-				<view class="stock">
-					<uni-forms :border="false" err-show-type="toast" validateTrigger="submit" ref="Forms1">
-						<!-- <view class="block ">
-							<uni-forms-item label="" required>
-								<view class="u-flex">
-									<view class="label-title">库存模式</view>
-									<view class="u-flex-1 u-p-l-100">
-										<uni-data-checkbox v-model="stockData.inventoryMode"
-											:localdata="InventoryModeData"></uni-data-checkbox>
-									</view>
-								</view>
-							</uni-forms-item>
-						</view> -->
-						<view class="block ">
-							<uni-forms-item label="">
-								<view class="u-flex u-row-between">
-									<view class="label-title">库存开关</view>
-									<my-switch v-model="FormData.isStock"
-										@change="updateProductStatus(FormData.id,'isStock')"></my-switch>
-								</view>
-							</uni-forms-item>
-						</view>
-						<view class="block ">
-							<uni-forms-item label="">
-								<view class="u-flex u-row-between">
-									<view class="label-title">共享库存</view>
-									<my-switch v-model="FormData.isDistribute"
-										@change="updateProductStatus(FormData.id,'isDistribute')"></my-switch>
-								</view>
-							</uni-forms-item>
-						</view>
-						<view class="block ">
-							<uni-forms-item label="">
-								<view class="u-flex u-row-between">
-									<view class="label-title">售罄</view>
-									<my-switch v-model="FormData.isPauseSale"
-										@change="updateProductStatus(FormData.id,'isPauseSale')"></my-switch>
-								</view>
-							</uni-forms-item>
-						</view>
-
-						<template v-if="FormData.typeEnum!=='sku'">
-							<view class="block ">
-								<uni-forms-item label="">
-									<view class="u-flex u-row-between">
-										<view class="label-title">上架</view>
-										<my-switch v-model="FormData.isGrounding"
-											@change="updateProductStatus(FormData.id,'isGrounding')"></my-switch>
-									</view>
-								</uni-forms-item>
-							</view>
-							<view class="block default-box-padding">
-								<view class="u-flex">
-									<view class="">
-										<my-button @tap="toRecoders" :height="60">库存记录</my-button>
-									</view>
-									<view class="u-m-l-40">
-										<my-button :height="60" @tap="toCheck">库存盘点</my-button>
-									</view>
-								</view>
-							</view>
-						</template>
-
-
-						<template v-else>
-							<view class="block default-box-padding">
-								<view class="u-flex">
-									<view class="">
-										<my-button @tap="toRecoders" :height="60">库存记录</my-button>
-									</view>
-								</view>
-							</view>
-							<view class="u-text-center block">
-								<view class="u-flex font-bold u-m-t-30 u-m-b-20">
-									<!-- <view class="u-flex-1">商品信息</view> -->
-									<view class="u-flex-1">规格</view>
-									<view class="u-flex-1">库存</view>
-									<view class="u-flex-1">售罄</view>
-									<view class="u-flex-1">上架</view>
-									<view class="u-flex-1">操作</view>
-								</view>
-								<view class="" v-for="(item,index) in pageData.skuList" :key="index">
-									<view class="u-flex u-p-b-12 u-p-t-12 ">
-										<view class="u-flex-1">{{item.specSnap}}</view>
-										<!-- <view class="u-flex-1">{{item.salePrice}}</view> -->
-										<view class="u-flex-1">{{item.stockNumber}}{{item.unitName}}</view>
-										<view class="u-flex-1 u-flex u-row-center"><my-switch v-model="item.isPauseSale"
-												@change="updateProductStatus(item.skuId,'isPauseSale')"></my-switch>
-										</view>
-										<view class="u-flex-1 u-flex u-row-center"><my-switch v-model="item.isGrounding"
-												@change="updateProductStatus(item.skuId,'isGrounding')"></my-switch>
-										</view>
-										<view class="u-flex u-row-center">
-											<my-button @tap="skuToCheck(item)" :width="120" :height="40">
-												<view class="u-font-24 no-wrap">库存盘点</view>
-											</my-button>
-											<!-- <my-button @tap="moreShow(item,index)" :width="100" :height="40">
-												<view class="u-font-24 no-wrap">更多</view>
-											</my-button> -->
-										</view>
-									</view>
-
-								</view>
-							</view>
-
-						</template>
-
-						<!-- <view class="block ">
-							<uni-forms-item label="" required>
-								<view class="u-flex">
-									<view class="label-title">剩余库存数量</view>
-									<view class="u-flex-1 u-p-l-40">
-										<uni-easyinput :paddingNone="inputPaddingNone"
-											:placeholderStyle="placeholderStyle" type="number"
-											:inputBorder="inputBorder" v-model="FormData.stockNumber"
-											placeholder="填写库存" />
-									</view>
-								</view>
-							</uni-forms-item>
-						</view> -->
-						<!-- <view class="block ">
-							<uni-forms-item label="" required>
-								<view class="u-flex">
-									<view class="label-title">库存模式</view>
-									<view class="u-flex-1 u-p-l-100">
-										<uni-data-checkbox v-model="stockData.inventoryReset"
-											:localdata="InventoryReset"></uni-data-checkbox>
-									</view>
-								</view>
-							</uni-forms-item>
-						</view> -->
-					</uni-forms>
-
-					<view class="btns">
-						<my-button shape="circle">保存</my-button>
-						<my-button shape="circle" type="default" @tap="back">取消</my-button>
-					</view>
-				</view>
+				<edit-haocai :goods="FormData" @cancel="changeTabsCurrent(0)"></edit-haocai>
 			</template>
 		</view>
 
@@ -894,11 +762,8 @@
 			</template>
 		</my-model>
 
-
-
-
-	</view>
-
+	
+	
 	<!-- 删除弹窗 -->
 	<my-model @confirm="delmodelConfirm" ref="delModel" desc="确认删除">
 	</my-model>
@@ -906,6 +771,9 @@
 	<choose-goods ref="refChooseGoods" @confirm="refChooseGoodsConfirm" :category="pageData.category"></choose-goods>
 	<!-- 更多操作 -->
 	<my-action-sheet @itemClick="actionSheetClick" ref="refMoreSheet" :list="actionSheet.list"></my-action-sheet>
+	</view>
+
+
 </template>
 
 <script setup>
@@ -922,6 +790,7 @@
 
 	import myModel from '@/components/my-components/my-model'
 	import chooseGoods from './components/choose-goods'
+	import editHaocai from './components/edit-haocai.vue'
 	import chooseGroupCategory from './components/choose-coupon-category'
 	import myRadio from '@/components/my-components/my-radio'
 	import myUploadFile from '@/components/my-components/my-upload-file'
@@ -929,6 +798,7 @@
 	import myButton from '@/components/my-components/my-button'
 	import mySwitch from '@/components/my-components/my-switch.vue'
 	import infoBox from "@/commons/utils/infoBox.js"
+	
 	import {
 		$types,
 		$defaultSku
@@ -1274,7 +1144,13 @@
 	}
 
 
-	const tabsList = ['基础设置', '库存设置']
+	const tabsList = ['基础设置', '耗材绑定']
+	let tabsCurrent = ref(0)
+	function changeTabsCurrent(newval){
+		tabsCurrent.value=newval
+	}
+	
+	
 	const Forms = ref(null)
 
 
@@ -1545,7 +1421,11 @@
 	//页面全部数据
 	const pageData = reactive({
 		// 商品类型
-		types: $types,
+		// types: $types,
+		types: [
+			{name:'单规格',value:'normal'},
+			{name:'多规格',value:'sku'}
+		],
 		// 单位
 		units: [],
 		// 分类
@@ -1597,14 +1477,7 @@
 
 
 
-	let tabsCurrent = ref(0)
 
-	function tabsChange(i) {
-		tabsCurrent.value = i
-		// if (tabsCurrent.value === 1 && option.type === 'add') {
-		// 	showModel('stockTips')
-		// }
-	}
 
 	let timer = null
 
@@ -1809,7 +1682,7 @@
 		watchTimerSave(false)
 	})
 	onReady(() => {
-		Forms.value.setRules(rules)
+		Forms.value&&Forms.value.setRules(rules)
 	})
 	watch(() => pageData.types, (newval) => {
 		Forms.value.setRules(rules)
@@ -1884,13 +1757,13 @@
 		position: fixed;
 		left: 110rpx;
 		right: 110rpx;
-		bottom: 110rpx;
+		bottom: 140rpx;
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 
 	.box {
-		margin-top: 70rpx;
+		margin-top: 36rpx;
 		font-size: 28rpx;
-
 		.block {
 			background: #FFFFFF;
 			border-radius: 18rpx 18rpx 18rpx 18rpx;
diff --git a/pageProduct/add-Product/components/choose-danwei.vue b/pageProduct/add-Product/components/choose-danwei.vue
new file mode 100644
index 0000000..4daf729
--- /dev/null
+++ b/pageProduct/add-Product/components/choose-danwei.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="u-relative choose-haocai">
+		<view class="input u-flex" @click="toggle" >
+			<up-input @blur="blur"   @change="filterHaocaiList" border="none" v-model="text" placeholder="请选择"></up-input>
+			<up-icon :size="10" name="arrow-down-fill"></up-icon>
+		</view>
+		<view class="u-absolute" v-if="popShow">
+			<scroll-view scroll-y="true" class="scroll">
+				<view class="item" v-for="(item,index) in $haocaiList" :key="index" @click="haocaiClick(item,index)">
+					{{item.name}}
+				</view>
+				<view class="item no-wrap" @click="toggle" v-if="text&&!$haocaiList.length">没有该单位</view>
+			</scroll-view>
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref,
+		watch,
+		onMounted
+	} from 'vue';
+	const props = defineProps({
+		listMap: {
+			type: Object,
+			default: () => {}
+		},
+		list: {
+			type: Array,
+			default: () => []
+		},
+		modelValue: {
+			type: [String, Number],
+			default: ''
+		},
+		show: {
+			type: Boolean,
+			default: false
+		},
+
+	})
+	let text = ref('')
+	
+	let popShow = ref(props.show)
+	const emits = defineEmits(['update:show', 'close', 'confirm', 'update:modelValue'])
+
+	function close() {
+		popShow.value = false
+	}
+
+	function confirm() {
+		popShow.value = false
+	}
+	watch(() => props.show, (newval) => {
+		popShow.value = newval
+		
+	})
+	watch(() => popShow.value, (newval) => {
+		console.log(newval);
+		emits('update:show', newval)
+	})
+	let $haocaiList = ref(props.list)
+	watch(() => props.list, (newval) => {
+		$haocaiList.value = newval
+		setText()
+	})
+	watch(() => props.modelValue, (newval) => {
+		console.log(newval);
+		setText()
+	})
+	
+	
+
+	function setText() {
+		// const item = props.listMap[props.modelValue]
+		// text.value = item ? item.name : ''
+		text.value=props.modelValue
+	}
+
+	function toggle(e) {
+		popShow.value = !popShow.value
+	}
+
+	function filterHaocaiList(e) {
+		if (e === '') {
+			return $haocaiList.value = props.list
+		}
+		const arr = props.list.filter(v => v.name.match(e))
+		$haocaiList.value = arr
+	}
+
+	function haocaiClick(item, index) {
+		console.log(item);
+		// if (item.id != props.modelValue) {
+		// 	emits('update:modelValue', item.id)
+		// }
+		if(item.name!=props.modelValue){
+				emits('update:modelValue', item.name)
+		}
+		popShow.value = false
+	}
+	
+	function focus(){
+		console.log('focus');
+		popShow.value = true
+	}
+	function blur() {
+		console.log('blur');
+		setTimeout(()=>{
+			popShow.value = false
+		},100)
+	}
+	onMounted(() => {
+		setText()
+	})
+</script>
+
+<style lang="scss" scoped>
+	.choose-haocai {
+		.input {
+			width: 172rpx;
+			padding: 10rpx 16rpx;
+			height: 60rpx;
+			box-sizing: border-box;
+			background: #FFFFFF;
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border: 2rpx solid #E5E5E5;
+			overflow: hidden;
+		}
+
+
+		.u-absolute {
+			top: calc(100% + 10rpx);
+			border: 1px solid #E5E5E5;
+			left: 0;
+			background-color: #fff;
+			z-index: 10;
+			right: 0;
+			border-radius: 8rpx;
+
+			.scroll {
+				$line-h: 60rpx;
+				max-height: calc($line-h * 4);
+
+				.item {
+					line-height: $line-h;
+					padding: 0 20rpx;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/choose-haocai - 副本.vue b/pageProduct/add-Product/components/choose-haocai - 副本.vue
new file mode 100644
index 0000000..7ef8774
--- /dev/null
+++ b/pageProduct/add-Product/components/choose-haocai - 副本.vue	
@@ -0,0 +1,57 @@
+<template>
+	<up-popup :round="10" :show="popShow" :closeable="true" @close="close">
+		<view class="u-text-center font-bold u-font-32 u-p-t-30">选择状态</view>
+		<view style="height: 20rpx;"></view>
+		<view class="u-p-30 all-list u-flex u-flex-wrap gap-20">
+			<view class="all-list-item" :class="{active:statusItemIndex==statusData.allListSel}" @click="changeAllListSel(statusItemIndex)" v-for="(statusItem,statusItemIndex) in statusData.allList" :key="statusItemIndex">
+				{{statusItem.label}}
+			</view>
+		</view>
+		<view class="u-flex u-p-t-30 u-p-b-30 u-p-l-20 u-p-r-20 gap-20">
+			<up-button @click="close">取消</up-button>
+			<up-button type="primary" @click="confirm">确定</up-button>
+		</view>
+	</up-popup>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue';
+	const props=defineProps({
+		show:{
+			type:Boolean,
+			default:false
+		}
+	})
+	
+	let popShow=ref(props.show)
+	const emits=defineEmits(['update:show','close','confirm'])
+	function close(){
+		popShow.value=false
+	}
+	function confirm(){
+		popShow.value=false
+	}
+	watch(()=>props.show,(newval)=>{
+		popShow.value=newval
+	})
+	watch(()=>popShow.value,(newval)=>{
+		emits('update:show',newval)
+	})
+</script>
+
+<style lang="scss" scoped>
+	.all-list-item{
+		text-align: center;
+		width: 156rpx;
+		white-space: nowrap;
+		color: #666;
+		padding: 10rpx 20rpx;
+		border-radius: 8rpx;
+		transition: all .2s ease-in-out;
+		border: 1px solid #eee;
+		&.active {
+			color: $my-main-color;
+			border-color: $my-main-color;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/choose-haocai.vue b/pageProduct/add-Product/components/choose-haocai.vue
new file mode 100644
index 0000000..0b5cf16
--- /dev/null
+++ b/pageProduct/add-Product/components/choose-haocai.vue
@@ -0,0 +1,149 @@
+<template>
+	<view class="u-relative choose-haocai">
+		<view class="input u-flex" @click="toggle">
+			<!-- <view>
+				<text v-if="modelValue">{{modelValue}}</text>
+				<text v-else class="color-666">请选择</text>
+			</view> -->
+			<up-input @blur="blur" @change="filterHaocaiList" border="none" v-model="text" placeholder="请选择"></up-input>
+			<up-icon :size="10" name="arrow-down-fill"></up-icon>
+		</view>
+		<view class="u-absolute" v-if="popShow">
+			<scroll-view scroll-y="true" class="scroll">
+				<view class="item" v-for="(item,index) in $haocaiList" :key="index" @click="haocaiClick(item,index)">
+					{{item.conName}}
+				</view>
+				<view class="item no-wrap" @click="toggle" v-if="text&&!$haocaiList.length">没有该耗材</view>
+			</scroll-view>
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref,
+		watch,
+		onMounted
+	} from 'vue';
+	const props = defineProps({
+		listMap: {
+			type: Object,
+			default: () => {}
+		},
+		list: {
+			type: Array,
+			default: () => []
+		},
+		modelValue: {
+			type: [String, Number],
+			default: ''
+		},
+		show: {
+			type: Boolean,
+			default: false
+		},
+
+	})
+	let text = ref('')
+	let popShow = ref(props.show)
+	const emits = defineEmits(['update:show', 'close', 'confirm', 'update:modelValue','change'])
+
+	function close() {
+		popShow.value = false
+	}
+
+	function confirm() {
+		popShow.value = false
+	}
+	watch(() => props.show, (newval) => {
+		popShow.value = newval
+	})
+	watch(() => popShow.value, (newval) => {
+		emits('update:show', newval)
+	})
+	let $haocaiList = ref(props.list)
+	watch(() => props.list, (newval) => {
+		$haocaiList.value = newval
+		setText()
+	})
+	watch(() => props.modelValue, (newval) => {
+		setText()
+	})
+
+	function setText() {
+		const item = props.listMap[props.modelValue]
+		text.value = item ? item.conName : ''
+	}
+
+	function toggle(e) {
+		popShow.value = !popShow.value
+	}
+
+	function filterHaocaiList(e) {
+		if (e === '') {
+			return $haocaiList.value = props.list
+		}
+		const arr = props.list.filter(v => v.conName.match(e))
+		$haocaiList.value = arr
+	}
+
+	function haocaiClick(item, index) {
+		console.log(item);
+		if (item.consId != props.modelValue) {
+			emits('update:modelValue', item.consId)
+			emits('change', item)
+		}
+		popShow.value = false
+	}
+
+	function blur() {
+		setTimeout(()=>{
+			popShow.value = false
+		},100)
+	}
+	onMounted(() => {
+		setText()
+	})
+</script>
+
+<style lang="scss" scoped>
+	.choose-haocai {
+		.input {
+			width: 172rpx;
+			padding: 10rpx 16rpx;
+			height: 60rpx;
+			box-sizing: border-box;
+			background: #FFFFFF;
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border: 2rpx solid #E5E5E5;
+			overflow: hidden;
+		}
+
+
+		.u-absolute {
+			top: calc(100% + 10rpx);
+			border: 1px solid #E5E5E5;
+			left: 0;
+			background-color: #fff;
+			z-index: 10;
+			right: 0;
+			border-radius: 8rpx;
+
+			.scroll {
+				$line-h: 60rpx;
+				max-height: calc($line-h * 4);
+
+				.item {
+					line-height: $line-h;
+					padding: 0 20rpx;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/edit-haocai.vue b/pageProduct/add-Product/components/edit-haocai.vue
new file mode 100644
index 0000000..e27798d
--- /dev/null
+++ b/pageProduct/add-Product/components/edit-haocai.vue
@@ -0,0 +1,359 @@
+<template>
+	<view>
+		<view class="default-box-padding bg-fff border-r-18">
+			<view class="u-flex u-row-between">
+				<view>商品名称</view>
+				<template v-if="isSku">
+					<view class="u-flex u-font-24 color-666">
+						<view class="u-m-r-20">绑定至规格</view>
+						<up-switch :size="18" v-model="isBindGuige" :disabled="!isSku">绑定至规格</up-switch>
+					</view>
+				</template>
+			</view>
+			<view class="border-bottom u-m-t-16 u-p-b-32">{{goods.name}}</view>
+			<view class="">
+				<template v-if="isBindGuige&&isSku">
+					<view class="list">
+						<view class="u-p-b-32 u-p-t-32 border-bottom" v-for="(item,index) in skuList" :key="index">
+							<view>规格名称</view>
+							<view class="u-m-t-16">{{item.specSnap}}</view>
+							<view class="color-666 u-m-t-24 u-flex">
+								<view class="xuhao">序号</view>
+								<view class="u-flex u-flex-1 u-p-l-32 gap-20">
+									<view class="u-flex-1">耗材名称</view>
+									<view class="u-flex-1">单位</view>
+									<view class="u-flex-1">用量</view>
+								</view>
+							</view>
+							<view class="u-m-t-32 color-666">
+								<view class="u-m-t-24" v-for="(haocai,haocaiIndex) in item.haoaiList"
+									:key="haocaiIndex">
+									<view class="  u-flex">
+										<view class="xuhao">{{haocaiIndex+1}}</view>
+										<view class="u-flex u-flex-1 u-p-l-32 gap-20">
+											<view class="u-flex-1  ">
+												<view class="u-flex  input">
+													<view>{{item.name}}</view>
+													<up-icon :size="10" name="arrow-down-fill"></up-icon>
+												</view>
+											</view>
+											<view class="u-flex-1  ">
+												<view class="u-flex  input">
+													<view>{{item.unit}}</view>
+													<up-icon :size="10" name="arrow-down-fill"></up-icon>
+												</view>
+											</view>
+											<view class="u-flex-1  ">
+												<view class="u-flex  input">
+													<up-input border="none"></up-input>
+													<up-icon color="#EB4F4F" @click="delGuigeHaocao(index,haocaiIndex)"
+														:size="16" name="minus-circle-fill"></up-icon>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view class="u-flex u-m-t-16 color-666 u-font-24">
+										<view class="xuhao">
+										</view>
+										<view class="u-flex u-flex-1 u-p-l-32 gap-20">库存：{{item.stockNumber}}
+										</view>
+									</view>
+
+
+								</view>
+
+							</view>
+							<view class="u-flex">
+								<view class=" u-p-t-32 u-flex" @click="addGuigeHaocai(index)">
+									<up-icon :size="18" color="#318AFE" name="plus-circle-fill"></up-icon>
+									<view class="u-m-l-16">添加耗材</view>
+								</view>
+
+							</view>
+						</view>
+					</view>
+				</template>
+				<template v-else>
+					<view class="list">
+						<view class="u-p-b-32 u-p-t-32 border-bottom" v-for="(item,index) in conInfos" :key="index">
+							<view class="color-666  u-flex">
+								<view class="xuhao">序号</view>
+								<view class="u-flex u-flex-1 u-p-l-32 gap-20">
+									<view class="u-flex-1">耗材名称</view>
+									<view class="u-flex-1">单位</view>
+									<view class="u-flex-1">用量</view>
+								</view>
+							</view>
+							<view class="u-m-t-32 color-666">
+								<view class=" u-m-t-24 u-flex">
+									<view class="xuhao">{{index+1}}</view>
+									<view class="u-flex u-flex-1 u-p-l-32 gap-20">
+										<view class="u-flex-1  ">
+											<choose-haocai @change="conInfosChange($event,item)" :listMap="$haocaiMap"
+												:list="haoCaiList" v-model="item.conInfoId"></choose-haocai>
+											<!-- <view class="u-flex  input">
+												<view>{{item.conName}}</view>
+												<up-icon :size="10" name="arrow-down-fill"></up-icon>
+											</view> -->
+										</view>
+										<view class="u-flex-1  ">
+											<choose-danwei :listMap="$danweiMap" :list="danweiList"
+												v-model="item.conUnit"></choose-danwei>
+											<!-- <view class="u-flex  input">
+												<view>{{item.conUnit}}</view>
+												<up-icon :size="10" name="arrow-down-fill"></up-icon>
+											</view> -->
+										</view>
+										<view class="u-flex-1  ">
+											<view class="u-flex  input">
+												<up-input border="none" v-model="item.surplusStock"></up-input>
+												<up-icon @click="delHaocai(index)" color="#EB4F4F" :size="16"
+													name="minus-circle-fill"></up-icon>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="u-flex u-m-t-16 u-font-24" v-if="item.stockNumber">
+									<view class="xuhao">
+
+									</view>
+									<view class="u-flex u-flex-1 u-p-l-32 gap-20">库存：{{item.stockNumber}}
+										{{item.conUnit}}
+									</view>
+								</view>
+							</view>
+
+						</view>
+					</view>
+				</template>
+				<template v-if="!isBindGuige">
+					<view class="u-flex">
+						<view class=" u-p-t-32 u-flex" @click="addHaocai">
+							<up-icon :size="18" color="#318AFE" name="plus-circle-fill"></up-icon>
+							<view class="u-m-l-16">添加耗材</view>
+						</view>
+
+					</view>
+				</template>
+
+			</view>
+		</view>
+		<view class="default-box-padding bg-fff border-r-18 u-flex u-row-between u-m-t-32">
+			<view>当某个耗材的使用库存不足时，商品自动
+				售罄。</view>
+			<view class="u-flex u-p-l-32">
+				<up-switch :size="20"></up-switch>
+			</view>
+		</view>
+		<view class="bottom">
+			<my-button type="primary" shape="circle" @click="save">保存</my-button>
+			<my-button bgColor="#F9F9F9" shape="circle" color="#999" @click="cancel">取消</my-button>
+		</view>
+
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		toRefs,
+		watch,
+		computed,
+		onMounted
+	}
+	from 'vue';
+	import {
+		getviewConSku,
+		gettbProductSpec,
+		gettbConsInfo,
+		posttbProskuCons,
+		puttbProskuCon,
+		deletetbProskuCon,
+	} from "@/http/yskApi/consumable.js";
+	import {
+		tbShopCurrencyGet,$hasPermission
+	} from '@/http/yskApi/shop.js'
+
+	import chooseHaocai from './choose-haocai.vue';
+	import chooseDanwei from './choose-danwei.vue';
+	import {
+		$tbProskuConV2
+	} from '@/http/yskApi/goods.js'
+	const emits=defineEmits(['cancel'])
+	function cancel(){
+		emits('cancel')
+	}
+	const props = defineProps({
+		goods: {
+			type: Object,
+			default: () => {
+				return {
+					conInfos: [],
+					skuList: [],
+					typeEnum: ''
+				}
+			}
+		}
+	})
+
+	const conInfos = ref(props.goods.conInfos)
+	watch(() => props.goods.conInfos, (newval) => {
+		console.log(newval);
+		conInfos.value = newval
+	})
+	function conInfosChange(newval, item) {
+		console.log(newval);
+		item.stockNumber = newval.balance
+		item.conUnit = newval.conUnit
+	}
+	
+	const skuList = ref(props.goods.skuList)
+	watch(() => props.goods.skuList, (newval) => {
+		console.log(newval);
+		skuList.value = newval
+	})
+	
+	
+	
+
+
+	function addHaocai() {
+		conInfos.value.push({
+			conInfoId: '',
+			conUnit: '',
+			surplusStock: ''
+		})
+	}
+	const popup = reactive({
+		haocai: {
+			show: true
+		}
+	})
+
+	function addGuigeHaocai(index) {
+		console.log(index);
+	}
+
+	function delHaocai(index) {
+		const item = conInfos.value[index]
+		uni.showModal({
+			title: '提示',
+			content: '是否删除该耗材',
+			success(res) {
+				if (res.confirm) {
+					if (item.id) {
+						deletetbProskuCon([item.id]).then(res1 => {
+							conInfos.value.splice(index, 1)
+						})
+					} else {
+						conInfos.value.splice(index, 1)
+					}
+
+				}
+			}
+		})
+
+	}
+
+	function delGuigeHaocao(guigeIndex, haocaiIndex) {
+		skuList.value[guigeIndex].haoaiList.splice(haocaiIndex, 1)
+	}
+
+	// 是否是多规格商品
+	const isSku = computed(() => {
+		return props.goods.typeEnum == 'sku'
+	})
+	let isBindGuige = ref(isSku.value)
+	watch(() => props.goods.typeEnum, (newval) => {
+		isBindGuige.value = isSku.value
+	})
+
+	function save() {
+		console.log('save');
+		const isPas= conInfos.value.every(v=>{
+			return v.conInfoId&&v.conUnit&&v.surplusStock>0
+		})
+		console.log(isPas);
+		return 
+		let ajaxData = ''
+		if (!isBindGuige.value) {
+			//绑定至商品
+			ajaxData = conInfos.value.map(v => {
+				return {
+					conInfoId: v.conInfoId,
+					productId: props.goods.id,
+					shopId: uni.getStorageSync('shopId'),
+					productSkuId: 0,
+					surplusStock: v.surplusStock
+				}
+			})
+		} else {
+
+		}
+		console.log(ajaxData);
+		$tbProskuConV2(ajaxData)
+	}
+
+	let haoCaiList = ref([])
+	let $haocaiMap = reactive({})
+	let danweiList = ref([])
+	let $danweiMap = reactive({})
+
+	function init() {
+		gettbConsInfo({
+			page: 0,
+			size: 200
+		}).then(res => {
+			for (let i in res.content) {
+				const item = res.content[i]
+				$haocaiMap[item.consId] = item
+			}
+			haoCaiList.value = res.content
+
+		})
+		tbShopCurrencyGet({
+			page: 0,
+			size: 200
+		}).then(res => {
+			for (let i in res.content) {
+				const item = res.content[i]
+				$danweiMap[item.id] = item
+			}
+			danweiList.value = res.content
+		})
+	}
+	onMounted(() => {
+		init()
+	})
+</script>
+
+<style lang="scss" scoped>
+	.bottom {
+		padding: 84rpx 82rpx;
+	}
+
+	.xuhao {
+		width: 52rpx;
+		white-space: nowrap;
+	}
+
+	.input {
+		width: 172rpx;
+		padding: 10rpx 16rpx;
+		height: 60rpx;
+		box-sizing: border-box;
+		background: #FFFFFF;
+		border-radius: 8rpx 8rpx 8rpx 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		border: 2rpx solid #E5E5E5;
+		overflow: hidden;
+	}
+
+	.list .border-bottom:last-child {
+		border: none;
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-specifications/add-specifications - 副本 (2).vue b/pageProduct/add-specifications/add-specifications - 副本 (2).vue
new file mode 100644
index 0000000..1b8fcac
--- /dev/null
+++ b/pageProduct/add-specifications/add-specifications - 副本 (2).vue	
@@ -0,0 +1,499 @@
+<template>
+	<view class="page">
+		<view class="box">
+			<view class="block border-top-0">
+				<uni-forms ref="nameFormRef" :model="specifications" :rules="rules" :label-width="350"
+					label-position="top" validateTrigger="blur">
+					<uni-forms-item label="模版名称" required name="name">
+						<uni-easyinput :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+							v-model="specifications.name" placeholder="模版名称,如:衣服" />
+					</uni-forms-item>
+				</uni-forms>
+			</view>
+			<view v-for="(item,index) in specifications.list" :key="index">
+				<uni-forms :model="item" :rules="rules" err-show-type="undertext" validateTrigger="blur"
+					:ref="setFormRef(index)" :border="true" label-position="top" label-width="350">
+
+					<view class="block">
+						<view class="border-top-0">
+							<uni-forms-item label="规格组名" required name="name">
+								<uni-easyinput :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+									v-model="item.name" placeholder="规格组名,如:尺码" />
+							</uni-forms-item>
+						</view>
+						<uni-forms-item label="规格值">
+							<view class="option">
+								<view class="">
+									<view class="u-flex option-item" v-for="(option,optionIndex) in item.options"
+										:key="optionIndex">
+										<view class="u-flex-1">
+											<uni-forms-item :key="optionIndex" :name="['options',optionIndex,'name']"
+												:ref="setFormInputRef(index,optionIndex)"
+												:rules="[{'required': true,errorMessage: '必填'}]" label-width="0"
+												label="" required :showRequired="false">
+												<uni-easyinput
+													v-model="specifications.list[index].options[optionIndex].name"
+													@input="inpuChange(index,optionIndex)"
+													:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+													placeholder="请输入规格值,如:S、M" />
+											</uni-forms-item>
+
+										</view>
+										<view class="  u-flex">
+											<uni-forms-item :key="optionIndex" label-width="0" label=""
+												:showRequired="false">
+												<view class="u-flex">
+													<!-- <uni-easyinput v-model="specifications.list[index].options[optionIndex].optionPrice"
+													@input="inpuChange(index,optionIndex)"
+													
+														:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+														type="digit" placeholder="填写价格" /> -->
+
+													<view class="icon icon-reduce u-m-l-38"
+														@click="delOption(index,optionIndex)">
+
+													</view>
+												</view>
+
+											</uni-forms-item>
+
+										</view>
+									</view>
+								</view>
+								<view class="u-flex" @click="addOptions(index)">
+									<view class="icon icon-add u-m-r-22 ">
+
+									</view>
+									<view class="color-main">添加规格</view>
+								</view>
+
+
+							</view>
+						</uni-forms-item>
+
+						<view class="u-flex u-m-t-48 u-m-b-24" @click="delSpecificationsGroup(index)">
+							<view class="icon icon-reduce u-m-r-22 ">
+
+							</view>
+							<view class="color-red">删除规格组</view>
+						</view>
+					</view>
+				</uni-forms>
+			</view>
+			<view class="u-flex block u-p-l-20 u-p-r-20 u-p-t-28 u-p-b-28" @click="addSpecificationsGroup">
+				<view class="icon icon-add u-m-r-22 ">
+
+				</view>
+				<view class="color-main">添加规格组</view>
+			</view>
+
+			<view class="save-btn-box">
+				<button class="save-btn" hover-class="btn-hover-class" @click="save">保存</button>
+			</view>
+		</view>
+		<view class="bottom" ref="bottom"></view>
+	</view>
+</template>
+
+<script setup>
+	import go from '@/commons/utils/go.js';
+	import {
+		$productSpec
+	} from '@/http/yskApi/goods.js'
+	import {
+		onLoad,
+		onReady,
+	} from '@dcloudio/uni-app';
+	import infoBox from '@/commons/utils/infoBox.js'
+	import {
+		onMounted,
+		reactive,
+		nextTick,
+		ref,
+		onBeforeMount
+	} from 'vue';
+	const nameFormRef = ref(null)
+	// 表单样式
+	const placeholderStyle = ref('font-size:28rpx;')
+	//表单边框
+	const inputBorder = ref(false)
+	const form = ref(null)
+	const bottom = ref(null)
+	//表单验证
+	const rules = {
+		name: {
+			rules: [{
+				required: true,
+				errorMessage: '必填'
+			}]
+		},
+		MinOptional: {
+			rules: [{
+				required: true,
+				errorMessage: '必填'
+			}]
+		},
+		MaxOptional: {
+			rules: [{
+				required: true,
+				errorMessage: '必填'
+			}]
+		},
+		optionPrice: {
+			rules: [{
+				required: true,
+				errorMessage: '必填'
+			}]
+		}
+	}
+
+
+	// 构造规格的选项值的基础数据
+	const specificationsOptionsBasicData = {
+		name: '',
+		optionPrice: '0.00'
+	}
+
+	function returnOptionsBasicData() {
+		return {
+			...specificationsOptionsBasicData
+		}
+	}
+	// 构造规格的基础数据
+	const specificationsBasicData = {
+		name: '',
+		// MinOptional: 1,
+		// MaxOptional: 1,
+		options: []
+	}
+
+	function returnSpecificationsOptionsBasicData() {
+		return {
+			...specificationsBasicData,
+			options: [returnOptionsBasicData()]
+		}
+	}
+
+	function onFieldChange(e) {
+		console.log(e);
+	}
+	// 规格列表
+	const specifications = reactive({
+		name: '',
+		list: [returnSpecificationsOptionsBasicData()]
+	})
+
+
+
+	//添加规格组
+	function addSpecificationsGroup() {
+		specifications.list.push(returnSpecificationsOptionsBasicData())
+		scrollPageBottom()
+	}
+	//删除规格组
+	function delSpecificationsGroup(index) {
+		specifications.list.splice(index, 1)
+	}
+	// 向指定索引的规格组添加规格项
+	function addOptions(index) {
+		specifications.list[index].options.push(returnOptionsBasicData())
+	}
+	// 删除指定索引的规格组添加规格项
+	function delOption(index, optionIndex) {
+		specifications.list[index].options.splice(optionIndex, 1)
+	}
+	//页面滚动到最底部
+	function scrollPageBottom() {
+		nextTick(() => {
+			uni.pageScrollTo({
+				duration: 100, // 过渡时间
+				scrollTop: 100000, // 滚动的实际距离
+			})
+		})
+	}
+	//设置表单验证规则
+	function setFormRules() {
+		form.value.setRules(rules)
+	}
+	const formRefs = ref([]);
+	//绑定表单元素
+	function setFormRef(index) {
+		formRefs.value[index] = null;
+		return (el) => {
+			if (el) {
+				formRefs.value[index] = el;
+			}
+		};
+	}
+	// 绑定option input元素
+	const refFormInput = ref([])
+
+	function setFormInputRef(index, index1) {
+		const newIndex = index * 10000 + index1
+		return (el) => {
+			if (el) {
+				if (!refFormInput.value[newIndex]) {
+					refFormInput.value[newIndex] = el;
+				}
+			}
+		}
+	}
+	// 当表单内容输入变化根据配置的rules进行验证
+	function inpuChange(index, index1) {
+		const newIndex = index * 10000 + index1
+		console.log(refFormInput.value[newIndex]);
+		refFormInput.value[newIndex].onFieldChange()
+	}
+
+
+
+
+
+
+	const option = {
+		type: 'add',
+		id: undefined
+	}
+	onLoad(opt => {
+		console.log(opt);
+		if (opt && JSON.stringify(opt) !== '{}' && opt.type) {
+			option.type = opt.type
+			const data = uni.getStorageSync('spec')
+			uni.removeStorageSync('spec')
+			if(data){
+				specifications.name = data.name
+				specifications.id = data.id
+				specifications.list = data.specList.map(v => {
+					return {
+						...v,
+						options: v.value.map(v => {
+							return {
+								name: v
+							}
+						})
+					}
+				})
+			}
+			
+		}
+		uni.setNavigationBarTitle({
+			title: option.type === 'edit' ? '编辑规格模版' : '添加规格模版'
+		})
+
+	})
+
+	function returnPromise(prosise, index) {
+		return new Promise((resolve, reject) => {
+			prosise.then(res => {
+				console.log(res);
+				resolve({
+					sucees: true
+				})
+			}).catch(err => {
+				console.log(err);
+				resolve({
+					sucees: false
+				})
+			})
+		})
+	}
+
+	let timer = null
+
+	function settimeoutBack(time) {
+		clearTimeout(timer)
+		timer = setTimeout(() => {
+			uni.navigateBack()
+		}, time)
+	}
+	async function save() {
+		let isAllPassForm = 0
+		const nameFormRes = await returnPromise(nameFormRef.value.validate())
+		console.log(nameFormRes);
+		if (!nameFormRes.sucees) {
+			isAllPassForm -= 1
+		}
+		for (let i in specifications.list) {
+			const res = await returnPromise(formRefs.value[i].validate(), i)
+			isAllPassForm += res.sucees ? 1 : 0
+		}
+		//判断验证是否通过
+		if (isAllPassForm === specifications.list.length) {
+			console.log('pass');
+			const data = {
+				name: specifications.name,
+				id:specifications.id,
+				specList: specifications.list.map(v => {
+					return {
+						...v,
+						value: v.options.map(v => v.name),
+						options: undefined
+					}
+				})
+			}
+			if (option.type === 'add') {
+				return $productSpec.add(data).then(res => {
+					infoBox.showSuccessToast('添加成功')
+					settimeoutBack(1500)
+				})
+			}
+
+			$productSpec.update(data).then(res => {
+				infoBox.showSuccessToast('修改成功')
+				settimeoutBack(1500)
+			})
+		}
+
+	}
+</script>
+<style scoped>
+	page {
+		background: #F9F9F9;
+	}
+</style>
+<style lang="scss" scoped>
+	$icon-size: 34rpx;
+	$icon-line-width: 20rpx;
+	$icon-line-height: 4rpx;
+
+	.page {
+		background: #F9F9F9;
+		padding: 30rpx;
+		padding-bottom: 200rpx;
+	}
+
+	.my-switch {
+		transform: scale(0.7);
+	}
+
+	::v-deep .uni-forms-item__error {
+		display: none !important;
+	}
+
+	::v-deep .option .uni-forms-item {
+		padding: 0;
+		min-height: inherit;
+		background-color: transparent;
+		border-top: none;
+	}
+
+	.icon {
+		width: $icon-size;
+		height: $icon-size;
+		position: relative;
+		border-radius: 50%;
+
+		&:before,
+		&::after {
+			position: absolute;
+			display: block;
+			content: '';
+			background-color: #fff;
+		}
+	}
+
+	.icon-add {
+		background-color: $my-main-color;
+
+		&::before {
+			width: $icon-line-height;
+			height: $icon-line-width;
+			top: calc(($icon-size /2) - ($icon-line-width / 2));
+			left: calc(($icon-size /2) - ($icon-line-height / 2));
+		}
+
+		&::after {
+			width: $icon-line-width;
+			height: 4rpx;
+			top: calc(($icon-size /2) - ($icon-line-height / 2));
+			left: calc(($icon-size /2) - ($icon-line-width / 2));
+		}
+	}
+
+	.icon-reduce {
+		background-color: $my-red-color;
+
+		&::after {
+			width: $icon-line-width;
+			height: $icon-line-height;
+			top: calc(($icon-size /2) - ($icon-line-height / 2));
+			left: calc(($icon-size /2) - ($icon-line-width / 2));
+		}
+	}
+
+	.label-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		font-family: Source Han Sans CN, Source Han Sans CN;
+	}
+
+	.lh40 {
+		line-height: 40rpx;
+	}
+
+	.box {
+		margin-top: 70rpx;
+		font-size: 28rpx;
+
+		.block {
+			background: #FFFFFF;
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
+			padding: 12rpx 24rpx;
+			margin-bottom: 32rpx;
+		}
+	}
+
+	.save-btn-box {
+		position: fixed;
+		left: 30rpx;
+		right: 30rpx;
+		bottom: 60rpx;
+
+	}
+
+	::v-deep.uni-forms-item {
+		align-items: inherit;
+	}
+
+	::v-deep .uni-forms-item .uni-forms-item__label {
+		text-indent: 0;
+		font-size: 28rpx !important;
+		font-weight: bold;
+		color: #333;
+	}
+
+	::v-deep .border-top-0 .uni-forms-item.is-direction-top {
+		border-color: transparent !important;
+	}
+
+	.save-btn {
+		background-color: $my-main-color;
+		color: #fff;
+		border-radius: 12rpx;
+		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;
+	}
+
+	.option {
+		padding: 26rpx 30rpx 24rpx 24rpx;
+		background: #F9F9F9;
+	}
+
+	.option-item {
+		margin-bottom: 34rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-specifications/add-specifications.vue b/pageProduct/add-specifications/add-specifications.vue
index 1b8fcac..46772d8 100644
--- a/pageProduct/add-specifications/add-specifications.vue
+++ b/pageProduct/add-specifications/add-specifications.vue
@@ -1,53 +1,62 @@
 <template>
 	<view class="page">
 		<view class="box">
-			<view class="block border-top-0">
-				<uni-forms ref="nameFormRef" :model="specifications" :rules="rules" :label-width="350"
-					label-position="top" validateTrigger="blur">
-					<uni-forms-item label="模版名称" required name="name">
-						<uni-easyinput :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
-							v-model="specifications.name" placeholder="模版名称,如:衣服" />
-					</uni-forms-item>
-				</uni-forms>
-			</view>
 			<view v-for="(item,index) in specifications.list" :key="index">
 				<uni-forms :model="item" :rules="rules" err-show-type="undertext" validateTrigger="blur"
 					:ref="setFormRef(index)" :border="true" label-position="top" label-width="350">
-
 					<view class="block">
 						<view class="border-top-0">
-							<uni-forms-item label="规格组名" required name="name">
+							<uni-forms-item label="规格组名" required name="name" >
 								<uni-easyinput :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
-									v-model="item.name" placeholder="规格组名,如:尺码" />
+									v-model="item.name" placeholder="规格组名" />
 							</uni-forms-item>
 						</view>
-						<uni-forms-item label="规格值">
+						<!-- <uni-forms-item label="最少可选" required name="MinOptional" >
+							<uni-easyinput :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+								v-model="item.MinOptional" type="number" placeholder="填写最小数量" />
+						</uni-forms-item>
+						<uni-forms-item label="最大可选" required name="MaxOptional" >
+							<uni-easyinput :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
+								v-model="item.MaxOptional" type="number" placeholder="填写最大数量" />
+						</uni-forms-item> -->
+						<uni-forms-item label="选项值">
 							<view class="option">
-								<view class="">
-									<view class="u-flex option-item" v-for="(option,optionIndex) in item.options"
-										:key="optionIndex">
+								<view class="u-flex">
+									<view class="u-flex-1">名称</view>
+									<view class="u-flex-1 u-p-l-60">加价</view>
+								</view>
+								<view class="u-m-t-32">
+									<view class="u-flex option-item" 
+									
+									v-for="(option,optionIndex) in item.options"
+										:key="optionIndex" 
+										>
 										<view class="u-flex-1">
-											<uni-forms-item :key="optionIndex" :name="['options',optionIndex,'name']"
-												:ref="setFormInputRef(index,optionIndex)"
-												:rules="[{'required': true,errorMessage: '必填'}]" label-width="0"
-												label="" required :showRequired="false">
-												<uni-easyinput
-													v-model="specifications.list[index].options[optionIndex].name"
-													@input="inpuChange(index,optionIndex)"
+											<uni-forms-item :key="optionIndex" :name="['options',optionIndex,'optionName']" 
+											:ref="setFormInputRef(index,optionIndex)"
+											 :rules="[{'required': true,errorMessage: '必填'}]"
+											 label-width="0" label="" required  :showRequired="false"
+												>
+												<uni-easyinput v-model="specifications.list[index].options[optionIndex].optionName"
+												 @input="inpuChange(index,optionIndex)"
+												
 													:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
-													placeholder="请输入规格值,如:S、M" />
+													placeholder="选项名" />
 											</uni-forms-item>
 
 										</view>
-										<view class="  u-flex">
-											<uni-forms-item :key="optionIndex" label-width="0" label=""
-												:showRequired="false">
+										<view class="u-p-l-60 u-flex-1 u-flex">
+											<uni-forms-item :key="optionIndex" 
+											:rules="[{'required': true,errorMessage: '必填'}]"
+											:ref="setFormInputRef(index,optionIndex)"
+											:name="['options',optionIndex,'optionPrice']" label-width="0" label="" required  :showRequired="false"
+												>
 												<view class="u-flex">
-													<!-- <uni-easyinput v-model="specifications.list[index].options[optionIndex].optionPrice"
+													<uni-easyinput v-model="specifications.list[index].options[optionIndex].optionPrice"
 													@input="inpuChange(index,optionIndex)"
 													
 														:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
-														type="digit" placeholder="填写价格" /> -->
+														type="digit" placeholder="填写价格" />
 
 													<view class="icon icon-reduce u-m-l-38"
 														@click="delOption(index,optionIndex)">
@@ -70,7 +79,7 @@
 
 							</view>
 						</uni-forms-item>
-
+						        
 						<view class="u-flex u-m-t-48 u-m-b-24" @click="delSpecificationsGroup(index)">
 							<view class="icon icon-reduce u-m-r-22 ">
 
@@ -97,14 +106,10 @@
 
 <script setup>
 	import go from '@/commons/utils/go.js';
-	import {
-		$productSpec
-	} from '@/http/yskApi/goods.js'
 	import {
 		onLoad,
-		onReady,
+		onReady
 	} from '@dcloudio/uni-app';
-	import infoBox from '@/commons/utils/infoBox.js'
 	import {
 		onMounted,
 		reactive,
@@ -112,9 +117,8 @@
 		ref,
 		onBeforeMount
 	} from 'vue';
-	const nameFormRef = ref(null)
 	// 表单样式
-	const placeholderStyle = ref('font-size:28rpx;')
+	const placeholderStyle = ref('font-size:28rpx;') 
 	//表单边框
 	const inputBorder = ref(false)
 	const form = ref(null)
@@ -139,6 +143,12 @@
 				errorMessage: '必填'
 			}]
 		},
+		optionName: {
+			rules: [{
+				required: true,
+				errorMessage: '必填'
+			}]
+		},
 		optionPrice: {
 			rules: [{
 				required: true,
@@ -147,10 +157,10 @@
 		}
 	}
 
-
+	
 	// 构造规格的选项值的基础数据
 	const specificationsOptionsBasicData = {
-		name: '',
+		optionName: '',
 		optionPrice: '0.00'
 	}
 
@@ -162,8 +172,8 @@
 	// 构造规格的基础数据
 	const specificationsBasicData = {
 		name: '',
-		// MinOptional: 1,
-		// MaxOptional: 1,
+		MinOptional: 1,
+		MaxOptional: 1,
 		options: []
 	}
 
@@ -179,7 +189,6 @@
 	}
 	// 规格列表
 	const specifications = reactive({
-		name: '',
 		list: [returnSpecificationsOptionsBasicData()]
 	})
 
@@ -226,8 +235,7 @@
 		};
 	}
 	// 绑定option input元素
-	const refFormInput = ref([])
-
+	const refFormInput=ref([])
 	function setFormInputRef(index, index1) {
 		const newIndex = index * 10000 + index1
 		return (el) => {
@@ -244,104 +252,61 @@
 		console.log(refFormInput.value[newIndex]);
 		refFormInput.value[newIndex].onFieldChange()
 	}
+	
+	
+	
 
-
-
-
-
-
-	const option = {
-		type: 'add',
-		id: undefined
+	
+	
+	let emitName=''
+	function triggerEvent (emitName,data){
+		if(emitName){
+			uni.$emit(emitName,data)
+		}
 	}
-	onLoad(opt => {
+	onLoad(opt=>{
+		const arr=uni.getStorageSync('guige')
+		if(arr.length){
+			specifications.list=arr
+			console.log(arr);
+		}
 		console.log(opt);
-		if (opt && JSON.stringify(opt) !== '{}' && opt.type) {
-			option.type = opt.type
-			const data = uni.getStorageSync('spec')
-			uni.removeStorageSync('spec')
-			if(data){
-				specifications.name = data.name
-				specifications.id = data.id
-				specifications.list = data.specList.map(v => {
-					return {
-						...v,
-						options: v.value.map(v => {
-							return {
-								name: v
-							}
-						})
-					}
-				})
-			}
-			
+		if(opt&&JSON.stringify(opt)!=='{}'&&opt.emitName){
+			emitName=opt.emitName
 		}
 		uni.setNavigationBarTitle({
-			title: option.type === 'edit' ? '编辑规格模版' : '添加规格模版'
+			title:emitName?'编辑规格模版':'添加规格模版'
 		})
-
+		
 	})
-
-	function returnPromise(prosise, index) {
-		return new Promise((resolve, reject) => {
-			prosise.then(res => {
+	function emitspecificationsSave(){
+		// emitspecificationsSave  触发规格保存事件将数据给到添加商品页面
+		// guigeEdit  触发规格保存事件将数据给到添加规格页面
+		uni.removeStorageSync('guige')
+		triggerEvent(emitName,specifications.list)
+	}
+	function returnPromise(index,prosise){
+		return new Promise((resolve,reject)=>{
+			prosise.then(res=>{
 				console.log(res);
-				resolve({
-					sucees: true
-				})
-			}).catch(err => {
+				resolve({sucees:true})
+			}).catch(err=>{
 				console.log(err);
-				resolve({
-					sucees: false
-				})
+				resolve({sucees:false})
 			})
 		})
 	}
-
-	let timer = null
-
-	function settimeoutBack(time) {
-		clearTimeout(timer)
-		timer = setTimeout(() => {
-			uni.navigateBack()
-		}, time)
-	}
-	async function save() {
-		let isAllPassForm = 0
-		const nameFormRes = await returnPromise(nameFormRef.value.validate())
-		console.log(nameFormRes);
-		if (!nameFormRes.sucees) {
-			isAllPassForm -= 1
-		}
+	async function  save() {
+		let isAllPassForm=0
 		for (let i in specifications.list) {
-			const res = await returnPromise(formRefs.value[i].validate(), i)
-			isAllPassForm += res.sucees ? 1 : 0
+			const res=await returnPromise(i,formRefs.value[i].validate())
+			isAllPassForm+=res.sucees?1:0
 		}
 		//判断验证是否通过
-		if (isAllPassForm === specifications.list.length) {
+		if(isAllPassForm===specifications.list.length){
 			console.log('pass');
-			const data = {
-				name: specifications.name,
-				id:specifications.id,
-				specList: specifications.list.map(v => {
-					return {
-						...v,
-						value: v.options.map(v => v.name),
-						options: undefined
-					}
-				})
-			}
-			if (option.type === 'add') {
-				return $productSpec.add(data).then(res => {
-					infoBox.showSuccessToast('添加成功')
-					settimeoutBack(1500)
-				})
-			}
-
-			$productSpec.update(data).then(res => {
-				infoBox.showSuccessToast('修改成功')
-				settimeoutBack(1500)
-			})
+			emitspecificationsSave()
+			go.back()
 		}
 
 	}
diff --git a/pageProduct/index/components/baosun.vue b/pageProduct/index/components/baosun.vue
new file mode 100644
index 0000000..b84c66e
--- /dev/null
+++ b/pageProduct/index/components/baosun.vue
@@ -0,0 +1,134 @@
+<template>
+	<up-popup :show="popShow" @close="close" @open="open" mode="center" :round="9" :zIndex="999">
+		<view class="u-p-32 box u-font-28">
+			<view class="u-flex u-relative u-row-center">
+				<view class="u-font-32">报损</view>
+				<view class="u-absolute close">
+					<up-icon @click="close" :size="16" color="#000" name="close-circle-fill"></up-icon>
+				</view>
+			</view>
+			<view class="u-m-t-48">
+				<view>商品名称</view>
+				<view class="u-m-t-16">{{data.name}}</view>
+				<view class="u-m-t-38">
+					<view class="u-m-b-32">
+						<view class="u-flex ">
+							报损数量
+						</view>
+						<view class="u-m-t-16">
+							<up-input v-model="form.number">
+								<template #suffix>
+									<view>{{data.unitName}}</view>
+								</template>
+							</up-input>
+						</view>
+					</view>
+					<view class="u-m-b-32">
+						<view class="u-flex u-row-between">
+							<view>备注</view>
+						</view>
+						<view class="u-m-t-16">
+							<up-textarea :height="42" v-model="form.note" placeholder="请输入备注"></up-textarea>
+						</view>
+					</view>
+					<view class="u-m-b-32">
+						<view class="u-flex u-row-between">
+							<view>上传图片</view>
+						</view>
+						<view class="u-m-t-16">
+							<scroll-view scroll-y="true" style="max-height: 300rpx;">
+								<my-up-upload v-model="form.images"></my-up-upload>
+							</scroll-view>
+						</view>
+					</view>
+					<view class="u-m-t-60">
+						<my-button type="primary" shape="circle" @tap="save">
+							<view class="u-font-32">
+								保存
+							</view>
+						</my-button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</up-popup>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref,
+		watch,
+		onMounted
+	} from 'vue';
+	import {
+		returnSkuSnap,
+		returnTypeEnum,
+		returnCategory
+	} from '@/pageProduct/util.js'
+	import {
+		$tbShopUnit
+	} from '@/http/yskApi/goods.js'
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		},
+		category: {
+			type: Array,
+			default: () => []
+		},
+		goods: {
+			type: Object,
+			default: () => {
+				skuList: []
+			}
+		}
+	})
+	const data = ref(props.goods)
+	const emits = defineEmits(['update:show', 'save'])
+	const form = reactive({
+		note: '',
+		number: 1,
+		images: []
+	})
+	let popShow = ref(props.show)
+	watch(() => props.show, (newval) => {
+		popShow.value = newval
+		if (newval) {
+			data.value = props.goods
+		}
+	})
+	watch(() => popShow.value, (newval) => {
+		emits('update:show', newval)
+	})
+
+	function close() {
+		popShow.value = false
+	}
+
+	function open() {
+
+	}
+
+	function save() {
+		console.log(form.images);
+	}
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		width: 556rpx;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		box-sizing: border-box;
+	}
+
+	.close {
+		position: absolute;
+		right: 0;
+	}
+
+	.number {
+		color: #EE4646;
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/index/components/edit-guige.vue b/pageProduct/index/components/edit-guige.vue
new file mode 100644
index 0000000..cfb9db7
--- /dev/null
+++ b/pageProduct/index/components/edit-guige.vue
@@ -0,0 +1,141 @@
+<template>
+	<up-popup :show="popShow" @close="close" @open="open" mode="center" :round="9">
+		<view class="u-p-32 box u-font-28">
+			<view class="u-flex u-relative u-row-center">
+				<view class="u-font-32">{{data.specSnap}}</view>
+				<view class="u-absolute close">
+					<up-icon @click="close" :size="16" color="#000" name="close-circle-fill"></up-icon>
+				</view>
+			</view>
+			<view class="u-m-t-48">
+				<view class="u-flex u-row-between border-bottom u-p-b-30">
+					<view>当前状态</view>
+					<view class="u-flex">
+						<up-radio-group v-model="isGrounding" placement="row" @change="isGroundingChange">
+							<up-radio :customStyle="{marginRight: '10px'}" v-for="(item, index) in status.list"
+								:key="index" :label="item.label" :name="item.name">
+							</up-radio>
+						</up-radio-group>
+					</view>
+
+				</view>
+				<view class=" u-flex u-row-between u-m-t-30">
+					<view>售罄</view>
+					<up-switch :size="20" @change="isPauseSaleChange" v-model="isPauseSale"></up-switch>
+				</view>
+			</view>
+		</view>
+	</up-popup>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref,
+		watch
+	} from 'vue';
+	import {
+		returnSkuSnap,
+		returnTypeEnum,
+		returnCategory
+	} from '@/pageProduct/util.js'
+	import {
+		$updateGrounding, $updateProductStatus
+	} from '@/http/yskApi/goods.js'
+	import infoBox from '@/commons/utils/infoBox.js'
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		},
+		category: {
+			type: Array,
+			default: () => []
+		},
+		goods: {
+			type: Object,
+			default: () => {
+				skuList: []
+			}
+		}
+	})
+	const status = reactive({
+		list: [{
+			name: 1,
+			label: '上架中'
+		}, {
+			name: 0,
+			label: '已下架'
+		}],
+	})
+	// 是否售罄
+	const isPauseSale = ref(false)
+	// 是否上架
+	const isGrounding = ref(1)
+	const data = ref(props.goods)
+	const emits = defineEmits(['update:show', 'save', 'isGroundingChange','isPauseSaleChange'])
+	const form = reactive({
+		note: ''
+	})
+	let popShow = ref(props.show)
+	watch(() => props.show, (newval) => {
+		popShow.value = newval
+		if (newval) {
+			console.log(props.goods);
+			data.value = props.goods
+			isPauseSale.value = props.goods.isPauseSale ? true : false
+			isGrounding.value = props.goods.isGrounding
+		}
+	})
+	watch(() => popShow.value, (newval) => {
+		emits('update:show', newval)
+	})
+
+	function close() {
+		popShow.value = false
+	}
+
+	function open() {
+
+	}
+
+	function save() {
+		emits('save')
+	}
+	async function isGroundingChange(e) {
+		console.log(e);
+		await $updateGrounding({
+			isGrounding: e ? true : false,
+			skuId: props.goods.id
+		})
+		emits('isGroundingChange', e)
+		infoBox.showToast('更新成功')
+	}
+	async function isPauseSaleChange(e) {
+		console.log(e);
+		await $updateProductStatus({
+			targetId:  props.goods.id,
+			updateKey: "pauseSaleSku",
+			updateValue: e?1:0
+		})
+		emits('isPauseSaleChange', e)
+		infoBox.showToast('更新成功')
+	}
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		width: 556rpx;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		box-sizing: border-box;
+	}
+
+	.close {
+		position: absolute;
+		right: 0;
+	}
+
+	.number {
+		color: #EE4646;
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/index/components/edit-price.vue b/pageProduct/index/components/edit-price.vue
new file mode 100644
index 0000000..0cfd190
--- /dev/null
+++ b/pageProduct/index/components/edit-price.vue
@@ -0,0 +1,186 @@
+<template>
+	<up-popup :show="popShow" @close="close" @open="open" mode="center" :round="9">
+		<view class="u-p-32 box u-font-28">
+			<view class="u-flex u-relative u-row-center">
+				<view class="u-font-32">修改价格</view>
+				<view class="u-absolute close">
+					<up-icon @click="close" :size="16" color="#000" name="close-circle-fill"></up-icon>
+				</view>
+			</view>
+			<view class="u-m-t-48">
+				<view>商品名称</view>
+				<view class="u-m-t-16" v-if="isSku">{{data.name}}</view>
+				<view class="u-m-t-38">
+					<template v-if="!isSku">
+						<view class="u-m-b-32">
+							<view class="u-flex u-row-between">
+								<view>{{data.name}}</view>
+								<view class="u-font-24">
+									<text>变动金额：</text>
+									<text class="number">{{data.lowPrice-data._lowPrice}}</text>
+								</view>
+							</view>
+							<view class="u-m-t-16">
+								<up-input v-model="data.lowPrice">
+									<template #suffix>
+										<view>元</view>
+									</template>
+								</up-input>
+							</view>
+						</view>
+						<view class="u-m-b-32">
+							<view class="u-flex u-row-between">
+								<view>备注</view>
+							</view>
+							<view class="u-m-t-16">
+								<up-textarea :height="42" v-model="form.note" placeholder="请输入备注"></up-textarea>
+							</view>
+						</view>
+					</template>
+					<template v-else>
+						<scroll-view scroll-y="true" style="max-height: 50vh;">
+							<view class="u-m-b-32" v-for="(item,index) in data.skuList" :key="index">
+								<view class="u-flex u-row-between">
+									<view>{{item.name}}</view>
+									<view class="u-font-24">
+										<text>变动金额：</text>
+										<text class="number">{{item.lowPrice-item._lowPrice}}</text>
+									</view>
+								</view>
+								<view class="u-m-t-16">
+									<up-input v-model="item.lowPrice">
+										<template #suffix>
+											<view>元</view>
+										</template>
+									</up-input>
+								</view>
+							</view>
+							<view class="u-m-b-32">
+								<view class="u-flex u-row-between">
+									<view>备注</view>
+								</view>
+								<view class="u-m-t-16">
+									<up-textarea :height="42" v-model="form.note" placeholder="请输入备注"></up-textarea>
+								</view>
+							</view>
+						</scroll-view>
+					</template>
+
+					<view class="u-m-t-60">
+						<my-button type="primary" shape="circle" @tap="save">
+							<view class="u-font-32">
+								保存
+							</view>
+						</my-button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</up-popup>
+</template>
+
+<script setup>
+	import {
+		computed,
+		reactive,
+		ref,
+		watch
+	} from 'vue';
+	import {
+		returnSkuSnap,
+		returnTypeEnum,
+		returnCategory
+	} from '@/pageProduct/util.js'
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		},
+		category: {
+			type: Array,
+			default: () => []
+		},
+		goods: {
+			type: Object,
+			default: () => {
+				return {
+					lowPrice:0,
+					skuList: []
+				}
+			
+			}
+		}
+	})
+	const data = ref(props.goods)
+	const emits = defineEmits(['update:show', 'save'])
+	const form = reactive({
+		note: ''
+	})
+	let popShow = ref(props.show)
+	watch(() => props.show, (newval) => {
+		popShow.value = newval
+		if (newval) {
+			data.value = props.goods
+		}
+	})
+	const isSku=computed(()=>{
+		return data.value.typeEnum=='多规格'
+	})
+	watch(() => popShow.value, (newval) => {
+		emits('update:show', newval)
+	})
+
+	function close() {
+		popShow.value = false
+	}
+
+	function open() {
+
+	}
+	
+	function save() {
+		emits('save', {
+			...data.value,
+		})
+	}
+
+	// function save() {
+	// 	const skuSnap = returnSkuSnap(data.value)
+	// 	let typeEnum = returnTypeEnum(data.value.typeEnum)
+	// 	let lowPrice = undefined
+	// 	typeEnum = typeEnum ? typeEnum : 'normal'
+	// 	const findCategory = returnCategory(data.value.categoryName, props.category)
+	// 	console.log(typeEnum);
+	// 	console.log(findCategory);
+	// 	const categoryId = findCategory ? findCategory.id : ''
+	// 	if (typeEnum == 'normal') {
+	// 		// 单规格
+	// 		lowPrice = data.value.skuList[0].salePrice
+	// 	}
+	// 	emits('save', {
+	// 		...data.value,
+	// 		lowPrice,
+	// 		typeEnum,
+	// 		images: data.value.images ? data.value.images : [data.value.coverImg],
+	// 		categoryId,
+	// 		skuSnap: JSON.stringify(skuSnap)
+	// 	})
+	// }
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		width: 556rpx;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		box-sizing: border-box;
+	}
+
+	.close {
+		position: absolute;
+		right: 0;
+	}
+
+	.number {
+		color: #EE4646;
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/index/components/edit-stock.vue b/pageProduct/index/components/edit-stock.vue
new file mode 100644
index 0000000..ef133de
--- /dev/null
+++ b/pageProduct/index/components/edit-stock.vue
@@ -0,0 +1,235 @@
+<template>
+	<up-popup :show="popShow" @close="close" @open="open" mode="center" :round="9">
+		<view class="u-p-32 box u-font-28">
+			<view class="u-flex u-relative u-row-center">
+				<view class="u-font-32">修改库存</view>
+				<view class="u-absolute close">
+					<up-icon @click="close" :size="16" color="#000" name="close-circle-fill"></up-icon>
+				</view>
+			</view>
+			<view class="u-m-t-48">
+				<view>商品名称</view>
+				<view class="u-m-t-16" v-if="isSku">{{data.name}}</view>
+				<view class="u-m-t-38">
+					<template v-if="!isSku">
+						<view class="u-m-b-32" >
+							<view class="u-flex u-row-between">
+								<view>{{data.name}}</view>
+								<view class="u-font-24">
+									<text>变动数量：</text>
+									<text class="number">{{data.stockNumber-data._stockNumber}}</text>
+								</view>
+							</view>
+							<view class="u-m-t-16">
+								<up-input v-model="data.stockNumber">
+									<template #suffix>
+										<view>{{data.unitName||''}}</view>
+									</template>
+								</up-input>
+							</view>
+						</view>
+						<view class="u-m-b-32">
+							<view class="u-flex u-row-between">
+								<view>备注</view>
+							</view>
+							<view class="u-m-t-16">
+								<up-textarea :height="42" v-model="form.note" placeholder="请输入备注"></up-textarea>
+							</view>
+						</view>
+					</template>
+					<template v-else>
+						<scroll-view scroll-y="true" style="max-height: 30vh;">
+							<view class="u-m-b-32" v-for="(item,index) in data.skuList" :key="index">
+								<view class="u-flex u-row-between">
+									<view>{{item.name}}</view>
+									<view class="u-font-24">
+										<text>变动数量：</text>
+										<text class="number">{{item.stockNumber-item._stockNumber}}</text>
+									</view>
+								</view>
+								<view class="u-m-t-16">
+									<up-input v-model="item.stockNumber">
+										<template #suffix>
+											<view>{{data.unitName||''}}</view>
+										</template>
+									</up-input>
+								</view>
+							</view>
+							<view class="u-m-b-32">
+								<view class="u-flex u-row-between">
+									<view>备注</view>
+								</view>
+								<view class="u-m-t-16">
+									<up-textarea :height="42" v-model="form.note" placeholder="请输入备注"></up-textarea>
+								</view>
+							</view>
+						</scroll-view>
+					</template>
+
+					<view class="u-m-t-60">
+						<my-button type="primary" shape="circle" @tap="save">
+							<view class="u-font-32">
+								保存
+							</view>
+						</my-button>
+						<view class="u-m-t-30">
+							<template v-if="!recoders.show">
+								<view class="color-999 u-font-24 u-flex u-row-center u-col-center">
+									<view class="u-flex" @click="changeShowRecoders(true)">
+										<view class="u-m-r-6">查看记录</view>
+										<up-icon name="arrow-down" :size="12"></up-icon>
+									</view>
+								</view>
+							</template>
+
+							<template v-else>
+								<scroll-view scroll-y="true" style="max-height: 30vh;">
+									<my-step :list="recoders.list"></my-step>
+								</scroll-view>
+								<view class="color-999 u-font-24 u-flex u-row-center u-col-center">
+									<view class="u-flex" @click="changeShowRecoders(false)">
+										<view class="u-m-r-6">收起记录</view>
+										<up-icon name="arrow-up" :size="12"></up-icon>
+									</view>
+								</view>
+							</template>
+
+						</view>
+
+					</view>
+				</view>
+			</view>
+		</view>
+	</up-popup>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref,
+		watch,
+		onMounted,
+		computed 
+	} from 'vue';
+	import {
+		returnSkuSnap,
+		returnTypeEnum,
+		returnCategory
+	} from '@/pageProduct/util.js'
+	import {
+		$tbShopUnit
+	} from '@/http/yskApi/goods.js'
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		},
+		category: {
+			type: Array,
+			default: () => []
+		},
+		goods: {
+			type: Object,
+			default: () => {
+				skuList: []
+			}
+		}
+	})
+
+	function changeShowRecoders(show) {
+		recoders.show = show
+	}
+	const recoders = reactive({
+		list: [{
+				title: '2024-09-15 11：20：30',
+				content: '开启了库存，库存由0件修改为5件'
+			},
+			{
+				title: '2024-09-15 ',
+				content: '开启了库存，库存由0件修改为4件'
+			},
+			{
+				title: '2024-09-15 ',
+				content: '开启了库存，库存由0件修改为3件'
+			},
+			{
+				title: '2024-09-15 ',
+				content: '开启了库存，库存由0件修改为2件'
+			},
+		],
+		show: false,
+		active: 0
+	})
+
+	const data = ref(props.goods)
+	const emits = defineEmits(['update:show', 'save'])
+	const form = reactive({
+		note: ''
+	})
+	let popShow = ref(props.show)
+	watch(() => props.show, (newval) => {
+		popShow.value = newval
+		if (newval) {
+			data.value = props.goods
+		}
+	})
+	const isSku = computed(() => {
+		// return data.value.typeEnum == '多规格'
+		return false
+	})
+	watch(() => popShow.value, (newval) => {
+		emits('update:show', newval)
+	})
+
+	function close() {
+		popShow.value = false
+	}
+
+	function open() {
+
+	}
+	function save() {
+		emits('save', {
+			...data.value,
+		})
+	}
+	// function save() {
+	// 	const skuSnap = returnSkuSnap(data.value)
+	// 	let typeEnum = returnTypeEnum(data.value.typeEnum)
+	// 	let lowPrice = undefined
+	// 	typeEnum = typeEnum ? typeEnum : 'normal'
+	// 	const findCategory = returnCategory(data.value.categoryName, props.category)
+	// 	console.log(typeEnum);
+	// 	console.log(findCategory);
+	// 	const categoryId = findCategory ? findCategory.id : ''
+	// 	if (typeEnum == 'normal') {
+	// 		// 单规格
+	// 		lowPrice = data.value.skuList[0].salePrice
+	// 	}
+	// 	emits('save', {
+	// 		...data.value,
+	// 		lowPrice,
+	// 		typeEnum,
+	// 		images: data.value.images ? data.value.images : [data.value.coverImg],
+	// 		categoryId,
+	// 		skuSnap: JSON.stringify(skuSnap)
+	// 	})
+	// }
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		width: 556rpx;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		box-sizing: border-box;
+	}
+
+	.close {
+		position: absolute;
+		right: 0;
+	}
+
+	.number {
+		color: #EE4646;
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/index/components/goods.vue b/pageProduct/index/components/goods.vue
index 09ac0ba..65359d6 100644
--- a/pageProduct/index/components/goods.vue
+++ b/pageProduct/index/components/goods.vue
@@ -7,55 +7,81 @@
 					<text class="u-m-l-20">{{data.sort}}</text>
 				</view>
 				<view class="color-333 u-m-l-42 u-flex">
-					<up-icon name="edit-pen" :size="16" :color="ColorMain"></up-icon>
-					<text class="stock">库存:</text>
-					<text class="font-bold u-m-l-10">{{data.stockNumber}}</text>
+					<up-icon @click="editStock" name="edit-pen" :size="16" :color="ColorMain"></up-icon>
+					<text class="stock u-m-l-4">库存:{{data.stockNumber}}</text>
 				</view>
 			</view>
-			<text class="u-font-28 color-666" @click="changeClick">修改</text>
+			<view>
+				<!-- <text class="u-font-28 color-666" @click="changeClick">修改</text> -->
+				<text class="u-font-28 color-666" @click="changePrice">改价</text>
+				<text class="u-font-28 color-red u-m-l-24" @click="baosun">报损</text>
+			</view>
 		</view>
 
 
-		<view class="u-m-t-48 u-flex">
+		<view class="u-m-t-48 u-flex u-col-top u-relative">
 			<view v-if="props.showChecked">
 				<label class="radio">
 					<radio :color="ColorMain" style="transform: scale(0.7);" @click="radioClick"
 						:checked="props.data.checked" /><text></text>
 				</label>
 			</view>
-			<image :src="data.coverImg" lazy-load class="img"></image>
-			<view class="h-100 u-p-l-16 u-flex-1 u-flex u-flex-col u-row-between">
-				<view class="color-333 w-full u-flex u-row-between">
+			<view class="img">
+				<up--image :width="63" :height="63" :radius="3" :src="data.coverImg"></up--image>
+			</view>
+			<view class="w-full info">
+				<view class="info-p-l color-333  u-flex u-row-between">
 					<view class="u-flex">
-						<text class="u-m-r-24">{{data.name}}</text><uni-tag size="small" type="primary"
-							custom-style="background-color: #318AFE;" :text="data.typeEnum"></uni-tag>
+						<text class="u-m-r-24">{{data.name}}</text>
+				<!-- 		<uni-tag size="small" type="primary"
+							custom-style="background-color: #318AFE;" :text="data.typeEnum"></uni-tag> -->
+					</view>
+					<view class="u-font-32">
+						<text>{{data.lowPrice}}</text>
+						<!-- <text>¥</text>
+						<text>{{data.lowPrice}}</text>
+						<text v-if="data.typeEnum == '多规格'">~￥{{data.maxPrice }}</text> -->
 					</view>
-					<view class="price">¥{{data.lowPrice}}</view>
 				</view>
+				<view class="u-m-t-44">
+					<template v-if="data.skuList.length>=2">
+						<view class="u-flex u-flex-wrap w-full gap-10  u-col-top">
+							<view class="u-font-24 info-p-l u-m-t-14">规格：</view>
+							<view class="skd" v-for="(item,index) in data.skuList" :key="index"
+								@click="guigeClick(index)">
+								<text>{{item.specSnap||item.name}}</text>
+								<view class="tag-primary tag" v-if="item.isGrounding">上架中</view>
+								<view class="tag-gray tag" v-else>已下架</view>
+								<!-- <template v-if="item.isPauseSale">
+									<view class="tag-gray tag" >已售罄</view>
+								</template>
+								<template v-else>
+									<view class="tag-primary tag" v-if="item.isGrounding">上架中</view>
+									<view class="tag-gray tag" v-else>已下架</view>
+								</template> -->
+
+							</view>
+						</view>
+					</template>
+					<template v-else>
+						<view style="height: 24rpx;">
+
+						</view>
+					</template>
+				</view>
+
 
 			</view>
 		</view>
 
-		<view class="u-m-t-16 skus u-text-center" v-if="data.skuList.length>=2">
-			<!-- <view class="u-flex u-row-between font-bold">
-				<view class="u-flex-1">商品信息</view>
-				<view class="u-flex-1">售价</view>
-				<view class="u-flex-1">库存</view>
-			</view>
-			<view v-for="(item,index) in data.skuList" :key="index">
-				<view class="u-flex u-m-t-10">
-					<view class="color-333 u-flex-1"> <text class="u-m-r-24">{{item.specSnap||''}}</text></view>
-					<view class="price u-flex-1">¥{{data.lowPrice||0}}</view>
-					<view class=" u-flex-1">{{item.stockNumber||0}} {{data.unitName||''}}</view>
-				</view>
-			</view> -->
+		<!-- <view class="u-m-t-16 skus u-text-center" v-if="data.skuList.length>=2">
 			<view class="u-flex u-flex-wrap  skds">
 				<view class="skd" v-for="(item,index) in data.skuList" :key="index"><text>{{item.specSnap}}</text>
 					<view class="tag-primary tag">上架中</view>
 				</view>
 			</view>
 
-		</view>
+		</view> -->
 		<view class="u-m-t-24 u-flex u-row-between">
 			<view class="u-flex">
 				<view class="u-flex">
@@ -93,7 +119,7 @@
 	import {
 		ColorMain
 	} from '@/commons/color.js'
-	const emits = defineEmits(['radioClick', 'changeClick', 'xiajia', 'del'])
+	const emits = defineEmits(['radioClick', 'changeClick', 'xiajia', 'del', 'changePrice', 'baosun', 'guigeClick','editStock'])
 	const props = defineProps({
 		index: {
 			type: Number
@@ -113,7 +139,8 @@
 			default: false
 		}
 	})
-
+	
+	
 
 	function isHotChange(e) {
 		$goodsIsHot({
@@ -155,6 +182,20 @@
 		emits('del', props.index)
 	}
 
+	function changePrice() {
+		emits('changePrice', props.index)
+	}
+
+	function baosun() {
+		emits('baosun', props.index)
+	}
+
+	function guigeClick(guigeIndex) {
+		emits('guigeClick', props.index, guigeIndex)
+	}
+	function editStock(){
+		emits('editStock', props.index)
+	}
 	//携带参数type edit跳转到商品添加页面，编辑与添加同一页面，根据type值来判断
 	function toEdit() {
 		go.to('PAGES_PRODUCT_ADD', {
@@ -174,9 +215,12 @@
 		border: 2rpx solid transparent;
 	}
 
+	.gap-10 {
+		gap: 10rpx;
+	}
+
 	.btn-primary {
 		border-color: $my-main-color;
-		;
 		color: $my-main-color;
 	}
 
@@ -194,8 +238,15 @@
 	}
 
 	.img {
-		width: $imgSize;
-		height: $imgSize;
+		position: absolute;
+		left: 0;
+		top: 0;
+		// width: $imgSize;
+		// height: $imgSize;
+	}
+
+	.info-p-l {
+		padding-left: 71px;
 	}
 
 	.icon-arrow-right {
@@ -219,6 +270,10 @@
 		// border: 2rpx solid #333333;
 	}
 
+	.color-red {
+		color: #F0465B;
+	}
+
 	.goods {
 		border-radius: 10rpx 10rpx 10rpx 10rpx;
 		background-color: #fff;
@@ -239,33 +294,37 @@
 			.skds {
 				gap: 10rpx 50rpx;
 			}
+		}
+	}
 
-			.skd {
-				padding: 14rpx 40rpx 14rpx 20rpx;
-				background: #F0F2F5;
-				border-radius: 4rpx;
-				position: relative;
-				color: #666;
-				overflow: hidden;
-				margin-bottom: 10rpx;
+	.skd {
+		padding: 14rpx 40rpx 14rpx 20rpx;
+		background: #F0F2F5;
+		border-radius: 4rpx;
+		position: relative;
+		color: #666;
+		overflow: hidden;
+		margin-bottom: 10rpx;
+		font-size: 24rpx;
 
-				.tag {
-					position: absolute;
-					right: 0;
-					top: 0;
-					font-size: 12rpx;
-					right: 0;
-					padding: 2rpx 4rpx;
-					border-radius: 0rpx 4rpx 4rpx 4rpx;
-				}
-
-				.tag-primary {
-					background-color: $my-main-color;
-					color: #fff;
-				}
-			}
+		.tag {
+			position: absolute;
+			right: 0;
+			top: 0;
+			font-size: 12rpx;
+			right: 0;
+			padding: 2rpx 4rpx;
+			border-radius: 0rpx 4rpx 4rpx 4rpx;
+		}
 
+		.tag-primary {
+			background-color: $my-main-color;
+			color: #fff;
+		}
 
+		.tag-gray {
+			background-color: rgb(144, 147, 153);
+			color: #fff;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pageProduct/index/index.vue b/pageProduct/index/index.vue
index e55fdba..41625f6 100644
--- a/pageProduct/index/index.vue
+++ b/pageProduct/index/index.vue
@@ -8,7 +8,8 @@
 				<view class="input-wrapper">
 					<view class="input-main">
 						<view class="u-flex u-p-r-30 u-font-28" @click="onCategoryShowChange(true)">
-							<text class="u-m-r-10 u-line-1" style="max-width: 100rpx;">{{pageData.categoryName||'分类' }}</text>
+							<text class="u-m-r-10 u-line-1"
+								style="max-width: 100rpx;">{{pageData.categoryName||'分类' }}</text>
 							<up-icon name="arrow-down" size="16"></up-icon>
 						</view>
 						<uni-easyinput clearable class='jeepay-search' :inputBorder="false"
@@ -40,8 +41,10 @@
 		<view class="goods-list u-p-30">
 			<template v-if="pageData.goodsList.length">
 				<view class="u-m-b-32" v-for="(item,index) in pageData.goodsList" :key="index">
-					<my-goods @changeClick="goodsChangeClick" @radioClick="goodsRadioClick" :index="index" :data="item"
-						@del="goodsDel" :showChecked="showChecked" :showDetail="pageData.showGoodsDetail"></my-goods>
+					<my-goods @changePrice="changePriceShow" @changeClick="goodsChangeClick"
+						@editStock="changeStockShow" @guigeClick="editGuigeShow" @baosun="baosunShow"
+						@radioClick="goodsRadioClick" :index="index" :data="item" @del="goodsDel"
+						:showChecked="showChecked" :showDetail="pageData.showGoodsDetail"></my-goods>
 				</view>
 			</template>
 			<template v-if="pageData.hasAjax&&!pageData.goodsList.length">
@@ -53,9 +56,8 @@
 		</view>
 
 		<my-control ref="control" :categoryShow="pageData.categoryShow" :categoryName="pageData.categoryName"
-			@categoryChange="categoryIdChange" @offShelf="offShelf" @allCheckedChange="allCheckedChange"
-			@controlChange="controlChange" @toggleCategory="toggleCategory"
-			:bottom="pageData.componentBottom"></my-control>
+			@offShelf="offShelf" @allCheckedChange="allCheckedChange" @controlChange="controlChange"
+			@toggleCategory="toggleCategory" :bottom="pageData.componentBottom"></my-control>
 		<!-- <my-category ref="category" @change="onCategoryShowChange" @cateClick="cateClick"
 			:bottom="pageData.componentBottom+100"></my-category> -->
 		<!-- 下架弹窗 -->
@@ -113,7 +115,19 @@
 		</my-model>
 
 		<!-- 分类 -->
-		<my-category  v-model:isShow="pageData.categoryShow" @confirm="setCategory"></my-category>
+		<my-category v-model:isShow="pageData.categoryShow" @confirm="setCategory"></my-category>
+		<!-- 修改价格弹窗 -->
+		<edit-price :category="pageData.categoryList" v-model:show="popup.price.show" @save="changePriceConfirm"
+			:goods="pageData.selGoods"></edit-price>
+		<!-- 修改库存弹窗 -->
+		<edit-stock :category="pageData.categoryList" v-model:show="popup.stock.show" @save="changeStockConfirm"
+			:goods="pageData.selGoods"></edit-stock>
+		<!-- 规格弹窗 -->
+		<edit-guige @isGroundingChange="isGroundingChange" v-model:show="popup.guige.show"
+			:goods="popup.guige.data"></edit-guige>
+		<!-- 报损 -->
+		<baosun-vue :category="pageData.categoryList" v-model:show="popup.baosun.show"
+			:goods="pageData.selGoods"></baosun-vue>
 	</view>
 
 </template>
@@ -136,14 +150,25 @@
 	import myControl from './components/control.vue'
 	import myCategory from './components/category.vue'
 	import infoBox from "@/commons/utils/infoBox.js"
+	import editPrice from './components/edit-price.vue';
+	import editGuige from './components/edit-guige.vue';
+	import editStock from './components/edit-stock.vue';
+	import baosunVue from './components/baosun.vue';
 	import {
 		$tbProduct,
 		$upProSort,
 		$updateProduct,
 		$getProductDetail,
 		$delProduct,
-		$updateProductStatus
+		$tbShopCategory,
+		$updateProductStatus,
+		$tbProductV2,
+		$updateProductData
 	} from "@/http/yskApi/goods.js"
+	import {
+		returnAllCategory
+	} from '@/pageProduct/util.js'
+
 	const pageData = reactive({
 		modelDesc: '是否下架',
 		stateCurrent: 0,
@@ -154,6 +179,7 @@
 		},
 		showGoodsDetail: false,
 		selGoodsIndex: '',
+		selGoods: {},
 		totalElements: 0,
 		totalPage: 0,
 		goodsList: [],
@@ -164,24 +190,179 @@
 			name: ''
 		},
 		category: '',
+		categoryList: [], //分类列表
 		categoryShow: false,
 		categoryName: '',
 		hasAjax: false
 	})
-	watch(()=>pageData.query.categoryId,(newval)=>{
+	watch(() => pageData.query.categoryId, (newval) => {
 		getGoodsList()
 	})
+
+	const popup = reactive({
+		price: {
+			show: false
+		},
+		guige: {
+			show: false,
+			data: {},
+			goodsIndex: '',
+			guigeIndex: '',
+		},
+		stock: {
+			show: false
+		},
+		baosun: {
+			show: false
+		}
+	})
+
+	//报损弹窗展示
+	function baosunShow(index) {
+		pageData.selGoodsIndex = index
+		const goods = pageData.goodsList[index]
+		pageData.selGoods = goods
+		popup.baosun.show = true
+	}
+
+	// 修改价格弹窗展示
+	function changePriceShow(index) {
+		pageData.selGoodsIndex = index
+		const goods = pageData.goodsList[index]
+		goods.skuList = goods.skuList.map(v => {
+			return {
+				...v,
+				_lowPrice: v.lowPrice
+			}
+		})
+		const lowPrice = goods.lowPrice.replace('￥', '') * 1
+		pageData.selGoods = {
+			...goods,
+			lowPrice,
+			_lowPrice: lowPrice
+		}
+		popup.price.show = true
+	}
+
+
+
+
+	async function changePriceConfirm(goods) {
+		let goodsArr = []
+		if (goods.typeEnum == '单规格') {
+			goodsArr = [{
+				shopId: uni.getStorageSync('shopId'),
+				isSku: false,
+				id: goods.id,
+				key: 'salePrice',
+				value: goods.lowPrice
+			}]
+		} else {
+			goodsArr = goods.skuList.map(v => {
+				return {
+					shopId: uni.getStorageSync('shopId'),
+					isSku: true,
+					id: v.id,
+					key: 'salePrice',
+					value: v.lowPrice
+				}
+			})
+		}
+		const res = await $updateProductData(goodsArr)
+		popup.price.show = false
+		getGoodsList()
+	}
+
+
+	// 修改库存弹窗展示
+	function changeStockShow(index) {
+		pageData.selGoodsIndex = index
+		const goods = pageData.goodsList[index]
+		goods.skuList = goods.skuList.map(v => {
+			return {
+				...v,
+				_stockNumber: v.stockNumber
+			}
+		})
+		const stockNumber = goods.stockNumber
+		pageData.selGoods = {
+			...goods,
+			stockNumber,
+			_stockNumber: stockNumber
+		}
+		popup.stock.show = true
+	}
+	async function changeStockConfirm(goods) {
+		let goodsArr = []
+		// if (goods.typeEnum == '单规格') {
+		// 	goodsArr = [{
+		// 		shopId: uni.getStorageSync('shopId'),
+		// 		isSku: false,
+		// 		id: goods.id,
+		// 		key: 'stockNumber',
+		// 		value: goods.stockNumber
+		// 	}]
+		// } else {
+		// 	goodsArr = goods.skuList.map(v => {
+		// 		return {
+		// 			shopId: uni.getStorageSync('shopId'),
+		// 			isSku: true,
+		// 			id: v.id,
+		// 			key: 'stockNumber',
+		// 			value: v.stockNumber 
+		// 		}
+		// 	})
+		// }
+		goodsArr = [{
+			shopId: uni.getStorageSync('shopId'),
+			isSku: false,
+			id: goods.id,
+			key: 'stockNumber',
+			value: goods.stockNumber
+		}]
+		const res = await $updateProductData(goodsArr)
+		popup.stock.show = false
+		getGoodsList()
+	}
+
+	//修改规格上下架，售罄
+	function editGuigeShow(goodsIndex, guigeIndex) {
+		console.log(goodsIndex, guigeIndex);
+		const goodsGuige = pageData.goodsList[goodsIndex].skuList[guigeIndex]
+		popup.guige.data = goodsGuige
+		popup.guige.goodsIndex = goodsIndex
+		popup.guige.guigeIndex = guigeIndex
+		popup.guige.show = true
+	}
+
+	function isGroundingChange(e) {
+		const {
+			goodsIndex,
+			guigeIndex
+		} = popup.guige
+		pageData.goodsList[goodsIndex].skuList[guigeIndex].isGrounding = e
+	}
+
+	function isPauseSaleChange(e) {
+		const {
+			goodsIndex,
+			guigeIndex
+		} = popup.guige
+		pageData.goodsList[goodsIndex].skuList[guigeIndex].isPauseSale = e
+	}
+
 	function onCategoryShowChange(show) {
 		console.log(show);
 		pageData.categoryShow = show
 	}
-	function setCategory(category){
+
+	function setCategory(category) {
 		pageData.query.categoryId = category.id
 		pageData.categoryName = category.name
 	}
 
 	function getGoodsList() {
-		$tbProduct(pageData.query).then(res => {
+		$tbProductV2(pageData.query).then(res => {
 			pageData.hasAjax = true
 			console.log(res);
 			pageData.goodsList = res.content.map(v => {
@@ -198,9 +379,18 @@
 	onShow(() => {
 		getGoodsList()
 	})
+	onLoad(() => {
+		$tbShopCategory({
+			page: 0,
+			size: 200
+		}).then(res => {
+			pageData.categoryList = returnAllCategory(res.content)
+			console.log(pageData.categoryList);
+		})
+	})
 
 	const tabsList = ['简洁', '详情']
-	const statesTabsList = ['全部', '已售罄','在售中', '已下架']
+	const statesTabsList = ['全部', '已售罄', '在售中', '已下架']
 	const control = ref(null)
 	const model = ref(null)
 	const goodsStockModel = ref(null)
diff --git a/pageProduct/util.js b/pageProduct/util.js
new file mode 100644
index 0000000..86005cd
--- /dev/null
+++ b/pageProduct/util.js
@@ -0,0 +1,41 @@
+import {
+	$types
+} from '@/pageProduct/goodsData.js'
+export function returnSkuSnap(goods) {
+	const selectSpec = typeof goods.selectSpec === 'string' ? JSON.parse(goods.selectSpec) : goods.selectSpec
+	let result = selectSpec.map(v => {
+		return {
+			name: v.name,
+			value: v.selectSpecResult.join(',')
+		}
+	})
+	return result
+}
+export function returnTypeEnum(typeEnum) {
+	const item = $types.find(v => v.title == typeEnum)
+	let result = item ? item.value : undefined
+	return result
+}
+export function returnCategory(cateName, cateList) {
+	console.log(cateName);
+	console.log(cateList);
+	const item = cateList.find(v => v.name == cateName)
+	let result = item ? item : undefined
+	return result
+}
+export function returnAllCategory(arr) {
+	const result = arr.reduce((prve, cur) => {
+		prve.push(...[{
+			...cur,
+			name: '' + cur.name,
+			childrenList: undefined
+		}, ...cur.childrenList.map(v => {
+			return {
+				...v,
+				name: '' + v.name
+			}
+		})])
+		return prve
+	}, [])
+	return result
+}
diff --git a/pageTable/index/components/table-item.vue b/pageTable/index/components/table-item.vue
index 8026597..0d17cd7 100644
--- a/pageTable/index/components/table-item.vue
+++ b/pageTable/index/components/table-item.vue
@@ -125,11 +125,12 @@
 	function more() {
 		emits('more')
 	}
-
+	
+	
 	function diancan() {
 		go.to('PAGES_CREATE_ORDER', {
 			tableId: props.data.tableId,
-			tableName: props.data.name
+			name: props.data.name
 		})
 	}
 
@@ -140,14 +141,16 @@
 				name,
 				status,
 				amount,
-				areaId
+				areaId,
+				orderId
 			} = props.data
-			go.to('PAGES_CRESATE_ORDER_DETAIL', {
+			go.to('PAGES_ORDER_DETAIL', {
 				tableId,
 				name,
 				status,
 				amount,
-				areaId
+				areaId,
+				id:orderId
 			})
 		}
 	}
diff --git a/pages.json b/pages.json
index 629844b..5b56bb2 100644
--- a/pages.json
+++ b/pages.json
@@ -1218,6 +1218,22 @@
 				{
 					"navigationBarTitleText" : "订单详情"
 				}
+			},
+			{
+				"pageId": "PAGES_ORDER_PAY",
+				"path" : "pay-order/pay-order",
+				"style" : 
+				{
+					"navigationBarTitleText" : "结账"
+				}
+			},
+			{
+				"pageId": "PAGES_ORDER_TUIKUAN",
+				"path" : "tuikuan/tuikuan",
+				"style" : 
+				{
+					"navigationBarTitleText" : "退款"
+				}
 			}
 				
 			]
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 760b2e7..ba674c4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -144,8 +144,7 @@
 		{
 			title: '成员管理',
 			icon: '/static/indexImg/icon-staff.svg',
-			pageUrl: 'PAGES_USER',
-			entId: 'ENT_UR_USER_LIST'
+			pageUrl: 'PAGES_USER'
 		},
 		{
 			title: '数据中心',
diff --git a/pagesCreateOrder/components/edit-discount.vue b/pagesCreateOrder/components/edit-discount.vue
index e1a3c8e..5ca910e 100644
--- a/pagesCreateOrder/components/edit-discount.vue
+++ b/pagesCreateOrder/components/edit-discount.vue
@@ -33,8 +33,10 @@
 		<template #btn>
 			<view class="u-p-30">
 				<view class="u-m-t-10">
-					<my-button @tap="confirm" shape="circle" showShadow>修改</my-button>
-					<my-button @tap="close" type="cancel" bgColor="#fff" >取消</my-button>
+					<my-button @tap="confirm" shape="circle" >修改</my-button>
+					<view class="">
+						<my-button @tap="close" type="cancel" bgColor="#fff" >取消</my-button>
+					</view>
 				</view>
 			</view>
 		</template>
@@ -60,6 +62,10 @@
 			type: Array,
 			default: []
 		},
+		discount:{
+			type: [Number,String],
+			default:100
+		},
 		price: {
 			type: [Number,String],
 			default: 0
@@ -119,6 +125,9 @@
 
 	function open() {
 		model.value.open()
+		form.price=props.price
+		form.currentPrice=props.price
+		form.discount=props.discount
 	}
 
 	function close() {
@@ -127,11 +136,9 @@
 	const emits = defineEmits(['confirm'])
 
 	function confirm() {
-		const {
-			price,
-		} = form
+		console.log(form);
+		emits('confirm',{...form,currentPrice:Number(form.currentPrice).toFixed(2)})
 		close()
-		emits('confirm',form)
 	}
 	defineExpose({
 		open,
diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 359e9e7..77e253a 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -6,9 +6,10 @@
 				<view class="u-m-t-24 u-flex u-row-between " @tap="chooseUser">
 					<view v-if="!user">选择用户</view>
 					<view class="u-flex" v-else>
-						<view class="headeimg">
+						<up-avatar :src="user.headImg" shape="square" :size="30"></up-avatar>
+						<!-- <view class="headeimg">
 							<image class="img" :src="user.headImg" mode=""></image>
-						</view>
+						</view> -->
 						<view class="u-m-l-20">{{user.nickName}}</view>
 						<view class="color-main u-m-l-10 u-font-24">{{user.isVip?'会员':'' }}</view>
 						<view class="u-font-24 u-m-l-30"><text>余额：</text><text class="color-main">{{user.amount}}</text>
@@ -16,69 +17,55 @@
 						<view class="u-font-24 u-m-l-30"><text>积分：</text><text
 								class="color-main">{{user.totalScore}}</text></view>
 					</view>
-					<uni-icons type="right" color="#999" size="22"></uni-icons>
+					<uni-icons type="right" color="#999" size="16"></uni-icons>
 				</view>
 			</view>
 			<view class="u-p-b-24 u-m-b-24 border-bottom">
 				<view>就餐类型</view>
 				<view class="u-m-t-24 u-flex  ">
 					<view class="u-flex color-666">
-						<radio-group @change="radioGroupChange">
-							<label class="radio u-m-r-60" v-for="(item,index) in eatTypes.list" :key="index">
-								<radio :value="''+item.value" :checked="item.value == eatTypes.active"
-									class="scale7 " />
-								<text>{{item.label}}</text>
-							</label>
-						</radio-group>
-
+						<up-radio-group v-model="eatTypes.active" placement="row">
+							<up-radio :customStyle="{marginRight: '30px'}" v-for="(item, index) in eatTypes.list"
+								:key="index" :label="item.name" :name="item.value">
+							</up-radio>
+						</up-radio-group>
 					</view>
 				</view>
 			</view>
 
-			<view class="u-p-b-24 u-m-b-24 border-bottom" @tap="chooseTable">
+			<view class="  " @tap="chooseTable">
 				<view>选择桌码</view>
 				<view class="u-m-t-24 u-flex u-row-between ">
 					<view>
 						<text v-if="table">{{table.name}}</text>
 						<text v-else>不选择桌台</text>
 					</view>
-					<uni-icons type="right" color="#999" size="22"></uni-icons>
+					<uni-icons type="right" color="#999" size="16"></uni-icons>
 				</view>
 			</view>
 
 		</view>
 
 
-
-		<view class="block">
-			<template v-if="!user">
-				<view class="u-p-b-24 u-m-b-24 border-bottom">
-					<view>用餐人数（人）</view>
-					<picker @change="userNumberChange" :value="userNumbers.defaultCateIndex" :range="userNumbers.list">
-						<view class="u-m-t-24 u-flex u-row-between ">
-							<view class="color-333">{{userNumbers.defaultCateIndex||''}}</view>
-							<uni-icons type="right" color="#999" size="22"></uni-icons>
-						</view>
-					</picker>
-				</view>
-			</template>
-			<template v-else>
-				<view>
-					<view class="u-flex border-bottom u-p-b-24">
-						<image class="headeimg" src="@/static/uni.png" mode=""></image>
+		<template v-if="user">
+			<view class="block">
+				<view class="">
+					<view class="u-flex border-bottom u-p-b-24 ">
+						<up-avatar :src="user.headImg" shape="square" :size="60"></up-avatar>
+						<!-- <image class="headeimg" src="@/static/uni.png" mode=""></image> -->
 						<view class="u-m-l-32">
-							<view class="">{{user.name}}</view>
-							<view class="color-main  u-font-24">{{user.isVip?'永久会员':'' }}</view>
+							<view class="">{{user.nickName}}</view>
+							<view class="color-main  u-font-24">{{user.isVip?'会员':'' }}</view>
 						</view>
 					</view>
 					<view class="u-flex u-m-t-24 u-row-between u-font-24 color-999">
 						<view class="u-flex">
 							<view>余额</view>
-							<view class="color-333 u-m-l-10"> 0.00</view>
+							<view class="color-333 u-m-l-10"> {{user.amount}}</view>
 						</view>
 						<view class="u-flex">
 							<view>积分</view>
-							<view class="color-333 u-m-l-10"> 0</view>
+							<view class="color-333 u-m-l-10"> {{user.totalScore}}</view>
 						</view>
 						<view class="u-flex">
 							<view>已消费</view>
@@ -86,10 +73,23 @@
 						</view>
 					</view>
 				</view>
-			</template>
-
-
-		</view>
+			</view>
+		</template>
+		<template v-if="$shop.registerType!='restaurant'">
+			<!-- 不免餐位费 -->
+			<view class="block">
+				<view class="   ">
+					<view>用餐人数（人）</view>
+					<picker @change="userNumberChange" :value="userNumbers.defaultCateIndex" :range="userNumbers.list">
+						<view class="u-m-t-24 u-flex u-row-between ">
+							<view class="color-333">{{userNumbers.defaultCateIndex||''}}</view>
+							<uni-icons type="right" color="#999" size="16"></uni-icons>
+						</view>
+					</picker>
+				</view>
+			</view>
+		</template>
+		
 
 		<view class="block">
 			<view class="u-p-b-24  ">
@@ -150,9 +150,9 @@
 
 					<scroll-view scroll-x="true" v-if="index==goods.sel">
 						<view class="u-m-t-32  u-flex no-wrap">
-							<view class="u-flex u-m-r-20 u-m-b-20">
+							<!-- <view class="u-flex u-m-r-20 u-m-b-20">
 								<button class="tag" hover-class="hover-class" @tap="showModel('discount')">单品打折</button>
-							</view>
+							</view> -->
 							<view class="u-flex u-m-r-20 u-m-b-20">
 								<!-- <button class="tag" hover-class="hover-class" @tap="showModel('giveFood')">赠菜</button> -->
 								<button class="tag" hover-class="hover-class"
@@ -177,7 +177,7 @@
 
 			<view class="u-flex u-row-between u-m-t-30 u-p-b-34 border-bottom">
 				<view>
-					<text v-if="eatTypes.active==2">包装费</text>
+					<text v-if="eatTypes.active=='takeout'">包装费</text>
 					<text v-else>桌位费</text>
 				</view>
 				<view>￥{{$seatFee.totalAmount||'0.00'}}</view>
@@ -196,14 +196,16 @@
 
 		<view style="height: 300rpx;"></view>
 		<view class="safe-bottom fixed">
-			<view>
+			<!-- <view class="u-m-b-48">
 				<label class="radio">
 					<radio value="" class="scale7" /><text>打印预结算</text>
 				</label>
-			</view>
+			</view> -->
 
-			<view class="u-m-t-48 btn">
-				<my-button shape="circle" @click="createOrder">提交</my-button>
+			<view class="btn ">
+				<my-button shape="circle" @click="createOrder">
+					{{$shop.registerType=='munchies'?'结算': '下单'}}
+				</my-button>
 			</view>
 
 		</view>
@@ -240,7 +242,12 @@
 	} from '@/commons/utils/format.js';
 	import color from '@/commons/color.js';
 	import * as Api from '@/http/yskApi/Instead.js'
-	import {getNowCart} from '@/pagesCreateOrder/util.js'
+	import {
+		tbShopInfo
+	} from '@/http/yskApi/user.js'
+	import {
+		getNowCart
+	} from '@/pagesCreateOrder/util.js'
 	const models = new Map();
 	//备注
 	let note = ref('')
@@ -270,16 +277,22 @@
 		defaultCateIndex: 1,
 	})
 	watch(() => userNumbers.defaultCateIndex, (newval) => {
+		console.log(newval);
 		updateChoseCount()
 	})
-	
+
 	//更新就餐人数
-	async function updateChoseCount(){
-		await Api.$choseCount({
-			masterId: option.masterId,
-			tableId: option.tableId,
-			num: userNumbers.defaultCateIndex,
-		})
+	async function updateChoseCount() {
+		console.log($shop.value);
+		if($shop.value.registerType!='restaurant'){
+			//不免餐位费
+			await Api.$choseCount({
+				masterId: option.masterId,
+				tableId: option.tableId,
+				num: userNumbers.defaultCateIndex,
+			})
+		}
+		
 	}
 
 	function userNumberChange(e) {
@@ -315,21 +328,17 @@
 
 	const eatTypes = reactive({
 		list: [{
-				label: '堂食',
-				value: 1
+				name: "堂食",
+				value: "dine-in",
 			},
 			{
-				label: '自取',
-				value: 2
-			},
+				name: "自取",
+				value: "takeout",
+			}
 		],
-		active: 1
+		active: 'dine-in'
 	})
 
-	function radioGroupChange(e) {
-		eatTypes.active = e.detail.value
-	}
-
 
 	function chooseUser() {
 		go.to('PAGES_CHOOSE_USER')
@@ -343,12 +352,24 @@
 
 	// 监听选择用户事件
 	let user = ref(null)
+	//更新选择用户
+	function setUser(par) {
+		const submitPar = {
+			masterId: option.masterId,
+			tableId: option.tableId,
+			vipUserId: user.value.id ? user.value.id : '',
+			type: user.value.id ? 0 : 1 //0 设置 1 取消
+		}
+		Object.assign(submitPar, par)
+		return Api.$setUser(submitPar)
+	}
 
 	function watchChooseuser() {
 		uni.$off('choose-user')
 		uni.$on('choose-user', (data) => {
 			console.log(data);
 			user.value = data
+			setUser()
 		})
 	}
 	let table = ref(null)
@@ -415,15 +436,24 @@
 			records,
 			seatFee
 		} = await Api.getCart(par)
-		goods.list =getNowCart(records) 
-		if(seatFee&&seatFee.totalNumber){
+		goods.list = getNowCart(records)
+		if (seatFee && seatFee.totalNumber) {
 			userNumbers.defaultCateIndex = seatFee.totalNumber || 1
 			Object.assign($seatFee, seatFee)
 		}
-		
+
 		console.log(goods.list);
 	}
 
+	let $shop = ref()
+	// 获取账号信息
+	async function getTbShopInfo() {
+		const res = await tbShopInfo()
+		$shop.value = res
+		console.log(res);
+		return res
+	}
+
 	// 创建订单
 	async function createOrder(par = {
 		masterId: option.masterId,
@@ -435,6 +465,13 @@
 	}) {
 		updateChoseCount()
 		const res = await Api.$createOrder(par)
+		console.log($shop.value);
+		if($shop.value.registerType=='munchies'){
+			//先付
+			return go.to('PAGES_ORDER_DETAIL',{
+				id:res.id
+			})
+		}
 		uni.showToast({
 			title: '提交成功',
 			icon: 'none'
@@ -453,10 +490,36 @@
 		if (opt) {
 			table.value = {
 				tableId: opt.tableId,
-				name: opt.tableName
+				name: opt.name
 			}
 		}
 		getCart()
+		getTbShopInfo()
+		updateChoseCount()
+	})
+
+	async function changeUseType() {
+		const {
+			registerType
+		} = $shop.value
+		//munchies 先付  restaurant 后付
+		const isPayAfter = registerType == "munchies" ? false : true;
+		let useType = "takeout";
+		if (eatTypes.active == "takeout") {
+			uni.setStorageSync("useType", "takeout");
+		} else {
+			//堂食
+			useType = `dine-in-${isPayAfter? "after" : "before"}`;
+			uni.setStorageSync("useType", useType);
+		}
+		const res = await Api.$changeUseType({
+			useType,
+			cartIds: goods.list.map((v) => v.id),
+		})
+		return res
+	}
+	watch(() => eatTypes.active, (newval) => {
+		changeUseType()
 	})
 	onBeforeUnmount(() => {
 
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index 7d7cf1c..92e1f9e 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -2,7 +2,18 @@
 	<view class="u-wrap">
 
 		<view class="top bg-fff w-full">
-			<view class="u-flex  u-row-between choose-user" @tap="chooseUser">
+			<view class="u-flex  u-row-between choose-user" @tap="chooseTable">
+				<view>
+					<view v-if="!data.table.tableId">选择桌台</view>
+					<view class="u-flex" v-else>
+						<view class="u-m-l-20">{{data.table.name}}</view>
+					</view>
+				</view>
+				<view class="u-flex">
+					<uni-icons type="right" size="20" color="#999"></uni-icons>
+				</view>
+			</view>
+			<!-- <view class="u-flex  u-row-between choose-user" @tap="chooseUser">
 				<view>
 					<view v-if="!data.vipUser.id">选择用户</view>
 					<view class="u-flex" v-else>
@@ -20,7 +31,7 @@
 				<view class="u-flex">
 					<uni-icons type="right" size="20" color="#999"></uni-icons>
 				</view>
-			</view>
+			</view> -->
 			<view class="search u-flex u-col-center ">
 				<view class="u-flex-1">
 					<uni-search-bar bgColor="#F9F9F9" cancelButton="none" placeholder="搜索店内商品" @confirm="search"
@@ -86,6 +97,7 @@
 <script setup>
 	import _ from 'lodash';
 	import * as Api from '@/http/yskApi/Instead.js'
+	import {$table} from '@/http/yskApi/table.js'
 	import {
 		$tbShopCategory
 	} from '@/http/yskApi/goods.js'
@@ -107,12 +119,15 @@
 		computed,
 		reactive,
 		ref,
-		nextTick
+		nextTick,
+		watch
 	} from 'vue';
 	import myCar from './components/car'
 	import go from '@/commons/utils/go.js';
 	import infoBox from '@/commons/utils/infoBox.js';
-	import {getNowCart} from '@/pagesCreateOrder/util.js'
+	import {
+		getNowCart
+	} from '@/pagesCreateOrder/util.js'
 	const cars = reactive([])
 	const data = reactive({
 		scrollTop: 0, //tab标题的滚动条位置
@@ -294,16 +309,23 @@
 	}
 
 
-
-
+	//获取台桌信息
+	async function getTableInfo(){
+		const res=await $table.get({qrcode:data.table.tableId})
+		console.log(res);
+		if(res&&res.content[0]){
+			// data.table=res.content[0]
+		}
+	}
 	async function init() {
+		getTableInfo()
 		const {
 			masterId
 		} = await getMasterId()
 		data.masterId = masterId
 		const cartRes = await getCart()
 		cars.length = 0
-		const cartArr =getNowCart(cartRes.records)
+		const cartArr = getNowCart(cartRes.records)
 		for (let i in cartArr) {
 			cars.push(cartArr[i])
 		}
@@ -351,13 +373,27 @@
 	let searchValue = ref('')
 
 	function search() {
-
+		console.log(searchValue.value);
+		console.log(data.tabbar );
 	}
 
 	function chooseUser() {
 		go.to('PAGES_CHOOSE_USER')
 	}
 
+	function chooseTable() {
+		go.to('PAGES_CHOOSE_TABLE', {
+			...data.table
+		})
+	}
+
+	function watchChooseTable() {
+		uni.$off('choose-table')
+		uni.$on('choose-table', (tableData) => {
+			data.table = tableData
+		})
+	}
+
 	function toLinshi() {
 		go.to('PAGES_ADD_TEMP_CUISINE')
 	}
@@ -499,7 +535,7 @@
 					prve[i] = matchArr
 						.filter((v) => v.specSnap.match(i))
 						.every((v) => {
-							return util.isCanBuy(v)
+							return !util.isCanBuy(v)
 						});
 				}
 			}
@@ -801,9 +837,14 @@
 			setUser()
 		})
 	}
+	watch(()=>data.table.tableId,(newval)=>{
+		console.log(newval);
+		init()
+	})
 	onBeforeUnmount(() => {})
 	onShow(() => {
-		watchChooseuser()
+		// watchChooseuser()
+		watchChooseTable()
 	})
 	onLoad((opt) => {
 		console.log(opt)
diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 020ed6b..36a8a67 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -12,7 +12,7 @@
 				<view class="item  u-m-b-20" v-for="(item,index) in order.info" :key="index">
 					<view class="u-flex u-col-top">
 						<view>
-							<image class="img" :src="item.coverImg" mode=""></image>
+							<image class="img" :src="item.coverImg||item.productImg" mode=""></image>
 						</view>
 						<view class="u-p-l-30 u-flex-1">
 							<view class="u-flex u-row-between u-col-top">
@@ -21,20 +21,27 @@
 									<view class="tui" v-if="item.status=='return'">
 										已退
 									</view>
-									<view :class="{'line-th':item.status=='return'}">{{item.name}}</view>
+									<view :class="{'line-th':item.status=='return'}">{{item.name||item.productName}}</view>
 								</view>
 								<view class="u-text-right">
-									<view>￥{{item.salePrice}}</view>
-									<view v-if="item.status=='return'" class="line-th color-666 u-font-24">￥{{item.salePrice}}</view>
-									<view class="u-m-t-10 u-font-24">X{{item.number}}</view>
+									<view>￥{{item.salePrice||item.price}}</view>
+									<view v-if="item.status=='return'" class="line-th color-666 u-font-24">￥{{item.salePrice||item.price}}</view>
+									<view class="u-m-t-10 u-font-24">X{{item.number||item.num}}</view>
 								</view>
 							</view>
 						</view>
 					</view>
-					<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
-						<!-- <my-button :height="60" color="#333" plain type="cancel" shape="circle">更多操作</my-button> -->
-						<my-button :width="168" :height="60" plain shape="circle" @tap="tuicai(item,index)">退菜</my-button>
-					</view>
+					<template v-if="orderInfo.status=='unpaid'">
+						<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
+							<!-- <my-button :height="60" color="#333" plain type="cancel" shape="circle">更多操作</my-button> -->
+							<my-button :width="168" :height="60" plain shape="circle" @tap="tuicai(item,index)">退菜</my-button>
+						</view>
+					</template>
+					<template v-if="orderInfo.status=='closed'">
+						<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
+							<my-button :width="168" :height="60" plain shape="circle" @tap="tuikuan(item,index)">退款</my-button>
+						</view>
+					</template>
 				</view>
 			</view>
 			<view class="bg-gray u-p-20 u-m-t-20">
@@ -45,9 +52,15 @@
 
 		<view class="u-m-t-40">
 			<view class="u-flex u-row-between border-bottom u-p-b-20">
-				<view class="tag no-pay">
-					未支付
+				<view>
+					<template v-if="orderInfo.status=='unpaid'">
+						<view class="tag no-pay">
+							未支付
+						</view>
+					</template>
+					
 				</view>
+				
 				<view>
 					<text>小计￥</text>
 					<text class="font-bold u-font-32">{{allPrice}}</text>
@@ -73,11 +86,21 @@
 		computed
 	} from 'vue';
 	import color from '@/commons/color.js'
-	const emits=defineEmits(['tuicai'])
+	const emits=defineEmits(['tuicai','tuikuan','printOrder'])
 	function tuicai(item,index){
 		emits('tuicai',item,index)
 	}
+	function tuikuan(item,index){
+		emits('tuikuan',item,index)
+	}
+	function printOrder(){
+		emits('printOrder')
+	}
 	const props = defineProps({
+		orderInfo:{
+			type: Object,
+			default: () => {}
+		},
 		data: {
 			type: Array,
 			default: () => []
@@ -90,7 +113,7 @@
 	const allPrice = computed(() => {
 		return props.data.reduce((prve, cur) => {
 			const curTotal=cur.info.filter(v=>v.isGift !== "true"&& v.status !== "return").reduce((a,b)=>{
-				return a+b.salePrice * b.number
+				return a+(b.salePrice||b.price) * (b.number||b.num)
 			},0)
 			return prve + curTotal
 		}, 0).toFixed(2)
@@ -100,15 +123,13 @@
 		let result = 0
 		result = props.data.reduce((a, b) => {
 			const bTotal = b.info.reduce((prve, cur) => {
-				return prve + cur.number * 1;
+				return prve + (cur.number||cur.num) * 1;
 			}, 0);
 			return a + bTotal
 		}, 0)
 		return result
 	})
-	function printOrder(){
-		
-	}
+	
 </script>
 
 <style lang="scss" scoped>
diff --git a/pagesOrder/detail/components/order.vue b/pagesOrder/detail/components/order.vue
index fb6fc52..03aae69 100644
--- a/pagesOrder/detail/components/order.vue
+++ b/pagesOrder/detail/components/order.vue
@@ -10,15 +10,15 @@
 		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>桌位号</view>
-			<view>{{table.name}}</view>
+			<view>{{table.name||data.tableName}}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>就餐人数</view>
-			<view>{{seatFee.totalNumber}}</view>
+			<view>{{seatFee.number||''}}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>支付方式</view>
-			<view></view>
+			<view>{{data.payType||''}}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>预约时间</view>
diff --git a/pagesOrder/detail/components/step.vue b/pagesOrder/detail/components/step.vue
index 8de801f..60fc5cb 100644
--- a/pagesOrder/detail/components/step.vue
+++ b/pagesOrder/detail/components/step.vue
@@ -1,11 +1,12 @@
 <template>
 	<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
-		<up-steps :dot="true" current="0" direction="column">
+		<my-step :list="recoders.list"></my-step>
+		<!-- <up-steps :dot="true" current="0" direction="column">
 			<up-steps-item title="2024-09-02 09:19" :itemStyle="itemStyle" desc="[东风(id:124413)]使用代客下单提交。(未打印预结单)">
 			</up-steps-item>
 			<up-steps-item title="2024-09-02 09:19" desc="[东风(id:124413)]使用代客下单提交。(未打印预结单)">
 			</up-steps-item>
-		</up-steps>
+		</up-steps> -->
 
 	</view>
 
@@ -19,7 +20,14 @@
 	const itemStyle = reactive({
 		color: 'rgb(255,0,0)'
 	})
-	
+	const recoders = reactive({
+		list:[
+			{title:'2024-09-15 11：20：30',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'},
+			{title:'2024-09-15 ',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'},
+			{title:'2024-09-15 ',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'}
+		],
+		active:0
+	})
 </script>
 
 <style>
diff --git a/pagesOrder/detail/components/user.vue b/pagesOrder/detail/components/user.vue
index 2ad40f5..5ddcf57 100644
--- a/pagesOrder/detail/components/user.vue
+++ b/pagesOrder/detail/components/user.vue
@@ -1,6 +1,8 @@
 <template>
 	<view class="u-font-28 default-box-padding u-relative bg-fff border-r-12 u-overflow-hide">
-		<view class="change u-absolute my-bg-main color-fff  left-top" >切换</view>
+		<template v-if="orderInfo.status=='unpaid'">
+			<view class="change u-absolute my-bg-main color-fff  left-top" @click="chooseUser">切换</view>
+		</template>
 		<view class="u-flex	u-row-between u-m-t-20 border-bottom u-p-b-20">
 			<view class="u-flex">
 				<up-avatar :size="30"></up-avatar>
@@ -27,14 +29,28 @@
 	</view>
 </template>
 
-<script>
+<script setup>
+	import go from '@/commons/utils/go.js'
+	const props = defineProps({
+		orderInfo: {
+			type: Object,
+			default: () => {}
+		},
+		user: {
+			type: Object,
+			default: () => {}
+		}
+	})
+
+	function chooseUser() {
+		go.to('PAGES_CHOOSE_USER')
+	}
 </script>
 
 <style lang="scss" scoped>
-.change{
-	padding: 4rpx 16rpx;
-	border-radius: 0 0 16rpx 0;
-	z-index: 2;
-}	
-
+	.change {
+		padding: 4rpx 16rpx;
+		border-radius: 0 0 16rpx 0;
+		z-index: 2;
+	}
 </style>
\ No newline at end of file
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 674e62d..e28171a 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="min-page bg-gray u-font-28 u-p-30">
-		<user-vue></user-vue>
+		<user-vue :orderInfo="orderDetail.info"></user-vue>
 		<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
 			<text class="color-666">桌位号：</text>
-			<text class="font-bold">{{options.name}}</text>
+			<text class="font-bold">{{orderDetail.info.tableName}}</text>
 		</view>
-		<goods-list :data="orderDetail.goodsList" :seatFee="orderDetail.seatFee.totalAmount"
+		<goods-list @printOrder="onPrintOrder"  @tuikuan="onTuikuan" :orderInfo="orderDetail.info" :data="orderDetail.goodsList" :seatFee="orderDetail.seatFee.totalAmount"
 			@tuicai="onTuiCai"></goods-list>
 		<extra-vue :data="orderDetail.seatFee"></extra-vue>
 		<order-vue :data="orderDetail.info" :table="options" :seatFee="orderDetail.seatFee"></order-vue>
@@ -23,7 +23,7 @@
 							type="primary">结账</my-button>
 					</view>
 				</template>
-				
+
 			</view>
 		</view>
 
@@ -34,6 +34,9 @@
 <script setup>
 	import * as Api from '@/http/yskApi/Instead.js'
 	import * as orderApi from '@/http/yskApi/order.js'
+	import {
+		objToArrary
+	} from '@/commons/utils/returrn-data.js'
 	import userVue from './components/user.vue';
 	import orderVue from './components/order.vue';
 	import goodsList from './components/list.vue';
@@ -41,13 +44,14 @@
 	import extraVue from './components/extra.vue';
 	import tuicaiVue from './components/tuicai.vue';
 	import go from '@/commons/utils/go.js'
+	import infoBox from '@/commons/utils/infoBox.js'
 	import {
 		onLoad,
 		onShow,
 		onHide
 	} from '@dcloudio/uni-app';
 	import {
-		reactive
+		reactive, ref
 	} from 'vue';
 	import OrderDetail from './page.js'
 	const tuicai = reactive({
@@ -59,13 +63,42 @@
 		tuicai.show = true
 		tuicai.selGoods = goods
 	}
+	async function printDishes(){
+		try{
+			const res= await Api.$printDishes({
+				tableId:orderDetail.info.tableId
+			})
+			infoBox.showToast('已发送打印请求')
+		}catch(e){
+			infoBox.showToast('发送打印请求失败')
+			//TODO handle the exception
+		}
+		
+	}
+	function onPrintOrder(){
+		uni.showModal({
+			title:'提示',
+			content:'是否打印当前台桌菜品',
+			success(res) {
+				if(res.confirm){
+					printDishes()
+				}
+			}
+		})
+	}
+	function onTuikuan(goods, index){
+		go.to('PAGES_ORDER_TUIKUAN',{
+			
+		})
+		
+	}
 
 	async function tuicaiConfirm() {
-		const res=await Api.$returnCart({
-			cartId: tuicai.selGoods.id,
-			tableId:options.tableId,
+		const res = await Api.$returnCart({
+			cartId: tuicai.selGoods.cartId,
+			tableId: orderDetail.info.tableId,
 		})
-		tuicai.selGoods.status='return'
+		tuicai.selGoods.status = 'return'
 		tuicai.show = false
 	}
 	const uiPage = new OrderDetail()
@@ -84,7 +117,7 @@
 	}
 
 	function toPay() {
-		go.to('PAGES_CRESATE_ORDER_PAY', {
+		go.to('PAGES_ORDER_PAY', {
 			tableId: options.tableId,
 			tableName: options.name,
 			masterId: options.masterId,
@@ -102,22 +135,48 @@
 	})
 	const options = reactive({})
 	async function init() {
-		const res= await orderApi.tbOrderInfoDetail(options.id)
-		const masterId=res.masterId
+		const res = await orderApi.tbOrderInfoDetail(options.id)
+		const masterId = res.masterId
 		options.masterId = res.masterId
-		if(res.status=='unpaid'){
+		if (res.status == 'unpaid') {
+			// if (false) {
 			const {
 				records,
 				seatFee
 			} = await Api.getCart({
 				masterId,
-				tableId:res.tableId
+				tableId: res.tableId,
+				page: 1,
+				size: 200
 			})
 			orderDetail.goodsList = records
-			orderDetail.seatFee = seatFee
-		}else{
-			orderDetail.goodsList = res.detailList
+			orderDetail.seatFee = seatFee ? seatFee : orderDetail.seatFee
+		} else {
+			const goodsMap = {}
+			for (let i in res.detailList) {
+				const goods = res.detailList[i]
+				if (goods.productName != '客座费') {
+					if (goodsMap.hasOwnProperty(goods.placeNum)) {
+						goodsMap[goods.placeNum].push(goods)
+					} else {
+						goodsMap[goods.placeNum] = [goods]
+					}
+				}
+
+			}
+			orderDetail.seatFee = {
+				name: '餐位费',
+				number: res.seatCount,
+				totalNumber: res.seatCount,
+				totalAmount: res.seatAmount
+			}
+			orderDetail.goodsList = Object.entries(goodsMap).map(([key, value]) => ({
+				info: value,
+				placeNum: key
+			}))
+			console.log(orderDetail.goodsList);
 		}
+		console.log(orderDetail);
 		orderDetail.info = res
 	}
 
@@ -128,8 +187,32 @@
 			init()
 		})
 	}
+	
+	// 监听选择用户事件
+	let user = ref(null)
+	//更新选择用户
+	function setUser(par) {
+		const submitPar = {
+			masterId: option.masterId,
+			tableId: option.tableId,
+			vipUserId: user.value.id ? user.value.id : '',
+			type: user.value.id ? 0 : 1 //0 设置 1 取消
+		}
+		Object.assign(submitPar, par)
+		return Api.$setUser(submitPar)
+	}
+	function watchChooseuser() {
+		uni.$off('choose-user')
+		uni.$on('choose-user', (data) => {
+			console.log(data);
+			user.value = data
+			setUser()
+		})
+	}
+	
 	onShow(() => {
 		watchEmit()
+		watchChooseuser()
 	})
 	onLoad((opt) => {
 		Object.assign(options, opt)
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index 71541de..3076977 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -22,7 +22,7 @@
 				<view class="u-m-l-16">{{formatTime(data.createdAt)}}</view>
 			</view>
 			<view class="u-m-t-32">
-				<view class="u-font-32">1种商品，共1件</view>
+				<view class="u-font-32">{{goosZhonglei}}种商品，共{{goodsNumber}}件</view>
 				<view class="border-bottom u-p-b-32">
 					<view class="u-flex u-row-between u-m-t-24" v-for="(item,index) in data.detailList" :key="index">
 						<view>
@@ -32,12 +32,12 @@
 							</view>
 						</view>
 						<view class="u-flex">
-							<view>×1</view>
-							<view class="u-m-l-24">￥15.00</view>
+							<view>×{{item.num}}</view>
+							<view class="u-m-l-24">￥{{item.price}}</view>
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
 			<view class="u-flex u-row-between border-bottom u-m-t-32 u-p-b-32">
 				<view>订单备注</view>
@@ -49,7 +49,7 @@
 					<text class="font-bold u-font-32">{{data.orderAmount}}</text>
 				</view>
 				<view class="u-flex u-row-right u-m-t-24">
-					<view class="print">重新打印</view>
+					<view class="print" @click.stop="print(item)">重新打印</view>
 				</view>
 			</view>
 		</view>
@@ -60,19 +60,51 @@
 	import dayjs from 'dayjs';
 	import orderEnum from '@/commons/orderEnum.js'
 	import go from '@/commons/utils/go.js'
+	import {
+		computed,
+		reactive,
+		ref,
+		watch
+	} from 'vue';
+	const emits=defineEmits(['printOrder'])
 	const props = defineProps({
 		data: {
 			type: Object,
-			default: () => {}
+			default: () => {
+				detailList: []
+			}
 		},
 		index: {
 			type: [String, Number],
 			default: 0
 		}
 	})
-	function formatTime(time){
+	let $goodsMap = {}
+	let goosZhonglei =ref(0)
+	let goodsNumber = ref(0)
+	function goodsMapInit(){
+		for (let i in props.data.detailList) {
+			const goods = props.data.detailList[i]
+			if ($goodsMap.hasOwnProperty(goods.productId)) {
+				$goodsMap[goods.productId] += goods.num*1
+				goodsNumber.value+=goods.num*1
+			} else {
+				$goodsMap[goods.productId] = goods.num*1
+				goosZhonglei.value+=1
+				goodsNumber.value+=goods.num*1
+			}
+		}
+	}
+	goodsMapInit()
+	watch(() => props.data.detailList, (newval) => {
+		goodsMapInit()
+	})
+	
+
+	function formatTime(time) {
 		return dayjs(time).format('YYYY-MM-DD HH:mm:ss');
 	}
+
 	function returnStatus(status) {
 		const item = orderEnum.status.find(v => v.key == status)
 		return item ? item.label : ''
@@ -85,11 +117,15 @@
 			return t;
 		}
 	}
-	function toDetail(){
-		go.to('PAGES_ORDER_DETAIL',{
-			id:props.data.id
+
+	function toDetail() {
+		go.to('PAGES_ORDER_DETAIL', {
+			id: props.data.id
 		})
 	}
+	function print(item) {
+		emits('printOrder',props.data)
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -110,10 +146,11 @@
 	.unpaid {
 		color: #FD7B49;
 	}
-	.print{
+
+	.print {
 		padding: 6rpx 14rpx 8rpx 18rpx;
-		border:1px solid $my-main-color;
-		color:$my-main-color;
+		border: 1px solid $my-main-color;
+		color: $my-main-color;
 		font-size: 24rpx;
 		border-radius: 100rpx;
 	}
diff --git a/pagesOrder/index/compoents/order-list.vue b/pagesOrder/index/compoents/order-list.vue
index 8c67aa7..efff248 100644
--- a/pagesOrder/index/compoents/order-list.vue
+++ b/pagesOrder/index/compoents/order-list.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="list">
 		<view v-for="(item,index) in list" :key="index">
-			<order-item :data="item" :index="index"></order-item>
+			<order-item @printOrder="print"  :data="item" :index="index"></order-item>
 		</view>
 		<view v-if="hasAjax&&!list.length">
 			<my-img-empty tips="亲，你还没有订单哦~"></my-img-empty>
@@ -21,7 +21,10 @@
 			default:false
 		}
 	})
-	
+	const emits=defineEmits(['printOrder'])
+	function print(item) {
+		emits('printOrder',item)
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pagesOrder/index/index.vue b/pagesOrder/index/index.vue
index 6b44641..1654feb 100644
--- a/pagesOrder/index/index.vue
+++ b/pagesOrder/index/index.vue
@@ -6,14 +6,18 @@
 			</view>
 			<filter-vue v-model:time="pageData.order.query.createdAt"></filter-vue>
 		</view>
-		<order-list :hasAjax="pageData.order.hasAjax" :list="pageData.order.list"></order-list>
+		<order-list @printOrder="onPrintOrder" :hasAjax="pageData.order.hasAjax" :list="pageData.order.list"></order-list>
+		<my-pagination :totalElements="pageData.order.totalElements"></my-pagination>
+		<view style="height: 100rpx;"></view>
 	</view>
 </template>
 
 <script setup>
 	import * as Api from '@/http/yskApi/order.js'
+	import {$printOrder} from '@/http/yskApi/Instead.js'
 	import filterVue from './compoents/filter.vue';
 	import orderList from './compoents/order-list.vue';
+	import infoBox from '@/commons/utils/infoBox.js'
 	import {
 		reactive, watch
 	} from 'vue';
@@ -28,10 +32,11 @@
 			textAlign: 'right'
 		}
 	})
-
+	
 	const pageData = reactive({
 		order: {
 			list: [],
+			totalElements:0,
 			hasAjax:false,
 			query: {
 				createdAt: [],
@@ -50,12 +55,40 @@
 		init()
 	})
 	async function init() {
-		const {content}=await Api.tbOrderInfoData(pageData.order.query)
+		const {content,totalElements}=await Api.tbOrderInfoData(pageData.order.query)
 		pageData.order.hasAjax=true
+		pageData.order.totalElements=totalElements
 		pageData.order.list=content
 		console.log(content);
 	}
 	init()
+	
+	async function printOrder(item){
+		try{
+			console.log(item);
+			const res= await $printOrder({
+				tableId:item.tableId
+			})
+			infoBox.showToast('已发送打印请求')
+		}catch(e){
+			console.log(e);
+			infoBox.showToast('发送打印请求失败')
+			//TODO handle the exception
+		}
+		
+	}
+	function onPrintOrder(e){
+		console.log(e);
+		uni.showModal({
+			title: '提示',
+			content: '是否打印该订单',
+			success(res) {
+				if (res.confirm) {
+					printOrder(e)
+				}
+			}
+		})
+	}
 </script>
 
 <style>
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
new file mode 100644
index 0000000..e920104
--- /dev/null
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -0,0 +1,320 @@
+<template>
+	<view class="bg-gray min-page u-p-30 u-font-28">
+		<view class="u-p-t-60 u-p-b-60 u-text-center">
+			<view class="u-font-32 ">
+				<text class="price-fuhao">￥</text>
+				<text class="font-bold price">{{discount.currentPrice?discount.currentPrice:order.amount}}</text>
+			</view>
+			<view class="u-m-t-10 color-999 old-price">
+				<text class="">￥</text>
+				<text class=" ">{{order.amount}}</text>
+			</view>
+			<view class="u-m-t-10 u-flex u-row-center color-main">
+				<view @click="showModel('editMoney',true)">修改</view>
+			</view>
+		</view>
+		<view class="content bg-fff box-shadow border-r-12">
+			<view class="  u-p-t-30 u-p-l-26 u-p-r-26 card top  u-m-t-30">
+				<view class="u-flex u-p-l-24 u-p-r-24 border-bottom-dashed u-row-between u-p-b-30">
+					<view>优惠券</view>
+					<view class="color-999 u-flex u-col-center">
+						<text>选择优惠券</text>
+						<view class="u-flex u-col-center">
+							<uni-icons type="right" color="#999"></uni-icons>
+						</view>
+					</view>
+				</view>
+				<view class="u-flex u-p-l-24 u-p-r-24 border-bottom u-row-between u-p-t-30 u-p-b-30"
+					v-if="discount.price&&discount.currentPrice!=order.amount">
+					<view>服务员改价</view>
+					<view class=" u-flex u-col-center">
+						<text style="color: rgb(255, 95, 46);">-￥{{order.amount- discount.currentPrice}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="bg-fff   border-r-12 ">
+				<view class="u-p-t-30 u-p-l-50 u-p-r-50  card bottom">
+					<my-tabs :list="pays.list" v-model="pays.selIndex"></my-tabs>
+					<template v-if="pays.selIndex==0">
+						<view class="list">
+							<view class="item" @click="changePayType(index)" v-for="(item,index) in pays.payTypes.list"
+								:key="index">
+								<view class="u-flex u-row-between u-p-t-30 u-p-b-30 border-bottom">
+									<view class="u-flex">
+										<image class="icon" :src="item.icon" mode=""></image>
+										<text class="u-m-l-10">{{item.payName}}</text>
+									</view>
+									<view class="u-flex color-999 u-font-24">
+										<!-- <view class="u-m-r-20">
+											<text>余额：</text>
+											<text>￥0.00</text>
+										</view> -->
+										<my-radio @click="changePayType(index)" :modelValue="index==pays.payTypes.selIndex">
+										</my-radio>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="u-m-t-60 u-p-b-30">
+							<my-button @click="payOrder">确认付款</my-button>
+						</view>
+					</template>
+					<template v-else>
+						<view class="">
+							<view class="u-font-32 u-m-t-40 u-text-center">请让顾客使用微信扫码</view>
+							<view class="u-flex u-row-center u-m-t-40  ">
+								<up-qrcode :size="140" val="uview-plus"></up-qrcode>
+							</view>
+						</view>
+					</template>
+				</view>
+				
+				<!-- 二维码支付扫码 -->
+				<template  v-if="pays.selIndex==1">
+					<view class="card border-bottom top u-m-t-32">
+					
+					</view>
+					<view class="bg-fff  card bottom border-r-12 u-p-32">
+						<view class="font-bold u-font-32 u-text-center">
+							￥{{discount.currentPrice?discount.currentPrice: order.amount}}</view>
+						<view class="u-flex u-row-center u-m-t-24">
+							<up-loading-icon size="14" text="等待支付"></up-loading-icon>
+							<view class="u-flex pay-success">
+								<up-icon color="#5CBB6F" name="checkmark-circle-fill"></up-icon>
+								<view class="u-m-l-6">支付成功</view>
+							</view>
+						</view>
+					</view>
+				</template>
+				
+				
+			
+			
+			</view>
+			
+		</view>
+	
+
+
+
+		<edit-discount @confirm="editDiscountConfirm" title="优惠金额" :ref="setModel" name="editMoney"
+			:price="order.amount"></edit-discount>
+	</view>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		onMounted,
+		watch,
+		ref
+	} from 'vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+	import * as Api from '@/http/yskApi/Instead.js'
+	import * as orderApi from '@/http/yskApi/order.js'
+	import infoBox from '@/commons/utils/infoBox.js'
+	import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue'
+
+	let payStatus = ref(null) //loading success
+
+
+	const pays = reactive({
+		list: ['扫码收款', '二维码收款'],
+		selIndex: 0,
+		payTypes: {
+			list: [],
+			selIndex: 0
+		}
+	})
+
+	const models = new Map();
+
+	function setModel(el) {
+		if (el && el.$attrs['name']) {
+			models.set(el.$attrs['name'], el);
+		}
+	}
+
+	function showModel(key) {
+		const model = models.get(key)
+		model && model.open()
+	}
+
+	//打折相关数据
+	const discount = reactive({
+
+	})
+
+	function editDiscountConfirm(form) {
+		console.log(form);
+		Object.assign(discount, form)
+	}
+	async function getPayType() {
+		const payTypeList = await Api.$getPayType()
+		pays.payTypes.list = payTypeList
+	}
+
+	function changePayType(i) {
+		pays.payTypes.selIndex = i
+	}
+	//支付成功回调
+	function paySuccess() {
+		infoBox.showToast('支付成功')
+		setTimeout(() => {
+			// uni.$emit('orderDetail:update')
+			uni.navigateBack({
+				delta: 2
+			})
+		}, 500)
+	}
+	async function payOrder() {
+		const payType = pays.payTypes.list[pays.payTypes.selIndex].payType
+		await Api.$payOrder({
+			tableId: order.tableId,
+			masterId: order.masterId,
+			orderId: order.id || order.orderId,
+			payType,
+			vipUserId: order.userId,
+			discount: 1,
+			code: ''
+		})
+		paySuccess()
+	}
+
+	onMounted(() => {
+		getPayType()
+	})
+	const order = reactive({
+		amount: 0
+	})
+
+	function saomaPay() {
+		const item = pays.payTypes.list[pays.payTypes.selIndex]
+		uni.scanCode({
+			onlyFromCamera: true,
+			success: function(res) {
+				console.log('条码类型：' + res.scanType);
+				console.log('条码内容：' + res.result);
+				Api.$payOrder({
+					"orderId": order.orderId, // 订单id
+					"payType": item.payType, //
+					"discount": order.discount,
+					"code": res.result
+				}).then(res => {
+					console.log(res);
+					paySuccess()
+				})
+			}
+		});
+	}
+	watch(() => pays.payTypes.selIndex, (newval) => {
+		const item = pays.payTypes.list[newval]
+		if (item.payType == "vipPay") {
+			return
+		}
+		if (item.payType == "deposit") {
+			//储值卡支付
+			return saomaPay('deposit')
+		}
+		if (item.payType == "scanCode") {
+			//扫码支付
+			return saomaPay('scanCode')
+		}
+	})
+	async function init() {
+		const res = await orderApi.tbOrderInfoDetail(order.orderId)
+		Object.assign(order, res)
+	}
+	onLoad((opt) => {
+		Object.assign(order, opt)
+		init()
+	})
+</script>
+
+<style lang="scss" scoped>
+	.box-shadow {
+		box-shadow: 0 0 5px #E5E5E5;
+	}
+
+	.pay-success {
+		color: #5CBB6F;
+	}
+
+	.icon {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.border-bottom-dashed {
+		border-bottom: 1px dashed #bbb;
+	}
+
+	.border-bottom {
+		border-color: rgb(240, 240, 240);
+	}
+
+	.list {
+		.item:last-child {
+			.border-bottom {
+				border-bottom: none;
+			}
+		}
+
+	}
+
+	.old-price {
+		text-decoration: line-through;
+	}
+
+	.price-fuhao {
+		font-size: 24px;
+	}
+
+	.price {
+		font-size: 32px;
+	}
+
+	$dotSize: 20rpx;
+	$position: calc($dotSize / (-2));
+
+	.card {
+		position: relative;
+
+		&::after,
+		&:before {
+			content: '';
+			display: block;
+			position: absolute;
+			background-color: #F9F9F9;
+			width: $dotSize;
+			height: $dotSize;
+			border-radius: 50%;
+		}
+
+		&.top {
+			&::after {
+				right: $position;
+				bottom: $position;
+			}
+
+			&:before {
+				left: $position;
+				bottom: $position;
+			}
+		}
+
+		&.bottom {
+			&::after {
+				right: $position;
+				top: $position;
+			}
+
+			&:before {
+				left: $position;
+				top: $position;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesOrder/tuikuan/tuikuan.vue b/pagesOrder/tuikuan/tuikuan.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pagesOrder/tuikuan/tuikuan.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>