diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index 65e0cbb..44d1412 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -10,28 +10,35 @@
 					<uni-forms :model="FormData" :rules="rules" :border="true" label-position="top"
 						err-show-type="toast" validateTrigger="submit" label-width="350" ref="Forms">
 						<view class="block">
-							<view class="border-top-0">
+							<view class="border-top-0 typeEnum">
 								<uni-forms-item label="商品类型" required showRequired>
+									<up-radio-group v-model="FormData.type" placement="row">
+										<up-radio v-for="(item, index) in pageData.types" :key="index"
+											:label="item.name" :name="item.value">
+										</up-radio>
+									</up-radio-group>
+								</uni-forms-item>
+							</view>
+							<view class="" v-if="FormData.type!='package'">
+								<uni-forms-item label="商品规格" required showRequired>
 									<up-radio-group v-model="FormData.typeEnum" placement="row">
-										<up-radio :customStyle="{marginRight: '30px'}"
-											v-for="(item, index) in pageData.types" :key="index" :label="item.name"
+										<up-radio :custom-style="{marginRight:'30px'}"
+											v-for="(item, index) in pageData.typeEnums" :key="index" :label="item.name"
+											:name="item.value">
+										</up-radio>
+									</up-radio-group>
+								</uni-forms-item>
+							</view>
+							<view class="" v-if="FormData.type==='package'">
+								<uni-forms-item label="套餐商品">
+									<up-radio-group v-model="FormData.groupType" placement="row">
+										<up-radio :custom-style="{marginRight:'30px'}"
+											v-for="(item, index) in packageType.list" :key="index" :label="item.name"
 											:name="item.value">
 										</up-radio>
 									</up-radio-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="title">{{item.title}}</view>
-											<view class="u-font-24 color-999 u-m-t-10">
-												{{item.desc}}
-											</view>
-										</view>
-									</view> -->
-
 								</uni-forms-item>
 							</view>
-
 							<uni-forms-item ref="fileItem" label="图片" required showRequired>
 								<my-upload-file ref="refFile" :images="FormData.images"
 									:imageStyles="imageStyles"></my-upload-file>
@@ -39,12 +46,20 @@
 									注:第一张图为商品封面图，图片尺寸为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'">
+							<view class=" typeEnum">
+								<uni-forms-item label="显示/隐藏" required showRequired>
+									<up-checkbox-group v-model="FormData.showType" placement="row">
+										<up-checkbox v-for="(item, index) in pageData.showTypes" :key="index"
+											:label="item.name" :name="item.value">
+										</up-checkbox>
+									</up-checkbox-group>
+								</uni-forms-item>
+							</view>
+							<template v-if="FormData.type!='package'">
+								<uni-forms-item required name="name" label="商品名称" showRequired>
+									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+										:inputBorder="inputBorder" v-model="FormData.name" placeholder="请输入商品名称" />
+								</uni-forms-item>
 								<view class="u-relative">
 									<uni-forms-item label="商品分类" required showRequired name="categoryId">
 										<uni-data-picker :clear-icon="false" :map="{text:'name',value:'id'}"
@@ -57,18 +72,152 @@
 
 									</view>
 								</view>
+								<view class="border-top-0">
+									<uni-forms-item label="单位" required showRequired name="units">
+
+										<uni-data-picker :clear-icon="false" @change="unitIdChange"
+											:map="{text:'name',value:'id'}" placeholder="请选择单位" popup-title="请选择单位"
+											:localdata="pageData.units" v-model="FormData.unitId">
+										</uni-data-picker>
+									</uni-forms-item>
+								</view>
+							</template>
+							<template v-if="FormData.type==='package'">
+								<!-- <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="border-top">
+									<view class=""
+										v-if="(FormData.groupType==1&&FormData.proGroupVo.length)||(FormData.groupType==0&&FormData.proGroupVo[0].goods.length) ">
+										<view class="border-bottom  u-p-b-32"
+											v-for="(item,index) in FormData.proGroupVo" :key="index">
+											<view class=" u-p-t-24" v-if="FormData.groupType==1">
+												<view class="u-flex u-row-between">
+													<view class="u-flex">
+														<text class="color-red">*</text>
+														<text class="font-bold">套餐名称</text>
+													</view>
+
+													<view class="u-flex color-999 " @tap="delproGroupVo(index)">
+														<uni-icons type="minus-filled" :size="16"
+															:color="color.ColorRed"></uni-icons>
+														<view class="u-m-l-10">删除套餐组</view>
+													</view>
+												</view>
+												<view class="u-flex u-m-t-16">
+													<up-input v-model="item.title" placeholder="请输入套餐名称"></up-input>
+													<view class="u-flex color-main u-font-24 u-m-l-24"
+														@click="proGroupVoAddGoods(index,item.goods)">
+														<up-icon name="plus" :size="12"
+															:color="color.ColorMain"></up-icon>
+														<view class="font-bold">添加商品</view>
+													</view>
+												</view>
+											</view>
+											<view class="u-m-t-24" v-if="item.goods.length>0">
+												<!-- <view class="font-bold">商品信息</view> -->
+												<view class="  u-font-24 table">
+													<view class="u-flex title">
+														<view class="u-flex-1 ">名称</view>
+														<view class="u-flex-1 u-text-center">规格</view>
+														<view class="u-flex-1 u-text-center">价格</view>
+														<view class=" u-flex-1 u-text-right">
+															<view class="u-p-r-40">数量</view>
+														</view>
+													</view>
+													<view class="u-flex row u-p-24 u-row-between"
+														v-for="(product,goodsIndex) in item.goods" :key="goodsIndex">
+														<view class=" u-flex u-flex-1">
+															<view class="  ">
+																{{product.name||product.proName}}
+															</view>
+														</view>
+														<view class=" u-flex u-row-center u-flex-1">
+															<view
+																@click="refChooseGuigeOpen(product.skuList,index,goodsIndex)"
+																class="">
+																<template
+																	v-if="!product.skuName&&product.typeEnum=='多规格'">
+																	<up-button type="primary"
+																		size="mini">设置规格</up-button>
+																</template>
+																<template v-else>
+																	<text class="color-main">{{product.skuName}}</text>
+																</template>
+															</view>
+														</view>
+														<view class=" u-flex u-flex-1 u-row-center">
+															<view class="  u-text-center ">
+																{{product.lowPrice||product.price}}
+															</view>
+														</view>
+														<view class=" u-flex u-text-right u-flex-1 u-row-right">
+															<view class="u-flex u-p-r-30">
+																<up-number-box :button-size="14" integer
+																	v-model="product.number">
+																	<template #minus>
+																		<view class="minus">
+																			<up-icon name="minus" size="12"></up-icon>
+																		</view>
+																	</template>
+																	<template #plus>
+																		<view class="plus">
+																			<up-icon name="plus" size="12"></up-icon>
+																		</view>
+																	</template>
+																</up-number-box>
+															</view>
+															<up-icon @click="proGroupVoGoodsDel(index,goodsIndex)"
+																size="14" name="trash"
+																:color="color.ColorMain"></up-icon>
+														</view>
+													</view>
+												</view>
+
+											</view>
+											<template v-if="FormData.groupType==1">
+												<view class="u-m-t-24">
+													<text class="color-red">*</text>
+													<text class="font-bold">几选几</text>
+												</view>
+												<view class="u-flex u-m-t-16">
+													<uni-number-box :min="1" :max="item.goods.length" :width="200"
+														v-model="item.number" placeholder="几选几"></uni-number-box>
+												</view>
+											</template>
+
+
+										</view>
+									</view>
+									<template v-if="FormData.groupType==1">
+										<view class="bg-fff u-flex u-p-t-24 u-p-b-24  border-r-12 "
+											@tap="proGroupVoPush">
+											<uni-icons type="plus-filled" :color="color.ColorMain"
+												:size="20"></uni-icons>
+											<view class="u-m-l-16">添加套餐组</view>
+										</view>
+									</template>
+									<template v-else>
+										<view class="bg-fff u-flex u-p-t-24 u-p-b-24  border-r-12 "
+											@tap="proGroupVoAddGoods()">
+											<uni-icons type="plus-filled" :color="color.ColorMain"
+												:size="20"></uni-icons>
+											<view class="u-m-l-16">添加商品</view>
+										</view>
+									</template>
+
+								</view>
+
+
 
 							</template>
-							<view class="border-top-0">
-								<uni-forms-item label="单位" required showRequired name="units">
-								
-									<uni-data-picker :clear-icon="false" @change="unitIdChange"
-										:map="{text:'name',value:'id'}" placeholder="请选择单位" popup-title="请选择单位"
-										:localdata="pageData.units" v-model="FormData.unitId">
-									</uni-data-picker>
-								</uni-forms-item>
-							</view>
-							
+
 
 							<view class="">
 								<uni-forms-item label="商品描述">
@@ -111,6 +260,7 @@
 								<choose-group-category @confirm="refChooseCouponCategoryConfirm"
 									ref="refChooseGroupCategory"></choose-group-category>
 							</template>
+
 						</view>
 						<template v-if="FormData.typeEnum=='sku' ">
 							<view class="block border-top-0 u-p-t-32 u-p-b-32">
@@ -148,82 +298,64 @@
 
 						</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.list" :key="index">
+							<view class="block u-p-t-32 u-p-b-32" v-for="(sku,index) in skuList.list" :key="index">
+								<view class=" font-bold u-m-b-32  u-text-center">规格属性</view>
+								<view class="u-flex w-full gap-26 u-row-between">
+									<view class="u-flex-1">
+										<view>
+											<text class="color-red">*</text>
+											<text>售价</text>
+										</view>
+										<view class="u-m-t-16">
+											<price-number-box placeholder="请输入售价"
+												v-model="sku.salePrice"></price-number-box>
+										</view>
+									</view>
+									<view class="u-flex-1">
+										<view>
+											<text>会员价</text>
+										</view>
+										<view class="u-m-t-16">
+											<price-number-box placeholder="请输入会员价（元）"
+												v-model="sku.memberPrice"></price-number-box>
+										</view>
+									</view>
+								</view>
+								<view class="u-flex w-full gap-26 u-row-between u-m-t-24">
+									<view class="u-flex-1">
+										<view>
+											<text class="color-red">*</text>
+											<text>起售数量</text>
+										</view>
+										<view class="u-m-t-16">
+											<price-number-box placeholder="请输入起售数量"
+												v-model="sku.suit"></price-number-box>
+										</view>
+									</view>
+									<view class="u-flex-1">
+										<view>
+											<text>分销金额</text>
+										</view>
+										<view class="u-m-t-16">
+											<price-number-box placeholder="请输入分销金额"
+												v-model="sku.firstShared"></price-number-box>
+										</view>
+									</view>
+								</view>
+								<view class="u-m-t-24">
+									<view class="">
+										商品条形码
+									</view>
+									<view class="u-m-t-16 barCode color-999">
+										{{sku.barCode}}
+									</view>
+								</view>
+
+							</view>
+							<!-- <view class="block" v-for="(sku,index) in skuList.list" :key="index">
+								<view class="u-m-t-20 font-bold u-m-b-20  u-text-center">规格属性</view>
 								<view class="border-top-0">
 									<uni-forms-item label="售价" required showRequired>
 										<uni-easyinput :paddingNone="inputPaddingNone"
@@ -239,28 +371,11 @@
 										: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="起售数量" required showRequired>
 									<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"
@@ -272,7 +387,7 @@
 										:placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
 										v-model="sku.barCode" placeholder="请输入起售数量" />
 								</uni-forms-item>
-							</view>
+							</view> -->
 						</template>
 
 						<template v-if="FormData.typeEnum==='group'">
@@ -397,6 +512,23 @@
 							</view>
 						</template>
 
+						<template v-if="FormData.type=='weight'">
+							<view class="block u-p-t-32 u-p-b-32">
+								<view class="font-bold">
+									<text class="color-red">*</text>
+									<text>重量</text>
+								</view>
+								<view class=" u-m-t-16">
+									<up-input v-model="FormData.weight">
+										<template #suffix>
+											<view class="bg-gray">千克</view>
+										</template>
+									</up-input>
+									<view class="u-m-t-16 color-999 u-font-24">用于快递或配送运费计重</view>
+								</view>
+							</view>
+						</template>
+
 						<template v-if="FormData.typeEnum!='group'">
 							<view class="block ">
 								<!-- <view class="border-top-0">
@@ -410,6 +542,57 @@
 									</uni-forms-item>
 								</view> -->
 								<view class="border-top-0">
+									<view class="u-flex u-row-between u-p-b-24 u-p-t-20">
+										<view class="label-title">是否允许临时改价</view>
+										<my-switch disabled :openDisabledClass="false"
+											v-model="FormData.isTempPrice"></my-switch>
+									</view>
+								</view>
+								<view class="u-p-t-24 u-p-b-24 border-top u-flex u-row-between">
+									<view>
+										<text class="font-bold">每日销量上限</text>
+									</view>
+									<view class="">
+										<price-number-box placeholder="请输入每日销量上限"
+											v-model="FormData.dayLimit"></price-number-box>
+									</view>
+								</view>
+								<view class="u-p-t-24 u-p-b-24 border-top u-flex u-row-between">
+									<view>
+										<text class="font-bold">每单限购</text>
+									</view>
+									<view class="">
+										<price-number-box placeholder="请输入每单限购"
+											v-model="FormData.singleOrderLimit"></price-number-box>
+									</view>
+								</view>
+								<view class="u-p-t-24 u-p-b-24 border-top u-flex u-row-between">
+									<view>
+										<text class="font-bold">每人限购</text>
+									</view>
+									<view class="">
+										<price-number-box placeholder="请输入每人限购"
+											v-model="FormData.singlePeopleLimit"></price-number-box>
+									</view>
+								</view>
+								<view>
+									<uni-forms-item label="">
+										<view class="u-flex u-row-between" @tap="toTimerPage">
+											<view>
+												<view class="label-title">定时上下架</view>
+											</view>
+											<view class="u-flex u-font-24">
+												<view>
+													<view class="color-666">{{returnTimerDayText()}}</view>
+													<view class="color-666 u-m-t-4" v-if="FormData.days">
+														{{returnTimerTimeText()}}</view>
+												</view>
+												<uni-icons type="right"></uni-icons>
+											</view>
+										</view>
+									</uni-forms-item>
+								</view>
+								<view class="">
 									<uni-forms-item label="">
 										<view class="u-flex u-row-between">
 											<view class="label-title">上架</view>
@@ -515,6 +698,8 @@
 		<!-- 选择商品 -->
 		<choose-goods ref="refChooseGoods" @confirm="refChooseGoodsConfirm"
 			:category="pageData.category"></choose-goods>
+		<!-- 选择规格 -->
+		<choose-guige ref="refChooseGuige" @confirm="refChooseGuigeConfirm"></choose-guige>
 		<!-- 更多操作 -->
 		<my-action-sheet @itemClick="actionSheetClick" ref="refMoreSheet" :list="actionSheet.list"></my-action-sheet>
 	</view>
@@ -535,8 +720,12 @@
 	import color from '@/commons/color.js';
 
 	import chooseGoods from './components/choose-goods'
+	import chooseGuige from './components/choose-guige'
 	import editHaocai from './components/edit-haocai.vue'
 	import chooseGroupCategory from './components/choose-coupon-category'
+	import priceNumberBox from './components/price-number-box'
+
+
 	import infoBox from "@/commons/utils/infoBox.js"
 
 	import {
@@ -701,18 +890,41 @@
 		refChooseGroupCategory.value.close()
 	}
 
+	//规格选择
+	const refChooseGuige = ref(null)
+	let proGroupVoGoodsIndex = undefined
+
+	function refChooseGuigeOpen(skuList, groupIndex, goodsIndex) {
+		proGroupVoIndex = groupIndex
+		proGroupVoGoodsIndex = goodsIndex
+		refChooseGuige.value.open(skuList)
+	}
+
+	function refChooseGuigeConfirm(sku) {
+		console.log(sku);
+		FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuName = sku.specSnap || sku.name
+		FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuId = sku.id
+		proGroupVoIndex = undefined
+		proGroupVoGoodsIndex = undefined
+	}
+
+
 	//套餐商品选择
 	const refChooseGoods = ref(null)
-	let groupSnapIndex = undefined
+	let proGroupVoIndex = undefined
 
-	function groupSnapAddGoods(index, arr) {
-		console.log(arr);
-		groupSnapIndex = index
-		refChooseGoods.value.open(arr.map(v => v.id))
+	function proGroupVoAddGoods(index, arr) {
+		proGroupVoIndex = index
+		if (FormData.groupType == 0) {
+			const goods = FormData.proGroupVo[0].goods
+			refChooseGoods.value.open(goods)
+		} else {
+			refChooseGoods.value.open(arr)
+		}
 	}
 
 	function refChooseGoodsOpen() {
-		groupSnapIndex = undefined
+		proGroupVoIndex = undefined
 		refChooseGoods.value.open()
 	}
 
@@ -720,41 +932,64 @@
 		refChooseGoods.value.close()
 	}
 
+	function proGroupVoPush() {
+		FormData.proGroupVo.push({
+			title: '',
+			number: 1,
+			goods: []
+		})
+	}
+
 	function refChooseGoodsConfirm(arr) {
 		console.log(arr);
 		refChooseGoodsClose()
 		arr = arr.map(v => {
 			const {
+				proId,
 				id,
 				name,
-				groupNum,
 				unitName,
-				categoryId
+				lowPrice,
+				type,
+				typeEnum,
+				skuList
 			} = v
+			if (proId) {
+				return v
+			}
 			return {
-				id,
-				name,
-				groupNum,
+				proId: id,
+				proName: name,
 				unitName,
-				categoryId
+				price: lowPrice,
+				number: 1,
+				type,
+				typeEnum,
+				skuList,
+				skuId: '',
+				skuName: ''
 			}
 		})
-		if (groupSnapIndex !== undefined) {
-			return FormData.groupSnap[groupSnapIndex].goods = arr
+		console.log(arr);
+		if (FormData.groupType == 0) {
+			return FormData.proGroupVo[0].goods = arr
 		}
-		FormData.groupSnap.push({
+		if (FormData.groupType == 1 && proGroupVoIndex !== undefined) {
+			return FormData.proGroupVo[proGroupVoIndex].goods = arr
+		}
+		FormData.proGroupVo.push({
 			title: '',
 			number: 1,
 			goods: arr
 		})
 	}
 
-	function groupSnapGoodsDel(index, goodsIndex) {
-		FormData.groupSnap[index].goods.splice(goodsIndex, 1)
+	function proGroupVoGoodsDel(index, goodsIndex) {
+		FormData.proGroupVo[index].goods.splice(goodsIndex, 1)
 	}
 
-	function delGroupSnap(index) {
-		FormData.groupSnap.splice(index, 1)
+	function delproGroupVo(index) {
+		FormData.proGroupVo.splice(index, 1)
 	}
 
 
@@ -790,6 +1025,9 @@
 			const min = 0;
 			const max = 100000000;
 			console.log(item[key]);
+			if (item[key] === '') {
+				return
+			}
 			const newval = formatPrice(item[key], min, max, true)
 			console.log(newval)
 			if (typeof newval !== 'number') {
@@ -805,7 +1043,17 @@
 		})
 	}
 
-
+	//套餐商品类型
+	const packageType = reactive({
+		list: [{
+			name: '固定套餐',
+			value: 0
+		}, {
+			name: '可选套餐',
+			value: 1
+		}],
+		sel: 0
+	})
 	// 库存模式
 	const InventoryModeData = [{
 			text: '传统模式',
@@ -975,44 +1223,16 @@
 	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({
+		days: '',
+		startTime: '',
+		endTime: '',
+		//每日销量上限，
+		dayLimit: 0,
+		singleOrderLimit:0,
+		singlePeopleLimit:0,
+		type: 'normal',
+		showType: 'table',
 		specsInfoName: '',
 		id: "",
 		typeEnum: "normal",
@@ -1025,18 +1245,24 @@
 		coverImg: "",
 		images: [],
 		shopId: uni.getStorageSync('shopId'),
+		groupType: 0,
+		weight: '',
+		//套餐组合
+		proGroupVo: [],
 		lowPrice: "",
 		skuList: [],
 		isShowMall: 1,
 		isShowCash: 1,
 		isStock: 0,
 		isStock: 0,
+		//是否允许临时改价
+		isTempPrice: 1,
 		isHot: 0,
 		packFee: 0,
 		specId: "",
 		// baseSalesNumber: 0,
 		sort: 0,
-		groupSnap: [],
+		proGroupVo: [],
 		specInfo: [],
 		selectSpec: [],
 		specTableHeaders: [],
@@ -1057,6 +1283,16 @@
 			usageRules: ""
 		}
 	})
+
+	//添加套餐组
+	function addProGroupVo() {
+		FormData.addProGroupVo.push({
+			title: '',
+			goods: [],
+			number: 0,
+			count: 0
+		})
+	}
 	const skuList = reactive({
 		list: [{
 			...$defaultSku,
@@ -1122,6 +1358,7 @@
 			res.specsInfoName = specsInfoName
 			$goodsData = res
 			skuList.list = res.skuList
+			res.showType=res.showType.split(',')
 			Object.assign(FormData, res)
 			//多规格
 			if (res.typeEnum === 'sku') {
@@ -1249,6 +1486,19 @@
 		// 商品类型
 		// types: $types,
 		types: [{
+				name: '普通商品',
+				value: 'normal'
+			},
+			{
+				name: '套餐商品',
+				value: 'package'
+			},
+			{
+				name: '称重商品',
+				value: 'weight'
+			}
+		],
+		typeEnums: [{
 				name: '单规格',
 				value: 'normal'
 			},
@@ -1264,7 +1514,25 @@
 		// 规格
 		specList: [],
 		//库存
-		skuList: []
+		skuList: [],
+		//显示
+		showTypes: [{
+				name: '堂食',
+				value: 'table'
+			},
+			{
+				name: '自取',
+				value: 'dine'
+			},
+			{
+				name: '配送',
+				value: 'delivery'
+			},
+			{
+				name: '快递',
+				value: 'express'
+			}
+		]
 	})
 	//查询商品库存
 	function getProductSku() {
@@ -1334,11 +1602,12 @@
 		if (!bol) {
 			return
 		}
-
 		Forms.value.validate().then(res => {
 			const {
 				typeEnum,
-				groupCategoryId
+				groupType,
+				groupCategoryId,
+				type
 			} = FormData
 			if (typeEnum === 'group' && !groupCategoryId.length) {
 				return infoBox.showToast('请选择团购券分类')
@@ -1409,9 +1678,41 @@
 					return infoBox.showToast('请输入库存数量！')
 				}
 			}
-
+			if (type == 'package') {
+				if (groupType == 0) {
+					// 固定套餐
+				}
+				if (groupType == 1) {
+					let ispase = FormData.proGroupVo.length > 0 ? true : false
+					let tips = ispase ? '' : '请添加至少一种套餐'
+					for (let i in FormData.proGroupVo) {
+						const item = FormData.proGroupVo[i]
+						if (item.goods.length <= 0) {
+							ispase = false
+							tips = '套餐组合至少需要包含一种商品，请添加商品'
+							break
+						}
+						if (!item.title) {
+							ispase = false
+							tips = '请输入套餐名称'
+							break
+						}
+					}
+					if (!ispase) {
+						return infoBox.showToast(tips)
+					}
+					// 可选套餐
+				}
+			}
+			if (type == 'weight') {
+				if (!FormData.weight) {
+					return infoBox.showToast('请输入重量')
+				}
+			}
 			const submitData = {
 				...FormData,
+				showType:FormData.showType.join(','),
+				proGroupVo: type != 'package' ? '' : FormData.proGroupVo,
 				images: images,
 				coverImg: images[0] || '',
 				skuList: submitSkuList,
@@ -1435,9 +1736,6 @@
 						settimeoutBack(1500)
 					})
 				})
-
-
-
 			}
 			submitData.selectSpec =
 				$addProduct(submitData).then(res => {
@@ -1519,27 +1817,46 @@
 	 * @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');
-			})
-		}
+		uni.$off('timerSave')
+		uni.$on('timerSave', function(timer) {
+			Object.assign(FormData, timer)
+		})
 
 	}
 
 	function toTimerPage() {
-		uni.setStorageSync('timer', FormData.timer)
-		go.to('PAGES_PRODUCT_TIMER')
+		go.to('PAGES_PRODUCT_TIMER', {
+			productId: option.productId
+		})
 	}
 
-	function returnTimerText() {
-		return FormData.timer.length ? `当前有${FormData.timer.length}个定时器` : '没有定时器'
+	const ListDataconstructor = {
+		cycleChecked: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
+	}
+	const $week = {
+		Monday: '周一',
+		Tuesday: '周二',
+		Wednesday: '周三',
+		Thursday: '周四',
+		Friday: '周无',
+		Saturday: '周六',
+		Sunday: '周日',
+	}
+
+	function returnTimerDayText() {
+		if (!FormData.days) {
+			return ''
+		}
+		return FormData.days.split(',').filter(v => v).map(v => $week[v]).join(',')
+		// return FormData.timer.length ? `当前有${FormData.timer.length}个定时器` : '没有定时器'
+	}
+
+	function returnTimerTimeText() {
+		if (!FormData.startTime || !FormData.endTime) {
+			return ''
+		}
+		return FormData.startTime + '-' + FormData.endTime
+		// return FormData.timer.length ? `当前有${FormData.timer.length}个定时器` : '没有定时器'
 	}
 
 
@@ -1602,6 +1919,42 @@
 				skuList.list = []
 			}
 		}
+	})
+
+	watch(() => FormData.type, (newval) => {
+		if (option.type == 'edit') {
+			if (newval == $goodsData.type) {
+				FormData.proGroupVo = $goodsData.proGroupVo
+			}
+		} else {
+			if (newval == 'package') {
+				initDefaultProGroupVo()
+			}
+		}
+
+	})
+
+	function initDefaultProGroupVo() {
+		FormData.proGroupVo = [{
+			title: '',
+			count: '',
+			number: 1,
+			goods: []
+		}]
+	}
+	watch(() => FormData.groupType, (newval) => {
+		if (newval == 0) {
+			return initDefaultProGroupVo()
+		}
+		if (option.type == 'edit') {
+			if (newval == $goodsData.groupType) {
+				FormData.proGroupVo = $goodsData.proGroupVo
+			} else {
+
+			}
+			return
+		}
+		initDefaultProGroupVo()
 
 	})
 
@@ -1647,6 +2000,7 @@
 	})
 	onShow(() => {
 		watchSpecificationsSave()
+		watchTimerSave()
 	})
 	onReady(() => {
 		Forms.value && Forms.value.setRules(rules)
@@ -1661,6 +2015,13 @@
 	}
 </style>
 <style lang="scss" scoped>
+	.barCode {
+		border: 1px solid #E5E5E5;
+		border-radius: 8rpx 8rpx 8rpx 8rpx;
+		padding: 22rpx 24rpx;
+		background: #FCFCFC;
+	}
+
 	.top {
 		position: fixed;
 		// left: 28rpx;
@@ -1733,6 +2094,10 @@
 		padding-bottom: env(safe-area-inset-bottom);
 	}
 
+	.minus {}
+
+	.plus {}
+
 	.box {
 		margin-top: 32rpx;
 		font-size: 28rpx;
@@ -1750,6 +2115,15 @@
 		align-items: inherit;
 	}
 
+	::v-deep .typeEnum .u-radio-group--row {
+		flex-wrap: nowrap;
+		justify-content: space-between;
+	}
+	::v-deep .typeEnum .u-checkbox-group--row{
+		flex-wrap: nowrap;
+		justify-content: space-between;
+	}
+
 	::v-deep .uni-forms-item .uni-forms-item__label {
 		text-indent: 0;
 		font-size: 28rpx !important;
@@ -1761,6 +2135,10 @@
 		min-height: initial !important;
 	}
 
+	.gap-26 {
+		gap: 26rpx;
+	}
+
 	::v-deep .bg-gray .uni-forms-item {
 		background-color: transparent !important;
 	}
@@ -1809,6 +2187,23 @@
 		font-size: 28rpx;
 	}
 
+	.table {
+		background: #F9F9F9;
+		border-radius: 8rpx;
+		overflow: hidden;
+
+		.title {
+			padding: 12rpx 24rpx 12rpx 24rpx;
+			background: #AEBAD2;
+			border-radius: 8rpx 8rpx 0rpx 0rpx;
+			color: #fff;
+		}
+
+		.row:nth-of-type(2n+1) {
+			background: #F0F0F0;
+		}
+	}
+
 	.types {
 		.item {
 			padding: 6rpx 20rpx;
diff --git a/pageProduct/add-Product/components/choose-goods.vue b/pageProduct/add-Product/components/choose-goods.vue
index ba98819..c11c6c9 100644
--- a/pageProduct/add-Product/components/choose-goods.vue
+++ b/pageProduct/add-Product/components/choose-goods.vue
@@ -1,34 +1,30 @@
 <template>
-	<view class="mask u-fixed position-all u-flex u-col-bottom" v-if="show" @tap="close">
-		<view class="bg-fff w-full" @tap.stop="nullFunction">
+	<view class="mask u-fixed position-all u-flex u-col-bottom u-font-28" v-if="show" @tap="close">
+		<view class="bg-fff w-full  " @tap.stop="nullFunction">
 			<view class="u-p-30">
 				<view class="font-bold u-text-center">选择商品</view>
 				<view class="u-m-t-32 u-flex">
-					<view class="u-flex-1 u-p-r-16">
-						<view class="u-m-b-12">商品名称</view>
-						<uni-easyinput v-model="goods.query.name" placeholder="请输入商品名称" />
-					</view>
-					<view class="u-flex-1 u-p-l-16">
-						<view class="u-m-b-12">商品分类</view>
+					<view class=" ">
 						<uni-data-picker :clear-icon="false" :map="{text:'name',value:'id'}" placeholder="请选择分类"
 							popup-title="请选择分类" :localdata="category" v-model="goods.query.categoryId">
+							<view class="u-flex  u-font-28" >
+								<text class=" u-line-1"
+									style="max-width: 100rpx;">{{goods.query.categoryId||'分类' }}</text>
+								<up-icon name="arrow-down" size="16"></up-icon>
+							</view>
 						</uni-data-picker>
 					</view>
+					<view class="u-flex-1 u-p-l-16">
+						<up-search @custom="getGoods" v-model="goods.query.name" placeholder="请输入商品名称" @search="getGoods" @clear="getGoods"></up-search>
+					</view>
+					
 				</view>
 
-				<view class="u-m-t-32 u-flex u-row-right">
-					<view class="u-flex-1 u-p-r-16">
-						<my-button type="cancel" plain @tap="resetQuery">重置</my-button>
-					</view>
-					<view class="u-flex-1 u-p-l-16">
-						<my-button @tap="getGoods">查询</my-button>
-					</view>
-				</view>
 			</view>
 
 			<scroll-view :scroll-x="false" scroll-y="true" :style="computedStyle()">
-				<view class="u-p-l-30 u-p-r-30">
-					<view class="u-flex u-row-between no-wrap">
+				<view class="u-p-l-30 u-p-r-30 table">
+					<view class="u-flex u-row-between no-wrap title">
 						<view>
 							<my-radio @change="radioAllChange" v-model="goods.allChecked" shape="square"
 								:size="20"></my-radio>
@@ -41,22 +37,26 @@
 						<view>销量/库存</view>
 						<view>分类名称</view>
 					</view>
-					<view class="u-m-t-12 u-flex u-row-between" v-for="(item,index) in goods.list" :key="index">
-						<my-radio @change="radioChange" v-model="item.checked" shape="square" :size="20"></my-radio>
-						<view class="u-flex u-flex-col u-row-center u-col-center">
-							<image lazy-load class="coverImg" :src="item.coverImg" mode=""></image>
-							<view class="u-m-t-10">{{item.name}}</view>
+					<view @click="changeChecked(item)" class="u-m-t-12 u-flex  u-p-24 u-row-between row" v-for="(item,index) in goods.list" :key="index">
+						<view class="">
+							<my-radio @change="radioChange($event,item)" v-model="item.checked" shape="square" :size="20"></my-radio>
 						</view>
-						<view>
+						<view class="u-text-left u-flex-1 u-p-l-20">
+							<!-- <view class="u-flex">
+								<image lazy-load class="coverImg" :src="item.coverImg" mode=""></image>
+							</view> -->
+							<view class="">{{item.name}}</view>
+						</view>
+						<view class="u-flex-1">
 							{{item.typeEnum}}
 						</view>
-						<view>
+						<view class="u-flex-1">
 							￥{{ item.lowPrice }}
 						</view>
-						<view>
+						<view class="u-flex-1">
 							{{ item.realSalesNumber }}/{{ item.stockNumber }}
 						</view>
-						<view>
+						<view class="u-flex-1">
 							{{item.categoryName}}
 						</view>
 					</view>
@@ -83,7 +83,7 @@
 	import myRadio from '@/components/my-components/my-radio';
 	import myPagination from '@/components/my-components/my-pagination'
 	import {
-		$tbProductV2
+		$tbProductList
 	} from '@/http/yskApi/goods.js';
 	import {
 		reactive,
@@ -98,7 +98,7 @@
 		},
 		height: {
 			type: [Number, String],
-			default: '40vh'
+			default: '50vh'
 		},
 		category: {
 			type: Array,
@@ -107,26 +107,39 @@
 			}
 		}
 	})
-
+	function changeChecked(item){
+		item.checked=!item.checked
+		if(!item.checked&&$selGoodsMap[item.id]){
+			delete $selGoodsMap[item.id]
+		}else{
+			$selGoodsMap[item.id]=item
+		}
+		goods.allChecked = goods.list.filter(v => v.checked).length != 0
+	}
 	function nullFunction() {
 
 	}
 
 	const show = ref(props.modelValue)
-
-	function open(arr) {
+	
+	let selArr=[]
+	
+	let $selGoodsMap={}
+	async function open(arr) {
 		show.value = true
-		if (arr) {
-			for (let i in goods.list) {
-				console.log(arr.includes(goods.list[i].id));
-				goods.list[i].checked = arr.includes(goods.list[i].id)
-			}
+		selArr=arr
+		console.log(arr);
+		for(let i in arr){
+			$selGoodsMap[arr[i].proId
+]=arr[i]
 		}
-
+		getGoods()
 	}
 
 	function close() {
 		show.value = false
+		resetQuery()
+		$selGoodsMap={}
 	}
 
 
@@ -162,38 +175,58 @@
 			...$quey
 		}
 	})
-
+	getGoods()
 	function getGoods() {
-		$tbProductV2(goods.query).then(res => {
+		const arr=selArr
+		$tbProductList(goods.query).then(res => {
+			let selLen=0;
 			goods.list = res.content.map(v => {
+				const checked=$selGoodsMap[v.id]?true:false
+				selLen+=(checked?1:0)
 				return {
 					...v,
-					checked: false
+					checked
 				}
 			})
-			goods.allChecked = false
+			goods.allChecked = selLen==res.content.length?true:false
 			goods.totalElements = res.totalElements
 		})
 	}
-	getGoods()
 
 	function pageChange(page) {
 		goods.query.page = page - 1
 		getGoods()
 	}
 
-	function radioChange(newval) {
+	function radioChange(newval,item) {
+		if(!newval&&$selGoodsMap[item.id]){
+			delete $selGoodsMap[item.id]
+		}else{
+			$selGoodsMap[item.id]=item
+		}
 		goods.allChecked = goods.list.filter(v => v.checked).length != 0
 	}
 
 	function radioAllChange(newval) {
 		goods.list.forEach(i => {
 			i.checked = newval
+			if($selGoodsMap[i.id]&&!newval){
+				delete $selGoodsMap[i.id]
+			}else{
+				$selGoodsMap[i.id]=i
+			}
 		})
 	}
-
+	
 	function confrim() {
-		const arr = goods.list.filter(v => v.checked)
+		for(let i in goods.list){
+			const item=goods.list[i]
+			if($selGoodsMap[item.id]&&!item.checked){
+				delete $selGoodsMap[item.id]
+			}
+		}
+		console.log($selGoodsMap);
+		const arr = Object.values($selGoodsMap)
 		emits('confirm', arr)
 	}
 	defineExpose({
@@ -203,6 +236,9 @@
 </script>
 
 <style lang="scss" scoped>
+	.bg-fff{
+		border-radius: 24rpx 24rpx 0 0 ;
+	}
 	.mask {
 		background: rgba(51, 51, 51, 0.5);
 		z-index: 900;
@@ -213,4 +249,20 @@
 		height: 60rpx;
 		border-radius: 10rpx;
 	}
+	.table {
+		background: #F9F9F9;
+		border-radius: 8rpx;
+		overflow: hidden;
+	
+		.title {
+			padding: 12rpx 24rpx 12rpx 24rpx;
+			background: #AEBAD2;
+			border-radius: 8rpx 8rpx 0rpx 0rpx;
+			color: #fff;
+		}
+	
+		.row:nth-of-type(2n+1) {
+			background: #F0F0F0;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/choose-guige.vue b/pageProduct/add-Product/components/choose-guige.vue
new file mode 100644
index 0000000..29bfa51
--- /dev/null
+++ b/pageProduct/add-Product/components/choose-guige.vue
@@ -0,0 +1,164 @@
+<template>
+	<view class="mask u-fixed position-all u-flex u-col-bottom u-font-28" v-if="show" @tap="close">
+		<view class="bg-fff w-full  " @tap.stop="nullFunction">
+			<view class="u-p-30">
+				<view class="font-bold u-text-center">选择规格</view>
+			</view>
+
+			<scroll-view :scroll-x="false" scroll-y="true" :style="computedStyle()">
+				<view class="u-p-l-30 u-p-r-30 ">
+					<view class="u-flex u-flex-wrap w-full gap-10  u-col-top">
+						<view class="skd" v-for="(item,index) in skuList" :key="index"
+						:class="{active:sel.id==item.id}"
+							@click="guigeClick(item,index)">
+							<text>{{item.specSnap||item.name}}</text>
+							<view class="tag-primary tag" v-if="item.isGrounding">上架中</view>
+							<view class="tag-gray tag" v-if="item.isPauseSale">已售罄</view>
+							<view class="tag-gray tag" v-if="!item.isGrounding">已下架</view>
+						</view>
+					</view>
+					
+				</view>
+			</scroll-view>
+			<view class="u-p-30">
+				<view class="u-m-t-20 u-flex">
+					<view class="u-flex-1 u-p-r-16">
+						<my-button type="cancel" plain @tap="close">取消</my-button>
+					</view>
+					<view class="u-flex-1 u-p-l-16">
+						<my-button @tap="confrim">确定</my-button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		$tbProduct
+	} from '@/http/yskApi/goods.js';
+	import {
+		reactive,
+		onMounted,
+		ref,
+		watch
+	} from 'vue';
+	import infoBox from '@/commons/utils/infoBox.js'
+	const props = defineProps({
+		modelValue: {
+			type: Boolean,
+			default: false
+		}
+	})
+	let skuList=ref([])
+	function nullFunction() {
+
+	}
+
+	const show = ref(props.modelValue)
+	
+	
+	async function open(arr,sel) {
+		show.value = true
+		skuList.value=arr
+	}
+
+	function close() {
+		show.value = false
+		sel.value={}
+	}
+	
+	let sel=ref({
+		
+	})
+	function guigeClick(item,index){
+		if(sel.value.id==item.id){
+			return sel.value={}
+		}
+		sel.value=item
+	}
+
+	function computedStyle() {
+		return `height:${typeof props.height==='string'?props.height:props.height+'rpx'};`
+	}
+
+	const emits = defineEmits(['update:modelValue', 'confirm'])
+	
+	function confrim() {
+		if(!sel.value.id){
+			return infoBox.showToast('请选择选择一个规格')
+		}
+		emits('confirm', sel.value)
+		close()
+	}
+	defineExpose({
+		open,
+		close
+	})
+</script>
+
+<style lang="scss" scoped>
+	.bg-fff{
+		border-radius: 24rpx 24rpx 0 0 ;
+	}
+	.mask {
+		background: rgba(51, 51, 51, 0.5);
+		z-index: 900;
+	}
+	.skd {
+		padding: 10rpx 38rpx 8rpx 40rpx;
+		background: #F0F2F5;
+		border-radius: 4rpx;
+		position: relative;
+		color: #666;
+		overflow: hidden;
+		margin-bottom: 10rpx;
+		font-size: 24rpx;
+		border: 1px solid transparent;
+		&.active{
+			border-color: $my-main-color;
+		}
+		.tag {
+			position: absolute;
+			right: 0;
+			top: 0;
+			font-size: 12rpx;
+			height: 18rpx;
+			line-height: 18rpx;
+			right: 0;
+			border-radius: 0rpx 2rpx 2rpx 8rpx;
+		}
+	
+		.tag-primary {
+			background-color: $my-main-color;
+			color: #fff;
+		}
+	
+		.tag-gray {
+			background-color: rgb(144, 147, 153);
+			color: #fff;
+		}
+	}
+	.coverImg {
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 10rpx;
+	}
+	.table {
+		background: #F9F9F9;
+		border-radius: 8rpx;
+		overflow: hidden;
+	
+		.title {
+			padding: 12rpx 24rpx 12rpx 24rpx;
+			background: #AEBAD2;
+			border-radius: 8rpx 8rpx 0rpx 0rpx;
+			color: #fff;
+		}
+	
+		.row:nth-of-type(2n+1) {
+			background: #F0F0F0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/price-number-box.vue b/pageProduct/add-Product/components/price-number-box.vue
new file mode 100644
index 0000000..d67f3b3
--- /dev/null
+++ b/pageProduct/add-Product/components/price-number-box.vue
@@ -0,0 +1,105 @@
+<template>
+	<view class="u-flex number-box">
+		<view class="u-flex u-flex-1">
+			<up-input @blur="priceFormat" border="none" v-model="number" type="number" :placeholder="placeholder"></up-input>
+		</view>
+		<view class="u-flex u-flex-col right">
+			<view class="u-flex-1 u-p-l-8 u-p-r-8" @click="changeNumber('add')">
+				<up-icon name="arrow-up" color="#E5E5E5"></up-icon>
+			</view>
+			<view class="line"></view>
+			<view class="u-flex-1 u-p-l-8 u-p-r-8" @click="changeNumber('reduce')">
+				<up-icon name="arrow-down" color="#E5E5E5"></up-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		formatPrice
+	} from "@/commons/utils/format.js";
+	import {
+		ref,
+		watch,nextTick
+	} from 'vue';
+	const props = defineProps({
+		modelValue: {
+			type: [String, Number]
+		},
+		min: {
+			type: Number,
+			default: 0
+		},
+		max: {
+			type: Number,
+			default: 999999999
+		},
+		step: {
+			type: Number,
+			default: 1
+		},
+		placeholder: {
+			type: String,
+			default: '请输入'
+		}
+	})
+	let number = ref(props.modelValue)
+
+	function changeNumber(type) {
+		const newval = number.value + props.step * (type == 'add' ? 1 : -1)
+		if (newval < props.min) {
+			number.value = props.min
+		}
+		if (newval > props.max) {
+			number.value = props.max
+		}
+		priceFormat(newval)
+	}
+
+	function priceFormat(e) {
+		nextTick(() => {
+			const min = props
+				.min;
+			const max = props.max;
+			if (e === '') {
+				return
+			}
+			const newval = formatPrice(e, min, max, true)
+			if (typeof newval !== 'number') {
+				number.value = newval.value
+				uni.showToast({
+					title: `请输入${min}到${max}范围内的数字`,
+					icon: 'none'
+				})
+			} else {
+				number.value = newval
+			}
+		})
+	}
+	watch(() => props.modelValue, (newval) => {
+		number.value = newval
+	})
+	const emits = defineEmits(['update:modelValue'])
+	watch(() => number.value, (newval) => {
+		emits('update:modelValue', newval)
+	})
+</script>
+
+<style lang="scss" scoped>
+	.line {
+		width: 100%;
+		height: 1px;
+		background-color: #E5E5E5;
+	}
+
+	.number-box {
+		border: 1px solid #E5E5E5;
+		border-radius: 8rpx 8rpx 8rpx 8rpx;
+		padding-left: 24rpx;
+
+		.right {
+			border-left: 1px solid #E5E5E5;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/timer - 副本.vue b/pageProduct/add-Product/timer - 副本.vue
new file mode 100644
index 0000000..3e0c104
--- /dev/null
+++ b/pageProduct/add-Product/timer - 副本.vue	
@@ -0,0 +1,224 @@
+<template>
+	<view class="u-p-30 min-page u-font-28">
+		<!-- <view class="u-flex">
+			<view style="width: 210rpx;">
+				<my-button shape="circle" @click="addTimer">添加定时器</my-button>
+			</view>
+		</view> -->
+		<view class="list u-m-t-20" v-if="list.length">
+			<view class="block" v-for="(item,index) in list" :key="index">
+				<!-- <view class="u-flex u-row-between">
+					<view>定时器{{index+1}}</view>
+					<uni-icons @click="delTimer(index)" type="trash"></uni-icons>
+				</view> -->
+				<view class="u-flex  u-row-between">
+					<view>周期</view>
+					<view class="color-main" @click="selectAllClick(index)">
+						{{isAllChecked?'取消全选':'全选'}}
+						</view>
+				</view>
+				<view class="u-m-t-24">
+					<uni-data-checkbox :selectedColor="color.ColorMain" multiple v-model="item.cycleChecked" :localdata="cycle"></uni-data-checkbox>
+				</view>
+				<view class="u-m-t-24">
+					<view class="u-flex">
+						<view>上架时间:</view>
+						<view class="u-flex-1 u-m-l-10">
+							<picker mode="multiSelector" @change="listingTimeChange($event,index)"
+								:value="item.listingTime.index" :range="times">
+								<view class="bg-gray u-p-l-20 u-p-t-6 u-p-b-6 u-p-r-20 ">
+									{{item.listingTime.value}}
+								</view>
+							</picker>
+						</view>
+					</view>
+					<view class="u-flex u-m-t-16">
+						<view>下架时间:</view>
+						<view class="u-flex-1 u-m-l-10">
+							<picker mode="multiSelector" @change="offShelfChange($event,index)"
+								:value="item.offShelf.index" :range="times">
+								<view class="bg-gray u-p-l-20 u-p-t-6 u-p-b-6 u-p-r-20 ">
+									{{item.offShelf.value}}
+								</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="u-flex u-row-center u-m-t-60">
+			<my-button width="580" shape="circle" @click="save">保存</my-button>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		onLoad,
+		onReady
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		ref
+	} from 'vue';
+	import go from '@/commons/utils/go.js';
+	import color from '@/commons/color.js'
+	import {
+		$getProductDetail,
+	} from '@/http/yskApi/goods.js'
+	//返回一天的时间 时分格式
+	function returnDayTime() {
+		return new Array(2).fill(1).map((v, index) => {
+			if (index === 0) {
+				return new Array(24).fill(1).map((hour, index) => {
+					return `0${index}`.slice(-2)
+				})
+			}
+			if (index === 1) {
+				return new Array(60).fill(1).map((hour, index) => {
+					return `0${index}`.slice(-2)
+				})
+			}
+		})
+	}
+	const times = ref(returnDayTime())
+	let defaultTimeIndex = ref(0)
+
+	function getTime(indexArr) {
+		const hour = times.value[0][indexArr[0]]
+		const month = times.value[1][indexArr[1]]
+		return `${hour}:${month}`
+	}
+	//获取$event.detail.value
+	function getEnentDetailValue(e) {
+		return e.detail.value
+	}
+
+	function setListTimeValue(index, key, time) {
+		list.value[index][key].value = time
+	}
+
+	function listingTimeChange(e, index) {
+		const indexArr = getEnentDetailValue(e)
+		const time = getTime(indexArr)
+		setListTimeValue(index, 'listingTime', time)
+	}
+
+	function offShelfChange(e, index) {
+		const indexArr = getEnentDetailValue(e)
+		const time = getTime(indexArr)
+		setListTimeValue(index, 'offShelf', time)
+	}
+
+
+
+	const cycle = [{
+			value: 0,
+			text: '星期一'
+		},
+		{
+			value: 1,
+			text: '星期二'
+		},
+		{
+			value: 2,
+			text: '星期三'
+		},
+		{
+			value: 3,
+			text: '星期四'
+		},
+		{
+			value: 4,
+			text: '星期五'
+		},
+		{
+			value: 5,
+			text: '星期六'
+		},
+		{
+			value: 6,
+			text: '星期日'
+		}
+	]
+	const ListDataconstructor = {
+		cycleChecked: [0, 1, 2, 3, 4, 5, 6],
+	}
+
+	function returnBasicTimeConstructor() {
+		return {
+			listingTime: {
+				value: '00:00',
+				index: [0, 0]
+			},
+			offShelf: {
+				value: '00:00',
+				index: [0, 0]
+			}
+		}
+	}
+	const list = ref([returnBasicDataConstructor()])
+	function returnBasicDataConstructor() {
+		return {
+			...ListDataconstructor,
+			...returnBasicTimeConstructor()
+		}
+	}
+
+	function addTimer() {
+		list.value.push(returnBasicDataConstructor())
+	}
+	function delTimer(index) {
+		list.value.splice(index,1)
+	}
+	const isAllChecked=computed(()=>{
+		return list.value[0].cycleChecked.length==cycle.length?true:false
+	})
+	function selectAllClick(index){
+		if(isAllChecked.value){
+			list.value[index].cycleChecked=[]
+		}else{
+			list.value[index].cycleChecked=ListDataconstructor.cycleChecked
+		}
+	}
+	// 触发定时器保存事件将数据给到添加商品页面
+	function emitTimerSave(){
+		uni.$emit('timerSave',list.value)
+		go.back()
+	}
+	function save(){
+		console.log(list.value);
+		emitTimerSave()
+	}
+	let goodsDetail=ref({})
+	
+	function returnTimer(res){
+		return []
+	}
+	onLoad(async(opt)=>{
+		let res=null
+		if(opt.productId){
+			res=await $getProductDetail(opt.productId)
+			goodsDetail.value=res
+		}
+		const arr=res?returnTimer(res):[]
+		if(arr.length){
+			list.value=arr
+		}
+	})
+</script>
+
+<style lang="scss">
+	.min-page {
+		background-color: #F9F9F9;
+	}
+
+	.block {
+		background: #FFFFFF;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		padding: 32rpx 28rpx;
+		margin-bottom: 32rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pageProduct/add-Product/timer.vue b/pageProduct/add-Product/timer.vue
index 1e7fdd2..dd7a8bf 100644
--- a/pageProduct/add-Product/timer.vue
+++ b/pageProduct/add-Product/timer.vue
@@ -1,42 +1,45 @@
 <template>
-	<view class="u-p-30 min-page">
-		<view class="u-flex">
+	<view class="u-p-30 min-page u-font-28">
+		<!-- <view class="u-flex">
 			<view style="width: 210rpx;">
 				<my-button shape="circle" @click="addTimer">添加定时器</my-button>
 			</view>
-		</view>
+		</view> -->
 		<view class="list u-m-t-20" v-if="list.length">
 			<view class="block" v-for="(item,index) in list" :key="index">
-				<view class="u-flex u-row-between">
+				<!-- <view class="u-flex u-row-between">
 					<view>定时器{{index+1}}</view>
 					<uni-icons @click="delTimer(index)" type="trash"></uni-icons>
-				</view>
-				<view class="u-flex u-m-t-20 u-row-between">
+				</view> -->
+				<view class="u-flex  u-row-between">
 					<view>周期</view>
-					<view @click="selectAllClick(index)">全选</view>
+					<view class="color-main" @click="selectAllClick(index)">
+						{{isAllChecked?'取消全选':'全选'}}
+					</view>
 				</view>
-				<view class="u-m-t-20">
-					<uni-data-checkbox multiple v-model="item.cycleChecked" :localdata="cycle"></uni-data-checkbox>
+				<view class="u-m-t-24">
+					<uni-data-checkbox :selectedColor="color.ColorMain" multiple v-model="item.cycleChecked"
+						:localdata="cycle"></uni-data-checkbox>
 				</view>
-				<view class="u-m-t-20">
+				<view class="u-m-t-24">
 					<view class="u-flex">
 						<view>上架时间:</view>
 						<view class="u-flex-1 u-m-l-10">
-							<picker mode="multiSelector" @change="listingTimeChange($event,index)"
-								:value="item.listingTime.index" :range="times">
+							<picker mode="multiSelector" @change="startTimeChange($event,index)"
+								:value="item.startTime.index" :range="times">
 								<view class="bg-gray u-p-l-20 u-p-t-6 u-p-b-6 u-p-r-20 ">
-									{{item.listingTime.value}}
+									{{item.startTime.value}}
 								</view>
 							</picker>
 						</view>
 					</view>
-					<view class="u-flex u-m-t-20">
+					<view class="u-flex u-m-t-16">
 						<view>下架时间:</view>
 						<view class="u-flex-1 u-m-l-10">
-							<picker mode="multiSelector" @change="offShelfChange($event,index)"
-								:value="item.offShelf.index" :range="times">
+							<picker mode="multiSelector" @change="endTimeChange($event,index)"
+								:value="item.endTime.index" :range="times">
 								<view class="bg-gray u-p-l-20 u-p-t-6 u-p-b-6 u-p-r-20 ">
-									{{item.offShelf.value}}
+									{{item.endTime.value}}
 								</view>
 							</picker>
 						</view>
@@ -58,19 +61,23 @@
 		onReady
 	} from '@dcloudio/uni-app';
 	import {
+		computed,
 		ref
 	} from 'vue';
 	import go from '@/commons/utils/go.js';
-	import myButton from '@/components/my-components/my-button.vue'
+	import color from '@/commons/color.js'
+	import {
+		$getProductDetail,
+	} from '@/http/yskApi/goods.js'
 	//返回一天的时间 时分格式
 	function returnDayTime() {
-		return new Array(2).fill(1).map((v, index) => {
+		return new Array(3).fill(1).map((v, index) => {
 			if (index === 0) {
 				return new Array(24).fill(1).map((hour, index) => {
 					return `0${index}`.slice(-2)
 				})
 			}
-			if (index === 1) {
+			if (index === 1 || index === 2) {
 				return new Array(60).fill(1).map((hour, index) => {
 					return `0${index}`.slice(-2)
 				})
@@ -83,7 +90,8 @@
 	function getTime(indexArr) {
 		const hour = times.value[0][indexArr[0]]
 		const month = times.value[1][indexArr[1]]
-		return `${hour}:${month}`
+		const s = times.value[2][indexArr[2]]
+		return `${hour}:${month}:${s}`
 	}
 	//获取$event.detail.value
 	function getEnentDetailValue(e) {
@@ -94,66 +102,67 @@
 		list.value[index][key].value = time
 	}
 
-	function listingTimeChange(e, index) {
+	function startTimeChange(e, index) {
 		const indexArr = getEnentDetailValue(e)
 		const time = getTime(indexArr)
-		setListTimeValue(index, 'listingTime', time)
+		setListTimeValue(index, 'startTime', time)
 	}
 
-	function offShelfChange(e, index) {
+	function endTimeChange(e, index) {
 		const indexArr = getEnentDetailValue(e)
 		const time = getTime(indexArr)
-		setListTimeValue(index, 'offShelf', time)
+		setListTimeValue(index, 'endTime', time)
 	}
 
 
 
 	const cycle = [{
-			value: 0,
+			value: 'Monday',
 			text: '星期一'
 		},
 		{
-			value: 1,
+			value: 'Tuesday',
 			text: '星期二'
 		},
 		{
-			value: 2,
+			value: 'Wednesday',
 			text: '星期三'
 		},
 		{
-			value: 3,
+			value: 'Thursday',
 			text: '星期四'
 		},
 		{
-			value: 4,
+			value: 'Friday',
 			text: '星期五'
 		},
 		{
-			value: 5,
+			value: 'Saturday',
 			text: '星期六'
 		},
 		{
-			value: 6,
+			value: 'Sunday',
 			text: '星期日'
 		}
 	]
 	const ListDataconstructor = {
-		cycleChecked: [0, 1, 2, 3, 4, 5, 6],
+		cycleChecked: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
 	}
 
 	function returnBasicTimeConstructor() {
 		return {
-			listingTime: {
-				value: '09:00',
-				index: [9, 0]
+			startTime: {
+				value: '00:00:00',
+				index: [0, 0, 0]
 			},
-			offShelf: {
-				value: '18:00',
-				index: [18, 0]
+			endTime: {
+				value: '00:00:00',
+				index: [0, 0, 0]
 			}
 		}
 	}
 	const list = ref([returnBasicDataConstructor()])
+
 	function returnBasicDataConstructor() {
 		return {
 			...ListDataconstructor,
@@ -164,25 +173,68 @@
 	function addTimer() {
 		list.value.push(returnBasicDataConstructor())
 	}
+
 	function delTimer(index) {
-		list.value.splice(index,1)
+		list.value.splice(index, 1)
 	}
-	function selectAllClick(index){
-		list.value[index].cycleChecked=ListDataconstructor.cycleChecked
+	const isAllChecked = computed(() => {
+		return list.value[0].cycleChecked.length == cycle.length ? true : false
+	})
+
+	function selectAllClick(index) {
+		if (isAllChecked.value) {
+			list.value[index].cycleChecked = []
+		} else {
+			list.value[index].cycleChecked = ListDataconstructor.cycleChecked
+		}
 	}
 	// 触发定时器保存事件将数据给到添加商品页面
-	function emitTimerSave(){
-		uni.$emit('timerSave',list.value)
+	function emitTimerSave() {
+		const par={
+			days:list.value[0].cycleChecked.join(','),
+			startTime:list.value[0].startTime.value,
+			endTime:list.value[0].endTime.value
+		}
+		console.log(par);
+		uni.$emit('timerSave',par)
 		go.back()
 	}
-	function save(){
-		console.log(list.value);
+
+	function save() {
 		emitTimerSave()
 	}
-	onLoad(()=>{
-		const arr=uni.getStorageSync('timer')
-		if(arr.length){
-			list.value=arr
+	let goodsDetail = ref({})
+
+	function returnTimeIndex(time) {
+		console.log(time);
+		return time.split(':').map(v=>{
+			return v*1
+		})
+	}
+
+	function returnTimer(res) {
+		return [{
+			cycleChecked: res.days ? res.days.split(',').filter(v=>v) : [],
+			startTime: res.startTime ? {
+				value: res.startTime,
+				index: returnTimeIndex(res.startTime)
+			} : returnBasicTimeConstructor.startTime,
+			endTime: res.endTime ? {
+				value: res.endTime,
+				index: returnTimeIndex(res.endTime)
+			} : returnBasicTimeConstructor.endTime
+		}]
+	}
+	onLoad(async (opt) => {
+		let res = null
+		if (opt.productId) {
+			res = await $getProductDetail(opt.productId)
+			goodsDetail.value = res
+		}
+		const arr = res ? returnTimer(res) : [];
+		console.log(arr);
+		if (arr.length) {
+			list.value = arr
 		}
 	})
 </script>
@@ -195,7 +247,7 @@
 	.block {
 		background: #FFFFFF;
 		border-radius: 18rpx 18rpx 18rpx 18rpx;
-		padding: 30rpx;
-		margin-bottom: 20rpx;
+		padding: 32rpx 28rpx;
+		margin-bottom: 32rpx;
 	}
 </style>
\ No newline at end of file