From 1a73f4bf69fdcf8c0a54d9daadf69fee8570bc44 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Fri, 7 Jun 2024 19:26:30 +0800
Subject: [PATCH] 11

---
 package1/.DS_Store                |  Bin 10244 -> 10244 bytes
 package1/AI/AiChat.vue            |   11 +-
 package1/AI/addAiList.vue         | 1135 +++++--
 package1/AI/voiceInventory.vue    | 4614 +++++++++++++++++------------
 package1/index/orderDetail.vue    |  376 +--
 package1/index/peopleList.vue     |    2 +-
 package1/inventory/addGoods.vue   |  141 +-
 package1/inventory/batchPrint.vue |   13 +
 package1/inventory/gategory.vue   |   10 +-
 9 files changed, 3885 insertions(+), 2417 deletions(-)

diff --git a/package1/.DS_Store b/package1/.DS_Store
index 546c695329cfa115492f66032ea37a0e4b3b9d05..ec03d09f7a9c6e0769a305887b640e4f24857f3f 100644
GIT binary patch
delta 416
zcmZn(XbIRLC@96sWx&9|z{KFl;F+86;*yk;p9JJ{FfcSs))thM2hv$T{vCCMsVT@X
z3{K9^EdcTv7+3=~CkyH^)-$GifOrg<40#MG45<tis3tM|W@kPIG66+J3X)yeRG`?z
zxB#dfS$|n@QC?1dUOG^eakGH1AtO_b<zxY2vB{AlJRrw+x;{MW2oey<%}2HgAu)Na
z2p{8y$&SL}n=gwvF){;9nk*qE5280)iA6BVrGjlNW+-7uWJqI3L-kX`<PG8=wGEpu
fiAOOqI!)G<lmZ*!B?&PiM{*?(xn@qjByI!%(%@W-

delta 416
zcmZn(XbIRLC@973`iX&ofr-J9!814C#U&{xKMBa^aQgFdvbLb4Jdn=%@$aZ3Oie+C
zVQ_MOZUK<bz`)$FIayGTu^!A}U}eZ;$YV%hNM)!%Hpytuq(|(`$3P~as7Qg^g<S=T
zO&B(m1sCPz<maUWB^Wmg2pcjoMF~$95Eh#pDZ;}c{O4Gw>%*gtAOVrwe1uKN5|h`8
z@G&+_b`%!hd|AYaky&lN;baLhc@VwXN-Tm=E*9+KVuliiM20kmG-N;J?4LDxgSb31
nkluVrJc^OgYqGAS6m!E(v&mkP@*sM1j^s)na?PB4N!$nkAs2A8

diff --git a/package1/AI/AiChat.vue b/package1/AI/AiChat.vue
index 88545be..f088bde 100644
--- a/package1/AI/AiChat.vue
+++ b/package1/AI/AiChat.vue
@@ -154,9 +154,9 @@
 			        '四': 4, '五': 5, '六': 6, '七': 7, '八': 8, 
 					'九': 9,'杠':'-','刚':'-','军色':'均色','叉':'X','金色':'均色','井':'#',
 					'时间':'10件','事件':'10件','世间':'10件','实践':'10件','实件':'10件',
-					'景':'#','警':'#','颈':'#',
+					'景':'#','警':'#','颈':'#','括号':'货号'
 			    };
-			    const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈)/g;
+			    const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈|括号)/g;
 			    return str.replace(regex, match => chineseNumToArabic[match]);
 			},
 			inputSaveText(){
@@ -184,6 +184,9 @@
 				if(convertedStr.indexOf('，') == 0){
 					convertedStr = convertedStr.substr(1)
 				}
+				if (convertedStr.startsWith("号")) {
+					convertedStr = "货号" + convertedStr.substr(1);
+				}
 				let getMsg = convertedStr
 				if(this.editText == ''){
 					return;
@@ -250,6 +253,10 @@
 						console.log('位置',convertedStr.indexOf('，'))
 						convertedStr = convertedStr.substr(1)
 					}
+					console.log(convertedStr.indexOf('号'))
+					if (convertedStr.indexOf('号') == 0) {
+						convertedStr = "货号" + convertedStr.substr(1);
+					}
 					let data = {
 						text:convertedStr
 					}
diff --git a/package1/AI/addAiList.vue b/package1/AI/addAiList.vue
index 2d4f1d7..a50d6fe 100644
--- a/package1/AI/addAiList.vue
+++ b/package1/AI/addAiList.vue
@@ -2,32 +2,52 @@
 <template>
 	<view class="page1">
 		<!-- <view class="content"> -->
-		<view class="content-box" style="position: fixed;top:0;z-index: 99;width: 100%;">
+		<view class="content-box" style="position: fixed;top:0;z-index: 99;width: 100%;margin-bottom: 0;">
 			<view class="content-list" @tap="goPopleList('gysName')">
 				<view class="list-name">供应商</view>
-				<view class="list-val">
+				<view class="list-val" >
 					<input type="text" placeholder="请选择供应商" disabled
-						style="border-bottom: 1px solid #fff;text-align: center;" :value="khName.consigneeName">
+						style="border-bottom: 1px solid #fff;padding-left: 100rpx;" :value="khName.consigneeName">
 					<uni-icons type="right" size="16" style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
 				</view>
+			</view>
+			<view class="content-list">
+				<view class="list-name">生成货号</view>
+				<view class="list-val" style="width:560rpx;display: flex;">
+					<radio-group style="display: flex;padding-left: 100rpx;">
+						<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in isGenerateSn"
+							:key="item.value" style="margin-right:0">
+							<view>
+								<radio :value="item.value" @tap.stop="isChange(index)"
+									:checked="index === isGenerateSnRadio" />
+							</view>
+							<view style="width: 100rpx;">{{item.name}}</view>
+						</label>
+					</radio-group>
+				</view>
+			</view>
+			<view class="content-list" v-if="isGenerateSnRadio == 0">
+				<view class="list-name">货号规则</view>
+				<uni-data-select class="uni-data-select" :clear="false" :delItem="true" :localdata="snList" v-model="snName"
+					placeholder="请选择货号规则" @change='changeSn' @addSn='addSn' @delItemSn='delItemSn'></uni-data-select>
 			</view>
 			<view class="shop-box" style="border-bottom: 1px solid #eee;margin-bottom: 20rpx;">
 				<u-grid :col="4" border>
 					<u-grid-item index="add" @tap.stop="scanCodeAdd">
-						<u-icon name="scan" size="36"></u-icon>
+						<u-icon name="scan" size="25"></u-icon>
 						<text>扫一扫</text>
 					</u-grid-item>
 					<u-grid-item index="add" @tap.stop="pictureAdd('')">
-						<u-icon name="photo" size="36"></u-icon>
+						<u-icon name="photo" size="25"></u-icon>
 						<text>图片添加</text>
 					</u-grid-item>
-					<u-grid-item @tap.stop="addPageGoods('')">
-						<u-icon name="plus" size="28"></u-icon>
-						<text>添加商品</text>
+					<u-grid-item @tap.stop="isSnList('')">
+						<u-icon name="plus" size="25"></u-icon>
+						<text>新增商品</text>
 					</u-grid-item>
 					<u-grid-item @tap.stop="goodsAdd">
-						<u-icon name="tags" size="28"></u-icon>
-						<text>库存商品</text>
+						<u-icon name="tags" size="25"></u-icon>
+						<text>选库存</text>
 					</u-grid-item>
 				</u-grid>
 			</view>
@@ -46,15 +66,15 @@
 				</view>
 			</view>
 		</view>
-		<scroll-view class="scroll-content" scroll-y="true" :scroll-into-view="currentAnchor" scroll-top="0">
-			<view class="content-box">
+		<scroll-view class="scroll-content" :style="{'padding-top':isGenerateSnRadio == 0?'530rpx':'450rpx'}" scroll-y="true" :scroll-into-view="currentAnchor" scroll-top="0">
+			<view class="content-box" style="margin-bottom: 0;">
 				<view class="shop-box" style="border-top:5px solid #eee;" v-for="(value,key) in Array.from(carList)"
 					:key="key">
 					<view class="shop-name">
 						<view class="new-logo" v-if="value[1].isNew">新</view>
 						<view class="u-upload" v-if="value[1].isNew" @tap="uploadFilePromise(value)"></view>
 						<view class="" style="width: 140rpx;height: 280rpx;margin: 30rpx 0 0 30rpx;">
-							<img v-if="value[1].productPicture !=''" class="img-radius"
+							<img v-if="value[1].productPicture !=null && value[1].productPicture !=''" class="img-radius"
 								style="width: 140rpx;height: 140rpx;display: block;overflow: hidden;"
 								:src="value[1].productPicture" alt="">
 							<view v-else
@@ -72,8 +92,8 @@
 							</view>
 							<view class="one-goods" @tap="pictureAdd(value[0])">
 								上传多图
-								<view class="jiaobiao" v-if="value[1].childrenList.length > 0">
-									{{value[1].childrenList.length}}
+								<view class="jiaobiao" v-if="value[1].productPictures != ''">
+									{{value[1].productPictures.length}}
 								</view>
 							</view>
 						</view>
@@ -92,13 +112,13 @@
 									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
 							</view>
 							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
-								货号:<input type="text" v-if="value[1].isNew" @blur="getSnIsRepeat($event,value[0])"
-									:value="value[1].productSn"
+								货号:<input type="text" v-if="value[1].isNew" @input="sninput($event,value[0])" @blur="getSnIsRepeat($event,value[0])"
+									v-model="carList.get(value[0]).productSn"
 									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 274rpx;padding-left: 20rpx;">
-								<input type="text" v-else disabled :value="value[1].productSn"
+								<input type="text" v-else disabled v-model="value[1].productSn"
 									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
 								<uni-icons type="refresh" color="#777" size='25'
-									@tap="generateSn"></uni-icons>
+									@tap="generateSn(value[0])"></uni-icons>
 							</view>
 							<view style="display: flex;height: 55rpx;line-height: 55rpx;" v-if="value[1].isNew">
 								分类: <text
@@ -121,11 +141,11 @@
 									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;">
 							</view>
 							<view @tap="toggle('oneGoods',value[0])"
-								style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;bottom: 100rpx;right: 0px;line-height: 54rpx;">
+								style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;top: 170rpx;right: 0px;line-height: 54rpx;">
 								语音录入 
 							</view>
 							<view @tap="AiAddSpec(value[1])"
-								style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;bottom: 30rpx;right: 0px;line-height: 54rpx;">
+								style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;top: 240rpx;right: 0px;line-height: 54rpx;">
 								添加规格
 							</view>
 						</view>
@@ -155,31 +175,31 @@
 				</view>
 			</view>
 			<view class="content-box" style="margin-bottom:110rpx;">
-				<view class="price-box-list">
+				<view class="price-box-list" style="margin-top:10rpx;">
 					<view class="content-list" v-if="userType == 0">
 						<view class="list-name">应付金额</view>
 						<view class="list-val">
-							<input type="text" placeholder="请输入应付金额" v-model="shouldPay"
+							<input type="digit" placeholder="请输入应付金额" v-model="shouldPay"
 								@focus="obtainPrice($event,'shouldPay')" @blur="changessPrice($event)">
 						</view>
 					</view>
 					<view class="content-list" v-if="userType == 0">
 						<view class="list-name">已付金额</view>
 						<view class="list-val">
-							<input type="text" placeholder="请输入已付金额" v-model="alreadyPay"
+							<input type="digit" placeholder="请输入已付金额" v-model="alreadyPay"
 								@focus="obtainPrice($event,'alreadyPay')" @blur="changePay($event)">
 						</view>
 					</view>
 					<view class="content-list" v-if="userType == 0">
 						<view class="list-name">欠款</view>
 						<view class="list-val">
-							<input type="text" v-model="noPay" disabled>
+							<input type="digit" v-model="noPay" disabled>
 						</view>
 					</view>
 					<view class="content-list">
 						<view class="list-name">其他费用</view>
 						<view class="list-val">
-							<input type="text" v-model="otherPay">
+							<input type="digit" v-model="otherPay">
 						</view>
 					</view>
 					<view class="content-list">
@@ -427,7 +447,7 @@
 			<view class="type-popup"
 				style="width:100%;margin-bottom: 0;border-radius: 0;height: 450rpx;border-radius: 10px;">
 				<view style="height: 120rpx;font-size: 36rpx;font-weight: bold;line-height: 120rpx;text-align: center;">
-					修改规格值
+					新增规格值
 				</view>
 				<view style="height: 80rpx;font-size: 28rpx;line-height: 80rpx;text-align: center;">
 					请在下方输入框中输入新规格
@@ -470,19 +490,17 @@
 				</view>
 			</view>
 		</uni-popup>
-		<!-- 弹出子图轮播 -->
+		<!-- 弹出多图轮播 -->
 		<uni-popup ref="showImgDiaLog" background-color="#fff">
-			<view class="showImg-box">
-				<uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="childrenList" :current="current" :mode="round"
-					:dots-styles="dotsStyles">
-					<swiper class="swiper-box" @change="lunbochange" autoplay="true" :current="current">
-						<swiper-item v-for="(item, index) in childrenList" :key="index">
-							<view class="swiper-item" :class="'swiper-item' + index">
-								<img :src="item" alt="" />
-							</view>
-						</swiper-item>
-					</swiper>
-				</uni-swiper-dot>
+			<view class="showImg-box"> 
+				<swiper indicator-dots class="swiper-box" @change="lunbochange" circular autoplay :current="swiperDotIndex">
+					<swiper-item v-for="(item, index) in productPictures" :key="index">
+						<view class="swiper-item">
+							<img :src="item.productPicture" alt="" style="width: 100%;height: 100%;" />
+						</view>
+					</swiper-item>
+				</swiper>
+				<view @tap="pictureAdd(childrenId,'huan')" class="lb-btn">更换图片</view>
 			</view>
 		</uni-popup>
 		<view class="voice-model" v-if="recordState == true">
@@ -524,14 +542,17 @@
 				index1: '',
 				recordState: false,
 				goodsDetail: [],
-				columns: [],
-				keyList: [],
 				temporaryList: [],
-				zNum: 0,
-				carList1: [],
-				productNum: null,
+				zNum: 0,
+				snList:[],
+				carList1: [],
+				zhuImg:'',
+				productNum: null,
+				prefixRule:'',
+				numRule:'',
 				productId: '',
-				oneGoodsId:'',
+				oneGoodsId:'',
+				goodsId:'',
 				pageOldTemList: [],
 				oldTemList: [],
 				attrList: [],
@@ -540,7 +561,8 @@
 				newTemList: [],
 				pecsList: [],
 				childrenId:'',
-				childrenList:[],
+				isGenerateSnRadio:1,
+				productPictures:[],
 				categoryText: '',
 				dataObj: new Map(),
 				isPlusAndMinus: false,
@@ -548,10 +570,148 @@
 				evalue: [],
 				attributeValue: [],
 				specifications: '',
-				current:0,
+				current:0,
+				swiperDotIndex:0,
 				currentAnchor: '',
 				temporaryNum: 0,
-				isBottom: false,
+				isBottom: false,
+				isGenerateSn: [{
+						value: '0',
+						name: '生成'
+					},
+					{
+						value: '1',
+						name: '不生成'
+					}
+				],
+				snName:'ty',
+				defaultList:[{
+					name:'颜色',
+					value:[{
+						value:'均色',
+						isChecked:false,
+					},{
+						value:'白色',
+						isChecked:false,
+					},{
+						value:'黑色',
+						isChecked:false,
+					},{
+						value:'浅蓝',
+						isChecked:false,
+					},{
+						value:'蓝色',
+						isChecked:false,
+					},{
+						value:'灰色',
+						isChecked:false,
+					},{
+						value:'咖色',
+						isChecked:false,
+					},{
+						value:'紫色',
+						isChecked:false,
+					},{
+						value:'红色',
+						isChecked:false,
+					},{
+						value:'米色',
+						isChecked:false,
+					}]
+				},{
+					name:'尺码',
+					value:[{
+						value:'均码',
+						isChecked:false,
+					},{
+						value:'XS码',
+						isChecked:false
+					},{
+						value:'S码',
+						isChecked:false,
+					},{
+						value:'M码',
+						isChecked:false,
+					},{
+						value:'L码',
+						isChecked:false,
+					},{
+						value:'XL码',
+						isChecked:false,
+					},{
+						value:'2XL码',
+						isChecked:false,
+					},{
+						value:'3XL码',
+						isChecked:false,
+					},{
+						value:'4XL码',
+						isChecked:false,
+					},{
+						value:'25码',
+						isChecked:false
+					},{
+						value:'26码',
+						isChecked:false
+					},{
+						value:'27码',
+						isChecked:false
+					},{
+						value:'28码',
+						isChecked:false
+					},{
+						value:'29码',
+						isChecked:false
+					},{
+						value:'30码',
+						isChecked:false
+					},{
+						value:'31码',
+						isChecked:false
+					},{
+						value:'32码',
+						isChecked:false
+					},{
+						value:'33码',
+						isChecked:false
+					},{
+						value:'34码',
+						isChecked:false
+					},{
+						value:'35码',
+						isChecked:false
+					},{
+						value:'36码',
+						isChecked:false
+					},{
+						value:'37码',
+						isChecked:false
+					},{
+						value:'38码',
+						isChecked:false
+					},{
+						value:'39码',
+						isChecked:false
+					},{
+						value:'40码',
+						isChecked:false
+					},{
+						value:'41码',
+						isChecked:false
+					},{
+						value:'42码',
+						isChecked:false
+					},{
+						value:'43码',
+						isChecked:false
+					},{
+						value:'44码',
+						isChecked:false
+					},{
+						value:'45码',
+						isChecked:false
+					}]
+				}],
 				temporary: [] //修改单个规格值临时存放要修改的对象
 			}
 		},
@@ -626,7 +786,8 @@
 			} else {
 				this.carList1 = this.carList1
 
-			}
+			}
+			console.log(this.carList1)
 			this.khName = JSON.parse(JSON.stringify(this.khName)) || ''
 			if (this.carList.size == 0) { //当前页没有数据
 				for (let i = 0; i < this.carList1.length; i++) {
@@ -641,10 +802,11 @@
 						productName: this.carList1[i].productName,
 						wholesalePrice: this.carList1[i].wholesalePrice || 0,
 						categoryName: this.carList1[i].categoryName,
-						categoryId: this.carList1[i].categoryId,
+						categoryId: this.carList1[i].attrId,
 						lsprice: this.carList1[i].price || 0,
 						productPicture: this.carList1[i].productPicture,
-						productSn: this.carList1[i].productSn,
+						productSn: this.carList1[i].productSn,
+						productPictures:[],
 						stockLogList: new Map(),
 						stockLogList1: []
 					}
@@ -713,12 +875,13 @@
 							productName: this.carList1[i].productName,
 							wholesalePrice: this.carList1[i].wholesalePrice || 0,
 							categoryName: this.carList1[i].categoryName,
-							categoryId: this.carList1[i].categoryId,
+							categoryId: this.carList1[i].attrId,
 							lsprice: this.carList1[i].price || 0,
 							productPicture: this.carList1[i].productPicture,
 							productSn: this.carList1[i].productSn,
 							stockLogList: new Map(),
-							stockLogList1: [],
+							stockLogList1: [],
+							productPictures:[],
 							name: ''
 						}
 						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
@@ -759,17 +922,157 @@
 				}
 				this.$forceUpdate()
 			})
-			console.log(this.carList)
 		},
 		onLoad(options) {
-			this.userType = uni.getStorageSync('type')
+			this.userType = uni.getStorageSync('type')
+			this.getSnList()
+			this.getShopCategory()
+			this.getDefaultCategory()
 		},
 		methods: {
+			//店铺规格库
+			getShopCategory(){
+				this.tui.request("/app/productCategory/getCategoryOfshop", "POST", {}, false, true).then((res) => {
+					if (res.code == 200) {
+						//this.specifiList[0] this.defaultList[1] 尺码
+						//this.specifiList[1] this.defaultList[0] 颜色
+						this.specifiList = res.result.productAttributeOfAddVos
+						for(let m=0;m<this.specifiList[0].productAttributeValueVoList.length;m++){ //尺码库
+							let isysTrue = true
+							for(let i=0;i<this.defaultList[1].value.length;i++){ //合并尺码 默认尺码
+								if(this.defaultList[1].value[i].value == this.specifiList[0].productAttributeValueVoList[m].value){
+									isysTrue = false
+								}
+							}
+							this.$nextTick(()=>{
+								if(isysTrue){
+									this.defaultList[1].value.push(this.specifiList[0].productAttributeValueVoList[m])
+								}
+							})
+						}
+						for(let m=0;m<this.specifiList[1].productAttributeValueVoList.length;m++){ //颜色库
+							let isTrue = true
+							for(let i=0;i<this.defaultList[0].value.length;i++){ //合并颜色 默认颜色
+								if(this.defaultList[0].value[i].value == this.specifiList[1].productAttributeValueVoList[m].value){
+									isTrue = false
+								}
+							}
+							this.$nextTick(()=>{
+								if(isTrue){
+									this.defaultList[0].value.push(this.specifiList[1].productAttributeValueVoList[m])
+								}
+							})
+							
+						}
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
+			//店铺默认分类
+			getDefaultCategory(){
+				this.tui.request("/app/productCategory/getDefaultCategory", "POST", {}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.categoryList = res.result
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
+			//进入页面，查询货号列表
+			getSnList(){
+				// snList
+				this.snList = []
+				this.snName = ''
+				this.tui.request("/app/productSn/getProductSnByShopId", "POST", {}, false, true).then((res1) => {
+					if (res1.code == 200) {
+						if(res1.result != ''){
+							for(let i=0;i<res1.result.length;i++){
+								let data= {
+									text:'前缀:'+res1.result[i].snPre+',位数:'+res1.result[i].snSufLength,
+									value:res1.result[i].snPre
+								}
+								
+								this.snList.push(data)
+							}
+							this.snName = res1.result[0].snPre
+						}
+						
+					} else {
+						this.tui.toast(res.message)
+					}
+					this.$forceUpdate()
+				}).catch((res) => {})
+			},
+			//根据规则生成货号
 			startGetSn(){
-				//调接口请求，返回货号放到货号一栏
+				var that = this;
+				if(this.prefixRule == ''){
+					this.tui.toast('请输入货号生成前缀规则')
+					return
+				}
+				if(this.numRule == ''){
+					this.tui.toast('请输入货号生成位数规则')
+					return
+				}
+				this.tui.request("/app/productSn/addAndGetNewProductSn", "POST", {
+					snPre:this.prefixRule,
+					snSufLength:this.numRule
+				}, false, false).then((res1) => {
+					if (res1.code == 200) {
+						// this.snList = res1.result
+						if(res1.message=='货号前缀已存在！'){  //被删除，调启用方法
+							uni.showModal({
+								title: "提示",
+								content: "货号已经被删除，是否重新启用？",
+								success: function(res) {
+									if (res.confirm) {
+										that.tui.request("/app/productSn/useAgainProductSn", "POST", {
+											id:res1.result.id
+										}, false, true).then((res2) => {
+											if (res2.code == 200) {
+												that.tui.toast('重新启用成功')
+												setTimeout(res=>{
+													that.$refs.SNDialog.close()
+													that.getSnList()
+												},1000)
+											} else {
+												that.tui.toast(res2.message)
+											}
+											that.$forceUpdate()
+										}).catch((res) => {})
+									}
+								}
+							})
+						}else{
+							this.addPageGoods(this.zhuImg,res1.result)
+						}
+						
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
 			},
-			//生成货号
-			generateSn(){
+			//生成货号弹出层
+			generateSn(id){
+				if(this.snList.length > 0){
+					this.tui.request("/app/productSn/getNewProductSn", "POST", {
+						snPre: this.snName
+					}, false, true).then((res) => {
+						if (res.code == 200) {
+							this.carList.get(id).productSn = res.result
+							this.$forceUpdate()
+						} else {
+							this.tui.toast(res.message)
+						}
+					}).catch((res) => {})
+				}else{
+					this.zhuImg = ''
+					this.$refs.SNDialog.open('center')
+				}
+				
+			},
+			addSn(){
 				this.$refs.SNDialog.open('center')
 			},
 			AiVoice() {
@@ -786,11 +1089,12 @@
 							productName: this.carList1[i].productName,
 							wholesalePrice: this.carList1[i].wholesalePrice || 0,
 							categoryName: this.carList1[i].categoryName,
-							categoryId: this.carList1[i].categoryId,
+							categoryId: this.carList1[i].attrId,
 							lsprice: this.carList1[i].price || 0,
 							productPicture: this.carList1[i].productPicture,
 							productSn: this.carList1[i].productSn,
-							stockLogList: new Map(),
+							stockLogList: new Map(),
+							productPictures:[],
 							stockLogList1: []
 						}
 
@@ -879,12 +1183,13 @@
 								productName: this.carList1[i].productName,
 								wholesalePrice: this.carList1[i].wholesalePrice || 0,
 								categoryName: this.carList1[i].categoryName,
-								categoryId: this.carList1[i].categoryId,
+								categoryId: this.carList1[i].attrId,
 								lsprice: this.carList1[i].price || 0,
 								productPicture: this.carList1[i].productPicture,
 								productSn: this.carList1[i].productSn,
 								stockLogList: new Map(),
-								stockLogList1: [],
+								stockLogList1: [],
+								productPictures:[],
 								name: ''
 							}
 							for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
@@ -925,7 +1230,6 @@
 					}
 					this.$forceUpdate()
 				})
-				console.log(this.carList)
 			},
 			numData(val) {
 				var name = []
@@ -947,19 +1251,23 @@
 				this.getGategoryLowList()
 			},
 			getScanCodeCategroyId(num) {
-				num = num == '颜色' ? 0 : 1
-				this.tui.request("/app/productAttribute/selectByCategoryId", "POST", {
-					categoryId: this.goodsDetail.categoryId
-				}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						this.isOpenId = res1.result[num].id
-						this.$refs.inputDialog.open('bottom')
-						this.isBottom = true
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-				this.$forceUpdate()
+				num = num == '颜色' ? 0 : 1
+				console.log('新增',this.goodsDetail)
+				this.isOpenId = num
+				this.goodsId = this.goodsDetail.id
+				this.$refs.inputDialog.open('bottom')
+				this.isBottom = true
+				// this.tui.request("/app/productAttribute/selectByCategoryId", "POST", {
+				// 	categoryId: this.goodsDetail.categoryId
+				// }, false, true).then((res1) => {
+				// 	if (res1.code == 200) {
+				// 		this.isOpenId = res1.result[num].id
+				// 		this.$refs.inputDialog.open('bottom')
+				// 		this.isBottom = true
+				// 	} else {
+				// 		this.tui.toast(res.message)
+				// 	}
+				// }).catch((res) => {})
 			},
 			//初始化获取子分类列表
 			getGategoryLowList() {
@@ -1069,7 +1377,8 @@
 				}
 			},
 			//确认语音输入的内容
-			setDetail(e) {
+			setDetail(e) {
+				let that = this;
 				if (this.voiceText == '') {
 					this.tui.toast('识别内容不能为空')
 					return
@@ -1111,13 +1420,13 @@
 				if (convertedStr.indexOf('货号') != -1) {
 					convertedStr = convertedStr.replace(/货号/g, '货号:')
 				}
-				//名称111，白色M码1一件
 				convertedStr = this.convertStringCorrectly(convertedStr)
 				convertedStr = this.spliceMsg(convertedStr)
 				if (convertedStr.indexOf('，') == 0) {
-					console.log('位置', convertedStr.indexOf('，'))
 					convertedStr = convertedStr.substr(1)
-					console.log('位置', convertedStr)
+				}
+				if (convertedStr.startsWith("号")) {
+					convertedStr = "货号" + convertedStr.substr(1);
 				}
 				this.getMsg = convertedStr
 				this.tui.request("/purchaseOcrPicture/callWithMessageOfPurchase", "POST", {
@@ -1129,19 +1438,25 @@
 						let purchaseDetails = res.result.data.purchaseDetails
 						if(this.oneGoodsId){
 							let id = this.oneGoodsId
-							this.tui.toast('单商品语音录入')
 							if(purchaseDetails.length > 0){
 								this.carList.get(id).productName = purchaseDetails[0].productName
-								this.carList.get(id).productSn = purchaseDetails[0].productSn
-								
-								if (purchaseDetails[0].productId) {
-									data.id = purchaseDetails[0].productId
-								} else if (purchaseDetails[0].productSn == '' || purchaseDetails[0].productSn ==
-									null || purchaseDetails[0].productSn == '货号') {
-									data.id = purchaseDetails[0].productName
-								} else if (purchaseDetails[0].productSn) {
-									data.id = purchaseDetails[0].productSn
+								let isTrue = false
+								this.carList.forEach(function(value, key) {
+									if(value.productSn == purchaseDetails[0].productSn){
+										isTrue = true
+										console.log('向通用')
+										this.carList.get(id).productSn = ''
+										this.$forceUpdate()
+										setTimeout(res=>{
+											this.tui.toast('该货号被页面其他商品占用,请重新输入！')
+										},300)
+									}
+								})
+								if(isTrue == false){
+									this.carList.get(id).productSn = purchaseDetails[0].productSn
 								}
+								
+								
 								// this.carList.get(id).id = purchaseDetails[0].productSn
 								this.carList.get(id).purchasePrice = purchaseDetails[0].purchasePrice
 								
@@ -1159,8 +1474,16 @@
 									this.carList.get(id).productCount += purchaseDetails[0].stockLogList1[i].productCount
 								}
 								this.carList.get(id).price1 = this.carList.get(id).productCount * this.carList.get(id).purchasePrice
+								// if (purchaseDetails[0].productId) {
+								// 	this.carList.get(id).id = purchaseDetails[0].productId
+								// } else if (purchaseDetails[0].productSn == '' || purchaseDetails[0].productSn ==
+								// 	null || purchaseDetails[0].productSn == '货号') {
+								// 	this.carList.get(id).id = purchaseDetails[0].productName
+								// } else if (purchaseDetails[0].productSn) {
+								// 	this.carList.get(id).id = purchaseDetails[0].productSn
+								// }
+								
 								this.getAllPrice()
-								console.log('carList',this.carList)
 								this.oneGoodsId = ''
 							}else{
 								this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
@@ -1183,8 +1506,10 @@
 									productSn: purchaseDetails[i].productSn,
 									productPicture: purchaseDetails[i].productPicture,
 									supplierName: purchaseDetails[i].supplierName,
+									productPictures:[],
 									saleDetailQueryDTO: []
 								}
+								console.log('data',data)
 								if (purchaseDetails[i].productId) {
 									data.id = purchaseDetails[i].productId
 								} else if (purchaseDetails[i].productSn == '' || purchaseDetails[i].productSn ==
@@ -1193,7 +1518,6 @@
 								} else if (purchaseDetails[i].productSn) {
 									data.id = purchaseDetails[i].productSn
 								}
-								console.log('货号', data)
 								for (let m = 0; m < purchaseDetails[i].stockLogList1.length; m++) {
 									let list = {
 										attributeList: this.getAttribute(purchaseDetails[i].stockLogList1[m]
@@ -1211,7 +1535,9 @@
 								this.carList1.push(data)
 							
 							}
-							this.AiVoice()
+							setTimeout(res=>{
+								this.AiVoice()
+							},300)
 						}
 						
 					} else {
@@ -1220,37 +1546,89 @@
 				}).catch((res) => {
 					this.tui.toast(res)
 				})
+			},
+			delItemSn(val){
+				var that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条货号规则吗？",
+					success: function(res) {
+						if (res.confirm) {
+							that.tui.request("/app/productSn/checkProductSn", "post", {
+								snPre:val.value
+							}, false, true).then((res1) => {
+								if (res1.code == 200) {
+									that.tui.request("/app/productSn/deleteProductSn", "post", {
+										id:res1.result.id
+									}, false, true).then((res2) => {
+										if (res2.code == 200) {
+											that.tui.toast('删除成功')
+											setTimeout(res=>{
+												that.getSnList()
+											},1000)
+										} else {
+											uni.showToast({
+												title: res2.message,
+												icon: 'none'
+											})
+										}
+									}).catch((res) => {})
+								} else {
+									uni.showToast({
+										title: res1.message,
+										icon: 'none'
+									})
+								}
+							}).catch((res) => {})
+						}
+					}
+				})
+				
 			},
 			dialogInputConfirm(e) {
 				if (this.categoryText == '') {
 					this.tui.toast("请输入规格值后提交")
 					return
-				}
-				this.tui.request("/app/productAttributeValue/save", "post", {
-					value: this.categoryText,
-					attributeId: this.isOpenId
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-
-						this.categoryText = ''
-						this.$refs.inputDialog.close()
-						if (this.isBottom) { //底部弹起的规格选择弹层
-							this.getById(this.goodsDetail, 1)
-						} else {
-							this.getGategoryLowList()
-						}
-						this.$forceUpdate()
-						uni.showToast({
-							title: "添加成功",
-							icon: 'none'
-						})
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-					}
-				}).catch((res) => {})
+				}
+				//this.goodsDetail[0]  颜色
+				//this.goodsDetail[1]  尺码
+				let data = {
+					isChecked:false,
+					value:this.categoryText
+				}
+				console.log('shuju',data)
+				if(this.isOpenId == '0'){
+					this.goodsDetail.attributeList[0].value.push(data)
+				}else if(this.isOpenId == '1'){
+					this.goodsDetail.attributeList[1].value.push(data)
+				}
+				this.$forceUpdate()
+				console.log('颜色',this.goodsDetail)
+				// this.tui.request("/app/productAttributeValue/save", "post", {
+				// 	value: this.categoryText,
+				// 	attributeId: this.isOpenId
+				// }, false, true).then((res) => {
+				// 	if (res.code == 200) {
+
+				// 		this.categoryText = ''
+				// 		this.$refs.inputDialog.close()
+				// 		if (this.isBottom) { //底部弹起的规格选择弹层
+				// 			this.getById(this.goodsDetail, 1)
+				// 		} else {
+				// 			this.getGategoryLowList()
+				// 		}
+				// 		this.$forceUpdate()
+				// 		uni.showToast({
+				// 			title: "添加成功",
+				// 			icon: 'none'
+				// 		})
+				// 	} else {
+				// 		uni.showToast({
+				// 			title: res.message,
+				// 			icon: 'none'
+				// 		})
+				// 	}
+				// }).catch((res) => {})
 			},
 			dialogClose() {
 				this.inputVal = '';
@@ -1384,13 +1762,13 @@
 				let multipleList = [{
 					attributeName: '颜色',
 					productAttributeValueVoList: [{
-						checked: true,
+						isChecked: true,
 						value: "均色"
 					}]
 				}, {
 					attributeName: '尺码',
 					productAttributeValueVoList: [{
-						checked: true,
+						isChecked: true,
 						value: "均码"
 					}]
 				}]
@@ -1453,8 +1831,6 @@
 				this.temporaryChange()
 			},
 			obtainPrice(e, type, num) {
-				console.log("获得焦点", this.carList)
-				console.log("获得焦点", e.target.value)
 				this.linshiPrice = e.target.value
 				if (type == 'danjia') {
 					this.carList.get(num).purchasePrice = ''
@@ -1552,7 +1928,8 @@
 				} else {
 					this.goodsList[index].specs.push(data1)
 				}
-				let jishuqi = 0
+				let jishuqi = 0
+				console.log(this.goodsList)
 				for (var i = 0; i < this.goodsList.length; i++) {
 					if (this.goodsList[i].specs.length > 0) {
 						jishuqi++
@@ -1581,7 +1958,7 @@
 					value.push(value1)
 					this.evalue.push(name)
 				}
-
+				console.log('value',value)
 				if (jishuqi == 0) {
 					this.oldTemList = []
 				}
@@ -1685,7 +2062,7 @@
 				this.current = e.detail.current
 			},
 			clickItem(e) {
-				this.current = e
+				this.swiperDotIndex = e
 			},
 			//弹出商品规格选择
 			toggle(type, id) {
@@ -1752,7 +2129,6 @@
 				// 识别结束事件
 				manager.onStop = (res) => {
 					let convertedStr = this.spliceMsg(this.convertChineseToArabic(res.result));
-					console.log(convertedStr)
 					if (convertedStr.indexOf('点') != -1) {
 						convertedStr = that.replaceCharAfterNumber(convertedStr, '点', '.')
 					}
@@ -1792,10 +2168,11 @@
 					convertedStr = this.convertStringCorrectly(convertedStr)
 
 					if (convertedStr.indexOf('，') == 0) {
-						console.log('位置', convertedStr.indexOf('，'))
 						convertedStr = convertedStr.substr(1)
 					}
-
+					if (convertedStr.startsWith("号")) {
+						convertedStr = "货号" + convertedStr.substr(1);
+					}
 					if (that.voiceText == '' || that.voiceText == null) {
 						that.voiceText = convertedStr
 					} else {
@@ -1873,14 +2250,12 @@
 					'实件': '10件',
 					'景': '#',
 					'警': '#',
-					'颈': '#',
+					'颈': '#',
+					'括号':'货号'
 				};
-				const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈)/g;
+				const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈|括号)/g;
 				return str.replace(regex, match => chineseNumToArabic[match]);
 			},
-			shiqujiaodian(e) {
-				console.log("11111", e);
-			},
 			//合并已有
 			clickMerge(value, key) {
 				let that = this;
@@ -1902,26 +2277,25 @@
 				this.getAllPrice()
 				this.$refs.mergePopup.close()
 			},
-			AiAddSpec(value) {
-				if (value.categoryId == '' || value.categoryId == null) {
-					this.tui.toast('请先选择商品分类')
-					return;
-				}
-				console.log(value);
+			AiAddSpec(value) {
+				console.log('添加规格',value)
 				this.getById(value, 1);
 			},
-			pictureAdd(id) {
+			pictureAdd(id,huan) {
 				let that = this
-				if(id != ''){  //上传子图
+				if(id != ''){  //上传多图
 					this.childrenId = id
-					if(this.carList.get(id).childrenList.length > 0){
-						this.childrenList = this.carList.get(id).childrenList
+					if(this.carList.get(id).productPictures.length > 0 && huan !='huan'){
+						console.log('productPictures',this.carList.get(id).productPictures)
+						this.productPictures = this.carList.get(id).productPictures
 						this.$refs.showImgDiaLog.open()
 						return;
+					}else if(huan == 'huan'){
+						this.$refs.showImgDiaLog.close()
 					}
-				}
-				
-				
+				}else{
+					this.childrenId = ''
+				}
 				uni.chooseMedia({
 					count: 9,
 					mediaType: ['image'],
@@ -1930,16 +2304,17 @@
 						uni.showLoading({
 							title: '加载中...',
 							mask:true
-						})
-						console.log(res.tempFiles)  //数组，取tempFilesPath
-						for(let i=0;i<res.tempFiles.length;i++){
-							that.upLoadFile(res.tempFiles[i].tempFilePath)
+						})
+						if(that.childrenId !=''){
+							that.carList.get(that.childrenId).productPictures = []
 						}
-						
+						for(let i=0;i<res.tempFiles.length;i++){
+							that.upLoadFile(res.tempFiles[i].tempFilePath,i+1)
+						}
 					}
 				})
 			},
-			async upLoadFile(path){
+			async upLoadFile(path,time){
 				let that = this;
 				let hiver_token = uni.getStorageSync("hiver_token")
 				await uni.uploadFile({
@@ -1953,14 +2328,19 @@
 					formData: {},
 					success: (uploadFileRes) => {
 						let pathData = JSON.parse(uploadFileRes.data)
-						console.log('pathData',pathData)
 						if(that.childrenId != ''){
-							that.carList.get(that.childrenId).childrenList.push(pathData.result)
+							let data = {
+								productPicture:pathData.result
+							}
+							that.carList.get(that.childrenId).productPictures.push(data)
 							that.$forceUpdate()
 						}else{
-							that.addPageGoods(pathData.result)
+							setTimeout(function() {
+								that.isSnList(pathData.result)
+							}, 500 * time);
+							
+							// that.addPageGoods(pathData.result)
 						}
-						console.log('carList子图',that.carList)
 					},
 					fail: (err) => {
 						uni.hideLoading();
@@ -1979,83 +2359,162 @@
 				let that = this;
 				uni.showLoading({
 					title: '加载中...'
-				})
-				this.isBottom = false
-				if (current == 1) {
-					that.goodsDetail = id;
-				} else {
-					this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
-						if (res.code == 200) {
-							if (res.result.delFlag == 0) {
-								that.tui.toast("请将商品上架后再操作！")
-								return
-							}
-							that.goodsDetail = res.result;
-						} else {
-							this.tui.toast(res.message)
-						}
-					}).catch((res) => {})
+				})
+				
+				this.isBottom = false
+				//判断isNew，新商品直接调店铺颜色库
+				if(current == 1){
+					that.goodsDetail = id;
+					that.goodsDetail.attributeList = []
+					if(this.goodsDetail.isNew){
+						this.goodsList = []
+						that.goodsDetail.attributeList = this.defaultList
+						for (var i = 0; i < that.goodsDetail.attributeList.length; i++) {
+						// 	let oldCheck = false
+						// 	let oldValue = []
+							for (var m = 0; m < that.goodsDetail.attributeList[i].value.length; m++) {
+								
+								that.dataObj.set(that.goodsDetail.attributeList[i].value[m].value,that.goodsDetail.attributeList[i].name)
+						// 		if (that.goodsDetail.attributeList[i].value[m].isChecked == true) {
+						// 			oldCheck = true
+						// 			oldValue.push(that.goodsDetail.attributeList[i].value[m].value)
+						// 		}
+							}
+							let specs1 = {
+								specs: []
+							}
+							that.goodsList.push(specs1)
+						// 	oldCheck = false
+						// 	oldValue = []
+						}
+					}else{
+						that.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
+							"POST", {
+								categoryId: that.goodsDetail.categoryId
+							}, false, true).then((res1) => {
+							if (res1.code == 200) {
+								that.goodsList = []
+								if (typeof(res1.result) == 'string') {
+									let newObj = JSON.parse(res1.result)
+									let newArr = []
+									let dataArr = []
+									for (let val in newObj) {
+										let valueObj = [];
+										for (var i = 0; i < newObj[val].length; i++) {
+											valueObj.push({
+												value: newObj[val][i],
+												isChecked: false
+											})
+											that.dataObj.set(newObj[val][i], val)
+										}
+										newArr.push({
+											name: val,
+											value: valueObj
+										})
+									}
+									console.log('dataObj',that.dataObj)
+									that.goodsDetail.attributeList = newArr;
+									for (var i = 0; i < that.goodsDetail.attributeList.length; i++) {
+										// let oldCheck = false
+										// let oldValue = []
+										// for (var m = 0; m < that.goodsDetail.attributeList[i].value
+										// 	.length; m++) {
+										// 	if (that.goodsDetail.attributeList[i].value[m]
+										// 		.isChecked == true) {
+										// 		oldCheck = true
+										// 		oldValue.push(that.goodsDetail.attributeList[i]
+										// 			.value[m].value)
+										// 	}
+										// }
+										let specs1 = {
+											specs: []
+										}
+										that.goodsList.push(specs1)
+										// oldCheck = false
+										// oldValue = []
+									}
+								} else {
+									that.tui.toast('失败了')
+								}
+				
+							} else {
+								that.tui.toast(res1.message)
+							}
+						}).catch((res) => {})
+					}
+					
+				}else{
+					this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
+						if (res.code == 200) {
+							if (res.result.delFlag == 0) {
+								that.tui.toast("请将商品上架后再操作！")
+								return
+							}
+							that.goodsDetail = res.result;
+							that.goodsDetail.attributeList = this.defaultList
+						} else {
+							this.tui.toast(res.message)
+						}
+					}).catch((res) => {})
+					this.$nextTick(() => {
+						setTimeout(res => {
+							that.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
+								"POST", {
+									categoryId: that.goodsDetail.categoryId
+								}, false, true).then((res1) => {
+								if (res1.code == 200) {
+									that.goodsList = []
+									if (typeof(res1.result) == 'string') {
+										let newObj = JSON.parse(res1.result)
+										let newArr = []
+										let dataArr = []
+										for (let val in newObj) {
+											let valueObj = [];
+											for (var i = 0; i < newObj[val].length; i++) {
+												valueObj.push({
+													value: newObj[val][i],
+													isChecked: false
+												})
+												that.dataObj.set(newObj[val][i], val)
+											}
+											newArr.push({
+												name: val,
+												value: valueObj
+											})
+										}
+										that.goodsDetail.attributeList = newArr;
+										for (var i = 0; i < that.goodsDetail.attributeList.length; i++) {
+											// let oldCheck = false
+											// let oldValue = []
+											// for (var m = 0; m < that.goodsDetail.attributeList[i].value
+											// 	.length; m++) {
+											// 	if (that.goodsDetail.attributeList[i].value[m]
+											// 		.isChecked == true) {
+											// 		oldCheck = true
+											// 		oldValue.push(that.goodsDetail.attributeList[i]
+											// 			.value[m].value)
+											// 	}
+											// }
+											let specs1 = {
+												specs: []
+											}
+											that.goodsList.push(specs1)
+											// oldCheck = false
+											// oldValue = []
+										}
+									} else {
+										that.tui.toast('失败了')
+									}
+					
+								} else {
+									that.tui.toast(res1.message)
+								}
+							}).catch((res) => {})
+						}, 300)
+					})
 				}
-				this.$nextTick(() => {
-					setTimeout(res => {
-						that.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
-							"POST", {
-								categoryId: that.goodsDetail.categoryId
-							}, false, true).then((res1) => {
-							if (res1.code == 200) {
-								that.goodsList = []
-								if (typeof(res1.result) == 'string') {
-									let newObj = JSON.parse(res1.result)
-									let newArr = []
-									let dataArr = []
-									for (let val in newObj) {
-										let valueObj = [];
-										for (var i = 0; i < newObj[val].length; i++) {
-											valueObj.push({
-												value: newObj[val][i],
-												isChecked: false
-											})
-											that.dataObj.set(newObj[val][i], val)
-										}
-										newArr.push({
-											name: val,
-											value: valueObj
-										})
-									}
-									that.goodsDetail.attributeList = newArr;
-									for (var i = 0; i < that.goodsDetail.attributeList
-										.length; i++) {
-										let oldCheck = false
-										let oldValue = []
-										for (var m = 0; m < that.goodsDetail.attributeList[i].value
-											.length; m++) {
-											if (that.goodsDetail.attributeList[i].value[m]
-												.isChecked == true) {
-												oldCheck = true
-												oldValue.push(that.goodsDetail.attributeList[i]
-													.value[m].value)
-											}
-										}
-										let specs1 = {
-											specs: []
-										}
-										that.goodsList.push(specs1)
-										oldCheck = false
-										oldValue = []
-									}
-								} else {
-									that.tui.toast('失败了')
-								}
-
-							} else {
-								that.tui.toast(res1.message)
-							}
-						}).catch((res) => {})
-					}, 300)
-				})
 				this.pageOldTemList = []
 				that.temporaryList = []
-				console.log('1111', that.carList)
 				if (that.carList.size > 0) {
 					let isArgin = false
 					that.carList.forEach(function(value, key) {
@@ -2095,7 +2554,6 @@
 								that.oldTemList = value.stockLogList1
 								isArgin = true
 							} else {
-								console.log()
 								if (value.isNew) {
 									if (value.id == id.id) {
 										that.zNum = value.productCount
@@ -2120,11 +2578,8 @@
 						}
 
 					})
-					// console.log('2222',that.carList)
 					that.zNum = 0
-					// console.log('id',id)
 					// that.$nextTick(() => {
-					// 	console.log("carList",that.carList)
 					// 	that.carList.forEach(function(value, key) {
 
 					// 	})
@@ -2133,28 +2588,59 @@
 				setTimeout(res => {
 					this.getKCList(current == 1 ? id.id : id);
 				}, 300)
-			},
-			addPageGoods(path) {
-				console.log(path)
+			},
+			changeSn(){
+				
+			},
+			//新增商品的时候，判断有没有货号生成规则，没有则弹出货号新增弹出层
+			async isSnList(img){
+				if(this.isGenerateSnRadio == 1){ //不自动生成货号
+					await this.addPageGoods(img,'')
+				}else{
+					if(this.snList.length > 0){
+						await this.getNewSn(img)
+					}else{
+						this.zhuImg = img
+						this.$refs.SNDialog.open('center')
+					}
+				}
+				
+			},
+			//获取新货号
+			getNewSn(img){
+				this.tui.request("/app/productSn/getNewProductSn", "POST", {
+					snPre: this.snName
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.addPageGoods(img,res.result)
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
+			//getNewProductSnMore     count/snPre
+			addPageGoods(path,sn) {
 				let obj = {
 					id: generateUUID(),
 					purchasePrice: 0, //进货价
-					price: 0,
+					price: 0,
+					price1:0,
+					categoryName: this.categoryList.categoryName,
+					categoryId: this.categoryList.categoryId,
 					productCount: 0,
 					productId: "",
 					productName: "",
 					wholesalePrice: 0,
 					lsprice: 0,
 					isNew: true,
-					childrenList:[],
+					productPictures:[],
 					productPicture: path?path:'',
-					productSn: "",
+					productSn: sn?sn:"",
 					stockLogList: new Map(),
 					stockLogList1: []
 				}
 				this.carList.set(obj.id, obj)
 				this.$forceUpdate()
-				console.log('carList', this.carList)
 			},
 			//库存商品详情
 			getKCList(id) {
@@ -2175,7 +2661,6 @@
 				}, 200)
 			},
 			temporaryChange(val, item) {
-				console.log(item)
 				if (item != '' && item != undefined) {
 					for (var m = 0; m < this.pageOldTemList.length; m++) {
 						if (item.attributeList == this.pageOldTemList[m].attributeList) {
@@ -2205,7 +2690,6 @@
 					title: '加载中...'
 				})
 				this.evalue = []
-				console.log(this.temporaryList)
 				let that = this,
 					carList1 = []
 				let data = {
@@ -2217,11 +2701,12 @@
 					wholesalePrice: this.goodsDetail.wholesalePrice,
 					purchasePrice: this.goodsDetail.purchasePrice,
 					categoryName: this.goodsDetail.categoryName,
-					categoryId: this.carList1.categoryId,
+					categoryId: this.goodsDetail.attrId,
 					lsprice: this.goodsDetail.price,
 					productSn: this.goodsDetail.productSn,
 					productPicture: this.goodsDetail.productPicture,
-					supplierName: this.goodsDetail.supplierName,
+					supplierName: this.goodsDetail.supplierName,
+					productPictures:[],
 					saleDetailQueryDTO: this.temporaryList
 				}
 				carList1.push(data)
@@ -2246,12 +2731,13 @@
 							productId: carList1[i].id,
 							wholesalePrice: this.goodsDetail.wholesalePrice,
 							categoryName: this.goodsDetail.categoryName,
-							categoryId: this.goodsDetail.categoryId,
+							categoryId: this.goodsDetail.attrId,
 							lsprice: this.goodsDetail.price,
 							productName: carList1[i].productName,
 							productPicture: carList1[i].productPicture,
 							productSn: carList1[i].productSn,
-							stockLogList: new Map(),
+							stockLogList: new Map(),
+							productPictures:[],
 							stockLogList1: []
 						}
 						for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
@@ -2271,8 +2757,6 @@
 				} else { //当前页有数据
 
 					for (let i = 0; i < carList1.length; i++) {
-						console.log('stockLogList', this.carList)
-						console.log('stockLogList', carList1[i].id)
 						if (this.carList.has(carList1[i].id) == true) {
 							this.carList.get(carList1[i].id).stockLogList = new Map()
 						}
@@ -2318,14 +2802,15 @@
 								price1: 0,
 								productCount: 0,
 								productId: carList1[i].id,
-								categoryId: this.goodsDetail.categoryId,
+								categoryId: this.goodsDetail.attrId,
 								productName: carList1[i].productName,
 								wholesalePrice: this.goodsDetail.wholesalePrice,
 								lsprice: this.goodsDetail.price,
 								productPicture: carList1[i].productPicture,
 								stockLogList: new Map(),
 								productSn: carList1[i].productSn,
-								stockLogList1: [],
+								stockLogList1: [],
+								productPictures:[],
 								name: ''
 							}
 
@@ -2363,23 +2848,54 @@
 				}
 				this.alreadyPay = this.shouldPay
 				this.noPay = this.shouldPay - this.alreadyPay;
+			},
+			sninput(e ,id){
+				console.log(e.detail.value)
+				this.carList.get(id).productSn = e.detail.value
+				this.$forceUpdate()
 			},
 			//货号是否重复
-			getSnIsRepeat(e, id) {
-				this.tui.request('/app/product/getByProductSn', "post", {
-					productSn: e.detail.value
-				}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						if (res1.result != '') {
-							this.tui.toast('当前货号已被商品：“' + res1.result[0].productName + '”占用，请重新输入')
-							this.carList.get(id).productSn = ""
-							this.$forceUpdate()
-						} else {
-							this.carList.get(id).productSn = e.detail.value
-						}
-
-					}
-				})
+			getSnIsRepeat(e, id) {
+				let that = this;
+				if(e.detail.value != ''){
+					this.tui.request('/app/product/getByProductSn', "post", {
+						productSn: e.detail.value
+					}, false, true).then((res1) => {
+						if (res1.code == 200) {
+							if (res1.result != '') {
+								that.tui.toast('当前货号已被商品：“' + res1.result[0].productName + '”占用，请重新输入')
+								setTimeout(res=>{
+									that.carList.get(id).productSn = ''
+								},100)
+								
+								setTimeout(res=>{
+									that.$forceUpdate()
+								},300)
+							} 
+							// else {
+							// 	that.carList.get(id).productSn = e.detail.value
+							// }
+					
+						}
+					})
+					this.carList.forEach(function(value, key) {
+						if(value.id != id){
+							if(value.productSn == e.detail.value){
+								that.tui.toast('该货号被页面其他商品占用,请重新输入！')
+								setTimeout(res=>{
+									that.carList.get(id).productSn = ''
+								},100)
+								setTimeout(res=>{
+									that.$forceUpdate()
+								},300)
+								
+							}
+						}
+					})
+					
+				}
+				console.log('点击',this.carList)
+			
 			},
 			getName(e, id) {
 				this.carList.get(id).productName = e.detail.value
@@ -2512,7 +3028,8 @@
 					supplierName: this.khName.consigneeName
 				}
 				let purchaseDetails = [];
-				let jishuqi = 0
+				let jishuqi = 0
+				console.log('carList',this.carList)
 				this.carList.forEach(function(value, key) {
 					// if(value.productName == ''){
 					// 	uni.showToast({
@@ -2552,22 +3069,34 @@
 					// 	})
 					// 	return
 					// }
-					if ((value.categoryId == '' && value.productId == '') || (value.categoryId == null && value
-							.productId == '')) {
-						that.tui.toast(value.productName + "分类未维护~")
-						return;
-					}
-					value.stockLogList.forEach(function(values, keys) {
-						if (values <= 0) {
-							that.tui.toast("入库数量不能为零~")
-							return;
-						}
-						let obj = {
-							productCount: values.productCount,
-							attributeList: keys
-						}
-						value.stockLogList1.push(obj)
-					})
+					// if ((value.categoryId == '' && value.productId == '') || (value.categoryId == null && value
+					// 		.productId == '')) {
+					// 	that.tui.toast(value.productName + "分类未维护~")
+					// 	return;
+					// }
+					if(value.stockLogList.size == 0){
+						let obj = {
+							productCount: 1,
+							attributeList: '{"颜色":"均色","尺码":"均码"}'
+						}
+						value.productCount = 1
+						value.price1 = value.productCount * value.purchasePrice
+						value.stockLogList1.push(obj)
+					}else{
+						value.stockLogList.forEach(function(values, keys) {
+							console.log('values',values)
+							if (values <= 0) {
+								that.tui.toast("入库数量不能为零~")
+								return;
+							}
+							let obj = {
+								productCount: values.productCount,
+								attributeList: keys
+							}
+							value.stockLogList1.push(obj)
+						})
+					}
+					
 					// delete value.id;
 					purchaseDetails.push(value)
 					jishuqi++
@@ -2645,6 +3174,10 @@
 				this.alreadyPay = this.shouldPay
 				that.noPay = this.shouldPay - this.alreadyPay
 				this.$forceUpdate()
+			},
+			//选择是否需要自动生成货号
+			isChange(index) {
+				this.isGenerateSnRadio = index
 			},
 			//修改已选规格的数量
 			GoodsNumChange(e, index, index1) {
@@ -3110,7 +3643,6 @@
 	}
 
 	.scroll-content {
-		padding-top: 390rpx;
 		height: 90%;
 	}
 
@@ -3269,5 +3801,38 @@
 	.showImg-box{
 		width: 500rpx;
 		height: 500rpx;
+	}
+	@media screen and (min-width: 500px) {
+		.uni-swiper-dot-box {
+			width: 400px;
+			margin: 0 auto;
+			margin-top: 8px;
+		}
+
+		.image {
+			width: 100%;
+		}
+	}
+	.swiper-box {
+		height: 200px;
+	}
+	.swiper-item {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 200px;
+		color: #fff;
+		background-color: #cee1fd;
+	}
+	.lb-btn{
+		width: 100%;
+		height: 100rpx;
+		text-align: center;
+		line-height: 100rpx;
+		background: #088FEB;
+		color: #fff;
+		border-bottom-left-radius: 10px;
+		border-bottom-right-radius: 10px;
 	}
 </style>
\ No newline at end of file
diff --git a/package1/AI/voiceInventory.vue b/package1/AI/voiceInventory.vue
index fa43e1a..a50d6fe 100644
--- a/package1/AI/voiceInventory.vue
+++ b/package1/AI/voiceInventory.vue
@@ -2,135 +2,204 @@
 <template>
 	<view class="page1">
 		<!-- <view class="content"> -->
-			<view class="content-box" style="position: fixed;top:0;z-index: 99;width: 100%;">
-				<view class="content-list" @tap="goPopleList('gysName')">
-					<view class="list-name">供应商</view>
-					<view class="list-val">
-						<input type="text" placeholder="请选择供应商" disabled
-							style="border-bottom: 1px solid #fff;text-align: center;" :value="khName.consigneeName">
-						<uni-icons type="right" size="16" style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
-					</view>
+		<view class="content-box" style="position: fixed;top:0;z-index: 99;width: 100%;margin-bottom: 0;">
+			<view class="content-list" @tap="goPopleList('gysName')">
+				<view class="list-name">供应商</view>
+				<view class="list-val" >
+					<input type="text" placeholder="请选择供应商" disabled
+						style="border-bottom: 1px solid #fff;padding-left: 100rpx;" :value="khName.consigneeName">
+					<uni-icons type="right" size="16" style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
 				</view>
-				<view class="shop-box" style="border-bottom: 1px solid #eee;margin-bottom: 20rpx;">
-					<u-grid :col="2" border>
-						<u-grid-item index="add" @tap.stop="scanCodeAdd">
-							<u-icon name="scan" size="36"></u-icon>
-							<text>扫一扫</text>
-						</u-grid-item>
-						<u-grid-item @tap.stop="goodsAdd">
-							<u-icon name="plus" size="28"></u-icon>
-							<text>添加商品</text>
-						</u-grid-item>
-					</u-grid>
+			</view>
+			<view class="content-list">
+				<view class="list-name">生成货号</view>
+				<view class="list-val" style="width:560rpx;display: flex;">
+					<radio-group style="display: flex;padding-left: 100rpx;">
+						<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in isGenerateSn"
+							:key="item.value" style="margin-right:0">
+							<view>
+								<radio :value="item.value" @tap.stop="isChange(index)"
+									:checked="index === isGenerateSnRadio" />
+							</view>
+							<view style="width: 100rpx;">{{item.name}}</view>
+						</label>
+					</radio-group>
 				</view>
-				<view style="height: 150rpx;width: 100%;display: flex;" @tap="toggle('center',item)">
-					<view style="width: 70rpx;height: 70rpx;margin: 40rpx;display: block;overflow: hidden;">
-						<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/27e2655fe19f454d93970f968d91fbef.png" alt="" style="width: 100%;height: 100%;" />
-					</view>
-					<view style="padding-left: 11rpx;">
-						<view style="height: 80rpx;font-size: 30rpx;font-weight: bold;line-height: 80rpx;">
-							AI语音入库
-						</view>
-						<view>
-							您可以语音录入商品进行识别入库
-						</view>
-					</view>
-				</view>
 			</view>
-			<scroll-view class="scroll-content" scroll-y="true" :scroll-into-view="currentAnchor" scroll-top="0">
-			<view class="content-box">
+			<view class="content-list" v-if="isGenerateSnRadio == 0">
+				<view class="list-name">货号规则</view>
+				<uni-data-select class="uni-data-select" :clear="false" :delItem="true" :localdata="snList" v-model="snName"
+					placeholder="请选择货号规则" @change='changeSn' @addSn='addSn' @delItemSn='delItemSn'></uni-data-select>
+			</view>
+			<view class="shop-box" style="border-bottom: 1px solid #eee;margin-bottom: 20rpx;">
+				<u-grid :col="4" border>
+					<u-grid-item index="add" @tap.stop="scanCodeAdd">
+						<u-icon name="scan" size="25"></u-icon>
+						<text>扫一扫</text>
+					</u-grid-item>
+					<u-grid-item index="add" @tap.stop="pictureAdd('')">
+						<u-icon name="photo" size="25"></u-icon>
+						<text>图片添加</text>
+					</u-grid-item>
+					<u-grid-item @tap.stop="isSnList('')">
+						<u-icon name="plus" size="25"></u-icon>
+						<text>新增商品</text>
+					</u-grid-item>
+					<u-grid-item @tap.stop="goodsAdd">
+						<u-icon name="tags" size="25"></u-icon>
+						<text>选库存</text>
+					</u-grid-item>
+				</u-grid>
+			</view>
+			<view style="height: 150rpx;width: 100%;display: flex;" @tap="toggle('center',item)">
+				<view style="width: 70rpx;height: 70rpx;margin: 40rpx;display: block;overflow: hidden;">
+					<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/27e2655fe19f454d93970f968d91fbef.png"
+						alt="" style="width: 100%;height: 100%;" />
+				</view>
+				<view style="padding-left: 11rpx;">
+					<view style="height: 80rpx;font-size: 30rpx;font-weight: bold;line-height: 80rpx;">
+						AI语音入库
+					</view>
+					<view>
+						您可以语音录入商品进行识别入库
+					</view>
+				</view>
+			</view>
+		</view>
+		<scroll-view class="scroll-content" :style="{'padding-top':isGenerateSnRadio == 0?'530rpx':'450rpx'}" scroll-y="true" :scroll-into-view="currentAnchor" scroll-top="0">
+			<view class="content-box" style="margin-bottom: 0;">
 				<view class="shop-box" style="border-top:5px solid #eee;" v-for="(value,key) in Array.from(carList)"
 					:key="key">
-					<view class="shop-name">
-						<view class="new-logo" v-if="value[1].isNew">新</view>
-						<view class="u-upload" v-if="value[1].isNew" @tap="uploadFilePromise(value)"></view>
-						<view class="" style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;">
-							<img  v-if="value[1].productPicture" class="img-radius" style="width: 140rpx;height: 140rpx;display: block;overflow: hidden;" :src="value[1].productPicture" alt="">
-							<view v-else style="width: 100%;height: 140rpx;border-radius: 10px;border: 1px solid #eee;line-height: 140rpx;text-align: center;">
-								<uni-icons type='plusempty' size='26'></uni-icons>
-							</view>
-							<view style="width: 140rpx;height:34rpx;line-height: 34rpx;display: flex;margin-top: 20rpx;">
-								<view @tap.stop="delShop(value[0])" style="background:#088FEB" class="left-btn">删除</view>
-								<view @tap="toggle('mergePopup',value[0])" class="left-btn" style="margin-left: 20rpx;">合并</view>
+					<view class="shop-name">
+						<view class="new-logo" v-if="value[1].isNew">新</view>
+						<view class="u-upload" v-if="value[1].isNew" @tap="uploadFilePromise(value)"></view>
+						<view class="" style="width: 140rpx;height: 280rpx;margin: 30rpx 0 0 30rpx;">
+							<img v-if="value[1].productPicture !=null && value[1].productPicture !=''" class="img-radius"
+								style="width: 140rpx;height: 140rpx;display: block;overflow: hidden;"
+								:src="value[1].productPicture" alt="">
+							<view v-else
+								style="width: 100%;height: 140rpx;border-radius: 10px;border: 1px solid #eee;line-height: 140rpx;text-align: center;">
+								<uni-icons type='plusempty' size='26'></uni-icons>
+							</view>
+							<view
+								style="width: 140rpx;height:34rpx;line-height: 34rpx;display: flex;margin-top: 20rpx;">
+								<view @tap.stop="delShop(value[0])" style="background:#088FEB" class="left-btn">
+									删除
+								</view>
+								<view @tap="toggle('mergePopup',value[0])" class="left-btn" style="margin-left: 20rpx;">
+									合并
+								</view>
 							</view>
+							<view class="one-goods" @tap="pictureAdd(value[0])">
+								上传多图
+								<view class="jiaobiao" v-if="value[1].productPictures != ''">
+									{{value[1].productPictures.length}}
+								</view>
+							</view>
 						</view>
-						
-						<view class="shop-productName">
-							<view style="position: absolute;top: 20rpx;right: 0;border: 1px solid #eee;width: 76rpx;height: 56rpx;line-height: 56rpx;border-radius: 5px;padding: 0 5rpx;color: #777;font-size: 26rpx;">
-								<uni-icons type="closeempty" size=""></uni-icons>
-								<text>{{value[1].productCount}}</text>
+
+						<view class="shop-productName">
+							<view
+								style="position: absolute;top: 20rpx;right: 0;border: 1px solid #eee;width: 76rpx;height: 56rpx;line-height: 56rpx;border-radius: 5px;padding: 0 5rpx;color: #777;font-size: 26rpx;">
+								<uni-icons type="closeempty" size=""></uni-icons>
+								<text>{{value[1].productCount}}</text>
 							</view>
-							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
-								品名:<input type="text" v-if="value[1].isNew" :value="value[1].productName" @blur="getName($event,value[0])" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
-									<input type="text" v-else disabled :value="value[1].productName" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
-							</view>
-							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
-								货号:<input type="text" v-if="value[1].isNew" @blur="getSnIsRepeat($event,value[0])" :value="value[1].productSn" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
-									<input type="text" v-else disabled :value="value[1].productSn" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
-							</view>
-							<view style="display: flex;height: 55rpx;line-height: 55rpx;" v-if="value[1].isNew">
-								分类: <text style="color: #777;padding-left: 20rpx;">{{value[1].categoryName==null?'':value[1].categoryName}}</text>
-								<uni-icons type="compose" color="#777" size='25'  @tap="toggle('typePopup',value[0])"></uni-icons>
+							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
+								品名:<input type="text" v-if="value[1].isNew" :value="value[1].productName"
+									@blur="getName($event,value[0])"
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
+								<input type="text" v-else disabled :value="value[1].productName"
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
+							</view>
+							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
+								货号:<input type="text" v-if="value[1].isNew" @input="sninput($event,value[0])" @blur="getSnIsRepeat($event,value[0])"
+									v-model="carList.get(value[0]).productSn"
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 274rpx;padding-left: 20rpx;">
+								<input type="text" v-else disabled v-model="value[1].productSn"
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 318rpx;padding-left: 20rpx;">
+								<uni-icons type="refresh" color="#777" size='25'
+									@tap="generateSn(value[0])"></uni-icons>
+							</view>
+							<view style="display: flex;height: 55rpx;line-height: 55rpx;" v-if="value[1].isNew">
+								分类: <text
+									style="color: #777;padding-left: 20rpx;">{{value[1].categoryName==null?'':value[1].categoryName}}</text>
+								<uni-icons type="compose" color="#777" size='25'
+									@tap="toggle('typePopup',value[0])"></uni-icons>
 							</view>
-							<view v-if='userType==0' style="display: flex;height: 55rpx;line-height: 55rpx;">
-								单价:<input type="digit" v-model="value[1].purchasePrice" @blur="clickCollapse($event,value[0])" @focus="obtainPrice($event,'danjia',value[0])" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 300rpx;padding-left: 20rpx;">
-							</view> 
-							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
-								批发价: <input type="digit" @blur="PriceAndWho($event,value[0],'pi')" @focus="obtainPrice($event,'pifa',value[0])" v-model="value[1].wholesalePrice" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;">
-								零售价:<input type="digit" @blur="PriceAndWho($event,value[0])" @focus="obtainPrice($event,'lingshou',value[0])" v-model="value[1].lsprice" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;">
+							<view v-if='userType==0' style="display: flex;height: 55rpx;line-height: 55rpx;">
+								单价:<input type="digit" v-model="value[1].purchasePrice"
+									@blur="clickCollapse($event,value[0])"
+									@focus="obtainPrice($event,'danjia',value[0])"
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 300rpx;padding-left: 20rpx;">
+							</view>
+							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
+								批发价: <input type="digit" @blur="PriceAndWho($event,value[0],'pi')"
+									@focus="obtainPrice($event,'pifa',value[0])" v-model="value[1].wholesalePrice"
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;">
+								零售价:<input type="digit" @blur="PriceAndWho($event,value[0])"
+									@focus="obtainPrice($event,'lingshou',value[0])" v-model="value[1].lsprice"
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;">
 							</view>
-							<view @tap="AiAddSpec(value[1])" style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;top: 130rpx;right: 0px;line-height: 54rpx;">
-								添加规格
+							<view @tap="toggle('oneGoods',value[0])"
+								style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;top: 170rpx;right: 0px;line-height: 54rpx;">
+								语音录入 
+							</view>
+							<view @tap="AiAddSpec(value[1])"
+								style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;top: 240rpx;right: 0px;line-height: 54rpx;">
+								添加规格
 							</view>
 						</view>
 					</view>
 					<view class="shop-type">
-						<view class="" v-for="(values,keys) in Array.from(value[1].stockLogList)"
-							:key="keys" :id="values[1].uuid">
-							<view class="shop-collapse">
-								<view @tap.stop="delShopSpec(value[0],values[0])">
-									<uni-icons color="red" type="minus" size="26"></uni-icons>
-								</view>
-								<text @tap="checkSpec('颜色',value[0],values[0],numData(values[0])[0])">
-									{{numData(values[0])[0]}}
-								</text>
-								<text @tap="checkSpec('尺码',value[0],values[0],numData(values[0])[1])">
-									{{numData(values[0])[1]}}
-								</text>
-								<!-- <text style="color: red;">单价：￥{{item.price}}</text> -->
-								<view style="text-align: left;padding-left: 5px;width:40%;display: flex;">
-									<uni-number-box max="100000" style="margin-top:16rpx;" v-model="values[1].productCount"
-										@change="GoodsNumChange($event,value,values[0])" />
-								</view>
+						<view class="" v-for="(values,keys) in Array.from(value[1].stockLogList)" :key="keys"
+							:id="values[1].uuid">
+							<view class="shop-collapse">
+								<view @tap.stop="delShopSpec(value[0],values[0])">
+									<uni-icons color="red" type="minus" size="26"></uni-icons>
+								</view>
+								<text @tap="checkSpec('颜色',value[0],values[0],numData(values[0])[0])">
+									{{numData(values[0])[0]}}
+								</text>
+								<text @tap="checkSpec('尺码',value[0],values[0],numData(values[0])[1])">
+									{{numData(values[0])[1]}}
+								</text>
+								<!-- <text style="color: red;">单价：￥{{item.price}}</text> -->
+								<view style="text-align: left;padding-left: 5px;width:40%;display: flex;">
+									<uni-number-box max="100000" style="margin-top:16rpx;"
+										v-model="values[1].productCount"
+										@change="GoodsNumChange($event,value,values[0])" />
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 			<view class="content-box" style="margin-bottom:110rpx;">
-				<view class="price-box-list">
+				<view class="price-box-list" style="margin-top:10rpx;">
 					<view class="content-list" v-if="userType == 0">
 						<view class="list-name">应付金额</view>
 						<view class="list-val">
-							<input type="text" placeholder="请输入应付金额" v-model="shouldPay" @focus="obtainPrice($event,'shouldPay')" @blur="changessPrice($event)">
+							<input type="digit" placeholder="请输入应付金额" v-model="shouldPay"
+								@focus="obtainPrice($event,'shouldPay')" @blur="changessPrice($event)">
 						</view>
 					</view>
 					<view class="content-list" v-if="userType == 0">
 						<view class="list-name">已付金额</view>
 						<view class="list-val">
-							<input type="text" placeholder="请输入已付金额" v-model="alreadyPay" @focus="obtainPrice($event,'alreadyPay')" @blur="changePay($event)">
+							<input type="digit" placeholder="请输入已付金额" v-model="alreadyPay"
+								@focus="obtainPrice($event,'alreadyPay')" @blur="changePay($event)">
 						</view>
 					</view>
 					<view class="content-list" v-if="userType == 0">
 						<view class="list-name">欠款</view>
 						<view class="list-val">
-							<input type="text" v-model="noPay" disabled>
+							<input type="digit" v-model="noPay" disabled>
 						</view>
 					</view>
 					<view class="content-list">
 						<view class="list-name">其他费用</view>
 						<view class="list-val">
-							<input type="text" v-model="otherPay">
+							<input type="digit" v-model="otherPay">
 						</view>
 					</view>
 					<view class="content-list">
@@ -140,8 +209,8 @@
 						</view>
 					</view>
 				</view>
-			</view>
-			</scroll-view>
+			</view>
+		</scroll-view>
 		<!-- </view> -->
 		<view class="bottom-box">
 			<view class="bottom-left">
@@ -169,16 +238,19 @@
 						</view>
 					</view>
 					<view class="shop-popup-container" style="position: relative;">
-						<view @tap="saveCheck" style="position: absolute;top: 10rpx;right: 20rpx;color: #088FEB;text-decoration: underline;z-index: 99;">
-							保存已选
+						<view @tap="saveCheck"
+							style="position: absolute;top: 10rpx;right: 20rpx;color: #088FEB;text-decoration: underline;z-index: 99;">
+							保存已选
 						</view>
 						<ul style="border-top:20rpx;">
-							<li v-for="(items,index) in goodsDetail.attributeList" :key="index" style="position: relative;">
+							<li v-for="(items,index) in goodsDetail.attributeList" :key="index"
+								style="position: relative;">
 								<view class="shop-title-fur">
 									<view class="shop-title-name">{{items.name}}</view>
-								</view>
-								<view @tap="getScanCodeCategroyId(items.name)" style="position: absolute;top: 18rpx;left: 100rpx;color: #088FEB;text-decoration: underline;font-size: 24rpx;">
-									新增{{items.name}}
+								</view>
+								<view @tap="getScanCodeCategroyId(items.name)"
+									style="position: absolute;top: 18rpx;left: 100rpx;color: #088FEB;text-decoration: underline;font-size: 24rpx;">
+									新增{{items.name}}
 								</view>
 								<view class="shop-attrs">
 									<uni-data-checkbox v-model="value" :localdata="range"></uni-data-checkbox>
@@ -188,22 +260,28 @@
 								</view>
 							</li>
 						</ul>
-						<view style="padding-bottom: 100rpx;">
-							<view class="shop-checkList" v-if="temporaryList != ''">
-								<view class="shop-checkList-box" style="width: 69.5%;">
-									<text style="width: 300rpx;display: inline-block;font-size: 30rpx;font-weight: bold;padding-left: 40rpx;">规格</text> 
-									<text style="font-size: 30rpx;color: #000;font-weight: bold;width: 110rpx;display: inline-block;text-align: right;">库存</text>
-								</view>
-								<view class="zuni-numbox">
-									<view @tap="minusNum" class="zuni-numbox__minus zuni-numbox-btns" style="background: #f5f5f5;">
-										<text class="zuni-numbox--text">-</text>
-									</view>
-									<input v-model="allChangeNum" @blur="allChange" @focus="obtainPrice($event,'zongjishu')" class="zuni-numbox__value" type="number" />
-									<view @tap="plusNum" class="zuni-numbox__plus zuni-numbox-btns" style="background: #f5f5f5;">
-										<text class="zuni-numbox--text">+</text>
-									</view>
-								</view>
-								<!-- <uni-number-box max='1000000' @minus='minusNum' @plus="plusNum" v-model="allChangeNum" @blur="allChange"  /> -->
+						<view style="padding-bottom: 100rpx;">
+							<view class="shop-checkList" v-if="temporaryList != ''">
+								<view class="shop-checkList-box" style="width: 69.5%;">
+									<text
+										style="width: 300rpx;display: inline-block;font-size: 30rpx;font-weight: bold;padding-left: 40rpx;">规格</text>
+									<text
+										style="font-size: 30rpx;color: #000;font-weight: bold;width: 110rpx;display: inline-block;text-align: right;">库存</text>
+								</view>
+								<view class="zuni-numbox">
+									<view @tap="minusNum" class="zuni-numbox__minus zuni-numbox-btns"
+										style="background: #f5f5f5;">
+										<text class="zuni-numbox--text">-</text>
+									</view>
+									<input v-model="allChangeNum" @blur="allChange"
+										@focus="obtainPrice($event,'zongjishu')" class="zuni-numbox__value"
+										type="number" />
+									<view @tap="plusNum" class="zuni-numbox__plus zuni-numbox-btns"
+										style="background: #f5f5f5;">
+										<text class="zuni-numbox--text">+</text>
+									</view>
+								</view>
+								<!-- <uni-number-box max='1000000' @minus='minusNum' @plus="plusNum" v-model="allChangeNum" @blur="allChange"  /> -->
 							</view>
 							<view class="shop-checkList" v-for="(item,index) in temporaryList" :key="index">
 								<view @tap.stop="delCarData(index)" style="margin-right: 20rpx">
@@ -213,7 +291,8 @@
 									<text style="width: 300rpx;display: inline-block;">{{item.name}}</text> <text
 										style="color:#777;font-size: 12px;">{{item.productNum==null?'无库存':item.productNum}}</text>
 								</view>
-								<uni-number-box max='1000000' v-model="item.productCount" @change="temporaryChange($event,item)" />
+								<uni-number-box max='1000000' v-model="item.productCount"
+									@change="temporaryChange($event,item)" />
 							</view>
 						</view>
 					</view>
@@ -228,153 +307,206 @@
 					</view>
 				</view>
 			</uni-popup>
-		</view>
-		
-		<!-- 弹出分类选择 -->
-		<uni-popup ref="typePopup" background-color="#fff" :is-mask-click="true">
-			<view class="type-popup" style="margin-bottom: 0;">
-				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
-					选择分类
-				</view>
-				<view style="position: absolute;bottom: 0;height: 90rpx;width: 100%;background: #fff;z-index: 99;">
-					<view @tap="toggle('addGateDialog')" style="width: 95%;height: 70rpx;line-height: 70rpx;text-align: center;background: linear-gradient(90deg, #60F3FF, #088FEB);border-radius: 5px;color: #fff;margin: 10rpx auto 0;">
-						新增分类
-					</view>
-				</view>
-				<view style="overflow: scroll;height: 630rpx;padding-bottom: 90rpx;">
-					<view v-for="(item,index) in indexList" :key="index" @tap="clickGategroy(item)" style="height: 80rpx;font-size: 32rpx;width: 90%;line-height:80rpx;margin: 0 auto;border-top: 1px solid #eee;">
-						<view style="width: 89%;padding-left: 20rpx;float:left">{{item.categoryName}}</view>
-						<uni-icons type="right" size="18"></uni-icons>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 新增分类输入框 -->
-		<uni-popup ref="addGateDialog" type="dialog">
-			<view class="type-popup" style="width:100%;margin-bottom: 0;border-radius: 0;height: 400rpx;border-radius: 10px;">
-				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
-					修改规格值
-				</view>
-				<view style="width: 90%;margin: 80rpx auto;">
-					<uni-easyinput type="text" v-model="categoryText" @blur="handleBlur" placeholder="请输入规格值" />
-				</view>
-				<view style="width: 100%;height: 90rpx;line-height: 90rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;display: flex;position: absolute;bottom: 0;">
-					<view style="width:50%;" @tap="$refs.addGateDialog.close()">取消</view>
-					<view style="width:50%;background: linear-gradient(90deg, #FF9797, #FFC1E0);" @tap="addGategory">确认</view>
-				</view>
-			</view>
+		</view>
+
+		<!-- 弹出分类选择 -->
+		<uni-popup ref="typePopup" background-color="#fff" :is-mask-click="true">
+			<view class="type-popup" style="margin-bottom: 0;">
+				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
+					选择分类
+				</view>
+				<view style="position: absolute;bottom: 0;height: 90rpx;width: 100%;background: #fff;z-index: 99;">
+					<view @tap="toggle('addGateDialog')"
+						style="width: 95%;height: 70rpx;line-height: 70rpx;text-align: center;background: linear-gradient(90deg, #60F3FF, #088FEB);border-radius: 5px;color: #fff;margin: 10rpx auto 0;">
+						新增分类
+					</view>
+				</view>
+				<view style="overflow: scroll;height: 630rpx;padding-bottom: 90rpx;">
+					<view v-for="(item,index) in indexList" :key="index" @tap="clickGategroy(item)"
+						style="height: 80rpx;font-size: 32rpx;width: 90%;line-height:80rpx;margin: 0 auto;border-top: 1px solid #eee;">
+						<view style="width: 89%;padding-left: 20rpx;float:left">{{item.categoryName}}</view>
+						<uni-icons type="right" size="18"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 新增分类输入框 -->
+		<uni-popup ref="addGateDialog" type="dialog">
+			<view class="type-popup"
+				style="width:100%;margin-bottom: 0;border-radius: 0;height: 400rpx;border-radius: 10px;">
+				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
+					修改规格值
+				</view>
+				<view style="width: 90%;margin: 80rpx auto;">
+					<uni-easyinput type="text" v-model="categoryText" @blur="handleBlur" placeholder="请输入规格值" />
+				</view>
+				<view
+					style="width: 100%;height: 90rpx;line-height: 90rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;display: flex;position: absolute;bottom: 0;">
+					<view style="width:50%;" @tap="$refs.addGateDialog.close()">取消</view>
+					<view style="width:50%;background: linear-gradient(90deg, #FF9797, #FFC1E0);" @tap="addGategory">确认
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 弹出合并商品 -->
+		<uni-popup ref="mergePopup" background-color="#fff" :is-mask-click="true">
+			<view class="type-popup" style="max-height: 1000rpx;overflow: scroll;margin-bottom: 0;border-radius: 0;">
+				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
+					请选择要合并到的商品
+				</view>
+				<view class="shop-box" v-for="(value,key) in Array.from(carList)" :key="key"
+					v-if="value[1].id != mergeId" @tap="clickMerge(value[0])">
+					<view class="shop-name" style="height: 150rpx;">
+						<view class="" style="width: 100rpx;height: 100rpx;margin: 20rpx 0 0 20rpx;font-size: 22rpx;">
+							<img v-if="value[1].productPicture" class="img-radius"
+								style="width: 100rpx;height: 100rpx;display: block;overflow: hidden;"
+								:src="value[1].productPicture" alt="">
+							<view v-else class="img-radius"
+								style="width: 100rpx;height: 100rpx;display: block;overflow: hidden;text-align: center;line-height: 100rpx;border: 1px solid #eee;">
+								暂无图片</view>
+						</view>
+						<view class="shop-productName" style="height: 130rpx;">
+							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
+								{{value[1].productName}}
+							</view>
+							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
+								货号:{{value[1].productSn}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view style="line-height: 80rpx;font-size: 22rpx;color: #777;text-align: center;">
+					没有要合并的商品？那就去库存里看看吧~ ↓↓
+				</view>
+				<view @tap="goChooseGoods"
+					style="width: 100%;height: 70rpx;line-height: 70rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;">
+					<view>同库存商品合并</view>
+				</view>
+			</view>
 		</uni-popup>
-		<!-- 弹出合并商品 -->
-		<uni-popup ref="mergePopup" background-color="#fff" :is-mask-click="true">
+		<!-- 弹出生成货号 -->
+		<uni-popup ref="SNDialog" background-color="#fff" :is-mask-click="true">
 			<view class="type-popup" style="max-height: 1000rpx;overflow: scroll;margin-bottom: 0;border-radius: 0;">
 				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
-					请选择要合并到的商品
+					请输入货号生成规则
 				</view>
-				<view class="shop-box" v-for="(value,key) in Array.from(carList)" :key="key" v-if="value[1].id != mergeId" @tap="clickMerge(value[0])">
-					<view class="shop-name" style="height: 150rpx;">
-						<view class="" style="width: 100rpx;height: 100rpx;margin: 20rpx 0 0 20rpx;font-size: 22rpx;">
-							<img v-if="value[1].productPicture" class="img-radius" style="width: 100rpx;height: 100rpx;display: block;overflow: hidden;" :src="value[1].productPicture" alt="">
-							<view v-else class="img-radius" style="width: 100rpx;height: 100rpx;display: block;overflow: hidden;text-align: center;line-height: 100rpx;border: 1px solid #eee;">暂无图片</view>
-						</view>
-						<view class="shop-productName" style="height: 130rpx;">
-							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
-								{{value[1].productName}}
-							</view>
-							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
-								货号:{{value[1].productSn}}
-							</view>
-						</view>
+				<view class="content-list">
+					<view class="list-name" style="width: 156rpx;">前缀</view>
+					<view class="list-val" style="width: 245rpx;">
+						<input type="text" placeholder="请输入前缀规则" v-model="prefixRule" style="width:245rpx;">
 					</view>
 				</view>
-				<view style="line-height: 80rpx;font-size: 22rpx;color: #777;text-align: center;">
-					没有要合并的商品？那就去库存里看看吧~ ↓↓
-				</view>
-				<view @tap="goChooseGoods" style="width: 100%;height: 70rpx;line-height: 70rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;">
-					<view>同库存商品合并</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 弹出规格选择 -->
-		<uni-popup ref="getaPopup" background-color="#fff" :is-mask-click="true">
-			<view class="type-popup" style="margin-bottom: 0;border-radius: 0;">
-				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
-					修改当前规格
-				</view>
-				<view style="text-align:center;color:red;font-size: 22rpx;">*如果当前规格中没有您想要的，可以手动输入</view>
-				<view class="card-list">
-					<ul>
-						<li v-for="items in attrList" :key="items.id">
-							<view class="title-fur">
-								<view class="name">{{items.attributeName}}</view>
-								<view class="rightBox">
-									<u-icon size="20" name="plus" color="#5fd9ee"
-										@tap="inputDialogToggle(items.id)"></u-icon>
-								</view>
-							</view>
-							<view class="content-fur">
-								<view class="content-low" v-for="item in attributeValue" :key="item.id"
-									@tap="changeSpec(item.value)" v-if="temporary[3] != item.value">{{item.value}}</view>
-							</view>
-						</li>
-					</ul>
-				</view>
-				<view style="color: #333;width: 90%;margin: 0 auto 20rpx;">
-					<uni-easyinput v-model="specifications" placeholder="请输入规格值"></uni-easyinput>
-				</view>
-				
-				<view @tap="changeSpec(specifications)" style="width: 100%;height: 70rpx;line-height: 70rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;">
-					<view>确认修改</view>
-				</view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="inputDialog" background-color="#fff" :is-mask-click="true">
-			<view class="type-popup" style="width:100%;margin-bottom: 0;border-radius: 0;height: 450rpx;border-radius: 10px;">
-				<view style="height: 120rpx;font-size: 36rpx;font-weight: bold;line-height: 120rpx;text-align: center;">
-					修改规格值
-				</view>
-				<view style="height: 80rpx;font-size: 28rpx;line-height: 80rpx;text-align: center;">
-					请在下方输入框中输入新规格
-				</view>
-				<view style="width: 90%;margin: 20px auto 0;">
-					<uni-easyinput type="text" v-model="categoryText" @blur="handleBlur" placeholder="请输入规格值" />
-				</view>
-				<view style="width: 100%;height: 90rpx;line-height: 90rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;display: flex;position: absolute;bottom: 0;">
-					<view style="width:50%;" @tap="dialogClose">取消</view>
-					<view style="width:50%;background: linear-gradient(90deg, #FF9797, #FFC1E0);" @tap="dialogInputConfirm">确认</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 语音识别弹出层 -->
-		<uni-popup ref="popup" background-color="#fff">
-			<view class="voice-popup-content">
-				<view class="voice-popup-title">
-					<text>语音录入</text>
-					<uni-icons @tap='$refs.popup.close()' type="closeempty" color='red' size="16"
-						style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
-				</view>
-				<view style="text-align: center;width: 100%;line-height: 40rpx;font-size: 11px;color: #777;">
-					示例：货号0237,名称:裙子,白色M码数量10件,蓝色M码数量10件，单价88
-				</view>
-				<view class="voice-popup-container">
-					<textarea name="" id="" style="width:100%;height:240rpx;border:1px solid #eee;margin:0;" v-model="voiceText"
-						placeholder="等待语音识别中..."></textarea>
-					<view>
-						<text style="color:red;font-size:22rpx;">*长按“语音”按钮录入，系统将自动识别</text>
-					</view>
-					<view class="voice-popup-bottom">
-						<view class="voice-popup-btn" @tap="clearText">清空</view>
-						<view class="voice-popup-btn" @tap="setDetail">确认</view>
+				<view class="content-list">
+					<view class="list-name" style="width: 156rpx;">生成位数</view>
+					<view class="list-val" style="width: 245rpx;">
+						<input type="number" placeholder="请输入位数规则" v-model="numRule" style="width: 245rpx;">
 					</view>
 				</view>
-				<view class="voice-btn" @touchstart="kaishi" @touchend="jieshu">
-					<img src="/static/images/maikefeng.png" style="width: 80%;height: 80%;margin: 10%;" alt="">
+				<view @tap="startGetSn"
+					style="width: 100%;height: 70rpx;line-height: 70rpx;margin-top:20rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;">
+					<view>开始生成</view>
 				</view>
 			</view>
+		</uni-popup>
+		<!-- 弹出规格选择 -->
+		<uni-popup ref="getaPopup" background-color="#fff" :is-mask-click="true">
+			<view class="type-popup" style="margin-bottom: 0;border-radius: 0;">
+				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
+					修改当前规格
+				</view>
+				<view style="text-align:center;color:red;font-size: 22rpx;">*如果当前规格中没有您想要的，可以手动输入</view>
+				<view class="card-list">
+					<ul>
+						<li v-for="items in attrList" :key="items.id">
+							<view class="title-fur">
+								<view class="name">{{items.attributeName}}</view>
+								<view class="rightBox">
+									<u-icon size="20" name="plus" color="#5fd9ee"
+										@tap="inputDialogToggle(items.id)"></u-icon>
+								</view>
+							</view>
+							<view class="content-fur">
+								<view class="content-low" v-for="item in attributeValue" :key="item.id"
+									@tap="changeSpec(item.value)" v-if="temporary[3] != item.value">{{item.value}}
+								</view>
+							</view>
+						</li>
+					</ul>
+				</view>
+				<view style="color: #333;width: 90%;margin: 0 auto 20rpx;">
+					<uni-easyinput v-model="specifications" placeholder="请输入规格值"></uni-easyinput>
+				</view>
+
+				<view @tap="changeSpec(specifications)"
+					style="width: 100%;height: 70rpx;line-height: 70rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;">
+					<view>确认修改</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="inputDialog" background-color="#fff" :is-mask-click="true">
+			<view class="type-popup"
+				style="width:100%;margin-bottom: 0;border-radius: 0;height: 450rpx;border-radius: 10px;">
+				<view style="height: 120rpx;font-size: 36rpx;font-weight: bold;line-height: 120rpx;text-align: center;">
+					新增规格值
+				</view>
+				<view style="height: 80rpx;font-size: 28rpx;line-height: 80rpx;text-align: center;">
+					请在下方输入框中输入新规格
+				</view>
+				<view style="width: 90%;margin: 20px auto 0;">
+					<uni-easyinput type="text" v-model="categoryText" @blur="handleBlur" placeholder="请输入规格值" />
+				</view>
+				<view
+					style="width: 100%;height: 90rpx;line-height: 90rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;display: flex;position: absolute;bottom: 0;">
+					<view style="width:50%;" @tap="dialogClose">取消</view>
+					<view style="width:50%;background: linear-gradient(90deg, #FF9797, #FFC1E0);"
+						@tap="dialogInputConfirm">确认</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 语音识别弹出层 -->
+		<uni-popup ref="popup" background-color="#fff">
+			<view class="voice-popup-content">
+				<view class="voice-popup-title">
+					<text>语音录入</text>
+					<uni-icons @tap='$refs.popup.close()' type="closeempty" color='red' size="16"
+						style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
+				</view>
+				<view style="text-align: center;width: 100%;line-height: 40rpx;font-size: 11px;color: #777;">
+					示例：货号0237,名称:裙子,白色M码数量10件,蓝色M码数量10件，单价88
+				</view>
+				<view class="voice-popup-container">
+					<textarea name="" id="" style="width:100%;height:240rpx;border:1px solid #eee;margin:0;"
+						v-model="voiceText" placeholder="等待语音识别中..."></textarea>
+					<view>
+						<text style="color:red;font-size:22rpx;">*长按“语音”按钮录入，系统将自动识别</text>
+					</view>
+					<view class="voice-popup-bottom">
+						<view class="voice-popup-btn" @tap="clearText">清空</view>
+						<view class="voice-popup-btn" @tap="setDetail">确认</view>
+					</view>
+				</view>
+				<view class="voice-btn" @touchstart="kaishi" @touchend="jieshu">
+					<img src="/static/images/maikefeng.png" style="width: 80%;height: 80%;margin: 10%;" alt="">
+				</view>
+			</view>
 		</uni-popup>
-		<view class="voice-model" v-if="recordState == true">
-			<img src="/static/images/maikefeng.png" alt="">
-			<view class="voice-text">语音识别中...</view>
-		</view>
+		<!-- 弹出多图轮播 -->
+		<uni-popup ref="showImgDiaLog" background-color="#fff">
+			<view class="showImg-box"> 
+				<swiper indicator-dots class="swiper-box" @change="lunbochange" circular autoplay :current="swiperDotIndex">
+					<swiper-item v-for="(item, index) in productPictures" :key="index">
+						<view class="swiper-item">
+							<img :src="item.productPicture" alt="" style="width: 100%;height: 100%;" />
+						</view>
+					</swiper-item>
+				</swiper>
+				<view @tap="pictureAdd(childrenId,'huan')" class="lb-btn">更换图片</view>
+			</view>
+		</uni-popup>
+		<view class="voice-model" v-if="recordState == true">
+			<img src="/static/images/maikefeng.png" alt="">
+			<view class="voice-text">语音识别中...</view>
+		</view>
 		<view class="mask-model" v-if="isVoice">貌似没有检测到您上次的语音录入信息，正在反复识别中</view>
 	</view>
 </template>
@@ -382,18 +514,20 @@
 <script>
 	import {
 		mapState
-	} from 'vuex';
-	import { generateUUID } from '@/utils/global.js'
-	import base from '@/utils/ossUploadFile/base64.js';
-	var plugin = requirePlugin("WechatSI")
+	} from 'vuex';
+	import {
+		generateUUID
+	} from '@/utils/global.js'
+	import base from '@/utils/ossUploadFile/base64.js';
+	var plugin = requirePlugin("WechatSI")
 	let manager = plugin.getRecordRecognitionManager()
 	export default {
 		computed: mapState(['shopName']),
 		data() {
-			return {
-				isVoice:false,
-				allChangeNum:0,
-				voiceText:'',
+			return {
+				isVoice: false,
+				allChangeNum: 0,
+				voiceText: '',
 				khName: [],
 				carList: new Map(),
 				remark: '',
@@ -401,38 +535,184 @@
 				noPay: 0,
 				alreadyPay: '',
 				realAmount: 0,
-				shouldPay: '',
-				userType:'',
+				shouldPay: '',
+				userType: '',
 				totalAmount: 0,
 				index: '',
-				index1: '',
-				recordState:false,
+				index1: '',
+				recordState: false,
 				goodsDetail: [],
-				columns: [],
-				keyList: [],
 				temporaryList: [],
 				zNum: 0,
-				carList1: [],
-				productNum: null,
-				productId: '',
+				snList:[],
+				carList1: [],
+				zhuImg:'',
+				productNum: null,
+				prefixRule:'',
+				numRule:'',
+				productId: '',
+				oneGoodsId:'',
+				goodsId:'',
 				pageOldTemList: [],
-				oldTemList: [],
+				oldTemList: [],
 				attrList: [],
-				goodsList: [],
-				mergeId:'',
+				goodsList: [],
+				mergeId: '',
 				newTemList: [],
 				pecsList: [],
-				categoryText:'',
-				dataObj: new Map(),
-				isPlusAndMinus:false,
-				indexList:[],
-				evalue:[],
-				attributeValue:[],
-				specifications:'',
-				currentAnchor: '',
-				temporaryNum:0,
-				isBottom:false,
-				temporary:[]  //修改单个规格值临时存放要修改的对象
+				childrenId:'',
+				isGenerateSnRadio:1,
+				productPictures:[],
+				categoryText: '',
+				dataObj: new Map(),
+				isPlusAndMinus: false,
+				indexList: [],
+				evalue: [],
+				attributeValue: [],
+				specifications: '',
+				current:0,
+				swiperDotIndex:0,
+				currentAnchor: '',
+				temporaryNum: 0,
+				isBottom: false,
+				isGenerateSn: [{
+						value: '0',
+						name: '生成'
+					},
+					{
+						value: '1',
+						name: '不生成'
+					}
+				],
+				snName:'ty',
+				defaultList:[{
+					name:'颜色',
+					value:[{
+						value:'均色',
+						isChecked:false,
+					},{
+						value:'白色',
+						isChecked:false,
+					},{
+						value:'黑色',
+						isChecked:false,
+					},{
+						value:'浅蓝',
+						isChecked:false,
+					},{
+						value:'蓝色',
+						isChecked:false,
+					},{
+						value:'灰色',
+						isChecked:false,
+					},{
+						value:'咖色',
+						isChecked:false,
+					},{
+						value:'紫色',
+						isChecked:false,
+					},{
+						value:'红色',
+						isChecked:false,
+					},{
+						value:'米色',
+						isChecked:false,
+					}]
+				},{
+					name:'尺码',
+					value:[{
+						value:'均码',
+						isChecked:false,
+					},{
+						value:'XS码',
+						isChecked:false
+					},{
+						value:'S码',
+						isChecked:false,
+					},{
+						value:'M码',
+						isChecked:false,
+					},{
+						value:'L码',
+						isChecked:false,
+					},{
+						value:'XL码',
+						isChecked:false,
+					},{
+						value:'2XL码',
+						isChecked:false,
+					},{
+						value:'3XL码',
+						isChecked:false,
+					},{
+						value:'4XL码',
+						isChecked:false,
+					},{
+						value:'25码',
+						isChecked:false
+					},{
+						value:'26码',
+						isChecked:false
+					},{
+						value:'27码',
+						isChecked:false
+					},{
+						value:'28码',
+						isChecked:false
+					},{
+						value:'29码',
+						isChecked:false
+					},{
+						value:'30码',
+						isChecked:false
+					},{
+						value:'31码',
+						isChecked:false
+					},{
+						value:'32码',
+						isChecked:false
+					},{
+						value:'33码',
+						isChecked:false
+					},{
+						value:'34码',
+						isChecked:false
+					},{
+						value:'35码',
+						isChecked:false
+					},{
+						value:'36码',
+						isChecked:false
+					},{
+						value:'37码',
+						isChecked:false
+					},{
+						value:'38码',
+						isChecked:false
+					},{
+						value:'39码',
+						isChecked:false
+					},{
+						value:'40码',
+						isChecked:false
+					},{
+						value:'41码',
+						isChecked:false
+					},{
+						value:'42码',
+						isChecked:false
+					},{
+						value:'43码',
+						isChecked:false
+					},{
+						value:'44码',
+						isChecked:false
+					},{
+						value:'45码',
+						isChecked:false
+					}]
+				}],
+				temporary: [] //修改单个规格值临时存放要修改的对象
 			}
 		},
 		filters: {
@@ -447,118 +727,127 @@
 				return name;
 			}
 		},
-		onShow() {
-			uni.showLoading({
-				title: '加载中...'
+		onShow() {
+			uni.showLoading({
+				title: '加载中...'
 			})
-			let that = this,
-				isTrue = false
-			
-			if(this.merge ==1){
-				this.$refs.mergePopup.close();
-				if(this.carList.has(this.carList1.id) == true){ //跟当前页面有相同的商品
-					that.carList.get(that.mergeId).stockLogList.forEach(function(value1, key1) {
-						that.carList.get(that.carList1.id).stockLogList.forEach(function(value, key) {
-							if(key1 == key){
-								if(that.mergeId != that.carList1.id){
-									that.carList.get(that.carList1.id).stockLogList.get(key).productCount =
-									that.carList.get(that.carList1.id).stockLogList.get(key).productCount + value1.productCount
-									isTrue = true
-									that.carList.get(that.carList1.id).productCount += value1.productCount
-								}
-							}
-						})
-						if(isTrue == false){
-							that.carList.get(that.carList1.id).stockLogList.set(key1,value1)
-							that.carList.get(that.carList1.id).productCount += value1.productCount
-						}
-					})
-					
-				}else{
-					this.carList.get(this.mergeId).productId = this.carList1.id
-					this.carList.get(this.mergeId).id = this.carList1.id
-					this.carList.get(this.mergeId).productName = this.carList1.productName
-					this.carList.get(this.mergeId).productPicture = this.carList1.productPicture
-					this.carList.get(this.mergeId).productSn = this.carList1.productSn
-					this.carList.get(this.mergeId).categoryId = this.carList1.categoryId
-					this.carList.get(this.mergeId).wholesalePrice=this.carList1.wholesalePrice || 0
-					this.carList.get(this.mergeId).lsprice= this.carList1.price || 0
-					this.carList.get(this.mergeId).isNew=false
-					this.carList.set(this.carList1.id,this.carList.get(this.mergeId))
-					
-				}
-				if(this.mergeId != this.carList1.id){
-					this.carList.delete(this.mergeId)
-				}
-				that.carList.get(that.carList1.id).price1 = that.carList.get(that.carList1.id).productCount * that.carList.get(that.carList1.id).purchasePrice
-				this.getAllPrice()
-				setTimeout(res => {
-					uni.hideLoading();
-				}, 300)
-				this.$forceUpdate()
-				this.merge = 0
-				return;
-			}
-			if(uni.getStorageSync('carList1') != ''){
-				this.carList1 = uni.getStorageSync('carList1')
-			}else{
-				this.carList1 = this.carList1
-				
+			let that = this,
+				isTrue = false
+
+			if (this.merge == 1) {
+				this.$refs.mergePopup.close();
+				if (this.carList.has(this.carList1.id) == true) { //跟当前页面有相同的商品
+					that.carList.get(that.mergeId).stockLogList.forEach(function(value1, key1) {
+						that.carList.get(that.carList1.id).stockLogList.forEach(function(value, key) {
+							if (key1 == key) {
+								if (that.mergeId != that.carList1.id) {
+									that.carList.get(that.carList1.id).stockLogList.get(key).productCount =
+										that.carList.get(that.carList1.id).stockLogList.get(key)
+										.productCount + value1.productCount
+									isTrue = true
+									that.carList.get(that.carList1.id).productCount += value1.productCount
+								}
+							}
+						})
+						if (isTrue == false) {
+							that.carList.get(that.carList1.id).stockLogList.set(key1, value1)
+							that.carList.get(that.carList1.id).productCount += value1.productCount
+						}
+					})
+
+				} else {
+					this.carList.get(this.mergeId).productId = this.carList1.id
+					this.carList.get(this.mergeId).id = this.carList1.id
+					this.carList.get(this.mergeId).productName = this.carList1.productName
+					this.carList.get(this.mergeId).productPicture = this.carList1.productPicture
+					this.carList.get(this.mergeId).productSn = this.carList1.productSn
+					this.carList.get(this.mergeId).categoryId = this.carList1.categoryId
+					this.carList.get(this.mergeId).wholesalePrice = this.carList1.wholesalePrice || 0
+					this.carList.get(this.mergeId).lsprice = this.carList1.price || 0
+					this.carList.get(this.mergeId).isNew = false
+					this.carList.set(this.carList1.id, this.carList.get(this.mergeId))
+
+				}
+				if (this.mergeId != this.carList1.id) {
+					this.carList.delete(this.mergeId)
+				}
+				that.carList.get(that.carList1.id).price1 = that.carList.get(that.carList1.id).productCount * that.carList
+					.get(that.carList1.id).purchasePrice
+				this.getAllPrice()
+				setTimeout(res => {
+					uni.hideLoading();
+				}, 300)
+				this.$forceUpdate()
+				this.merge = 0
+				return;
 			}
+			if (uni.getStorageSync('carList1') != '') {
+				this.carList1 = uni.getStorageSync('carList1')
+			} else {
+				this.carList1 = this.carList1
+
+			}
+			console.log(this.carList1)
 			this.khName = JSON.parse(JSON.stringify(this.khName)) || ''
 			if (this.carList.size == 0) { //当前页没有数据
 				for (let i = 0; i < this.carList1.length; i++) {
 					let obj = {
-						purchasePrice: this.userType == 0?this.carList1[i].purchasePrice:'', //进货价
-						price1: 0,
-						price:this.carList1[i].price,
-						productCount: 0,
-						id:this.carList1[i].productId != null ? this.carList1[i].productId : this.carList1[i].id,
-						isNew:this.carList1[i].isNew, //是否是新商品
+						purchasePrice: this.userType == 0 ? this.carList1[i].purchasePrice : '', //进货价
+						price1: 0,
+						price: this.carList1[i].price,
+						productCount: 0,
+						id: this.carList1[i].productId != null ? this.carList1[i].productId : this.carList1[i].id,
+						isNew: this.carList1[i].isNew, //是否是新商品
 						productId: this.carList1[i].productId == null ? '' : this.carList1[i].productId,
-						productName: this.carList1[i].productName,
-						wholesalePrice: this.carList1[i].wholesalePrice || 0,
-						categoryName:this.carList1[i].categoryName,
-						categoryId:this.carList1[i].categoryId,
+						productName: this.carList1[i].productName,
+						wholesalePrice: this.carList1[i].wholesalePrice || 0,
+						categoryName: this.carList1[i].categoryName,
+						categoryId: this.carList1[i].attrId,
 						lsprice: this.carList1[i].price || 0,
 						productPicture: this.carList1[i].productPicture,
-						productSn: this.carList1[i].productSn,
+						productSn: this.carList1[i].productSn,
+						productPictures:[],
 						stockLogList: new Map(),
 						stockLogList1: []
 					}
-					for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-						let productCount = this.carList1[i].saleDetailQueryDTO[m].productCount
-						if(obj.stockLogList.has(this.carList1[i].saleDetailQueryDTO[m].attributeList) ==true){
-							productCount += obj.stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList).productCount
+					for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
+						let productCount = this.carList1[i].saleDetailQueryDTO[m].productCount
+						if (obj.stockLogList.has(this.carList1[i].saleDetailQueryDTO[m].attributeList) == true) {
+							productCount += obj.stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList)
+								.productCount
 						}
 						var data1 = {
 							productCount: productCount,
 							name: this.carList1[i].saleDetailQueryDTO[m].name
 						}
 						obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-						obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount == null ? 0 : this.carList1[i].saleDetailQueryDTO[m].productCount
+						obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount == null ? 0 : this
+							.carList1[i].saleDetailQueryDTO[m].productCount
 						obj.price1 = obj.productCount * this.carList1[i].purchasePrice
-					}
-					let id = this.carList1[i].isNew ==true ?this.carList1[i].id : this.carList1[i].productId
-					this.carList.set(id, obj)
-					// that.carList.get(id).price = that.carList.get(id).purchasePrice *
+					}
+					let id = this.carList1[i].isNew == true ? this.carList1[i].id : this.carList1[i].productId
+					this.carList.set(id, obj)
+					// that.carList.get(id).price = that.carList.get(id).purchasePrice *
 					// 	that.carList.get(id).productCount;
 				}
 				this.carList1 = []
 			} else { //当前页有数据
-				for (let i = 0; i < this.carList1.length; i++) {
+				for (let i = 0; i < this.carList1.length; i++) {
 					let id = this.carList1[i].isNew == true ? this.carList1[i].id : this.carList1[i].productId
 					if (this.carList.has(this.carList1[i].id) == true) { //商品相同
 						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
 							if (this.carList.get(this.carList1[i].id).stockLogList.has(this.carList1[i].saleDetailQueryDTO[
-									m].attributeList) == true) { //规格相同
-									
-								var data1 = {
-									productCount: this.carList.get(this.carList1[i].id).stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList).productCount + this.carList1[i].saleDetailQueryDTO[m].productCount,
-									name: this.carList1[i].saleDetailQueryDTO[m].name
-								}
-								
-								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
+									m].attributeList) == true) { //规格相同
+
+								var data1 = {
+									productCount: this.carList.get(this.carList1[i].id).stockLogList.get(this.carList1[
+											i].saleDetailQueryDTO[m].attributeList).productCount + this.carList1[i]
+										.saleDetailQueryDTO[m].productCount,
+									name: this.carList1[i].saleDetailQueryDTO[m].name
+								}
+
+								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[
+									m].attributeList, data1)
 							} else { //规格不同
 								var data1 = {
 									productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
@@ -570,27 +859,29 @@
 							}
 							this.carList.get(this.carList1[i].id).productCount += this.carList1[i].saleDetailQueryDTO[
 								m].productCount == null ? 0 : this.carList1[i].saleDetailQueryDTO[
-								m].productCount
-							this.carList.get(this.carList1[i].id).price1 = this.carList.get(this.carList1[i].id).productCount * this.carList.get(this.carList1[i].id).purchasePrice
+								m].productCount
+							this.carList.get(this.carList1[i].id).price1 = this.carList.get(this.carList1[i].id)
+								.productCount * this.carList.get(this.carList1[i].id).purchasePrice
 						}
 					} else { //商品不同
 						let obj = {
-							purchasePrice: this.userType == 0?this.carList1[i].purchasePrice:'', //进货价
-							price1: 0,
-							price:this.carList1[i].price,
-							productCount: 0,
-							id:this.carList1[i].productId != null ? this.carList1[i].productId : this.carList1[i].id,
-							productId: this.carList1[i].productId == null ? '' : this.carList1[i].productId,
-							isNew:this.carList1[i].isNew,
-							productName: this.carList1[i].productName,
-							wholesalePrice: this.carList1[i].wholesalePrice || 0,
-							categoryName:this.carList1[i].categoryName,
-							categoryId:this.carList1[i].categoryId,
+							purchasePrice: this.userType == 0 ? this.carList1[i].purchasePrice : '', //进货价
+							price1: 0,
+							price: this.carList1[i].price,
+							productCount: 0,
+							id: this.carList1[i].productId != null ? this.carList1[i].productId : this.carList1[i].id,
+							productId: this.carList1[i].productId == null ? '' : this.carList1[i].productId,
+							isNew: this.carList1[i].isNew,
+							productName: this.carList1[i].productName,
+							wholesalePrice: this.carList1[i].wholesalePrice || 0,
+							categoryName: this.carList1[i].categoryName,
+							categoryId: this.carList1[i].attrId,
 							lsprice: this.carList1[i].price || 0,
 							productPicture: this.carList1[i].productPicture,
 							productSn: this.carList1[i].productSn,
 							stockLogList: new Map(),
-							stockLogList1: [],
+							stockLogList1: [],
+							productPictures:[],
 							name: ''
 						}
 						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
@@ -601,316 +892,479 @@
 							obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
 
 							obj.name = this.carList1[i].saleDetailQueryDTO[m].name
-							obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount ==null ? 0 : this.carList1[i].saleDetailQueryDTO[
-								m].productCount
+							obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount == null ? 0 : this
+								.carList1[i].saleDetailQueryDTO[
+									m].productCount
 							obj.price1 = obj.productCount * this.carList1[i].purchasePrice
-						}
-						
+						}
+
 						this.carList.set(id, obj)
-					}
-					// that.carList.get(id).price = that.carList.get(id).purchasePrice *
+					}
+					// that.carList.get(id).price = that.carList.get(id).purchasePrice *
 					// 		that.carList.get(id).productCount;
-					
+
 				}
-				
-			}
-			this.$nextTick(()=>{
-				
-				this.carList1 = []
-				uni.removeStorageSync('carList1')
-				this.getAllPrice()
-				if(this.carList1 != ''){
-					setTimeout(res => {
-						uni.hideLoading();
-					}, 2000)
-				}else{
-					setTimeout(res => {
-						uni.hideLoading();
-					}, 300)
-				}
-				this.$forceUpdate()
-			})
-			console.log(this.carList)
+
+			}
+			this.$nextTick(() => {
+
+				this.carList1 = []
+				uni.removeStorageSync('carList1')
+				this.getAllPrice()
+				if (this.carList1 != '') {
+					setTimeout(res => {
+						uni.hideLoading();
+					}, 2000)
+				} else {
+					setTimeout(res => {
+						uni.hideLoading();
+					}, 300)
+				}
+				this.$forceUpdate()
+			})
 		},
-		onLoad(options) {
-			this.userType=uni.getStorageSync('type')
+		onLoad(options) {
+			this.userType = uni.getStorageSync('type')
+			this.getSnList()
+			this.getShopCategory()
+			this.getDefaultCategory()
 		},
 		methods: {
-			AiVoice(){
-				if (this.carList.size == 0) { //当前页没有数据
-					for (let i = 0; i < this.carList1.length; i++) {
-						let obj = {
-							purchasePrice: this.userType == 0?this.carList1[i].purchasePrice:'', //进货价
-							price1: 0,
-							price:this.carList1[i].price,
-							productCount: 0,
-							id:this.carList1[i].productId != null ? this.carList1[i].productId : this.carList1[i].id,
-							isNew:this.carList1[i].isNew, //是否是新商品
-							productId: this.carList1[i].productId == null ? '' : this.carList1[i].productId,
-							productName: this.carList1[i].productName,
-							wholesalePrice: this.carList1[i].wholesalePrice || 0,
-							categoryName:this.carList1[i].categoryName,
-							categoryId:this.carList1[i].categoryId,
-							lsprice: this.carList1[i].price || 0,
-							productPicture: this.carList1[i].productPicture,
-							productSn: this.carList1[i].productSn,
-							stockLogList: new Map(),
-							stockLogList1: []
-						}
-						
-						// let attrMap = new Map()
-						// let newSaleDetailDTOList = []
-						// for(let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++){
-						// 	if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){
-						// 		let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
-						// 		let trueCount = hasCount.split('-')[0]
-						// 		let lastConut = Number(trueCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
-						// 		newSaleDetailDTOList[hasCount.split('-')[1]].productCount = lastConut
-						// 	}else{
-						// 		newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m])
-						// 		attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,item.saleDetailDTOList[i].stockLogList1[m].productCount+'-'+m)
-						// 	}
-						// }
-						// obj.saleDetailQueryDTO = newSaleDetailDTOList
-						
-						
-						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-							let productCount = this.carList1[i].saleDetailQueryDTO[m].productCount
-							if(obj.stockLogList.has(this.carList1[i].saleDetailQueryDTO[m].attributeList) ==true){
-								productCount += obj.stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList).productCount
-							}
-							var data1 = {
-								productCount: productCount,
-								name: this.carList1[i].saleDetailQueryDTO[m].name
+			//店铺规格库
+			getShopCategory(){
+				this.tui.request("/app/productCategory/getCategoryOfshop", "POST", {}, false, true).then((res) => {
+					if (res.code == 200) {
+						//this.specifiList[0] this.defaultList[1] 尺码
+						//this.specifiList[1] this.defaultList[0] 颜色
+						this.specifiList = res.result.productAttributeOfAddVos
+						for(let m=0;m<this.specifiList[0].productAttributeValueVoList.length;m++){ //尺码库
+							let isysTrue = true
+							for(let i=0;i<this.defaultList[1].value.length;i++){ //合并尺码 默认尺码
+								if(this.defaultList[1].value[i].value == this.specifiList[0].productAttributeValueVoList[m].value){
+									isysTrue = false
+								}
 							}
-							obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-							obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount == null ? 0 : this.carList1[i].saleDetailQueryDTO[m].productCount
-							obj.price1 = obj.productCount * this.carList1[i].purchasePrice
+							this.$nextTick(()=>{
+								if(isysTrue){
+									this.defaultList[1].value.push(this.specifiList[0].productAttributeValueVoList[m])
+								}
+							})
 						}
-						let id = this.carList1[i].isNew ==true ?this.carList1[i].id : this.carList1[i].productId
-						this.carList.set(id, obj)
-						// that.carList.get(id).price = that.carList.get(id).purchasePrice *
-						// 	that.carList.get(id).productCount;
-					}
-					this.carList1 = []
-				} else { //当前页有数据
-					for (let i = 0; i < this.carList1.length; i++) {
-						let id = this.carList1[i].isNew == true ? this.carList1[i].id : this.carList1[i].productId
-						if (this.carList.has(this.carList1[i].id) == true) { //商品相同
-							this.carList.get(this.carList1[i].id).purchasePrice = this.carList1[i].purchasePrice
-							for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-								if (this.carList.get(this.carList1[i].id).stockLogList.has(this.carList1[i].saleDetailQueryDTO[
-										m].attributeList) == true) { //规格相同
-										
-									var data1 = {
-										productCount: this.carList.get(this.carList1[i].id).stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList).productCount + this.carList1[i].saleDetailQueryDTO[m].productCount,
-										name: this.carList1[i].saleDetailQueryDTO[m].name
-									}
-									
-									this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-								} else { //规格不同
-									var data1 = {
-										productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
-										name: this.carList1[i].saleDetailQueryDTO[m].name
-									}
-									this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[
-										m].attributeList, data1)
-				
+						for(let m=0;m<this.specifiList[1].productAttributeValueVoList.length;m++){ //颜色库
+							let isTrue = true
+							for(let i=0;i<this.defaultList[0].value.length;i++){ //合并颜色 默认颜色
+								if(this.defaultList[0].value[i].value == this.specifiList[1].productAttributeValueVoList[m].value){
+									isTrue = false
 								}
-								this.carList.get(this.carList1[i].id).productCount += this.carList1[i].saleDetailQueryDTO[
-									m].productCount == null ? 0 : this.carList1[i].saleDetailQueryDTO[
-									m].productCount
-								this.carList.get(this.carList1[i].id).price1 = this.carList.get(this.carList1[i].id).productCount * this.carList.get(this.carList1[i].id).purchasePrice
 							}
-						} else { //商品不同
-							let obj = {
-								purchasePrice: this.userType == 0?this.carList1[i].purchasePrice:'', //进货价
-								price1: 0,
-								price:this.carList1[i].price,
-								productCount: 0,
-								id:this.carList1[i].productId != null ? this.carList1[i].productId : this.carList1[i].id,
-								productId: this.carList1[i].productId == null ? '' : this.carList1[i].productId,
-								isNew:this.carList1[i].isNew,
-								productName: this.carList1[i].productName,
-								wholesalePrice: this.carList1[i].wholesalePrice || 0,
-								categoryName:this.carList1[i].categoryName,
-								categoryId:this.carList1[i].categoryId,
-								lsprice: this.carList1[i].price || 0,
-								productPicture: this.carList1[i].productPicture,
-								productSn: this.carList1[i].productSn,
-								stockLogList: new Map(),
-								stockLogList1: [],
-								name: ''
-							}
-							for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-								var data1 = {
-									productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
-									name: this.carList1[i].saleDetailQueryDTO[m].name
+							this.$nextTick(()=>{
+								if(isTrue){
+									this.defaultList[0].value.push(this.specifiList[1].productAttributeValueVoList[m])
 								}
-								obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-				
-								obj.name = this.carList1[i].saleDetailQueryDTO[m].name
-								obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount ==null ? 0 : this.carList1[i].saleDetailQueryDTO[
-									m].productCount
-								obj.price1 = obj.productCount * this.carList1[i].purchasePrice
-							}
+							})
 							
-							this.carList.set(id, obj)
 						}
-						// that.carList.get(id).price = that.carList.get(id).purchasePrice *
-						// 		that.carList.get(id).productCount;
-						
-					}
-					
-				}
-				this.$nextTick(()=>{
-					
-					this.carList1 = []
-					uni.removeStorageSync('carList1')
-					this.getAllPrice()
-					if(this.carList1 != ''){
-						setTimeout(res => {
-							uni.hideLoading();
-						}, 2000)
-					}else{
-						setTimeout(res => {
-							uni.hideLoading();
-						}, 300)
-					}
-					this.$forceUpdate()
-				})
-				console.log(this.carList)
-			},
-			numData(val){
-				var name = []
-				if (typeof(val) == 'string') {
-					let newObj = JSON.parse(val)
-					for (let as in newObj) {
-						name.push(newObj[as])
+					} else {
+						this.tui.toast(res.message)
 					}
-				}
-				return name;
-			},
-			checkSpec(type,id,attr,value){
-				if(this.carList.get(id).categoryId == '' || this.carList.get(id).categoryId == null){
-					this.tui.toast('请先选择商品分类')
-					return;
-				}
-				this.temporary = [id,attr,type,value]
-				let num = type == '颜色' ? 0 : 1
-				this.getGategoryLowList()
+				}).catch((res) => {})
 			},
-			getScanCodeCategroyId(num){
-				num = num == '颜色' ? 0 : 1
-				this.tui.request("/app/productAttribute/selectByCategoryId", "POST", {
-					categoryId: this.goodsDetail.categoryId
-				}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						this.isOpenId = res1.result[num].id
-						this.$refs.inputDialog.open('bottom')
-						this.isBottom = true
+			//店铺默认分类
+			getDefaultCategory(){
+				this.tui.request("/app/productCategory/getDefaultCategory", "POST", {}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.categoryList = res.result
 					} else {
 						this.tui.toast(res.message)
 					}
 				}).catch((res) => {})
-				this.$forceUpdate()
 			},
-			//初始化获取子分类列表
-			getGategoryLowList() {
-				this.attrList = []
-				let num = this.temporary[2] == '颜色' ? 0 : 1
-				this.tui.request("/app/productAttribute/selectByCategoryId", "POST", {
-					categoryId: this.carList.get(this.temporary[0]).categoryId
-				}, false, true).then((res1) => {
+			//进入页面，查询货号列表
+			getSnList(){
+				// snList
+				this.snList = []
+				this.snName = ''
+				this.tui.request("/app/productSn/getProductSnByShopId", "POST", {}, false, true).then((res1) => {
 					if (res1.code == 200) {
-						this.attrList.push(res1.result[num])
-						if (res1.result.length > 0) {
-							this.attributeValue = []
-							this.tui.request(
-								"/app/productAttributeValue/selectByAttributeId",
-								"get", {
-									id: this.attrList[0].id
-								}, false, true).then((res2) => {
-								if (res2.code == 200) {
-									this.attributeValue = res2.result;
-									this.$forceUpdate()
-								} else {
-									this.tui.toast(res.message)
+						if(res1.result != ''){
+							for(let i=0;i<res1.result.length;i++){
+								let data= {
+									text:'前缀:'+res1.result[i].snPre+',位数:'+res1.result[i].snSufLength,
+									value:res1.result[i].snPre
 								}
-		
-							}).catch((res) => {})
+								
+								this.snList.push(data)
+							}
+							this.snName = res1.result[0].snPre
 						}
-						setTimeout(() => {
-							this.showList = this.attrList;
-						}, 1000)
+						
 					} else {
 						this.tui.toast(res.message)
 					}
+					this.$forceUpdate()
 				}).catch((res) => {})
-				this.$forceUpdate()
-				this.$refs.getaPopup.open()
 			},
-			sliceMsg(val) {
-				var name = ''
-				if (typeof(val) == 'string') {
-					let newObj = JSON.parse(val)
-					for (let as in newObj) {
-						name += newObj[as] + '/'
-					}
+			//根据规则生成货号
+			startGetSn(){
+				var that = this;
+				if(this.prefixRule == ''){
+					this.tui.toast('请输入货号生成前缀规则')
+					return
 				}
-				return name;
-			},
-			//点击某一个规格，可修改
-			async changeSpec(item){
-				let that = this;
-				if(item == ''){
-					this.tui.toast('请输入要修改的规格值')
-					return;
+				if(this.numRule == ''){
+					this.tui.toast('请输入货号生成位数规则')
+					return
 				}
-				let data = this.temporary
-				let specMap = new Map()  //新的临时存放值那个更改过的值的map
-				await this.carList.get(data[0]).stockLogList.forEach(function(value, key) {
-					if(key == data[1]){
-						let stringKey = key.replace(data[3],item)  //拿到了更改过的key
-						if(specMap.has(stringKey)== true){
-							data[1] = stringKey
-							
-							specMap.get(stringKey).name = that.sliceMsg(stringKey)
-							specMap.get(stringKey).productCount += value.productCount
+				this.tui.request("/app/productSn/addAndGetNewProductSn", "POST", {
+					snPre:this.prefixRule,
+					snSufLength:this.numRule
+				}, false, false).then((res1) => {
+					if (res1.code == 200) {
+						// this.snList = res1.result
+						if(res1.message=='货号前缀已存在！'){  //被删除，调启用方法
+							uni.showModal({
+								title: "提示",
+								content: "货号已经被删除，是否重新启用？",
+								success: function(res) {
+									if (res.confirm) {
+										that.tui.request("/app/productSn/useAgainProductSn", "POST", {
+											id:res1.result.id
+										}, false, true).then((res2) => {
+											if (res2.code == 200) {
+												that.tui.toast('重新启用成功')
+												setTimeout(res=>{
+													that.$refs.SNDialog.close()
+													that.getSnList()
+												},1000)
+											} else {
+												that.tui.toast(res2.message)
+											}
+											that.$forceUpdate()
+										}).catch((res) => {})
+									}
+								}
+							})
 						}else{
-							data[1] = stringKey
-							
-							specMap.set(stringKey,value)
-							specMap.get(stringKey).name = that.sliceMsg(stringKey)
+							this.addPageGoods(this.zhuImg,res1.result)
 						}
-						that.tui.request("/app/stock/productCount", "post", {
-							productId: that.carList.get(data[0]).productId,
-							attributeList: stringKey
-						}, false, true).then((res) => {
-							if (res.code == 200) {
-								value.productNum = res.result
-								that.$forceUpdate()
-							} else {
-								that.tui.toast(res.message)
-							}
-						}).catch((res) => {})
-					}else{
-						specMap.set(key,value)
+						
+					} else {
+						this.tui.toast(res.message)
 					}
-				})
-				await that.$nextTick(()=>{
-					this.carList.get(data[0]).stockLogList = specMap
-					this.$forceUpdate()
-					this.$refs.getaPopup.close()
-				})
+				}).catch((res) => {})
 			},
-			handleBlur(e){
-				this.categoryText = e.detail.value
+			//生成货号弹出层
+			generateSn(id){
+				if(this.snList.length > 0){
+					this.tui.request("/app/productSn/getNewProductSn", "POST", {
+						snPre: this.snName
+					}, false, true).then((res) => {
+						if (res.code == 200) {
+							this.carList.get(id).productSn = res.result
+							this.$forceUpdate()
+						} else {
+							this.tui.toast(res.message)
+						}
+					}).catch((res) => {})
+				}else{
+					this.zhuImg = ''
+					this.$refs.SNDialog.open('center')
+				}
+				
 			},
-			inputDialogToggle(item) {
-				this.inputVal = '';
-				this.isOpenId = item;
+			addSn(){
+				this.$refs.SNDialog.open('center')
+			},
+			AiVoice() {
+				if (this.carList.size == 0) { //当前页没有数据
+					for (let i = 0; i < this.carList1.length; i++) {
+						let obj = {
+							purchasePrice: this.userType == 0 ? this.carList1[i].purchasePrice : '', //进货价
+							price1: 0,
+							price: this.carList1[i].price,
+							productCount: 0,
+							id: this.carList1[i].productId != null ? this.carList1[i].productId : this.carList1[i].id,
+							isNew: this.carList1[i].isNew, //是否是新商品
+							productId: this.carList1[i].productId == null ? '' : this.carList1[i].productId,
+							productName: this.carList1[i].productName,
+							wholesalePrice: this.carList1[i].wholesalePrice || 0,
+							categoryName: this.carList1[i].categoryName,
+							categoryId: this.carList1[i].attrId,
+							lsprice: this.carList1[i].price || 0,
+							productPicture: this.carList1[i].productPicture,
+							productSn: this.carList1[i].productSn,
+							stockLogList: new Map(),
+							productPictures:[],
+							stockLogList1: []
+						}
+
+						// let attrMap = new Map()
+						// let newSaleDetailDTOList = []
+						// for(let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++){
+						// 	if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){
+						// 		let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
+						// 		let trueCount = hasCount.split('-')[0]
+						// 		let lastConut = Number(trueCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
+						// 		newSaleDetailDTOList[hasCount.split('-')[1]].productCount = lastConut
+						// 	}else{
+						// 		newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m])
+						// 		attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,item.saleDetailDTOList[i].stockLogList1[m].productCount+'-'+m)
+						// 	}
+						// }
+						// obj.saleDetailQueryDTO = newSaleDetailDTOList
+
+
+						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
+							let productCount = this.carList1[i].saleDetailQueryDTO[m].productCount
+							if (obj.stockLogList.has(this.carList1[i].saleDetailQueryDTO[m].attributeList) == true) {
+								productCount += obj.stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList)
+									.productCount
+							}
+							var data1 = {
+								productCount: productCount,
+								name: this.carList1[i].saleDetailQueryDTO[m].name
+							}
+							obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
+							obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount == null ? 0 : this
+								.carList1[i].saleDetailQueryDTO[m].productCount
+							obj.price1 = obj.productCount * this.carList1[i].purchasePrice
+						}
+						let id = this.carList1[i].isNew == true ? this.carList1[i].id : this.carList1[i].productId
+						this.carList.set(id, obj)
+						// that.carList.get(id).price = that.carList.get(id).purchasePrice *
+						// 	that.carList.get(id).productCount;
+					}
+					this.carList1 = []
+				} else { //当前页有数据
+					for (let i = 0; i < this.carList1.length; i++) {
+						let id = this.carList1[i].isNew == true ? this.carList1[i].id : this.carList1[i].productId
+						if (this.carList.has(this.carList1[i].id) == true) { //商品相同
+							this.carList.get(this.carList1[i].id).purchasePrice = this.carList1[i].purchasePrice
+							for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
+								if (this.carList.get(this.carList1[i].id).stockLogList.has(this.carList1[i]
+										.saleDetailQueryDTO[
+											m].attributeList) == true) { //规格相同
+
+									var data1 = {
+										productCount: this.carList.get(this.carList1[i].id).stockLogList.get(this
+												.carList1[i].saleDetailQueryDTO[m].attributeList).productCount + this
+											.carList1[i].saleDetailQueryDTO[m].productCount,
+										name: this.carList1[i].saleDetailQueryDTO[m].name
+									}
+
+									this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i]
+										.saleDetailQueryDTO[m].attributeList, data1)
+								} else { //规格不同
+									var data1 = {
+										productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
+										name: this.carList1[i].saleDetailQueryDTO[m].name
+									}
+									this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i]
+										.saleDetailQueryDTO[
+											m].attributeList, data1)
+
+								}
+								this.carList.get(this.carList1[i].id).productCount += this.carList1[i].saleDetailQueryDTO[
+									m].productCount == null ? 0 : this.carList1[i].saleDetailQueryDTO[
+									m].productCount
+								this.carList.get(this.carList1[i].id).price1 = this.carList.get(this.carList1[i].id)
+									.productCount * this.carList.get(this.carList1[i].id).purchasePrice
+							}
+						} else { //商品不同
+							let obj = {
+								purchasePrice: this.userType == 0 ? this.carList1[i].purchasePrice : '', //进货价
+								price1: 0,
+								price: this.carList1[i].price,
+								productCount: 0,
+								id: this.carList1[i].productId != null ? this.carList1[i].productId : this.carList1[i]
+									.id,
+								productId: this.carList1[i].productId == null ? '' : this.carList1[i].productId,
+								isNew: this.carList1[i].isNew,
+								productName: this.carList1[i].productName,
+								wholesalePrice: this.carList1[i].wholesalePrice || 0,
+								categoryName: this.carList1[i].categoryName,
+								categoryId: this.carList1[i].attrId,
+								lsprice: this.carList1[i].price || 0,
+								productPicture: this.carList1[i].productPicture,
+								productSn: this.carList1[i].productSn,
+								stockLogList: new Map(),
+								stockLogList1: [],
+								productPictures:[],
+								name: ''
+							}
+							for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
+								var data1 = {
+									productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
+									name: this.carList1[i].saleDetailQueryDTO[m].name
+								}
+								obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
+
+								obj.name = this.carList1[i].saleDetailQueryDTO[m].name
+								obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount == null ? 0 : this
+									.carList1[i].saleDetailQueryDTO[
+										m].productCount
+								obj.price1 = obj.productCount * this.carList1[i].purchasePrice
+							}
+
+							this.carList.set(id, obj)
+						}
+						// that.carList.get(id).price = that.carList.get(id).purchasePrice *
+						// 		that.carList.get(id).productCount;
+
+					}
+
+				}
+				this.$nextTick(() => {
+
+					this.carList1 = []
+					uni.removeStorageSync('carList1')
+					this.getAllPrice()
+					if (this.carList1 != '') {
+						setTimeout(res => {
+							uni.hideLoading();
+						}, 2000)
+					} else {
+						setTimeout(res => {
+							uni.hideLoading();
+						}, 300)
+					}
+					this.$forceUpdate()
+				})
+			},
+			numData(val) {
+				var name = []
+				if (typeof(val) == 'string') {
+					let newObj = JSON.parse(val)
+					for (let as in newObj) {
+						name.push(newObj[as])
+					}
+				}
+				return name;
+			},
+			checkSpec(type, id, attr, value) {
+				if (this.carList.get(id).categoryId == '' || this.carList.get(id).categoryId == null) {
+					this.tui.toast('请先选择商品分类')
+					return;
+				}
+				this.temporary = [id, attr, type, value]
+				let num = type == '颜色' ? 0 : 1
+				this.getGategoryLowList()
+			},
+			getScanCodeCategroyId(num) {
+				num = num == '颜色' ? 0 : 1
+				console.log('新增',this.goodsDetail)
+				this.isOpenId = num
+				this.goodsId = this.goodsDetail.id
 				this.$refs.inputDialog.open('bottom')
+				this.isBottom = true
+				// this.tui.request("/app/productAttribute/selectByCategoryId", "POST", {
+				// 	categoryId: this.goodsDetail.categoryId
+				// }, false, true).then((res1) => {
+				// 	if (res1.code == 200) {
+				// 		this.isOpenId = res1.result[num].id
+				// 		this.$refs.inputDialog.open('bottom')
+				// 		this.isBottom = true
+				// 	} else {
+				// 		this.tui.toast(res.message)
+				// 	}
+				// }).catch((res) => {})
+			},
+			//初始化获取子分类列表
+			getGategoryLowList() {
+				this.attrList = []
+				let num = this.temporary[2] == '颜色' ? 0 : 1
+				this.tui.request("/app/productAttribute/selectByCategoryId", "POST", {
+					categoryId: this.carList.get(this.temporary[0]).categoryId
+				}, false, true).then((res1) => {
+					if (res1.code == 200) {
+						this.attrList.push(res1.result[num])
+						if (res1.result.length > 0) {
+							this.attributeValue = []
+							this.tui.request(
+								"/app/productAttributeValue/selectByAttributeId",
+								"get", {
+									id: this.attrList[0].id
+								}, false, true).then((res2) => {
+								if (res2.code == 200) {
+									this.attributeValue = res2.result;
+									this.$forceUpdate()
+								} else {
+									this.tui.toast(res.message)
+								}
+
+							}).catch((res) => {})
+						}
+						setTimeout(() => {
+							this.showList = this.attrList;
+						}, 1000)
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+				this.$forceUpdate()
+				this.$refs.getaPopup.open()
+			},
+			sliceMsg(val) {
+				var name = ''
+				if (typeof(val) == 'string') {
+					let newObj = JSON.parse(val)
+					for (let as in newObj) {
+						name += newObj[as] + '/'
+					}
+				}
+				return name;
+			},
+			//点击某一个规格，可修改
+			async changeSpec(item) {
+				let that = this;
+				if (item == '') {
+					this.tui.toast('请输入要修改的规格值')
+					return;
+				}
+				let data = this.temporary
+				let specMap = new Map() //新的临时存放值那个更改过的值的map
+				await this.carList.get(data[0]).stockLogList.forEach(function(value, key) {
+					if (key == data[1]) {
+						let stringKey = key.replace(data[3], item) //拿到了更改过的key
+						if (specMap.has(stringKey) == true) {
+							data[1] = stringKey
+
+							specMap.get(stringKey).name = that.sliceMsg(stringKey)
+							specMap.get(stringKey).productCount += value.productCount
+						} else {
+							data[1] = stringKey
+
+							specMap.set(stringKey, value)
+							specMap.get(stringKey).name = that.sliceMsg(stringKey)
+						}
+						that.tui.request("/app/stock/productCount", "post", {
+							productId: that.carList.get(data[0]).productId,
+							attributeList: stringKey
+						}, false, true).then((res) => {
+							if (res.code == 200) {
+								value.productNum = res.result
+								that.$forceUpdate()
+							} else {
+								that.tui.toast(res.message)
+							}
+						}).catch((res) => {})
+					} else {
+						specMap.set(key, value)
+					}
+				})
+				await that.$nextTick(() => {
+					this.carList.get(data[0]).stockLogList = specMap
+					this.$forceUpdate()
+					this.$refs.getaPopup.close()
+				})
+			},
+			handleBlur(e) {
+				this.categoryText = e.detail.value
+			},
+			inputDialogToggle(item) {
+				this.inputVal = '';
+				this.isOpenId = item;
+				this.$refs.inputDialog.open('bottom')
 			},
 			//保存已选
 			saveCheck() {
@@ -921,184 +1375,265 @@
 						this.goodsDetail.attributeList[i].value[m].isChecked = false
 					}
 				}
-			},
-			//确认语音输入的内容
+			},
+			//确认语音输入的内容
 			setDetail(e) {
-				if(this.voiceText ==''){
-					this.tui.toast('识别内容不能为空')
-					return
-				}
-				let convertedStr = this.convertChineseToArabic(this.voiceText);
-				if(convertedStr.indexOf('点') != -1){
-					convertedStr = this.replaceCharAfterNumber(convertedStr,'点','.')
-				}
-				if(convertedStr.indexOf('，名称') != -1){
-					convertedStr = convertedStr.replace(/，名称/g,'名称')
-				}
-				if(convertedStr.indexOf('名称，') != -1){
-					convertedStr = convertedStr.replace(/名称，/g,'名称')
-				}
-				if(convertedStr.indexOf('名称') != -1){
-					convertedStr = convertedStr.replace(/名称/g,'，名称:')
-				}
-				if(convertedStr.indexOf('，单价') != -1){
-					convertedStr = convertedStr.replace(/，单价/g,'单价')
-				}
-				if(convertedStr.indexOf('单价，') != -1){
-					convertedStr = convertedStr.replace(/单价，/g,'单价')
-				}
-				if(convertedStr.indexOf('单价') != -1){
-					convertedStr = convertedStr.replace(/单价/g,'，单价:')
-				}
-				if(convertedStr.indexOf('，数量') != -1){
-					convertedStr = convertedStr.replace(/，数量/g,'数量')
-				}
-				if(convertedStr.indexOf('数量，') != -1){
-					convertedStr = convertedStr.replace(/数量，/g,'数量')
-				}
-				if(convertedStr.indexOf('数量') != -1){
-					convertedStr = convertedStr.replace(/数量/g,'，数量:')
-				}
-				if(convertedStr.indexOf('货号，') != -1){
-					convertedStr = convertedStr.replace(/货号，/g,'货号')
-				}
-				if(convertedStr.indexOf('货号') != -1){
-					convertedStr = convertedStr.replace(/货号/g,'货号:')
-				}
-				//名称111，白色M码1一件
-				convertedStr = this.convertStringCorrectly(convertedStr)
-				convertedStr = this.spliceMsg(convertedStr)
-				if(convertedStr.indexOf('，') == 0){
-					console.log('位置',convertedStr.indexOf('，'))
-					convertedStr = convertedStr.substr(1)
-					console.log('位置',convertedStr)
+				let that = this;
+				if (this.voiceText == '') {
+					this.tui.toast('识别内容不能为空')
+					return
+				}
+				let convertedStr = this.convertChineseToArabic(this.voiceText);
+				if (convertedStr.indexOf('点') != -1) {
+					convertedStr = this.replaceCharAfterNumber(convertedStr, '点', '.')
+				}
+				if (convertedStr.indexOf('，名称') != -1) {
+					convertedStr = convertedStr.replace(/，名称/g, '名称')
+				}
+				if (convertedStr.indexOf('名称，') != -1) {
+					convertedStr = convertedStr.replace(/名称，/g, '名称')
+				}
+				if (convertedStr.indexOf('名称') != -1) {
+					convertedStr = convertedStr.replace(/名称/g, '，名称:')
+				}
+				if (convertedStr.indexOf('，单价') != -1) {
+					convertedStr = convertedStr.replace(/，单价/g, '单价')
+				}
+				if (convertedStr.indexOf('单价，') != -1) {
+					convertedStr = convertedStr.replace(/单价，/g, '单价')
+				}
+				if (convertedStr.indexOf('单价') != -1) {
+					convertedStr = convertedStr.replace(/单价/g, '，单价:')
+				}
+				if (convertedStr.indexOf('，数量') != -1) {
+					convertedStr = convertedStr.replace(/，数量/g, '数量')
+				}
+				if (convertedStr.indexOf('数量，') != -1) {
+					convertedStr = convertedStr.replace(/数量，/g, '数量')
+				}
+				if (convertedStr.indexOf('数量') != -1) {
+					convertedStr = convertedStr.replace(/数量/g, '，数量:')
+				}
+				if (convertedStr.indexOf('货号，') != -1) {
+					convertedStr = convertedStr.replace(/货号，/g, '货号')
+				}
+				if (convertedStr.indexOf('货号') != -1) {
+					convertedStr = convertedStr.replace(/货号/g, '货号:')
+				}
+				convertedStr = this.convertStringCorrectly(convertedStr)
+				convertedStr = this.spliceMsg(convertedStr)
+				if (convertedStr.indexOf('，') == 0) {
+					convertedStr = convertedStr.substr(1)
 				}
-				this.getMsg = convertedStr
-				this.tui.request("/purchaseOcrPicture/callWithMessageOfPurchase", "POST", {
-					questionMsg:this.getMsg
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						this.voiceText = ''
+				if (convertedStr.startsWith("号")) {
+					convertedStr = "货号" + convertedStr.substr(1);
+				}
+				this.getMsg = convertedStr
+				this.tui.request("/purchaseOcrPicture/callWithMessageOfPurchase", "POST", {
+					questionMsg: this.getMsg
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.voiceText = ''
 						this.$refs.popup.close()
-						
-						let purchaseDetails = res.result.data.purchaseDetails
-						// uni.setStorageSync('AiInventoryId', res.result.purchase.id)
-						for(let i=0;i<purchaseDetails.length;i++){
-							let data = {
-								id: "",
-								price: purchaseDetails[i].price,
-								productCount: 0,
-								categoryId:purchaseDetails[i].categoryId,
-								categoryName:purchaseDetails[i].categoryName,
-								wholesalePrice: purchaseDetails[i].wholesalePrice,
-								purchasePrice:purchaseDetails[i].purchasePrice,
-								isNew: purchaseDetails[i].productId==null?true:false,
-								productId:purchaseDetails[i].productId,
-								productName: purchaseDetails[i].productName,
-								productSn: purchaseDetails[i].productSn,
-								productPicture: purchaseDetails[i].productPicture,
-								supplierName: purchaseDetails[i].supplierName,
-								saleDetailQueryDTO: []
-							}
-							if(purchaseDetails[i].productId){
-								data.id = purchaseDetails[i].productId
-							}else if(purchaseDetails[i].productSn == '' || purchaseDetails[i].productSn == null || purchaseDetails[i].productSn == '货号'){
-								data.id = purchaseDetails[i].productName
-							}else if(purchaseDetails[i].productSn){
-								data.id = purchaseDetails[i].productSn
-							}
-							console.log('货号',data)
-							for(let m=0;m<purchaseDetails[i].stockLogList1.length;m++){
-								let list = {
-									attributeList: this.getAttribute(purchaseDetails[i].stockLogList1[m].attributeList),
-									productCount:purchaseDetails[i].stockLogList1[m].productCount || purchaseDetails[i].stockLogList1[m].productCounts,
-									productNum:'',
-									name: this.sliceMsg(this.getAttribute(purchaseDetails[i].stockLogList1[m].attributeList)),
-									price: purchaseDetails[i].stockLogList1[m].purchasePrice
+						let purchaseDetails = res.result.data.purchaseDetails
+						if(this.oneGoodsId){
+							let id = this.oneGoodsId
+							if(purchaseDetails.length > 0){
+								this.carList.get(id).productName = purchaseDetails[0].productName
+								let isTrue = false
+								this.carList.forEach(function(value, key) {
+									if(value.productSn == purchaseDetails[0].productSn){
+										isTrue = true
+										console.log('向通用')
+										this.carList.get(id).productSn = ''
+										this.$forceUpdate()
+										setTimeout(res=>{
+											this.tui.toast('该货号被页面其他商品占用,请重新输入！')
+										},300)
+									}
+								})
+								if(isTrue == false){
+									this.carList.get(id).productSn = purchaseDetails[0].productSn
+								}
+								
+								
+								// this.carList.get(id).id = purchaseDetails[0].productSn
+								this.carList.get(id).purchasePrice = purchaseDetails[0].purchasePrice
+								
+								for(let i=0;i<purchaseDetails[0].stockLogList1.length;i++){
+									if(this.carList.get(id).stockLogList.size == 0){
+										this.carList.get(id).stockLogList.set(purchaseDetails[0].stockLogList1[i].attributeList,purchaseDetails[0].stockLogList1[i])
+									}else{
+										if(this.carList.get(id).stockLogList.has(purchaseDetails[0].stockLogList1[i].attributeList)== true){
+											this.carList.get(id).stockLogList.get(purchaseDetails[0].stockLogList1[i].attributeList).productCount += 
+											purchaseDetails[0].stockLogList1[i].productCount
+										}else{
+											this.carList.get(id).stockLogList.set(purchaseDetails[0].stockLogList1[i].attributeList,purchaseDetails[0].stockLogList1[i])
+										}
+									}
+									this.carList.get(id).productCount += purchaseDetails[0].stockLogList1[i].productCount
 								}
-								data.productCount += purchaseDetails[i].stockLogList1[m].productCount 
-								data.saleDetailQueryDTO.push(list)
+								this.carList.get(id).price1 = this.carList.get(id).productCount * this.carList.get(id).purchasePrice
+								// if (purchaseDetails[0].productId) {
+								// 	this.carList.get(id).id = purchaseDetails[0].productId
+								// } else if (purchaseDetails[0].productSn == '' || purchaseDetails[0].productSn ==
+								// 	null || purchaseDetails[0].productSn == '货号') {
+								// 	this.carList.get(id).id = purchaseDetails[0].productName
+								// } else if (purchaseDetails[0].productSn) {
+								// 	this.carList.get(id).id = purchaseDetails[0].productSn
+								// }
+								
+								this.getAllPrice()
+								this.oneGoodsId = ''
+							}else{
+								this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
 							}
-							this.carList1.push(data)
+						}else{
 							
-						}
-						this.AiVoice()
-						// // for(let i=0;i<res.result.length;i++){
-						// // 	res.result[i].productCount = 0
-						// // }
-						// this.noList = []
-						// if(this.isInventory == true){
-						// 	let newData = []
+							// uni.setStorageSync('AiInventoryId', res.result.purchase.id)
+							for (let i = 0; i < purchaseDetails.length; i++) {
+								let data = {
+									id: "",
+									price: purchaseDetails[i].price,
+									productCount: 0,
+									categoryId: purchaseDetails[i].categoryId,
+									categoryName: purchaseDetails[i].categoryName,
+									wholesalePrice: purchaseDetails[i].wholesalePrice,
+									purchasePrice: purchaseDetails[i].purchasePrice,
+									isNew: purchaseDetails[i].productId == null ? true : false,
+									productId: purchaseDetails[i].productId,
+									productName: purchaseDetails[i].productName,
+									productSn: purchaseDetails[i].productSn,
+									productPicture: purchaseDetails[i].productPicture,
+									supplierName: purchaseDetails[i].supplierName,
+									productPictures:[],
+									saleDetailQueryDTO: []
+								}
+								console.log('data',data)
+								if (purchaseDetails[i].productId) {
+									data.id = purchaseDetails[i].productId
+								} else if (purchaseDetails[i].productSn == '' || purchaseDetails[i].productSn ==
+									null || purchaseDetails[i].productSn == '货号') {
+									data.id = purchaseDetails[i].productName
+								} else if (purchaseDetails[i].productSn) {
+									data.id = purchaseDetails[i].productSn
+								}
+								for (let m = 0; m < purchaseDetails[i].stockLogList1.length; m++) {
+									let list = {
+										attributeList: this.getAttribute(purchaseDetails[i].stockLogList1[m]
+											.attributeList),
+										productCount: purchaseDetails[i].stockLogList1[m].productCount ||
+											purchaseDetails[i].stockLogList1[m].productCounts,
+										productNum: '',
+										name: this.sliceMsg(this.getAttribute(purchaseDetails[i].stockLogList1[m]
+											.attributeList)),
+										price: purchaseDetails[i].stockLogList1[m].purchasePrice
+									}
+									data.productCount += purchaseDetails[i].stockLogList1[m].productCount
+									data.saleDetailQueryDTO.push(list)
+								}
+								this.carList1.push(data)
 							
-						// 	for(let i=0;i<res.result.data.length;i++){
-						// 		let newList = []
-						// 		// res.result.data[i].productCount = 0
-						// 		for(let m=0;m<res.result.data[i].stockLogList1.length;m++){
-						// 			if(res.result.data[i].stockLogList1[m].stockCount != null){
-						// 				newList.push(res.result.data[i].stockLogList1[m])
-						// 			}else{
-						// 				// res.result.data[i].productCount = res.result.data[i].productCount - res.result.data[i].stockLogList1[m].productCount
-						// 				this.noList.push(res.result.data[i].productName+'-'+ res.result.data[i].stockLogList1[m].attributeList)
-						// 			}
-						// 		}
-								
-						// 		res.result.data[i].stockLogList1 = newList
-						// 		if(newList.length > 0){
-						// 			 newData.push(res.result.data[i])
-						// 		}
-								
-						// 	}
-						// 	this.carList1 = newData
-						// }else{
-						// 	this.carList1 = res.result.data
-						// }
-						
-						// if(this.noList !='' || res.result.aiNotRecognition !=''){
-						// 	this.$refs.AiNoPopup.open()
-						// }
-						// this.AiHandleData()
-					} else {
-						this.tui.toast("抱歉：小助手对"+this.getMsg+"的部分商品未识别，请检查识别信息是否正确")
-					}
-				}).catch((res) => {
-					this.tui.toast(res)
-				})
+							}
+							setTimeout(res=>{
+								this.AiVoice()
+							},300)
+						}
+						
+					} else {
+						this.tui.toast("抱歉：小助手对" + this.getMsg + "的部分商品未识别，请检查识别信息是否正确")
+					}
+				}).catch((res) => {
+					this.tui.toast(res)
+				})
 			},
-			dialogInputConfirm(e) {	
-				if (this.categoryText == '') {
-					this.tui.toast("请输入规格值后提交")
-					return
-				}
-				this.tui.request("/app/productAttributeValue/save", "post", {
-					value: this.categoryText,
-					attributeId: this.isOpenId
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-
-						this.categoryText = ''
-						this.$refs.inputDialog.close()
-						if(this.isBottom){  //底部弹起的规格选择弹层
-							this.getById(this.goodsDetail,1)
-						}else{
-							this.getGategoryLowList()
+			delItemSn(val){
+				var that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条货号规则吗？",
+					success: function(res) {
+						if (res.confirm) {
+							that.tui.request("/app/productSn/checkProductSn", "post", {
+								snPre:val.value
+							}, false, true).then((res1) => {
+								if (res1.code == 200) {
+									that.tui.request("/app/productSn/deleteProductSn", "post", {
+										id:res1.result.id
+									}, false, true).then((res2) => {
+										if (res2.code == 200) {
+											that.tui.toast('删除成功')
+											setTimeout(res=>{
+												that.getSnList()
+											},1000)
+										} else {
+											uni.showToast({
+												title: res2.message,
+												icon: 'none'
+											})
+										}
+									}).catch((res) => {})
+								} else {
+									uni.showToast({
+										title: res1.message,
+										icon: 'none'
+									})
+								}
+							}).catch((res) => {})
 						}
-						this.$forceUpdate()
-						uni.showToast({
-							title: "添加成功",
-							icon: 'none'
-						})
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
 					}
-				}).catch((res) => {})
-			},
-			dialogClose() {
-				this.inputVal = '';
-				this.$refs.inputDialog.close()
-				this.categoryText = ''
+				})
+				
+			},
+			dialogInputConfirm(e) {
+				if (this.categoryText == '') {
+					this.tui.toast("请输入规格值后提交")
+					return
+				}
+				//this.goodsDetail[0]  颜色
+				//this.goodsDetail[1]  尺码
+				let data = {
+					isChecked:false,
+					value:this.categoryText
+				}
+				console.log('shuju',data)
+				if(this.isOpenId == '0'){
+					this.goodsDetail.attributeList[0].value.push(data)
+				}else if(this.isOpenId == '1'){
+					this.goodsDetail.attributeList[1].value.push(data)
+				}
+				this.$forceUpdate()
+				console.log('颜色',this.goodsDetail)
+				// this.tui.request("/app/productAttributeValue/save", "post", {
+				// 	value: this.categoryText,
+				// 	attributeId: this.isOpenId
+				// }, false, true).then((res) => {
+				// 	if (res.code == 200) {
+
+				// 		this.categoryText = ''
+				// 		this.$refs.inputDialog.close()
+				// 		if (this.isBottom) { //底部弹起的规格选择弹层
+				// 			this.getById(this.goodsDetail, 1)
+				// 		} else {
+				// 			this.getGategoryLowList()
+				// 		}
+				// 		this.$forceUpdate()
+				// 		uni.showToast({
+				// 			title: "添加成功",
+				// 			icon: 'none'
+				// 		})
+				// 	} else {
+				// 		uni.showToast({
+				// 			title: res.message,
+				// 			icon: 'none'
+				// 		})
+				// 	}
+				// }).catch((res) => {})
+			},
+			dialogClose() {
+				this.inputVal = '';
+				this.$refs.inputDialog.close()
+				this.categoryText = ''
 			},
 			combination(arr) {
 				let result = [
@@ -1115,22 +1650,22 @@
 					result = res
 				})
 				return result;
-			},
-			//获取分类列表
-			getGategoryList() {
-				this.tui.request("/app/productCategory/list", "get", {
-					
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						this.indexList = res.result;
-						this.categoryText = ""
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
+			},
+			//获取分类列表
+			getGategoryList() {
+				this.tui.request("/app/productCategory/list", "get", {
+
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.indexList = res.result;
+						this.categoryText = ""
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
 			},
 			//扫一扫功能
-			scanCodeAdd() {
+			scanCodeAdd() {
 				let that = this;
 				uni.scanCode({
 					success: (res) => {
@@ -1182,206 +1717,208 @@
 						})
 					}
 				})
-			},
-			uploadFilePromise(value) {
-				let that = this;
-				uni.chooseMedia({
-					count: 1,
-					mediaType: ['image'],
-					sourceType: ['album', 'camera'],
-					camera: 'back',
-					success(res) {
-						uni.uploadFile({
-							url: 'https://dev.xenjoyou.com/hiver/upload/file',
-							filePath: res.tempFiles[0].tempFilePath,
-							name: 'file',
-							header: {
-								"content-type": "multipart/form-data",
-								'accessToken': that.tui.getToken()
-							},
-							formData: {},
-							success: (uploadFileRes) => {
-								that.carList.get(value[0]).productPicture = ''
-								let path = JSON.parse(uploadFileRes.data)
-								//后端返回的地址，存入图片地址
-								that.carList.get(value[0]).productPicture = path.result
-								that.$forceUpdate()
-							}
-						});
-					}
-				})
+			},
+			uploadFilePromise(value) {
+				let that = this;
+				uni.chooseMedia({
+					count: 1,
+					mediaType: ['image'],
+					sourceType: ['album', 'camera'],
+					camera: 'back',
+					success(res) {
+						uni.uploadFile({
+							url: 'https://dev.xenjoyou.com/hiver/upload/file',
+							filePath: res.tempFiles[0].tempFilePath,
+							name: 'file',
+							header: {
+								"content-type": "multipart/form-data",
+								'accessToken': that.tui.getToken()
+							},
+							formData: {},
+							success: (uploadFileRes) => {
+								that.carList.get(value[0]).productPicture = ''
+								let path = JSON.parse(uploadFileRes.data)
+								//后端返回的地址，存入图片地址
+								that.carList.get(value[0]).productPicture = path.result
+								that.$forceUpdate()
+							}
+						});
+					}
+				})
 			},
 			goodsAdd() {
 				uni.navigateTo({
 					url: "/pages/inventory/changeGoods1"
 				})
+			},
+			mergeGoods() {
+
 			},
-			mergeGoods(){
+			//上传子图
+			uploadZi(id){
 				
-			},
-			addGategory(e){
-				let multipleList = [{
-					attributeName:'颜色',
-					productAttributeValueVoList:[{
-						checked: true,
-						value: "均色"
-					}]
-				},{
-					attributeName:'尺码',
-					productAttributeValueVoList:[{
-						checked: true,
-						value: "均码"
-					}]
-				}]
-				this.tui.request("/app/productCategory/batchSaveCategoryAndAttribute", "post", {
-					categoryName: this.categoryText,
-					productAttributeOfAddVos:multipleList
-				}, false, false).then((res) => {
-					if (res.code == 200) {
-						this.getGategoryList()
-						uni.showToast({
-							title:"添加成功",
-							icon: 'none'
-						})
-					} else {
-						uni.showToast({
-							title:"添加失败",
-							icon: 'none'
-						})
-					}
-					this.$refs.addGateDialog.close()
-				}).catch((res) => {})
-			},
-			allChange(e){
-				if(this.linshiPrice == e.target.value){
-					this.allChangeNum = e.target.value
-				}else{
-					if(e.target.value == ''){
-						this.allChangeNum = this.linshiPrice
-					}else{
-						this.allChangeNum = e.target.value
-					}
-					
-				}
-				//监听到输入框改变，给所有的都赋值
-				if(this.isPlusAndMinus == false){
-					for(var i=0;i<this.temporaryList.length;i++){
-						if(this.evalue.length == 0){
-							this.temporaryList[i].productCount = Number(this.allChangeNum)
-						}else{
-							for(var j=0;j<this.evalue.length;j++){
-								if(this.evalue[j] == this.temporaryList[i].name){
-									this.temporaryList[i].productCount = Number(this.allChangeNum)
-								}
-							}
-						}
-						
-						for(var m=0;m<this.pageOldTemList.length;m++){
-							if(this.temporaryList[i].attributeList == this.pageOldTemList[m].attributeList){
-								this.pageOldTemList[m].productCount = this.temporaryList[i].productCount
-							}
-						}
-						for(var j=0;j<this.oldTemList.length;j++){
-							if(this.temporaryList[i].attributeList == this.oldTemList[j].attributeList){
-								this.oldTemList[j].productCount = this.temporaryList[i].productCount
-							}
-						}
-					}
-				}
-				this.isPlusAndMinus == false
-				this.temporaryChange()
-			},
-			obtainPrice(e,type,num){
-				console.log("获得焦点",this.carList)
-				console.log("获得焦点",e.target.value)
-				this.linshiPrice = e.target.value
-				if(type=='danjia'){
-					this.carList.get(num).purchasePrice = ''
-				}else if(type=='pifa'){
-					this.carList.get(num).wholesalePrice = ''
-				}else if(type=='lingshou'){
-					this.carList.get(num).lsprice = ''
-					this.$forceUpdate()
-				}else if(type=='zongjishu'){
-					this.allChangeNum = ''
-				}else if(type=='shouldPay'){
-					this.shouldPay = ''
-				}else if(type=='alreadyPay'){
-					this.alreadyPay = ''
-				}
-				this.$forceUpdate()
-			},
-			plusNum(){
-				this.isPlusAndMinus == true
-				//监听到点击+的操作，给所有的都+1
-				for(var i=0;i<this.temporaryList.length;i++){
-					if(this.evalue.length == 0){
-						if(this.temporaryList[i].productCount == undefined){
-							this.temporaryList[i].productCount = 1
-						}else{
-							this.temporaryList[i].productCount++
-						}
-					}else{
-						for(var j=0;j<this.evalue.length;j++){
-							if(this.evalue[j] == this.temporaryList[i].name){
-								if(this.temporaryList[i].productCount == undefined){
-									this.temporaryList[i].productCount = 1
-								}else{
-									this.temporaryList[i].productCount++
-								}
-							}
-						}
-					}
-					
-					for(var m=0;m<this.pageOldTemList.length;m++){
-						if(this.temporaryList[i].attributeList == this.pageOldTemList[m].attributeList){
-							this.pageOldTemList[m].productCount = this.temporaryList[i].productCount
-						}
-					}
-					for(var j=0;j<this.oldTemList.length;j++){
-						if(this.temporaryList[i].attributeList == this.oldTemList[j].attributeList){
-							this.oldTemList[j].productCount = this.temporaryList[i].productCount
-						}
-					}
-				}
-				this.temporaryChange()
-			},
-			minusNum(){
-				this.isPlusAndMinus == true
-				//监听到点击-的操作，给所有的都-1
-				for(var i=0;i<this.temporaryList.length;i++){
-					if(this.evalue.length == 0){
-						this.temporaryList[i].productCount--
-					}else{
-						for(var j=0;j<this.evalue.length;j++){
-							if(this.evalue[j] == this.temporaryList[i].name){
-								this.temporaryList[i].productCount--
-							}
-						}
-					}
-					
-					for(var m=0;m<this.pageOldTemList.length;m++){
-						if(this.temporaryList[i].attributeList == this.pageOldTemList[m].attributeList){
-							this.pageOldTemList[m].productCount = this.temporaryList[i].productCount
-						}
-					}
-					for(var j=0;j<this.oldTemList.length;j++){
-						if(this.temporaryList[i].attributeList == this.oldTemList[j].attributeList){
-							this.oldTemList[j].productCount = this.temporaryList[i].productCount
-						}
-					}
-				}
-				this.temporaryChange()
-			},
-			goChooseGoods(){
-				uni.navigateTo({
-					url: '/package1/AI/AiChangeGoods'
-				})
 			},
-			attrNameChange(index, data1, index1) {
-				let that= this;
-				uni.showLoading({
-					title: '加载中...'
+			addGategory(e) {
+				let multipleList = [{
+					attributeName: '颜色',
+					productAttributeValueVoList: [{
+						isChecked: true,
+						value: "均色"
+					}]
+				}, {
+					attributeName: '尺码',
+					productAttributeValueVoList: [{
+						isChecked: true,
+						value: "均码"
+					}]
+				}]
+				this.tui.request("/app/productCategory/batchSaveCategoryAndAttribute", "post", {
+					categoryName: this.categoryText,
+					productAttributeOfAddVos: multipleList
+				}, false, false).then((res) => {
+					if (res.code == 200) {
+						this.getGategoryList()
+						uni.showToast({
+							title: "添加成功",
+							icon: 'none'
+						})
+					} else {
+						uni.showToast({
+							title: "添加失败",
+							icon: 'none'
+						})
+					}
+					this.$refs.addGateDialog.close()
+				}).catch((res) => {})
+			},
+			allChange(e) {
+				if (this.linshiPrice == e.target.value) {
+					this.allChangeNum = e.target.value
+				} else {
+					if (e.target.value == '') {
+						this.allChangeNum = this.linshiPrice
+					} else {
+						this.allChangeNum = e.target.value
+					}
+
+				}
+				//监听到输入框改变，给所有的都赋值
+				if (this.isPlusAndMinus == false) {
+					for (var i = 0; i < this.temporaryList.length; i++) {
+						if (this.evalue.length == 0) {
+							this.temporaryList[i].productCount = Number(this.allChangeNum)
+						} else {
+							for (var j = 0; j < this.evalue.length; j++) {
+								if (this.evalue[j] == this.temporaryList[i].name) {
+									this.temporaryList[i].productCount = Number(this.allChangeNum)
+								}
+							}
+						}
+
+						for (var m = 0; m < this.pageOldTemList.length; m++) {
+							if (this.temporaryList[i].attributeList == this.pageOldTemList[m].attributeList) {
+								this.pageOldTemList[m].productCount = this.temporaryList[i].productCount
+							}
+						}
+						for (var j = 0; j < this.oldTemList.length; j++) {
+							if (this.temporaryList[i].attributeList == this.oldTemList[j].attributeList) {
+								this.oldTemList[j].productCount = this.temporaryList[i].productCount
+							}
+						}
+					}
+				}
+				this.isPlusAndMinus == false
+				this.temporaryChange()
+			},
+			obtainPrice(e, type, num) {
+				this.linshiPrice = e.target.value
+				if (type == 'danjia') {
+					this.carList.get(num).purchasePrice = ''
+				} else if (type == 'pifa') {
+					this.carList.get(num).wholesalePrice = ''
+				} else if (type == 'lingshou') {
+					this.carList.get(num).lsprice = ''
+					this.$forceUpdate()
+				} else if (type == 'zongjishu') {
+					this.allChangeNum = ''
+				} else if (type == 'shouldPay') {
+					this.shouldPay = ''
+				} else if (type == 'alreadyPay') {
+					this.alreadyPay = ''
+				}
+				this.$forceUpdate()
+			},
+			plusNum() {
+				this.isPlusAndMinus == true
+				//监听到点击+的操作，给所有的都+1
+				for (var i = 0; i < this.temporaryList.length; i++) {
+					if (this.evalue.length == 0) {
+						if (this.temporaryList[i].productCount == undefined) {
+							this.temporaryList[i].productCount = 1
+						} else {
+							this.temporaryList[i].productCount++
+						}
+					} else {
+						for (var j = 0; j < this.evalue.length; j++) {
+							if (this.evalue[j] == this.temporaryList[i].name) {
+								if (this.temporaryList[i].productCount == undefined) {
+									this.temporaryList[i].productCount = 1
+								} else {
+									this.temporaryList[i].productCount++
+								}
+							}
+						}
+					}
+
+					for (var m = 0; m < this.pageOldTemList.length; m++) {
+						if (this.temporaryList[i].attributeList == this.pageOldTemList[m].attributeList) {
+							this.pageOldTemList[m].productCount = this.temporaryList[i].productCount
+						}
+					}
+					for (var j = 0; j < this.oldTemList.length; j++) {
+						if (this.temporaryList[i].attributeList == this.oldTemList[j].attributeList) {
+							this.oldTemList[j].productCount = this.temporaryList[i].productCount
+						}
+					}
+				}
+				this.temporaryChange()
+			},
+			minusNum() {
+				this.isPlusAndMinus == true
+				//监听到点击-的操作，给所有的都-1
+				for (var i = 0; i < this.temporaryList.length; i++) {
+					if (this.evalue.length == 0) {
+						this.temporaryList[i].productCount--
+					} else {
+						for (var j = 0; j < this.evalue.length; j++) {
+							if (this.evalue[j] == this.temporaryList[i].name) {
+								this.temporaryList[i].productCount--
+							}
+						}
+					}
+
+					for (var m = 0; m < this.pageOldTemList.length; m++) {
+						if (this.temporaryList[i].attributeList == this.pageOldTemList[m].attributeList) {
+							this.pageOldTemList[m].productCount = this.temporaryList[i].productCount
+						}
+					}
+					for (var j = 0; j < this.oldTemList.length; j++) {
+						if (this.temporaryList[i].attributeList == this.oldTemList[j].attributeList) {
+							this.oldTemList[j].productCount = this.temporaryList[i].productCount
+						}
+					}
+				}
+				this.temporaryChange()
+			},
+			goChooseGoods() {
+				uni.navigateTo({
+					url: '/package1/AI/AiChangeGoods'
+				})
+			},
+			attrNameChange(index, data1, index1) {
+				let that = this;
+				uni.showLoading({
+					title: '加载中...'
 				})
 				this.goodsDetail.attributeList[index].isChecked = !this.goodsDetail.attributeList[index].isChecked;
 				this.goodsDetail.attributeList[index].value[index1].isChecked = !this.goodsDetail.attributeList[index]
@@ -1391,7 +1928,8 @@
 				} else {
 					this.goodsList[index].specs.push(data1)
 				}
-				let jishuqi = 0
+				let jishuqi = 0
+				console.log(this.goodsList)
 				for (var i = 0; i < this.goodsList.length; i++) {
 					if (this.goodsList[i].specs.length > 0) {
 						jishuqi++
@@ -1420,7 +1958,7 @@
 					value.push(value1)
 					this.evalue.push(name)
 				}
-
+				console.log('value',value)
 				if (jishuqi == 0) {
 					this.oldTemList = []
 				}
@@ -1505,242 +2043,355 @@
 					this.temporaryList = this.newTemList;
 					this.oldTemList = []
 					this.newTemList = []
-				}
-				setTimeout(res => {
-					uni.hideLoading();
+				}
+				setTimeout(res => {
+					uni.hideLoading();
 				}, 200)
+			},
+			clickGategroy(item) {
+				this.carList.get(this.productId).categoryName = item.categoryName
+				this.carList.get(this.productId).categoryId = item.id
+				this.$forceUpdate()
+				this.$refs.typePopup.close()
+			},
+			change() {
+				this.allChangeNum = 0
+				this.oldTemList = []
 			},
-			clickGategroy(item){
-				this.carList.get(this.productId).categoryName = item.categoryName
-				this.carList.get(this.productId).categoryId = item.id
-				this.$forceUpdate()
-				this.$refs.typePopup.close()
+			lunbochange(e) {
+				this.current = e.detail.current
 			},
-			change() {
-				this.allChangeNum = 0
-				this.oldTemList = []
+			clickItem(e) {
+				this.swiperDotIndex = e
 			},
 			//弹出商品规格选择
 			toggle(type, id) {
-				if (type == 'bottom') {
-					uni.showLoading({
-						title: '加载中...'
-					})
+				if (type == 'bottom') {
+					uni.showLoading({
+						title: '加载中...'
+					})
 					this.allChangeNum = 0
 					this.getById(id);
-				}else if(type== 'typePopup'){
-					this.productId = id
-					this.getGategoryList()
-					this.$refs.typePopup.open()
-				}else if(type== 'addGateDialog'){
-					this.$refs.addGateDialog.open("bottom")
-				}else if(type== "mergePopup"){
-					this.mergeId = id
-					this.$refs.mergePopup.open()
-				}else if(type=='center'){
+				} else if (type == 'typePopup') {
+					this.productId = id
+					this.getGategoryList()
+					this.$refs.typePopup.open()
+				} else if (type == 'addGateDialog') {
+					this.$refs.addGateDialog.open("bottom")
+				} else if (type == "mergePopup") {
+					this.mergeId = id
+					this.$refs.mergePopup.open()
+				} else if (type == 'center') {
+					this.initRecord();
+					this.voiceText = ''
+					this.$refs.popup.open(type)
+				}else if(type == 'oneGoods'){
+					this.oneGoodsId = id
 					this.initRecord();
 					this.voiceText = ''
-					this.$refs.popup.open(type)
+					this.$refs.popup.open('center')
 				}
-			},
-			//按住语音识别，开始
-			kaishi() {
-				if(this.isVoice == false){
-					this.recordState = true
-					uni.vibrateShort();
-					manager.start({
-						duration: 60000,
-						lang: "zh_CN"
-					});
-				}
-			},
-			//松开语音识别，结束
-			jieshu() {
-				this.recordState = false
-				manager.stop()
-			},
-			isCharPrecededByNumber(str, char) {
-			  const regex = new RegExp(`\\d${char}`, 'g');
-			  return regex.test(str);
-			},
-			
-			replaceCharAfterNumber(str, charToFind, charToReplace) {
-				// 正则表达式匹配字符前是否有数字，并且该字符与charToFind相同
-				const regex = new RegExp(`\\d${charToFind}`, 'g');
-				// 使用replace方法进行替换
-				return str.replace(regex, (match) => {
-				// 将匹配到的字符中的指定字符替换为charToReplace
-				return match.replace(charToFind, charToReplace);
-				});
-			},
-			//语音识别功能初始化
-			initRecord() {
-				let that = this;
-				manager.stop()
-				// 识别结束事件
-				manager.onStop = (res) => {
-					let convertedStr = this.spliceMsg(this.convertChineseToArabic(res.result));
-					console.log(convertedStr)
-					if(convertedStr.indexOf('点') != -1){
-						convertedStr = that.replaceCharAfterNumber(convertedStr,'点','.')
-					}
-					if(convertedStr.indexOf('，名称') != -1){
-						convertedStr = convertedStr.replace(/，名称/g,'名称')
-					}
-					if(convertedStr.indexOf('名称，') != -1){
-						convertedStr = convertedStr.replace(/名称，/g,'名称')
-					}
-					if(convertedStr.indexOf('名称') != -1){
-						convertedStr = convertedStr.replace(/名称/g,'，名称:')
-					}
-					if(convertedStr.indexOf('，单价') != -1){
-						convertedStr = convertedStr.replace(/，单价/g,'单价')
-					}
-					if(convertedStr.indexOf('单价，') != -1){
-						convertedStr = convertedStr.replace(/单价，/g,'单价')
-					}
-					if(convertedStr.indexOf('单价') != -1){
-						convertedStr = convertedStr.replace(/单价/g,'，单价:')
-					}
-					if(convertedStr.indexOf('，数量') != -1){
-						convertedStr = convertedStr.replace(/，数量/g,'数量')
-					}
-					if(convertedStr.indexOf('数量，') != -1){
-						convertedStr = convertedStr.replace(/数量，/g,'数量')
-					}
-					if(convertedStr.indexOf('数量') != -1){
-						convertedStr = convertedStr.replace(/数量/g,'，数量:')
-					}
-					if(convertedStr.indexOf('货号，') != -1){
-						convertedStr = convertedStr.replace(/货号，/g,'货号')
-					}
-					if(convertedStr.indexOf('货号') != -1){
-						convertedStr = convertedStr.replace(/货号/g,'货号:')
-					}
-					convertedStr = this.convertStringCorrectly(convertedStr)
-					
-					if(convertedStr.indexOf('，') == 0){
-						console.log('位置',convertedStr.indexOf('，'))
-						convertedStr = convertedStr.substr(1)
-					}
-					
-					if(that.voiceText == '' || that.voiceText == null){
-						that.voiceText = convertedStr
-					}else{
-						that.voiceText += '\n' + convertedStr
-					}
-				}
-			
-				// 识别错误事件
-				manager.onError = (res) => {
-					if(res.retcode == '-30011'){
-						that.isVoice = true
-					}
-					if(res.retcode == '-30004'){
-						// uni.hideLoading()
-						that.isVoice = false
-						uni.hideToast()
-						uni.showToast({
-							title: "未识别到声音信息,请重新录入",
-							icon: 'none'
-						})
+			},
+			//按住语音识别，开始
+			kaishi() {
+				if (this.isVoice == false) {
+					this.recordState = true
+					uni.vibrateShort();
+					manager.start({
+						duration: 60000,
+						lang: "zh_CN"
+					});
+				}
+			},
+			//松开语音识别，结束
+			jieshu() {
+				this.recordState = false
+				manager.stop()
+			},
+			isCharPrecededByNumber(str, char) {
+				const regex = new RegExp(`\\d${char}`, 'g');
+				return regex.test(str);
+			},
+
+			replaceCharAfterNumber(str, charToFind, charToReplace) {
+				// 正则表达式匹配字符前是否有数字，并且该字符与charToFind相同
+				const regex = new RegExp(`\\d${charToFind}`, 'g');
+				// 使用replace方法进行替换
+				return str.replace(regex, (match) => {
+					// 将匹配到的字符中的指定字符替换为charToReplace
+					return match.replace(charToFind, charToReplace);
+				});
+			},
+			//语音识别功能初始化
+			initRecord() {
+				let that = this;
+				manager.stop()
+				// 识别结束事件
+				manager.onStop = (res) => {
+					let convertedStr = this.spliceMsg(this.convertChineseToArabic(res.result));
+					if (convertedStr.indexOf('点') != -1) {
+						convertedStr = that.replaceCharAfterNumber(convertedStr, '点', '.')
+					}
+					if (convertedStr.indexOf('，名称') != -1) {
+						convertedStr = convertedStr.replace(/，名称/g, '名称')
+					}
+					if (convertedStr.indexOf('名称，') != -1) {
+						convertedStr = convertedStr.replace(/名称，/g, '名称')
+					}
+					if (convertedStr.indexOf('名称') != -1) {
+						convertedStr = convertedStr.replace(/名称/g, '，名称:')
+					}
+					if (convertedStr.indexOf('，单价') != -1) {
+						convertedStr = convertedStr.replace(/，单价/g, '单价')
+					}
+					if (convertedStr.indexOf('单价，') != -1) {
+						convertedStr = convertedStr.replace(/单价，/g, '单价')
+					}
+					if (convertedStr.indexOf('单价') != -1) {
+						convertedStr = convertedStr.replace(/单价/g, '，单价:')
+					}
+					if (convertedStr.indexOf('，数量') != -1) {
+						convertedStr = convertedStr.replace(/，数量/g, '数量')
+					}
+					if (convertedStr.indexOf('数量，') != -1) {
+						convertedStr = convertedStr.replace(/数量，/g, '数量')
+					}
+					if (convertedStr.indexOf('数量') != -1) {
+						convertedStr = convertedStr.replace(/数量/g, '，数量:')
+					}
+					if (convertedStr.indexOf('货号，') != -1) {
+						convertedStr = convertedStr.replace(/货号，/g, '货号')
+					}
+					if (convertedStr.indexOf('货号') != -1) {
+						convertedStr = convertedStr.replace(/货号/g, '货号:')
+					}
+					convertedStr = this.convertStringCorrectly(convertedStr)
+
+					if (convertedStr.indexOf('，') == 0) {
+						convertedStr = convertedStr.substr(1)
+					}
+					if (convertedStr.startsWith("号")) {
+						convertedStr = "货号" + convertedStr.substr(1);
+					}
+					if (that.voiceText == '' || that.voiceText == null) {
+						that.voiceText = convertedStr
+					} else {
+						that.voiceText += '\n' + convertedStr
+					}
+				}
+
+				// 识别错误事件
+				manager.onError = (res) => {
+					if (res.retcode == '-30011') {
+						that.isVoice = true
+					}
+					if (res.retcode == '-30004') {
+						// uni.hideLoading()
+						that.isVoice = false
+						uni.hideToast()
+						uni.showToast({
+							title: "未识别到声音信息,请重新录入",
+							icon: 'none'
+						})
+					}
+					if (res.retcode == '-40001') {
+						uni.showToast({
+							title: '使用次数超限制，请联系管理员！',
+							icon: 'none'
+						})
+					}
+				}
+			},
+			getAttribute(str) {
+				str = str.replace(/"色"(?![^{]*": *"色")/g, '"均色"');
+				str = str.replace(/"码"(?![^{]*": *"码")/g, '"均码"');
+				return str
+			},
+			//清空语音输入的文字
+			clearText() {
+				this.voiceText = ''
+			},
+			//正则匹配处理“2十9”等情况
+			convertStringCorrectly(str) {
+				var regexForSingleTen = /(\d+)十(?!\d)/g;
+				var regexForFollowedByDigit = /(\d+)十(?=\d)/g;
+				var step1Result = str.replace(regexForSingleTen, '$10');
+				var finalResult = step1Result.replace(regexForFollowedByDigit, '$1');
+
+				return finalResult;
+			},
+			spliceMsg(res) {
+				let regex = /嗯|啊|儿|阿|恩/g;
+				return res.replace(regex, '')
+			},
+			convertChineseToArabic(str) {
+				const chineseNumToArabic = {
+					'零': 0,
+					'一': 1,
+					'二': 2,
+					'两': 2,
+					'三': 3,
+					'四': 4,
+					'五': 5,
+					'六': 6,
+					'七': 7,
+					'八': 8,
+					'九': 9,
+					'杠': '-',
+					'刚': '-',
+					'军色': '均色',
+					'叉': 'X',
+					'金色': '均色',
+					'井': '#',
+					'时间': '10件',
+					'事件': '10件',
+					'世间': '10件',
+					'实践': '10件',
+					'实件': '10件',
+					'景': '#',
+					'警': '#',
+					'颈': '#',
+					'括号':'货号'
+				};
+				const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈|括号)/g;
+				return str.replace(regex, match => chineseNumToArabic[match]);
+			},
+			//合并已有
+			clickMerge(value, key) {
+				let that = this;
+				this.carList.get(this.mergeId).stockLogList.forEach(function(values, keys) {
+					if (that.carList.get(value).stockLogList.has(keys)) {
+						that.carList.get(value).stockLogList.get(keys).productCount += that.carList.get(that
+							.mergeId).stockLogList.get(keys).productCount
+					} else {
+						that.carList.get(value).stockLogList.set(keys, that.carList.get(that.mergeId).stockLogList
+							.get(keys))
+					}
+					that.carList.get(value).productCount += that.carList.get(that.mergeId).stockLogList.get(keys)
+						.productCount
+					that.carList.get(value).price1 = that.carList.get(value).productCount * that.carList.get(value)
+						.purchasePrice
+				})
+				this.carList.delete(this.mergeId)
+				this.$forceUpdate()
+				this.getAllPrice()
+				this.$refs.mergePopup.close()
+			},
+			AiAddSpec(value) {
+				console.log('添加规格',value)
+				this.getById(value, 1);
+			},
+			pictureAdd(id,huan) {
+				let that = this
+				if(id != ''){  //上传多图
+					this.childrenId = id
+					if(this.carList.get(id).productPictures.length > 0 && huan !='huan'){
+						console.log('productPictures',this.carList.get(id).productPictures)
+						this.productPictures = this.carList.get(id).productPictures
+						this.$refs.showImgDiaLog.open()
+						return;
+					}else if(huan == 'huan'){
+						this.$refs.showImgDiaLog.close()
 					}
-					if (res.retcode == '-40001') {
-						uni.showToast({
-							title: '使用次数超限制，请联系管理员！',
-							icon: 'none'
+				}else{
+					this.childrenId = ''
+				}
+				uni.chooseMedia({
+					count: 9,
+					mediaType: ['image'],
+					sourceType: ['album'],
+					success(res) {
+						uni.showLoading({
+							title: '加载中...',
+							mask:true
 						})
-					}
-				}
-			},
-			getAttribute(str){
-				str = str.replace(/"色"(?![^{]*": *"色")/g, '"均色"');
-				str = str.replace(/"码"(?![^{]*": *"码")/g, '"均码"');
-				return str
-			},
-			//清空语音输入的文字
-			clearText(){
-				this.voiceText = ''
-			},
-			//正则匹配处理“2十9”等情况
-			convertStringCorrectly(str) {
-			    var regexForSingleTen = /(\d+)十(?!\d)/g;
-			    var regexForFollowedByDigit = /(\d+)十(?=\d)/g;
-			    var step1Result = str.replace(regexForSingleTen, '$10');
-			    var finalResult = step1Result.replace(regexForFollowedByDigit, '$1');
-			
-			    return finalResult;
-			},
-			spliceMsg(res){
-				let regex = /嗯|啊|儿|阿|恩/g;
-				return res.replace(regex, '')
-			},
-			convertChineseToArabic(str) {
-			    const chineseNumToArabic = {
-			        '零': 0, '一': 1, '二': 2, '两': 2, '三': 3,
-			        '四': 4, '五': 5, '六': 6, '七': 7, '八': 8, 
-					'九': 9,'杠':'-','刚':'-','军色':'均色','叉':'X','金色':'均色','井':'#',
-					'时间':'10件','事件':'10件','世间':'10件','实践':'10件','实件':'10件',
-					'景':'#','警':'#','颈':'#',
-			    };
-			    const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈)/g;
-			    return str.replace(regex, match => chineseNumToArabic[match]);
-			},
-			shiqujiaodian(e){
-				console.log("11111",e);
+						if(that.childrenId !=''){
+							that.carList.get(that.childrenId).productPictures = []
+						}
+						for(let i=0;i<res.tempFiles.length;i++){
+							that.upLoadFile(res.tempFiles[i].tempFilePath,i+1)
+						}
+					}
+				})
 			},
-			//合并已有
-			clickMerge(value,key){
+			async upLoadFile(path,time){
 				let that = this;
-				this.carList.get(this.mergeId).stockLogList.forEach(function(values, keys) {
-					if(that.carList.get(value).stockLogList.has(keys)){
-						that.carList.get(value).stockLogList.get(keys).productCount += that.carList.get(that.mergeId).stockLogList.get(keys).productCount
-					}else{
-						that.carList.get(value).stockLogList.set(keys,that.carList.get(that.mergeId).stockLogList.get(keys))
+				let hiver_token = uni.getStorageSync("hiver_token")
+				await uni.uploadFile({
+					url: 'https://dev.xenjoyou.com/hiver/upload/file',
+					filePath: path,
+					name: 'file',
+					header: {
+						"content-type": "multipart/form-data",
+						'accessToken': hiver_token
+					},
+					formData: {},
+					success: (uploadFileRes) => {
+						let pathData = JSON.parse(uploadFileRes.data)
+						if(that.childrenId != ''){
+							let data = {
+								productPicture:pathData.result
+							}
+							that.carList.get(that.childrenId).productPictures.push(data)
+							that.$forceUpdate()
+						}else{
+							setTimeout(function() {
+								that.isSnList(pathData.result)
+							}, 500 * time);
+							
+							// that.addPageGoods(pathData.result)
+						}
+					},
+					fail: (err) => {
+						uni.hideLoading();
+						uni.showToast({
+							title: JSON.stringify(err),
+							icon: 'none'
+						})
 					}
-					that.carList.get(value).productCount += that.carList.get(that.mergeId).stockLogList.get(keys).productCount
-					that.carList.get(value).price1 = that.carList.get(value).productCount * that.carList.get(value).purchasePrice
-				})
-				this.carList.delete(this.mergeId)
-				this.$forceUpdate()
-				this.getAllPrice()
-				this.$refs.mergePopup.close()
-			},
-			AiAddSpec(value){
-				if(value.categoryId == '' || value.categoryId == null){
-					this.tui.toast('请先选择商品分类')
-					return;
-				}
-				console.log(value);
-				this.getById(value,1);
+				});
+				await setTimeout(res=>{
+					uni.hideLoading();
+				},1000)
 			},
 			//通过商品id查询商品详细信息
-			getById(id,current) {
-				let that = this;
-				uni.showLoading({
-					title: '加载中...'
+			getById(id, current) {
+				let that = this;
+				uni.showLoading({
+					title: '加载中...'
 				})
+				
 				this.isBottom = false
+				//判断isNew，新商品直接调店铺颜色库
 				if(current == 1){
 					that.goodsDetail = id;
-				}else{
-					this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
-						if (res.code == 200) {
-							if (res.result.delFlag == 0) {
-								that.tui.toast("请将商品上架后再操作！")
-								return
+					that.goodsDetail.attributeList = []
+					if(this.goodsDetail.isNew){
+						this.goodsList = []
+						that.goodsDetail.attributeList = this.defaultList
+						for (var i = 0; i < that.goodsDetail.attributeList.length; i++) {
+						// 	let oldCheck = false
+						// 	let oldValue = []
+							for (var m = 0; m < that.goodsDetail.attributeList[i].value.length; m++) {
+								
+								that.dataObj.set(that.goodsDetail.attributeList[i].value[m].value,that.goodsDetail.attributeList[i].name)
+						// 		if (that.goodsDetail.attributeList[i].value[m].isChecked == true) {
+						// 			oldCheck = true
+						// 			oldValue.push(that.goodsDetail.attributeList[i].value[m].value)
+						// 		}
 							}
-							that.goodsDetail = res.result;
-						} else {
-							this.tui.toast(res.message)
+							let specs1 = {
+								specs: []
+							}
+							that.goodsList.push(specs1)
+						// 	oldCheck = false
+						// 	oldValue = []
 						}
-					}).catch((res) => {})
-				}
-				this.$nextTick(()=>{
-					setTimeout(res => {
-						that.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
-							categoryId: that.goodsDetail.categoryId
-						}, false, true).then((res1) => {
+					}else{
+						that.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
+							"POST", {
+								categoryId: that.goodsDetail.categoryId
+							}, false, true).then((res1) => {
 							if (res1.code == 200) {
 								that.goodsList = []
 								if (typeof(res1.result) == 'string') {
@@ -1761,117 +2412,238 @@
 											value: valueObj
 										})
 									}
+									console.log('dataObj',that.dataObj)
 									that.goodsDetail.attributeList = newArr;
 									for (var i = 0; i < that.goodsDetail.attributeList.length; i++) {
-										let oldCheck = false
-										let oldValue = []
-										for (var m = 0; m < that.goodsDetail.attributeList[i].value
-											.length; m++) {
-											if (that.goodsDetail.attributeList[i].value[m].isChecked == true) {
-												oldCheck = true
-												oldValue.push(that.goodsDetail.attributeList[i].value[m].value)
-											}
-										}
+										// let oldCheck = false
+										// let oldValue = []
+										// for (var m = 0; m < that.goodsDetail.attributeList[i].value
+										// 	.length; m++) {
+										// 	if (that.goodsDetail.attributeList[i].value[m]
+										// 		.isChecked == true) {
+										// 		oldCheck = true
+										// 		oldValue.push(that.goodsDetail.attributeList[i]
+										// 			.value[m].value)
+										// 	}
+										// }
 										let specs1 = {
 											specs: []
 										}
 										that.goodsList.push(specs1)
-										oldCheck = false
-										oldValue = []
+										// oldCheck = false
+										// oldValue = []
 									}
 								} else {
 									that.tui.toast('失败了')
 								}
-						
+				
 							} else {
 								that.tui.toast(res1.message)
 							}
 						}).catch((res) => {})
-					}, 300)
-				})
-				this.pageOldTemList = []
-				that.temporaryList = []
-				console.log('1111',that.carList)
-				if (that.carList.size > 0) {
-					let isArgin = false
-					that.carList.forEach(function(value, key) {
-						value.stockLogList1 = []
-						if(isArgin == false){
-							value.stockLogList.forEach(function(values, keys) {
-								if(value.stockLogList1.length == 0){
-									let obj = {
-										productCount: values.productCount,
-										name: values.name,
-										attributeList: keys,
-										productNum: that.productNum
-									}
-									value.stockLogList1.push(obj)
-								}else{
-									for(var i=0;i<value.stockLogList1.length;i++){
-										if(value.stockLogList1[i].attributeList != keys){
-											if(value.stockLogList1.length == (i+1)){
-												let obj = {
-													productCount: values.productCount,
-													name: values.name,
-													attributeList: keys,
-													productNum: that.productNum
-												}
-												value.stockLogList1.push(obj)
+					}
+					
+				}else{
+					this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
+						if (res.code == 200) {
+							if (res.result.delFlag == 0) {
+								that.tui.toast("请将商品上架后再操作！")
+								return
+							}
+							that.goodsDetail = res.result;
+							that.goodsDetail.attributeList = this.defaultList
+						} else {
+							this.tui.toast(res.message)
+						}
+					}).catch((res) => {})
+					this.$nextTick(() => {
+						setTimeout(res => {
+							that.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
+								"POST", {
+									categoryId: that.goodsDetail.categoryId
+								}, false, true).then((res1) => {
+								if (res1.code == 200) {
+									that.goodsList = []
+									if (typeof(res1.result) == 'string') {
+										let newObj = JSON.parse(res1.result)
+										let newArr = []
+										let dataArr = []
+										for (let val in newObj) {
+											let valueObj = [];
+											for (var i = 0; i < newObj[val].length; i++) {
+												valueObj.push({
+													value: newObj[val][i],
+													isChecked: false
+												})
+												that.dataObj.set(newObj[val][i], val)
 											}
+											newArr.push({
+												name: val,
+												value: valueObj
+											})
 										}
-									}
-								}	
-								
-							})
-
-								if (value.productId == id) {
-									that.zNum = value.productCount
-									that.temporaryList = value.stockLogList1
-									that.pageOldTemList = value.stockLogList1
-									that.oldTemList = value.stockLogList1
-									isArgin = true
-								}else{
-									console.log()
-									if(value.isNew){
-										if(value.id == id.id){
-											that.zNum = value.productCount
-											that.temporaryList = value.stockLogList1
-											that.pageOldTemList = value.stockLogList1
-											that.oldTemList = value.stockLogList1
-											isArgin = true
-										}
-									}else{
-										if(value.productId == id.productId){
-											that.zNum = value.productCount
-											that.temporaryList = value.stockLogList1
-											that.pageOldTemList = value.stockLogList1
-											that.oldTemList = value.stockLogList1
-											isArgin = true
+										that.goodsDetail.attributeList = newArr;
+										for (var i = 0; i < that.goodsDetail.attributeList.length; i++) {
+											// let oldCheck = false
+											// let oldValue = []
+											// for (var m = 0; m < that.goodsDetail.attributeList[i].value
+											// 	.length; m++) {
+											// 	if (that.goodsDetail.attributeList[i].value[m]
+											// 		.isChecked == true) {
+											// 		oldCheck = true
+											// 		oldValue.push(that.goodsDetail.attributeList[i]
+											// 			.value[m].value)
+											// 	}
+											// }
+											let specs1 = {
+												specs: []
+											}
+											that.goodsList.push(specs1)
+											// oldCheck = false
+											// oldValue = []
 										}
+									} else {
+										that.tui.toast('失败了')
 									}
-									 
+					
+								} else {
+									that.tui.toast(res1.message)
 								}
-								value.stockLogList1 = []
-						
-						}
-						
+							}).catch((res) => {})
+						}, 300)
 					})
-					// console.log('2222',that.carList)
-					that.zNum = 0
-					// console.log('id',id)
-					// that.$nextTick(() => {
-					// 	console.log("carList",that.carList)
-					// 	that.carList.forEach(function(value, key) {
-							
-					// 	})
-					// })
-				}
-				setTimeout(res => {
-					this.getKCList(current == 1?id.id:id);
+				}
+				this.pageOldTemList = []
+				that.temporaryList = []
+				if (that.carList.size > 0) {
+					let isArgin = false
+					that.carList.forEach(function(value, key) {
+						value.stockLogList1 = []
+						if (isArgin == false) {
+							value.stockLogList.forEach(function(values, keys) {
+								if (value.stockLogList1.length == 0) {
+									let obj = {
+										productCount: values.productCount,
+										name: values.name,
+										attributeList: keys,
+										productNum: that.productNum
+									}
+									value.stockLogList1.push(obj)
+								} else {
+									for (var i = 0; i < value.stockLogList1.length; i++) {
+										if (value.stockLogList1[i].attributeList != keys) {
+											if (value.stockLogList1.length == (i + 1)) {
+												let obj = {
+													productCount: values.productCount,
+													name: values.name,
+													attributeList: keys,
+													productNum: that.productNum
+												}
+												value.stockLogList1.push(obj)
+											}
+										}
+									}
+								}
+
+							})
+
+							if (value.productId == id) {
+								that.zNum = value.productCount
+								that.temporaryList = value.stockLogList1
+								that.pageOldTemList = value.stockLogList1
+								that.oldTemList = value.stockLogList1
+								isArgin = true
+							} else {
+								if (value.isNew) {
+									if (value.id == id.id) {
+										that.zNum = value.productCount
+										that.temporaryList = value.stockLogList1
+										that.pageOldTemList = value.stockLogList1
+										that.oldTemList = value.stockLogList1
+										isArgin = true
+									}
+								} else {
+									if (value.productId == id.productId) {
+										that.zNum = value.productCount
+										that.temporaryList = value.stockLogList1
+										that.pageOldTemList = value.stockLogList1
+										that.oldTemList = value.stockLogList1
+										isArgin = true
+									}
+								}
+
+							}
+							value.stockLogList1 = []
+
+						}
+
+					})
+					that.zNum = 0
+					// that.$nextTick(() => {
+					// 	that.carList.forEach(function(value, key) {
+
+					// 	})
+					// })
+				}
+				setTimeout(res => {
+					this.getKCList(current == 1 ? id.id : id);
 				}, 300)
+			},
+			changeSn(){
+				
+			},
+			//新增商品的时候，判断有没有货号生成规则，没有则弹出货号新增弹出层
+			async isSnList(img){
+				if(this.isGenerateSnRadio == 1){ //不自动生成货号
+					await this.addPageGoods(img,'')
+				}else{
+					if(this.snList.length > 0){
+						await this.getNewSn(img)
+					}else{
+						this.zhuImg = img
+						this.$refs.SNDialog.open('center')
+					}
+				}
+				
+			},
+			//获取新货号
+			getNewSn(img){
+				this.tui.request("/app/productSn/getNewProductSn", "POST", {
+					snPre: this.snName
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.addPageGoods(img,res.result)
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
+			//getNewProductSnMore     count/snPre
+			addPageGoods(path,sn) {
+				let obj = {
+					id: generateUUID(),
+					purchasePrice: 0, //进货价
+					price: 0,
+					price1:0,
+					categoryName: this.categoryList.categoryName,
+					categoryId: this.categoryList.categoryId,
+					productCount: 0,
+					productId: "",
+					productName: "",
+					wholesalePrice: 0,
+					lsprice: 0,
+					isNew: true,
+					productPictures:[],
+					productPicture: path?path:'',
+					productSn: sn?sn:"",
+					stockLogList: new Map(),
+					stockLogList1: []
+				}
+				this.carList.set(obj.id, obj)
+				this.$forceUpdate()
 			},
 			//库存商品详情
-			getKCList(id) {
+			getKCList(id) {
 				let that = this
 				this.tui.request("/app/stock/productCount", "GET", {
 					productId: id
@@ -1882,60 +2654,59 @@
 						this.tui.toast(res.message)
 					}
 				}).catch((res) => {})
-				setTimeout(res => {
-					that.$forceUpdate()
-					uni.hideLoading();
-					this.$refs.shopPopup.open('bottom')
+				setTimeout(res => {
+					that.$forceUpdate()
+					uni.hideLoading();
+					this.$refs.shopPopup.open('bottom')
 				}, 200)
 			},
-			temporaryChange(val,item) {
-				console.log(item)
-				if(item != '' && item != undefined){
-					for(var m=0;m<this.pageOldTemList.length;m++){
-						if(item.attributeList == this.pageOldTemList[m].attributeList){
-							this.pageOldTemList[m].productCount = item.productCount
-							break;
-						}
-					}
-					for(var j=0;j<this.oldTemList.length;j++){
-						if(item.attributeList == this.oldTemList[j].attributeList){
-							this.oldTemList[j].productCount = item.productCount
-							break;
-						}
-					}
+			temporaryChange(val, item) {
+				if (item != '' && item != undefined) {
+					for (var m = 0; m < this.pageOldTemList.length; m++) {
+						if (item.attributeList == this.pageOldTemList[m].attributeList) {
+							this.pageOldTemList[m].productCount = item.productCount
+							break;
+						}
+					}
+					for (var j = 0; j < this.oldTemList.length; j++) {
+						if (item.attributeList == this.oldTemList[j].attributeList) {
+							this.oldTemList[j].productCount = item.productCount
+							break;
+						}
+					}
 				}
 				this.zNum = 0
 				for (var i = 0; i < this.temporaryList.length; i++) {
 					this.zNum += this.temporaryList[i].productCount || 0
 				}
 			},
-			clickClose(){
-				this.evalue = []
-				this.allChangeNum = 0
+			clickClose() {
+				this.evalue = []
+				this.allChangeNum = 0
 			},
 			//弹窗选择规格后，点击弹窗中选好了按钮
-			temporaryCheck() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				this.evalue = []
-				console.log(this.temporaryList)
+			temporaryCheck() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				this.evalue = []
 				let that = this,
 					carList1 = []
 				let data = {
-					id: this.goodsDetail.productId?this.goodsDetail.productId:this.goodsDetail.id,
+					id: this.goodsDetail.productId ? this.goodsDetail.productId : this.goodsDetail.id,
 					price: 0,
-					num: this.zNum,
-					productId:this.goodsDetail.productId,
-					productName: this.goodsDetail.productName,
-					wholesalePrice: this.goodsDetail.wholesalePrice,
-					purchasePrice:this.goodsDetail.purchasePrice,
-					categoryName:this.goodsDetail.categoryName,
-					categoryId:this.carList1.categoryId,
+					num: this.zNum,
+					productId: this.goodsDetail.productId,
+					productName: this.goodsDetail.productName,
+					wholesalePrice: this.goodsDetail.wholesalePrice,
+					purchasePrice: this.goodsDetail.purchasePrice,
+					categoryName: this.goodsDetail.categoryName,
+					categoryId: this.goodsDetail.attrId,
 					lsprice: this.goodsDetail.price,
 					productSn: this.goodsDetail.productSn,
 					productPicture: this.goodsDetail.productPicture,
-					supplierName: this.goodsDetail.supplierName,
+					supplierName: this.goodsDetail.supplierName,
+					productPictures:[],
 					saleDetailQueryDTO: this.temporaryList
 				}
 				carList1.push(data)
@@ -1952,20 +2723,21 @@
 				if (this.carList.size == 0) { //当前页没有数据
 					for (let i = 0; i < carList1.length; i++) {
 						let obj = {
-							purchasePrice: this.userType == 0?this.goodsDetail.purchasePrice:'', //进货价
-							price:this.goodsDetail.price,
-							price1:0,
-							productCount: 0,
+							purchasePrice: this.userType == 0 ? this.goodsDetail.purchasePrice : '', //进货价
+							price: this.goodsDetail.price,
+							price1: 0,
+							productCount: 0,
 							id: carList1[i].id,
-							productId: carList1[i].id,
-							wholesalePrice: this.goodsDetail.wholesalePrice,
-							categoryName:this.goodsDetail.categoryName,
-							categoryId:this.goodsDetail.categoryId,
+							productId: carList1[i].id,
+							wholesalePrice: this.goodsDetail.wholesalePrice,
+							categoryName: this.goodsDetail.categoryName,
+							categoryId: this.goodsDetail.attrId,
 							lsprice: this.goodsDetail.price,
 							productName: carList1[i].productName,
 							productPicture: carList1[i].productPicture,
 							productSn: carList1[i].productSn,
-							stockLogList: new Map(),
+							stockLogList: new Map(),
+							productPictures:[],
 							stockLogList1: []
 						}
 						for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
@@ -1975,48 +2747,47 @@
 								name: carList1[i].saleDetailQueryDTO[m].name
 							}
 							obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-							obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
+							obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
 							obj.price1 = obj.productCount * this.goodsDetail.purchasePrice
 						}
 						this.carList.set(carList1[i].id, obj)
 					}
 					carList1 = []
 
-				} else { //当前页有数据
-					
-					for (let i = 0; i < carList1.length; i++) {
-						console.log('stockLogList',this.carList)
-						console.log('stockLogList',carList1[i].id)
-						if(this.carList.has(carList1[i].id) == true){
-							this.carList.get(carList1[i].id).stockLogList = new Map()
-						}
-						
-						if (this.carList.has(carList1[i].id) == true) { //商品相同
-							if(this.carList.get(carList1[i].id)){
-								this.carList.get(carList1[i].id).productCount = 0
+				} else { //当前页有数据
+
+					for (let i = 0; i < carList1.length; i++) {
+						if (this.carList.has(carList1[i].id) == true) {
+							this.carList.get(carList1[i].id).stockLogList = new Map()
+						}
+
+						if (this.carList.has(carList1[i].id) == true) { //商品相同
+							if (this.carList.get(carList1[i].id)) {
+								this.carList.get(carList1[i].id).productCount = 0
 							}
 							for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
 								if (this.carList.get(carList1[i].id).stockLogList.has(carList1[i]
 										.saleDetailQueryDTO[
-											m].attributeList) == true) { //规格相同
-											
-									var data1 = {
-										productCount: carList1[i].saleDetailQueryDTO[m].productCount,
-										name: carList1[i].saleDetailQueryDTO[m].name
-									}
-									
-									this.carList.get(carList1[i].id).stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)		
+											m].attributeList) == true) { //规格相同
+
+									var data1 = {
+										productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+										name: carList1[i].saleDetailQueryDTO[m].name
+									}
+
+									this.carList.get(carList1[i].id).stockLogList.set(carList1[i].saleDetailQueryDTO[m]
+										.attributeList, data1)
 									// this.carList.get(carList1[i].id).stockLogList.get(carList1[i]
 									// 	.saleDetailQueryDTO[m].attributeList).productCount += carList1[i]
-									// 	.saleDetailQueryDTO[m].productCount
+									// 	.saleDetailQueryDTO[m].productCount
 									// this.carList.get(carList1[i].id).price1 = this.carList.get(carList1[i].id).productCount * this.goodsDetail.purchasePrice
 
 								} else { //规格不同
-									var data1 = {
-										productCount: carList1[i].saleDetailQueryDTO[m].productCount,
-										name: carList1[i].saleDetailQueryDTO[m].name
-									}
-									this.carList.get(carList1[i].id).stockLogList.set(carList1[i].saleDetailQueryDTO[
+									var data1 = {
+										productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+										name: carList1[i].saleDetailQueryDTO[m].name
+									}
+									this.carList.get(carList1[i].id).stockLogList.set(carList1[i].saleDetailQueryDTO[
 										m].attributeList, data1)
 								}
 								this.carList.get(carList1[i].id).productCount += carList1[i].saleDetailQueryDTO[
@@ -2026,19 +2797,20 @@
 							}
 						} else { //商品不同
 							let obj = {
-								purchasePrice: this.userType == 0?this.goodsDetail.purchasePrice:'', //进货价
-								price:this.goodsDetail.price,
+								purchasePrice: this.userType == 0 ? this.goodsDetail.purchasePrice : '', //进货价
+								price: this.goodsDetail.price,
 								price1: 0,
 								productCount: 0,
-								productId: carList1[i].id,
-								categoryId:this.goodsDetail.categoryId,
-								productName: carList1[i].productName,
-								wholesalePrice: this.goodsDetail.wholesalePrice,
+								productId: carList1[i].id,
+								categoryId: this.goodsDetail.attrId,
+								productName: carList1[i].productName,
+								wholesalePrice: this.goodsDetail.wholesalePrice,
 								lsprice: this.goodsDetail.price,
 								productPicture: carList1[i].productPicture,
 								stockLogList: new Map(),
 								productSn: carList1[i].productSn,
-								stockLogList1: [],
+								stockLogList1: [],
+								productPictures:[],
 								name: ''
 							}
 
@@ -2048,7 +2820,7 @@
 									name: carList1[i].saleDetailQueryDTO[m].name
 								}
 								obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-								obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
+								obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
 								obj.price1 = obj.productCount * this.goodsDetail.purchasePrice
 							}
 							this.carList.set(carList1[i].id, obj)
@@ -2057,60 +2829,91 @@
 					carList1 = []
 				}
 				this.getAllPrice()
-				this.$refs.shopPopup.close()
+				this.$refs.shopPopup.close()
 				this.allChangeNum = 0
-				setTimeout(res => {
-					uni.hideLoading();
+				setTimeout(res => {
+					uni.hideLoading();
 				}, 500)
 			},
-			changessPrice(e) {
-				if(this.linshiPrice == e.target.value){
-					this.shouldPay = e.target.value
-				}else{
-					if(e.target.value == ''){
-						this.shouldPay = this.linshiPrice
-					}else{
-						this.shouldPay = e.target.value
-					}
-					
-				}
+			changessPrice(e) {
+				if (this.linshiPrice == e.target.value) {
+					this.shouldPay = e.target.value
+				} else {
+					if (e.target.value == '') {
+						this.shouldPay = this.linshiPrice
+					} else {
+						this.shouldPay = e.target.value
+					}
+
+				}
 				this.alreadyPay = this.shouldPay
 				this.noPay = this.shouldPay - this.alreadyPay;
 			},
-			//货号是否重复
-			getSnIsRepeat(e,id){
-				this.tui.request('/app/product/getByProductSn', "post", {
-					productSn:e.detail.value
-				}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						if(res1.result != ''){
-							this.tui.toast('当前货号已被商品：“'+res1.result[0].productName+'”占用，请重新输入')
-							this.carList.get(id).productSn = ""
-							this.$forceUpdate()
-						}else{
-							this.carList.get(id).productSn = e.detail.value
+			sninput(e ,id){
+				console.log(e.detail.value)
+				this.carList.get(id).productSn = e.detail.value
+				this.$forceUpdate()
+			},
+			//货号是否重复
+			getSnIsRepeat(e, id) {
+				let that = this;
+				if(e.detail.value != ''){
+					this.tui.request('/app/product/getByProductSn', "post", {
+						productSn: e.detail.value
+					}, false, true).then((res1) => {
+						if (res1.code == 200) {
+							if (res1.result != '') {
+								that.tui.toast('当前货号已被商品：“' + res1.result[0].productName + '”占用，请重新输入')
+								setTimeout(res=>{
+									that.carList.get(id).productSn = ''
+								},100)
+								
+								setTimeout(res=>{
+									that.$forceUpdate()
+								},300)
+							} 
+							// else {
+							// 	that.carList.get(id).productSn = e.detail.value
+							// }
+					
 						}
-						
-					}
-				})
-			},
-			getName(e,id){
-				this.carList.get(id).productName = e.detail.value
+					})
+					this.carList.forEach(function(value, key) {
+						if(value.id != id){
+							if(value.productSn == e.detail.value){
+								that.tui.toast('该货号被页面其他商品占用,请重新输入！')
+								setTimeout(res=>{
+									that.carList.get(id).productSn = ''
+								},100)
+								setTimeout(res=>{
+									that.$forceUpdate()
+								},300)
+								
+							}
+						}
+					})
+					
+				}
+				console.log('点击',this.carList)
+			
+			},
+			getName(e, id) {
+				this.carList.get(id).productName = e.detail.value
 			},
 			//计算欠款
 			changePay(e) {
-				if(this.linshiPrice == e.target.value){
-					this.alreadyPay = e.target.value
-				}else if(Number(e.detail.value) > Number(this.shouldPay)){
-					this.alreadyPay = this.shouldPay
-				}else{
-					if(e.target.value == ''){
-						this.alreadyPay = this.linshiPrice
-					}else{
-						this.alreadyPay = e.target.value
-					}
+				if (this.linshiPrice == e.target.value) {
+					this.alreadyPay = e.target.value
+				} else if (Number(e.detail.value) > Number(this.shouldPay)) {
+					this.alreadyPay = this.shouldPay
+				} else {
+					if (e.target.value == '') {
+						this.alreadyPay = this.linshiPrice
+					} else {
+						this.alreadyPay = e.target.value
+					}
 				}
-				this.noPay = this.shouldPay - this.alreadyPay
+				this.noPay = this.shouldPay - this.alreadyPay
 				this.noPay = this.noPay.toFixed(2)
 			},
 			//跳转选择供应商
@@ -2149,25 +2952,27 @@
 					title: "提示",
 					content: "确定删除此条规格吗？",
 					success: function(res) {
-						if (res.confirm) {
-							if(that.carList.get(id).stockLogList.size == 1){
-								that.carList.get(id).productCount = that.carList.get(id).stockLogList.get(name).productCount;
-							}else{
-								that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name).productCount;
+						if (res.confirm) {
+							if (that.carList.get(id).stockLogList.size == 1) {
+								that.carList.get(id).productCount = that.carList.get(id).stockLogList.get(name)
+									.productCount;
+							} else {
+								that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(
+									name).productCount;
 							}
-							
+
 							let count = that.carList.get(id).stockLogList.get(name).productCount
-							that.carList.get(id).stockLogList.delete(name)
-							
+							that.carList.get(id).stockLogList.delete(name)
+
 							that.carList.get(id).price1 = that.carList.get(id).productCount * that.carList.get(
 								id).purchasePrice
 							if (that.carList.get(id).stockLogList.size == 0) {
-								let key = '{"颜色":"均色","尺码":"均码"}'
-								let value = {
-									name:'均色/均码/',
-									productCount: count
-								}
-								that.carList.get(id).stockLogList.set(key,value)
+								let key = '{"颜色":"均色","尺码":"均码"}'
+								let value = {
+									name: '均色/均码/',
+									productCount: count
+								}
+								that.carList.get(id).stockLogList.set(key, value)
 							}
 
 							that.getAllPrice()
@@ -2176,170 +2981,185 @@
 					}
 				})
 
-			},
-			gysList(){
-				let that = this;
-				this.tui.request("/app/supplier/getByCondition", "post", {
-					searchStr:'默认供应商',
-					pageNumber: 1,
-					pageSize: 10
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						if(res.result.content.length == 0){
-							that.tui.request("/app/supplier/save", "post", {
-								consigneeMobile: '',
-								consigneeName: '默认供应商',
-								address1: '',
-								address: '',
-								province: '',
-								city: '',
-								area: ''
-							}, false,true).then((res) => {
-								if (res.code == 200) {
-									that.gysList()
-								}
-							}) 
-						}else{
-							that.khName = res.result.content[0]
-							that.goRuku()
-						}
-						
-					}else{
-						this.tui.toast(res.message)
-					}
-				})
-			},
-			async goRuku(){
-				let that = this;
-				let purchase = {
-					// id:uni.getStorageSync('AiInventoryId'),
-					alreadyPay: this.alreadyPay == '' ? 0 : this.alreadyPay, //已付金额
-					noPay: this.noPay == '' ? 0 : this.noPay, //欠款
-					shouldPay: this.shouldPay, //应付金额
-					totalAmount: this.totalAmount, //总数量
-					remark: this.remark,
-					otherPay: this.otherPay == '' ? 0 : this.otherPay,
-					supplierId: this.khName.id, //供应商id和姓名
-					supplierName: this.khName.consigneeName
-				}
-				let purchaseDetails = [];
+			},
+			gysList() {
+				let that = this;
+				this.tui.request("/app/supplier/getByCondition", "post", {
+					searchStr: '默认供应商',
+					pageNumber: 1,
+					pageSize: 10
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						if (res.result.content.length == 0) {
+							that.tui.request("/app/supplier/save", "post", {
+								consigneeMobile: '',
+								consigneeName: '默认供应商',
+								address1: '',
+								address: '',
+								province: '',
+								city: '',
+								area: ''
+							}, false, true).then((res) => {
+								if (res.code == 200) {
+									that.gysList()
+								}
+							})
+						} else {
+							that.khName = res.result.content[0]
+							that.goRuku()
+						}
+
+					} else {
+						this.tui.toast(res.message)
+					}
+				})
+			},
+			async goRuku() {
+				let that = this;
+				let purchase = {
+					// id:uni.getStorageSync('AiInventoryId'),
+					alreadyPay: this.alreadyPay == '' ? 0 : this.alreadyPay, //已付金额
+					noPay: this.noPay == '' ? 0 : this.noPay, //欠款
+					shouldPay: this.shouldPay, //应付金额
+					totalAmount: this.totalAmount, //总数量
+					remark: this.remark,
+					otherPay: this.otherPay == '' ? 0 : this.otherPay,
+					supplierId: this.khName.id, //供应商id和姓名
+					supplierName: this.khName.consigneeName
+				}
+				let purchaseDetails = [];
 				let jishuqi = 0
-				this.carList.forEach(function(value, key) {
-					// if(value.productName == ''){
-					// 	uni.showToast({
-					// 		title:  "品名必须维护~",
-					// 		icon: 'none'
-					// 	})
-					// 	return
-					// }
-					if(value.productSn == ''){
-						uni.showToast({
-							title: value.productName + "的货号必须维护~",
-							icon: 'none'
-						})
-						return
-					}
-					// if(value.wholesalePrice ==null || value.wholesalePrice ==undefined || value.wholesalePrice <= 0 || value.wholesalePrice == ""){
-					// 	uni.showToast({
-					// 		title: value.productName + "的批发价必须维护~",
-					// 		icon: 'none'
-					// 	})
-					// 	return
-					// }
-					// if(value.lsprice ==null || value.lsprice ==undefined || value.lsprice <= 0 || value.lsprice == ""){
-					// 	uni.showToast({
-					// 		title: value.productName + "的零售价必须维护~",
-					// 		icon: 'none'
-					// 	})
-					// 	return
-					// }else{
-						value.price = value.lsprice
-					// }
-					value.stockLogList1 = []
-					// if (value.purchasePrice == '' || value.purchasePrice == 0) {
-					// 	uni.showToast({
-					// 		title: value.productName + "的价格必须维护~",
-					// 		icon: 'none'
-					// 	})
-					// 	return
+				console.log('carList',this.carList)
+				this.carList.forEach(function(value, key) {
+					// if(value.productName == ''){
+					// 	uni.showToast({
+					// 		title:  "品名必须维护~",
+					// 		icon: 'none'
+					// 	})
+					// 	return
+					// }
+					if (value.productSn == '') {
+						uni.showToast({
+							title: value.productName + "的货号必须维护~",
+							icon: 'none'
+						})
+						return
+					}
+					// if(value.wholesalePrice ==null || value.wholesalePrice ==undefined || value.wholesalePrice <= 0 || value.wholesalePrice == ""){
+					// 	uni.showToast({
+					// 		title: value.productName + "的批发价必须维护~",
+					// 		icon: 'none'
+					// 	})
+					// 	return
+					// }
+					// if(value.lsprice ==null || value.lsprice ==undefined || value.lsprice <= 0 || value.lsprice == ""){
+					// 	uni.showToast({
+					// 		title: value.productName + "的零售价必须维护~",
+					// 		icon: 'none'
+					// 	})
+					// 	return
+					// }else{
+					value.price = value.lsprice
+					// }
+					value.stockLogList1 = []
+					// if (value.purchasePrice == '' || value.purchasePrice == 0) {
+					// 	uni.showToast({
+					// 		title: value.productName + "的价格必须维护~",
+					// 		icon: 'none'
+					// 	})
+					// 	return
+					// }
+					// if ((value.categoryId == '' && value.productId == '') || (value.categoryId == null && value
+					// 		.productId == '')) {
+					// 	that.tui.toast(value.productName + "分类未维护~")
+					// 	return;
 					// }
-					if((value.categoryId == '' && value.productId == '') || (value.categoryId == null && value.productId == '')){
-						that.tui.toast(value.productName + "分类未维护~")
-						return;
-					}
-					value.stockLogList.forEach(function(values, keys) {
-						if (values <= 0) {
-							that.tui.toast("入库数量不能为零~")
-							return;
-						}
+					if(value.stockLogList.size == 0){
 						let obj = {
-							productCount: values.productCount,
-							attributeList: keys
+							productCount: 1,
+							attributeList: '{"颜色":"均色","尺码":"均码"}'
 						}
+						value.productCount = 1
+						value.price1 = value.productCount * value.purchasePrice
 						value.stockLogList1.push(obj)
-					})
-					// delete value.id;
-					purchaseDetails.push(value)
-					jishuqi ++
-				})
-				if(jishuqi == this.carList.size){
-					await this.goInventory(purchase,purchaseDetails)
-				}
+					}else{
+						value.stockLogList.forEach(function(values, keys) {
+							console.log('values',values)
+							if (values <= 0) {
+								that.tui.toast("入库数量不能为零~")
+								return;
+							}
+							let obj = {
+								productCount: values.productCount,
+								attributeList: keys
+							}
+							value.stockLogList1.push(obj)
+						})
+					}
+					
+					// delete value.id;
+					purchaseDetails.push(value)
+					jishuqi++
+				})
+				if (jishuqi == this.carList.size) {
+					await this.goInventory(purchase, purchaseDetails)
+				}
 			},
 			async inventorySubmit() {
 				if (this.khName == '') {
 					await this.gysList()
-				}else{
-					this.goRuku()
+				} else {
+					this.goRuku()
+				}
+
+			},
+			goInventory(purchase, purchaseDetails) {
+				uni.navigateTo({
+					url: '/package1/inventory/inventoryConfirm?aiinventory=1&purchase=' + JSON.stringify(
+						purchase) + '&purchaseDetails=' + JSON.stringify(purchaseDetails)
+				})
+			},
+			//编辑每一个的单价
+			clickCollapse(e, id) {
+				if (this.linshiPrice == e.target.value) {
+					this.carList.get(id).purchasePrice = e.target.value
+				} else {
+					if (e.detail.value == '') {
+						this.carList.get(id).purchasePrice = this.linshiPrice
+					} else {
+						this.carList.get(id).purchasePrice = Number(e.detail.value)
+					}
+				}
+				this.carList.get(id).price1 = this.carList.get(id).productCount * this.carList.get(id).purchasePrice
+				this.getAllPrice()
+			},
+			//编辑每一个的批和零售
+			PriceAndWho(e, id, type) {
+				if (type == 'pi') {
+					if (this.linshiPrice == e.target.value) {
+						this.carList.get(id).wholesalePrice = e.target.value
+					} else {
+						if (e.detail.value == '') {
+							this.carList.get(id).wholesalePrice = this.linshiPrice
+						} else {
+							this.carList.get(id).wholesalePrice = Number(e.detail.value)
+						}
+					}
+				} else {
+					if (this.linshiPrice == e.target.value) {
+						this.carList.get(id).price = e.target.value
+						this.carList.get(id).lsprice = e.target.value
+					} else {
+						if (e.detail.value == '') {
+							this.carList.get(id).price = this.linshiPrice
+							this.carList.get(id).lsprice = this.linshiPrice
+						} else {
+							this.carList.get(id).price = Number(e.detail.value)
+							this.carList.get(id).lsprice = Number(e.detail.value)
+						}
+					}
 				}
-				
-			},
-			goInventory(purchase,purchaseDetails){
-				uni.navigateTo({
-					url: '/package1/inventory/inventoryConfirm?aiinventory=1&purchase=' + JSON.stringify(purchase) + '&purchaseDetails=' + JSON.stringify(purchaseDetails)
-				})
-			},
-			//编辑每一个的单价
-			clickCollapse(e,id) {
-				if(this.linshiPrice == e.target.value){
-					this.carList.get(id).purchasePrice = e.target.value
-				}else{
-					if(e.detail.value == ''){
-						this.carList.get(id).purchasePrice = this.linshiPrice
-					}else{
-						this.carList.get(id).purchasePrice = Number(e.detail.value)
-					}
-				}
-				this.carList.get(id).price1 = this.carList.get(id).productCount * this.carList.get(id).purchasePrice
-				this.getAllPrice()
-			},
-			//编辑每一个的批和零售
-			PriceAndWho(e,id,type) {
-				if(type == 'pi'){
-					if(this.linshiPrice == e.target.value){
-						this.carList.get(id).wholesalePrice = e.target.value
-					}else{
-						if(e.detail.value == ''){
-							this.carList.get(id).wholesalePrice = this.linshiPrice
-						}else{
-							this.carList.get(id).wholesalePrice = Number(e.detail.value)
-						}
-					}
-				}else{
-					if(this.linshiPrice == e.target.value){
-						this.carList.get(id).price = e.target.value
-						this.carList.get(id).lsprice = e.target.value
-					}else{
-						if(e.detail.value == ''){
-							this.carList.get(id).price = this.linshiPrice
-							this.carList.get(id).lsprice = this.linshiPrice
-						}else{
-							this.carList.get(id).price = Number(e.detail.value)
-							this.carList.get(id).lsprice = Number(e.detail.value)
-						}
-					}
-				}
-				this.$forceUpdate()
+				this.$forceUpdate()
 			},
 			//计算总金额和总数量
 			getAllPrice() {
@@ -2349,21 +3169,27 @@
 				this.carList.forEach(function(value, key) {
 					that.shouldPay = that.shouldPay + value.price1
 					that.totalAmount = that.totalAmount + value.productCount
-				})
+				})
 				that.shouldPay = that.shouldPay.toFixed(2)
 				this.alreadyPay = this.shouldPay
-				that.noPay = this.shouldPay - this.alreadyPay
+				that.noPay = this.shouldPay - this.alreadyPay
 				this.$forceUpdate()
+			},
+			//选择是否需要自动生成货号
+			isChange(index) {
+				this.isGenerateSnRadio = index
 			},
 			//修改已选规格的数量
 			GoodsNumChange(e, index, index1) {
 				let that = this;
-				this.carList.get(index[0]).stockLogList.get(index1).productCount = e
+				this.carList.get(index[0]).stockLogList.get(index1).productCount = e
 				this.carList.get(index[0]).productCount = 0
 				this.carList.get(index[0]).stockLogList.forEach(function(value, key) {
-					that.carList.get(index[0]).productCount = that.carList.get(index[0]).productCount + value.productCount
-					that.carList.get(index[0]).price1 = that.carList.get(index[0]).productCount * that.carList.get(index[0]).purchasePrice
-				})
+					that.carList.get(index[0]).productCount = that.carList.get(index[0]).productCount + value
+						.productCount
+					that.carList.get(index[0]).price1 = that.carList.get(index[0]).productCount * that.carList.get(
+						index[0]).purchasePrice
+				})
 				that.getAllPrice()
 			}
 		}
@@ -2372,19 +3198,21 @@
 
 <style lang="scss">
 	page,
-	.page1 {
-		height: 1280rpx;
-		overflow-y: scroll;
+	.page1 {
+		height: 1280rpx;
+		overflow-y: scroll;
 		min-height: 100vh;
 	}
-	.u-upload{
-		position: absolute;
-		top: 30rpx;
-		left: 30rpx;
-		opacity: 0;
-		width: 140rpx;
-		height: 140rpx;
+
+	.u-upload {
+		position: absolute;
+		top: 30rpx;
+		left: 30rpx;
+		opacity: 0;
+		width: 140rpx;
+		height: 140rpx;
 	}
+
 	.content {
 		border-top: 1px solid #eee;
 		overflow-y: scroll;
@@ -2480,9 +3308,9 @@
 		flex: 1;
 		display: flex;
 		flex-direction: column;
-		padding-left: 20rpx;
-		height: 180rpx;
-		margin-top:20rpx;
+		padding-left: 20rpx;
+		height: 280rpx;
+		margin-top: 20rpx;
 	}
 
 	.shop-productName view {
@@ -2493,7 +3321,7 @@
 		display: flex;
 		height: 80rpx;
 		font-size: 26rpx;
-		line-height: 80rpx;
+		line-height: 80rpx;
 		border-top: 1px solid #eee;
 	}
 
@@ -2530,7 +3358,7 @@
 		display: flex;
 		background: #fff;
 		border-top: 1px solid #eee;
-		height: 150rpx;
+		height: 150rpx;
 		z-index: 99;
 	}
 
@@ -2630,9 +3458,9 @@
 		text {
 			display: inline-block;
 			border: 1px solid #5fd9ee;
-			margin: 20rpx;
-			    margin-bottom: 0;
-			    margin-left: 0;
+			margin: 20rpx;
+			margin-bottom: 0;
+			margin-left: 0;
 			background-color: #fff;
 			color: #5fd9ee;
 			padding: 0 10px;
@@ -2673,7 +3501,7 @@
 		z-index: 99;
 		background: #fff;
 	}
-	
+
 	.shop-popup-bottom-left {
 		width: 50%;
 		line-height: 80rpx;
@@ -2705,232 +3533,306 @@
 		line-height: 140rpx;
 		color: #777;
 		background: #eee;
+	}
+
+	.new-logo {
+		position: absolute;
+		top: 35rpx;
+		left: 131rpx;
+		background: red;
+		color: #fff;
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align: center;
+		border-top-right-radius: 10px;
+	}
+
+	.goods-btn {
+		color: #fff;
+		border-radius: 5px;
+		background: linear-gradient(90deg, #60F3FF, #088FEB);
+		height: 60rpx;
+		width: 150rpx;
+		padding: 5px;
+		margin: 0 auto;
+		text-align: center;
+	}
+
+	.shop-btn {
+		display: flex;
+	}
+
+	.shop-title {
+		display: flex;
+		height: 80rpx;
+		line-height: 80rpx;
+		padding-left: 70rpx;
+		text-align: center;
+	}
+
+	.shop-type {
+		margin-top: 40rpx;
+		border-top: 1px solid #eee;
+	}
+
+	.left-btn {
+		font-weight: 800;
+		font-size: 22rpx;
+		color: #fff;
+		background: #088FEB;
+		border-radius: 5px;
+		width: 60rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align: center;
+	}
+
+	.type-popup {
+		width: 500rpx;
+		height: auto;
+		background: #fff;
+		border-radius: 10px;
+		position: relative;
+		margin-bottom: 40rpx;
+	}
+
+	.card-list {
+		width: 95%;
+		border-radius: 10upx;
+		background: #fff;
+		height: auto;
+		margin: 40rpx auto 0;
+
+	}
+
+	.title-fur {
+		width: 95%;
+		height: 50rpx;
+		margin: 0 auto;
+		border-bottom: 1px solid #eee;
+	}
+
+	.name {
+		font-size: 30rpx;
+		width: 50%;
+		float: left;
+		height: 50rpx;
+		line-height: 70rpx;
+	}
+
+	.rightBox {
+		display: flex;
+		float: right;
+	}
+
+	.content-fur {
+		padding-bottom: 25rpx;
+	}
+
+	.content-low {
+		width: auto;
+		border: 1px solid #eee;
+		display: inline-block;
+		min-width: 90rpx;
+		padding: 5rpx;
+		font-size: 35rpx;
+		text-align: center;
+		color: #777;
+		margin: 20rpx 0 0 20rpx;
+	}
+
+	.scroll-content {
+		height: 90%;
+	}
+
+	.zuni-numbox {
+		height: 60rpx;
+		display: flex;
+		flex-direction: row;
+	}
+
+	.zuni-numbox-btns {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 8px;
+		cursor: pointer;
+	}
+
+	.zuni-numbox__value {
+		margin: 0 2px;
+		width: 40px;
+		text-align: center;
+		font-size: 20px;
+		line-height: 30px;
+		height: 60rpx;
+		border-left-width: 0;
+		border-right-width: 0;
+	}
+
+
+	.zuni-numbox--text {
+		line-height: 20px;
+
+		font-size: 32px;
+		font-weight: 300;
+	}
+
+	.zuni-numbox .zuni-numbox--disabled {
+		color: #c0c0c0 !important;
+		cursor: not-allowed;
+	}
+
+	.voice-popup-content {
+		align-items: center;
+		justify-content: center;
+		padding: 15px;
+		width: 500rpx;
+		border-radius: 10px;
+		height: 600rpx;
+		background-color: #fff;
+	}
+
+	.voice-popup-title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		position: relative;
+	}
+
+	.voice-popup-container {
+		margin-top: 20rpx;
+	}
+
+	.voice-popup-bottom {
+		display: flex;
+		height: 80rpx;
+		color: #fff;
+		line-height: 80rpx;
+		margin-top: 30rpx;
+	}
+
+	.voice-popup-btn {
+		flex: 1;
+		text-align: center;
+		background: linear-gradient(90deg, #FF9797, #FFC1E0);
+	}
+
+	.voice-popup-btn:last-child {
+		background: linear-gradient(90deg, #60F3FF, #088FEB);
+	}
+
+	.voice-model {
+		width: 300rpx;
+		height: 300rpx;
+		display: flex;
+		justify-content: center;
+		flex-flow: column;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		background: rgba(0, 0, 0, 0.5);
+		border-radius: 20rpx;
+		color: #fff;
+		text-align: center;
+		margin-left: -150rpx;
+		z-index: 999;
+	}
+
+	.voice-model img {
+		width: 200rpx;
+		height: 200rpx;
+		margin: 0 auto;
+	}
+
+	.voice-btn {
+		position: absolute;
+		bottom: -250rpx;
+		left: 30%;
+		width: 180rpx;
+		height: 180rpx;
+		background: #eee;
+		border-radius: 50%;
+	}
+
+	.mask-model {
+		width: 60%;
+		height: 100rpx;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		margin: auto;
+		text-align: center;
+		background: rgba(0, 0, 0, 0.7);
+		color: #eee;
+		padding: 5px;
+		border-radius: 5px;
+		z-index: 99;
 	}
-	.new-logo{
-		position: absolute;
-		top: 35rpx;
-		left: 131rpx;
-		background: red;
-		color: #fff;
-		width: 40rpx;
-		height: 40rpx;
-		line-height: 40rpx;
+	.one-goods{
+		margin-top: 10px;
+		width: 100%;
+		height: 50rpx;
+		background: #088FEB;
+		font-size: 28rpx;
 		text-align: center;
-		border-top-right-radius: 10px;
-	}
-	.goods-btn{
+		line-height: 50rpx;
 		color: #fff;
 		border-radius: 5px;
-		background: linear-gradient(90deg, #60F3FF, #088FEB);
-		height: 60rpx;
-		width: 150rpx;
-		padding: 5px;
-		margin: 0 auto;
-		text-align: center;
-	}
-	.shop-btn{
-		display: flex;
-	}
-	.shop-title{
-		display: flex;
-		height: 80rpx;
-		line-height: 80rpx;
-		padding-left: 70rpx;
-		text-align: center;
-	}
-	.shop-type{
-		margin-top: 40rpx;
-		border-top: 1px solid #eee;
+		position: relative;
 	}
-	.left-btn{
-		font-weight: 800;
-		font-size: 22rpx;
-		color: #fff;
-		background: #088FEB;
-		border-radius: 5px;
-		width: 60rpx;
+	.jiaobiao{
+		width: 40rpx;
 		height: 40rpx;
-		line-height: 40rpx;
-		text-align: center;
-	}
-	.type-popup{
-		width: 500rpx;
-		height: auto;
-		background: #fff;
 		border-radius: 10px;
-		position: relative;
-		margin-bottom: 40rpx;
-	}
-	.card-list {
-		width: 95%;
-		border-radius: 10upx;
-		background: #fff;
-		height: auto;
-		margin: 40rpx auto 0;
-	
-	}
-	
-	.title-fur {
-		width: 95%;
-		height: 50rpx;
-		margin: 0 auto;
-		border-bottom: 1px solid #eee;
-	}
-	
-	.name {
-		font-size: 30rpx;
-		width: 50%;
-		float: left;
-		height: 50rpx;
-		line-height: 70rpx;
-	}
-	
-	.rightBox {
-		display: flex;
-		float: right;
-	}
-	
-	.content-fur {
-		padding-bottom: 25rpx;
-	}
-	
-	.content-low {
-		width: auto;
-		border: 1px solid #eee;
-		display: inline-block;
-		min-width: 90rpx;
-		padding: 5rpx;
-		font-size: 35rpx;
-		text-align: center;
-		color: #777;
-		margin: 20rpx 0 0 20rpx;
-	}
-	.scroll-content{
-		padding-top: 390rpx;
-		height: 90%;
-	}
-	.zuni-numbox {
-		    height: 60rpx;
-		display: flex;
-		flex-direction: row;
-	}
-	
-	.zuni-numbox-btns {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		padding: 0 8px;
-		cursor: pointer;
-	}
-	
-	.zuni-numbox__value {
-		margin: 0 2px;
-		width: 40px;
+		color: #fff;
+		background: red;
+		position: absolute;
+		top: -5px;
+		right: -5px;
 		text-align: center;
-		font-size: 20px;
-		line-height: 30px;
-		height: 60rpx;
-		border-left-width: 0;
-		border-right-width: 0;
-	}
-	
-	
-	.zuni-numbox--text {
-		line-height: 20px;
-	
-		font-size: 32px;
-		font-weight: 300;
-	}
-	
-	.zuni-numbox .zuni-numbox--disabled {
-		color: #c0c0c0 !important;
-		cursor: not-allowed;
+		line-height: 40rpx;
+		font-size: 28rpx;
 	}
-	.voice-popup-content {
-		align-items: center;
-		justify-content: center;
-		padding: 15px;
+	.showImg-box{
 		width: 500rpx;
-		border-radius: 10px;
-		height: 600rpx;
-		background-color: #fff;
-	}
-	
-	.voice-popup-title {
-		font-size: 36rpx;
-		font-weight: bold;
-		text-align: center;
-		position: relative;
-	}
-	
-	.voice-popup-container {
-		margin-top: 20rpx;
-	}
-	
-	.voice-popup-bottom {
-		display: flex;
-		height: 80rpx;
-		color: #fff;
-		line-height: 80rpx;
-		margin-top: 30rpx;
+		height: 500rpx;
 	}
-	
-	.voice-popup-btn {
-		flex: 1;
-		text-align: center;
-		background: linear-gradient(90deg, #FF9797, #FFC1E0);
+	@media screen and (min-width: 500px) {
+		.uni-swiper-dot-box {
+			width: 400px;
+			margin: 0 auto;
+			margin-top: 8px;
+		}
+
+		.image {
+			width: 100%;
+		}
 	}
-	
-	.voice-popup-btn:last-child {
-		background: linear-gradient(90deg, #60F3FF, #088FEB);
+	.swiper-box {
+		height: 200px;
 	}
-	
-	.voice-model {
-		width: 300rpx;
-		height: 300rpx;
+	.swiper-item {
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
-		flex-flow: column;
-		position: fixed;
-		top:50%;
-		left: 50%;
-		background: rgba(0, 0, 0, 0.5);
-		border-radius: 20rpx;
+		align-items: center;
+		height: 200px;
 		color: #fff;
-		text-align: center;
-		margin-left: -150rpx;
-		z-index: 999;
-	}
-	
-	.voice-model img {
-		width: 200rpx;
-		height: 200rpx;
-		margin: 0 auto;
-	}
-	.voice-btn{
-		position: absolute;
-		bottom: -250rpx;
-		left: 30%;
-		width: 180rpx;
-		height: 180rpx;
-		background: #eee;
-		border-radius: 50%;
+		background-color: #cee1fd;
 	}
-	.mask-model{
-		width: 60%;
+	.lb-btn{
+		width: 100%;
 		height: 100rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		margin: auto;
 		text-align: center;
-		background: rgba(0,0,0,0.7);
-		color: #eee;
-		padding: 5px;
-		border-radius: 5px;
-		z-index: 99;
+		line-height: 100rpx;
+		background: #088FEB;
+		color: #fff;
+		border-bottom-left-radius: 10px;
+		border-bottom-right-radius: 10px;
 	}
 </style>
\ No newline at end of file
diff --git a/package1/index/orderDetail.vue b/package1/index/orderDetail.vue
index a381e8b..8e525ec 100644
--- a/package1/index/orderDetail.vue
+++ b/package1/index/orderDetail.vue
@@ -426,7 +426,10 @@
 						if (res.code == 200 && res.result != null && res.result != undefined) {
 							this.sales = res.result.sale
 							this.list = res.result.saleDetailDTOList
-							for (var i = 0; i < this.list.length; i++) {
+							for (var i = 0; i < this.list.length; i++) {
+								if(this.list[i].realPrice != '' && this.list[i].discountAmount == null){
+									this.list[i].discountAmount = this.list[i].realPrice
+								}
 								for (var m = 0; m < this.list[i].stockLogList1.length; m++) {
 									if (this.list[i].productCount == null) {
 										this.list[i].productCount = this.list[i].stockLogList1[m].productCount
@@ -549,301 +552,178 @@
 			},
 			//打印小票
 			onPrintSmall() {
-				let that = this;
-				let strCmd = ''
-				that.yNum = 150
-				strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-				strCmd += blesdk.addCPCLSETMAG(2, 2)
-				blesdk.addCPCLSETBOLD('bold')
-				strCmd += blesdk.addCPCLLocation(2);
-				strCmd += blesdk.addCPCLText('0', '30', '24', '0', 0, uni.getStorageSync('shopName'))
-
-				strCmd += blesdk.addCPCLSETMAG(1, 1)
-				strCmd += blesdk.addCPCLLocation(0);
-				strCmd += blesdk.addCPCLText('0', '100', '24', '0', 0, '客户:' + this.order.name)
-				strCmd += blesdk.addCPCLText('280', '100', '24', '0', 0, this.sales.id)
-				strCmd += blesdk.addCPCLText('0', '130', '24', '0', 0, '销售:' + this.sales.createByName)
-				strCmd += blesdk.addCPCLText('280', '130', '24', '0', 0, '日期:' + this.sales.createTime)
-				strCmd += blesdk.addCPCLText('0', '150', '24', '0', 0,
-					'=========================================================')
-				for (var i = 0; i < this.list.length; i++) {
-					if (that.countPrint() < that.printTotal) {
-						strCmd += blesdk.addCPCLText('0', that.yNum, '24', '0', 0, this.list[i].productName + '（' +
-							this.list[i].productSn + '）')
-					} else {
-						that.yNum = 0
-						strCmd += blesdk.addCPCLPrint();
-						that.bufferData.push(strCmd);
-						strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-						strCmd += blesdk.addCPCLLocation(0);
-						strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, this.list[i].productName + '（' +
-							this.list[i].productSn + '）')
-
-					}
-					for (var m = 0; m < this.list[i].stockLogList1.length; m++) {
-						if (that.countPrint() < that.printTotal) {
-							strCmd += blesdk.addCPCLText('0', that.yNum, '24', '0', 0, '□ '+(that.slicePrint(
-									this.list[i].stockLogList1[m].attributeList)) + '*' + this.list[i].stockLogList1[m]
-								.productCount)
-							strCmd += blesdk.addCPCLText('240', that.yNum, '24', '0', 0, '单价:' + this.list[i]
-								.discountAmount)
-							strCmd += blesdk.addCPCLText('400', that.yNum, '24', '0', 0, '总价:' + (this.list[i]
-								.discountAmount * this.list[i].stockLogList1[m].productCount))
-						} else {
-							that.yNum = 0
-							strCmd += blesdk.addCPCLPrint();
-							that.bufferData.push(strCmd);
-							strCmd = ''
-							strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-							strCmd += blesdk.addCPCLLocation(0);
-							strCmd += blesdk.addCPCLText('0', (that.yNum += 30), '24', '0', 0, '□ '+(that.slicePrint(
-									this.list[i].stockLogList1[m].attributeList)) + '*' + this.list[i].stockLogList1[m]
-								.productCount)
-							strCmd += blesdk.addCPCLText('240', that.yNum, '24', '0', 0, '单价:' + this.list[i]
-								.discountAmount)
-							strCmd += blesdk.addCPCLText('400', that.yNum, '24', '0', 0, '总价:' + (this.list[i]
-								.discountAmount * this.list[i].stockLogList1[m].productCount))
-						}
-					}
-				}
-				if (that.countPrint() < this.printTotal) {
-					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
-						'===============================================================')
-				} else {
-					this.yNum = 0
-					strCmd += blesdk.addCPCLPrint();
-					this.bufferData.push(strCmd);
-					strCmd = ''
-					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-					strCmd += blesdk.addCPCLLocation(0);
-					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
-						'===============================================================')
-				}
-				if (that.countPrint() < this.printTotal) {
-					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '总数量:' + this.sales.productCount)
-					strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '总金额:' + this.sales.totalAmount)
-					strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.sales.realAmount)
-				} else {
-					this.yNum = 0
-					strCmd += blesdk.addCPCLPrint();
-					this.bufferData.push(strCmd);
-					strCmd = ''
-					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-					strCmd += blesdk.addCPCLLocation(0);
-					strCmd += blesdk.addCPCLText('0', (this.yNum += 30), '24', '0', 0, '总数量:' + this.sales.productCount)
-					strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '总金额' + this.sales.totalAmount)
-					strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.sales.realAmount)
-
-				}
-				if (that.countPrint() < this.printTotal) {
-					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '实收:' + this.sales.alreadyEarn)
-					strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.sales.noEarn))
-					strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.sales.otherExpense))
-				} else {
-					this.yNum = 0
-					strCmd += blesdk.addCPCLPrint();
-					this.bufferData.push(strCmd);
-					strCmd = ''
-					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-					strCmd += blesdk.addCPCLLocation(0);
-					strCmd += blesdk.addCPCLText('0', (this.yNum += 30), '24', '0', 0, '实收:' + this.sales.alreadyEarn)
-					strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.sales.noEarn))
-					strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.sales.otherExpense))
-
-				}
-				if (this.sales.remark) {
-					// if (Math.ceil(Number(this.sales.remark.length) / 20) * 30 + this.yNum < this.printTotal) {
-					// 	if (this.sales.remark.length > 20) {
-					// 		let position = 20;
-					// 		let part1 = this.sales.remark.substring(0, position);
-					// 		let part2 = this.sales.remark.substring(position);
-					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
-					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
-					// 	} else {
-					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.sales.remark)
-					// 	}
-					// 	strCmd += blesdk.addCPCLLocation(0);
-					// 	strCmd += blesdk.addCPCLPrint();
-					// 	this.bufferData.push(strCmd);
-					// } else {
-					// 	this.yNum = 0
-					// 	strCmd += blesdk.addCPCLLocation(0);
-					// 	strCmd += blesdk.addCPCLPrint();
-					// 	this.bufferData.push(strCmd);
-					// 	strCmd = ''
-					// 	if (this.sales.remark.length > 20) {
-					// 		let position = 20;
-					// 		let part1 = this.sales.remark.substring(0, position);
-					// 		let part2 = this.sales.remark.substring(position);
-					// 		strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-					// 		strCmd += blesdk.addCPCLLocation(0);
-					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
-					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
-					// 	} else {
-					// 		strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-					// 		strCmd += blesdk.addCPCLLocation(0);
-					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.sales.remark)
-					// 	}
-					// 	strCmd += blesdk.addCPCLLocation(0);
-					// 	strCmd += blesdk.addCPCLPrint();
-
-					// 	this.bufferData.push(strCmd);
-
-					// }
-					if (Math.ceil(Number(this.sales.remark.length) / 20) * 30 + this.yNum < that.printTotal) {
-						if (this.sales.remark.length > 20) {
-							let position = 20;
-							let part1 = this.sales.remark.substring(0, position);
-							let part2 = this.sales.remark.substring(position);
-							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
-							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
-						} else {
-							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.sales.remark)
-						}
+				let that = this;
+				let printHeight = 800
+				for(let i=0;i<this.list.length;i++){
+					printHeight += 30
+					for(let m=0;m<this.list[i].stockLogList1.length;m++){
+						printHeight += 30
+					}
+				}
+				let strCmd = ''
+				that.yNum = 300
+				strCmd = blesdk.CreatCPCLPage(1000, printHeight, 1, 0);
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLLocation(2);
+				strCmd += blesdk.addCPCLText('0', '30', '24', '0', 0, '')
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLLocation(2);
+				strCmd += blesdk.addCPCLText('0', '110', '24', '0', 0, uni.getStorageSync('shopName'))
+				
+				strCmd += blesdk.addCPCLSETMAG(1, 1)
+				strCmd += blesdk.addCPCLLocation(0);
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLText('0', '190', '24', '0', 0, '客户:' + this.order.name)
+				strCmd += blesdk.addCPCLSETMAG(1, 1)
+				strCmd += blesdk.addCPCLLocation(0);
+				strCmd += blesdk.addCPCLText('500', '190', '24', '0', 0,'单号:' + this.sales.id)
+				strCmd += blesdk.addCPCLText('0', '240', '24', '0', 0, '销售员:' + this.sales.createByName)
+				strCmd += blesdk.addCPCLText('500', '240', '24', '0', 0, '日期:' + this.sales.createTime)
+				strCmd += blesdk.addCPCLText('0', '300', '24', '0', 0,
+					'=================================================================================')
+				for (var i = 0; i < this.list.length; i++) {
 					
-					} else {
-						this.yNum = 0
-						strCmd += blesdk.addCPCLLocation(0);
-						strCmd += blesdk.addCPCLPrint();
-						this.bufferData.push(strCmd);
-						strCmd = ''
+						strCmd += blesdk.addCPCLText('0', that.yNum += 30, '24', '0', 0, this.list[i].productName + '（' +
+							this.list[i].productSn + '）')
+					
+					for (var m = 0; m < this.list[i].stockLogList1.length; m++) {
+				
+							strCmd += blesdk.addCPCLText('0', that.yNum += 30, '24', '0', 0, '□ '+that.slicePrint(
+									this.list[i].stockLogList1[m].attributeList))
+							strCmd += blesdk.addCPCLText('220', that.yNum, '24', '0', 0, '数量:'+ this.list[i].stockLogList1[m].productCount)
+									
+							strCmd += blesdk.addCPCLText('400', that.yNum, '24', '0', 0, '单价:' + this.list[i]
+								.discountAmount)
+							strCmd += blesdk.addCPCLText('650', that.yNum, '24', '0', 0, '总价:' + (this.list[i]
+								.discountAmount * this.list[i].stockLogList1[m].productCount))
+				
+					}
+				}
+				
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
+						'=======================================================================================')
+				
+				
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '总数量:' + this.sales.productCount)
+					strCmd += blesdk.addCPCLText('300', this.yNum, '24', '0', 0, '总金额:' + this.sales.totalAmount)
+					strCmd += blesdk.addCPCLText('630', this.yNum, '24', '0', 0, '应收:' + this.sales.realAmount)
+				
+				
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '实收:' + this.sales.alreadyEarn)
+					strCmd += blesdk.addCPCLText('300', this.yNum, '24', '0', 0, '欠款:' + (this.sales.noEarn))
+					strCmd += blesdk.addCPCLText('630', this.yNum, '24', '0', 0, '其他费用:' + (this.sales.otherExpense))
+				
+				if (this.sales.remark) {
 						if (this.sales.remark.length > 20) {
 							let position = 20;
 							let part1 = this.sales.remark.substring(0, position);
 							let part2 = this.sales.remark.substring(position);
-							strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-							strCmd += blesdk.addCPCLLocation(0);
 							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
 							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
 						} else {
-							strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-							strCmd += blesdk.addCPCLLocation(0);
 							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.sales.remark)
 						}
-					}
 				}
-				if (that.countPrint() < that.printTotal) {
-					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
-						'===============================================================')
-				} else {
-					this.yNum = 0
-					strCmd += blesdk.addCPCLPrint();
-					this.bufferData.push(strCmd);
-					strCmd = ''
-					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-					strCmd += blesdk.addCPCLLocation(0);
+				
 					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
-						'===============================================================')
-				}
+						'===============================================================================================')
 				//店铺地址
-				if (that.countPrint() < that.printTotal) {
-					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '店铺地址:' + uni.getStorageSync(
-						'shopAddress'))
-				} else {
-					this.yNum = 0
-					strCmd += blesdk.addCPCLPrint();
-					this.bufferData.push(strCmd);
-					strCmd = ''
-					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-					strCmd += blesdk.addCPCLLocation(0);
+				
+					strCmd += blesdk.addCPCLSETMAG(1, 1)
 					strCmd += blesdk.addCPCLText('0', (that.yNum += 30), '24', '0', 0, '店铺地址:' + uni.getStorageSync(
 						'shopAddress'))
-				}
+						
 				//店铺电话
-				if (that.countPrint() < that.printTotal) {
+				
+					strCmd += blesdk.addCPCLSETMAG(1, 1)
 					strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, '店铺电话:' + uni.getStorageSync(
 						'username'))
-				} else {
-					that.yNum = 0
-					strCmd += blesdk.addCPCLPrint();
-					that.bufferData.push(strCmd);
-					strCmd = ''
-					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-					strCmd += blesdk.addCPCLLocation(0);
-					strCmd += blesdk.addCPCLText('0', (that.yNum += 30), '24', '0', 0, '店铺电话:' + uni.getStorageSync(
-						'username'))
-				}
+				
 				if(this.qrArr.length != 0){
 					//店铺微信/微信收款/支付宝收款/收款码收款（店铺，微信，支付，收款）
 					for (let i = 0; i < this.qrArr.length; i++) {
 						//店铺二维码
-						if ((that.yNum + 200) < that.printTotal) {
-							console.log('11111')
-							strCmd += blesdk.addCPCLQRCode(that.countWidth(i,600/that.qrArr.length), (that.yNum + 50), that.qrArr[i].level, '2', 3, that.qrArr[i].path) //二维码
-							strCmd += blesdk.addCPCLText(that.countWidth(i,600/that.qrArr.length), (that.yNum + 180), '24', '0', 0, that.qrArr[i].name)
+							strCmd += blesdk.addCPCLQRCode(that.countWidth(i,1000/that.qrArr.length), (that.yNum + 80), that.qrArr[i].level, '2', 4, that.qrArr[i].path) //二维码
+							strCmd += blesdk.addCPCLSETMAG(1, 1)
+							strCmd += blesdk.addCPCLText(that.countWidth(i,1000/that.qrArr.length), (that.yNum + 240), '24', '0', 0, that.qrArr[i].name)
 							strCmd += blesdk.addCPCLLocation(0);
 							if(this.qrArr.length == (i+1)){
 								strCmd += blesdk.addCPCLPrint();
 								that.bufferData.push(strCmd);
 							}
-						} else {
-							console.log('2222')
-							// that.yNum = 0
-							strCmd += blesdk.addCPCLPrint();
-							that.bufferData.push(strCmd);
-							strCmd = ''
-							strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
-							strCmd += blesdk.addCPCLLocation(0);
-							strCmd += blesdk.addCPCLQRCode(that.countWidth(i,600/that.qrArr.length) , 30, that.qrArr[i].level, '2', 3, that.qrArr[i].path) //二维码
-							strCmd += blesdk.addCPCLText(that.countWidth(i,600/that.qrArr.length), 180, '24', '0', 0, that.qrArr[i].name)
-							strCmd += blesdk.addCPCLPrint();
-							that.bufferData.push(strCmd);
-						}
 					}
 				}else{
 					strCmd += blesdk.addCPCLPrint();
 					that.bufferData.push(strCmd);
 				}
-				
-				this.$nextTick(() => {
-					that.bufferData = []
-					uni.hideLoading();
+				
+				this.$nextTick(() => {
+					that.bufferData = []
+					uni.hideLoading();
 				})
-
+				setTimeout(res=>{
+					uni.closeBLEConnection({
+					  deviceId:uni.getStorageSync('deviceId'),
+					  success(res) {
+					    console.log(res)
+					  },fail(err){
+						  console.log(err)
+					  }
+					})
+				},5000)
 			},
 			countWidth(num,len){
 				return num*len + 20
 			},
 			goPrint(type){
 				let strCmd = ''
-				strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 1);
-				strCmd += blesdk.addCPCLSETMAG(2, 2)
-				blesdk.addCPCLSETBOLD('bold')
-				strCmd += blesdk.addCPCLText('40', '30', '24', '0', 0, '沧州明珠商贸城--快衣店')
+				strCmd = blesdk.CreatCPCLPage(1000, 1040, 1, 1);
 				strCmd += blesdk.addCPCLSETMAG(3, 3)
 				blesdk.addCPCLSETBOLD('bold')
-				strCmd += blesdk.addCPCLText('50', '120', '24', '0', 0, '收：' + maskShopName(this.sales.userName))
-				strCmd += blesdk.addCPCLSETMAG(1, 1)
-				strCmd += blesdk.addCPCLText('50', '250', '24', '0', 0, maskPhone(this.order.phone))
-				strCmd += blesdk.addCPCLText('250', '250', '24', '0', 0, '编号：' + this.sales.id)
-				strCmd += blesdk.addCPCLSETMAG(1, 1)
+				strCmd += blesdk.addCPCLLocation(2);
+				strCmd += blesdk.addCPCLText('0', '30', '24', '0', 0, '沧州明珠商贸城--快衣店')
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				strCmd += blesdk.addCPCLLocation(0);
 				blesdk.addCPCLSETBOLD('bold')
-				strCmd += blesdk.addCPCLText('50', '330', '24', '0', 0, this.sales.province + '/' + this.sales.city + '/' +
+				strCmd += blesdk.addCPCLText('50', '150', '24', '0', 0, '收货人：' + maskShopName(this.sales.userName))
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				strCmd += blesdk.addCPCLLocation(0);
+				strCmd += blesdk.addCPCLText('50', '230', '24', '0', 0, '电话：' + maskPhone(this.order.phone))
+				strCmd += blesdk.addCPCLText('50', '310', '24', '0', 0, '编号：' + this.sales.id)
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLLocation(0);
+				strCmd += blesdk.addCPCLText('50', '390', '24', '0', 0, this.sales.province + '/' + this.sales.city + '/' +
 					this.sales.area)
-				strCmd += blesdk.addCPCLSETMAG(1, 1)
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				strCmd += blesdk.addCPCLLocation(0);
 				if(type == 'confirm'){
-					strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, "*****")
+					strCmd += blesdk.addCPCLText('50', '470', '24', '0', 0, "*****")
 				}else{
 					if (this.sales.receiveAddress.length > 20) {
 						let position = 20;
 						let part1 = this.sales.receiveAddress.substring(0, position);
 						let part2 = this.sales.receiveAddress.substring(position);
-						strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, part1)
-						strCmd += blesdk.addCPCLText('50', '440', '24', '0', 0, part2)
+						strCmd += blesdk.addCPCLText('50', '470', '24', '0', 0, part1)
+						strCmd += blesdk.addCPCLText('50', '550', '24', '0', 0, part2)
 					} else {
 						strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, this.sales.receiveAddress)
 					}
 				}
 				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				strCmd += blesdk.addCPCLLocation(0);
 				blesdk.addCPCLSETBOLD('bold')
-				strCmd += blesdk.addCPCLText('0', '490', '24', '0', 0, '——————————————————————————————')
-				strCmd += blesdk.addCPCLText('50', '570', '24', '0', 0, '发货方式：' + (this.sales.companyName ? this.sales
+				strCmd += blesdk.addCPCLText('0', '600', '24', '0', 0, '——————————————————————————————')
+				strCmd += blesdk.addCPCLText('50', '680', '24', '0', 0, '发货方式：' + (this.sales.companyName ? this.sales
 					.companyName : '暂无'))
 				strCmd += blesdk.addCPCLSETMAG(2, 2)
-				strCmd += blesdk.addCPCLText('0', '650', '24', '0', 0, '——————————————————————————————')
-				strCmd += blesdk.addCPCLText('50', '730', '24', '0', 0, '店铺：' + this.sales.shopName)
-				strCmd += blesdk.addCPCLText('50', '810', '24', '0', 0, this.sales.createByPhone)
-				strCmd += blesdk.addCPCLText('50', '890', '24', '0', 0, '地址：' + this.shopData.shopAddress)
+				strCmd += blesdk.addCPCLLocation(0);
+				strCmd += blesdk.addCPCLText('0', '760', '24', '0', 0, '——————————————————————————————')
+				strCmd += blesdk.addCPCLText('50', '840', '24', '0', 0, '店铺：' + this.sales.shopName)
+				strCmd += blesdk.addCPCLText('50', '920', '24', '0', 0, this.sales.createByPhone)
+				strCmd += blesdk.addCPCLText('50', '1000', '24', '0', 0, '地址：' + this.shopData.shopAddress)
 				strCmd += blesdk.addCPCLLocation(0);
 				strCmd += blesdk.addCPCLPrint();
 				this.bufferData.push(strCmd);
@@ -852,6 +732,16 @@
 					this.bufferData = []
 					uni.hideLoading();
 				})
+				setTimeout(res=>{
+					uni.closeBLEConnection({
+					  deviceId:uni.getStorageSync('deviceId'),
+					  success(res) {
+					    console.log(res)
+					  },fail(err){
+						  console.log(err)
+					  }
+					})
+				},5000)
 			},
 			xierushuju() {
 				let that = this;
@@ -933,11 +823,11 @@
 			},
 			//计算打印机当前行高度
 			countPrint() {
-				if ((this.yNum + 50) >= 1040) {
-					return this.yNum += 50
-				} else {
+				// if ((this.yNum + 50) >= 1040) {
+				// 	return this.yNum += 50
+				// } else {
 					return this.yNum += 30
-				}
+				// }
 			},
 			//截取
 			slicePrint(val) {
diff --git a/package1/index/peopleList.vue b/package1/index/peopleList.vue
index 66dd802..48c62eb 100644
--- a/package1/index/peopleList.vue
+++ b/package1/index/peopleList.vue
@@ -23,7 +23,7 @@
 						<text>{{item.consigneeMobile}}</text>
 					</view>
 					<view class="name-tel" style="width: 100%;" v-else>
-						<text style="line-height: 75rpx;">{{item.name}}</text>
+						<text style="line-height: 75rpx;">{{item.name}}<text v-if="item.notBuyDays!=null">({{item.notBuyDays+'天未拿货'}})</text> </text>
 						<text v-if="item.name != '散客'">{{item.phone}}</text>
 					</view>
 					<view class="name-tel" style="width: 100%;display: flex;flex-direction: column;height:auto;font-size: 30rpx;">
diff --git a/package1/inventory/addGoods.vue b/package1/inventory/addGoods.vue
index d74644d..49d88a3 100644
--- a/package1/inventory/addGoods.vue
+++ b/package1/inventory/addGoods.vue
@@ -6,7 +6,7 @@
 				<uni-forms-item label="商品名称" name="productName" required>
 					<uni-easyinput type="text" v-model="formData.productName" placeholder="请输入商品名称" trim="all" />
 				</uni-forms-item>
-				<uni-forms-item label="商品图片" name="productPicture">
+				<uni-forms-item label="商品主图" name="productPicture">
 					<view v-if="formData.productPicture !=''">
 						<img :src="formData.productPicture" alt="" class="upload-img">
 					</view>
@@ -34,23 +34,40 @@
 						</view>
 					</view>
 				</uni-forms-item>
-				<uni-forms-item label="添加规格" name="categoryId" v-if="dataList == ''">
-					<!-- <uni-data-select class="uni-data-select" :localdata="categoryList" v-model="formData.categoryId"
-						placeholder="请选择分类" @change="categoryChange(formData.categoryId)"></uni-data-select> -->
+				<uni-forms-item label="添加规格" name="categoryId">
 					<view class="content-list">
 						<view class="list-val">
 							<input type="text" placeholder="点击选择规格" disabled
 								style="border-bottom: 1px solid #fff;text-align: center;"
 								@tap="ejectRuleSelect">
-							<!-- <uni-icons type="right" size="16"
-								style="margin-left: 40rpx;line-height: 70rpx;"></uni-icons> -->
 						</view>
 					</view>
 				</uni-forms-item>
+				<view v-for="(item,index) in multipleList" :key="index" style="display: flex;">
+					<view class="" style="width: 28%;">
+						{{item.attributeName}}
+					</view>
+					<view class="" style="width: 72%;min-height: 80rpx;padding: 0 10px 20rpx 0;">
+						<view v-for="(item1,index1) in item.productAttributeValueVoList" :key="index1" style="float: left;padding-right: 20rpx;">
+							{{item1.value}}
+						</view>
+					</view>
+				</view>
 				<uni-forms-item label="商品条码" name="barcode">
 					<uni-easyinput type="text" v-model="formData.barcode" placeholder="可以扫码商品条码添加" trim="all" />
 					<u-icon name="camera" size="36" @tap.stop='scanCodeAdd'></u-icon>
 				</uni-forms-item>
+				<uni-forms-item label="多图上传" name="productPicture">
+					<view class="upload-img" @tap="pictureAdd" style="background: #eee;text-align: center;line-height: 160rpx;">
+						<uni-icons type="camera" size="28" color="#777"></uni-icons>
+					</view>
+					<view style="overflow-x: scroll;display: flex;width: 350rpx;">
+						<view v-if="formData.productPictures !=''" v-for="(item,index) in formData.productPictures" :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
+							<img :src="item.productPicture" alt="" class="upload-img">
+						</view>
+					</view>
+					
+				</uni-forms-item>
 				<uni-forms-item label="市场价" name="price">
 					<!-- <uni-easyinput type="digit" v-model="formData.price" placeholder="请输入零售价" trim="all" /> -->
 					<input type="digit" class="content-input" v-model="formData.price" @focus="obtainPrice($event,'price')" @blur="changessPrice($event,'price')" placeholder="请输入零售价">
@@ -66,19 +83,16 @@
 					<uni-easyinput type="textarea" autoHeight v-model="formData.productIntro" placeholder="请输入货品简介"
 						trim="all" />
 				</uni-forms-item>
-			</uni-forms>
-			<view v-if="type == 'edit'" style="display: flex;">
-				<button @tap.stop="submit()" style="width: 95%;">保存</button>
-			</view>
-			<view v-else>
+			</uni-forms>
+			<view>
 				<button @tap.stop="submit()">保存</button>
 			</view>
 		</view>
 		<!-- 添加分类弹出层 -->
-		<uni-popup ref="addTypeDialog" background-color="#fff">
+		<uni-popup ref="addTypeDialog" background-color="#fff" @change="changeAddType">
 			<view class="add-popup-content">
 				<view class="add-popup-title">
-					<text>添加规格</text>
+					<text>颜色尺码库</text>
 					<uni-icons @tap='close' type="closeempty" color='red' size="16"
 						style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
 				</view>
@@ -115,7 +129,8 @@
 	export default {
 		data() {
 			return {
-				fileList1: [],
+				fileList1: [],
+				oldMultipleList:[],
 				formData: {
 					productName: '',
 					price: 0,
@@ -126,7 +141,12 @@
 					categoryId: '',
 					salesWeek: '',
 					tailWarn: '',
-					barcode:''
+					barcode:'',
+					productPictures:[],
+					// let data = {
+					// 	productPicture:pathData.result
+					// }
+					productCategoryVo:{}
 				},
 				defaultList:[{
 					name:'颜色',
@@ -321,6 +341,7 @@
 			if(option.dataList){
 				this.type = 'edit'
 				this.dataList = JSON.parse(option.dataList)
+				this.formData.attrId = this.dataList.attrId
 				this.formData.productName = this.dataList.productName
 				this.formData.barcode = this.dataList.barcode
 				this.formData.price = this.dataList.price
@@ -331,10 +352,28 @@
 				this.formData.categoryId = this.dataList.categoryId
 				this.formData.salesWeek = this.dataList.salesWeek
 				this.formData.tailWarn = this.dataList.tailWarn
+				this.getChildrenPic()
 			}
 			this.getGategoryList()
 		},
 		methods: {
+			//获取子图
+			getChildrenPic(){
+				this.tui.request("/app/productPicture/getProductPictureByProductId", "POST", {
+					productId: this.dataList.id,
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						for(let i=0;i<res.result.length;i++){
+							let data = {
+								productPicture:res.result[i].productPicture
+							}
+							this.formData.productPictures.push(data)
+						}
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
 			//初始化获取分类列表
 			getGategoryList() {
 				this.tui.request("/app/productCategory/list", "get", {
@@ -390,6 +429,11 @@
 					this.formData.wholesalePrice = ''
 				}
 			},
+			changeAddType(e){
+				if(e.show ==false && this.multipleList == ''){
+					this.multipleList = this.oldMultipleList
+				}
+			},
 			dialogInputConfirm(e) {
 				let that = this;
 				if(that.multipleList == ''){ 
@@ -480,10 +524,9 @@
 				
 			},
 			uploadFilePromise(url) {
-				
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: 'https://dev.xenjoyou.com/hiver/upload/file',
+						url: 'https://storage.xenjoyou.com/hiver/upload/file',
 						filePath: url,
 						name: 'file',
 						header: {
@@ -518,6 +561,8 @@
 				})
 			},
 			ejectRuleSelect(){
+				this.oldMultipleList = this.multipleList
+				this.multipleList = []
 				this.$refs.addTypeDialog.open('bottom')
 			},
 			// 触发提交表单
@@ -534,6 +579,9 @@
 					}
 					if(res.productPicture == ''){
 						res.productPicture = ''
+					}
+					this.formData.productCategoryVo = {
+						productAttributeOfAddVos:this.multipleList
 					}
 					that.tui.request(url, "post", this.formData, false, false).then((res1) => {
 						if (res1.code == 200) {
@@ -557,6 +605,56 @@
 					url: '/package1/inventory/gategory'
 				})
 			},
+			pictureAdd(id,huan) {
+				let that = this
+				uni.chooseMedia({
+					count: 9,
+					mediaType: ['image'],
+					sourceType: ['album'],
+					success(res) {
+						uni.showLoading({
+							title: '加载中...',
+							mask:true
+						})
+						for(let i=0;i<res.tempFiles.length;i++){
+							that.upLoadFile(res.tempFiles[i].tempFilePath)
+						}
+						
+					}
+				})
+			},
+			async upLoadFile(path){
+				let that = this;
+				let hiver_token = uni.getStorageSync("hiver_token")
+				await uni.uploadFile({
+					url: 'https://storage.xenjoyou.com/hiver/upload/file',
+					filePath: path,
+					name: 'file',
+					header: {
+						"content-type": "multipart/form-data",
+						'accessToken': hiver_token
+					},
+					formData: {},
+					success: (uploadFileRes) => {
+						let pathData = JSON.parse(uploadFileRes.data)
+						let data = {
+							productPicture:pathData.result
+						}
+						this.formData.productPictures.push(data)
+						that.$forceUpdate()
+					},
+					fail: (err) => {
+						uni.hideLoading();
+						uni.showToast({
+							title: JSON.stringify(err),
+							icon: 'none'
+						})
+					}
+				});
+				await setTimeout(res=>{
+					uni.hideLoading();
+				},1000)
+			},
 			scanCodeAdd() {
 				let that = this;
 				uni.scanCode({
@@ -584,6 +682,7 @@
 			},
 			//选择多个规格保存
 			addMultipleType(item,item1,index){
+				// this.multipleList = []
 				item.list[index].checked = !item.list[index].checked
 				var list = []
 				if(this.multipleList == ''){
@@ -596,19 +695,13 @@
 				}else{
 					for(var i=0;i<this.multipleList.length;i++){
 						if(this.multipleList[i].attributeName == item.name){ //同种分类
-							
-							
 							for(var m=0;m<this.multipleList[i].productAttributeValueVoList.length;m++){
 								if(this.multipleList[i].productAttributeValueVoList[m].value == item.list[index].value){ //规格相同
-									
 									this.multipleList[i].productAttributeValueVoList.splice(m,1)
-									
 									return;
 								}else{ //规格不同
 									if(m+1 == this.multipleList[i].productAttributeValueVoList.length){
-										
 										this.multipleList[i].productAttributeValueVoList.push(item.list[index])
-										
 										return;
 									}
 								}
@@ -629,8 +722,6 @@
 						}
 					}
 				}
-				
-				
 			},
 		}
 	}
diff --git a/package1/inventory/batchPrint.vue b/package1/inventory/batchPrint.vue
index a9d6756..da0f484 100644
--- a/package1/inventory/batchPrint.vue
+++ b/package1/inventory/batchPrint.vue
@@ -141,6 +141,19 @@
 		},
 		components: {
 			kkPrinter
+		},
+		onHide(){
+			setTimeout(res=>{
+				uni.closeBLEConnection({
+				  deviceId:uni.getStorageSync('deviceId'),
+				  success(res) {
+				    console.log(res)
+				  },fail(err){
+					  console.log(err)
+				  }
+				})
+			},5000)
+			
 		},
 		onLoad(options) {
 			wx.openBluetoothAdapter({mode: 'central'})
diff --git a/package1/inventory/gategory.vue b/package1/inventory/gategory.vue
index 39b334d..dbb3b47 100644
--- a/package1/inventory/gategory.vue
+++ b/package1/inventory/gategory.vue
@@ -27,17 +27,17 @@
 		<uni-popup ref="delDialog" type="dialog">
 			<view class="type-popup" style="width:100%;margin-bottom: 0;border-radius: 0;height: 450rpx;border-radius: 10px;">
 				<view style="height: 120rpx;font-size: 36rpx;font-weight: bold;line-height: 120rpx;text-align: center;">
-					修改规格值
+					编辑分类
 				</view>
 				<view style="height: 80rpx;font-size: 28rpx;line-height: 80rpx;text-align: center;">
-					请在下方输入框中输入新规格
+					请在下方输入框中输入分类名
 				</view>
 				<view style="width: 90%;margin: 20px auto 0;">
 					<uni-easyinput type="text" v-model="inputVal" @blur="handleBlur" placeholder="请输入规格值" />
 				</view>
-				<view style="width: 100%;height: 90rpx;line-height: 90rpx;text-align: center;border-radius: 0;background: linear-gradient(90deg, #60F3FF, #088FEB);color: #fff;display: flex;position: absolute;bottom: 0;">
-					<view style="width:50%;" @tap="dialogDel">删除</view>
-					<view style="width:50%;background: linear-gradient(90deg, #FF9797, #FFC1E0);" @tap="dialogInputConfirm">确认</view>
+				<view style="width: 100%;height: 90rpx;line-height: 90rpx;text-align: center;border-radius: 0;color: #fff;display: flex;position: absolute;bottom: 0;">
+					<view style="flex: 1;" v-if="inputVal != '默认分类'" @tap="dialogDel">删除</view>
+					<view style="flex: 1;background: linear-gradient(90deg, #FF9797, #FFC1E0);" @tap="dialogInputConfirm">确认</view>
 				</view>
 			</view>
 		</uni-popup>