From f8d141a314ca400aa030e48981bf15fa3e52c48c Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Mon, 12 Aug 2024 12:14:00 +0800
Subject: [PATCH] 11

---
 pages/.DS_Store                               |  Bin 10244 -> 10244 bytes
 pages/billing/addUser.vue                     |   94 +-
 pages/billing/changeGoods1.vue                |   98 +-
 pages/index/checkShop.vue                     |    7 +-
 .../index/customAndSupplierProductDetail.vue  | 1754 ++--
 pages/index/index.vue                         |   85 +-
 pages/index/shareStyle.vue                    |   74 +-
 pages/index/uparrears.vue                     |    2 +-
 pages/index/waitStorage.vue                   |  180 +-
 pages/index/waitStorageDetail.vue             |  743 --
 pages/inventory/changeGoods1.vue              | 1452 ---
 pages/inventory/goodsList1.vue                | 8283 +++++++++++------
 pages/inventory/inventory.vue                 |  110 +-
 pages/inventory/inventoryDetail.vue           |   42 +-
 pages/login/login.vue                         |   20 +-
 15 files changed, 6982 insertions(+), 5962 deletions(-)
 delete mode 100644 pages/index/waitStorageDetail.vue
 delete mode 100644 pages/inventory/changeGoods1.vue

diff --git a/pages/.DS_Store b/pages/.DS_Store
index d13ddaa9a764b5f534efdc741fb9c554e35bbefd..8be862adafc20b8fbd467565252a2fa6e100600e 100644
GIT binary patch
delta 296
zcmZn(XbIS0B&h5X!N9=4&XB~A$&dqtnGAUh>ACqXE=f80NkAD6Af6m5sLTwcH&+Wb
zGlCeC8HE+0wCH9lVK>J5Q@uc8R<Q0AhE#?MWD^!_Gpd=Rcgzu8MGD*w>?#T}41<&N
za|?j_7#NrxKqQh4Wx+*xIr(|%Kv719&HqJ2n3-AYR3|$~NKDp~;9_eKe`MFCGTBZ-
zg#*Go<~Z3vRBUpC1TPcohRyvFwv3D~CZCl|U~Jf|Cl$%aKH*p0`JM8|Cih9p!q}TP
INeA%&0NM3UX#fBK

delta 296
zcmZn(XbIS0B&ck1kAZ=Kogs-KlOYEPGa2$2(sT1&T#|C~lYlZDYB#hdhYBh)1L@7x
zg3XM~b=r}W8HE+0wCH9lVK>Hlr!=5iR<Q0AhE#?MWD`m@a!RlY9dkrikpi~^yNZGg
z!{Frn+ybCJ1_q`BAQH)jvf!e;ocz3WpeQ55=Kmrh%*-r~2PZp7NKDp~;9{$LU2@z`
zcCwv>3I~LF%yF`TsMzEN30@|agw6dDwv3D>lg~;fFcxgqlZs?y2byzObIQ@lebTZp
K_U28}K|BC4_)I<k

diff --git a/pages/billing/addUser.vue b/pages/billing/addUser.vue
index ea6d4e0..7c65e24 100644
--- a/pages/billing/addUser.vue
+++ b/pages/billing/addUser.vue
@@ -4,7 +4,7 @@
 		<view class="formBox">
 			<uni-forms ref="form" :modelValue="formData" :rules="rules" labelWidth="170rpx">
 				<uni-forms-item label="名称" name="consigneeName">
-					<uni-easyinput type="text" v-model="formData.consigneeName" placeholder="请输入名称" />
+					<uni-easyinput type="text" @blur="selectRepeat" v-model="formData.consigneeName" placeholder="请输入名称" />
 					<button @tap="getUserPhone">通讯录导入</button>
 				</uni-forms-item>
 				<uni-forms-item label="手机号码" name="consigneeMobile">
@@ -130,8 +130,9 @@
 				this.formData.city = data.city
 				this.formData.province = data.province
 				this.formData.id = data.id
-				this.formData.consigneeMobile = data.consigneeMobile || data.phone
-				this.formData.consigneeName = data.consigneeName || data.name
+				this.formData.consigneeMobile = data.consigneeMobile || data.phone || ""
+				console.log(this.formData.consigneeMobile)
+				this.formData.consigneeName = data.consigneeName || data.name || ""
 			}
 			
 		},
@@ -164,6 +165,39 @@
 				this.showPrice = false
 				this.keyboardNum = ''
 			},
+			selectRepeat(e){
+				var that = this;
+				let url,data 
+				if(this.popleType == 'khName'){
+					url = '/app/customer/findByUserName'
+					data = {
+						userName: e.detail.value,
+					}
+				}else if(this.popleType == 'gysName'){
+					url = '/app/supplier/getbySupplierName'
+					data = {
+						supplierName: e.detail.value
+					}
+				}
+				this.tui.request(url, "post", data, false, true).then((res) => {
+					if (res.code == 200) {
+						if(res.result.length > 0){
+							uni.showModal({
+								title: "提示",
+								content: "已经存在相同名称，是否继续添加？",
+								success: function(res) {
+									if (res.cancel) {
+										that.formData.consigneeName = ""
+										that.$forceUpdate()
+									}
+								}
+							})
+						}
+					} else {
+						
+					}
+				})
+			},
 			del() {
 				this.delShow = true;
 			},
@@ -322,13 +356,24 @@
 									uni.showToast({
 										title: "添加成功",
 										icon: 'none'
-									})
-									let pages = getCurrentPages();
-									let prevPage = pages[pages.length - 2];
-									prevPage.$vm.popleType = 'khName'
-									uni.navigateBack({
-										delta: 1
-									})
+									})
+									if(uni.getStorageSync('kaidanBack')){
+										uni.removeStorageSync('kaidanBack')
+										let pages = getCurrentPages();
+										let prevPage = pages[pages.length - 3];
+										res.result.noEarn = this.formData.noEarn == ''?'0': this.formData.noEarn
+										prevPage.$vm.khName = res.result
+										uni.navigateBack({
+											delta: 2
+										})
+									}else{
+										let pages = getCurrentPages();
+										let prevPage = pages[pages.length - 2];
+										prevPage.$vm.popleType = 'khName'
+										uni.navigateBack({
+											delta: 1
+										})
+									}
 								} else {
 									uni.showToast({
 										title: "添加失败",
@@ -339,7 +384,8 @@
 						}
 
 					} else {
-						if (that.type == 'edit') {
+						if (that.type == 'edit') {
+							console.log('this.formData',this.formData)
 							that.tui.request("/app/supplier/edit", "post", this.formData, false,
 								true).then((res) => {
 								if (res.code == 200) {
@@ -362,14 +408,24 @@
 									uni.showToast({
 										title: "添加成功",
 										icon: 'none'
-									})
-									let pages =
-										getCurrentPages();
-									let prevPage = pages[pages.length - 2];
-									prevPage.$vm.popleType = 'gysName'
-									uni.navigateBack({
-										delta: 1
-									})
+									})
+									if(uni.getStorageSync('kaidanBack')){
+										uni.removeStorageSync('kaidanBack')
+										let pages = getCurrentPages();
+										let prevPage = pages[pages.length - 3];
+										res.result.noEarn = this.formData.noEarn == ''?'0':this.formData.noEarn
+										prevPage.$vm.khName = res.result
+										uni.navigateBack({
+											delta: 2
+										})
+									}else{
+										let pages = getCurrentPages();
+										let prevPage = pages[pages.length - 2];
+										prevPage.$vm.popleType = 'gysName'
+										uni.navigateBack({
+											delta: 1
+										})
+									}
 								} else {
 									uni.showToast({
 										title: "添加失败",
diff --git a/pages/billing/changeGoods1.vue b/pages/billing/changeGoods1.vue
index 7f2ed19..f2ecb81 100644
--- a/pages/billing/changeGoods1.vue
+++ b/pages/billing/changeGoods1.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="title-box" style="height:8%;">
-			<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/货号/供应商" cancelButton="none" @confirm="search"
+			<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/货号/供应商" cancelButton="none"
 				@blur="search" @clear="clearSearch" />
 		</view>
 		<view class="content-left" style="height: 100%;float: left;position: fixed;top: 8%;">
@@ -15,21 +15,21 @@
 			<view class="right-box" v-for="(item,index) in shopList" :key="index" @tap="toggle('bottom',item)">
 				<!-- 当商品的delFlag=0和未入库状态时，显示此遮罩，点击弹出弹窗提示不能操作 -->
 				<!-- <view class="shop-mask" v-if="item.delFlag == 0"></view> -->
-				<view class="box-left">
+				<view class="box-left" @tap.stop="largeImg(item)">
 					<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
 					<view class="noPic" v-else>暂无图片</view>
 				</view>
 				<view class="box-right">
 					<view class="box-right-name">
-						{{item.productSn}}
+						{{item.productSn}}({{item.productName == null ?'':item.productName}})
 						<text style="color: red;" v-if="item.delFlag == 0">(已下架)</text>
 					</view>
-					<view class="box-right-num">{{item.productName}}</view>
+					<view class="box-right-num">供应商:{{item.supplierName== null?'':item.supplierName}}</view>
 					<view class="box-right-price">
-						<view class="price-box" v-if="storageType== 0">
+						<!-- <view class="price-box" v-if="storageType== 0">
 							<text>{{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}</text>
 							<text>采购价</text>
-						</view>
+						</view> -->
 						<view class="price-box">
 							<text>{{item.wholesalePrice}}</text>
 							<text>批发价</text>
@@ -49,18 +49,21 @@
 			<view class="right-box" v-for="(item,index) in shopList1" :key="index" @tap="toggle('bottom',item)">
 				<!-- 当商品的delFlag=0和未入库状态时，显示此遮罩，点击弹出弹窗提示不能操作 -->
 				<!-- <view class="shop-mask" v-if="item.delFlag == 0 || item.purchasePrice==null || item.inStorageStatus == 0" @tap.stop="clickMask"></view> -->
-				<view class="box-left">
+				<view class="box-left" @tap.stop="largeImg(item)">
 					<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
 					<view class="noPic" v-else>暂无图片</view>
 				</view>
 				<view class="box-right">
-					<view class="box-right-name">{{item.productName}}</view>
-					<view class="box-right-num">{{item.productSn}}</view>
+					<view class="box-right-name">
+						{{item.productSn}}
+						<text v-if="item.productName">({{item.productName == null ?'':item.productName}})</text>
+					</view>
+					<view class="box-right-num">供应商:{{item.supplierName}}</view>
 					<view class="box-right-price">
-						<view class="price-box" v-if="storageType== 0">
+						<!-- <view class="price-box" v-if="storageType== 0">
 							<text>{{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}</text>
 							<text>采购价</text>
-						</view>
+						</view> -->
 						<view class="price-box">
 							<text>{{item.wholesalePrice}}</text>
 							<text>批发价</text>
@@ -193,7 +196,19 @@
 					</view>
 				</view>
 			</uni-popup>
-		</view>
+		</view>
+		<!-- 弹出多图轮播 -->
+		<uni-popup ref="imgPopup" 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 bigImg" :key="index">
+						<view class="swiper-item">
+							<image mode='aspectFit' :src="item.productPicture" alt="" style="width: 100%;height: 100%;border-radius: 10px;" /></image>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+		</uni-popup>
 		<uni-popup ref="goodsNumDialog" @change="keyWordChange" background-color="#fff">
 			<view class="add-popup-content">
 				<view class="add-popup-title">
@@ -319,7 +334,9 @@
 				pecsList: [],
 				// status: 'loadmore',
 				pageOldTemList: [],
-				oldTemList: [],
+				oldTemList: [],
+				bigImg:[],
+				swiperDotIndex:0,
 				goodsList: [],
 				evalue: [],
 				newTemList: [],
@@ -345,7 +362,12 @@
 			if (this.pageNum >= this.pages) return;
 			// this.status = 'loading';
 			this.pageNum++;
-			this.getShareList();
+			if(this.gateType == 'search'){
+				this.getShareList('search');
+			}else{
+				this.getShareList();
+			}
+			
 		},
 		onLoad() {
 			this.height = wx.getSystemInfoSync().windowHeight
@@ -353,7 +375,10 @@
 			this.storageType = uni.getStorageSync('type')
 			uni.setStorageSync('clearMsg', '1')
 		},
-		methods: {
+		methods: {
+			lunbochange(e) {
+				this.current = e.detail.current
+			},
 			//初始化获取分类列表
 			getGategoryList() {
 				this.tui.request("/app/productCategory/list", "get", {}, false, true).then((res) => {
@@ -661,6 +686,9 @@
 			},
 			//顶部搜索框
 			search(e) {
+				this.pageNum = 1
+				this.shopList1 = []
+				this.shopList = []
 				if (e.value == '') {
 					this.searchName = ""
 					this.getShareList()
@@ -683,7 +711,7 @@
 					data = {
 						categoryId: "",
 						searchStr: this.searchName,
-						pageNum: 1,
+						pageNum: this.pageNum,
 						pageSize: '10'
 					}
 				} else {
@@ -973,6 +1001,25 @@
 					that.goodsNum = ''
 				})
 				this.$forceUpdate()
+			},
+			largeImg(img) {
+				if(img.productPicture == null &&img.productPictures == null ){
+					this.tui.toast("暂无可展示的图片")
+					return
+				}
+				this.bigImg = []
+				if(img.productPicture != null){
+					let data = {
+						productPicture:img.productPicture
+					}
+					this.bigImg.push(data)
+				}
+				if(img.productPictures != null){
+					for(let i=0;i<img.productPictures.length;i++){
+						this.bigImg.push(img.productPictures[i])
+					}
+				}
+				this.$refs.imgPopup.open()
 			},
 			//库存商品详情
 			getKCList(list) {
@@ -1558,7 +1605,24 @@
 		right: -15rpx;
 		background-size: 100%;
 	}
-
+	.showImg-box{
+		width: 700rpx;
+		height: 1100rpx;
+		border-radius: 10px;
+	}
+	.swiper-box {
+		height: 1100rpx;
+	}
+	.swiper-item {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 1100rpx;
+		color: #fff;
+		background-color: #cee1fd;
+		border-radius: 10px;
+	}
 	.zuni-numbox {
 		height: 60rpx;
 		display: flex;
diff --git a/pages/index/checkShop.vue b/pages/index/checkShop.vue
index eaaf860..dd6abed 100644
--- a/pages/index/checkShop.vue
+++ b/pages/index/checkShop.vue
@@ -65,6 +65,7 @@
 				shopList: [],
 				shopId: null,
 				current: '',
+				shopOwnerName:'',
 				name: '',
 				type:''
 			}
@@ -87,7 +88,8 @@
 							uni.setStorageSync('shopAddress', res.result.shopAddress)
 							uni.setStorageSync('shopIcon', res.result.shopIcon)
 							uni.setStorageSync('type', res.result.userType)
-							uni.setStorageSync('shopId', this.current)
+							uni.setStorageSync('shopId', this.current)
+							uni.setStorageSync("shopOwnerPhone", item.shopOwnerPhone)
 							this.tui.toast('切换店铺成功', 2000, true)
 							setTimeout(() => {
 								uni.reLaunch({
@@ -197,7 +199,8 @@
 					this.name = item.companyName
 				}else{
 					this.current = item.shopId
-					this.name = item.shopName
+					this.name = item.shopName
+					this.shopOwnerName = item.shopOwnerName
 				}
 			},
 			onEditSave() {
diff --git a/pages/index/customAndSupplierProductDetail.vue b/pages/index/customAndSupplierProductDetail.vue
index ca1d992..c6ec888 100644
--- a/pages/index/customAndSupplierProductDetail.vue
+++ b/pages/index/customAndSupplierProductDetail.vue
@@ -1,51 +1,79 @@
 <template>
-	<view class="container">
-		<uni-datetime-picker style="margin-bottom:10px;" v-if="type=='khName'" v-model="range" type="daterange" @change="searchList" />
-		<view class="tui-order-item boxbg" v-if="type=='khName'">
-			<view style="background: #fff;border: 1px solid #eee;">
-				<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text" activeColor="#007aff"></uni-segmented-control>
-			</view>
-			<view class="content">
-				
-				<view v-show="current === 1">
-					<view class="shop-box" v-for="(item,index4) in list" :key="index4" style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
-						<view>
-							<view style="width: 100%;height: 80rpx;line-height: 80rpx;">
-								<text style="display:inline-block;width: 55%;text-align: center;font-weight: bold;font-size: 30rpx;">
-									日期:{{item.createTime | removeStr}}
-								</text>
-								<text style="display:inline-block;width: 45%;text-align: center;border-left: 1px solid #eee;">
-									操作:{{item.createByName}}
-								</text>
-							</view>
-							<uni-table border stripe emptyText="暂无更多数据">
-								<!-- 表头行 -->
-								<uni-tr style="background: #eee;">
-									<uni-th align="center" width="60">货号</uni-th>
-									<uni-th align="center" width="50">数量</uni-th>
-									<uni-th align="center" width="70">拿货金额</uni-th>
-									<uni-th align="center" width="70">采购成本</uni-th>
-									<uni-th align="center" width="70">利润</uni-th>
-								</uni-tr>
-								<!-- 表格数据行 -->
-								<uni-tr  v-for="(item1,index) in item.saleDetailDTOList" :key="index" @tap="xiaoshouDetail('1',item1)">
-									<uni-td align="center">{{item1.productSn}}</uni-td>
-									<uni-td align="center">{{item1.productCount == null ?'0':item1.productCount}}</uni-td>
-									<uni-td align="center">{{item1.discountAmount * item1.productCount}}</uni-td>
-									<uni-td align="center">{{userType == 0 && isDownKH == false?(item1.purchasePrice * item1.productCount):'0'}}</uni-td>
-									<uni-td align="center">{{userType == 0 && isDownKH == false?((item1.discountAmount - item1.purchasePrice)*item1.productCount).toFixed(2):0}}</uni-td>
-								</uni-tr>
-							</uni-table>
-						</view>
-					</view>
-				</view>
-				<view v-show="current === 0">
-					<view style="background: linear-gradient(90deg, #6484fa 0%, #66e8ff 100%);overflow: hidden;color:#eee;">
+	<view class="container">
+		<uni-datetime-picker style="margin-bottom:10px;" v-model="range" type="daterange"
+			@change="searchList" />
+		<view class="tui-order-item boxbg" v-if="type=='khName'">
+			<view style="background: #fff;border: 1px solid #eee;">
+				<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+					activeColor="#007aff"></uni-segmented-control>
+			</view>
+			<view class="content">
+
+				<view v-show="current === 1">
+					<view class="shop-box" v-for="(item,index4) in list" :key="index4"
+						style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
+						<view>
+							<view style="width: 100%;height: 80rpx;line-height: 80rpx;">
+								<text
+									style="display:inline-block;width: 55%;text-align: center;font-weight: bold;font-size: 30rpx;">
+									日期:{{item.createTime | removeStr}}
+								</text>
+								<text
+									style="display:inline-block;width: 45%;text-align: center;border-left: 1px solid #eee;">
+									操作:{{item.createByName}}
+								</text>
+							</view>
+							<uni-table border stripe emptyText="暂无更多数据">
+								<!-- 表头行 -->
+								<uni-tr style="background: #eee;">
+									<uni-th align="center" width="60">货号</uni-th>
+									<uni-th align="center" width="50">数量</uni-th>
+									<uni-th align="center" width="70">拿货金额</uni-th>
+									<uni-th align="center" width="70">采购成本</uni-th>
+									<uni-th align="center" width="70">利润</uni-th>
+								</uni-tr>
+								<!-- 表格数据行 -->
+								<uni-tr v-for="(item1,index) in item.saleDetailDTOList" :key="index"
+									@tap="xiaoshouDetail('1',item1)">
+									<uni-td align="center">{{item1.productSn}}</uni-td>
+									<uni-td
+										align="center">{{item1.productCount == null ?'0':item1.productCount}}</uni-td>
+									<uni-td align="center">{{item1.discountAmount * item1.productCount}}</uni-td>
+									<uni-td
+										align="center">{{userType == 0 && isDownKH == false?(item1.purchasePrice * item1.productCount):'0'}}</uni-td>
+									<uni-td
+										align="center">{{userType == 0 && isDownKH == false?((item1.discountAmount - item1.purchasePrice)*item1.productCount).toFixed(2):0}}</uni-td>
+								</uni-tr>
+								<uni-tr>
+									<uni-td align="center">
+										<text style="font-weight: bold;">总数量:</text>
+									</uni-td>
+									<uni-td align="center">
+										<text style="font-weight: bold;">{{item.productCount}}</text>
+									</uni-td>
+									<uni-td align="center">
+										<text style="font-weight: bold;"></text>
+									</uni-td>
+									<uni-td align="center">
+										<text style="font-weight: bold;">拿货总价:</text>
+									</uni-td>
+									<uni-td align="center">
+										<text style="font-weight: bold;">{{item.totalAmount}}</text>
+									</uni-td>
+								</uni-tr>
+							</uni-table>
+						</view>
+					</view>
+				</view>
+				<view v-show="current === 0">
+					<view
+						style="background: linear-gradient(90deg, #6484fa 0%, #66e8ff 100%);overflow: hidden;color:#eee;">
 						<view class="top" ref="top">
 							<view class="top1">
 								<view class="hello-box">
 									<view class="hello-left">
-										<text style="font-size: 40rpx;font-weight: 800;line-height: 56rpx;color: rgba(86, 132, 255, 1);">
+										<text
+											style="font-size: 40rpx;font-weight: 800;line-height: 56rpx;color: rgba(86, 132, 255, 1);">
 											Hi
 										</text>
 									</view>
@@ -53,56 +81,75 @@
 										{{shopName+'对账单'}}
 									</view>
 									<view class="hello-right"></view>
-							
+
 								</view>
 								<view class="hello-text">
 									欢迎查看客户:{{duizhangList.userName == null ?"" : duizhangList.userName}}的对账单
 								</view>
-								<view style="text-align: center;display: flex;border-top: 1px solid #eee;padding: 10px 0;color: #7E5E60;position: absolute;top: 380rpx;width: 100%;font-weight: bold;">
+								<view
+									style="text-align: center;display: flex;border-top: 1px solid #eee;padding: 10px 0;color: #7E5E60;position: absolute;top: 380rpx;width: 100%;font-weight: bold;">
 									<view style="display: flex;flex-direction: column;width: 20%;">
 										<text>{{duizhangList.initialArrears >= 0?'期初欠款':'期初余额'}}</text>
 										<text>{{duizhangList.initialArrears == null ?"0" :Math.abs(duizhangList.initialArrears)}}</text>
 									</view>
-									<view style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
+									<view
+										style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
 										<text>{{duizhangList.endArrears >= 0?'期末欠款':'期末余额'}}</text>
 										<text>{{duizhangList.endArrears == null ?"0" :Math.abs(duizhangList.endArrears)}}</text>
 									</view>
-									<view style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
+									<view
+										style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
 										<text>{{duizhangList.arrears >= 0?'本期欠款':'本期余额'}}</text>
 										<text>{{duizhangList.arrears == null ?"0" :Math.abs(duizhangList.arrears)}}</text>
 									</view>
-									<view style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
+									<view
+										style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
 										<text>拿货总额</text>
 										<text>{{duizhangList.totalSale == null ?"0" :duizhangList.totalSale}}</text>
 									</view>
-									<view style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
+									<view
+										style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
 										<text>退货总额</text>
 										<text>{{duizhangList.totalReturn == null ?"0" :duizhangList.totalReturn}}</text>
 									</view>
 								</view>
 							</view>
-							
-						</view>
-						
-					</view>
-					<view v-if="duizhangList" v-for="(item,index) in duizhangRecords" :key="index" style="background: #fff;display: block;overflow: hidden;margin: 20rpx auto;width: 95%;border-radius: 10px;">
+
+						</view>
+
+					</view>
+					<view v-if="duizhangList" v-for="(item,index) in duizhangRecords" :key="index"
+						style="background: #fff;display: block;overflow: hidden;margin: 20rpx auto;width: 95%;border-radius: 10px;position: relative;">
 						<view style="display: flex;">
-							<view style="margin-top: 40rpx;width: 100rpx;height: 100rpx;border-radius: 80rpx;background: #8470FF;color: #fff;font-size: 26rpx;padding: 17rpx 24rpx;margin: 35rpx 0 0 35rpx;">
+							<view
+								style="margin-top: 40rpx;width: 100rpx;height: 100rpx;border-radius: 80rpx;background: #8470FF;color: #fff;font-size: 26rpx;padding: 17rpx 24rpx;margin: 35rpx 0 0 35rpx;">
 								{{item.dealingsType == 0 ?"销售开单" :item.dealingsType == 1 ?"退货" :item.dealingsType == 2 ?"回款" :item.dealingsType == 3 && item.amount< 0?"初始余额" :item.dealingsType == 3 && item.amount>= 0?"初始欠款" :item.dealingsType == 4 ?"充值金额" :item.dealingsType == 5 ?"追加欠款" :item.dealingsType == 6 ?"撤销订单" :""}}
 							</view>
 							<view style="height: 170rpx;line-height: 50rpx;padding-left: 30rpx;">
-								<view style="color: #747474;font-size: 28rpx;font-weight: bold;font-size: 32rpx;color: #000;margin-top:36rpx;">
+								<view
+									style="color: #747474;font-size: 28rpx;font-weight: bold;font-size: 32rpx;color: #000;margin-top:36rpx;">
 									{{item.createTime | removeStr}}
 								</view>
 								<view style="color: #747474;font-size: 28rpx;">
 									操作人:{{item.createByName == null ?"" :item.createByName}}
-								</view>
+								</view>
+								<img v-if="item.delFlag == 1 && item.dealingsType == 0 && item.billSaleDetailVos != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/7650e962bef14f529406866888eeff24.png" alt="" style="position: absolute;top: 0;right:0;width: 300rpx;height: 150rpx;" />
+								<img v-if="item.delFlag == 1 && item.dealingsType == 0 && item.billSaleDetailVos == null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/7517e15b5cf843d59b5b69c3a06a5d7b.png" alt="" style="position: absolute;top: 0;right:0;width: 200rpx;height: 110rpx;" />
+								<img v-if="item.dealingsType == 6" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/862680ecfe5a48b1a410287fb45987ef.png" alt="" style="position: absolute;top: 0;right:0;width: 300rpx;height: 150rpx;" />
 							</view>
 						</view>
-						<view v-if="item.billSaleDetailVos != null || item.billReturnSaleDetailVos != null" style="height: 60rpx;line-height: 60rpx;padding-left: 20rpx;font-size: 28rpx;background: #FFF0F5;color: #F08080;margin-bottom: 20rpx;width: 95%;margin: 0 auto 20rpx;border-radius: 5px;">
+						<view v-if="item.billSaleDetailVos != null || item.billReturnSaleDetailVos != null"
+							style="height: 60rpx;line-height: 60rpx;padding-left: 20rpx;font-size: 28rpx;background: #FFF0F5;color: #F08080;margin-bottom: 20rpx;width: 95%;margin: 0 auto 20rpx;border-radius: 5px;">
 							拿货数据~请查收
 						</view>
-						<view v-if="item.billSaleDetailVos != null" style="width: 95%;margin: 0 auto;border: 1.5px solid #000;border-radius: 10px;">
+						<view @tap="delDZD(item)" v-if="userType == 0 && isDownKH == false && item.billSaleDetailVos != null && (item.dealingsType == 6 || (item.dealingsType == 0 && item.delFlag == 1))" style="position: absolute;top: 173rpx;right: 17rpx;width: 100rpx;height: 60rpx;background: #088FEB;color: #fff;text-align: center;line-height: 60rpx;border-radius: 5px;">
+							删除
+						</view>
+						<view @tap="delDZD(item)" v-if="userType == 0 && isDownKH == false && item.billSaleDetailVos == null && (item.dealingsType == 6 || (item.dealingsType == 0 && item.delFlag == 1))" style="position: absolute;top: 116rpx;right: 17rpx;width: 100rpx;height: 60rpx;background: #088FEB;color: #fff;text-align: center;line-height: 60rpx;border-radius: 5px;">
+							删除
+						</view>
+						<view v-if="item.billSaleDetailVos != null"
+							style="width: 95%;margin: 0 auto;border: 1.5px solid #000;border-radius: 10px;">
 							<uni-table stripe>
 								<uni-tr style="background: #FFBF00;">
 									<uni-th align="center" width="120">
@@ -116,19 +163,24 @@
 									<uni-th align="center" width="80">总价</uni-th>
 								</uni-tr>
 								<!-- 表格数据行 -->
-								<uni-tr v-for="(item1,index1) in item.billSaleDetailVos" :key="index1" @tap="clickDetail(item1)">
+								<uni-tr v-for="(item1,index1) in item.billSaleDetailVos" :key="index1"
+									@tap="clickDetail(item1)">
 									<uni-td align="center">
 										<text>
 											{{item1.productSn == null ?"" :item1.productSn}}
 										</text>
 									</uni-td>
-									<uni-td align="center">{{item1.productCount == null ?"0" :item1.productCount}}</uni-td>
-									<uni-td align="center">{{item1.discountAmount == null ?"0" :item1.discountAmount}}</uni-td>
-									<uni-td align="center">{{item1.totalAmount == null ?"0" :item1.totalAmount}}</uni-td>
+									<uni-td
+										align="center">{{item1.productCount == null ?"0" :item1.productCount}}</uni-td>
+									<uni-td
+										align="center">{{item1.discountAmount == null ?"0" :item1.discountAmount}}</uni-td>
+									<uni-td
+										align="center">{{item1.totalAmount == null ?"0" :item1.totalAmount}}</uni-td>
 								</uni-tr>
 							</uni-table>
-						</view>
-						<view v-if="item.billReturnSaleDetailVos != null" style="width: 95%;margin: 20rpx auto 0;border: 1.5px solid #000;border-radius: 10px;">
+						</view>
+						<view v-if="item.billReturnSaleDetailVos != null"
+							style="width: 95%;margin: 20rpx auto 0;border: 1.5px solid #000;border-radius: 10px;">
 							<uni-table stripe>
 								<uni-tr style="background: #FFBF00;">
 									<uni-th align="center" width="120">
@@ -143,23 +195,27 @@
 									<uni-th align="center" width="80">总价</uni-th>
 								</uni-tr>
 								<!-- 表格数据行 -->
-								<uni-tr v-for="(item1,index1) in item.billReturnSaleDetailVos" :key="index1" @tap="clickDetail(item1)">
+								<uni-tr v-for="(item1,index1) in item.billReturnSaleDetailVos" :key="index1"
+									@tap="clickDetail(item1)">
 									<uni-td align="center">
 										<text>
 											{{item1.productSn == null ?"" :item1.productSn}}
 										</text>
 									</uni-td>
-									<uni-td align="center">{{item1.productCount == null ?"0" :item1.productCount}}</uni-td>
-									<uni-td align="center">{{item1.discountAmount == null ?"0" :item1.discountAmount}}</uni-td>
-									<uni-td align="center">{{item1.totalAmount == null ?"0" :item1.totalAmount}}</uni-td>
+									<uni-td
+										align="center">{{item1.productCount == null ?"0" :item1.productCount}}</uni-td>
+									<uni-td
+										align="center">{{item1.discountAmount == null ?"0" :item1.discountAmount}}</uni-td>
+									<uni-td
+										align="center">{{item1.totalAmount == null ?"0" :item1.totalAmount}}</uni-td>
 								</uni-tr>
 							</uni-table>
-						</view>
-						
-						
-						<view style="border-bottom: 2px solid #eee;" v-if="item.billSaleDetailVos != null">
-							<view style="font-weight: bold;padding: 20rpx;">
-								付款明细:
+						</view>
+
+
+						<view style="border-bottom: 2px solid #eee;" v-if="item.billSaleDetailVos != null">
+							<view style="font-weight: bold;padding: 20rpx;">
+								付款明细:
 							</view>
 							<view>
 								<view>
@@ -171,210 +227,518 @@
 									</view>
 								</view>
 								<view style="padding-left: 20rpx;margin-top: 40rpx;">
-									<view>欠款抵退货:{{item.debtDeductionAmount == null ?"0" :item.debtDeductionAmount}}</view>
-									<view>销售抵退货:{{item.saleDeductionAmount == null ?"0" :item.saleDeductionAmount}}</view>
-									<view>余额抵销售:{{item.balanceDeductionAmount == null ?"0" :item.balanceDeductionAmount}}</view>
+									<view>欠款抵退货:{{item.debtDeductionAmount == null ?"0" :item.debtDeductionAmount}}
+									</view>
+									<view>销售抵退货:{{item.saleDeductionAmount == null ?"0" :item.saleDeductionAmount}}
+									</view>
+									<view>
+										余额抵销售:{{item.balanceDeductionAmount == null ?"0" :item.balanceDeductionAmount}}
+									</view>
 								</view>
-							</view>
-							<view style="padding-left: 10px;margin: 20px 0 10px;height: 60rpx;line-height: 60rpx;text-align: center;font-size: 30rpx;font-weight: bold;display: flex;">
-								<text style="flex: 1;">本单实收:{{item.realAmount == null ?"0" :item.realAmount}}</text>
-								<text style="display: inline-block;padding-left: 20rpx;flex: 1;">本单已收:{{item.alreadyEarn == null ?"0" :item.alreadyEarn}}</text>
-							</view>
-						</view>
-						<view style="text-align: center;display: flex;padding: 10px 0;color: #000;">
-							<view v-if="item.lastDebtAmount >= 0" style="flex: 1;display: flex;flex-direction: column;">
-								<text>之前欠款</text>
-								<text>{{item.lastDebtAmount == null ?"0" :item.lastDebtAmount}}</text>
-							</view>
-							<view v-if="item.lastDebtAmount < 0" style="flex: 1;display: flex;flex-direction: column;">
-								<text>之前余额</text>
-								<text>{{item.lastDebtAmount == null ?"0" :Math.abs(item.lastDebtAmount)}}</text>
-							</view>
-							<view v-if="item.dealingsType == 5 || item.amount >= 0" style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
-								<text>{{item.dealingsType == 5?'追加欠款':item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销余额':'本单欠款'}}</text>
-								<text>{{item.amount == null ?"0" :item.dealingsType == 5?Math.abs(item.amount):item.amount}}</text>
-							</view>
-							<view v-if="item.amount < 0 && item.dealingsType != 5" style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
-								<text>{{item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销欠款':'本单余额'}}</text>
-								<text>{{item.amount == null ?"0" :Math.abs(item.amount)}}</text>
-							</view>
-							<view v-if="item.balanceDue >= 0" style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
-								<text>{{item.dealingsType == 6?'撤销后欠款':'本单后欠款'}}</text>
-								<text>{{item.balanceDue == null ?"0" :item.balanceDue}}</text>
-							</view>
-							<view v-if="item.balanceDue < 0" style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
-								<text>{{item.dealingsType == 6?'撤销后余额':'本单后余额'}}</text>
-								<text>{{item.balanceDue == null ?"0" :Math.abs(item.balanceDue)}}</text>
-							</view>
-						</view>
-					</view>
-					<view style="text-align: center;margin-bottom:20rpx;">
-						<text>对账时间:{{duizhangList.queryDate == null ?"" :duizhangList.queryDate}}</text>
-					</view>
-					<view style="text-align: center;height: 100rpx;line-height: 100rpx;border-top: 1px solid #eee;color: #777;">
-						<text>用快衣店AI，入库、开单更方便</text>
-					</view>
-				</view>
-				<view v-show="current === 2">
-					<view class="shop-box" v-for="(item,index4) in list" :key="index4" style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
-						<view>
-							<view style="padding-left: 20rpx;margin: 40rpx 0; font-weight: bold;font-size: 36rpx;text-align: center;">
-								<text>货号:{{item.productSn}}</text>
-							</view>
-							<view style="text-align: center;margin-bottom:20rpx;">
-								<text>名称:{{item.productName}}</text>
-								<text style="padding: 0 20rpx;">总数量:{{item.productCount == undefined ?'0':item.productCount}}</text>
-								<!-- <text style="padding: 0 20rpx;" v-if="userType == 0">利润:{{item1.lirun.toFixed(2)}}</text> -->
-							</view>
-							<uni-table border stripe emptyText="暂无更多数据">
-								<!-- 表头行 -->
-								<uni-tr style="background: #eee;">
-									<uni-th align="center" width="100">日期</uni-th>
-									<uni-th align="center" width="50">数量</uni-th>
-									<uni-th align="center" width="70">拿货价</uni-th>
-									<uni-th align="center" width="70">采购价</uni-th>
-									<uni-th align="center" width="70">利润</uni-th>
-								</uni-tr>
-								<!-- 表格数据行 -->
-								<uni-tr v-for="(item1,index1) in item.customerBuySaleVoList" :key="index1" @tap="xiaoshouDetail('2',item1)">
-									<uni-td align="center">{{item1.createTime | removeStr}}</uni-td>
-									<uni-td align="center">{{item1.productCount}}</uni-td>
-									<uni-td align="center">{{item1.customerBuyProductDetailLogVos[0].realPrice * item1.productCount}}</uni-td>
-									<uni-td align="center">{{userType == 0 && isDownKH == false?item1.customerBuyProductDetailLogVos[0].purchasePrice * item1.productCount:0}}</uni-td>
-									<uni-td align="center">{{userType == 0 && isDownKH == false?((item1.customerBuyProductDetailLogVos[0].realPrice - item1.customerBuyProductDetailLogVos[0].purchasePrice) * item1.productCount).toFixed(2):0}}</uni-td>
-								</uni-tr>
-							</uni-table>
-						</view>
-					</view>
-				</view>
-				<view v-show="current === 3">
-					<view v-for="(item,index) in list" :key="index" style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
-						<view style="width: 100%;height: 80rpx;line-height: 80rpx;">
-							<text style="display:inline-block;width: 55%;text-align: center;font-weight: bold;font-size: 30rpx;">
-								日期:{{item.createTime | removeStr}}
-							</text>
-							<text style="display:inline-block;width: 45%;text-align: center;border-left: 1px solid #eee;">
-								操作:{{item.createByName}}
-							</text>
-						</view>
-						<uni-table border stripe emptyText="暂无更多数据">
-							<!-- 表头行 -->
-							<uni-tr style="background: #eee;">
-								<uni-th align="center" width="85">货号</uni-th>
-								<uni-th align="center" width="50">数量</uni-th>
-								<uni-th align="center" width="70">退货价</uni-th>
-								<uni-th align="center" width="70">采购价</uni-th>
-							</uni-tr>
-							<!-- 表格数据行 -->
-							<uni-tr v-for="(items,index1) in item.returnSaleDetailList" :key="index1" @tap="xiaoshouDetail('3',items)">
-								<uni-td align="center">{{items.productSn}}</uni-td>
-								<uni-td align="center">{{item.productCount}}</uni-td>
-								<uni-td align="center">{{items.discountAmount}}</uni-td>
-								<uni-td align="center">{{userType == 0 && isDownKH == false?items.purchasePrice == null?0:items.purchasePrice:0}}</uni-td>
-							</uni-tr>
-						</uni-table>
-					</view>
-				</view>
-			</view>
-			<view class="shop-box" v-if="type==1" v-for="(item,index3) in list" :key="index3">
-				<uni-card :title="'供应商：'+ (item.purchase.supplierName?item.purchase.supplierName:'暂无')"
-						:sub-title="item.purchase.createTime?item.purchase.createTime:'暂无'" >
-					<view class="uni-body" style="text-align: center;"><text v-if="userType == 0 && isDownKH == false">采购价：{{item.purchaseDetails[0].purchasePrice?item.purchaseDetails[0].purchasePrice:'暂无'}}</text> 总数量：{{item.purchase.totalAmount?item.purchase.totalAmount:'暂无'}}</view>
-					<view style="margin: 5px 0;height: 1px;background: #eee;"></view>
-					<view style="display: flex;border-bottom: 1px solid #eee;height: 50rpx;line-height: 50rpx;">
-						<view style="width: 49%;text-align: center;border-right: 1px solid #eee;">商品规格</view>
-						<view style="width: 50%;text-align: center;">总数量</view>
-					</view>
-					<view v-for="(items,index1) in item.purchaseDetails" :key="index1">
-						<view v-for="(data,index2) in items.stockLogList1" :key="index2" style='height: 50rpx;line-height: 50rpx;'>
-							<view style="width: 49%;text-align: center;border-right: 1px solid #eee;float: left;">
-								{{data.attributeList | sliceMsg}}
-							</view>
-							<view style="width: 50%;text-align: center;float: left;">
-								{{data.productCount}}
-							</view> 
-						</view>
-					</view>
-				</uni-card>
+							</view>
+							<view
+								style="padding-left: 10px;margin: 20px 0 10px;height: 60rpx;line-height: 60rpx;text-align: center;font-size: 30rpx;font-weight: bold;display: flex;">
+								<text style="flex: 1;">本单应收:{{item.realAmount == null ?"0" :item.realAmount}}</text>
+								<text
+									style="display: inline-block;padding-left: 20rpx;flex: 1;">本单实收:{{item.alreadyEarn == null ?"0" :item.alreadyEarn}}</text>
+							</view>
+						</view>
+						<view style="text-align: center;display: flex;padding: 10px 0;color: #000;">
+							<view v-if="item.lastDebtAmount >= 0" style="flex: 1;display: flex;flex-direction: column;">
+								<text>之前欠款</text>
+								<text>{{item.lastDebtAmount == null ?"0" :item.lastDebtAmount}}</text>
+							</view>
+							<view v-if="item.lastDebtAmount < 0" style="flex: 1;display: flex;flex-direction: column;">
+								<text>之前余额</text>
+								<text>{{item.lastDebtAmount == null ?"0" :Math.abs(item.lastDebtAmount)}}</text>
+							</view>
+							<view v-if="item.dealingsType == 5 || item.amount >= 0"
+								style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
+								<text>{{item.dealingsType == 5?'追加欠款':item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销余额':'本单欠款'}}</text>
+								<text>{{item.amount == null ?"0" :item.dealingsType == 5?Math.abs(item.amount):item.amount}}</text>
+							</view>
+							<view v-if="item.amount < 0 && item.dealingsType != 5"
+								style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
+								<text>{{item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销欠款':'本单余额'}}</text>
+								<text>{{item.amount == null ?"0" :Math.abs(item.amount)}}</text>
+							</view>
+							<view v-if="item.balanceDue >= 0"
+								style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
+								<text>{{item.dealingsType == 6?'撤销后欠款':'本单后欠款'}}</text>
+								<text>{{item.balanceDue == null ?"0" :item.balanceDue}}</text>
+							</view>
+							<view v-if="item.balanceDue < 0"
+								style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
+								<text>{{item.dealingsType == 6?'撤销后余额':'本单后余额'}}</text>
+								<text>{{item.balanceDue == null ?"0" :Math.abs(item.balanceDue)}}</text>
+							</view>
+						</view>
+					</view>
+					<view style="text-align: center;margin-bottom:20rpx;">
+						<text>对账时间:{{duizhangList.queryDate == null ?"" :duizhangList.queryDate}}</text>
+					</view>
+					<view
+						style="text-align: center;height: 100rpx;line-height: 100rpx;border-top: 1px solid #eee;color: #777;">
+						<text>用快衣店AI，入库、开单更方便</text>
+					</view>
+				</view>
+				<view v-show="current === 2">
+					<view class="shop-box" v-for="(item,index4) in list" :key="index4"
+						style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
+						<view>
+							<view
+								style="padding-left: 20rpx;margin: 40rpx 0; font-weight: bold;font-size: 36rpx;text-align: center;">
+								<text>货号:{{item.productSn}}</text>
+							</view>
+							<view style="text-align: center;margin-bottom:20rpx;">
+								<text>名称:{{item.productName}}</text>
+								<text
+									style="padding: 0 20rpx;">总数量:{{item.productCount == undefined ?'0':item.productCount}}</text>
+								<!-- <text style="padding: 0 20rpx;" v-if="userType == 0">利润:{{item1.lirun.toFixed(2)}}</text> -->
+							</view>
+							<uni-table border stripe emptyText="暂无更多数据">
+								<!-- 表头行 -->
+								<uni-tr style="background: #eee;">
+									<uni-th align="center" width="100">日期</uni-th>
+									<uni-th align="center" width="50">数量</uni-th>
+									<uni-th align="center" width="70">拿货价</uni-th>
+									<uni-th align="center" width="70">采购价</uni-th>
+									<uni-th align="center" width="70">利润</uni-th>
+								</uni-tr>
+								<!-- 表格数据行 -->
+								<uni-tr v-for="(item1,index1) in item.customerBuySaleVoList" :key="index1"
+									@tap="xiaoshouDetail('2',item1)">
+									<uni-td align="center">{{item1.createTime | removeStr}}</uni-td>
+									<uni-td align="center">{{item1.productCount}}</uni-td>
+									<uni-td
+										align="center">{{item1.customerBuyProductDetailLogVos[0].realPrice * item1.productCount}}</uni-td>
+									<uni-td
+										align="center">{{userType == 0 && isDownKH == false?item1.customerBuyProductDetailLogVos[0].purchasePrice * item1.productCount:0}}</uni-td>
+									<uni-td
+										align="center">{{userType == 0 && isDownKH == false?((item1.customerBuyProductDetailLogVos[0].realPrice - item1.customerBuyProductDetailLogVos[0].purchasePrice) * item1.productCount).toFixed(2):0}}</uni-td>
+								</uni-tr>
+							</uni-table>
+						</view>
+					</view>
+				</view>
+				<view v-show="current === 3">
+					<view v-for="(item,index) in list" :key="index"
+						style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
+						<view style="width: 100%;height: 80rpx;line-height: 80rpx;">
+							<text
+								style="display:inline-block;width: 55%;text-align: center;font-weight: bold;font-size: 30rpx;">
+								日期:{{item.createTime | removeStr}}
+							</text>
+							<text
+								style="display:inline-block;width: 45%;text-align: center;border-left: 1px solid #eee;">
+								操作:{{item.createByName}}
+							</text>
+						</view>
+						<uni-table border stripe emptyText="暂无更多数据">
+							<!-- 表头行 -->
+							<uni-tr style="background: #eee;">
+								<uni-th align="center" width="85">货号</uni-th>
+								<uni-th align="center" width="50">数量</uni-th>
+								<uni-th align="center" width="70">退货价</uni-th>
+								<uni-th align="center" width="70">采购价</uni-th>
+							</uni-tr>
+							<!-- 表格数据行 -->
+							<uni-tr v-for="(items,index1) in item.returnSaleDetailList" :key="index1"
+								@tap="xiaoshouDetail('3',items)">
+								<uni-td align="center">{{items.productSn}}</uni-td>
+								<uni-td align="center">{{item.productCount}}</uni-td>
+								<uni-td align="center">{{items.discountAmount}}</uni-td>
+								<uni-td
+									align="center">{{userType == 0 && isDownKH == false?items.purchasePrice == null?0:items.purchasePrice:0}}</uni-td>
+							</uni-tr>
+						</uni-table>
+					</view>
+				</view>
+			</view>
+			<view class="shop-box" v-if="type==1" v-for="(item,index3) in list" :key="index3">
+				<uni-card :title="'供应商：'+ (item.purchase.supplierName?item.purchase.supplierName:'暂无')"
+					:sub-title="item.purchase.createTime?item.purchase.createTime:'暂无'">
+					<view class="uni-body" style="text-align: center;"><text
+							v-if="userType == 0 && isDownKH == false">采购价：{{item.purchaseDetails[0].purchasePrice?item.purchaseDetails[0].purchasePrice:'暂无'}}</text>
+						总数量：{{item.purchase.totalAmount?item.purchase.totalAmount:'暂无'}}</view>
+					<view style="margin: 5px 0;height: 1px;background: #eee;"></view>
+					<view style="display: flex;border-bottom: 1px solid #eee;height: 50rpx;line-height: 50rpx;">
+						<view style="width: 49%;text-align: center;border-right: 1px solid #eee;">商品规格</view>
+						<view style="width: 50%;text-align: center;">总数量</view>
+					</view>
+					<view v-for="(items,index1) in item.purchaseDetails" :key="index1">
+						<view v-for="(data,index2) in items.stockLogList1" :key="index2"
+							style='height: 50rpx;line-height: 50rpx;'>
+							<view style="width: 49%;text-align: center;border-right: 1px solid #eee;float: left;">
+								{{data.attributeList | sliceMsg}}
+							</view>
+							<view style="width: 50%;text-align: center;float: left;">
+								{{data.productCount}}
+							</view>
+						</view>
+					</view>
+				</uni-card>
+			</view>
+		</view>
+		<view class="tui-order-item boxbg" v-else>
+			<view style="background: #fff;border: 1px solid #eee;">
+				<uni-segmented-control :current="current" :values="itemsGYS" @clickItem="onClickItem" styleType="text"
+					activeColor="#007aff"></uni-segmented-control>
 			</view>
-		</view>
-		<view class="tui-order-item boxbg" v-else>
-			<view class="shop-box" v-for="(item,index4) in list" :key="index4">
-				<uni-card :title="item.productName?item.productName:'暂无'" :sub-title="item.productSn">
-					<view v-for="(data,index2) in item.supplierBuySaleVos" :key="index2" style="padding-bottom: 20rpx;margin-bottom: 20rpx;border-bottom: 1px solid #eee;">
-						<view class="uni-body" style="text-align: center;display: flex;flex-direction: column;">
-							<text>{{data.createTime}} </text> 
-							<text  v-if="userType == 0 && isDownKH == false" style="color:red;">采购价：{{data.supplierBuyProductDetailLogVos[0].purchasePrice}}</text>
-						</view>
-						<view style="margin: 5px 0;height: 1px;background: #eee;"></view>
-						<view style="display: flex;border-bottom: 1px solid #eee;height: 50rpx;line-height: 50rpx;">
-							<view style="width: 70%;text-align: center;border-right: 1px solid #eee;">商品规格</view>
-							<view style="width: 29%;text-align: center;">数量</view>
-						</view>
-						<view v-for="(data1,index) in data.supplierBuyProductDetailLogVos" :key="index" style='height: 50rpx;line-height: 50rpx;'>
-							<view style="width: 70%;text-align: center;border-right: 1px solid #eee;float: left;height: 50rpx;overflow: hidden;">
-								{{data1.attributeList | sliceMsg}}
+			<view class="content">
+
+				<view v-show="current === 1">
+					<view class="shop-box" v-for="(item,index4) in list" :key="index4"
+						style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
+						<view>
+							<view style="width: 100%;height: 80rpx;line-height: 80rpx;">
+								<text
+									style="display:inline-block;width: 55%;text-align: center;font-weight: bold;font-size: 30rpx;">
+									日期:{{item.purchase.createTime}}
+								</text>
+								<text
+									style="display:inline-block;width: 45%;text-align: center;border-left: 1px solid #eee;">
+									操作:{{item.purchase.createByName}}
+								</text>
+							</view>
+							<uni-table border stripe emptyText="暂无更多数据">
+								<!-- 表头行 -->
+								<uni-tr style="background: #eee;">
+									<uni-th align="center" width="60">货号</uni-th>
+									<uni-th align="center" width="50">数量</uni-th>
+									<uni-th align="center" width="70">采购价</uni-th>
+									<uni-th align="center" width="70">总金额</uni-th>
+								</uni-tr>
+								<!-- 表格数据行 -->
+								<uni-tr v-for="(item1,index) in item.purchaseDetails" :key="index"
+									@tap="xiaoshouDetail('1',item1)">
+									<uni-td align="center">{{item1.productSn}}</uni-td>
+									<uni-td
+										align="center">{{item1.productCount == null ?'0':item1.productCount}}</uni-td>
+									<uni-td align="center">{{item1.purchasePrice}}</uni-td>
+									<uni-td align="center">{{item1.productCount * item1.purchasePrice || 0}}</uni-td>
+								</uni-tr>
+								<uni-tr>
+									<uni-td align="center">
+										<text style="font-weight: bold;">总数量:</text>
+									</uni-td>
+									<uni-td align="center">
+										<text style="font-weight: bold;">{{item.purchase.productCount}}</text>
+									</uni-td>
+									<uni-td align="center">
+										<text style="font-weight: bold;">总价:</text>
+									</uni-td>
+									<uni-td align="center">
+										<text style="font-weight: bold;">{{item.purchase.shouldPay}}</text>
+									</uni-td>
+								</uni-tr>
+							</uni-table>
+						</view>
+					</view>
+				</view>
+				<view v-show="current === 0">
+					<view
+						style="background: linear-gradient(90deg, #6484fa 0%, #66e8ff 100%);overflow: hidden;color:#eee;">
+						<view class="top" ref="top">
+							<view class="top1">
+								<view class="hello-box">
+									<view class="hello-left">
+										<text
+											style="font-size: 40rpx;font-weight: 800;line-height: 56rpx;color: rgba(86, 132, 255, 1);">
+											Hi
+										</text>
+									</view>
+									<view class="hello-name">
+										{{shopName+'对账单'}}
+									</view>
+									<view class="hello-right"></view>
+
+								</view>
+								<view class="hello-text">
+									欢迎查看供应商:{{duizhangList.userName == null ?"" : duizhangList.userName}}的对账单
+								</view>
+								<view
+									style="text-align: center;display: flex;border-top: 1px solid #eee;padding: 10px 0;color: #7E5E60;position: absolute;top: 380rpx;width: 100%;font-weight: bold;">
+									<view style="display: flex;flex-direction: column;width: 25%;">
+										<text>{{duizhangList.initialArrears >= 0?'期初欠款':'期初余额'}}</text>
+										<text>{{duizhangList.initialArrears == null ?"0" :Math.abs(duizhangList.initialArrears)}}</text>
+									</view>
+									<view
+										style="display: flex;flex-direction: column;width: 25%;border-left: 1px solid #eee;">
+										<text>{{duizhangList.endArrears >= 0?'期末欠款':'期末余额'}}</text>
+										<text>{{duizhangList.endArrears == null ?"0" :Math.abs(duizhangList.endArrears)}}</text>
+									</view>
+									<view
+										style="display: flex;flex-direction: column;width: 25%;border-left: 1px solid #eee;">
+										<text>{{duizhangList.arrears >= 0?'本期欠款':'本期余额'}}</text>
+										<text>{{duizhangList.arrears == null ?"0" :Math.abs(duizhangList.arrears)}}</text>
+									</view>
+									<view
+										style="display: flex;flex-direction: column;width: 25%;border-left: 1px solid #eee;">
+										<text>拿货总额</text>
+										<text>{{duizhangList.totalSale == null ?"0" :duizhangList.totalSale}}</text>
+									</view>
+									<!-- <view
+										style="display: flex;flex-direction: column;width: 20%;border-left: 1px solid #eee;">
+										<text>退货总额</text>
+										<text>{{duizhangList.totalReturn == null ?"0" :duizhangList.totalReturn}}</text>
+									</view> -->
+								</view>
+							</view>
+
+						</view>
+
+					</view>
+					<view v-if="duizhangList" v-for="(item,index) in duizhangRecords" :key="index"
+						style="background: #fff;display: block;overflow: hidden;margin: 20rpx auto;width: 95%;border-radius: 10px;position: relative;">
+						<view style="display: flex;position: relative;">
+							<view
+								style="margin-top: 40rpx;width: 100rpx;height: 100rpx;border-radius: 80rpx;background: #8470FF;color: #fff;font-size: 26rpx;padding: 17rpx 24rpx;margin: 35rpx 0 0 35rpx;">
+								{{item.dealingsType == 0 ?"销售开单" :item.dealingsType == 1 ?"退货" :item.dealingsType == 2 ?"回款" :item.dealingsType == 3 && item.amount< 0?"初始余额" :item.dealingsType == 3 && item.amount>= 0?"初始欠款" :item.dealingsType == 4 ?"充值金额" :item.dealingsType == 5 ?"追加欠款" :item.dealingsType == 6 ?"撤销订单" :item.dealingsType == 7 ?"采购订单" :""}}
+							</view>
+							<view style="height: 170rpx;line-height: 50rpx;padding-left: 30rpx;">
+								<view
+									style="color: #747474;font-size: 28rpx;font-weight: bold;font-size: 32rpx;color: #000;margin-top:12rpx;">
+									操作时间:{{item.createTime | removeStr}}
+								</view>
+								<view v-if="item.dealingsType == 7 && item.purchaseTime != null" style="color: #747474;font-size: 28rpx;">
+									拿货时间:{{item.purchaseTime | removeStr}}
+								</view>
+								<view style="color: #747474;font-size: 28rpx;">
+									操作人:{{item.createByName == null ?"" :item.createByName}}
+								</view>
 							</view>
-							<view style="width: 29%;text-align: center;float: left;">
-								{{data1.productCount}}
-							</view> 
-						</view>
-					</view>
-				</uni-card>
-			</view>
-		</view>
-		<view v-if="type =='khName'" style="width: 90rpx;height: 80rpx;position: fixed;bottom: 50rpx;right: 40rpx;">
-			<button open-type="share" class="shareBtn">
-				<uni-icons type="redo" size="32"></uni-icons>
-				<text>分享</text>
-			</button>
-		</view>
-		<u-loadmore :status="status" />
-		<!-- 弹出销售商品规格 -->
-		<uni-popup ref="xsdetailPopup" background-color="#fff">
-			<view style="width: 500rpx;min-height: 500rpx;max-height: 1000rpx;overflow: scroll;">
-				<view @tap="$refs.xsdetailPopup.close()" style='width: 50rpx;height: 50rpx;position: absolute;right: 20rpx;top: 25rpx;'>
-					<uni-icons type="closeempty" color="red" size="22"></uni-icons>
-				</view>
-				<view style="height: 100rpx;line-height: 100rpx;font-weight: bold;font-size: 36rpx;text-align: center;">
-					规格数量详情
-				</view>
-				<uni-table border stripe emptyText="暂无更多数据" style="margin-bottom: 20rpx;border-radius: 10px;">
-					<!-- 表头行 -->
-					<uni-tr style="background: #eee;">
-						<uni-th align="center" width="80">规格</uni-th>
-						<uni-th align="center" width="55">数量</uni-th>
-					</uni-tr>
-					<!-- 表格数据行 -->
-					<uni-tr v-for="(item,index) in GDList" :key="index">
-						<uni-td align="center">{{item.attributeList | sliceMsg}}</uni-td>
-						<uni-td align="center">{{item.productCount}}</uni-td>
-					</uni-tr>
-				</uni-table>
-			</view>
-		</uni-popup>
-		<!-- 弹出商品规格 -->
-		<uni-popup ref="detailPopup" background-color="#fff">
-			<view style="width: 250px;min-height: 250px;max-height: 1000rpx;overflow: scroll;">
-				<view @tap="$refs.detailPopup.close()" style='width: 50rpx;height: 50rpx;position: absolute;right: 20rpx;top: 25rpx;'>
-					<uni-icons type="closeempty" color="red" size="22"></uni-icons>
-				</view>
-				<view style="height: 100rpx;line-height: 100rpx;font-weight: bold;font-size: 36rpx;text-align: center;">
-					{{detailList.productName}}({{detailList.productSn}})
-				</view>
-				<uni-table border stripe emptyText="暂无更多数据" style="margin-bottom: 20rpx;">
-					<!-- 表头行 -->
-					<uni-tr style="background: #eee;">
-						<uni-th align="center" width="80">规格</uni-th>
-						<uni-th align="center" width="55">数量</uni-th>
-					</uni-tr>
-					<!-- 表格数据行 -->
-					<uni-tr v-for="(item,index) in detailList.billAttributeListVos" :key="index">
-						<uni-td align="center">{{item.attributeList | sliceMsg}}</uni-td>
-						<uni-td align="center">{{item.productCount}}</uni-td>
-					</uni-tr>
-				</uni-table>
-			</view>
+							<img v-if="item.delFlag == 1&& item.dealingsType == 7" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/7650e962bef14f529406866888eeff24.png" alt="" style="position: absolute;top: 0;right:0;width: 300rpx;height: 150rpx;" />
+							<img v-if="item.dealingsType == 6" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/862680ecfe5a48b1a410287fb45987ef.png" alt="" style="position: absolute;top: 0;right:0;width: 300rpx;height: 150rpx;" />
+						</view>
+						<view v-if="item.billSaleDetailVos != null || item.billReturnSaleDetailVos != null"
+							style="height: 60rpx;line-height: 60rpx;padding-left: 20rpx;font-size: 28rpx;background: #FFF0F5;color: #F08080;margin-bottom: 20rpx;width: 95%;margin: 0 auto 20rpx;border-radius: 5px;">
+							拿货数据~请查收
+						</view>
+						<view @tap="delDZD(item)" v-if="userType == 0 && isDownKH == false &&item.billSaleDetailVos != null && (item.dealingsType == 6 || (item.dealingsType == 7 && item.delFlag == 1))" style="position: absolute;top: 173rpx;right: 17rpx;width: 100rpx;height: 60rpx;background: #088FEB;color: #fff;text-align: center;line-height: 60rpx;border-radius: 5px;">
+							删除
+						</view>
+						<view @tap="delDZD(item)" v-if="userType == 0 && isDownKH == false &&item.billSaleDetailVos == null && (item.dealingsType == 6 || (item.dealingsType == 7 && item.delFlag == 1))" style="position: absolute;top: 116rpx;right: 17rpx;width: 100rpx;height: 60rpx;background: #088FEB;color: #fff;text-align: center;line-height: 60rpx;border-radius: 5px;">
+							删除
+						</view>
+						<view v-if="item.billSaleDetailVos != null"
+							style="width: 95%;margin: 0 auto;border: 1.5px solid #000;border-radius: 10px;">
+							<uni-table stripe>
+								<uni-tr style="background: #FFBF00;">
+									<uni-th align="center" width="120">
+										货号
+									</uni-th>
+									<uni-th align="center" width="55">数量</uni-th>
+									<uni-th align="center" width="70">拿货价</uni-th>
+									<uni-th align="center" width="80">总价</uni-th>
+								</uni-tr>
+								<!-- 表格数据行 -->
+								<uni-tr v-for="(item1,index1) in item.billSaleDetailVos" :key="index1"
+									@tap="clickDetail(item1)">
+									<uni-td align="center">
+										<text>
+											{{item1.productSn == null ?"" :item1.productSn}}
+										</text>
+									</uni-td>
+									<uni-td
+										align="center">{{item1.productCount == null ?"0" :item1.productCount}}</uni-td>
+									<uni-td
+										align="center">{{item1.totalAmount / item1.productCount}}</uni-td>
+									<uni-td
+										align="center">{{item1.totalAmount == null ?"0" :item1.totalAmount}}</uni-td>
+								</uni-tr>
+							</uni-table>
+						</view>
+						<view style="border-bottom: 2px solid #eee;" v-if="item.billSaleDetailVos != null">
+							<view style="font-weight: bold;padding: 20rpx;">
+								付款明细:
+							</view>
+							<view>
+								<view>
+									<view style="padding-left: 20rpx;">
+										<text>拿货金额:{{item.shouldPay == null ?"0" :item.shouldPay}}</text>
+									</view>
+								</view>
+								<view style="padding-left: 20rpx;margin-top: 40rpx;">
+									<view>
+										余额抵进货:{{item.balanceDeductionAmount == null ?"0" :item.balanceDeductionAmount}}
+									</view>
+								</view>
+							</view>
+							<view
+								style="padding-left: 10px;margin: 20px 0 10px;height: 60rpx;line-height: 60rpx;text-align: center;font-size: 30rpx;font-weight: bold;display: flex;">
+								<text style="flex: 1;">本单应付:{{item.shouldPay == null ?"0" :item.shouldPay}}</text>
+								<text
+									style="display: inline-block;padding-left: 20rpx;flex: 1;">本单实付:{{item.alreadyPay == null ?"0" :item.alreadyPay}}</text>
+							</view>
+						</view>
+						<view style="text-align: center;display: flex;padding: 10px 0;color: #000;">
+							<view v-if="item.lastDebtAmount >= 0" style="flex: 1;display: flex;flex-direction: column;">
+								<text>之前欠款</text>
+								<text>{{item.lastDebtAmount == null ?"0" :item.lastDebtAmount}}</text>
+							</view>
+							<view v-if="item.lastDebtAmount < 0" style="flex: 1;display: flex;flex-direction: column;">
+								<text>之前余额</text>
+								<text>{{item.lastDebtAmount == null ?"0" :Math.abs(item.lastDebtAmount)}}</text>
+							</view>
+							<view v-if="item.dealingsType == 5 || item.amount >= 0"
+								style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
+								<text>{{item.dealingsType == 5?'追加欠款':item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销欠款':'本单欠款'}}</text>
+								<text>{{item.amount == null ?"0" :item.dealingsType == 5?Math.abs(item.amount):item.amount}}</text>
+							</view>
+							<view v-if="item.amount < 0 && item.dealingsType != 5"
+								style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
+								<text>{{item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销余额':'本单余额'}}</text>
+								<text>{{item.amount == null ?"0" :Math.abs(item.amount)}}</text>
+							</view>
+							<view v-if="item.balanceDue >= 0"
+								style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
+								<text>{{item.dealingsType == 6?'撤销后欠款':'本单后欠款'}}</text>
+								<text>{{item.balanceDue == null ?"0" :item.balanceDue}}</text>
+							</view>
+							<view v-if="item.balanceDue < 0"
+								style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
+								<text>{{item.dealingsType == 6?'撤销后余额':'本单后余额'}}</text>
+								<text>{{item.balanceDue == null ?"0" :Math.abs(item.balanceDue)}}</text>
+							</view>
+						</view>
+					</view>
+					<view style="text-align: center;margin-bottom:20rpx;">
+						<text>对账时间:{{duizhangList.queryDate == null ?"" :duizhangList.queryDate}}</text>
+					</view>
+					<view
+						style="text-align: center;height: 100rpx;line-height: 100rpx;border-top: 1px solid #eee;color: #777;">
+						<text>用快衣店AI，入库、开单更方便</text>
+					</view>
+				</view>
+				<view v-show="current === 2">
+					<view class="shop-box" v-for="(item,index4) in list" :key="index4"
+						style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
+						<view>
+							<view
+								style="padding-left: 20rpx;margin: 40rpx 0; font-weight: bold;font-size: 36rpx;text-align: center;">
+								<text>货号:{{item.productSn}}</text>
+							</view>
+							<view style="text-align: center;margin-bottom:20rpx;">
+								<text>名称:{{item.productName}}</text>
+								<text
+									style="padding: 0 20rpx;">总数量:{{item.productCount == undefined ?'0':item.productCount}}</text>
+								<!-- <text style="padding: 0 20rpx;" v-if="userType == 0">利润:{{item1.lirun.toFixed(2)}}</text> -->
+							</view>
+							<uni-table border stripe emptyText="暂无更多数据">
+								<!-- 表头行 -->
+								<uni-tr style="background: #eee;">
+									<uni-th align="center" width="100">日期</uni-th>
+									<uni-th align="center" width="50">数量</uni-th>
+									<!-- <uni-th align="center" width="70">拿货价</uni-th> -->
+									<uni-th align="center" width="70">采购价</uni-th>
+									<uni-th align="center" width="70">总金额</uni-th>
+									<!-- <uni-th align="center" width="70">利润</uni-th> -->
+								</uni-tr>
+								<!-- 表格数据行 -->
+								<uni-tr v-for="(item1,index1) in item.supplierBuySaleVos" :key="index1"
+									@tap="xiaoshouDetail('2',item1)">
+									<uni-td align="center">{{item1.createTime | removeStr}}</uni-td>
+									<uni-td align="center">{{item1.productCount}}</uni-td>
+									<!-- <uni-td align="center">{{item1.supplierBuyProductDetailLogVos[0].realPrice * item1.productCount}}</uni-td> -->
+									<uni-td
+										align="center">{{userType == 0 ?item1.supplierBuyProductDetailLogVos[0].purchasePrice:0}}</uni-td>
+									<uni-td align="center">{{item1.productCount * item1.supplierBuyProductDetailLogVos[0].purchasePrice || 0}}</uni-td>
+									<!-- <uni-td align="center">{{userType == 0 && isDownKH == false?((item1.supplierBuyProductDetailLogVos[0].realPrice - item1.customerBuyProductDetailLogVos[0].purchasePrice) * item1.productCount).toFixed(2):0}}</uni-td> -->
+								</uni-tr>
+							</uni-table>
+						</view>
+					</view>
+				</view>
+				<view v-show="current === 3">
+					<view v-for="(item,index) in list" :key="index"
+						style="background: #fff;display: block;overflow: hidden;margin: 0 auto 10px;">
+						<view style="width: 100%;height: 80rpx;line-height: 80rpx;">
+							<text
+								style="display:inline-block;width: 55%;text-align: center;font-weight: bold;font-size: 30rpx;">
+								日期:{{item.createTime | removeStr}}
+							</text>
+							<text
+								style="display:inline-block;width: 45%;text-align: center;border-left: 1px solid #eee;">
+								操作:{{item.createByName}}
+							</text>
+						</view>
+						<uni-table border stripe emptyText="暂无更多数据">
+							<!-- 表头行 -->
+							<uni-tr style="background: #eee;">
+								<uni-th align="center" width="85">货号</uni-th>
+								<uni-th align="center" width="50">数量</uni-th>
+								<uni-th align="center" width="70">退货价</uni-th>
+								<uni-th align="center" width="70">采购价</uni-th>
+							</uni-tr>
+							<!-- 表格数据行 -->
+							<uni-tr v-for="(items,index1) in item.returnSaleDetailList" :key="index1"
+								@tap="xiaoshouDetail('3',items)">
+								<uni-td align="center">{{items.productSn}}</uni-td>
+								<uni-td align="center">{{item.productCount}}</uni-td>
+								<uni-td align="center">{{items.discountAmount}}</uni-td>
+								<uni-td
+									align="center">{{userType == 0 && isDownKH == false?items.purchasePrice == null?0:items.purchasePrice:0}}</uni-td>
+							</uni-tr>
+						</uni-table>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="type =='khName'" style="width: 90rpx;height: 80rpx;position: fixed;bottom: 50rpx;right: 40rpx;">
+			<button open-type="share" class="shareBtn">
+				<uni-icons type="redo" size="32"></uni-icons>
+				<text>分享</text>
+			</button>
+		</view>
+		<u-loadmore :status="status" />
+		<!-- 弹出销售商品规格 -->
+		<uni-popup ref="xsdetailPopup" background-color="#fff">
+			<view style="width: 500rpx;min-height: 500rpx;max-height: 1000rpx;overflow: scroll;">
+				<view @tap="$refs.xsdetailPopup.close()"
+					style='width: 50rpx;height: 50rpx;position: absolute;right: 20rpx;top: 25rpx;'>
+					<uni-icons type="closeempty" color="red" size="22"></uni-icons>
+				</view>
+				<view style="height: 100rpx;line-height: 100rpx;font-weight: bold;font-size: 36rpx;text-align: center;">
+					规格数量详情
+				</view>
+				<uni-table border stripe emptyText="暂无更多数据" style="margin-bottom: 20rpx;border-radius: 10px;">
+					<!-- 表头行 -->
+					<uni-tr style="background: #eee;">
+						<uni-th align="center" width="80">规格</uni-th>
+						<uni-th align="center" width="55">数量</uni-th>
+					</uni-tr>
+					<!-- 表格数据行 -->
+					<uni-tr v-for="(item,index) in GDList" :key="index">
+						<uni-td align="center">{{item.attributeList | sliceMsg}}</uni-td>
+						<uni-td align="center">{{item.productCount}}</uni-td>
+					</uni-tr>
+				</uni-table>
+			</view>
+		</uni-popup>
+		<!-- 弹出商品规格 -->
+		<uni-popup ref="detailPopup" background-color="#fff">
+			<view style="width: 250px;min-height: 250px;max-height: 1000rpx;overflow: scroll;">
+				<view @tap="$refs.detailPopup.close()"
+					style='width: 50rpx;height: 50rpx;position: absolute;right: 20rpx;top: 25rpx;'>
+					<uni-icons type="closeempty" color="red" size="22"></uni-icons>
+				</view>
+				<view style="height: 100rpx;line-height: 100rpx;font-weight: bold;font-size: 36rpx;text-align: center;">
+					{{detailList.productName}}({{detailList.productSn}})
+				</view>
+				<uni-table border stripe emptyText="暂无更多数据" style="margin-bottom: 20rpx;">
+					<!-- 表头行 -->
+					<uni-tr style="background: #eee;">
+						<uni-th align="center" width="80">规格</uni-th>
+						<uni-th align="center" width="55">数量</uni-th>
+					</uni-tr>
+					<!-- 表格数据行 -->
+					<uni-tr v-for="(item,index) in detailList.billAttributeListVos" :key="index">
+						<uni-td align="center">{{item.attributeList | sliceMsg}}</uni-td>
+						<uni-td align="center">{{item.productCount}}</uni-td>
+					</uni-tr>
+				</uni-table>
+			</view>
 		</uni-popup>
 	</view>
 </template>
@@ -383,23 +747,24 @@
 	export default {
 		data() {
 			return {
-				list:[],
-				range:[],
-				GDList:[],
-				status: 'loadmore',
-				pages: 1,
-				pageNum: 1,
-				userId:'',
-				shopId:'',
-				duizhangRecords:[],
-				detailList:{},
-				duizhangList:{},
-				type:'',
-				isDownKH:false,
-				userType:uni.getStorageSync('type'),
-				items:['对账单', '拿货(按订单)','拿货(按商品)','退货明细'],
-				current: 1,
-				shopName:""
+				list: [],
+				range: [],
+				GDList: [],
+				status: 'loadmore',
+				pages: 1,
+				pageNum: 1,
+				userId: '',
+				shopId: '',
+				duizhangRecords: [],
+				detailList: {},
+				duizhangList: {},
+				type: '',
+				isDownKH: false,
+				userType: uni.getStorageSync('type'),
+				items: ['对账单', '拿货(按订单)', '拿货(按商品)', '退货明细'],
+				itemsGYS: ['对账单', '拿货(按订单)', '拿货(按商品)'],
+				current: 1,
+				shopName: ""
 			}
 		},
 		filters: {
@@ -412,243 +777,376 @@
 					}
 				}
 				return name;
-			},
-			removeStr(val) {
-				if(val == null){
-					return "";
-				}else{
-					var dotIndex = val.indexOf('.');
-					if (dotIndex !== -1) {
-					    return val.substring(0, dotIndex);
-					}
-					return val;
-				}
+			},
+			removeStr(val) {
+				if (val == null) {
+					return "";
+				} else {
+					var dotIndex = val.indexOf('.');
+					if (dotIndex !== -1) {
+						return val.substring(0, dotIndex);
+					}
+					return val;
+				}
+			}
+		},
+		onShareAppMessage() {
+			return {
+				title: this.shopName + '的对账单',
+				imageUrl: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/b28b3d46c21d4f60a334b25f56175cf3.jpg',
+				path: '/pages/index/customAndSupplierProductDetail?popleType=khName&id=' + this.userId + '&shopId=' + this
+					.shopId + '&shopName=' + this.shopName
 			}
-		},
-		onShareAppMessage() {
-			return {
-				title: '查看对账单详情',
-				imageUrl: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/b28b3d46c21d4f60a334b25f56175cf3.jpg',
-				path: '/pages/index/customAndSupplierProductDetail?popleType=khName&id=' + this.userId + '&shopId=' + this.shopId+ '&shopName=' + this.shopName
-			}
 		},
-		onLoad(option) {
-			let that = this;
-			this.getMonth();
-			this.userId = option.id
+		onLoad(option) {
+			let that = this;
+			
+			this.getMonth();
+			this.userId = option.id
 			this.type = option.popleType
-			this.shopName = option.shopName ?option.shopName : uni.getStorageSync('shopName')
-			this.shopId = option.shopId ?option.shopId : uni.getStorageSync('shopId')
-			if(option.shopId && option.shopId != uni.getStorageSync('shopId')){
-				this.isDownKH = true
-			}
+			this.shopName = option.shopName ? option.shopName : uni.getStorageSync('shopName')
+			this.shopId = option.shopId ? option.shopId : uni.getStorageSync('shopId')
+			if (option.shopId && option.shopId != uni.getStorageSync('shopId')) {
+				this.isDownKH = true
+			}
+			uni.setNavigationBarTitle({
+										title: this.shopName
+									});
 			this.getList()
-		},
-		onReachBottom() {
-			if (this.pageNum >= this.pages) return;
-			this.status = 'loading';
-			this.pageNum++;
-			if(this.current == 0){
-				this.duizhangdan()
-			}else{
-				this.getList();
-			}
 		},
-		methods: {
-			//获取当月1日到当前时间
-			getMonth() {
-				let date = new Date()
-				let year = date.getFullYear().toString()   //'年'
-				let month = date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1).toString():(date.getMonth()+1).toString()  //'月'
-				let da = date.getDate() < 10 ? '0'+date.getDate().toString():date.getDate().toString()  //'日'
-				let end = year + '-' + month + '-' + da  //当天
-				let beg = year + '-' + month + '-01'    //当月第一天
-				this.range = [beg,end]
-			},
-			duizhangdan(){
-				this.tui.request("/app/bill/getCustomerBill", "post", {
-					customerId:this.userId,
-					pageNum:this.pageNum,
-					pageSize:'10',
-					startDate:this.range[0],
-					endDate:this.range[1],
-					shopId:this.shopId
-				}, false, false).then((res) => {
-					if (res.code == 200) {
-						this.status = 'nomore';
-						if (this.pages == 1) {
-							this.duizhangList = res.result
-							this.duizhangRecords = res.result.customerBillSaleVos.records
-						} else {
-							for(let i=0;i<res.result.customerBillSaleVos.records.length;i++){
-								this.duizhangRecords.push(res.result.customerBillSaleVos.records[i])
-							}
-						}
-						this.pages = res.result.customerBillSaleVos.pages
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			xiaoshouDetail(type,item){
-				if(item){
-					if(type == '1'){
-						this.GDList = item.stockLogList1
-						this.$refs.xsdetailPopup.open()
-					}else if(type == '2'){
-						this.GDList = item.customerBuyProductDetailLogVos
-						this.$refs.xsdetailPopup.open()
-					}else if(type == '3'){
-						this.GDList = item.stockLogList1
-						this.$refs.xsdetailPopup.open()
-					}
-				}
+		onReachBottom() {
+			if (this.pageNum >= this.pages) return;
+			this.status = 'loading';
+			this.pageNum++;
+			if (this.current == 0) {
+				this.duizhangdan()
+			} else {
+				this.getList();
+			}
+		},
+		methods: {
+			//获取当月1日到当前时间
+			getMonth() {
+				let date = new Date()
+				let year = date.getFullYear().toString() //'年'
+				let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : (date.getMonth() + 1)
+					.toString() //'月'
+				let da = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate().toString() //'日'
+				let end = year + '-' + month + '-' + da //当天
+				let beg = year + '-' + month + '-01' //当月第一天
+				this.range = [beg, end]
 			},
-			getList(id) {
-				this.status = 'loading';
-				var url,data
-				if(this.type == 'gysName'){
-					url = "/app/sale/getSupplierBuyProductLog"
-					data = {
-						supplierId: this.userId,
-						pageSize: 10,
-						pageNum: this.pageNum
-					}
-				}else{
-					if(this.current == 1){
-						url = "/app/sale/listPages"
-						data = {
-							userId: this.userId,
-							pageVo: {pageSize: 10, pageNumber: this.pageNum},
-							searchStr: "",
-							startTime:this.range[0],
-							endTime:this.range[1],
-							shopId:this.shopId,
-							fromWhere:1
-						}
-					}else if(this.current == 2){
-						url = "/app/sale/getCustomerBuyProductLog"
-						data = {
-							userId: this.userId,
-							pageSize: 10,
-							startDate:this.range[0],
-							endDate:this.range[1],
-							pageNum: this.pageNum,
-							shopId:this.shopId
-						}
-					}else if(this.current == 3){
-						url = "/app/return/getReturnSaleListByUserId"
-						data = {
-							userId:this.userId,
-							startDate:this.range[0],
-							endDate:this.range[1],
-							pageNum:this.pageNum,
-							pageSize:"10",
-							shopId:this.shopId
-						}
-					}
+			delDZD(item){
+				let that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条数据吗？",
+					success: function(res) {
+						uni.showLoading({
+							title: '加载中...'
+						})
+						if (res.confirm) {
+							that.tui.request('/app/dealingRecord/deleteDealingsRecord', "post", {
+								id:item.id
+							}, false, true).then((res) => {
+								if (res.code == 200) {
+									that.tui.toast('删除成功')
+									that.duizhangList = []
+									that.pageNum = 1
+									that.pages = 1
+									that.duizhangdan()
+								} else {
+									that.tui.toast(res.message)
+								}
+							}).catch((res) => {})
+						}
+						setTimeout(res1 => {
+							uni.hideLoading();
+						}, 500)
+					}
+				})
+				
+			},
+			duizhangdan() {
+				var url,data
+				if(this.type == 'gysName'){
+					url = '/app/bill/getSupplierBill'
+					data = {
+						supplierId:this.userId,
+					    shopId:this.shopId,
+					    pageNum:this.pageNum,
+						startDate: this.range[0],
+						endDate: this.range[1],
+					    pageSize:"10"
+					}
+				}else{
+					url = "/app/bill/getCustomerBill"
+					data = {
+						customerId: this.userId,
+						pageNum: this.pageNum,
+						pageSize: '10',
+						startDate: this.range[0],
+						endDate: this.range[1],
+						shopId: this.shopId
+					}
 				}
-				this.tui.request(url, "post", data, false, false).then((res) => {
+				this.tui.request(url, "post", data, false, false).then((res) => {
+					if (res.code == 200) {
+						this.status = 'nomore';
+						if(this.type == 'gysName'){
+							if (this.pages == 1) {
+								this.duizhangList = res.result
+								this.duizhangRecords = res.result.supplierBillSaleVos.records
+							} else {
+								for (let i = 0; i < res.result.supplierBillSaleVos.records.length; i++) {
+									this.duizhangRecords.push(res.result.supplierBillSaleVos.records[i])
+								}
+							}
+							this.pages = res.result.supplierBillSaleVos.pages
+						}else{
+							if (this.pages == 1) {
+								this.duizhangList = res.result
+								this.duizhangRecords = res.result.customerBillSaleVos.records
+							} else {
+								for (let i = 0; i < res.result.customerBillSaleVos.records.length; i++) {
+									this.duizhangRecords.push(res.result.customerBillSaleVos.records[i])
+								}
+							}
+							this.pages = res.result.customerBillSaleVos.pages
+						}
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
+			xiaoshouDetail(type, item) {
+				if (item) {
+					if (type == '1') {
+						this.GDList = item.stockLogList1
+						this.$refs.xsdetailPopup.open()
+					} else if (type == '2') {
+						if(this.type == 'gysName'){
+							console.log('item',item)
+							this.GDList = item.supplierBuyProductDetailLogVos
+						}else{
+							this.GDList = item.customerBuyProductDetailLogVos
+						}
+						
+						this.$refs.xsdetailPopup.open()
+					} else if (type == '3') {
+						this.GDList = item.stockLogList1
+						this.$refs.xsdetailPopup.open()
+					}
+				}
+			},
+			getList(id) {
+				this.status = 'loading';
+				var url, data
+				if (this.type == 'gysName') {
+					if(this.current == 1){
+						url = "/app/purchase/getPurchaseListOfSupplier"
+						data = {
+							supplierId: this.userId,
+							pageSize: 10,
+							pageNum: this.pageNum,
+							startDate:this.range[0],
+							endDate:this.range[1]
+						}
+					}else if(this.current == 2){
+						url = "/app/sale/getSupplierBuyProductLog"
+						data = {
+							supplierId: this.userId,
+							pageSize: 10,
+							pageNum: this.pageNum,
+							shopId: this.shopId,
+							startDate:this.range[0],
+							endDate:this.range[1]
+						}
+					}
+					
+				} else {
+					if (this.current == 1) {
+						url = "/app/sale/listPages"
+						data = {
+							userId: this.userId,
+							pageVo: {
+								pageSize: 10,
+								pageNumber: this.pageNum
+							},
+							searchStr: "",
+							startTime: this.range[0],
+							endTime: this.range[1],
+							shopId: this.shopId,
+							fromWhere: 1
+						}
+					} else if (this.current == 2) {
+						url = "/app/sale/getCustomerBuyProductLog"
+						data = {
+							userId: this.userId,
+							pageSize: 10,
+							startDate: this.range[0],
+							endDate: this.range[1],
+							pageNum: this.pageNum,
+							shopId: this.shopId
+						}
+					} else if (this.current == 3) {
+						url = "/app/return/getReturnSaleListByUserId"
+						data = {
+							userId: this.userId,
+							startDate: this.range[0],
+							endDate: this.range[1],
+							pageNum: this.pageNum,
+							pageSize: "10",
+							shopId: this.shopId
+						}
+					}
+				}
+				this.tui.request(url, "post", data, false, false).then((res) => {
 					this.status = 'nomore';
 					if (res.code == 200) {
 						// this.list = res.result.records
-						if (this.pages == 1) {
-							this.list = res.result.records
-						} else {
-							this.list = [...this.list, ...res.result.records]
-							
-						}
-						this.pages = res.result.pages
-						if(this.current == 1){
-							for(let i=0;i<this.list.length;i++){
-								for(let j=0;j<this.list[i].saleDetailDTOList.length;j++){
-									this.list[i].saleDetailDTOList[j].productCount = 0
-									for(let m=0;m<this.list[i].saleDetailDTOList[j].stockLogList1.length;m++){
-										this.list[i].saleDetailDTOList[j].productCount += this.list[i].saleDetailDTOList[j].stockLogList1[m].productCount
-									}
-								}
-							}
-							this.$forceUpdate()
-						}else if(this.current == 2){
-							for(let i=0;i<this.list.length;i++){
-								this.list[i].productCount = 0
-								for(let j=0;j<this.list[i].customerBuySaleVoList.length;j++){
-									this.list[i].customerBuySaleVoList[j].productCount = 0
-									
-									for(let m=0;m<this.list[i].customerBuySaleVoList[j].customerBuyProductDetailLogVos.length;m++){
-										this.list[i].productCount += this.list[i].customerBuySaleVoList[j].customerBuyProductDetailLogVos[m].productCount
-										this.list[i].customerBuySaleVoList[j].productCount += this.list[i].customerBuySaleVoList[j].customerBuyProductDetailLogVos[m].productCount
-									}
-								}
-							}
-							this.$forceUpdate()
+						if (this.pages == 1) {
+							this.list = res.result.records
+						} else {
+							this.list = [...this.list, ...res.result.records]
+
+						}
+						this.pages = res.result.pages
+						if (this.current == 1) {
+							if(this.type == 'gysName'){
+								for (let i = 0; i < this.list.length; i++) {
+									this.list[i].purchase.productCount = 0
+									for (let j = 0; j < this.list[i].purchaseDetails.length; j++) {
+										for (let m = 0; m < this.list[i].purchaseDetails[j].stockLogList1
+											.length; m++) {
+											this.list[i].purchase.productCount += this.list[i]
+												.purchaseDetails[j].stockLogList1[m].productCount
+										}
+									}
+								}
+							}else{
+								for (let i = 0; i < this.list.length; i++) {
+									this.list[i].productCount = 0
+									for (let j = 0; j < this.list[i].saleDetailDTOList.length; j++) {
+										this.list[i].saleDetailDTOList[j].productCount = 0
+										for (let m = 0; m < this.list[i].saleDetailDTOList[j].stockLogList1
+											.length; m++) {
+											this.list[i].productCount += this.list[i]
+												.saleDetailDTOList[j].stockLogList1[m].productCount
+											this.list[i].saleDetailDTOList[j].productCount += this.list[i]
+												.saleDetailDTOList[j].stockLogList1[m].productCount
+										}
+									}
+								}
+							}
+							
+							this.$forceUpdate()
+						} else if (this.current == 2) {
+							if(this.type == 'gysName'){
+								for (let i = 0; i < this.list.length; i++) {
+									this.list[i].productCount = 0
+									for (let j = 0; j < this.list[i].supplierBuySaleVos.length; j++) {
+										this.list[i].supplierBuySaleVos[j].productCount = 0
+
+										for (let m = 0; m < this.list[i].supplierBuySaleVos[j]
+											.supplierBuyProductDetailLogVos.length; m++) {
+											this.list[i].productCount += this.list[i].supplierBuySaleVos[j]
+												.supplierBuyProductDetailLogVos[m].productCount
+											this.list[i].supplierBuySaleVos[j].productCount += this.list[i]
+												.supplierBuySaleVos[j].supplierBuyProductDetailLogVos[m]
+												.productCount
+										}
+									}
+								}
+								this.$forceUpdate()
+							}else{
+								for (let i = 0; i < this.list.length; i++) {
+									this.list[i].productCount = 0
+									for (let j = 0; j < this.list[i].customerBuySaleVoList.length; j++) {
+										this.list[i].customerBuySaleVoList[j].productCount = 0
+
+										for (let m = 0; m < this.list[i].customerBuySaleVoList[j]
+											.customerBuyProductDetailLogVos.length; m++) {
+											this.list[i].productCount += this.list[i].customerBuySaleVoList[j]
+												.customerBuyProductDetailLogVos[m].productCount
+											this.list[i].customerBuySaleVoList[j].productCount += this.list[i]
+												.customerBuySaleVoList[j].customerBuyProductDetailLogVos[m]
+												.productCount
+										}
+									}
+								}
+								this.$forceUpdate()
+							}
+							
 						}
 					} else {
 						this.tui.toast(res.message)
 					}
 				}).catch((res) => {})
-			},
-			clickDetail(item){
-				this.detailList = item
-				this.$refs.detailPopup.open()
-			},
-			onClickItem(e) {
-				if (this.current !== e.currentIndex) {
-					this.current = e.currentIndex
-				}
-				if(e.currentIndex == 0){
-					this.duizhangList = []
-					this.pageNum = 1
-					this.pages = 1
-					this.duizhangdan()
-				}else if(e.currentIndex == 1){
-					this.list = []
-					this.pageNum = 1
-					this.getList()
-				}else if(e.currentIndex == 2){
-					this.list = []
-					this.pageNum = 1
-					this.getList()
-				}else if(e.currentIndex == 3){
-					this.list = []
-					this.pageNum = 1
-					this.getList()
-				}
-			},
-			searchList() {
-				if(this.current == 0){
-					this.duizhangList = []
-					this.pageNum = 1
-					this.pages = 1
-					this.duizhangdan()
-				}else if(this.current == 1){
-					this.list = []
-					this.pageNum = 1
-					this.getList()
-				}else if(this.current == 2){
-					this.list = []
-					this.pageNum = 1
-					this.getList()
-				}else if(this.current == 3){
-					this.list = []
-					this.pageNum = 1
-					this.getList()
-				}
+			},
+			clickDetail(item) {
+				this.detailList = item
+				this.$refs.detailPopup.open()
+			},
+			onClickItem(e) {
+				if (this.current !== e.currentIndex) {
+					this.current = e.currentIndex
+				}
+				if (e.currentIndex == 0) {
+					this.duizhangList = []
+					this.pageNum = 1
+					this.pages = 1
+					this.duizhangdan()
+				} else if (e.currentIndex == 1) {
+					this.list = []
+					this.pageNum = 1
+					this.getList()
+				} else if (e.currentIndex == 2) {
+					this.list = []
+					this.pageNum = 1
+					this.getList()
+				} else if (e.currentIndex == 3) {
+					this.list = []
+					this.pageNum = 1
+					this.getList()
+				}
+			},
+			searchList() {
+				if (this.current == 0) {
+					this.duizhangList = []
+					this.pageNum = 1
+					this.pages = 1
+					this.duizhangdan()
+				} else if (this.current == 1) {
+					this.list = []
+					this.pageNum = 1
+					this.getList()
+				} else if (this.current == 2) {
+					this.list = []
+					this.pageNum = 1
+					this.getList()
+				} else if (this.current == 3) {
+					this.list = []
+					this.pageNum = 1
+					this.getList()
+				}
 			},
 		},
 	}
 </script>
 
-<style lang="scss">
-	.uni-card__header-box{
-		text-align: center !important;
-	}
-	.uni-card__header-content-title{
-		font-weight: bold;
+<style lang="scss">
+	.uni-card__header-box {
+		text-align: center !important;
 	}
+
+	.uni-card__header-content-title {
+		font-weight: bold;
+	}
+
 	.container {
-		
-		.boxbg {
+
+		.boxbg {
 			padding-top: 10rpx;
 			background-color: #FAF7F7;
 		}
@@ -665,7 +1163,7 @@
 				width: 100%;
 				box-sizing: border-box;
 				background: #fff;
-				line-height: 26px;
+				line-height: 26px;
 				border-top: 10px solid #eee;
 
 				.tui-price-flex {
@@ -685,6 +1183,7 @@
 
 				.tui-price-large {
 					font-size: 32rpx;
+
 					.lineText {
 						text-decoration: line-through;
 						font-size: 12px;
@@ -732,129 +1231,139 @@
 		z-index: 996;
 	}
 
-	.tui-btn-mr {
-		width:130rpx;
-		height: 60rpx;
-		background: #088FEB;
-		color: #fff;
-		border-radius: 10px;
-		line-height: 60rpx;
-		text-align: center;
-		margin-right: 30rpx;
-	}
-	.shop-box {
-		margin: 0 auto;
-		position: relative;
-	}
-	.shop-name {
-		width: 100%;
-		height: 200rpx;
-		line-height: 80rpx;
-		border-top: 1px solid #eee;
-		border-bottom: 1px solid #eee;
-		font-size: 28rpx;
-		font-weight: bold;
-		display: flex;
-		.uni-icons {
-			color: #088FEB !important;
-		}
-	}
-	
-	.shop-productName {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		padding-left: 20rpx;
-	}
-	
-	.shop-productName view {
-		height: 55rpx;
-	}
-	
-	.shop-collapse {
-		display: flex;
-		height: 80rpx;
-		font-size: 26rpx;
-		line-height: 80rpx;
-	}
-	
-	.shop-collapse text {
-		flex: 1;
-		text-align: center;
-		padding-right: 40rpx;
-		border-right: 1px solid #eee;
-	}
-	.content-list {
-		width: 95%;
-		margin: 0 auto;
-		display: flex;
-		height: 80rpx;
-		border-bottom: 1px solid #eee;
-	}
-	
-	.content-list:last-child {
-		border-bottom: none;
-		height: auto;
-	}
-	
-	.list-name {
-		width: 200rpx;
-		text-align: left;
-		line-height: 40px;
-		height: 80rpx;
-		padding-left: 20rpx;
-	}
-	
-	.list-val {
-		width: 560rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-	}
-	
-	.list-val input {
-		width: 400rpx;
-		height: 60rpx;
-		display: inline-block;
-		line-height: 60rpx;
-		float: left;
-		margin-top: 10rpx;
-		padding-left: 20rpx;
-		border-bottom: 1px solid #088FEB;
-	}
-	.shareBtn{
-		background: rgba(255, 255, 255, 0);
-		width: 90rpx;
-		height: 50;
-		height: 80rpx;
-		line-height: 80rpx;
-		border: 1px solid #f3f4f6;
-		background-color: rgba(255,255,255,0);
-	}
-	.shareBtn::after{
-		border: none;
-	}
-	textarea {
-		margin: 20rpx;
-		border: 1px solid #eee;
-		height: 150rpx;
-		width: 500rpx;
+	.tui-btn-mr {
+		width: 130rpx;
+		height: 60rpx;
+		background: #088FEB;
+		color: #fff;
+		border-radius: 10px;
+		line-height: 60rpx;
+		text-align: center;
+		margin-right: 30rpx;
+	}
+
+	.shop-box {
+		margin: 0 auto;
+		position: relative;
+	}
+
+	.shop-name {
+		width: 100%;
+		height: 200rpx;
+		line-height: 80rpx;
+		border-top: 1px solid #eee;
+		border-bottom: 1px solid #eee;
+		font-size: 28rpx;
+		font-weight: bold;
+		display: flex;
+
+		.uni-icons {
+			color: #088FEB !important;
+		}
+	}
+
+	.shop-productName {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		padding-left: 20rpx;
+	}
+
+	.shop-productName view {
+		height: 55rpx;
 	}
+
+	.shop-collapse {
+		display: flex;
+		height: 80rpx;
+		font-size: 26rpx;
+		line-height: 80rpx;
+	}
+
+	.shop-collapse text {
+		flex: 1;
+		text-align: center;
+		padding-right: 40rpx;
+		border-right: 1px solid #eee;
+	}
+
+	.content-list {
+		width: 95%;
+		margin: 0 auto;
+		display: flex;
+		height: 80rpx;
+		border-bottom: 1px solid #eee;
+	}
+
+	.content-list:last-child {
+		border-bottom: none;
+		height: auto;
+	}
+
+	.list-name {
+		width: 200rpx;
+		text-align: left;
+		line-height: 40px;
+		height: 80rpx;
+		padding-left: 20rpx;
+	}
+
+	.list-val {
+		width: 560rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+
+	.list-val input {
+		width: 400rpx;
+		height: 60rpx;
+		display: inline-block;
+		line-height: 60rpx;
+		float: left;
+		margin-top: 10rpx;
+		padding-left: 20rpx;
+		border-bottom: 1px solid #088FEB;
+	}
+
+	.shareBtn {
+		background: rgba(255, 255, 255, 0);
+		width: 90rpx;
+		height: 50;
+		height: 80rpx;
+		line-height: 80rpx;
+		border: 1px solid #f3f4f6;
+		background-color: rgba(255, 255, 255, 0);
+	}
+
+	.shareBtn::after {
+		border: none;
+	}
+
+	textarea {
+		margin: 20rpx;
+		border: 1px solid #eee;
+		height: 150rpx;
+		width: 500rpx;
+	}
+
 	.uni-table-scroll {
 		width: 100%;
 		overflow-x: auto;
 		border-radius: 10px;
 	}
-	.uni-table-th{
+
+	.uni-table-th {
 		background: #FAE7B5 !important;
 		color: #000 !important;
 	}
+
 	.top1 {
 		width: 780rpx;
 		height: 390rpx;
 		opacity: 1;
 		background: linear-gradient(360deg, #FAF7F7 0%, rgba(255, 255, 255, 0) 100%);
 	}
-	
+
 	.ai-bot {
 		position: absolute;
 		top: 200rpx;
@@ -864,14 +1373,14 @@
 		background-size: 100% !important;
 		background: url(https://jewel-shop.oss-cn-beijing.aliyuncs.com/66dc640d9e8f4749a234d9ef2af1b257.png) no-repeat;
 	}
-	
+
 	.hello-box {
 		position: absolute;
 		left: 42rpx;
 		top: 205rpx;
 		width: 220rpx;
 		height: 56rpx;
-	
+
 		.hello-left {
 			width: 102rpx;
 			height: 56rpx;
@@ -881,7 +1390,7 @@
 			text-align: center;
 			transform: skewX(8deg);
 		}
-	
+
 		.hello-right {
 			position: absolute;
 			left: 5px;
@@ -891,7 +1400,7 @@
 			opacity: 1;
 			background: linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, #ffffff 100%);
 		}
-	
+
 		.hello-name {
 			position: absolute;
 			left: 118rpx;
@@ -904,7 +1413,7 @@
 			overflow: hidden;
 		}
 	}
-	
+
 	.hello-text {
 		position: absolute;
 		top: 275rpx;
@@ -912,6 +1421,7 @@
 		color: #fff;
 		font-size: 28rpx;
 	}
+
 	.top {
 		width: 780rpx;
 		height: 330rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 47f66e8..b9439b6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -45,7 +45,7 @@
 					</view> -->
 				</view>
 			</view>
-			<view class="waimai" @tap="quwaimai"></view>
+			<view class="waimai" :style="{'right':waimaiRight}" @tap="quwaimai"></view>
 
 			<view class="contentPadding">
 				<view class="title">
@@ -66,19 +66,25 @@
 						<u-count-to :start-val="0" :end-val="type==0?shopInfo.totalProfit:0" :decimals="2"></u-count-to>
 						<view class="grid-text">今日利润</view>
 					</u-grid-item>
-					<u-grid-item>
-						<u-count-to :start-val="0" :end-val="shopInfo.totalCCount"></u-count-to>
-						<view class="grid-text">下单客户数</view>
-					</u-grid-item>
-					<u-grid-item>
-						<u-count-to :start-val="0" :end-val="shopInfo.returnTotalAmount"></u-count-to>
-						<view class="grid-text">退货金额</view>
-					</u-grid-item>
-					<u-grid-item>
-						<u-count-to :start-val="0" :end-val="shopInfo.returnTotalCount"></u-count-to>
-						<view class="grid-text">退货笔数</view>
-					</u-grid-item>
 				</u-grid>
+				<view style="display: flex;text-align: center;font-size: 30rpx;">
+					<view class="title-four">
+						<view style="line-height:80rpx;font-size:34rpx;">{{shopInfo.totalCCount}}</view>
+						<view>下单客户</view>
+					</view>
+					<view class="title-four">
+						<view style="line-height:80rpx;font-size:34rpx;">{{shopInfo.totalJCount}}</view>
+						<view>销售件数</view>
+					</view>
+					<view class="title-four">
+						<view style="line-height:80rpx;font-size:34rpx;">{{shopInfo.returnTotalAmount}}</view>
+						<view>退货金额</view>
+					</view>
+					<view class="title-four">
+						<view style="line-height:80rpx;font-size:34rpx;">{{shopInfo.returnTotalCount}}</view>
+						<view>退货数</view>
+					</view>
+				</view>
 			</view>
 			<view class="contentPadding">
 				<view class="title">
@@ -144,7 +150,9 @@
 								isLink arrow-direction="left"></u-cell>
 							<u-cell icon="account-fill" url="/package1/index/returnOrder" title="退货单历史" clickable
 								isLink arrow-direction="left"></u-cell>
-							<view class="border-line"></view>
+							<view class="border-line"></view>
+							<u-cell icon="rewind-right-fill" url="/package1/index/updateShopMsg" title="更新店铺信息" clickable
+								isLink arrow-direction="left"></u-cell>
 							<u-cell v-if="shopName == '提钱退休' || shopName == '测试库新店' || shopName == '侧视颠仆'"
 								icon="integral-fill" url="/package1/AI/addAiList" title="管理员登录" clickable isLink
 								arrow-direction="left"></u-cell>
@@ -209,6 +217,7 @@
 				chartData: {},
 				returnList:new Map(),
 				shopName: '',
+				waimaiRight:'-70rpx',
 				showDayPrice: false,
 				opts: {
 					padding: [15, 10, 0, 15],
@@ -333,7 +342,7 @@
 			async cancelOrder(item, type) {
 				let that = this;
 				await this.getReturnOrder(item.id)
-				await this.tui.modal("提示", "您确定要撤销订单吗？", true, (res) => {
+				await this.tui.modal("提示", type=='goPay'?"您确定要撤销订单并重新开单吗？":"您确定要撤销订单吗？", true, (res) => {
 					if (res) {
 						that.cancelSale(item,type)
 					}
@@ -425,7 +434,8 @@
 						obj.productName = item.saleDetailDTOList[i].productName
 						obj.productPicture = item.saleDetailDTOList[i].productPicture + '?time=' + new Date().getTime()
 						obj.productSn = item.saleDetailDTOList[i].productSn
-						obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
+						obj.wholesalePrice = item.saleDetailDTOList[i].discountAmount?item.saleDetailDTOList[i].discountAmount:item.saleDetailDTOList[i].wholesalePrice
+						// obj.discountAmount = item.saleDetailDTOList[i].discountAmount
 						obj.returnPrice = item.saleDetailDTOList[i].returnPrice
 						obj.saleId = item.id
 						obj.remark = item.remark
@@ -518,9 +528,16 @@
 			},
 			//跳转外卖小程序
 			quwaimai() {
-				uni.openEmbeddedMiniProgram({
-					appId: 'wxf5362b6e97ecee2f'
-				})
+				if(this.waimaiRight == '-70rpx'){
+					this.waimaiRight = '20rpx'
+				}else{
+					uni.openEmbeddedMiniProgram({
+						appId: 'wxf5362b6e97ecee2f'
+					})
+				}
+				setTimeout(res=>{
+					this.waimaiRight = '-70rpx'
+				},2000)
 			},
 			gotoSearchData() {
 				uni.navigateTo({
@@ -724,26 +741,6 @@
 
 	}
 
-	.u-grid-item:nth-child(2) {
-		background-image: linear-gradient(#FFBB77, #FFDCB9) !important;
-	}
-
-	.u-grid-item:nth-child(3) {
-		background-image: linear-gradient(#1AFD9C, #7AFEC6) !important;
-	}
-
-	.u-grid-item:nth-child(4) {
-		background-image: linear-gradient(#1AFD9C, #7AFEC6) !important;
-	}
-
-	.u-grid-item:nth-child(5) {
-		background-image: linear-gradient(#FFBB77, #FFDCB9) !important;
-	}
-
-	.u-grid-item:nth-child(6) {
-		background-image: linear-gradient(#84C1FF, #C4E1FF) !important;
-	}
-
 	.u-count-num {
 		color: #FFF !important
 	}
@@ -800,7 +797,6 @@
 	.waimai {
 		position: fixed;
 		bottom: 0;
-		right: 20rpx;
 		background: url(https://jewel-shop.oss-cn-beijing.aliyuncs.com/cda1b75affd349118081f3880f815a0f.jpg) no-repeat;
 		background-size: 100%;
 		width: 130rpx;
@@ -821,4 +817,13 @@
 		color: $u-primary;
 		font-size: 26upx;
 	}
+	.title-four{
+		width: 23% !important;
+		height: 160rpx;
+		background-image: linear-gradient(#1AFD9C, #7AFEC6) !important;
+		margin-left: 2%;
+		border-radius: 30rpx;
+		margin-top: 20rpx !important;
+		color: #fff !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/shareStyle.vue b/pages/index/shareStyle.vue
index 55b0fbf..f1027b9 100644
--- a/pages/index/shareStyle.vue
+++ b/pages/index/shareStyle.vue
@@ -4,7 +4,7 @@
 			<uni-search-bar class="uni-mt-10" radius="5" placeholder="请输入商品名称" cancelButton="none" @blur="search" @clear="clearSearch" />
 		</view>
 		<view class="content-left" style="height: 85%;float: left;position: fixed;top: 100rpx;">
-			<view class="left-box" v-for="(item, index) in indexList" :key="index"
+			<view class="left-box" v-if="gateType == ''" v-for="(item, index) in indexList" :key="index"
 				:class="item.parentId ? 'left-box-hover':''" @tap="clickLeftBtn(index)">
 				<text style="width: 100%;height: 90rpx;line-height: 90rpx;display: inline-block;overflow: hidden;"
 					:class="item.parentId ? 'red' :''">{{item.categoryName}}</text>
@@ -20,10 +20,50 @@
 				</view>
 				<view class="box-right">
 					<view class="box-right-name">
-						{{item.productName}}
+						{{item.productName == null ?'':item.productName}}
 						<text style="color: red;" v-if="item.delFlag == 0">(已下架)</text>
 					</view>
 					<view class="box-right-num">{{item.productSn}}</view>
+					<view class="box-right-num">供应商:{{item.supplierName == null ?'':item.supplierName}}</view>
+					<view class="box-right-price">
+						<view class="price-box" v-if="type==0">
+							<text>{{item.purchasePrice?item.purchasePrice:'暂无'}}</text>
+							<text>采购价</text>
+						</view>
+						<view class="price-box">
+							<text>{{item.wholesalePrice}}</text>
+							<text>批发价</text>
+						</view>
+						<view class="price-box">
+							<text>{{item.price}}</text>
+							<text>零售价</text>
+						</view>
+						<view class="price-box">
+							<text>{{item.stockCount}}</text>
+							<text>库存</text>
+						</view>
+					</view>
+				</view>
+				<checkbox-group @tap="checkboxChange(item)">
+					<label>
+						<checkbox :checked="item.checked" class="checkbox" />
+					</label>
+				</checkbox-group>
+			</view>
+			<view class="right-box" v-for="(item,index) in shopList1" :key="index" v-if="item.delFlag">
+				<!-- 当商品的delFlag=0和未入库状态时，显示此遮罩，点击弹出弹窗提示不能操作 -->
+				<!-- <view class="shop-mask" v-if="item.delFlag == 0 || item.purchasePrice==null || item.inStorageStatus == 0" @tap.stop="clickMask"></view> -->
+				<view class="box-left">
+					<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
+					<view class="noPic" v-else>暂无图片</view>	
+				</view>
+				<view class="box-right">
+					<view class="box-right-name">
+						{{item.productName == null ?'':item.productName}}
+						<text style="color: red;" v-if="item.delFlag == 0">(已下架)</text>
+					</view>
+					<view class="box-right-num">{{item.productSn}}</view>
+					<view class="box-right-num">供应商:{{item.supplierName== null?'':item.supplierName}}</view>
 					<view class="box-right-price">
 						<view class="price-box" v-if="type==0">
 							<text>{{item.purchasePrice?item.purchasePrice:'暂无'}}</text>
@@ -128,6 +168,7 @@
 				shopList: [],
 				shopList1: [],
 				info: 0,
+				gateType:'',
 				goodsList: [],
 				categoryId: '', //分类id
 				searchName: '', //搜索框输入值
@@ -151,8 +192,13 @@
 			console.log("触底")
 			if (this.pageNum >= this.pages) return;
 			// this.status = 'loading';
-			this.pageNum ++;
-			this.getShareList();
+			this.pageNum ++;
+			if(this.gateType == 'search'){
+				this.getShareList('search');
+			}else{
+				this.getShareList();
+			}
+			
 		},
 		onShareTimeline() {
 			return {
@@ -163,7 +209,7 @@
 		},
 		onShareAppMessage() {
 			return {
-				title: '查看我的推荐',
+				title: this.shopName + '的推荐',
 				imageUrl:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/70c3d9a274ff4feeb6df0bcb8be0f733.jpg',
 				path: '/pages/index/shareStyle?khid=' + this.khid
 			}
@@ -183,7 +229,7 @@
 				this.type = uni.getStorageSync('type')
 				this.getGategoryList()
 			}
-			
+			this.shopName = options.shopName ? options.shopName : uni.getStorageSync('shopName')
 		},
 		methods: {
 			//初始化获取分类列表
@@ -228,7 +274,8 @@
 							}
 						}
 						this.$nextTick(()=>{
-							if(type=='search'){
+							if(type=='search'){
+								this.gateType = 'search'
 								this.shopList = []
 								this.status = 'nomore';
 								if (this.pages == 1) {
@@ -237,7 +284,8 @@
 									this.shopList1 = [...this.shopList1, ...res.result.records]
 								}
 								this.pages = res.result.pages
-							}else{
+							}else{
+								this.gateType = ''
 								this.shopList1 = []
 								this.status = 'nomore';
 								if (this.pages == 1) {
@@ -257,12 +305,16 @@
 				await this.getCheck()
 			},
 			//顶部搜索框
-			search(e) {
+			search(e) {
+				this.pageNum = 1
+				this.shopList1 = []
+				this.shopList = []
 				if(e.value == ''){
 					this.searchName = ""
 					this.getShareList()
 				}else{
-					this.searchName = e.value
+					this.searchName = e.value
+					
 					this.getShareList('search')
 					
 				}
@@ -559,7 +611,7 @@
 
 	.right-box {
 		width: 100%;
-		height: 190rpx;
+		height: 240rpx;
 		display: flex;
 		border-bottom: 1px solid #eee;
 		position: relative;
diff --git a/pages/index/uparrears.vue b/pages/index/uparrears.vue
index 9d0b18a..232b6c6 100644
--- a/pages/index/uparrears.vue
+++ b/pages/index/uparrears.vue
@@ -82,7 +82,7 @@
 			},
 			returnPrice(item){
 				uni.navigateTo({
-					url: '/pages/index/waitStorageDetail?id='+ item.id
+					url: '/package1/index/waitStorageDetail?id='+ item.id
 				})
 			}
 		}
diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue
index 0d1e772..cb89edd 100644
--- a/pages/index/waitStorage.vue
+++ b/pages/index/waitStorage.vue
@@ -1,31 +1,56 @@
 <template>
 	<view>
-		<view class="search" style="position: fixed;top: 0;z-index: 99;">
-			<uni-datetime-picker style="margin-bottom:10px;" v-model="range" @change="searchTime" type="daterange" />
-			<uni-search-bar class="uni-mt-10" radius="5" placeholder="输入供应商/商品名称/货号查询" cancelButton="none"
-				@confirm="searchList" />
+		<view class="search" style="position: fixed;top: 0;z-index: 99;">
+			<uni-datetime-picker style="margin-bottom:10px;" v-model="range" @change="searchList" type="daterange" />
+			<view style="display: flex;">
+				<view style="width: 80%;" :style="{'width':inStorageStatus!= 0?'80%':'100%'}">
+					<uni-search-bar class="uni-mt-10" radius="5" placeholder="输入供应商名称搜索" cancelButton="none"
+						@confirm="searchList" />
+				</view>
+				<view style="width: 20%;" v-if="inStorageStatus!= 0">
+					<view style="width: 80%;height: 70rpx;background: #5fd9ee;text-align: center;line-height: 70rpx;border-radius: 10px;margin: 10px;color: #fff;" @tap="changeSort('paixu')">
+						查看
+						<uni-icons type="down" color="#fff" size="11" v-if="noDaysort == false"></uni-icons>
+						<uni-icons type="up" color="#fff" size="11" v-if="noDaysort"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="nahuo-mask" v-if="noDaysort">
+			<view style="width: 100%;margin: 0 auto;background: #fff;height: 200rpx;border: 1px solid #eee;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;">
+				<view @tap="getCancelOrder()" class="paixu-content" style="border-bottom: 1px solid #eee;">
+					查看全部订单
+				</view>
+				<view @tap="getCancelOrder('1')" class="paixu-content">
+					查看已作废状态的订单
+				</view>
+			</view>
 		</view>
 		<u-alert description="点击可跳转至入库单" type="primary"></u-alert>
 		<view class="ulList" v-if="list.length > 0" style="overflow: scroll;margin-top:300rpx;">
 			<ul>
-				<li v-for="(item,index) in list" @tap="returnPrice(item)" :key="index">
-					<uni-card :title="'供应商：'+(item.supplierName == null ?'暂无':item.supplierName)"
-						:sub-title="item.createTime == null ?'暂无':item.createTime"
+				<li v-for="(item,index) in list" @tap="goDetail(item)" :key="index">
+					<uni-card :title="'供应商:'+(item.supplierName == null ?'暂无':item.supplierName)"
+						:sub-title="'操作时间:'+(item.purchaseTime == null ?'暂无':item.purchaseTime)"
 						:extra="'共'+(item.totalAmount == null ?'暂无':item.totalAmount) + '件'"
-						thumbnail="/static/images/dingdan/dd1.png">
+						thumbnail="/static/images/dingdan/dd1.png">
 						<view class="uni-body"><text class="cardText">
-							入库人：</text>{{item.createByName == null ?'暂无':item.createByName}}
+							入库时间:</text>{{item.createTime == null ?'暂无':item.createTime}}
+						</view>
+						<view class="uni-body"><text class="cardText">
+							入库人:</text>{{item.createByName == null ?'暂无':item.createByName}}
 						</view>
 						<view class="uni-body" v-if="item.inStorageStatus != 0 && type==0">
-							<text class="cardText">总成本：</text> 
+							<text class="cardText">总成本:</text> 
 							<text class="priceText">{{item.shouldPay == null ?'暂无':item.shouldPay}} </text> 
 							<text decode class="cardText">{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> 
-							<text class="priceText">{{item.noPay == null ?'暂无':item.noPay}}</text>
+							<text class="priceText" style="color:red">{{item.noPay == null ?'暂无':item.noPay}}</text>
 						</view>
 						<view class="uni-body"> 
-							<text class="cardText">订单状态：</text>{{item.inStorageStatus == 0 ?'未入库' :item.inStorageStatus == 1 ?'已入库':item.inStorageStatus == 2 ?'AI识别-识别中...':item.inStorageStatus == 3 || (item.inStorageStatus == 4 && item.ocrCount > 0) ?'AI识别-识别完成':item.ocrCount == 0 && item.inStorageStatus == 4?'AI识别-识别失败':'暂无'}}
+							<text class="cardText">订单状态:</text>{{item.delFlag == 1 ?'已撤销':item.inStorageStatus == 0 ?'未入库' :item.inStorageStatus == 1 ?'已入库':item.inStorageStatus == 2 ?'AI识别-识别中...':item.inStorageStatus == 3 || (item.inStorageStatus == 4 && item.ocrCount > 0) ?'AI识别-识别完成':item.ocrCount == 0 && item.inStorageStatus == 4?'AI识别-识别失败':'暂无'}}
 						</view>
 						<view v-if="item.inStorageStatus== 0 && type==0" class="return-price" @tap.stop="returnPrice(item)">更新</view>
+						<view v-if="item.delFlag != 1 && type==0" class="return-price" @tap.stop="returnPrice(item,index)">撤销</view>
 						<view v-if="item.inStorageStatus == 2 || item.inStorageStatus == 3 || item.inStorageStatus == 4" class="return-price" style="width:105rpx;" @tap.stop="returnPrice(item)">AI入库</view>
 					</uni-card>
 				</li>
@@ -54,7 +79,9 @@
 				supplierName: '',
 				startDate: '',
 				endDate: '',
-				type: '',
+				noDaysort:false,
+				type: '',
+				cancel:false,
 				pages: 1,
 				pageNum:1,
 				status: 'loadmore',
@@ -66,16 +93,27 @@
 			this.type = uni.getStorageSync('type')			
 		},
 		onShow(){
-			this.list = []
-			this.pageNum = 1
-			this.getList()
+			
+			if(uni.getStorageSync('noReload') == true){
+				uni.removeStorageSync('noReload')
+			}else{
+				this.list = []
+				this.pageNum = 1
+				this.getList()
+			}
+			
 		},
 		onReachBottom() {
 			if(this.inStorageStatus != 0){
 				if (this.pageNum >= this.pages) return;
 				this.status = 'loading';
 				this.pageNum += 1;
-				this.getList();
+				
+				if(this.cancel == true){
+					this.getList("1");
+				}else{
+					this.getList();
+				}
 			}
 		},
 		methods: {
@@ -87,16 +125,24 @@
 				this.pages = 1;
 				this.pageNum = 1;
 				this.list = [];
-				this.getList()
+				if(this.cancel == true){
+					this.getList("1");
+				}else{
+					this.getList();
+				}
 			},
 			searchList(res) {
 				this.searchStr = res.value
 				this.pages = 1;
 				this.pageNum = 1;
-				this.list = [];
-				this.getList()
+				this.list = [];
+				if(this.cancel == true){
+					this.getList("1");
+				}else{
+					this.getList();
+				}
 			},
-			getList() {
+			getList(type) {
 				var url,data;
 				if(this.inStorageStatus == 0){
 					this.tui.request("/app/purchase/list", "POST", {
@@ -109,7 +155,9 @@
 								this.list = res.result.records
 							} else {
 								this.list = [...this.list, ...res.result.records]
-							}
+							}
+							this.searchStr = ""
+							this.noDaysort = false
 						} else {
 							this.tui.toast(res.message)
 						}
@@ -119,7 +167,8 @@
 						inStorageStatus: this.inStorageStatus,
 						searchStr: this.searchStr,
 						startDate: this.range[0],
-						endDate: this.range[1],
+						endDate: this.range[1],
+						delFlag:type,
 						pageNum:this.pageNum,
 						pageSize:10,
 					}, false, false).then((res) => {
@@ -131,22 +180,81 @@
 								this.list = res.result.records
 							} else {
 								this.list = [...this.list, ...res.result.records]
-							}
+							}
+							// this.searchStr = ""
+							this.noDaysort = false
 						} else {
 							this.tui.toast(res.message)
 						}
 					})
 				}
 			},
-			returnPrice(item) {
+			getCancelOrder(type){
+				this.pageNum =1
+				this.list = []
+				if(type == "1"){
+					this.cancel = true
+				}else{
+					this.cancel = false
+				}
+				this.getList(type)
+			},
+			changeSort(type){
+				this.nahuoDay = false
+				this.noDaysort = !this.noDaysort
+				
+			},
+			paixuChange(text){
+				this.sort = text
+				this.popleList = []
+				this.pages = 1
+				this.searchName = ""
+				this.noDaysort = false
+				this.khOrGysList()
+			},
+			goDetail(item){
+				uni.setStorageSync('noReload',true)
+				uni.navigateTo({
+					url: '/package1/index/waitStorageDetail?id=' + item.id
+				})
+			},
+			returnPrice(item,index) {
+				let that = this;
 				if(item.inStorageStatus == 2 || item.inStorageStatus == 3 || item.inStorageStatus == 4){
 					uni.navigateTo({
 						url: '/package1/AI/AIInventoryList'
 					})
-				}else{
-					uni.navigateTo({
-						url: '/pages/index/waitStorageDetail?id=' + item.id
+				}else if(item.inStorageStatus == 1){
+					uni.showModal({
+						title: "提示",
+						content: "确定撤销该采购单吗？",
+						success: function(res) {
+							uni.showLoading({
+								title: '加载中...'
+							})
+							if (res.confirm) {
+								that.tui.request("/app/purchase/cancelPurchase", "POST", {
+									id: item.id,
+								}, false, true).then((res) => {
+									if (res.code == 200) {
+										// that.pages = 1;
+										// that.pageNum = 1;
+										// that.list = [];
+										that.list[index].delFlag = 1
+										that.$forceUpdate()
+										// that.getList()
+										that.tui.toast("撤销成功！")
+									} else {
+										that.tui.toast(res.message)
+									}
+								})
+							}
+							setTimeout(res => {
+								uni.hideLoading();
+							}, 500)
+						}
 					})
+					
 				}
 			}
 		}
@@ -203,4 +311,20 @@
 		background-color: #fff;
 		width: 100%;
 	}
+	.paixu-content{
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+	.nahuo-mask{
+		    height: 1200rpx;
+		    background: rgba(0, 0, 0, 0.6);
+		    position: fixed;
+		    top: 100px;
+		    right: 0;
+		    z-index: 100;
+		    width: 100%;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/waitStorageDetail.vue b/pages/index/waitStorageDetail.vue
deleted file mode 100644
index 65131fe..0000000
--- a/pages/index/waitStorageDetail.vue
+++ /dev/null
@@ -1,743 +0,0 @@
-<template>
-	<view class="container">
-		<uni-card :title="(sales.supplierName == null ?'暂无':sales.supplierName)+'--'+(supplier.consigneeMobile == null ?'暂无':supplier.consigneeMobile)" thumbnail="/static/images/dingdan/dd0.png">
-			<view class="uni-body" v-if="supplier.province">{{supplier.province + supplier.area + supplier.city + supplier.address}} </view>
-		</uni-card>
-		<view class="tui-order-item boxbg">
-			<view class="shop-box" style="border-top:5px solid #eee;" v-for="(item,index) in goodsList" :key="index">
-				<view class="shop-name">
-					<img class="img-radius" :src="item.productPicture" alt="" style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;" v-if="item.productPicture">
-					<view class="noPic" v-else>暂无图片</view>		
-					<view class="shop-productName">
-						<view style="color:#FF5809;">{{item.productName == null ?'暂无':item.productName}}({{item.productSn == null ?'暂无':item.productSn}})</view>
-						<view style="display: flex;height: 55rpx;line-height: 55rpx;" v-if="type==0">
-							采购价: <input type="digit" :disabled="sales.inStorageStatus == 0?false:true" @blur="PriceAndWho($event,index,'caigou')" @focus="obtainPrice($event,'caigou',index)" v-model="item.purchasePrice" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;">
-						</view>
-						<view>
-							<text style="padding: 0 5rpx;"> 数量： {{item.productCount == null ?'暂无':item.productCount}} </text>
-							<text v-if="type==0" style="padding-left: 10rpx;"> 总价：{{(item.productCount*item.purchasePrice)== null?'暂无':(item.productCount*item.purchasePrice)}}</text>
-						</view>
-						<view style="display: flex;height: 55rpx;line-height: 55rpx;">
-							批发价: <input type="digit" @blur="PriceAndWho($event,index,'pi')" @focus="obtainPrice($event,'pifa',index)" v-model="item.wholesalePrice" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;" :disabled="sales.inStorageStatus == 0?false:true">
-							零售价:<input type="digit" @blur="PriceAndWho($event,index)" @focus="obtainPrice($event,'lingshou',index)" v-model="item.price" style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;" :disabled="sales.inStorageStatus == 0?false:true">
-						</view>
-					</view>
-				</view>
-				<view class="shop-type">
-					<view class="shop-collapse" v-for="(items,index) in item.stockLogList1" :key='index'>
-						<text>{{items.attributeList | sliceMsg}}</text>
-						<!-- <text style="color: red;">单价：￥{{item.price}}</text> -->
-						<text>数量：{{items.productCount == null ?'暂无':items.productCount}}</text>
-					</view>
-				</view>
-			</view>
-			<view class="tui-goods-info" style="width: 95%;margin: 0 auto;" v-if="type==0 && sales.inStorageStatus != 0">
-				<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
-					<view class="tui-flex-shrink">应付金额</view>
-					<view class="tui-goods-price">
-						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.shouldPay == null ?'暂无':sales.shouldPay }}</view>
-					</view>
-				</view>
-				<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
-					<view class="tui-flex-shrink">已付金额</view>
-					<view class="tui-goods-price">
-						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.alreadyPay == null ?'暂无':sales.alreadyPay }}</view>
-					</view>
-				</view>
-				<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
-					<view class="tui-flex-shrink">欠款</view>
-					<view class="tui-goods-price tui-primary-color">
-						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.noPay == null ?'暂无':sales.noPay}}</view>
-					</view>
-				</view>
-				<view class="tui-price-flex tui-size32">
-					<view class="tui-flex-shrink">备注</view>
-					<view class="tui-goods-price">
-						<uni-tooltip :content="sales.remark == null ?'暂无':sales.remark" placement="left">
-							<view style="font-size: 13px;width: 200px;height: 40rpx;overflow: hidden;text-align: right;">{{ sales.remark == null ?'':sales.remark}}</view>
-							<text style="color: blue;">查看更多</text>
-						</uni-tooltip>
-					</view>
-				</view>
-			</view>
-			<view class="tui-goods-info" v-if="type==0 && sales.inStorageStatus == 0">
-				<!-- 账号权限是否可以维护成本价格（主账号和被授权的账号可以维护），参数名：shop_admin_cost，维护在用户表中，存在前后端缓存里，把备注栏挪出来，谁都可以备注 -->
-				<view class="price-box-list">
-					<view class="price-box" v-if="type == 0">
-						<view style="flex: 1;text-align: left;padding-left: 20rpx;">
-							供应商:{{dealings.dealingsUserName?dealings.dealingsUserName:''}}
-						</view>
-						<view v-if="dealings.lastDebtAmount >= 0" style="flex: 1;text-align: right;padding-right: 20rpx;">
-							之前欠款:{{dealings.lastDebtAmount}}
-						</view>
-						<view v-if="dealings.lastDebtAmount < 0" style="flex: 1;text-align: right;padding-right: 20rpx;">
-							客户余额:{{Math.abs(dealings.lastDebtAmount)}}
-						</view>
-					</view>
-					<view class="content-list">
-						<view class="list-name">应付金额</view>
-						<view class="list-val">
-							<input type="text" v-model="shouldPay">
-						</view>
-					</view>
-					<view class="content-list">
-						<view class="list-name">已付金额</view>
-						<view class="list-val">
-							<input type="text" v-model="alreadyPay" @focus="obtainPrice($event,'alreadyPay')" @blur="changePay($event)">
-						</view>
-					</view>
-					<view class="content-list" v-if="yuedikou != 0 && type == 0">
-						<view class="list-name">余额抵扣</view>
-						<view class="list-val">
-							<input type="digit" v-model="yuedikou" disabled>
-						</view>
-						<!-- <view v-if="yuedikou > 0" @tap="noReturn" style="flex: 1;height: 30px;line-height: 30px;margin-top: 5px;font-size: 24rpx;background: #00BFFF;text-align: center;color: #fff;border-radius: 20px;">
-							不抵扣
-						</view> -->
-					</view>
-					<view class="content-list" v-if="zhiqianqiankuan > 0 && type == 0">
-						<view class="list-name">累计欠款</view>
-						<view class="list-val">
-							<input type="digit" v-model="leijiqiankuan" disabled>
-						</view>
-					</view>
-					<view class="content-list" v-if="leijiqiankuan < 0 && type == 0">
-						<view class="list-name">累计余额</view>
-						<view class="list-val">
-							<input type="digit" v-model="Math.abs(leijiqiankuan)" disabled>
-						</view>
-					</view>
-					<view class="content-list" v-if="noPay >= 0 && type == 0">
-						<view class="list-name">本次欠款</view>
-						<view class="list-val">
-							<input type="digit" v-model="noPay" disabled>
-						</view>
-					</view>
-					<view class="content-list" v-if="noPay < 0 && type == 0">
-						<view class="list-name">本次余额</view>
-						<view class="list-val">
-							<input type="digit" v-model="Math.abs(noPay)" disabled>
-						</view>
-					</view>
-					<view class="content-list">
-						<view class="list-name">其他费用</view>
-						<view class="list-val">
-							<input type="text" v-model="otherPay">
-						</view>
-					</view>
-					<view class="content-list">
-						<view class="list-name">备注</view>
-						<view class="">
-							<textarea v-model="remark" />
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-			<view class="tui-order-info boxbg">
-				<view class="tui-order-title">
-					回款历史
-				</view>
-				<view class="tui-order-content" style="border-bottom: 1px solid #E0E0E0;" v-for="(item,index) in collection" :key="index">	
-					<view class="tui-order-flex">
-						<view class="tui-item-title">回款金额:</view>
-						<view class="tui-item-content">{{ item.amount }}</view>
-					</view>
-					<view class="tui-order-flex">
-						<view class="tui-item-title">操作人:</view>
-						<view class="tui-item-content">{{ item.createByName }}</view>
-					</view>
-					<view class="tui-order-flex">
-						<view class="tui-item-title">操作时间:</view>
-						<view class="tui-item-content">{{ item.createTime }}</view>
-					</view>
-				</view>
-			</view>
-		<view class="tui-tabbar">
-			<view class="tui-btn-mr" v-if="type==0 && sales.inStorageStatus == 1 && sales.noPay >0" @tap="inputDialogToggle">回款</view>
-			<view class="tui-btn-mr" v-if="type==0 && sales.inStorageStatus == 0" @click="inventorySubmit">确认提交</view>
-			<view class="tui-btn-mr" @click="batchPrint">批量打印</view>
-		</view>
-		<!-- 弹出输入框 -->
-		<uni-popup ref="priceDialog" type="dialog">
-			<uni-popup-dialog ref="purInput" mode="input" inputType="digit" title="采购价" placeholder="请输入采购价"
-				@confirm="changePrice"></uni-popup-dialog>
-		</uni-popup>
-		<!-- 回款金额输入框 -->
-		<uni-popup ref="inputDialog" type="dialog">
-			<uni-popup-dialog ref="inputClose" mode="input" inputType="digit" title="回款金额" placeholder="请输入回款金额"
-				@confirm="sureNpPay"></uni-popup-dialog>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				sales: {},
-				goodsList: [],
-				isReturn: false,
-				shouldPay:0,
-				noPay:0,
-				alreadyPay:0,
-				otherPay:0,
-				remark:'',
-				zhiqianqiankuan:0,
-				yuedikou:0,
-				leijiqiankuan:0,
-				id:'',
-				type:'',
-				supplier:[],
-				dealings:[],
-				collection:[]
-			}
-		},
-		filters: {
-			sliceMsg(val) {
-				var name = ''
-				if (typeof(val) == 'string') {
-					let newObj = JSON.parse(val)
-					for (let as in newObj) {
-						name += newObj[as] + '/'
-					}
-				}
-				return name;
-			}
-		},
-		onLoad(option) {
-			this.id = option.id
-			this.getWaitStorage(option.id)
-			this.collectionList(option.id)
-			this.type = uni.getStorageSync('type')
-		},
-		methods: {
-			//回款历史
-			collectionList(id){
-				this.tui.request('/app/dealingRecord/getDealingsRecordList','post', {
-					orderId:id
-				},false,true).then(res => {
-					this.collection = res.result
-				}).catch(res => {});
-			},
-			getWaitStorage(id) {
-				this.tui.request("/app/purchase/getPurchaseAllData", "post", {
-					id: id
-				}, false, true).then((res) => {
-					
-					if (res.code == 200) {
-						for(let i = 0;i<res.result.purchaseDetails.length;i++){
-							if(res.result.purchaseDetails[i].purchasePrice != null){
-								res.result.purchaseDetails[i].zPrice = res.result.purchaseDetails[i].purchasePrice * res.result.purchaseDetails[i].productCount
-							}else{
-								res.result.purchaseDetails[i].zPrice = 0
-							}
-							res.result.purchaseDetails[i].lsPrice = res.result.purchaseDetails[i].lsPrice
-						}
-						this.zhiqianqiankuan = res.result.dealingsRecords[0].lastDebtAmount
-						this.sales = res.result.purchase
-						this.dealings = res.result.dealingsRecords[0]
-						this.noPay = res.result.purchase.noPay
-						this.supplier = res.result.supplier
-						this.remark = res.result.purchase.remark
-						this.goodsList = res.result.purchaseDetails
-						this.getAllPrice()
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			//计算欠款
-			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.shouldPay - this.alreadyPay) <= Math.abs(this.zhiqianqiankuan) && this.zhiqianqiankuan <0){
-							this.yuedikou = this.shouldPay - this.alreadyPay
-						}else if((this.shouldPay - this.alreadyPay) > Math.abs(this.zhiqianqiankuan) && this.zhiqianqiankuan <0){
-							this.yuedikou = Math.abs(this.zhiqianqiankuan)
-						}
-						
-					}
-				}
-				this.noPay = this.shouldPay - this.alreadyPay - this.yuedikou
-				this.noPay = this.noPay.toFixed(2)
-				this.leijiqiankuan = Number(this.zhiqianqiankuan) +  Number(this.yuedikou) +  Number(this.noPay)
-			},
-			obtainPrice(e, type, num,num1) {
-				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=='danjishu'){
-					this.temporaryList[num].productCount = ''
-					this.$forceUpdate()
-				} else if (type == 'zongjishu') {
-					this.allChangeNum = ''
-				} else if (type == 'shouldPay') {
-					this.shouldPay = ''
-				}else if(type=='mapdanjishu'){
-					this.carList.get(num).stockLogList.get(num1).productCount = ''
-					this.$forceUpdate()
-				}else if (type == 'alreadyPay') {
-					this.alreadyPay = ''
-				}
-				this.$forceUpdate()
-			},
-			//回款金额输入框
-			inputDialogToggle() {
-				this.$refs.inputDialog.open()
-			},
-			sureNpPay(e){
-				if(e>this.noPay){
-					uni.showToast({
-						title: "回款金额不应超过欠款金额！",
-						icon: 'none'
-					})
-					return
-				}
-				this.tui.request('/app/purchase/editPayPrice','post', {
-					id:this.sales.id,
-					price:e
-				},false,true).then(res => {
-					uni.showToast({
-						title: "成功！",
-						icon: 'none'
-					})
-					uni.navigateBack();
-				}).catch(res => {});
-			},
-			PriceAndWho(e,id,type) {
-				if(type == 'pi'){
-					if(this.linshiPrice == e.target.value){
-						this.goodsList[id].wholesalePrice = e.target.value
-					}else{
-						if(e.detail.value == ''){
-							this.goodsList[id].wholesalePrice = this.linshiPrice
-						}else{
-							this.goodsList[id].wholesalePrice = Number(e.detail.value)
-						}
-					}
-				}else if(type == 'caigou'){
-					this.shouldPay = 0
-					if(this.linshiPrice == e.target.value){
-						this.goodsList[id].purchasePrice = e.target.value
-					}else{
-						if(e.detail.value == ''){
-							this.goodsList[id].purchasePrice = this.linshiPrice
-						}else{
-							this.goodsList[id].purchasePrice = Number(e.detail.value)
-						}
-					}
-					this.goodsList[id].zPrice = this.goodsList[id].purchasePrice * this.goodsList[id].productCount;
-					this.getAllPrice()
-				}else{
-					if(this.linshiPrice == e.target.value){
-						// this.goodsList[id].price = e.target.value
-						this.goodsList[id].lsPrice = e.target.value
-					}else{
-						if(e.detail.value == ''){
-							// this.goodsList[id].price = this.linshiPrice
-							this.goodsList[id].lsPrice = this.linshiPrice
-						}else{
-							// this.goodsList[id].price = Number(e.detail.value)
-							this.goodsList[id].lsPrice = Number(e.detail.value)
-						}
-					}
-				}
-				this.$forceUpdate()
-			},
-			obtainPrice(e,type,num){
-				this.linshiPrice = e.target.value
-				if(type=='pifa'){
-					this.goodsList[num].wholesalePrice = ''
-					this.$forceUpdate()
-				}else if(type=='lingshou'){
-					this.goodsList[num].price = ''
-					this.$forceUpdate()
-				}else if(type=='caigou'){
-					this.goodsList[num].purchasePrice = ''
-					this.$forceUpdate()
-				}
-			},
-			inventorySubmit() {
-				if(this.shouldPay == 0){
-					uni.showToast({
-						title: "请维护商品价格后入库！",
-						icon: 'none'
-					})
-					return
-				}
-				// else if(this.alreadyPay == 0){
-				// 	uni.showToast({
-				// 		title: "管理员必须维护价格后入库！",
-				// 		icon: 'none'
-				// 	})
-				// 	return
-				// }
-				let that = this;
-				let purchase = {
-					id:this.id,
-					alreadyPay: this.alreadyPay, //已付金额
-					noPay: this.noPay, //欠款
-					balanceDeductionAmount:this.yuedikou,
-					shouldPay: this.shouldPay, //应付金额
-					totalAmount: this.sales.totalAmount, //总数量
-					remark: this.remark,
-					supplierId: this.sales.supplierId, //供应商id和姓名
-					supplierName: this.sales.supplierName
-				}
-				this.tui.request("/app/stock/putInPrice", "post", {
-					purchase: purchase,
-					purchaseDetails: this.goodsList
-				}, false, false).then((res) => {
-					if (res.code == 200) {
-						uni.showToast({
-							title: "入库成功",
-							icon: 'none'
-						})
-						uni.navigateBack({
-							delta: 2
-						})
-					} else {
-						uni.showToast({
-							title: "入库失败",
-							icon: 'none'
-						})
-					}
-				})
-			},
-			batchPrint(){
-				uni.navigateTo({
-					url: "/package1/inventory/batchPrint?purchase=" + JSON.stringify(this.sales) + '&purchaseDetails=' + JSON.stringify(this.goodsList)
-				})
-			},
-			//编辑每一个的单价
-			clickCollapse(index) {
-				this.index = index
-				this.$refs.priceDialog.val = ''
-				this.$refs.priceDialog.open()
-			},
-			//计算价格
-			changePrice(val) {
-				let that = this;
-				this.$refs.purInput.val = ''
-				that.shouldPay = 0
-				that.goodsList[that.index].purchasePrice = val
-				that.goodsList[that.index].zPrice = val * that.goodsList[that.index].productCount;
-				this.getAllPrice()
-			},
-			//计算总金额和总数量
-			getAllPrice() {
-				let that = this;
-				this.shouldPay = 0
-				this.totalAmount = 0
-				this.goodsList.forEach(function(value, key) {
-					that.shouldPay = that.shouldPay + value.zPrice
-				})
-				this.$nextTick(()=>{
-					if(parseFloat(that.zhiqianqiankuan) < 0){
-						if(that.shouldPay > Math.abs(that.zhiqianqiankuan)){
-							that.yuedikou = Math.abs(that.zhiqianqiankuan)
-							this.alreadyPay = this.shouldPay - Math.abs(that.zhiqianqiankuan)
-						}else if(that.shouldPay <= Math.abs(that.zhiqianqiankuan)){
-							that.yuedikou = that.shouldPay
-							that.alreadyPay = 0
-						}
-					}else{
-						this.alreadyPay = this.shouldPay
-					}
-					that.shouldPay = that.shouldPay.toFixed(2)
-					
-					that.noPay = this.shouldPay - (this.alreadyPay == '' ? 0 : this.alreadyPay) - that.yuedikou
-					that.noPay = that.noPay.toFixed(2)
-					this.leijiqiankuan = Number(this.zhiqianqiankuan) + Number(this.yuedikou) +  Number(this.noPay)
-					this.$forceUpdate()
-				})
-			},
-		},
-	}
-</script>
-
-<style lang="scss">
-	.container {
-		padding-bottom: 118rpx;
-		.boxbg {
-			background-color: #fff;
-			margin: 30upx;
-			padding: 20upx;
-			border-radius: 10upx;
-			box-shadow: 0px 1px 10px 2px #e2e2e2;
-		}
-		.tui-order-info {
-			margin-top: 20rpx;
-		}
-		.tui-order-content {
-			width: 100%;
-			padding: 24rpx 30rpx;
-			box-sizing: border-box;
-			background: #fff;
-			font-size: 24rpx;
-			line-height: 30rpx;
-		}
-		
-		.tui-order-flex {
-			display: flex;
-			padding-top: 18rpx;
-		}
-		
-		.tui-order-flex:first-child {
-			padding-top: 0
-		}
-		
-		.tui-item-title {
-			width: 132rpx;
-			flex-shrink: 0;
-		}
-		
-		.tui-item-content {
-			color: #666;
-			line-height: 32rpx;
-		}
-		.tui-order-title {
-			position: relative;
-			font-size: 28upx;
-			line-height: 28upx;
-			padding-left: 16upx;
-			box-sizing: border-box;
-		}
-		
-		.tui-order-title::before {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 0;
-			border-left: 8upx solid $u-primary;
-			height: 120%;
-			border-radius: 4upx;
-		}
-		// .boxbg {
-		// 	background-color: #fff;
-		// 	margin: 30upx;
-		// 	border-radius: 10upx;
-		// 	box-shadow: 0px 1px 10px 2px #e2e2e2;
-		// }
-
-		.tui-order-item {
-			.u-collapse-content {
-				display: flex;
-				justify-content: space-between;
-				line-height: 30px;
-			}
-
-
-			.tui-goods-info {
-				width: 100%;
-				box-sizing: border-box;
-				background: #fff;
-				line-height: 26px;
-				border-top: 10px solid #eee;
-
-				.tui-price-flex {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-				}
-
-				.tui-size32 {
-					font-size: 32rpx;
-					font-weight: 500;
-				}
-
-				.tui-size-24 {
-					font-size: 24rpx;
-				}
-
-				.tui-price-large {
-					font-size: 32rpx;
-					.lineText {
-						text-decoration: line-through;
-						font-size: 12px;
-						color: #888;
-					}
-				}
-
-				.tui-flex-shrink {
-					flex-shrink: 0;
-				}
-
-				.tui-goods-price {
-					width: 100%;
-					display: flex;
-					align-items: flex-end;
-					justify-content: flex-end;
-					font-size: 24rpx;
-				}
-
-				.tui-primary-color {
-					color: #EB0909;
-				}
-
-				.tui-pbtm20 {
-					padding-bottom: 20rpx;
-				}
-
-			}
-		}
-	}
-
-	.tui-tabbar {
-		width: 100%;
-		height: 98rpx;
-		background: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		font-size: 26rpx;
-		box-shadow: 0 0 1px rgba(0, 0, 0, .3);
-		padding-bottom: env(safe-area-inset-bottom);
-		z-index: 996;
-	}
-
-	.tui-btn-mr {
-		width:130rpx;
-		height: 60rpx;
-		background: #088FEB;
-		color: #fff;
-		border-radius: 10px;
-		line-height: 60rpx;
-		text-align: center;
-		margin-right: 30rpx;
-	}
-	.shop-box {
-		width: 95%;
-		margin: 0 auto;
-		position: relative;
-	}
-	.shop-name {
-		width: 100%;
-		height: 250rpx;
-		line-height: 80rpx;
-		border-top: 1px solid #eee;
-		border-bottom: 1px solid #eee;
-		font-size: 28rpx;
-		font-weight: bold;
-		display: flex;
-		.uni-icons {
-			color: #088FEB !important;
-		}
-	}
-	
-	.shop-productName {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		padding-left: 20rpx;
-	}
-	
-	.shop-productName view {
-		height: 55rpx;
-		line-height: 55rpx;
-	}
-	
-	.shop-collapse {
-		display: flex;
-		height: 80rpx;
-		font-size: 26rpx;
-		line-height: 80rpx;
-	}
-	
-	.shop-collapse text {
-		flex: 1;
-		text-align: center;
-		padding-right: 40rpx;
-		border-right: 1px solid #eee;
-	}
-	.content-list {
-		width: 95%;
-		margin: 0 auto;
-		display: flex;
-		height: 80rpx;
-		border-bottom: 1px solid #eee;
-	}
-	
-	.content-list:last-child {
-		border-bottom: none;
-		height: auto;
-	}
-	
-	.list-name {
-		width: 200rpx;
-		text-align: left;
-		line-height: 40px;
-		height: 80rpx;
-		padding-left: 20rpx;
-	}
-	
-	.list-val {
-		width: 560rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-	}
-	
-	.list-val input {
-		width: 400rpx;
-		height: 60rpx;
-		display: inline-block;
-		line-height: 60rpx;
-		float: left;
-		margin-top: 10rpx;
-		padding-left: 20rpx;
-		border-bottom: 1px solid #088FEB;
-	}
-	textarea {
-		margin: 20rpx;
-		border: 1px solid #eee;
-		height: 150rpx;
-		width: 500rpx;
-	}
-	.noPic{
-		border-radius: 10px;
-		width: 140rpx;
-		height: 140rpx;
-		text-align: center;
-		line-height: 140rpx;
-		color: #777;
-		background: #eee;
-		margin: 30rpx 0 0 30rpx;
-	}
-	.uni-tooltip {
-		display: flex !important;
-	}
-	.price-box{
-		width: 95%;
-		margin: 10px auto;
-		background: #eee;
-		height: 80rpx;
-		display: flex;
-		line-height: 80rpx;
-		text-align: center;
-		overflow: hidden;
-		border-radius: 10px;
-		background: #FDF5E6;
-		color: #EEB422;
-		background: linear-gradient(180deg, #fff, #FDF5E6);
-		border: 1px solid #FAEBD7;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/inventory/changeGoods1.vue b/pages/inventory/changeGoods1.vue
deleted file mode 100644
index 82fbf4c..0000000
--- a/pages/inventory/changeGoods1.vue
+++ /dev/null
@@ -1,1452 +0,0 @@
-<template>
-	<view>
-		<view style="z-index: 99;width: 100%;position: fixed;top: 0;background: #fff;">
-			<view style="background: #fff;">
-				<button size="default" type="default" @tap="goAddGoods" hover-class="is-hover">新增商品</button>
-			</view>
-			<view class="title-box">
-				<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/货号/供应商" cancelButton="none"
-					@confirm="search" @blur="search" @clear="clearSearch" />
-			</view>
-		</view>
-		<view class="content-left" style="height: 76%;position: fixed;top: 16%;overflow: scroll;">
-			<view class="left-box" v-if="gateType == ''" v-for="(item, index) in indexList" :key="index"
-				:class="item.parentId ? 'left-box-hover':''" @tap="clickLeftBtn(index)">
-				<text style="width: 100%;height: 90rpx;line-height: 90rpx;display: inline-block;overflow: hidden;"
-					:class="item.parentId ? 'red' :''">{{item.categoryName}}</text>
-			</view>
-		</view>
-		<view class="content-right" style="width: 570rpx;background: #fff;margin: 30% 0 120rpx 170rpx;height: 76%;padding-bottom: 50rpx;">
-			<view class="right-box" v-for="(item,index) in shopList" :key="index" @tap="toggle('bottom',item)">
-				<!-- 当商品的delFlag=0和未入库状态时，显示此遮罩，点击弹出弹窗提示不能操作 -->
-				<view class="shop-mask" v-if="item.delFlag == 0 || item.inStorageStatus == 0"
-					@tap.stop="clickMask(item)"></view>
-				<view class="box-left">
-					<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
-					<view class="noPic" v-else>暂无图片</view>
-				</view>
-				<view class="box-right">
-					<view class="box-right-name">{{item.productSn}}</view>
-					<view class="box-right-num">{{item.productName}}</view>
-					<view class="box-right-price">
-						<view class="price-box" v-if="storageType == 0">
-							<text>{{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}</text>
-							<text>采购价</text>
-						</view>
-						<view class="price-box">
-							<text>{{item.wholesalePrice}}</text>
-							<text>批发价</text>
-						</view>
-						<view class="price-box">
-							<text>{{item.price}}</text>
-							<text>零售价</text>
-						</view>
-						<view class="price-box">
-							<text>{{item.stockCount}}</text>
-							<text>库存</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="right-box" v-for="(item,index) in shopList1" :key="index" @tap="toggle('bottom',item)">
-				<!-- 当商品的delFlag=0和未入库状态时，显示此遮罩，点击弹出弹窗提示不能操作 -->
-				<view class="shop-mask" v-if="item.delFlag == 0 || item.inStorageStatus == 0"
-					@tap.stop="clickMask(item)"></view>
-				<view class="box-left">
-					<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
-					<view class="noPic" v-else>暂无图片</view>
-				</view>
-				<view class="box-right">
-					<view class="box-right-name">{{item.productName}}</view>
-					<view class="box-right-num">{{item.productSn}}</view>
-					<view class="box-right-price">
-						<view class="price-box" v-if="storageType == 0">
-							<text>{{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}</text>
-							<text>采购价</text>
-						</view>
-						<view class="price-box">
-							<text>{{item.wholesalePrice}}</text>
-							<text>批发价</text>
-						</view>
-						<view class="price-box">
-							<text>{{item.price}}</text>
-							<text>零售价</text>
-						</view>
-						<view class="price-box">
-							<text>{{item.stockCount}}</text>
-							<text>库存</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<u-loadmore :status="status" />
-		</view>
-		<view class="bottom-box">
-			<view class="bottom-left" @tap="toggle('carPopup')">
-				<view class="bottom-left-box">
-					<uni-icons type="cart" size="20" color="#646566"></uni-icons>
-					<text class="uni-tab__text">已选择</text>
-				</view>
-				<text style="background-color:#ff0000;color:#fff;position: absolute;top: 0;right: 10rpx;"
-					class="uni-tab__dot">{{carList.length}}</text>
-			</view>
-			<view class="bottom-right">
-				<view class="bottom-btn" @tap="backPrevPage">选好了</view>
-			</view>
-		</view>
-		<!-- 弹出层 -->
-		<view>
-			<uni-popup ref="popup" background-color="#fff" @change="clickClose">
-				<view class="popup-content">
-					<view class="popup-title">
-						<view class="popup-title-left">
-							<img class="img-radius" :src="goodsDetail.productPicture" alt=""
-								v-if="goodsDetail.productPicture">
-							<view class="noPic" v-else>暂无图片</view>
-						</view>
-						<view class="popup-title-right">
-							<view class="popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
-							</view>
-							<view class="popup-title-right-box">{{goodsDetail.productSn}}</view>
-							<view class="popup-title-right-box" style="color: darkorange;" @tap="inputDialogToggle">
-								<!-- <text style="margin-right:20rpx;">￥{{goodsDetail.price}}</text> -->
-							</view>
-						</view>
-					</view>
-					<view class="popup-container">
-						<view @tap="saveCheck" style="position: absolute;top: 10rpx;right: 20rpx;color: #088FEB;text-decoration: underline;">保存已选</view>
-						<ul style="border-top:20rpx;">
-							<li v-for="(items,index) in goodsDetail.attributeList" :key="index">
-								<view class="title-fur">
-									<view class="name">{{items.name}}</view>
-								</view>
-								<view class="attrs">
-									<uni-data-checkbox v-model="value" :localdata="range"
-										@change="change"></uni-data-checkbox>
-									<text v-for="(itemTag, index1) in items.value" :key="index1"
-										@tap.stop="attrNameChange(index,itemTag.value,index1) "
-										:class="itemTag.isChecked ? 'checkedText' : '' "> {{itemTag.value}}</text>
-								</view>
-							</li>
-						</ul>
-						<view style="padding-bottom: 100rpx;">
-							<view class="checkList" v-if="temporaryList != ''">
-								<view class="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="checkList" v-for="(item,index) in temporaryList" :key="index">
-								<view @tap.stop="delCarData(index)" style="margin-right: 20rpx;width: 7%;">
-									<uni-icons color="red" type="minus" size="26"></uni-icons>
-								</view>
-								<view class="checkList-box">
-									<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="100000" v-model="item.productCount" @change="temporaryChange"  /> -->
-								<view class="zuni-numbox">
-									<view @tap="oneMinusNum(index)" class="zuni-numbox__minus zuni-numbox-btns" style="background: #f5f5f5;">
-										<text class="zuni-numbox--text">-</text>
-									</view>
-									<input v-model="item.productCount" @blur="numChange($event,index)" @focus="obtainPrice($event,'danjishu',index)" class="zuni-numbox__value" type="number" />
-									<view @tap="onePlusNum(index)" class="zuni-numbox__plus zuni-numbox-btns" style="background: #f5f5f5;">
-										<text class="zuni-numbox--text">+</text>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="popup-bottom">
-					<view class="popup-bottom-left">
-						<text>数量：{{zNum}} 件</text>
-						<!-- <text>￥{{zPrice}}</text> -->
-					</view>
-					<view class="popup-bottom-right">
-						<view class="bottom-btn" @tap="temporaryCheck">选好了</view>
-					</view>
-				</view>
-			</uni-popup>
-		</view>
-		<!-- 购物车弹出层 -->
-		<uni-popup ref="carPopup" background-color="#fff" @change="change">
-			<view class="popup-content">
-				<view v-for="(item,index) in carList" :key="index" style="position: relative;">
-					<view class="popup-title">
-						<view class="popup-title-left">
-							<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
-							<view class="noPic" v-else>暂无图片</view>
-						</view>
-						<view class="popup-title-right">
-							<view class="popup-title-right-box" style="color: #088FEB;">{{item.productName}}</view>
-							<view class="popup-title-right-box">{{item.productSn}}</view>
-							<view class="popup-title-right-box" style="color: darkorange;" @tap="inputDialogToggle">
-								<text style="margin-right:20rpx;">￥{{item.price}}</text>
-								<!-- <uni-icons color="#088FEB" type="compose" size="16"></uni-icons> -->
-								<view style="position: absolute;top: 30rpx;right: 30rpx;" @tap.stop="delShop(item)">
-									<uni-icons color="red" type="trash" size="26"></uni-icons>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view style="padding-bottom: 100rpx;">
-						<view class="popup-container" v-for="(item1,index1) in item.saleDetailQueryDTO" :key="index1">
-							<view class="checkList">
-								<view style="margin-right:5%;" @tap="delShopSpec(item.id,item1.attributeList)">
-									<uni-icons color="red" type="minus" size="26"></uni-icons>
-								</view>
-								<view class="checkList-box">
-									{{item1.attributeList | sliceMsg}}
-								</view>
-								<!-- <uni-number-box max="100000" v-model="item1.productCount"
-									@change="carChange($event,index,index1)" /> -->
-								<view class="zuni-numbox">
-									<view @tap="oneMinusNum(index1)" class="zuni-numbox__minus zuni-numbox-btns" style="background: #f5f5f5;">
-										<text class="zuni-numbox--text">-</text>
-									</view>
-									<input v-model="item1.productCount" @blur="chenumChange($event,index,index1)" @focus="obtainPrice($event,'chejishu',index,index1)" class="zuni-numbox__value" type="number" />
-									<view @tap="onePlusNum(index1)" class="zuni-numbox__plus zuni-numbox-btns" style="background: #f5f5f5;">
-										<text class="zuni-numbox--text">+</text>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<view class="popup-bottom">
-					<view class="popup-bottom-left">
-						<text>{{carType}} 款 {{carNum}} 件</text>
-					</view>
-					<view class="popup-bottom-right">
-						<view class="bottom-btn" @tap="this.$refs.carPopup.close()">关闭</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		components: {},
-		data() {
-			return {
-				indexList: [],
-				pageNum: 1, //分页的页码
-				shopList: [],
-				shopList1: [],
-				info: 0,
-				categoryId: '', //分类id
-				searchName: '', //搜索框输入值
-				temporaryNum: 0,
-				allChangeNum:0,
-				goodsDetail: [],
-				attrNameList: [],
-				temporaryList: [],
-				carList: [],
-				columns: [],
-				keyList: [],
-				evalue: [],
-				show: false,
-				attributeList: {},
-				purchasePrice: "",
-				zPrice: 0,
-				zNum: 0,
-				storageType: 0,
-				carNum: 0,
-				carType: 0,
-				productId: '',
-				productNum: 0,
-				isPlusAndMinus:false,
-				height: 0,
-				oldTemList:[],
-				pageOldTemList:[],
-				goodsList:[],
-				newTemList:[],
-				pecsList:[],
-				gateType:'',
-				dataObj :new Map() //拿到的 规格值为key的
-			}
-		},
-		filters: {
-			sliceMsg(val) {
-				var name = ''
-				if (typeof(val) == 'string') {
-					let newObj = JSON.parse(val)
-					for (let as in newObj) {
-						name += newObj[as] + '/'
-					}
-				}
-				return name;
-			},
-			maxNum(val) {
-				if (val >= 10) {
-					return 10
-				} else if (val < 0) {
-					return 0
-				}
-			}
-		},
-		onLoad() {
-			this.height = wx.getSystemInfoSync().windowHeight
-			this.storageType = uni.getStorageSync('type')
-		},
-		onShow() {
-			this.getGategoryList()
-		},
-		onReachBottom() {
-			if (this.pageNum >= this.pages) return;
-			// this.status = 'loading';
-			this.pageNum ++;
-			this.getShareList();
-		},
-		methods: {
-			//初始化获取分类列表
-			getGategoryList() {
-				this.tui.request("/app/productCategory/list", "get", {
-					// shopId: 1,
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						this.indexList = res.result;
-						for (var i = 0; i < this.indexList.length; i++) {
-							if (i == 0) {
-								this.indexList[i].parentId = true
-							} else {
-								this.indexList[i].parentId = false
-							}
-						}
-						this.categoryId = this.indexList[0].id
-						this.getShareList();
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			combination(arr) {
-				let result = [
-					[]
-				]
-
-				arr.map(x => {
-					var res = []
-					result.map(y => {
-						x.specs.map(z => {
-							res.push([...y, z])
-						})
-					})
-					result = res
-				})
-				return result;
-			},
-			//保存已选
-			saveCheck(){
-				this.pageOldTemList = this.temporaryList
-				for(var i=0;i<this.goodsDetail.attributeList.length;i++){
-					this.goodsList[i].specs = []
-					for(var m=0;m<this.goodsDetail.attributeList[i].value.length;m++){
-						this.goodsDetail.attributeList[i].value[m].isChecked = false
-					}
-				}
-			},
-			clickClose(){
-				this.evalue = []
-				this.allChangeNum = 0
-			},
-			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()
-			},
-			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()
-			},
-			attrNameChange(index, data1,index1) {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				this.goodsDetail.attributeList[index].isChecked = !this.goodsDetail.attributeList[index].isChecked;
-				this.goodsDetail.attributeList[index].value[index1].isChecked = !this.goodsDetail.attributeList[index].value[index1].isChecked;
-				if(this.goodsList[index].specs.indexOf(data1) != -1){
-					this.goodsList[index].specs.splice(this.goodsList[index].specs.indexOf(data1),1)
-				}else{
-					this.goodsList[index].specs.push(data1)
-				}
-				let jishuqi = 0
-				for(var i = 0; i < this.goodsList.length; i++){
-					if(this.goodsList[i].specs.length > 0){
-						jishuqi++
-					}
-				}
-				var resultList = []
-				if(jishuqi == this.goodsList.length){
-					
-					resultList = this.combination(this.goodsList);
-				}
-				this.evalue = []
-				var value = []
-				for (var m = 0; m < resultList.length; m++) {
-					var name = ''
-					let value1 = "{"
-					for (var j = 0; j < resultList[m].length; j++) {
-						if(j != resultList[m].length - 1){
-							name += resultList[m][j] + '/'
-							value1 += '"'+this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '",'
-						}else{
-							name += resultList[m][j]
-							value1 +=  '"'+this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '"'
-						}
-					}
-					value1 += "}"
-					value.push(value1)
-					this.evalue.push(name)
-				}
-				if(jishuqi == 0){
-					this.oldTemList = []
-					this.temporaryList = this.pageOldTemList
-				}
-				if(this.temporaryList.length == 0){
-					if(jishuqi == this.goodsList.length){
-						for (var i = 0; i < value.length; i++) {
-							this.attributeList = {
-								attributeList: value[i],
-								productCount: this.temporaryNum,
-								productNum:null,
-								name: this.evalue[i],
-								price: this.purchasePrice
-							}
-							this.temporaryList.push(this.attributeList);
-						}	
-					}		
-				}else{
-					let newProductCount = 0;
-					for (var i = 0; i < value.length; i++) {
-						for (var m = 0; m < this.temporaryList.length; m++) {
-							if(this.temporaryList[m].attributeList == value[i]){
-								newProductCount = this.temporaryList[m].productCount
-							}
-						}
-						this.attributeList = {
-							attributeList: value[i],
-							productCount: newProductCount,
-							productNum:null,
-							name: this.evalue[i],
-							price: this.purchasePrice
-						}
-						
-						this.newTemList.push(this.attributeList);
-						newProductCount = 0;
-					}
-					for (var i = 0; i < this.oldTemList.length; i++) {
-						let oldAttributeList = '';
-						let oldProductCount = '';
-						let notChcek = true;
-						for (var m = 0; m < this.newTemList.length; m++) {
-							if(this.oldTemList[i].attributeList == this.newTemList[m].attributeList){
-								this.newTemList[m].productCount = this.oldTemList[i].productCount
-								notChcek = false;
-							}
-						}
-						if(this.newTemList.length > 0 && notChcek){
-							this.newTemList.push(this.oldTemList[i]);
-						}
-					}
-					
-					for (var i = 0; i < this.pageOldTemList.length; i++) {
-						let oldAttributeList = '';
-						let oldProductCount = '';
-						let notChcek = true;
-						for (var m = 0; m < this.newTemList.length; m++) {
-							if(this.pageOldTemList[i].attributeList == this.newTemList[m].attributeList){
-								this.newTemList[m].productCount = this.pageOldTemList[i].productCount
-								notChcek = false;
-							}
-						}
-						if(this.newTemList.length > 0 && notChcek){
-							this.newTemList.push(this.pageOldTemList[i]);
-						}
-					}
-				}
-				this.$nextTick(()=>{
-					for(var i=0;i<this.temporaryList.length;i++){
-						for(var m=0;m<this.pecsList.length;m++){
-							if(this.temporaryList[i].attributeList == this.pecsList[m].attributeList){
-								this.temporaryList[i].productNum = this.pecsList[m].stockCount
-							}
-						}
-					}
-				})
-				if(jishuqi != this.goodsList.length){
-					if(this.oldTemList.length ==0 && this.pageOldTemList.length ==0){
-						this.newTemList = []
-						this.temporaryList = [] 
-					}
-				}
-				if(this.newTemList.length != 0 && jishuqi == this.goodsList.length){
-					this.temporaryList = this.newTemList;
-					this.oldTemList = []
-					this.newTemList = []
-				}
-				setTimeout(res => {
-					uni.hideLoading();
-				}, 200)
-			},
-			temporaryChange(val) {
-				this.zNum = 0
-				for (var i = 0; i < this.temporaryList.length; i++) {
-					this.zNum += this.temporaryList[i].productCount || 0
-				}
-				this.zPrice = this.zNum * this.purchasePrice
-			},
-			//点击底部选好了，返回上一页
-			backPrevPage() {
-				let pages = getCurrentPages();
-				let prevPage = pages[pages.length - 2];
-				prevPage.$vm.carList1 = this.carList
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-			getShareList(type) {
-				let data = {}
-				if(type=='search'){
-					this.gateType = 'search'
-					data = {
-						categoryId: "",
-						searchStr: this.searchName,
-						pageNum: 1,
-						pageSize: '10'
-					}
-				}else{
-					this.gateType = ''
-					data = {
-						categoryId: this.categoryId,
-						searchStr: this.searchName,
-						pageNum: this.pageNum,
-						pageSize: '10'
-					}
-				}
-				this.tui.request("/app/product/getShareList", "POST", data, false, false).then((res) => {
-					if (res.code == 200) {
-						if(type=='search'){
-							this.shopList = []
-							this.status = 'nomore';
-							if (this.pages == 1) {
-								this.shopList1 = res.result.records
-							} else {
-								this.shopList1 = [...this.shopList1, ...res.result.records]
-							}
-							this.pages = res.result.pages
-						}else{
-							this.shopList1 = []
-							this.status = 'nomore';
-							if (this.pages == 1) {
-								this.shopList = res.result.records
-							} else {
-								this.shopList = [...this.shopList, ...res.result.records]
-							}
-							this.pages = res.result.pages
-						}
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			carChange(e, index, index1) {
-
-				this.carNum = 0
-				for (let i = 0; i < this.carList.length; i++) {
-					this.carList[i].num = 0
-					for (let m = 0; m < this.carList[i].saleDetailQueryDTO.length; m++) {
-						this.carList[i].num += this.carList[i].saleDetailQueryDTO[m].productCount
-					}
-					this.carNum += this.carList[i].num
-				}
-			},
-			//跳转新增商品
-			goAddGoods() {
-				uni.navigateTo({
-					url: "/package1/inventory/addGoods"
-				})
-			},
-			//弹出购物车或者商品规格选择弹窗
-			toggle(type, item) {
-
-				this.type = type
-				if (type == 'carPopup') {
-					this.carNum = 0
-					for (let i = 0; i < this.carList.length; i++) {
-						this.carNum += this.carList[i].num
-					}
-					this.carType = this.carList.length
-					this.$refs.carPopup.open('bottom')
-				} else {
-					uni.showLoading({
-						title: '加载中...'
-					})
-					this.productId = item.id
-					this.goodsList = []
-					this.allChangeNum = 0
-					this.checkGoods(item);
-					this.$refs.popup.open('bottom')
-				}
-
-			},
-			//选择商品查询商品规格
-			checkGoods(item) {
-				let that = this;
-				this.goodsDetail = item;
-				this.temporaryList = []
-				this.pageOldTemList = []
-				if (this.carList != '') {
-					this.zNum = 0
-					for (let i = 0; i < this.carList.length; i++) {
-
-						if (item.id == this.carList[i].id) {
-							this.zNum = this.carList[i].num
-							this.temporaryList = this.carList[i].saleDetailQueryDTO
-							this.pageOldTemList = this.carList[i].saleDetailQueryDTO
-							this.oldTemList = this.carList[i].saleDetailQueryDTO
-						}
-					}
-					
-				}
-				
-				this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
-					categoryId: this.goodsDetail.attrId
-				}, false, true).then((res1) => {
-					if (res1.code == 200) {
-						if (typeof(res1.result.attributeAndValue) == 'string') {
-							let newObj = JSON.parse(res1.result.attributeAndValue)
-							let newArr = []
-							let dataArr = []
-							for (let val in newObj) {
-								let valueObj = [];
-								let isTrue = false
-								for (var i = 0; i < newObj[val].length; i++) {
-									for (var m = 0; m < this.oldTemList.length; m++) {
-										var data = this.oldTemList[m].name.split('/')
-										for(var j = 0; j < data.length; j++){
-											if(data[j] == newObj[val][i]){
-												isTrue = true
-											}
-										}
-									}
-									for (var m = 0; m < this.pageOldTemList.length; m++) {
-										var data = this.pageOldTemList[m].name.split('/')
-										for(var j = 0; j < data.length; j++){
-											if(data[j] == newObj[val][i]){
-												isTrue = true
-											}
-										}
-									}
-									valueObj.push({
-										value: newObj[val][i],
-										isChecked: false
-									})
-									that.dataObj.set(newObj[val][i],val)
-									isTrue = false
-								}
-								newArr.push({
-									name: val,
-									value: valueObj
-								})
-							}
-							
-							this.goodsDetail.attributeList = newArr;
-							
-							for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
-								let oldCheck = false
-								let oldValue = []
-								for (var m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
-									if(this.goodsDetail.attributeList[i].value[m].isChecked == true){
-										oldCheck = true
-										oldValue.push(this.goodsDetail.attributeList[i].value[m].value)
-									}
-								}
-								if(oldCheck){
-									let specs1 = {
-										specs:[]
-									}
-									
-									specs1.specs = oldValue
-									this.goodsList.push(specs1)
-								}else{
-									let specs1 = { 
-										specs:[]
-									}
-									this.goodsList.push(specs1)
-								}
-								oldCheck = false
-								oldValue = []
-							}
-							
-						}
-						this.getKCList(res1.result.stock);
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			//库存商品详情
-			getKCList(list) {
-				// this.tui.request("/app/stock/productCount", "GET", {
-				// 	productId: id
-				// }, false, true).then((res) => {
-				// 	if (res.code == 200) {
-						this.pecsList = list
-				// 	} else {
-				// 		this.tui.toast(res.message)
-				// 	}
-				// }).catch((res) => {})
-				setTimeout(res => {
-					uni.hideLoading();
-				}, 200)
-			},
-			//顶部搜索框
-			search(e) {
-				if(e.value == ''){
-					this.searchName = ""
-					this.getShareList()
-				}else{
-					this.searchName = e.value
-					this.getShareList('search')
-					
-				}
-			},
-			//清空搜索条件
-			clearSearch(){
-				this.searchName = ''
-				this.getShareList()
-			},
-			chenumChange(e,index,index1){
-				
-				if(this.linshiPrice == e.target.value){
-					this.carList[index].saleDetailQueryDTO[index1].productCount = Number(e.target.value)
-				}else{
-					if(e.detail.value == ''){
-						this.carList[index].saleDetailQueryDTO[index1].productCount = Number(this.linshiPrice)
-					}else if(e.detail.value == 0){
-						this.carList[index].saleDetailQueryDTO[index1].productCount = 0
-					}else{
-						this.carList[index].saleDetailQueryDTO[index1].productCount = Number(e.detail.value);
-					}
-					this.$forceUpdate()
-				}
-				this.carChange()
-			},
-			numChange(e,index){
-				if(this.linshiPrice == e.target.value){
-					this.temporaryList[index].productCount = Number(e.target.value)
-				}else{
-					if(e.detail.value == ''){
-						this.temporaryList[index].productCount =  Number(this.linshiPrice)
-					}else if(e.detail.value == 0){
-						this.temporaryList[index].productCount = 0
-					}else{
-						this.temporaryList[index].productCount =  Number(e.detail.value);
-					}
-					this.$forceUpdate()
-				}
-				this.temporaryChange()
-			},
-			oneMinusNum(index){
-				this.temporaryList[index].productCount --
-				this.temporaryChange()
-			},
-			onePlusNum(index){
-				this.temporaryList[index].productCount ++
-				this.temporaryChange()
-			},
-			obtainPrice(e,type,index,index1){
-				this.linshiPrice = e.target.value
-				if(type=='zongjishu'){
-					this.allChangeNum = ''
-				}else if(type=='danjishu'){
-					this.temporaryList[index].productCount = ''
-					this.$forceUpdate()
-				}else if(type=='chejishu'){
-					this.carList[index].saleDetailQueryDTO[index1].productCount = ''
-					this.$forceUpdate()
-				}
-			},
-			//未入库遮罩
-			clickMask(item) {
-				let title = ''
-				if (item.delFlag == 0) {
-					title = '请将商品上架后再操作！'
-				} else {
-					title = '请将上次入库的采购价维护后再进行操作！'
-				}
-				uni.showToast({
-					title: title,
-					icon: 'none'
-				})
-			},
-			//点击左侧菜单切换
-			clickLeftBtn(index) {
-				for (var i = 0; i < this.indexList.length; i++) {
-					if (i == index) {
-						this.indexList[i].parentId = true
-					} else {
-						this.indexList[i].parentId = false
-					}
-				}
-				this.categoryId = this.indexList[index].id
-				this.getShareList(this.indexList[index].id)
-			},
-			inputDialogToggle() {
-				this.$refs.inputDialog.open()
-			},
-			//临时改价
-			changePrice(val) {
-				this.goodsDetail.price = this.temporaryList[0].price = val
-			},
-			//弹窗选择规格后，点击弹窗中选好了按钮
-			temporaryCheck() {
-				this.evalue = []
-				let data = {
-					attrId:this.goodsDetail.attrId,
-					id: this.goodsDetail.id,
-					price: this.goodsDetail.price,
-					categoryId:this.goodsDetail.categoryId,
-					num: this.zNum,
-					productId:this.goodsDetail.id,
-					wholesalePrice: this.goodsDetail.wholesalePrice,
-					purchasePrice: this.goodsDetail.purchasePrice,
-					productName: this.goodsDetail.productName,
-					productSn: this.goodsDetail.productSn,
-					productPicture: this.goodsDetail.productPicture,
-					supplierName: this.goodsDetail.supplierName,
-					saleDetailQueryDTO: this.temporaryList
-				}
-				if (this.carList.length == 0) {
-					this.carList.push(data)
-				} else {
-					let aa = true;
-					for (let i = 0; i < this.carList.length; i++) {
-						if (this.carList[i].id == data.id) {
-							this.carList[i] = data
-							aa = false
-						}
-					}
-					if (aa) {
-						this.carList.push(data)
-					}
-				}
-
-
-				for (let i = 0; i < this.carList.length; i++) {
-					this.carList[i].num = 0
-					for (let m = 0; m < this.carList[i].saleDetailQueryDTO.length; m++) {
-						this.carList[i].num += this.carList[i].saleDetailQueryDTO[m].productCount
-					}
-				}
-				this.temporaryList = []
-				this.purchasePrice = ""
-				this.oldTemList = []
-				this.zPrice = ''
-				this.zNum = ''
-				for (let i = 0; i < this.goodsDetail.attributeList.length; i++) {
-					this.goodsDetail.attributeList[i].isChecked = false;
-					for (let m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
-						this.goodsDetail.attributeList[i].value[m].isChecked = false
-					}
-				}
-				this.$refs.popup.close()
-				
-			},
-			//删除整条商品
-			delShop(item) {
-				var that = this;
-				uni.showModal({
-					title: "提示",
-					content: "确定删除此条商品吗？",
-					success: function(res) {
-						if (res.confirm) {
-							for (let i = 0; i < that.carList.length; i++) {
-								if (that.carList[i].id == item.id) {
-									that.carNum -= that.carList[i].num
-									that.carList.splice(i, 1)
-								}
-							}
-							that.carType = that.carList.length
-						}
-						that.$forceUpdate()
-					}
-				})
-			},
-			change() {
-				this.oldTemList = []
-			},
-			//选商品的时候能删除规格
-			delCarData(index) {
-				
-				this.temporaryList.splice(index, 1);
-				this.temporaryChange()
-				// uni.showModal({
-				// 	title: "提示",
-				// 	content: "确定删除此条商品吗？",
-				// 	success: function(res) {
-				// 		if(res.confirm){
-				// 			that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name);
-				// 			that.carList.get(id).stockLogList.delete(name)
-				// 			that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(id).purchasePrice
-				// 			if(that.carList.get(id).stockLogList.size == 0){
-				// 				that.carList.delete(id)
-				// 			}
-
-				// 			that.getAllPrice()
-				// 		}
-				// 		that.$forceUpdate()
-				// 	}
-				// })
-
-			},
-			//删除商品下的某一个规格
-			delShopSpec(index, index1) {
-				var that = this;
-				uni.showModal({
-					title: "提示",
-					content: "确定删除此条商品吗？",
-					success: function(res) {
-						if (res.confirm) {
-							for (let i = 0; i < that.carList.length; i++) {
-								for (let m = 0; m < that.carList[i].saleDetailQueryDTO.length; m++) {
-									if (that.carList[i].id == index) {
-										if (that.carList[i].saleDetailQueryDTO[m].attributeList == index1) {
-											that.carList[i].num -= that.carList[i].saleDetailQueryDTO[m]
-												.productCount
-											that.carNum -= that.carList[i].saleDetailQueryDTO[m].productCount
-											that.carList[i].saleDetailQueryDTO.splice(m, 1)
-											continue;
-										}
-									}
-
-								}
-								if (that.carList[i].saleDetailQueryDTO.length == 0) {
-									that.carList.splice(i, 1)
-								}
-							}
-							that.carType = that.carList.length
-						}
-						that.$forceUpdate()
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	button {
-		color: #ffffff !important;
-		background: #5fd9ee !important;
-		width: 95%;
-		margin-top: 20rpx;
-	}
-
-	.page1 {
-		display: flex;
-		flex-direction: column;
-		height: 92%;
-	}
-
-	.uni-tab__dot {
-		padding: 0 4px;
-		line-height: 15px;
-		color: #ffffff;
-		text-align: center;
-		font-size: 12px;
-		background-color: #ff0000;
-		border-radius: 15px;
-	}
-
-	.popup-content {
-		align-items: center;
-		justify-content: center;
-		padding: 15px;
-		height: 1200rpx;
-		background-color: #fff;
-		margin-bottom: 30rpx;
-		overflow: scroll;
-	}
-
-	.popup-title-right-box {
-		height: 50rpx;
-		line-height: 50rpx;
-	}
-
-	.popup-title-right {
-		width: 400rpx;
-		margin-left: 30rpx;
-	}
-
-	.popup-title-left {
-		width: 150rpx;
-		height: 150rpx;
-	}
-
-	.popup-title-left image {
-		width: 150rpx;
-		height: 150rpx;
-
-	}
-
-	.popup-title {
-		display: flex;
-		height: 180rpx;
-		border-bottom: 1px solid #eee;
-		margin-top: 20rpx;
-	}
-
-	.popup-container {
-		width: 100%;
-		background: #fff;
-		height: 50rpx;
-		position: relative;
-	}
-
-	.uni-tab__text {
-		font-size: 12px;
-		color: #646566;
-	}
-
-	.title-box {
-		background: #fff;
-	}
-
-	.bottom-box {
-		width: 100%;
-		height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		display: flex;
-		background: #fff;
-		z-index: 98;
-	}
-
-	.bottom-left {
-		width: 15%;
-		position: relative;
-		padding-top: 20rpx;
-	}
-
-	.bottom-right {
-		width: 85%;
-		padding-top: 20rpx;
-
-		.bottom-btn {
-			width: 85%;
-			line-height: 35px;
-			height: 70rpx;
-			text-align: center;
-			margin-top: 10rpx;
-			color: #fff;
-			font-size: 28rpx;
-			margin: 0 auto;
-			background: linear-gradient(90deg, #60F3FF, #088FEB);
-			border-radius: 70rpx;
-		}
-	}
-
-	.bottom-left-box {
-		display: flex;
-		flex-direction: column;
-		text-align: center;
-	}
-
-	.content-box {
-		background: #fff;
-		flex: 1;
-		display: flex;
-	}
-
-	.content-left {
-		width: 170rpx;
-		background: #eee;
-		height: 100%;
-		overflow: scroll;
-	}
-
-	.left-box {
-		width: 100%;
-		height: 90rpx;
-		font-size: 30rpx;
-		text-align: center;
-		line-height: 90rpx;
-		border-bottom: 1px solid #fff;
-	}
-
-	.purchase-price {
-		display: flex;
-		line-height: 40px;
-		height: 80rpx;
-		width: 95%;
-		margin: 20rpx auto;
-	}
-
-	.left-box-hover {
-		width: 100%;
-		height: 90rpx;
-		font-size: 30rpx;
-		text-align: center;
-		line-height: 90rpx;
-		border-bottom: 1px solid #fff;
-		background-color: #fff;
-	}
-
-	.red {
-		border-right: 3px solid red;
-	}
-
-	.content-right {
-		flex: 1;
-		height: 100%;
-		overflow-y: scroll;
-	}
-
-	.right-box {
-		width: 100%;
-		height: 190rpx;
-		display: flex;
-		border-bottom: 1px solid #eee;
-		position: relative;
-	}
-
-	.box-left {
-		width: 130rpx;
-		height: 131rpx;
-		background-size: 100%;
-		margin: 25rpx 30rpx 35rpx 10rpx;
-		border-radius: 20rpx;
-	}
-
-	.box-left img {
-		width: 100%;
-		height: 100%;
-
-	}
-
-	.box-right {
-		margin-top: 17rpx;
-	}
-
-	.box-right-name {
-		font-size: 30rpx;
-		font-weight: bold;
-	}
-
-	.box-right-num {
-		padding: 5rpx 0;
-		color: #777;
-	}
-
-	.box-right-price {
-		display: flex;
-		font-size: 25rpx;
-	}
-
-	.checkbox {
-		width: 40rpx;
-		height: 40rpx;
-		position: absolute;
-		top: 20rpx;
-		right: 30rpx;
-	}
-
-	.price-box {
-		display: flex;
-		flex-direction: column;
-		margin-right: 20rpx;
-	}
-
-	.price-box text:first-child {
-		color: #ffa200
-	}
-
-	.uni-tab__cart-button-right,
-	.uni-tab__cart-sub-right {
-		display: none;
-		flex: none;
-	}
-
-	.title-fur {
-		width: 95%;
-		height: 50rpx;
-		margin: 0 auto;
-	}
-
-	.name {
-		font-size: 30rpx;
-		width: 50%;
-		float: left;
-		height: 50rpx;
-		line-height: 70rpx;
-	}
-
-	.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;
-	}
-
-	.content-low:hover {
-		background: #eee;
-	}
-
-	.checkList {
-		display: flex;
-		height: 50rpx;
-		font-size: 28rpx;
-		line-height: 50rpx;
-		margin: 20rpx 0;
-	}
-
-	.checkList-box {
-		height: 50rpx;
-		width: 60%;
-	}
-
-	.popup-bottom {
-		width: 95%;
-		height: 100rpx;
-		position: fixed;
-		bottom: 0;
-		left: 2.5%;
-		display: flex;
-		z-index: 99;
-		background: #fff;
-	}
-
-	.popup-bottom-left {
-		width: 50%;
-		line-height: 80rpx;
-	}
-
-	.popup-bottom-right {
-		width: 50%;
-		line-height: 100rpx;
-
-		.bottom-btn {
-			width: 70%;
-			line-height: 35px;
-			height: 70rpx;
-			text-align: center;
-			/* margin-top: 10rpx; */
-			color: #fff;
-			font-size: 28rpx;
-			margin: 0 auto;
-			background: linear-gradient(90deg, #60F3FF, #088FEB);
-			border-radius: 70rpx;
-		}
-	}
-
-	.attrs {
-		text {
-			display: inline-block;
-			border: 1px solid #5fd9ee;
-			margin: 20rpx;
-			    margin-bottom: 0;
-			    margin-left: 0;
-			background-color: #fff;
-			color: #5fd9ee;
-			padding: 0 10px;
-			min-width: 100rpx;
-			line-height: 35px;
-			height: 70rpx;
-			text-align: center;
-			border-radius: 20rpx;
-		}
-
-		.checkedText {
-			background-color: #5fd9ee;
-			color: #fff;
-			border-radius: 20rpx;
-		}
-	}
-
-	.shop-mask {
-		width: 100%;
-		height: 190rpx;
-		position: absolute;
-		top: 0;
-		left: 0;
-		background: rgba(0, 0, 0, 0.1);
-	}
-
-	.noPic {
-		border-radius: 10px;
-		width: 150rpx;
-		height: 150rpx;
-		// margin: 30rpx 0 0 30rpx;
-		text-align: center;
-		line-height: 140rpx;
-		color: #777;
-		background: #eee;
-	}
-	.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;
-	}
-	
-	@media screen and (min-width: 470px) {
-	
-		/* 适配宽度为375px及以上的屏幕 */
-		.popup-content {
-			height: 900rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 8538fe5..5ef8e0e 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -20,11 +20,11 @@
 						<view @tap.stop="scanCodeAdd" style="width: 33.33%;text-align: center;line-height: 70rpx;">
 							<uni-icons type="scan" size="12"></uni-icons>
 							<text>扫一扫</text>
-						</view>
-						<view @tap.stop="isSnList('')"
-							style="width: 33.33%;text-align: center;line-height: 70rpx;border-left: 1px solid #eee;">
-							<uni-icons type="plusempty" size="12"></uni-icons>
-							<text>新增商品</text>
+						</view>
+						<view @tap.stop="isSnList('')"
+							style="width: 33.33%;text-align: center;line-height: 70rpx;border-left: 1px solid #eee;">
+							<uni-icons type="plusempty" size="12"></uni-icons>
+							<text>新增商品</text>
 						</view>
 						<view @tap.stop="goodsAdd"
 							style="width: 33.33%;text-align: center;line-height: 70rpx;border-left: 1px solid #eee;">
@@ -42,7 +42,8 @@
 								AI开单
 							</view>
 							<view>
-								点击使用AI语音去开单
+								<radio @tap.stop="voiceGetOne" :checked="voiceGetOneData"/>
+								<text>根据货号模糊搜索</text>
 							</view>
 						</view>
 					</view>
@@ -53,117 +54,128 @@
 			<view class="content-box">
 				<view class="shop-box" style="border-top:5px solid #eee;" v-for="(value,key) in Array.from(carList)"
 					:key="key">
-					<view class="shop-name" style="height: 310rpx;position: relative;" v-if="value[1].isNew">
-						<view class="new-logo">新</view>
-						<view class="u-upload" @tap="uploadFilePromise(value)"></view>
-						<view style="width: 140rpx;height: 280rpx;margin: 30rpx 0 0 30rpx;display: flex;flex-direction: column;">
-							<img class="img-radius" :src="value[1].productPicture" alt=""
-								style="width: 140rpx;height: 140rpx;"
-								v-if="value[1].productPicture !=null && value[1].productPicture !=''">
-							<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;margin-top: 20rpx;">
-								<view @tap.stop="delShop(value[0])" style="background:#088FEB" class="left-btn">
-									删除
-								</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 class="shop-name" style="height: 310rpx;position: relative;" v-if="value[1].isNew">
+						<view class="new-logo">新</view>
+						<view class="u-upload"
+							v-if="(value[1].productPicture == '' || value[1].productPicture == undefined) && value[1].isNew == true"
+							@tap="uploadFilePromise(value)"></view>
+						<view class="u-upload"
+							v-if="value[1].productPicture != '' && value[1].productPicture != undefined && value[1].isNew == true"
+							@longpress="uploadFilePromise(value)" @tap="getZhuBigImage(value[1].productPicture)"></view>
+						<view
+							style="width: 140rpx;height: 280rpx;margin: 30rpx 0 0 30rpx;display: flex;flex-direction: column;">
+							<img class="img-radius" :src="value[1].productPicture" alt=""
+								style="width: 140rpx;height: 140rpx;"
+								v-if="value[1].productPicture !=null && value[1].productPicture !=''">
+							<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;margin-top: 20rpx;">
+								<view @tap.stop="delShop(value[0])" style="background:#088FEB" class="left-btn">
+									删除
+								</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" style="margin-top: 20rpx;">
-							<!-- <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" :value="value[1].productName"
-									@blur="getName($event,value[0])"
-									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" @input="sninput($event,value[0])" @blur="getSnIsRepeat($event,value[0])"
-									v-model="value[1].productSn"
-									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 252rpx;padding-left: 20rpx;">
-								<uni-icons type="refresh" color="#777" size='30'
-									@tap="getOneId(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 style="display: flex;height: 55rpx;line-height: 55rpx;">
-								单价:<input type="digit" v-model="value[1].discountAmount"
-									@tap="obtainPrice($event,'danjia',value[0])" disabled
-									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 230rpx;padding-left: 20rpx;">
-							</view>
-							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
-								数量: <text style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;">
-									{{value[1].productCount}}
-								</text>
-								总价: <text style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 140rpx;padding-left: 20rpx;">
-									{{value[1].price}}
-								</text>
-							</view>
+						<view class="shop-productName" style="margin-top: 20rpx;">
+							<!-- <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" :value="value[1].productName" @blur="getName($event,value[0])"
+									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" @input="sninput($event,value[0])"
+									@blur="getSnIsRepeat($event,value[0])" v-model="value[1].productSn"
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 252rpx;padding-left: 20rpx;">
+								<uni-icons type="refresh" color="#777" size='30' @tap="getOneId(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 style="display: flex;height: 55rpx;line-height: 55rpx;">
+								单价:<input type="digit" v-model="value[1].discountAmount"
+									@tap="obtainPrice($event,'danjia',value[0])" disabled
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 230rpx;padding-left: 20rpx;">
+							</view>
+							<view style="display: flex;height: 55rpx;line-height: 55rpx;">
+								数量: <text
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 100rpx;padding-left: 20rpx;">
+									{{value[1].productCount}}
+								</text>
+								总价: <text
+									style="height: 55rpx;border-bottom: 1px solid #eee;color:#777;width: 140rpx;padding-left: 20rpx;">
+									{{value[1].price}}
+								</text>
+							</view>
 							<!-- <view style="color:#FF5809;">{{value[1].productName}} （{{value[1].productSn}}）</view> -->
 							<!-- <view>￥{{value[1].discountAmount}} * {{value[1].productCount}} 总价：{{value[1].price}}
 							</view> -->
 							<!-- <view v-if="value[1].supplierName !=undefined">供应商：{{value[1].supplierName}}</view> -->
-						</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: 90rpx;right: 0px;line-height: 54rpx;">
-							语音录入 
-						</view>
-						<view @tap="AiAddSpec(value[1],1)"
-							style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;top: 236rpx;right: 0px;line-height: 54rpx;">
-							添加规格
-						</view>
-						<view @tap.stop="getHistoryPrice(value[1].productId,value[0])"
-							v-if="khName !=''&&khName.name !='散客'"
-							style="background:#088FEB;position: absolute;bottom: 165rpx;right: 0;" class="left-btn">
-							上次价格
 						</view>
-					</view>
-					<view class="shop-name" style="position: relative;" v-else>
-						<img class="img-radius" :src="value[1].productPicture" alt=""
-							style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;"
-							v-if="value[1].productPicture">
-						<view class="noPic" v-else>暂无图片</view>
-						<view class="shop-productName">
-							<view style="color:#FF5809;">{{value[1].productName == null?'':value[1].productName}} （{{value[1].productSn}}）</view>
-							<view>
-								销售价:{{value[1].discountAmount}} 数量: {{value[1].productCount}} 
-							</view>
-							<view>
-								总价：{{value[1].price}}
-							</view>
-							<view v-if="value[1].returnCount > 0">
-								退货价:{{value[1].returnPrice}} 退货数: {{value[1].returnCount}} 
-							</view>
-							<!-- <view v-if="value[1].supplierName !=undefined">供应商：{{value[1].supplierName}}</view> -->
-						</view>
-						<view @tap.stop="clickPrice(value[0])" style="background:#088FEB;position: absolute;bottom: 80rpx;right: 0;" class="left-btn">
-							改价
-						</view>
-						<view @tap.stop="AiAddSpec(value[1].productId)" style="background:#088FEB;position: absolute;bottom: 10rpx;right: 0;" class="left-btn">
-							添加规格
-						</view>
-						<view @tap.stop="getHistoryPrice(value[1].productId,value[0])"
-							v-if="khName !=''&&khName.name !='散客'"
-							style="background:#088FEB;position: absolute;bottom: 150rpx;right: 0;" class="left-btn">
-							上次价格
-						</view>
-						<view @tap.stop="delShop(value[0])" style="background:#088FEB;position: absolute;bottom: 10rpx;left: 30rpx;" class="left-btn">
-							移除商品
-						</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: 90rpx;right: 0px;line-height: 54rpx;">
+							语音录入
+						</view>
+						<view @tap="AiAddSpec(value[1],1)"
+							style="height: 27px;width: 70px;background: #088FEB;color: #fff;border-radius: 5px;text-align: center;position: absolute;top: 236rpx;right: 0px;line-height: 54rpx;">
+							添加规格
+						</view>
+						<view @tap.stop="getHistoryPrice(value[1].productId,value[0])"
+							v-if="khName !=''&&khName.name !='散客'"
+							style="background:#088FEB;position: absolute;bottom: 165rpx;right: 0;" class="left-btn">
+							上次价格
+						</view>
+					</view>
+					<view class="shop-name" style="position: relative;" v-else>
+						<img @tap="getZhuBigImage(value[1].productPicture)" class="img-radius"
+							:src="value[1].productPicture" alt=""
+							style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;"
+							v-if="value[1].productPicture">
+						<view class="noPic" v-else>暂无图片</view>
+						<view class="shop-productName">
+							<view style="color:#FF5809;">{{value[1].productName == null?'':value[1].productName}}
+								（{{value[1].productSn}}）</view>
+							<view>
+								销售价:{{value[1].discountAmount}} 数量: {{value[1].productCount}}
+							</view>
+							<view>
+								总价：{{value[1].price}}
+							</view>
+							<view v-if="value[1].returnCount > 0">
+								退货价:{{value[1].returnPrice}} 退货数: {{value[1].returnCount}}
+							</view>
+							<!-- <view v-if="value[1].supplierName !=undefined">供应商：{{value[1].supplierName}}</view> -->
+						</view>
+						<view @tap.stop="clickPrice(value[0])"
+							style="background:#088FEB;position: absolute;bottom: 80rpx;right: 0;" class="left-btn">
+							改价
+						</view>
+						<view @tap.stop="AiAddSpec(value[1].productId)"
+							style="background:#088FEB;position: absolute;bottom: 10rpx;right: 0;" class="left-btn">
+							添加规格
+						</view>
+						<view @tap.stop="getHistoryPrice(value[1].productId,value[0])"
+							v-if="khName !=''&&khName.name !='散客'"
+							style="background:#088FEB;position: absolute;bottom: 150rpx;right: 0;" class="left-btn">
+							上次价格
+						</view>
+						<view @tap.stop="delShop(value[0])"
+							style="background:#088FEB;position: absolute;bottom: 10rpx;left: 30rpx;" class="left-btn">
+							移除商品
+						</view>
 					</view>
 					<view class="shop-type">
 						<view class="shop-collapse-item" v-if="discountType == '0'">
@@ -173,8 +185,8 @@
 							</view>
 							<view class="collapse-1">
 								<text>折扣(0-10)</text>
-								<input class="input" type="digit" @focus="obtainPrice($event,'danzhe',value[0])" :value='value[1].discount'
-									@blur="changeDis($event,value[0])">
+								<input class="input" type="digit" @focus="obtainPrice($event,'danzhe',value[0])"
+									:value='value[1].discount' @blur="changeDis($event,value[0])">
 							</view>
 							<view class="collapse-1">
 								<text>折后价</text>
@@ -196,7 +208,8 @@
 									库存
 								</text>
 							</view>
-							<view style="font-size: 30rpx;color: #000;font-weight: bold;width: 152rpx;display: inline-block;text-align: right;">
+							<view
+								style="font-size: 30rpx;color: #000;font-weight: bold;width: 152rpx;display: inline-block;text-align: right;">
 								数量
 							</view>
 						</view>
@@ -212,18 +225,22 @@
 								<text @tap="checkSpec('尺码',value[0],values[0],numData(values[0])[1])">
 									{{numData(values[0])[1]}}
 								</text>
-								<text style="width: 25%;font-size: 22rpx;">
-									{{values[1].productNum == null ?'无库存':values[1].productNum}}
+								<text style="width: 25%;font-size: 22rpx;">
+									{{values[1].productNum == null ?'无库存':values[1].productNum}}
 								</text>
-								<view style="text-align: left;padding-left: 5px;width:50%;display: flex;">
-									<view class="zuni-numbox">
-										<view @tap="oneMinusNum(value[0],values[0])" class="zuni-numbox__minus zuni-numbox-btns" style="background: #f5f5f5;">
-											<text class="zuni-numbox--text">-</text>
-										</view>
-										<input v-model="values[1].productCount" disabled @tap="obtainPrice($event,'mapdanjishu',value[0],values[0])" class="zuni-numbox__value" type="number" />
-										<view @tap="onePlusNum(value[0],values[0])" class="zuni-numbox__plus zuni-numbox-btns" style="background: #f5f5f5;">
-											<text class="zuni-numbox--text">+</text>
-										</view>
+								<view style="text-align: left;padding-left: 5px;width:50%;display: flex;">
+									<view class="zuni-numbox">
+										<view @tap="oneMinusNum(value[0],values[0])"
+											class="zuni-numbox__minus zuni-numbox-btns" style="background: #f5f5f5;">
+											<text class="zuni-numbox--text">-</text>
+										</view>
+										<input v-model="values[1].productCount" disabled
+											@tap="obtainPrice($event,'mapdanjishu',value[0],values[0])"
+											class="zuni-numbox__value" type="number" />
+										<view @tap="onePlusNum(value[0],values[0])"
+											class="zuni-numbox__plus zuni-numbox-btns" style="background: #f5f5f5;">
+											<text class="zuni-numbox--text">+</text>
+										</view>
 									</view>
 								</view>
 							</view>
@@ -232,8 +249,8 @@
 				</view>
 				<view class="shop-box" style="border-top:5px solid #eee;">
 					<view class="content-list">
-						<view class="list-name" style="width:150rpx;padding-left:0;">选择价格</view>
-						<view class="list-val" style="width:560rpx;display: flex;">
+						<view class="list-name" style="width:30%;padding-left:0;">选择价格</view>
+						<view class="list-val" style="width:70%;display: flex;">
 							<radio-group style="display: flex;">
 								<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in priceItems"
 									:key="item.value" style="margin-right:0">
@@ -249,8 +266,8 @@
 				</view>
 				<view class="shop-box">
 					<view class="content-list">
-						<view class="list-name" style="width:150rpx;padding-left:0;">折扣类型</view>
-						<view class="list-val" style="width:560rpx;display: flex;">
+						<view class="list-name" style="width:30%;padding-left:0;">折扣类型</view>
+						<view class="list-val" style="width:70%;display: flex;">
 							<radio-group @change="discountChange" style="display: flex;">
 								<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items"
 									:key="item.value" style="margin-right:0">
@@ -271,123 +288,130 @@
 			</view>
 
 			<view class="content-box">
-				<view class="price-box-list" style="overflow: hidden;">
-					<view class="price-box">
-						<view style="flex: 1;text-align: left;padding-left: 20rpx;">
-							客户:{{khName.name?khName.name:''}}
-						</view>
-						<view v-if="zhiqianqiankuan >= 0" style="flex: 1;text-align: right;padding-right: 20rpx;">
-							之前欠款:{{zhiqianqiankuan}}
-						</view>
-						<view v-if="zhiqianqiankuan < 0" style="flex: 1;text-align: right;padding-right: 20rpx;">
-							客户余额:{{Math.abs(zhiqianqiankuan)}}
-						</view>
-					</view>
-					<view class="content-list">
-						<view class="list-name">支付类型</view>
-						<uni-data-select class="uni-data-select" :localdata="payTypeList" v-model="payType"
-							placeholder="请选择支付类型" @change="payTypeChange" style="width: 60%;">
-						</uni-data-select>
+				<view class="price-box-list" style="overflow: hidden;">
+					<view class="price-box">
+						<view style="flex: 1;text-align: left;padding-left: 20rpx;">
+							客户:{{khName.name?khName.name:''}}
+						</view>
+						<view v-if="zhiqianqiankuan >= 0" style="flex: 1;text-align: right;padding-right: 20rpx;">
+							之前欠款:{{zhiqianqiankuan}}
+						</view>
+						<view v-if="zhiqianqiankuan < 0" style="flex: 1;text-align: right;padding-right: 20rpx;">
+							客户余额:{{Math.abs(zhiqianqiankuan)}}
+						</view>
+					</view>
+					<view class="content-list">
+						<view class="list-name">支付类型</view>
+						<uni-data-select class="uni-data-select" :localdata="payTypeList" v-model="payType"
+							placeholder="请选择支付类型" @change="payTypeChange" style="width: 60%;">
+						</uni-data-select>
 					</view>
 					<view class="content-list">
 						<view class="list-name">销售金额</view>
 						<view class="list-val">
-							<input type="digit" v-model="shouldPay" @blur="xiaoshouChange($event)" @focus="obtainPrice($event,'xiaoshou')">
+							<input type="digit" v-model="shouldPay" @blur="xiaoshouChange($event)"
+								@focus="obtainPrice($event,'xiaoshou')">
+						</view>
+					</view>
+					<view class="content-list" v-if="returnPay != 0">
+						<view class="list-name">退货金额</view>
+						<view class="list-val">
+							<input type="digit" v-model="returnPay">
+						</view>
+					</view>
+					<view class="content-list">
+						<view class="list-name" @tap="getCountMethod">应收金额<uni-icons type="help" size="15"></uni-icons>
+						</view>
+						<view class="list-val">
+							<input type="digit" ref="relPriceinput" placeholder="请输入应收金额" v-model="relPrice"
+								@tap="obtainPrice($event,'relPrice')" disabled>
+						</view>
+					</view>
+					<view class="content-list">
+						<view class="list-name" style="width: 190rpx;">已收金额</view>
+						<view class="list-val" style="width: 400rpx;">
+							<input type="digit" placeholder="请输入已收金额" v-model="priceOk"
+								@tap="obtainPrice($event,'priceOk')" disabled>
+						</view>
+						<view v-if="priceOk < 0" @tap="noReturn"
+							style="flex: 1;height: 30px;line-height: 30px;margin-top: 5px;font-size: 24rpx;background: #00BFFF;text-align: center;color: #fff;border-radius: 20px;">
+							不退款
+						</view>
+					</view>
+					<view v-if="priceOk < 0"
+						style="color: red;font-size: 22rpx;text-align: left;width: 100%;padding-left: 40rpx;">
+						*已收金额为负，默认您已为客户退款，如不退款请更改已收金额
+					</view>
+					<view @tap="priceMore = !priceMore"
+						style="width: 95%;height: 80rpx;line-height: 80rpx;color:#777;font-size: 24rpx;text-align: center;border-bottom: 1px solid #eee;margin: 0 auto;">
+						<text>查看更多</text>
+						<uni-icons type="down" size="11" v-if="priceMore == false"></uni-icons>
+						<uni-icons type="up" size="11" v-if="priceMore"></uni-icons>
+					</view>
+					<view v-if="priceMore">
+						<view class="content-list" v-if="qiankuandikou != 0">
+							<view class="list-name">欠款抵退货</view>
+							<view class="list-val">
+								<input type="digit" v-model="qiankuandikou" disabled>
+							</view>
+						</view>
+						<view class="content-list" v-if="yuedikou != 0">
+							<view class="list-name">余额抵扣</view>
+							<view class="list-val">
+								<input type="digit" v-model="yuedikou" disabled>
+							</view>
+						</view>
+						<view class="content-list" v-if="xiaoshoudikou != 0">
+							<view class="list-name">销售抵退货</view>
+							<view class="list-val">
+								<input type="digit" v-model="xiaoshoudikou" disabled>
+							</view>
+						</view>
+						<view class="content-list" v-if="zhiqianqiankuan > 0">
+							<view class="list-name">累计欠款</view>
+							<view class="list-val">
+								<input type="digit" v-model="leijiqiankuan" disabled>
+							</view>
+						</view>
+						<view class="content-list" v-if="leijiqiankuan < 0">
+							<view class="list-name">累计余额</view>
+							<view class="list-val">
+								<input type="digit" v-model="Math.abs(leijiqiankuan)" disabled>
+							</view>
+						</view>
+
+						<view class="content-list" v-if="noPay >= 0">
+							<view class="list-name">本次欠款</view>
+							<view class="list-val">
+								<input type="digit" v-model="noPay" disabled>
+							</view>
+						</view>
+						<view class="content-list" v-if="noPay < 0">
+							<view class="list-name">本次余额</view>
+							<view class="list-val">
+								<input type="digit" v-model="Math.abs(noPay)" disabled>
+							</view>
+						</view>
+						<view class="content-list">
+							<view class="list-name">其他费用</view>
+							<view class="list-val">
+								<input type="digit" placeholder="如无其他费用可忽略" v-model="otherExpense">
+							</view>
 						</view>
-					</view>
-					<view class="content-list" v-if="returnPay != 0">
-						<view class="list-name">退货金额</view>
-						<view class="list-val">
-							<input type="digit" v-model="returnPay">
-						</view>
-					</view>
-					<view class="content-list">
-						<view class="list-name" @tap="getCountMethod">应收金额<uni-icons type="help" size="15"></uni-icons></view>
-						<view class="list-val">
-							<input type="digit" ref="relPriceinput" placeholder="请输入应收金额" v-model="relPrice" @tap="obtainPrice($event,'relPrice')" disabled>
-						</view>
-					</view>
-					<view class="content-list">
-						<view class="list-name" style="width: 190rpx;">已收金额</view>
-						<view class="list-val" style="width: 400rpx;">
-							<input type="digit" placeholder="请输入已收金额" v-model="priceOk" @tap="obtainPrice($event,'priceOk')" disabled>
-						</view>
-						<view v-if="priceOk < 0" @tap="noReturn" style="flex: 1;height: 30px;line-height: 30px;margin-top: 5px;font-size: 24rpx;background: #00BFFF;text-align: center;color: #fff;border-radius: 20px;">
-							不退款
-						</view>
-					</view>
-					<view v-if="priceOk < 0" style="color: red;font-size: 22rpx;text-align: left;width: 100%;padding-left: 40rpx;">
-						*已收金额为负，默认您已为客户退款，如不退款请更改已收金额
-					</view>
-					<view @tap="priceMore = !priceMore" style="width: 95%;height: 80rpx;line-height: 80rpx;color:#777;font-size: 24rpx;text-align: center;border-bottom: 1px solid #eee;margin: 0 auto;">
-						<text>查看更多</text>
-						<uni-icons type="down" size="11" v-if="priceMore == false"></uni-icons>
-						<uni-icons type="up" size="11" v-if="priceMore"></uni-icons>
-					</view>
-					<view v-if="priceMore">
-						<view class="content-list" v-if="qiankuandikou != 0">
-							<view class="list-name">欠款抵退货</view>
-							<view class="list-val">
-								<input type="digit" v-model="qiankuandikou" disabled>
-							</view>
-						</view>
-						<view class="content-list" v-if="yuedikou != 0">
-							<view class="list-name">余额抵扣</view>
-							<view class="list-val">
-								<input type="digit" v-model="yuedikou" disabled>
-							</view>
-						</view>
-						<view class="content-list" v-if="xiaoshoudikou != 0">
-							<view class="list-name">销售抵退货</view>
-							<view class="list-val">
-								<input type="digit" v-model="xiaoshoudikou" disabled>
-							</view>
-						</view>
-						<view class="content-list" v-if="zhiqianqiankuan > 0">
-							<view class="list-name">累计欠款</view>
-							<view class="list-val">
-								<input type="digit" v-model="leijiqiankuan" disabled>
-							</view>
-						</view>
-						<view class="content-list" v-if="leijiqiankuan < 0">
-							<view class="list-name">累计余额</view>
-							<view class="list-val">
-								<input type="digit" v-model="Math.abs(leijiqiankuan)" disabled>
-							</view>
-						</view>
-						
-						<view class="content-list" v-if="noPay >= 0">
-							<view class="list-name">本次欠款</view>
-							<view class="list-val">
-								<input type="digit" v-model="noPay" disabled>
-							</view>
-						</view>
-						<view class="content-list" v-if="noPay < 0">
-							<view class="list-name">本次余额</view>
-							<view class="list-val">
-								<input type="digit" v-model="Math.abs(noPay)" disabled>
-							</view>
-						</view>
-						<view class="content-list">
-							<view class="list-name">其他费用</view>
-							<view class="list-val">
-								<input type="digit" placeholder="如无其他费用可忽略" v-model="otherExpense">
-							</view>
-						</view>
 					</view>
 					<view class="content-list">
 						<view class="list-name">备注</view>
 						<view class="">
-							<textarea @input='changeRemark($event)' v-model="remark" />
+							<textarea maxlength="-1" @input='changeRemark($event)' v-model="remark" />
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="content-box" style="margin-bottom: 130rpx;">
-				<view class="content-list">
-					<view class="list-name">销售员</view>
-					<uni-data-select class="uni-data-select" :localdata="categoryList" v-model="xsyId"
-						placeholder="请选择销售员" @change="categoryChange"></uni-data-select>
+			<view class="content-box" style="margin-bottom: 130rpx;">
+				<view class="content-list">
+					<view class="list-name">销售员</view>
+					<uni-data-select class="uni-data-select" :localdata="categoryList" v-model="xsyId"
+						placeholder="请选择销售员" @change="categoryChange"></uni-data-select>
 				</view>
 				<view class="shop-box">
 					<view class="" style="border-bottom: 1px solid #eee;">
@@ -461,7 +485,7 @@
 						<view class="content-list" v-if="radioType == '3'">
 							<view class="list-name" style="padding-left:0;">拼包地址</view>
 							<view class="">
-								<textarea @input='changePbAddress($event)' :value='pbAddress' />
+								<textarea maxlength="-1" @input='changePbAddress($event)' :value='pbAddress' />
 							</view>
 						</view>
 					</view>
@@ -471,12 +495,13 @@
 		<!-- </view> -->
 		<view class="bottom-box">
 			<view class="bottom-left">
-				<text>销售:{{totalAmount}}件</text>
+				<text>销售:{{totalAmount}}件</text>
 				<text>退货:{{returnTotalAmount}}件</text>
 				<!-- <text style="color: #ffa200;">￥{{shouldPay == null ?0:shouldPay}}</text> -->
 			</view>
 			<view class="bottom-right">
-				<button class="bottom-btn" @tap.stop="clearAll">清空数据</button>
+				<button class="bottom-btn" @tap.stop="hangOrderFn">挂单</button>
+				<button class="bottom-btn" @tap.stop="clearAll">清空</button>
 				<button class="bottom-btn" @tap.stop="showPrice1">开单</button>
 			</view>
 		</view>
@@ -491,44 +516,49 @@
 				</view>
 				<view class="popup-pay-container" @tap.stop="checkPay(wholesalePrice,'')">
 					<text style="display: inline-block">批发价：￥{{wholesalePrice}}</text>
-				</view>
-				<!-- <view class="popup-pay-title" style="font-size: 18px;margin-top: 10px;border-top: 1px solid #eee;padding-top: 10px;">
-					<text>自定义价格</text>
+				</view>
+				<!-- <view class="popup-pay-title" style="font-size: 18px;margin-top: 10px;border-top: 1px solid #eee;padding-top: 10px;">
+					<text>自定义价格</text>
 				</view> -->
-				<view class="popup-pay-container" style="background: #fff;display: flex;width: 100%;height: 70rpx;color: #000;border: none;line-height: 70rpx;">
-					<view style="width:190rpx;">自定义售价：</view>
-					<input ref='priceD' type="digit" style="height: 70rpx;line-height: 70rpx;color: #000;width: 240rpx;border-bottom: 1px solid #eee;"
+				<view class="popup-pay-container"
+					style="background: #fff;display: flex;width: 100%;height: 70rpx;color: #000;border: none;line-height: 70rpx;">
+					<view style="width:230rpx;">自定义售价：</view>
+					<input ref='priceD' type="digit"
+						style="height: 70rpx;line-height: 70rpx;color: #000;width: 200rpx;border-bottom: 1px solid #eee;"
 						placeholder="请输入售价" v-model="customPrice" @input="changePay">
-				</view>
-				<view class="popup-pay-container" style="background: #fff;display: flex;width: 100%;height: 70rpx;color: #000;border: none;line-height: 70rpx;">
-					<view style="width:190rpx;">自定义退货：</view>
-					<input ref='returnPriceD' type="digit" style="height: 70rpx;line-height: 70rpx;color: #000;width: 240rpx;border-bottom: 1px solid #eee;"
-						placeholder="请输入退货价" v-model="returnPrice" @input="changeReturnPay">
-				</view>
-				<view style="width: 100%;color: #fff;height: 70rpx;background: #088FEB;border-radius: 5px;font-size: 30rpx;text-align: center;line-height: 70rpx;margin-top: 20rpx;"
+				</view>
+				<view class="popup-pay-container"
+					style="background: #fff;display: flex;width: 100%;height: 70rpx;color: #000;border: none;line-height: 70rpx;">
+					<view style="width:230rpx;">自定义退货：</view>
+					<input ref='returnPriceD' type="digit"
+						style="height: 70rpx;line-height: 70rpx;color: #000;width: 200rpx;border-bottom: 1px solid #eee;"
+						placeholder="请输入退货价" v-model="returnPrice" @input="changeReturnPay">
+				</view>
+				<view
+					style="width: 100%;color: #fff;height: 70rpx;background: #088FEB;border-radius: 5px;font-size: 30rpx;text-align: center;line-height: 70rpx;margin-top: 20rpx;"
 					@tap.stop="checkPay(customPrice,returnPrice)">确定</view>
 			</view>
 		</uni-popup>
-		<!-- 弹出分类选择 -->
-		<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 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>
 		<!-- 弹出层 -->
 		<view class="tanchuceng">
@@ -541,7 +571,7 @@
 							<view class="noPic" style="margin: 0;" v-else>暂无图片</view>
 						</view>
 						<view class="shop-popup-title-right">
-							<view class="shop-popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
+							<view class="shop-popup-title-right-box" style="color: #088FEB;">{{(goodsDetail.productName == undefined || goodsDetail.productName == null)?'':goodsDetail.productName}}
 							</view>
 							<view class="shop-popup-title-right-box">{{goodsDetail.productSn}}</view>
 						</view>
@@ -551,39 +581,42 @@
 							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" v-if="goodsDetail.isNew == true" :key="index" style="position: relative;">
+							<li v-for="(items,index) in goodsDetail.attributeList" v-if="goodsDetail.isNew == true"
+								: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 class="shop-attrs">
+									<view class="suibian" @longpress="longPrec(index,itemTag.value,index1)"
+										v-for="(itemTag, index1) in items.value" :key="index1"
+										@tap.stop="attrNameChange(index,itemTag.value,index1) "
+										:class="itemTag.isChecked ? 'checkedText' : '' " style="position: relative;">
+										{{itemTag.value}}
+										<view class="kucun" v-if="itemTag.isKucun"></view>
+									</view>
+								</view>
+							</li>
+							<li v-for="(items,index) in goodsDetail.attributeList"
+								v-if="goodsDetail.isNew != true && index == 0" :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)" v-if="goodsDetail.isNew == true"
+									style="position: absolute;top: 18rpx;left: 100rpx;color: #088FEB;text-decoration: underline;font-size: 24rpx;">
+									新增{{items.name}}
 								</view>
 								<view class="shop-attrs">
-									<view class="suibian" @longpress="longPrec(index,itemTag.value,index1)" v-for="(itemTag, index1) in items.value" :key="index1"
+									<view class="suibian" v-for="(itemTag, index1) in items.value" :key="index1"
 										@tap.stop="attrNameChange(index,itemTag.value,index1) "
 										:class="itemTag.isChecked ? 'checkedText' : '' " style="position: relative;">
 										{{itemTag.value}}
 										<view class="kucun" v-if="itemTag.isKucun"></view>
 									</view>
 								</view>
-							</li>
-							<li v-for="(items,index) in goodsDetail.attributeList" v-if="goodsDetail.isNew != true && index == 0" :key="index" style="position: relative;">
-								<view class="shop-title-fur">
-									<view class="shop-title-name">{{items.name}}</view>
-								</view>
-								<view @tap="getScanCodeCategroyId(items.name)"  v-if="goodsDetail.isNew == true"
-									style="position: absolute;top: 18rpx;left: 100rpx;color: #088FEB;text-decoration: underline;font-size: 24rpx;">
-									新增{{items.name}}
-								</view>
-								<view class="shop-attrs">
-									<view class="suibian" v-for="(itemTag, index1) in items.value" :key="index1"
-										@tap.stop="attrNameChange(index,itemTag.value,index1) "
-										:class="itemTag.isChecked ? 'checkedText' : '' " style="position: relative;">
-										{{itemTag.value}}
-										<view class="kucun" v-if="itemTag.isKucun"></view>
-									</view>
-								</view>
 							</li>
 						</ul>
 						<view style="padding-bottom:100rpx;">
@@ -603,8 +636,8 @@
 										style="background: #f5f5f5;">
 										<text class="zuni-numbox--text">-</text>
 									</view>
-									<input v-model="allChangeNum" @tap="obtainPrice($event,'zongjishu')" disabled class="zuni-numbox__value"
-										type="number" />
+									<input v-model="allChangeNum" @tap="obtainPrice($event,'zongjishu')" disabled
+										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>
@@ -621,15 +654,19 @@
 										style="color:#777;font-size: 12px;">{{item.productNum==null?'无库存':item.productNum}}</text>
 								</view>
 								<!-- <uni-number-box max='1000000' min="-10000" v-model="item.productCount"
-									@change="temporaryChange($event,item)" /> -->
-								<view class="zuni-numbox">
-									<view @tap="mapMinusNum(index)" class="zuni-numbox__minus zuni-numbox-btns" style="background: #f5f5f5;">
-										<text class="zuni-numbox--text">-</text>
-									</view>
-									<input v-model="item.productCount" @blur="numChange($event,index)" @tap="obtainPrice($event,'danjishu',index)" disabled class="zuni-numbox__value" type="number" />
-									<view @tap="mapPlusNum(index)" class="zuni-numbox__plus zuni-numbox-btns" style="background: #f5f5f5;">
-										<text class="zuni-numbox--text">+</text>
-									</view>
+									@change="temporaryChange($event,item)" /> -->
+								<view class="zuni-numbox">
+									<view @tap="mapMinusNum(index)" class="zuni-numbox__minus zuni-numbox-btns"
+										style="background: #f5f5f5;">
+										<text class="zuni-numbox--text">-</text>
+									</view>
+									<input v-model="item.productCount" @blur="numChange($event,index)"
+										@tap="obtainPrice($event,'danjishu',index)" disabled class="zuni-numbox__value"
+										type="number" />
+									<view @tap="mapPlusNum(index)" class="zuni-numbox__plus zuni-numbox-btns"
+										style="background: #f5f5f5;">
+										<text class="zuni-numbox--text">+</text>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -677,12 +714,13 @@
 					<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>
-				<view style="text-align: center;width: 100%;line-height: 40rpx;font-size: 11px;color: #777;">
-					{{oneGoodsId != ''?'语音示例：货号0237,白色M码,数量10件,蓝色M码,数量10件,单价88,名称:裙子':'语音示例：货号02-37，白色M码，10件'}}
+				<view style="text-align: center;width: 100%;line-height: 40rpx;font-size: 11px;color: #777;">
+					{{oneGoodsId != ''?'语音示例：货号0237,数量10件,单价88,名称:裙子':'语音示例：货号02-37，白色M码，数量10件'}}
 				</view>
 				<view class="voice-popup-container">
-					<textarea name="" id="" style="width:100%;height:300rpx;border:1px solid #eee;margin:0;"
-						v-model="voiceText" placeholder="等待语音识别中..."></textarea>
+					<textarea maxlength="-1" name="" id="" @input="getText"
+						style="width:100%;height:248rpx;border:1px solid #eee;margin:0;" v-model="voiceText1"
+						placeholder="等待语音识别中..."></textarea>
 					<view>
 						<text style="color:red;font-size:22rpx;">*长按“语音”按钮录入，系统将自动识别</text>
 					</view>
@@ -710,7 +748,8 @@
 				</view>
 				<view>
 					<view style="width: 100%;height: 150rpx;">
-						<view style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 20rpx;">
+						<view
+							style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 20rpx;">
 							<text style="font-weight: bold;">
 								销售金额
 							</text>
@@ -718,7 +757,8 @@
 								￥{{shouldPay}}
 							</text>
 						</view>
-						<view v-if="noPay >= 0" style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 40rpx;">
+						<view v-if="noPay >= 0"
+							style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 40rpx;">
 							<text style="font-weight: bold;">
 								本次欠款
 							</text>
@@ -726,7 +766,8 @@
 								￥{{noPay}}
 							</text>
 						</view>
-						<view v-if="noPay < 0" style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 40rpx;">
+						<view v-if="noPay < 0"
+							style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 40rpx;">
 							<text style="font-weight: bold;">
 								本次余额
 							</text>
@@ -736,7 +777,8 @@
 						</view>
 					</view>
 					<view style="width: 100%;height: 150rpx;">
-						<view style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 20rpx;">
+						<view
+							style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 20rpx;">
 							<text style="font-weight: bold;">
 								应收金额
 							</text>
@@ -744,7 +786,8 @@
 								￥{{relPrice}}
 							</text>
 						</view>
-						<view style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 40rpx;">
+						<view
+							style="width: 200rpx;height: 130rpx;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 20rpx;padding-top: 10px;display: flex;flex-direction: column;text-align: center;float: left;margin-left: 40rpx;">
 							<text style="font-weight: bold;">
 								已收金额
 							</text>
@@ -752,10 +795,11 @@
 								￥{{priceOk}}
 							</text>
 						</view>
-					</view>
-					
+					</view>
+
 				</view>
-				<view style="width: 90%;height: auto;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 10px;padding: 10px 0;display: flex;flex-direction: column;text-align: center;margin: 20rpx auto 0;">
+				<view
+					style="width: 90%;height: auto;border: 3px solid #FFE4C4;border-radius: 10px;margin-top: 10px;padding: 10px 0;display: flex;flex-direction: column;text-align: center;margin: 20rpx auto 0;">
 					<view style="height: 50rpx;display: flex;">
 						<text style="font-size: 24rpx;flex: 1;">退货金额：</text>
 						<text style="font-size: 24rpx;flex: 1;font-weight: bold;">￥{{returnPay}}</text>
@@ -790,7 +834,8 @@
 					</view>
 					<view style="height: 50rpx;display: flex;">
 						<text style="font-size: 24rpx;flex: 1;">其他费用：</text>
-						<text style="font-size: 24rpx;flex: 1;font-weight: bold;">￥{{otherExpense == ''?'0':otherExpense}}</text>
+						<text
+							style="font-size: 24rpx;flex: 1;font-weight: bold;">￥{{otherExpense == ''?'0':otherExpense}}</text>
 					</view>
 				</view>
 				<view class="popup-pay-container" style="display: flex;margin-top: 50rpx;background: #89CFF0;">
@@ -821,42 +866,45 @@
 					</view>
 				</view>
 			</view>
-		</uni-popup>
-		<!-- 弹出生成货号 -->
-		<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 v-if="snList.length > 0" style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
-					点击选择已有规则
-				</view>
-				<view v-if="snList.length > 0" style="width: 90%;margin: 0 auto;">
-					<view v-for="(item,index) in snList" @tap="generateSn(item.value)" :key="index" style="height: 80rpx;line-height: 80rpx;font-size: 28rpx;border-bottom: 1px solid #eee;display: flex;">
-						<view style="width: 90%;">{{index + 1}} 、 {{item.text}}</view>
-						<uni-icons type="right" size="16" style="width: 10%;text-align: center;"></uni-icons>
-					</view>
-				</view>
-				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
-					生成新规则
-				</view>
-				<view style="height: 80rpx;font-size: 22rpx;font-weight: bold;line-height: 80rpx;color:red;text-align: center;">
-					*如生成新的货号规则，可在下方输入框新增
-				</view>
-				<view class="sn-content-list">
-					<view class="sn-list-name" style="width: 156rpx;">前缀</view>
-					<view class="sn-list-val" style="width: 245rpx;">
-						<input type="text" placeholder="请输入前缀规则" v-model="prefixRule" style="width:245rpx;">
-					</view>
-				</view>
-				<view class="sn-content-list">
-					<view class="sn-list-name" style="width: 156rpx;">生成位数</view>
-					<view class="sn-list-val" style="width: 245rpx;">
-						<input type="number" placeholder="请输入位数规则" v-model="numRule" style="width: 245rpx;">
-					</view>
-				</view>
-				<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="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 v-if="snList.length > 0"
+					style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
+					点击选择已有规则
+				</view>
+				<view v-if="snList.length > 0" style="width: 90%;margin: 0 auto;">
+					<view v-for="(item,index) in snList" @tap="generateSn(item.value)" :key="index"
+						style="height: 80rpx;line-height: 80rpx;font-size: 28rpx;border-bottom: 1px solid #eee;display: flex;">
+						<view style="width: 90%;">{{index + 1}} 、 {{item.text}}</view>
+						<uni-icons type="right" size="16" style="width: 10%;text-align: center;"></uni-icons>
+					</view>
+				</view>
+				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
+					生成新规则
+				</view>
+				<view
+					style="height: 80rpx;font-size: 22rpx;font-weight: bold;line-height: 80rpx;color:red;text-align: center;">
+					*如生成新的货号规则，可在下方输入框新增
+				</view>
+				<view class="sn-content-list">
+					<view class="sn-list-name" style="width: 156rpx;">前缀</view>
+					<view class="sn-list-val" style="width: 245rpx;">
+						<input type="text" placeholder="请输入前缀规则" v-model="prefixRule" style="width:245rpx;">
+					</view>
+				</view>
+				<view class="sn-content-list">
+					<view class="sn-list-name" style="width: 156rpx;">生成位数</view>
+					<view class="sn-list-val" style="width: 245rpx;">
+						<input type="number" placeholder="请输入位数规则" v-model="numRule" style="width: 245rpx;">
+					</view>
+				</view>
+				<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">
@@ -877,59 +925,109 @@
 							</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 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="specDialog" 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="oneDataPopup" background-color="#fff" :is-mask-click="true" v-show="showTan"
+			@change="changeMore">
+			<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 class="card-list" style="margin:0 auto;">
+					<view class="right-box" v-for="(item,index) in moreData[currentPopupIndex]" :key='index'
+						@tap="clickGetOne(item)">
+						<view class="box-left">
+							<img :src="item.productPicture" alt="" v-if="item.productPicture">
+							<view class="noPic" style="margin:0;" v-else>暂无图片</view>
+						</view>
+						<view class="box-right">
+							<view class="box-right-name">
+								{{item.productSn}}
+								<text style="color: red;" v-if="item.delFlag == 0">(已下架)</text>
+							</view>
+							<view class="box-right-num">{{item.productName == null ?'':item.productName}}</view>
+							<view class="box-right-price">
+								<view class="voice-price-box" v-if="storageType== 0">
+									<text>{{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}</text>
+									<text>采购价</text>
+								</view>
+								<view class="voice-price-box">
+									<text>{{item.wholesalePrice}}</text>
+									<text>批发价</text>
+								</view>
+								<view class="voice-price-box">
+									<text>{{item.price}}</text>
+									<text>零售价</text>
+								</view>
+								<view class="voice-price-box">
+									<text>{{item.stockCount}}</text>
+									<text>库存</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<view class="mask-model" v-if="methodMask">
+			<view>实收金额计算方式</view>
+			<view>
+				{{methodText}}
+			</view>
+		</view>
+		<view class="mask-model" v-if="isVoice">貌似没有检测到您上次的语音录入信息，正在反复识别中...</view>
+		<u-keyboard ref="uKeyboard" @confirm='keyboardConfirm' @cancel="keyCancel" @close="keyCancel"
+			@change="valChange" @backspace="backspace" :overlay='true' :closeOnClickOverlay='true'
+			:defaultText="keyboardNum" mode="card" :show="showFu"></u-keyboard>
+		<u-keyboard ref="uKeyboard" @confirm='keyboardConfirm' @cancel="keyCancel" @close="keyCancel"
+			@change="valChange" @backspace="backspace" :overlay='true' :closeOnClickOverlay='true'
+			:defaultText="keyboardNum" mode="price" :show="showPrice"></u-keyboard>
+		<!-- 弹出多图轮播 -->
+		<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" v-if="item.productPicture != ''">
+						<view class="swiper-item">
+							<image mode='aspectFit' :src="item.productPicture" alt=""
+								style="width: 100%;height: 100%;" />
+							</image>
+						</view>
+					</swiper-item>
+				</swiper>
+				<view @tap="pictureAdd(childrenId,'huan')" class="lb-btn">更换图片</view>
 			</view>
-		</uni-popup>
-		<!-- 新增规格值弹窗 -->
-		<uni-popup ref="specDialog" 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>
-		<view class="mask-model" v-if="methodMask">
-			<view>实收金额计算方式</view>
-			<view>
-				{{methodText}}
-			</view>
-		</view>
-		<view class="mask-model" v-if="isVoice">貌似没有检测到您上次的语音录入信息，正在反复识别中...</view>
-		<u-keyboard ref="uKeyboard" @confirm='keyboardConfirm' @cancel="keyCancel" @close="keyCancel" @change="valChange" @backspace="backspace" :overlay='true' :closeOnClickOverlay='true' :defaultText="keyboardNum" mode="card" :show="showFu"></u-keyboard>
-		<u-keyboard ref="uKeyboard" @confirm='keyboardConfirm' @cancel="keyCancel" @close="keyCancel" @change="valChange" @backspace="backspace" :overlay='true' :closeOnClickOverlay='true' :defaultText="keyboardNum" mode="price" :show="showPrice"></u-keyboard>
-		<!-- 弹出多图轮播 -->
-		<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" v-if="item.productPicture != ''">
-						<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>
 </template>
@@ -944,28 +1042,32 @@
 	export default {
 		data() {
 			return {
-				attrList: [],
-				productPictures:[],
-				showPrice:false,
-				swiperDotIndex:0,
-				showFu:false,
-				attributeValue: [],
-				prefixRule:'',
-				numRule:'',
-				evalue:[],
+				attrList: [],
+				productPictures: [],
+				oneData: {},
+				moreData: [],
+				voiceData: {},
+				showPrice: false,
+				swiperDotIndex: 0,
+				showFu: false,
+				attributeValue: [],
+				prefixRule: '',
+				numRule: '',
+				evalue: [],
 				lsprice: 0, //临时零售价
 				wholesalePrice: 0, // 临时显示批发价
 				price: 0, //总金额
 				relPrice: "", //实收金额
-				otherExpense: "", // 其他费用
-				keyboardNum:'',
-				priceMore:false,
-				sellObj:{},
+				otherExpense: "", // 其他费用
+				keyboardNum: '',
+				priceMore: false,
+				sellObj: {},
 				noPay: 0, //欠款
 				discountNum: 10, //整体折扣
 				priceCurrent: '',
-				goodsDetail: [],
-				childrenId:'',
+				voiceGetOneData: true,
+				goodsDetail: [],
+				childrenId: '',
 				noticeData: ['您每发出一个包，使用拉包工和物流公司送货时，我们将从中拿出XX元，捐入快拾帮帮公益基金中，帮助那些贫困儿童！我们的付出将让世界充满爱！'],
 				columns: [],
 				keyList: [],
@@ -1029,31 +1131,34 @@
 					}
 				],
 				discountType: '', //折扣类型
-				discountCurrent: '',
-				isVoice:false,
-				current: 0,
-				lunbocurrent:4,
+				discountCurrent: '',
+				isVoice: false,
+				showTan: false,
+				currentPopupIndex: 0,
+				current: 0,
+				lunbocurrent: 4,
 				voiceText: ' ',
+				voiceText1:' ',
 				discCurrent: '', //折扣
 				logisticsCurrent: '', //物流
-				categoryList: '',
-				fenleiList:{},
-				payType:1,
-				payTypeList:[{
-					value: 1,
-					text: "微信支付"
-				},{
-					value: 0,
-					text: "现金支付"
-				},{
-					value: 2,
-					text: "支付宝支付"
-				},{
-					value: 3,
-					text: "银行卡转账"
-				},{
-					value: 4,
-					text: "收款码支付"
+				categoryList: '',
+				fenleiList: {},
+				payType: 1,
+				payTypeList: [{
+					value: 1,
+					text: "微信支付"
+				}, {
+					value: 0,
+					text: "现金支付"
+				}, {
+					value: 2,
+					text: "支付宝支付"
+				}, {
+					value: 3,
+					text: "银行卡转账"
+				}, {
+					value: 4,
+					text: "收款码支付"
 				}],
 				radioType: "2", //发货方式按钮选择
 				khName: [], //客户
@@ -1063,105 +1168,116 @@
 				lbgName: [], //拉包工姓名
 				carList: new Map(), //添加商品页传回来的商品信息
 				xsyId: '',
-				shouldPay: 0,
-				methodText:'',
-				methodMask:false,
-				returnPay:0,
-				tanyishou:false,
-				tanyue:true,
-				tanxiaoshou:true,
-				khData:{},
-				totalAmount: 0,
-				returnTotalAmount: 0,
-				zhiqianqiankuan:0,
-				qiankuandikou:0,
-				xiaoshoudikou:0,
-				yuedikou:0,
-				leijiqiankuan:0,
-				customPrice: '', //选择自定义金额
-				returnPrice:'',
+				shouldPay: 0,
+				methodText: '',
+				methodMask: false,
+				returnPay: 0,
+				tanyishou: false,
+				tanyue: true,
+				tanxiaoshou: true,
+				khData: {},
+				totalAmount: 0,
+				returnTotalAmount: 0,
+				zhiqianqiankuan: 0,
+				qiankuandikou: 0,
+				xiaoshoudikou: 0,
+				yuedikou: 0,
+				leijiqiankuan: 0,
+				customPrice: '', //选择自定义金额
+				returnPrice: '',
 				remark: '',
 				pbAddress: '',
 				yanseList: new Map(),
 				chimaList: new Map(),
-				carList1: [],
+				carList1: [],
 				specifications: '',
 				isPlusAndMinus: false,
-				radioType1: 0,
-				linshiPrice:0,
-				snName:'',
+				radioType1: 0,
+				linshiPrice: 0,
+				snName: '',
 				saleDetailList: [],
-				clearMsg: '',
-				snList:[],
+				clearMsg: '',
+				snList: [],
 				priceType: '',
 				multiple: 1,
 				productId: '',
 				productNum: 0,
 				historyList: {},
 				afterPrice: 0, //第二次选择商品的时候，先计算这个价格，实收金额= 已经存在的实收金额 + afterPrice
-				pageOldTemList: [],
-				indexList:[],
-				categoryText:'',
+				pageOldTemList: [],
+				indexList: [],
+				categoryText: '',
 				oldTemList: [],
-				goodsList: [],
-				saleId:'',
+				goodsList: [],
+				saleId: '',
 				newTemList: [],
-				pecsList: [],
-				oneGoodsId:'',
+				pecsList: [],
+				oneGoodsId: '',
 				dataObj: new Map(),
 				allChangeNum: 0,
 				recordState: false,
+				textareaValue:'',
 				currentAnchor: '',
-				temporaryNum: 0,
-				keyboard:'',
-				keyboardIndex:'',
+				temporaryNum: 0,
+				keyboard: '',
+				keyboardIndex: '',
 				aiNotRecognition: '',
 				getMsg: '',
-				qrArr: [],
-				defaultList:[{
-					name:'颜色',
-					value:[]
-				},{
-					name:'尺码',
-					value:[]
+				qrArr: [],
+				defaultList: [{
+					name: '颜色',
+					value: []
+				}, {
+					name: '尺码',
+					value: []
 				}],
 			}
 		},
-		onShow() {
-			let isTrue = false
-			this.xsyList();
-			this.initRecord();
-			this.analysisQrCode()
-			this.getShopCategory()
-			this.getSnList()
+		onShow() {
+			uni.authorize({
+				scope: 'scope.writePhotosAlbum',
+				success() {
+			
+				},
+				fail() {
+					this.tui.toast("您未授权，图片上传功能可能会出现错误")
+				}
+			})
+			let isTrue = false
+			this.xsyList();
+			this.initRecord();
+			this.analysisQrCode()
+			this.getShopCategory()
+			this.getSnList()
 			this.recordState = false
 			uni.showLoading({
 				title: '加载中...'
 			})
-			let that = this;
-			if (uni.getStorageSync('hangOrder') == true) {
-				this.carList.clear()
-				this.remark = ''
-				this.xsyId = ''
-				this.khName = []
-				this.saleId = ''
-				uni.removeStorageSync('hangOrder');
-			}
-			if(this.khName== '' && uni.getStorageSync('khName') == ''){
-				this.getkhName()
-			}else{
-				this.khName = uni.getStorageSync('khName')?JSON.parse(uni.getStorageSync('khName')):JSON.parse(JSON.stringify(this.khName))
-			}
-			if(this.khName != ''){
-				if(this.khName.noEarn != null && this.zhiqianqiankuan != this.khName.noEarn){
-					isTrue = true
-				}
-				if(this.khName.noEarn == null){
-					this.zhiqianqiankuan = 0
-				}else{
-					this.zhiqianqiankuan = this.khName.noEarn
-				}
-			}
+			let that = this;
+			if (uni.getStorageSync('hangOrder') == true) {
+				this.carList.clear()
+				this.remark = ''
+				this.xsyId = ''
+				this.khName = []
+				this.saleId = ''
+				uni.removeStorageSync('hangOrder');
+			}
+			if (this.khName == '' && uni.getStorageSync('khName') == '') {
+				this.getkhName()
+			} else {
+				this.khName = uni.getStorageSync('khName') ? JSON.parse(uni.getStorageSync('khName')) : JSON.parse(JSON
+					.stringify(this.khName))
+			}
+			if (this.khName != '') {
+				if (this.khName.noEarn != null && this.zhiqianqiankuan != this.khName.noEarn) {
+					isTrue = true
+				}
+				if (this.khName.noEarn == null) {
+					this.zhiqianqiankuan = 0
+				} else {
+					this.zhiqianqiankuan = this.khName.noEarn
+				}
+			}
 			this.$forceUpdate()
 			this.gysName = JSON.parse(JSON.stringify(this.gysName))
 			this.wlName = JSON.parse(JSON.stringify(this.wlName))
@@ -1173,9 +1289,9 @@
 			}, {
 				text: '自送',
 				value: 1
-			}]
-			
-			if (uni.getStorageSync('carList1') != '') {
+			}]
+
+			if (uni.getStorageSync('carList1') != '') {
 				isTrue = true
 				this.carList.clear()
 				this.carList1 = JSON.parse(uni.getStorageSync('carList1'))
@@ -1184,9 +1300,9 @@
 				this.saleId = this.carList1[0].saleId
 				this.xsyId = this.carList1[0].xsyId
 				this.createByName = this.carList1[0].createByName
-			} else {
-				if(this.carList1 != ''){
-					isTrue = true
+			} else {
+				if (this.carList1 != '') {
+					isTrue = true
 				}
 				this.carList1 = this.carList1
 			}
@@ -1209,179 +1325,271 @@
 		onLoad(option) {
 			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
-						if(this.specifiList[0].attributeName == '尺码'){
-							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])
-									}
-								})
-							}
-						}else{
-							for(let m=0;m<this.specifiList[0].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[0].productAttributeValueVoList[m].value){
-										isTrue = false
-									}
-								}
-								this.$nextTick(()=>{
-									if(isTrue){
-										this.defaultList[0].value.push(this.specifiList[0].productAttributeValueVoList[m])
-									}
-								})
-								
-							}
-						}
-						if(this.specifiList[1].attributeName == '尺码'){
-							for(let m=0;m<this.specifiList[1].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[1].productAttributeValueVoList[m].value){
-										isysTrue = false
-									}
-								}
-								this.$nextTick(()=>{
-									if(isysTrue){
-										this.defaultList[1].value.push(this.specifiList[1].productAttributeValueVoList[m])
-									}
-								})
-							}
-						}else{
-							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) => {})
-			},
-			keyboardConfirm(){
-				if(this.keyboardNum != ''){
-					if(this.keyboard == 'goodsNum'){
-						this.goodsNum = Number(this.keyboardNum)
-					}else if(this.keyboard == 'zongjishu'){
-						this.allChange(Number(this.keyboardNum))
-					}else if(this.keyboard == 'danjishu'){
-						this.numChange(Number(this.keyboardNum),this.keyboardIndex)
-					}else if(this.keyboard == 'mapdanjishu'){
-						this.mapnumChange(Number(this.keyboardNum),this.keyboardIndex[0],this.keyboardIndex[1])
-					}else if(this.keyboard == 'danjia'){
-						this.clickCollapse(Number(this.keyboardNum),this.keyboardIndex)
-					}else if(this.keyboard == 'priceOk'){
-						this.changePrice(Number(this.keyboardNum))
-					}else if(this.keyboard == 'relPrice'){
-						this.changessPrice(Number(this.keyboardNum))
-					}
-				}
-				this.showFu = false
-				this.showPrice = false
-				this.keyboardNum = ''
-			},
-			keyCancel(){
-				this.showFu = false
-				this.showPrice = false
-				this.keyboardNum = ''
-			},
-			// 按键被点击(点击退格键不会触发此事件)
-			valChange(val) {
-				this.keyboardNum += val
-				if(this.keyboard == 'goodsNum'){
-					this.goodsNum = this.keyboardNum
-				}
-			},
-			// 退格键被点击
-			backspace(val) {
-				this.keyboardNum = val
-				this.goodsNum = val
-			},
-			yuyinChange(){
-				this.isVoice = false
-			},
-			//正则匹配处理“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;
-			},
+		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
+						if (this.specifiList[0].attributeName == '尺码') {
+							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])
+									}
+								})
+							}
+						} else {
+							for (let m = 0; m < this.specifiList[0].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[0]
+										.productAttributeValueVoList[m].value) {
+										isTrue = false
+									}
+								}
+								this.$nextTick(() => {
+									if (isTrue) {
+										this.defaultList[0].value.push(this.specifiList[0]
+											.productAttributeValueVoList[m])
+									}
+								})
+
+							}
+						}
+						if (this.specifiList[1].attributeName == '尺码') {
+							for (let m = 0; m < this.specifiList[1].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[1]
+										.productAttributeValueVoList[m].value) {
+										isysTrue = false
+									}
+								}
+								this.$nextTick(() => {
+									if (isysTrue) {
+										this.defaultList[1].value.push(this.specifiList[1]
+											.productAttributeValueVoList[m])
+									}
+								})
+							}
+						} else {
+							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) => {})
+			},
+			keyboardConfirm() {
+				if (this.keyboardNum != '') {
+					if (this.keyboard == 'goodsNum') {
+						this.goodsNum = Number(this.keyboardNum)
+					} else if (this.keyboard == 'zongjishu') {
+						this.allChange(Number(this.keyboardNum))
+					} else if (this.keyboard == 'danjishu') {
+						this.numChange(Number(this.keyboardNum), this.keyboardIndex)
+					} else if (this.keyboard == 'mapdanjishu') {
+						this.mapnumChange(Number(this.keyboardNum), this.keyboardIndex[0], this.keyboardIndex[1])
+					} else if (this.keyboard == 'danjia') {
+						this.clickCollapse(Number(this.keyboardNum), this.keyboardIndex)
+					} else if (this.keyboard == 'priceOk') {
+						this.changePrice(Number(this.keyboardNum))
+					} else if (this.keyboard == 'relPrice') {
+						this.changessPrice(Number(this.keyboardNum))
+					}
+				}
+				this.showFu = false
+				this.showPrice = false
+				this.keyboardNum = ''
+			},
+			keyCancel() {
+				this.showFu = false
+				this.showPrice = false
+				this.keyboardNum = ''
+			},
+			// 按键被点击(点击退格键不会触发此事件)
+			valChange(val) {
+				this.keyboardNum += val
+				if (this.keyboard == 'goodsNum') {
+					this.goodsNum = this.keyboardNum
+				}
+			},
+			// 退格键被点击
+			backspace(val) {
+				this.keyboardNum = val
+				this.goodsNum = val
+			},
+			yuyinChange() {
+				this.isVoice = false
+			},
+			//正则匹配处理“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;
+			},
 			//打印小票二维码，分割二维码字符串
 			analysisQrCode() {
 				let qrCode = uni.getStorageSync('shopIcon')
-				if(qrCode != ''){
-					let data = qrCode.split(',')
-					for(let i=0;i<data.length;i++){
-						var weixin = data[i].indexOf("微信");
-						var dianpu = data[i].indexOf("店铺");
-						var zifubao = data[i].indexOf("支付");
-						var yinlian = data[i].indexOf("收款");
-						if (dianpu != -1) {
-						    var result = data[i].substring(dianpu + 2);
-							let obj = {
-								name:'店铺微信',
-								path:result,
-								level:"M"
-							}
-						    this.qrArr.push(obj)
-						}
-						if (weixin != -1) {
-						    var result =  data[i].substring(weixin + 2);
-							let obj = {
-								name:'微信收款码',
-								path:result,
-								level:"M"
-							}
-						    this.qrArr.push(obj)
-						}
-						if (zifubao != -1) {
-						    var result =  data[i].substring(zifubao + 2);
-							let obj = {
-								name:'支付宝收款码',
-								path:result,
-								level:"Q"
-							}
-						    this.qrArr.push(obj)
-						}
-						if (yinlian != -1) {
-						    var result =  data[i].substring(yinlian + 2);
-							let obj = {
-								name:'银行收款码',
-								path:result,
-								level:"M"
-							}
-						    this.qrArr.push(obj)
-						}
-					}
+				if (qrCode != '') {
+					let data = qrCode.split(',')
+					for (let i = 0; i < data.length; i++) {
+						var weixin = data[i].indexOf("微信");
+						var dianpu = data[i].indexOf("店铺");
+						var zifubao = data[i].indexOf("支付");
+						var yinlian = data[i].indexOf("收款");
+						if (dianpu != -1) {
+							var result = data[i].substring(dianpu + 2);
+							let obj = {
+								name: '店铺微信',
+								path: result,
+								level: "M"
+							}
+							this.qrArr.push(obj)
+						}
+						if (weixin != -1) {
+							var result = data[i].substring(weixin + 2);
+							let obj = {
+								name: '微信收款码',
+								path: result,
+								level: "M"
+							}
+							this.qrArr.push(obj)
+						}
+						if (zifubao != -1) {
+							var result = data[i].substring(zifubao + 2);
+							let obj = {
+								name: '支付宝收款码',
+								path: result,
+								level: "Q"
+							}
+							this.qrArr.push(obj)
+						}
+						if (yinlian != -1) {
+							var result = data[i].substring(yinlian + 2);
+							let obj = {
+								name: '银行收款码',
+								path: result,
+								level: "M"
+							}
+							this.qrArr.push(obj)
+						}
+					}
+				}
+			},
+			removePunctuationAndSpaces(str) {
+				const regex = /[\u3002\uff0c\uff1a\uFF0E\u3001\s,:;]/g;
+				return str.replace(regex, '');
+			},
+			//查询货号的后面第一个中文字符是不是“数量”，是返回true
+			isQuantityFollowsProductCode(str) {
+				const afterProductCode = str.split('货号')[1];
+				if (!afterProductCode || afterProductCode.indexOf('数量') === -1) {
+					return false;
+				}
+				const beforeQuantity = afterProductCode.split('数量')[0];
+				const containsChineseCharacter = /[^\u4e00-\u9fa5]/.test(beforeQuantity);
+				return !containsChineseCharacter;
+			},
+			extractInfo(str) {
+				const info = {};
+				const regexes = [{
+						name: 'productSn',
+						regex: /货号(.*?)，/
+					},
+					{
+						name: 'productCount',
+						regex: /，数量:(.*?)，/
+					},
+					{
+						name: 'productCount',
+						regex: /，数量:(.*?)。/
+					},
+					{
+						name: 'wholesalePrice',
+						regex: /，单价:(.*?)，/
+					},
+					{
+						name: 'wholesalePrice',
+						regex: /，单价:(.*?)。/
+					},
+					{
+						name: 'productName',
+						regex: /，名称:(.*?)，/
+					},
+					{
+						name: 'productName',
+						regex: /，名称:(.*?)。/
+					},
+					{
+						name: 'wholesalePrice1',
+						regex: /，批发价:(.*?)，/
+					},
+					{
+						name: 'wholesalePrice1',
+						regex: /，批发价:(.*?)。/
+					}
+
+				];
+
+				regexes.forEach(({
+					name,
+					regex
+				}) => {
+					const match = str.match(regex);
+					if (match && match[1]) {
+						// 去除可能的前后空格
+						info[name] = match[1].trim();
+					}
+				});
+				console.log('info', info)
+				if (info.productCount && info.productCount.indexOf('，') != -1) {
+					info.productCount = info.productCount.split('，')[0]
+				}
+				if (info.productName && info.productName.indexOf('，') != -1) {
+					info.productName = info.productName.split('，')[0]
 				}
+				if (info.wholesalePrice && info.wholesalePrice.indexOf('，') != -1) {
+					info.wholesalePrice = info.wholesalePrice.split('，')[0]
+				}
+				if (info.wholesalePrice1 && info.wholesalePrice1.indexOf('，') != -1) {
+					info.wholesalePrice1 = info.wholesalePrice1.split('，')[0]
+				}
+				return info;
 			},
 			handleData(isTrue) {
 				let that = this;
@@ -1394,13 +1602,14 @@
 								discount: 10, //折扣
 								categoryId: this.carList1[i].categoryId,
 								unitPrice: this.carList1[i].unitPrice || 0, //单价
-								discountAmount: this.carList1[i].wholesalePrice || 0, //折后价
-								returnPrice:this.carList1[i].returnPrice?this.carList1[i].returnPrice:this.carList1[i].wholesalePrice || 0,
+								discountAmount: this.carList1[i].wholesalePrice || 0, //折后价
+								returnPrice: this.carList1[i].returnPrice ? this.carList1[i].returnPrice : this
+									.carList1[i].wholesalePrice || 0,
 								disNoAmount: 0, //折前价，用于计算整体折扣
 								wholesalePrice: this.carList1[i].wholesalePrice, //批发价
 								lsprice: this.carList1[i].lsprice, //零售价
-								productCount: 0, //总数量
-								returnCount:0, //退货数量
+								productCount: 0, //总数量
+								returnCount: 0, //退货数量
 								productId: this.carList1[i].id,
 								productName: this.carList1[i].productName,
 								productPicture: this.carList1[i].productPicture,
@@ -1418,19 +1627,19 @@
 										.saleDetailQueryDTO[m].stockCount
 								}
 
-								obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-								if(this.carList1[i].saleDetailQueryDTO[m].productCount < 0){ //退货数量
-									obj.returnCount += Math.abs(this.carList1[i].saleDetailQueryDTO[m].productCount)
-								}else{
-									obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount
+								obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
+								if (this.carList1[i].saleDetailQueryDTO[m].productCount < 0) { //退货数量
+									obj.returnCount += Math.abs(this.carList1[i].saleDetailQueryDTO[m].productCount)
+								} else {
+									obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount
 								}
-								
+
 							}
 							this.carList.set(this.carList1[i].id, obj)
 						} else { //当前页有数据
-							if (this.carList.has(this.carList1[i].id) == true) { //商品相同
-								if(this.carList.get(this.carList1[i].id).returnPrice != this.carList1[i].returnPrice){
-									this.carList.get(this.carList1[i].id).returnPrice = this.carList1[i].returnPrice
+							if (this.carList.has(this.carList1[i].id) == true) { //商品相同
+								if (this.carList.get(this.carList1[i].id).returnPrice != this.carList1[i].returnPrice) {
+									this.carList.get(this.carList1[i].id).returnPrice = this.carList1[i].returnPrice
 								}
 								for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
 									if (this.carList.get(this.carList1[i].id).stockLogList.has(this.carList1[i]
@@ -1474,13 +1683,15 @@
 										this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i]
 											.saleDetailQueryDTO[
 												m].attributeList, data1)
-									}
-									if(this.carList1[i].saleDetailQueryDTO[m].productCount < 0){ //退货数量
-										this.carList.get(this.carList1[i].id).returnCount += Math.abs(this.carList1[i].saleDetailQueryDTO[m].productCount)
-									}else{
-										this.carList.get(this.carList1[i].id).productCount += this.carList1[i].saleDetailQueryDTO[m].productCount
 									}
-									
+									if (this.carList1[i].saleDetailQueryDTO[m].productCount < 0) { //退货数量
+										this.carList.get(this.carList1[i].id).returnCount += Math.abs(this.carList1[i]
+											.saleDetailQueryDTO[m].productCount)
+									} else {
+										this.carList.get(this.carList1[i].id).productCount += this.carList1[i]
+											.saleDetailQueryDTO[m].productCount
+									}
+
 								}
 							} else { //商品不同
 								let obj = {
@@ -1488,14 +1699,15 @@
 									price: 0,
 									discount: 10,
 									categoryId: this.carList1[i].categoryId,
-									discountAmount: this.carList1[i].wholesalePrice || 0,
-									returnPrice:this.carList1[i].returnPrice?this.carList1[i].returnPrice:this.carList1[i].wholesalePrice || 0,
+									discountAmount: this.carList1[i].wholesalePrice || 0,
+									returnPrice: this.carList1[i].returnPrice ? this.carList1[i].returnPrice : this
+										.carList1[i].wholesalePrice || 0,
 									disNoAmount: 0, //折前价，用于计算整体折扣
 									unitPrice: this.carList1[i].unitPrice || 0, //单价
 									wholesalePrice: this.carList1[i].wholesalePrice, //批发价
 									lsprice: this.carList1[i].lsprice, //零售价
-									productCount: 0,
-									returnCount:0,
+									productCount: 0,
+									returnCount: 0,
 									productId: this.carList1[i].id,
 									productName: this.carList1[i].productName,
 									productPicture: this.carList1[i].productPicture,
@@ -1517,11 +1729,11 @@
 									}
 									obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
 
-									obj.name = this.carList1[i].saleDetailQueryDTO[m].name
-									if(this.carList1[i].saleDetailQueryDTO[m].productCount < 0){ //退货数量
-										obj.returnCount += Math.abs(this.carList1[i].saleDetailQueryDTO[m].productCount)
-									}else{
-										obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount
+									obj.name = this.carList1[i].saleDetailQueryDTO[m].name
+									if (this.carList1[i].saleDetailQueryDTO[m].productCount < 0) { //退货数量
+										obj.returnCount += Math.abs(this.carList1[i].saleDetailQueryDTO[m].productCount)
+									} else {
+										obj.productCount += this.carList1[i].saleDetailQueryDTO[m].productCount
 									}
 								}
 								this.carList.set(this.carList1[i].id, obj)
@@ -1530,7 +1742,7 @@
 					}
 
 				}
-				uni.removeStorageSync('carList1') 
+				uni.removeStorageSync('carList1')
 				uni.removeStorageSync('khName')
 				uni.removeStorageSync('saoma')
 				uni.removeStorageSync('clearMsg')
@@ -1548,11 +1760,11 @@
 						value.price = value.unitPrice * 10000 * value.productCount * that.discountNum / 10 / 10000
 					}
 				})
-				// this.getAllPrice()
-				if(isTrue){
-					this.getAmountAndWho()
+				// this.getAllPrice()
+				if (isTrue) {
+					this.getAmountAndWho()
 				}
-				
+
 				// this.noPay = this.shouldPay
 				if (this.xsyId == '') {
 					this.xsyId = uni.getStorageSync('id')
@@ -1570,6 +1782,7 @@
 			},
 			AiHandleData() {
 				let that = this;
+				console.log('carList1', this.carList1)
 				for (let i = 0; i < this.carList1.length; i++) {
 
 					if (this.carList1[i].stockLogList1) {
@@ -1578,24 +1791,25 @@
 							let obj = {
 								purchasePrice: this.carList1[i].purchasePrice, //采购价
 								price: 0, //总价
-								discount: 10, //折扣
-								isNew:this.carList1[i].isNew,
+								discount: 10, //折扣
+								isNew: this.carList1[i].isNew,
 								productId: this.carList1[i].productId,
-								categoryId: this.carList1[i].categoryId,
-								categoryName:this.carList1[i].isNew?'默认分类':this.carList1[i].categoryName,
+								categoryId: this.carList1[i].categoryId,
+								categoryName: this.carList1[i].isNew ? '默认分类' : this.carList1[i].categoryName,
 								unitPrice: this.carList1[i].wholesalePrice || 0, //单价
-								discountAmount: this.carList1[i].wholesalePrice || 0, //折后价
+								discountAmount: this.carList1[i].wholesalePrice || 0, //折后价
 								returnPrice: this.carList1[i].wholesalePrice || 0,
 								disNoAmount: 0, //折前价，用于计算整体折扣
 								wholesalePrice: this.carList1[i].wholesalePrice, //批发价
 								lsprice: this.carList1[i].price, //零售价
 								productCount: 0, //总数量
-								id: this.carList1[i].productId,
-								returnPrice:this.carList1[i].wholesalePrice || 0,
-								returnCount:0,
-								productName: this.carList1[i].productName == null?this.carList1[i].productSn:this.carList1[i].productName,
-								productPicture: this.carList1[i].productPicture,
-								productPictures:this.carList1[i].productPictures || [],
+								id: this.carList1[i].productId,
+								returnPrice: this.carList1[i].wholesalePrice || 0,
+								returnCount: 0,
+								productName: this.carList1[i].productName == null ? this.carList1[i].productSn : this
+									.carList1[i].productName,
+								productPicture: this.carList1[i].productPicture || "",
+								productPictures: this.carList1[i].productPictures || [],
 								productSn: this.carList1[i].productSn,
 								stockLogList: new Map(),
 								stockLogList1: [],
@@ -1608,7 +1822,11 @@
 									productNum: this.carList1[i].stockLogList1[m].stockCount
 								}
 								obj.stockLogList.set(this.carList1[i].stockLogList1[m].attributeList, data1)
-								obj.productCount += this.carList1[i].stockLogList1[m].productCount
+								if (this.carList1[i].stockLogList1[m].productCount < 0) { //退货数量
+									obj.returnCount += Math.abs(this.carList1[i].stockLogList1[m].productCount)
+								} else {
+									obj.productCount += this.carList1[i].stockLogList1[m].productCount
+								}
 							}
 							this.carList.set(this.carList1[i].productId, obj)
 						} else { //当前页有数据
@@ -1637,35 +1855,39 @@
 											productNum: this.carList1[i].stockLogList1[m].stockCount
 										}
 										this.carList.get(this.carList1[i].productId).stockLogList.set(this.carList1[i]
-											.stockLogList1[
-												m].attributeList, data1)
+											.stockLogList1[m].attributeList, data1)
+									}
+									if (this.carList.get(this.carList1[i].productId).productCount < 0) { //退货数量
+										this.carList.get(this.carList1[i].productId).returnCount += Math.abs(this.carList1[
+											i].stockLogList1[m].productCount)
+									} else {
+										this.carList.get(this.carList1[i].productId).productCount += this.carList1[i]
+											.stockLogList1[m].productCount
 									}
-									this.carList.get(this.carList1[i].productId).productCount += this.carList1[i]
-										.stockLogList1[
-											m].productCount
 								}
 							} else { //商品不同
 								let obj = {
 									purchasePrice: this.carList1[i].purchasePrice, //采购价
 									price: 0, //总价
 									discount: 10, //折扣 
-									categoryId: this.carList1[i].categoryId,
-									categoryName:this.carList1[i].isNew?'默认分类':this.carList1[i].categoryName,
-									productId: this.carList1[i].productId,
-									isNew:this.carList1[i].isNew,
+									categoryId: this.carList1[i].categoryId,
+									categoryName: this.carList1[i].isNew ? '默认分类' : this.carList1[i].categoryName,
+									productId: this.carList1[i].productId,
+									isNew: this.carList1[i].isNew,
 									unitPrice: this.carList1[i].wholesalePrice || 0, //单价
-									discountAmount: this.carList1[i].wholesalePrice || 0, //折后价
+									discountAmount: this.carList1[i].wholesalePrice || 0, //折后价
 									returnPrice: this.carList1[i].wholesalePrice || 0,
 									disNoAmount: 0, //折前价，用于计算整体折扣
 									wholesalePrice: this.carList1[i].wholesalePrice, //批发价
 									lsprice: this.carList1[i].price, //零售价
-									productCount: 0, //总数量
-									returnPrice:this.carList1[i].wholesalePrice || 0,
-									returnCount:0,
+									productCount: 0, //总数量
+									returnPrice: this.carList1[i].wholesalePrice || 0,
+									returnCount: 0,
 									id: this.carList1[i].productId,
-									productName: this.carList1[i].productName == null?this.carList1[i].productSn:this.carList1[i].productName,
-									productPicture: this.carList1[i].productPicture,
-									productPictures:this.carList1[i].productPictures || [],
+									productName: this.carList1[i].productName == null ? this.carList1[i].productSn :
+										this.carList1[i].productName,
+									productPicture: this.carList1[i].productPicture,
+									productPictures: this.carList1[i].productPictures || [],
 									productSn: this.carList1[i].productSn,
 									stockLogList: new Map(),
 									stockLogList1: [],
@@ -1683,7 +1905,11 @@
 									obj.stockLogList.set(this.carList1[i].stockLogList1[m].attributeList, data1)
 
 									obj.name = this.sliceMsg(this.carList1[i].stockLogList1[m].attributeList)
-									obj.productCount += this.carList1[i].stockLogList1[m].productCount
+									if (this.carList1[i].stockLogList1[m].productCount < 0) { //退货数量
+										obj.returnCount += Math.abs(this.carList1[i].stockLogList1[m].productCount)
+									} else {
+										obj.productCount += this.carList1[i].stockLogList1[m].productCount
+									}
 								}
 								this.carList.set(this.carList1[i].productId, obj)
 							}
@@ -1702,7 +1928,8 @@
 							value.unitPrice = value.wholesalePrice
 						}
 						if (that.discountType == 1) { //整体折扣
-							value.price = value.unitPrice * 10000 * value.productCount * that.discountNum / 10 / 10000
+							value.price = value.unitPrice * 10000 * value.productCount * that.discountNum /
+								10 / 10000
 						}
 					})
 					// this.getAllPrice()
@@ -1723,13 +1950,13 @@
 				var name = ''
 				if (typeof(val) == 'string') {
 					let newObj = JSON.parse(val)
-					for (let as in newObj) {
-						if(as == '尺码'){
-							name += newObj[as]
-						}else{
-							name += newObj[as] + ' | '
+					for (let as in newObj) {
+						if (as == '尺码') {
+							name += newObj[as]
+						} else {
+							name += newObj[as] + ' | '
 						}
-						
+
 					}
 				}
 				return name;
@@ -1798,234 +2025,236 @@
 				}).catch((res) => {})
 				this.$forceUpdate()
 				this.$refs.getaPopup.open()
-			},
-			//店铺默认分类
-			getDefaultCategory(){
-				this.tui.request("/app/productCategory/getDefaultCategory", "POST", {}, false, true).then((res) => {
-					if (res.code == 200) {
-						this.fenleiList = res.result
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			//新增商品
-			isSnList(img){
-				this.addPageGoods(img,'')
-			},
-			//进入页面，查询货号列表
-			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) => {})
-			},
-			async startGetSn(){
-				var that = this;
-				if(this.prefixRule == ''){
-					this.tui.toast('请输入货号生成前缀规则')
-					return
-				}
-				if(this.numRule == ''){
-					this.tui.toast('请输入货号生成位数规则')
-					return
-				}
-				await 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()
-													that.generateSn(that.prefixRule)
-													that.$forceUpdate()
-												},1000)
-											} else {
-												that.tui.toast(res2.message)
-											}
-											that.$forceUpdate()
-										}).catch((res) => {})
-									}
-								}
-							})
-						}else{
-							that.$refs.SNDialog.close()
-							if(this.oneGoodsId != ''){
-								that.generateSn(that.prefixRule)
-							}else{
-								that.addPageGoods(that.zhuImg,res1.result)
-							}
-							that.getSnList()
-						}
-						
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			//获取新货号
-			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) => {})
-			},
-			addPageGoods(path,sn) {
-				let obj = {
-					id: generateUUID(),
-					categoryName: this.fenleiList.categoryName,
-					categoryId: this.fenleiList.categoryId,
-					isNew: true,
-					productPictures:[],
-					purchasePrice: "", //采购价
-					price: 0, //总价
-					discount: 10, //折扣
-					unitPrice: 0, //单价
-					discountAmount: 0, //折后价
-					returnPrice:0,
-					disNoAmount: 0, //折前价，用于计算整体折扣
-					wholesalePrice: 0, //批发价
-					lsprice: 0, //零售价
-					productCount: 0, //总数量
-					returnCount:0, //退货数量
-					productId: '',
-					productName: '',
-					productPicture: '',
-					productSn: sn?sn:"",
-					stockLogList: new Map(),
-					stockLogList1: [],
-					supplierName: '' //供应商
-				}
-				let data = {
-					attributeList:'{"颜色":"均色","尺码":"均码"}',
-					name:'均色 | 均码',
-					productCount:0,
-					productNum:null
-				}
-				obj.stockLogList.set(data.attributeList,data)
-				this.carList.set(obj.id, obj)
-				this.$forceUpdate()
+			},
+			//店铺默认分类
+			getDefaultCategory() {
+				this.tui.request("/app/productCategory/getDefaultCategory", "POST", {}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.fenleiList = res.result
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
+			//新增商品
+			isSnList(img) {
+				this.addPageGoods(img, '')
+			},
+			//进入页面，查询货号列表
+			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) => {})
+			},
+			async startGetSn() {
+				var that = this;
+				if (this.prefixRule == '') {
+					this.tui.toast('请输入货号生成前缀规则')
+					return
+				}
+				if (this.numRule == '') {
+					this.tui.toast('请输入货号生成位数规则')
+					return
+				}
+				await 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()
+													that.generateSn(that
+														.prefixRule)
+													that.$forceUpdate()
+												}, 1000)
+											} else {
+												that.tui.toast(res2.message)
+											}
+											that.$forceUpdate()
+										}).catch((res) => {})
+									}
+								}
+							})
+						} else {
+							that.$refs.SNDialog.close()
+							if (this.oneGoodsId != '') {
+								that.generateSn(that.prefixRule)
+							} else {
+								that.addPageGoods(that.zhuImg, res1.result)
+							}
+							that.getSnList()
+						}
+
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
+			//获取新货号
+			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) => {})
+			},
+			addPageGoods(path, sn) {
+				let obj = {
+					id: generateUUID(),
+					categoryName: this.fenleiList.categoryName,
+					categoryId: this.fenleiList.categoryId,
+					isNew: true,
+					productPictures: [],
+					purchasePrice: "", //采购价
+					price: 0, //总价
+					discount: 10, //折扣
+					unitPrice: 0, //单价
+					discountAmount: 0, //折后价
+					returnPrice: 0,
+					disNoAmount: 0, //折前价，用于计算整体折扣
+					wholesalePrice: 0, //批发价
+					lsprice: 0, //零售价
+					productCount: 0, //总数量
+					returnCount: 0, //退货数量
+					productId: '',
+					productName: '',
+					productPicture: '',
+					productSn: sn ? sn : "",
+					stockLogList: new Map(),
+					stockLogList1: [],
+					supplierName: '' //供应商
+				}
+				let data = {
+					attributeList: '{"颜色":"均色","尺码":"均码"}',
+					name: '均色 | 均码',
+					productCount: 0,
+					productNum: null
+				}
+				obj.stockLogList.set(data.attributeList, data)
+				this.carList.set(obj.id, obj)
+				this.$forceUpdate()
 			},
 			//点击某一个规格，可修改
 			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(data[2] == '颜色'){
-						if (that.numData(key)[0] == data[3]) {
-							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)
-							}
-							if(that.carList.get(data[0]).isNew != true){
-								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 {
-							if (specMap.has(key) == true) {
-								specMap.get(key).productCount += value.productCount
-							} else {
-								specMap.set(key, value)
-								specMap.get(key).name = that.sliceMsg(key)
-							}
-						}
-					}else if(data[2] == '尺码'){
-						if (that.numData(key)[1] == data[3]) {
-							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)
-							}
-							if(that.carList.get(data[0]).isNew != true){
-								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 {
-							if (specMap.has(key) == true) {
-								specMap.get(key).productCount += value.productCount
-							} else {
-								specMap.set(key, value)
-								specMap.get(key).name = that.sliceMsg(key)
-							}
-						}
-					}
-				})
-				await that.$nextTick(() => {
-					this.carList.get(data[0]).stockLogList = specMap
-					this.$forceUpdate()
-					this.$refs.getaPopup.close()
+				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 (data[2] == '颜色') {
+						if (that.numData(key)[0] == data[3]) {
+							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)
+							}
+							if (that.carList.get(data[0]).isNew != true) {
+								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 {
+							if (specMap.has(key) == true) {
+								specMap.get(key).productCount += value.productCount
+							} else {
+								specMap.set(key, value)
+								specMap.get(key).name = that.sliceMsg(key)
+							}
+						}
+					} else if (data[2] == '尺码') {
+						if (that.numData(key)[1] == data[3]) {
+							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)
+							}
+							if (that.carList.get(data[0]).isNew != true) {
+								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 {
+							if (specMap.has(key) == true) {
+								specMap.get(key).productCount += value.productCount
+							} else {
+								specMap.set(key, value)
+								specMap.get(key).name = that.sliceMsg(key)
+							}
+						}
+					}
+				})
+				await that.$nextTick(() => {
+					this.carList.get(data[0]).stockLogList = specMap
+					this.$forceUpdate()
+					this.$refs.getaPopup.close()
 				})
 
 			},
@@ -2035,6 +2264,8 @@
 
 				}, false, false, true).then((res) => {
 					if (res.code !== 200) return
+					this.xsyId = res.result[0].id
+					this.createByName = res.result[0].nickname
 					this.categoryList = res.result.map(item => {
 						return {
 							value: item.id,
@@ -2043,21 +2274,21 @@
 					})
 				})
 			},
-			allChange(e) {
+			allChange(e) {
 				this.allChangeNum = e
 				//监听到输入框改变，给所有的都赋值
 				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 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
@@ -2077,24 +2308,24 @@
 			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 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) {
@@ -2112,17 +2343,17 @@
 			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 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
@@ -2136,15 +2367,15 @@
 				}
 
 				this.temporaryChange()
-			},
-			getScanCodeCategroyId(num) {
-				this.isOpenId = num == '颜色' ? 0 : 1
-				this.goodsId = this.goodsDetail.id
-				this.$refs.specDialog.open('bottom')
-				this.isBottom = true
 			},
-			longPrec(index,value,index1){
-				console.log('删除',index,value,index1)
+			getScanCodeCategroyId(num) {
+				this.isOpenId = num == '颜色' ? 0 : 1
+				this.goodsId = this.goodsDetail.id
+				this.$refs.specDialog.open('bottom')
+				this.isBottom = true
+			},
+			longPrec(index, value, index1) {
+				console.log('删除', index, value, index1)
 				var that = this;
 				uni.showModal({
 					title: "提示",
@@ -2154,7 +2385,7 @@
 							title: '加载中...'
 						})
 						if (res.confirm) {
-							that.delDefaultCate(index,value,index1)
+							that.delDefaultCate(index, value, index1)
 						}
 						setTimeout(res => {
 							uni.hideLoading();
@@ -2162,368 +2393,374 @@
 					}
 				})
 			},
-			attrNameChange(index, data1, index1) {
+			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]
-					.value[index1].isChecked;
-				if(this.goodsDetail.isNew){
-					if (this.goodsList[index].specs.indexOf(data1) != -1) {
-						this.goodsList[index].specs.splice(this.goodsList[index].specs.indexOf(data1), 1)
-					} else {
-						this.goodsList[index].specs.push(data1)
-					}
-					let jishuqi = 0
-					for (var i = 0; i < this.goodsList.length; i++) {
-						if (this.goodsList[i].specs.length > 0) {
-							jishuqi++
-						}
-					}
-					var resultList = []
-					if (jishuqi == this.goodsList.length) {
-					
-						resultList = this.combination(this.goodsList);
-					}
-					this.evalue = []
-					var value = []
-					for (var m = 0; m < resultList.length; m++) {
-						var name = ''
-						let value1 = "{"
-						for (var j = 0; j < resultList[m].length; j++) {
-							if (j != resultList[m].length - 1) {
-								name += resultList[m][j] + '/'
-								value1 += '"' + this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '",'
-							} else {
-								name += resultList[m][j]
-								value1 += '"' + this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '"'
-							}
-						}
-						value1 += "}"
-						value.push(value1)
-						this.evalue.push(name)
-					}
-					if (jishuqi == 0) {
-						this.oldTemList = []
-						this.temporaryList = this.pageOldTemList
-					}
-					if (this.temporaryList.length == 0) {
-						if (jishuqi == this.goodsList.length) {
-							for (var i = 0; i < value.length; i++) {
-								this.attributeList = {
-									attributeList: value[i],
-									productCount: this.temporaryNum,
-									productNum: this.productNum,
-									name: this.evalue[i],
-									price: this.purchasePrice
-								}
-								this.temporaryList.push(this.attributeList);
-							}
-						}
-					} else {
-						let newProductCount = 0;
-						for (var i = 0; i < value.length; i++) {
-							for (var m = 0; m < this.temporaryList.length; m++) {
-								if (this.temporaryList[m].attributeList == value[i]) {
-									newProductCount = this.temporaryList[m].productCount
-								}
-							}
-							this.attributeList = {
-								attributeList: value[i],
-								productCount: newProductCount || 0,
-								productNum: this.productNum,
-								name: this.evalue[i],
-								price: this.purchasePrice
-							}
-					
-							this.newTemList.push(this.attributeList);
-							newProductCount = 0;
-						}
-						for (var i = 0; i < this.oldTemList.length; i++) {
-							let oldAttributeList = '';
-							let oldProductCount = '';
-							let notChcek = true;
-							for (var m = 0; m < this.newTemList.length; m++) {
-								if (this.oldTemList[i].attributeList == this.newTemList[m].attributeList) {
-									this.newTemList[m].productCount = this.oldTemList[i].productCount
-									notChcek = false;
-								}
-							}
-							if (this.newTemList.length > 0 && notChcek) {
-								this.newTemList.push(this.oldTemList[i]);
-							}
-						}
-					
-						for (var i = 0; i < this.pageOldTemList.length; i++) {
-							let oldAttributeList = '';
-							let oldProductCount = '';
-							let notChcek = true;
-							for (var m = 0; m < this.newTemList.length; m++) {
-								if (this.pageOldTemList[i].attributeList == this.newTemList[m].attributeList) {
-									this.newTemList[m].productCount = this.pageOldTemList[i].productCount
-									notChcek = false;
-								}
-							}
-							if (this.newTemList.length > 0 && notChcek) {
-								this.newTemList.push(this.pageOldTemList[i]);
-							}
-						}
-					}
-					this.$nextTick(() => {
-						for (var i = 0; i < that.temporaryList.length; i++) {
-							for (var m = 0; m < that.pecsList.length; m++) {
-								if (that.temporaryList[i].attributeList == that.pecsList[m].attributeList) {
-									that.temporaryList[i].productNum = that.pecsList[m].stockCount
-								}
-								that.$forceUpdate()
-							}
-						}
-					})
-					if (jishuqi != this.goodsList.length) {
-						if (this.oldTemList.length == 0 && this.pageOldTemList.length == 0) {
-							this.newTemList = []
-							this.temporaryList = []
-						}
-					}
-					if (this.newTemList.length != 0 && jishuqi == this.goodsList.length) {
-						this.temporaryList = this.newTemList;
-						this.oldTemList = []
-						this.newTemList = []
-					}
-					setTimeout(res => {
-						uni.hideLoading();
-					}, 200)
-				}else{
-					this.evalue = []
-					var value = []
-					for(let i=0,data=this.goodsDetail.attributeList[0].value;i<data.length;i++){
-						if(data[i].isChecked){
-							for(let j=0,dataJ=this.goodsDetail.attributeList[1].value;j<dataJ.length;j++){
-								var name = ''
-								let value1 = "{"
-								
-								name = data[i].value +' | '+  dataJ[j].value
-								value1 +=  '"'+'颜色'+ '":"' + data[i].value + '",'
-								value1 +=  '"'+'尺码' + '":"' + dataJ[j].value + '"'
-								value1 += "}"
-								value.push(value1)
-								this.evalue.push(name)
-							}
-						}
-					}
-					if (this.temporaryList.length == 0) {
-						for (var i = 0; i < value.length; i++) {
-							this.attributeList = {
-								attributeList: value[i],
-								productCount: this.temporaryNum,
-								productNum: null,
-								name: this.evalue[i],
-								price: this.purchasePrice
-							}
-							this.temporaryList.push(this.attributeList);
-						}
-					} else {
-						let newProductCount = 0;
-						for (var i = 0; i < value.length; i++) {
-							for (var m = 0; m < this.temporaryList.length; m++) {
-								if (this.temporaryList[m].attributeList == value[i]) {
-									newProductCount = this.temporaryList[m].productCount
-								}
-							}
-							this.attributeList = {
-								attributeList: value[i],
-								productCount: newProductCount,
-								productNum: null,
-								name: this.evalue[i],
-								price: this.purchasePrice
-							}
-					
-							this.newTemList.push(this.attributeList);
-							newProductCount = 0;
-						}
-						for (var i = 0; i < this.oldTemList.length; i++) {
-							let oldAttributeList = '';
-							let oldProductCount = '';
-							let notChcek = true;
-							for (var m = 0; m < this.newTemList.length; m++) {
-								if (this.oldTemList[i].attributeList == this.newTemList[m].attributeList) {
-									this.newTemList[m].productCount = this.oldTemList[i].productCount
-									notChcek = false;
-								}
-							}
-							if (this.newTemList.length > 0 && notChcek) {
-								this.newTemList.push(this.oldTemList[i]);
-							}
-						}
-					
-						for (var i = 0; i < this.pageOldTemList.length; i++) {
-							let oldAttributeList = '';
-							let oldProductCount = '';
-							let notChcek = true;
-							for (var m = 0; m < this.newTemList.length; m++) {
-								if (this.pageOldTemList[i].attributeList == this.newTemList[m].attributeList) {
-									this.newTemList[m].productCount = this.pageOldTemList[i].productCount
-									notChcek = false;
-								}
-							}
-							if (this.newTemList.length > 0 && notChcek) {
-								this.newTemList.push(this.pageOldTemList[i]);
-							}
-						}
-					}
-					this.$nextTick(() => {
-						for (var i = 0; i < this.temporaryList.length; i++) {
-							for (var m = 0; m < this.pecsList.length; m++) {
-								if (this.temporaryList[i].attributeList == this.pecsList[m].attributeList) {
-									this.temporaryList[i].productNum = this.pecsList[m].stockCount
-								}
-							}
-						}
-					})
-					if (this.newTemList.length != 0) {
-						this.temporaryList = this.newTemList;
-						this.oldTemList = []
-						this.newTemList = []
-					}
-					setTimeout(res => {
-						uni.hideLoading();
-					}, 200)
+					.value[index1].isChecked;
+				if (this.goodsDetail.isNew) {
+					if (this.goodsList[index].specs.indexOf(data1) != -1) {
+						this.goodsList[index].specs.splice(this.goodsList[index].specs.indexOf(data1), 1)
+					} else {
+						this.goodsList[index].specs.push(data1)
+					}
+					let jishuqi = 0
+					for (var i = 0; i < this.goodsList.length; i++) {
+						if (this.goodsList[i].specs.length > 0) {
+							jishuqi++
+						}
+					}
+					var resultList = []
+					if (jishuqi == this.goodsList.length) {
+
+						resultList = this.combination(this.goodsList);
+					}
+					this.evalue = []
+					var value = []
+					for (var m = 0; m < resultList.length; m++) {
+						var name = ''
+						let value1 = "{"
+						for (var j = 0; j < resultList[m].length; j++) {
+							if (j != resultList[m].length - 1) {
+								name += resultList[m][j] + '/'
+								value1 += '"' + this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '",'
+							} else {
+								name += resultList[m][j]
+								value1 += '"' + this.dataObj.get(resultList[m][j]) + '":"' + resultList[m][j] + '"'
+							}
+						}
+						value1 += "}"
+						value.push(value1)
+						this.evalue.push(name)
+					}
+					if (jishuqi == 0) {
+						this.oldTemList = []
+						this.temporaryList = this.pageOldTemList
+					}
+					if (this.temporaryList.length == 0) {
+						if (jishuqi == this.goodsList.length) {
+							for (var i = 0; i < value.length; i++) {
+								this.attributeList = {
+									attributeList: value[i],
+									productCount: this.temporaryNum,
+									productNum: this.productNum,
+									name: this.evalue[i],
+									price: this.purchasePrice
+								}
+								this.temporaryList.push(this.attributeList);
+							}
+						}
+					} else {
+						let newProductCount = 0;
+						for (var i = 0; i < value.length; i++) {
+							for (var m = 0; m < this.temporaryList.length; m++) {
+								if (this.temporaryList[m].attributeList == value[i]) {
+									newProductCount = this.temporaryList[m].productCount
+								}
+							}
+							this.attributeList = {
+								attributeList: value[i],
+								productCount: newProductCount || 0,
+								productNum: this.productNum,
+								name: this.evalue[i],
+								price: this.purchasePrice
+							}
+
+							this.newTemList.push(this.attributeList);
+							newProductCount = 0;
+						}
+						for (var i = 0; i < this.oldTemList.length; i++) {
+							let oldAttributeList = '';
+							let oldProductCount = '';
+							let notChcek = true;
+							for (var m = 0; m < this.newTemList.length; m++) {
+								if (this.oldTemList[i].attributeList == this.newTemList[m].attributeList) {
+									this.newTemList[m].productCount = this.oldTemList[i].productCount
+									notChcek = false;
+								}
+							}
+							if (this.newTemList.length > 0 && notChcek) {
+								this.newTemList.push(this.oldTemList[i]);
+							}
+						}
+
+						for (var i = 0; i < this.pageOldTemList.length; i++) {
+							let oldAttributeList = '';
+							let oldProductCount = '';
+							let notChcek = true;
+							for (var m = 0; m < this.newTemList.length; m++) {
+								if (this.pageOldTemList[i].attributeList == this.newTemList[m].attributeList) {
+									this.newTemList[m].productCount = this.pageOldTemList[i].productCount
+									notChcek = false;
+								}
+							}
+							if (this.newTemList.length > 0 && notChcek) {
+								this.newTemList.push(this.pageOldTemList[i]);
+							}
+						}
+					}
+					this.$nextTick(() => {
+						for (var i = 0; i < that.temporaryList.length; i++) {
+							for (var m = 0; m < that.pecsList.length; m++) {
+								if (that.temporaryList[i].attributeList == that.pecsList[m].attributeList) {
+									that.temporaryList[i].productNum = that.pecsList[m].stockCount
+								}
+								that.$forceUpdate()
+							}
+						}
+					})
+					if (jishuqi != this.goodsList.length) {
+						if (this.oldTemList.length == 0 && this.pageOldTemList.length == 0) {
+							this.newTemList = []
+							this.temporaryList = []
+						}
+					}
+					if (this.newTemList.length != 0 && jishuqi == this.goodsList.length) {
+						this.temporaryList = this.newTemList;
+						this.oldTemList = []
+						this.newTemList = []
+					}
+					setTimeout(res => {
+						uni.hideLoading();
+					}, 200)
+				} else {
+					this.evalue = []
+					var value = []
+					for (let i = 0, data = this.goodsDetail.attributeList[0].value; i < data.length; i++) {
+						if (data[i].isChecked) {
+							for (let j = 0, dataJ = this.goodsDetail.attributeList[1].value; j < dataJ.length; j++) {
+								var name = ''
+								let value1 = "{"
+
+								name = data[i].value + ' | ' + dataJ[j].value
+								value1 += '"' + '颜色' + '":"' + data[i].value + '",'
+								value1 += '"' + '尺码' + '":"' + dataJ[j].value + '"'
+								value1 += "}"
+								value.push(value1)
+								this.evalue.push(name)
+							}
+						}
+					}
+					if (this.temporaryList.length == 0) {
+						for (var i = 0; i < value.length; i++) {
+							this.attributeList = {
+								attributeList: value[i],
+								productCount: this.temporaryNum,
+								productNum: null,
+								name: this.evalue[i],
+								price: this.purchasePrice
+							}
+							this.temporaryList.push(this.attributeList);
+						}
+					} else {
+						let newProductCount = 0;
+						for (var i = 0; i < value.length; i++) {
+							for (var m = 0; m < this.temporaryList.length; m++) {
+								if (this.temporaryList[m].attributeList == value[i]) {
+									newProductCount = this.temporaryList[m].productCount
+								}
+							}
+							this.attributeList = {
+								attributeList: value[i],
+								productCount: newProductCount,
+								productNum: null,
+								name: this.evalue[i],
+								price: this.purchasePrice
+							}
+
+							this.newTemList.push(this.attributeList);
+							newProductCount = 0;
+						}
+						for (var i = 0; i < this.oldTemList.length; i++) {
+							let oldAttributeList = '';
+							let oldProductCount = '';
+							let notChcek = true;
+							for (var m = 0; m < this.newTemList.length; m++) {
+								if (this.oldTemList[i].attributeList == this.newTemList[m].attributeList) {
+									this.newTemList[m].productCount = this.oldTemList[i].productCount
+									notChcek = false;
+								}
+							}
+							if (this.newTemList.length > 0 && notChcek) {
+								this.newTemList.push(this.oldTemList[i]);
+							}
+						}
+
+						for (var i = 0; i < this.pageOldTemList.length; i++) {
+							let oldAttributeList = '';
+							let oldProductCount = '';
+							let notChcek = true;
+							for (var m = 0; m < this.newTemList.length; m++) {
+								if (this.pageOldTemList[i].attributeList == this.newTemList[m].attributeList) {
+									this.newTemList[m].productCount = this.pageOldTemList[i].productCount
+									notChcek = false;
+								}
+							}
+							if (this.newTemList.length > 0 && notChcek) {
+								this.newTemList.push(this.pageOldTemList[i]);
+							}
+						}
+					}
+					this.$nextTick(() => {
+						for (var i = 0; i < this.temporaryList.length; i++) {
+							for (var m = 0; m < this.pecsList.length; m++) {
+								if (this.temporaryList[i].attributeList == this.pecsList[m].attributeList) {
+									this.temporaryList[i].productNum = this.pecsList[m].stockCount
+								}
+							}
+						}
+					})
+					if (this.newTemList.length != 0) {
+						this.temporaryList = this.newTemList;
+						this.oldTemList = []
+						this.newTemList = []
+					}
+					setTimeout(res => {
+						uni.hideLoading();
+					}, 200)
+				}
+
+
+			},
+			obtainPrice(e, type, num, num1) {
+
+				this.linshiPrice = e.target.value
+				if (type == 'relPrice') {
+					this.showPrice = true
+					this.keyboard = 'relPrice'
+					// this.relPrice = ''
+				} else if (type == 'priceOk') {
+					this.showPrice = true
+					this.keyboard = 'priceOk'
+				} else if (type == 'zhengti') {
+					this.discountNum = ''
+				} else if (type == 'xiaoshou') {
+					this.shouldPay = ''
+				} else if (type == 'danzhe') {
+					this.carList.get(num).discount = ''
+					this.$forceUpdate()
+				} else if (type == 'danjishu') {
+					this.keyboard = 'danjishu'
+					this.keyboardIndex = num
+					this.showFu = true
+				} else if (type == 'zongjishu') {
+					this.keyboard = 'zongjishu'
+					this.showFu = true
+				} else if (type == 'danjia') {
+					this.showPrice = true
+					this.keyboard = 'danjia'
+					this.keyboardIndex = num
+				} else if (type == 'mapdanjishu') {
+					this.showFu = true
+					this.keyboard = 'mapdanjishu'
+					this.keyboardIndex = [num, num1]
+				} else {
+					this.showPrice = true
+					this.priceOk = ''
 				}
-				
-				
-			},
-			obtainPrice(e,type,num,num1){
-				
-				this.linshiPrice = e.target.value
-				if(type=='relPrice'){
-					this.showPrice = true
-					this.keyboard = 'relPrice'
-					// this.relPrice = ''
-				}else if(type=='priceOk'){
-					this.showPrice = true
-					this.keyboard = 'priceOk'
-				}else if(type=='zhengti'){
-					this.discountNum = ''
-				}else if(type=='xiaoshou'){
-					this.shouldPay = ''
-				}else if(type=='danzhe'){
-					this.carList.get(num).discount = ''
-					this.$forceUpdate()
-				}else if(type=='danjishu'){
-					this.keyboard = 'danjishu'
-					this.keyboardIndex = num
-					this.showFu = true
-				}else if(type=='zongjishu'){
-					this.keyboard = 'zongjishu'
-					this.showFu = true
-				}else if(type=='danjia'){
-					this.showPrice = true
-					this.keyboard = 'danjia'
-					this.keyboardIndex = num
-				}else if(type=='mapdanjishu'){
-					this.showFu = true
-					this.keyboard = 'mapdanjishu'
-					this.keyboardIndex = [num,num1]
-				}else{
-					this.showPrice = true
-					this.priceOk = ''
-				}
-			},
-			numChange(e,index){
-				this.temporaryList[index].productCount = e
-				this.$forceUpdate()
-				this.temporaryChange()
-			},
-			mapnumChange(e,id,id1){
-				let that = this;
-				this.carList.get(id).productCount = 0
-				this.carList.get(id).returnCount = 0
-
-				this.carList.get(id).stockLogList.get(id1).productCount = Number(e)
-				
-				this.carList.get(id).stockLogList.forEach(function(value, key) {
-					if(value.productCount < 0){
-						that.carList.get(id).returnCount = that.carList.get(id).returnCount + Math.abs(value.productCount)
-					}else{
-						that.carList.get(id).productCount = that.carList.get(id).productCount + value.productCount
-					}
-				})
-				this.$nextTick(()=>{
-					// if (that.discountType != 0) { //单品折扣
-						that.carList.get(id).price = that.carList.get(id).productCount * that.carList
-							.get(id).discountAmount
-					// }
-				})
-				this.$nextTick(()=>{
-					this.getAllPrice()
-				})
-			},
-			async mapMinusNum(index){
-				this.temporaryList[index].productCount --
-				this.temporaryChange()
-			},
-			mapPlusNum(index){
-				this.temporaryList[index].productCount ++
-				this.temporaryChange()
-			},
-			async oneMinusNum(index,index1){
-				let that = this;
-				this.carList.get(index).productCount = 0
-				this.carList.get(index).returnCount = 0
-				this.carList.get(index).stockLogList.get(index1).productCount --
-				await this.carList.get(index).stockLogList.forEach(function(value, key) {
-					if(value.productCount < 0){
-						that.carList.get(index).returnCount = that.carList.get(index).returnCount + Math.abs(value.productCount)
-					}else{
-						that.carList.get(index).productCount = that.carList.get(index).productCount + value.productCount
-					}
-				})
-				await this.$nextTick(()=>{
-					// if (that.discountType != 0) { //单品折扣
-						that.carList.get(index).price = that.carList.get(index).productCount * that.carList
-							.get(index).discountAmount
-					// }
-				})
-				this.$forceUpdate()
-				this.getAllPrice()
-			},
-			onePlusNum(index,index1){
-				let that = this;
-				this.carList.get(index).productCount = 0
-				this.carList.get(index).returnCount = 0
-				this.carList.get(index).stockLogList.get(index1).productCount ++
-				this.carList.get(index).stockLogList.forEach(function(value, key) {
-					if(value.productCount < 0){
-						that.carList.get(index).returnCount = that.carList.get(index).returnCount + Math.abs(value.productCount)
-					}else{
-						that.carList.get(index).productCount = that.carList.get(index).productCount + value.productCount
-					}
-				})
-				this.$nextTick(()=>{
-					// if (that.discountType != 0) { //单品折扣
-						that.carList.get(index).price = that.carList.get(index).productCount * that.carList
-							.get(index).discountAmount
-					// }
-				})
-				this.$nextTick(()=>{
-					this.getAllPrice()
-				})
-			},
-
+			},
+			numChange(e, index) {
+				this.temporaryList[index].productCount = e
+				this.$forceUpdate()
+				this.temporaryChange()
+			},
+			mapnumChange(e, id, id1) {
+				let that = this;
+				this.carList.get(id).productCount = 0
+				this.carList.get(id).returnCount = 0
+
+				this.carList.get(id).stockLogList.get(id1).productCount = Number(e)
+
+				this.carList.get(id).stockLogList.forEach(function(value, key) {
+					if (value.productCount < 0) {
+						that.carList.get(id).returnCount = that.carList.get(id).returnCount + Math.abs(value
+							.productCount)
+					} else {
+						that.carList.get(id).productCount = that.carList.get(id).productCount + value.productCount
+					}
+				})
+				this.$nextTick(() => {
+					// if (that.discountType != 0) { //单品折扣
+					that.carList.get(id).price = that.carList.get(id).productCount * that.carList
+						.get(id).discountAmount
+					// }
+				})
+				this.$nextTick(() => {
+					this.getAllPrice()
+				})
+			},
+			async mapMinusNum(index) {
+				this.temporaryList[index].productCount--
+				this.temporaryChange()
+			},
+			mapPlusNum(index) {
+				this.temporaryList[index].productCount++
+				this.temporaryChange()
+			},
+			async oneMinusNum(index, index1) {
+				let that = this;
+				this.carList.get(index).productCount = 0
+				this.carList.get(index).returnCount = 0
+				this.carList.get(index).stockLogList.get(index1).productCount--
+				await this.carList.get(index).stockLogList.forEach(function(value, key) {
+					if (value.productCount < 0) {
+						that.carList.get(index).returnCount = that.carList.get(index).returnCount + Math.abs(
+							value.productCount)
+					} else {
+						that.carList.get(index).productCount = that.carList.get(index).productCount + value
+							.productCount
+					}
+				})
+				await this.$nextTick(() => {
+					// if (that.discountType != 0) { //单品折扣
+					that.carList.get(index).price = that.carList.get(index).productCount * that.carList
+						.get(index).discountAmount
+					// }
+				})
+				this.$forceUpdate()
+				this.getAllPrice()
+			},
+			onePlusNum(index, index1) {
+				let that = this;
+				this.carList.get(index).productCount = 0
+				this.carList.get(index).returnCount = 0
+				this.carList.get(index).stockLogList.get(index1).productCount++
+				this.carList.get(index).stockLogList.forEach(function(value, key) {
+					if (value.productCount < 0) {
+						that.carList.get(index).returnCount = that.carList.get(index).returnCount + Math.abs(value
+							.productCount)
+					} else {
+						that.carList.get(index).productCount = that.carList.get(index).productCount + value
+							.productCount
+					}
+				})
+				this.$nextTick(() => {
+					// if (that.discountType != 0) { //单品折扣
+					that.carList.get(index).price = that.carList.get(index).productCount * that.carList
+						.get(index).discountAmount
+					// }
+				})
+				this.$nextTick(() => {
+					this.getAllPrice()
+				})
+			},
+
 			//实收金额失去焦点
-			changessPrice(e) {
+			changessPrice(e) {
 				this.relPrice = e
 				this.priceOk = this.relPrice
 				this.noPay = this.relPrice - this.priceOk;
 			},
-			changePrice(e) {
-				this.tanyishou = true
+			changePrice(e) {
+				this.tanyishou = true
 				this.priceOk = e
 				this.noPay = this.relPrice - this.priceOk;
-				this.noPay = this.noPay.toFixed(2)
-				this.leijiqiankuan = Number(this.zhiqianqiankuan) -  Number(this.qiankuandikou) +  Number(this.yuedikou) +  Number(this.noPay)
+				this.noPay = this.noPay.toFixed(2)
+				this.leijiqiankuan = Number(this.zhiqianqiankuan) - Number(this.qiankuandikou) + Number(this.yuedikou) +
+					Number(this.noPay)
 				this.$forceUpdate()
 			},
 			getImg(key) {
@@ -2545,6 +2782,9 @@
 					}
 				}).catch((res) => {})
 			},
+			getText(e){
+							this.voiceText = e.detail.value
+						},
 			//切换销售员
 			categoryChange(e) {
 				for (let i = 0; i < this.categoryList.length; i++) {
@@ -2553,18 +2793,19 @@
 						this.createByName = this.categoryList[i].text
 					}
 				}
-			},
-			//切换销售员
-			payTypeChange(e) {
-				for (let i = 0; i < this.payTypeList.length; i++) {
-					if (this.payTypeList[i].value == e) {
-						this.payType = e;
-					}
-				}
+			},
+			//切换销售员
+			payTypeChange(e) {
+				for (let i = 0; i < this.payTypeList.length; i++) {
+					if (this.payTypeList[i].value == e) {
+						this.payType = e;
+					}
+				}
 			},
 			//清空语音输入的文字
 			clearText() {
 				this.voiceText = ''
+				this.voiceText1 = ''
 			},
 			spliceMsg(res) {
 				let regex = /嗯|啊|儿|阿|恩/g;
@@ -2593,315 +2834,1852 @@
 					'世间': '10件',
 					'实践': '10件',
 					'实件': '10件',
+					'十件': '10件',
 					'景': '#',
 					'警': '#',
-					'颈': '#',
-					'括号':'货号'
+					'颈': '#',
+					'括号': '货号',
+					'付': '-',
+					'负': '-',
+					'父': '-',
+					'名城': '名称',
+					'明城': '名称',
+					'名成': '名称',
+					'名程': '名称',
+					'上移': '上衣',
+					'时1': '11',
+					'时2': '12',
+					'时3': '13',
+					'时4': '14',
+					'时5': '15',
+					'时6': '16',
+					'时7': '17',
+					'时8': '18',
+					'时9': '19',
 				};
-				const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|井|时间|事件|世间|实践|实件|景|警|颈|括号)/g;
+				const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|井|时间|十件|事件|世间|实践|实件|景|警|颈|括号|付|负|父|名城|名程|名成|明城|上移|时1|时2|时3|时4|时5|时6|时7|时8|时9)/g;
 				return str.replace(regex, match => chineseNumToArabic[match]);
 			},
 			//编辑挂单信息
-			setDetail(e) {
-				if(this.oneGoodsId){
-					this.setOneDetail()
-					return
-				}
-				if(this.voiceText ==''){
-					this.tui.toast('识别内容不能为空')
-					return
+			async setDetail(e) {
+				if (this.oneGoodsId) {
+					this.setOneDetail()
+					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, '，数量:')
-				}
-				convertedStr = this.convertStringCorrectly(convertedStr)
-				convertedStr = this.spliceMsg(convertedStr)
-				if(convertedStr.indexOf('，') == 0){
-					
-					convertedStr = convertedStr.substr(1)
-				}
-				if (convertedStr.startsWith("号")) {
-					convertedStr = "货号" + convertedStr.substr(1);
+				if (this.voiceText == '') {
+					this.tui.toast('识别内容不能为空')
+					return
 				}
-				this.getMsg = convertedStr
-				this.tui.request("/app/sale/buyAi", "POST", {
-					aiMsg: this.getMsg
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						this.voiceText = ''
-						this.$refs.popup.close()
-						this.aiNotRecognition = res.result.aiNotRecognition
-						// if (this.isInventory == true) {
-							let newData = []
-
-							for (let i = 0; i < res.result.data.length; i++) {
-								let newList = []
-								if(res.result.data[i].productId == null){
-									res.result.data[i].isNew = true
-									res.result.data[i].productId = res.result.data[i].productSn || res.result.data[i].productName
-								}else{
-									res.result.data[i].isNew = false
-								}
-								// res.result.data[i].productCount = 0
-								if(res.result.data[i].stockLogList1.length > 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{
-									let data = {
-										attributeList:'{"颜色":"均色","尺码":"均码"}',
-										name:'均色 | 均码',
-										productCount:0,
-										productNum:null
-									}
-									newList.push(data)
-								}
-								
-
-								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 (res.result.aiNotRecognition != '') {
-							this.$refs.AiNoPopup.open()
-						}
-						this.$nextTick(()=>{
-							this.AiHandleData()
-						})
-					} else {
-						this.tui.toast("抱歉：小助手对" + this.getMsg + "的部分商品未识别，请检查识别信息是否正确")
+				let convertedStr = this.trimWhitespace(this.voiceText);
+				convertedStr = this.convertChineseToArabic(convertedStr);
+				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, '单价')
+				}
+				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, '批发价')
+				}
+				if (convertedStr.indexOf('批发价') != -1) {
+					convertedStr = convertedStr.replace(/批发价/g, '，批发价:')
+				}
+				convertedStr = this.convertStringCorrectly(convertedStr)
+				convertedStr = this.spliceMsg(convertedStr)
+				if (convertedStr.indexOf('，') == 0) {
+
+					convertedStr = convertedStr.substr(1)
+				}
+				if (convertedStr.startsWith("号")) {
+					convertedStr = "货号" + convertedStr.substr(1);
+				}
+				this.getMsg = convertedStr
+				let regexCount = /-?\d+/g;
+				if (this.isQuantityFollowsProductCode(convertedStr) || (convertedStr.indexOf('色') == -1 && convertedStr
+						.indexOf('码') == -1)) {
+					try {
+						const regex = /货号.*?(?=货号|$)/g;
+						convertedStr = convertedStr.match(regex);
+						for (let i = 0; i < convertedStr.length; i++) {
+							if (this.voiceGetOneData == true) {
+								setTimeout(resData => {
+									this.voiceData = this.extractInfo(convertedStr[i] + '。')
+
+									if (this.voiceData.productSn) {
+										this.voiceData.productSn = this.voiceData.productSn.replace(/[沟勾钩]/g,
+											'J');
+									}
+									if (this.voiceData.productCount) {
+										this.voiceData.productCount = this.voiceData.productCount.match(
+											regexCount);
+									}
+
+									if (this.voiceData.wholesalePrice) {
+										this.voiceData.wholesalePrice = this.replaceCharAfterNumber(this
+											.voiceData.wholesalePrice, '块', '.')
+										this.voiceData.wholesalePrice = this.replaceCharAfterNumber(this
+											.voiceData.wholesalePrice, '元', '')
+										this.voiceData.wholesalePrice = this.voiceData.wholesalePrice.replace(
+											/[^0-9.]/g, '');
+									}
+									if (this.voiceData.wholesalePrice1) {
+										this.voiceData.wholesalePrice1 = this.replaceCharAfterNumber(this
+											.voiceData.wholesalePrice1, '块', '.')
+										this.voiceData.wholesalePrice1 = this.replaceCharAfterNumber(this
+											.voiceData.wholesalePrice1, '元', '')
+										this.voiceData.wholesalePrice = this.voiceData.wholesalePrice1.replace(
+											/[^0-9.]/g, '');
+									}
+									if (i == convertedStr.length - 1) {
+										this.getOneData(this.voiceData, true)
+									} else {
+										this.getOneData(this.voiceData)
+									}
+								}, 100 * i)
+							} else {
+								let voiceData = this.extractInfo(convertedStr[i] + '。')
+								if (voiceData.productSn) {
+									voiceData.productSn = voiceData.productSn.replace(/[沟勾钩]/g, 'J');
+								}
+								if (voiceData.productCount) {
+									voiceData.productCount = voiceData.productCount.match(regexCount);
+								}
+								if (voiceData.wholesalePrice) {
+									voiceData.wholesalePrice = this.replaceCharAfterNumber(voiceData.wholesalePrice,
+										'块', '.')
+									voiceData.wholesalePrice = this.replaceCharAfterNumber(
+										voiceData.wholesalePrice, '元', '')
+									voiceData.wholesalePrice = voiceData.wholesalePrice.replace(/[^0-9.]/g, "");
+								}
+								if (voiceData.wholesalePrice1) {
+									voiceData.wholesalePrice1 = this.replaceCharAfterNumber(voiceData.wholesalePrice1,
+										'块', '.')
+									voiceData.wholesalePrice1 = this.replaceCharAfterNumber(
+										voiceData.wholesalePrice1, '元', '')
+									voiceData.wholesalePrice = voiceData.wholesalePrice1.replace(/[^0-9.]/g, "");
+								}
+								this.tui.request('/app/product/getByProductSn', "post", {
+									productSn: voiceData.productSn
+								}, false, true).then((res) => {
+									if (res.code == 200) {
+										if (res.result != '') {
+											this.voiceText = ''
+											this.voiceText1 = ''
+											this.$refs.popup.close();
+											this.tui.request(
+												"/app/productAttribute/selectAttributeAndValueByCategoryId",
+												"POST", {
+													categoryId: res.result[0].attrId
+												}, false, true).then((res1) => {
+												if (res1.code == 200) {
+													let data = {
+														attributeList: '{"颜色":"均色","尺码":"均码"}',
+														productCount: Number(voiceData
+															.productCount[0]),
+														stockCount: null
+													}
+													if (res1.result.stock.length > 0) {
+														for (let i = 0; i < res1.result.stock
+															.length; i++) {
+															if (res1.result.stock[i].attributeList ==
+																'{"颜色":"均色","尺码":"均码"}') {
+																console.log("进来了")
+																data = {
+																	attributeList: '{"颜色":"均色","尺码":"均码"}',
+																	productCount: Number(voiceData
+																		.productCount[0]),
+																	stockCount: res1.result.stock[
+																			i]
+																		.stockCount
+																}
+															}
+														}
+													} else {
+
+													}
+
+													setTimeout(ress => {
+														res.result[0].productId = res.result[0]
+															.id
+														res.result[0].stockLogList1 = []
+														res.result[0].stockLogList1.push(data)
+														if (voiceData.wholesalePrice) {
+															res.result[0].wholesalePrice =
+																voiceData
+																.wholesalePrice
+															res.result[0].unitPrice = voiceData
+																.wholesalePrice
+															res.result[0].discountAmount =
+																voiceData
+																.wholesalePrice
+															res.result[0].returnPrice =
+																voiceData
+																.wholesalePrice
+														}
+														if (!res.result[0].productCount) {
+															res.result[0].productCount = ''
+														}
+														if (res.result[0].productCount == '') {
+															if (voiceData.productCount < 0) {
+																res.result[0].returnCount =
+																	voiceData
+																	.productCount[0]
+																res.result[0].returnPrice = res
+																	.result[
+																		0].wholesalePrice
+															} else {
+																res.result[0].productCount =
+																	voiceData
+																	.productCount
+															}
+
+														}
+														let purchaseDetails = res.result
+
+														let id = this.oneGoodsId
+														if (purchaseDetails.length > 0) {
+															this.carList1 = purchaseDetails
+															this.$nextTick(() => {
+																this.AiHandleData()
+															})
+
+														} else {
+															this.tui.toast(
+																"抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确"
+																)
+														}
+													}, 500 * i)
+												} else {
+													this.tui.toast(res1.message)
+												}
+											}).catch((res) => {})
+
+
+										} else {
+											this.voiceText = ''
+											this.voiceText1 = ''
+											this.$refs.popup.close()
+											console.log('voiceData3070', voiceData)
+											if (voiceData.productCount) {
+												let regexZCount = /\d+/g;
+												voiceData.productCount = voiceData.productCount[0].match(
+													regexZCount);
+											}
+											if (voiceData.wholesalePrice) {
+												voiceData.wholesalePrice = this.replaceCharAfterNumber(
+													voiceData.wholesalePrice, '块', '.')
+												voiceData.wholesalePrice = this.replaceCharAfterNumber(
+													voiceData.wholesalePrice, '元', '')
+												voiceData.wholesalePrice = voiceData.wholesalePrice.replace(
+													/[^0-9.]/g, "");
+											}
+											if (voiceData.wholesalePrice1) {
+												voiceData.wholesalePrice1 = this.replaceCharAfterNumber(
+													voiceData.wholesalePrice1, '块', '.')
+												voiceData.wholesalePrice1 = this.replaceCharAfterNumber(
+													voiceData.wholesalePrice1, '元', '')
+												voiceData.wholesalePrice = voiceData.wholesalePrice1.replace(
+													/[^0-9.]/g, "");
+											}
+											let data = {
+												id: voiceData.productSn,
+												productId: voiceData.productSn,
+												productCount: voiceData.productCount[0] || 0,
+												productName: voiceData.productName,
+												productSn: voiceData.productSn,
+												isNew: true,
+												categoryId: this.fenleiList.categoryId,
+												categoryName: this.fenleiList.categoryName,
+												unitPrice: voiceData.wholesalePrice || 0,
+												discountAmount: voiceData.wholesalePrice || 0,
+												wholesalePrice: voiceData.wholesalePrice || 0,
+												stockLogList1: [{
+													attributeList: '{"颜色":"均色","尺码":"均码"}',
+													productCount: Number(voiceData.productCount[
+														0]),
+													stockCount: null
+												}]
+											}
+											console.log(data)
+											let purchaseDetails = []
+											purchaseDetails.push(data)
+
+											setTimeout(ress => {
+												if (purchaseDetails.length > 0) {
+													this.carList1 = purchaseDetails
+													this.$nextTick(() => {
+														this.AiHandleData()
+													})
+
+												} else {
+													this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+												}
+											}, 300 * i)
+
+										}
+									}
+								})
+							}
+						}
+
+					} catch (e) {
+						this.tui.request("/app/sale/buyAi", "POST", {
+							aiMsg: this.getMsg
+						}, false, true).then((res) => {
+							if (res.code == 200) {
+								this.voiceText = ''
+								this.voiceText1 = ''
+								this.$refs.popup.close()
+								this.aiNotRecognition = res.result.aiNotRecognition
+								// if (this.isInventory == true) {
+								let newData = []
+
+								for (let i = 0; i < res.result.data.length; i++) {
+									let newList = []
+									if (res.result.data[i].productId == null) {
+										res.result.data[i].isNew = true
+										res.result.data[i].productId = res.result.data[i].productSn || res
+											.result
+											.data[i].productName
+									} else {
+										res.result.data[i].isNew = false
+									}
+									// res.result.data[i].productCount = 0
+									if (res.result.data[i].stockLogList1.length > 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 {
+										let data = {
+											attributeList: '{"颜色":"均色","尺码":"均码"}',
+											name: '均色 | 均码',
+											productCount: 0,
+											productNum: null
+										}
+										newList.push(data)
+									}
+
+
+									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 (res.result.aiNotRecognition != '') {
+									this.$refs.AiNoPopup.open()
+								}
+								this.$nextTick(() => {
+									this.AiHandleData()
+								})
+							} else {
+								this.tui.toast("抱歉：小助手对" + this.getMsg + "的部分商品未识别，请检查识别信息是否正确")
+							}
+						}).catch((res) => {
+							this.tui.toast(res)
+						})
 					}
-				}).catch((res) => {
-					this.tui.toast(res)
-				})
-			},
-			//编辑挂单信息
-			async setOneDetail(e) {
-				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, '数量')
-				}
-				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)
-				}
-				if (convertedStr.startsWith("号")) {
-					convertedStr = "货号" + convertedStr.substr(1);
-				}
-				this.getMsg = convertedStr
-				await 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
-							let id = this.oneGoodsId
-							if(purchaseDetails.length > 0){
-								if(this.carList.get(id).productName == ''){
-									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
-									}
-								})
-								if(isTrue){
-									this.carList.get(id).productSn = ''
-									this.carList.get(id).productName = ''
-									this.$forceUpdate()
-									this.tui.toast('该货号被页面其他商品占用,请重新输入！')
-									return
-								}
-								this.$nextTick(()=>{
-									if(isTrue == false && this.carList.get(id).productSn == ''){
-										this.carList.get(id).productSn = purchaseDetails[0].productSn
-									}
-									if(isTrue == false){
-										if (purchaseDetails[0].productId) {
-											
-											this.carList.get(id).id = purchaseDetails[0].productId
-											this.carList.get(id).productId = purchaseDetails[0].productId
-											this.carList.get(id).isNew = false
-											id = purchaseDetails[0].productId
-										} else if (purchaseDetails[0].productSn == '' || purchaseDetails[0].productSn ==
-											null) {
-											this.carList.get(id).id = purchaseDetails[0].productName
-											id = purchaseDetails[0].productName
-										} else if (purchaseDetails[0].productSn == '货号') {
-											this.carList.get(id).productSn = purchaseDetails[0].productName
-											this.carList.get(id).id = purchaseDetails[0].productName
-											id = purchaseDetails[0].productName
-										}else if (purchaseDetails[0].productSn) {
-											
-											this.carList.get(id).id = purchaseDetails[0].productSn
-											id = purchaseDetails[0].productSn
-										}
-									}
-									this.$forceUpdate()
-								})
-								// if(this.carList.get(id).purchasePrice == '' || this.carList.get(id).purchasePrice == 0){
-									if(this.carList.get(id).purchasePrice == '' || this.carList.get(id).purchasePrice == null && purchaseDetails[0].productId != null){
-										this.carList.get(id).purchasePrice = purchaseDetails[0].purchasePrice
-									}
-									if(this.carList.get(id).productPicture == '' || this.carList.get(id).productPicture == null && purchaseDetails[0].productId != null){
-										this.carList.get(id).productPicture = purchaseDetails[0].productPicture
-									}
-									if(purchaseDetails[0].productId){
-										this.carList.get(id).wholesalePrice = purchaseDetails[0].wholesalePrice
-										this.carList.get(id).lsPrice = purchaseDetails[0].lsPrice
-									}else{
-										this.carList.get(id).wholesalePrice = purchaseDetails[0].purchasePrice
-										this.carList.get(id).unitPrice = purchaseDetails[0].purchasePrice
-										this.carList.get(id).discountAmount = purchaseDetails[0].purchasePrice
-									}
-								
-								let specMap = new Map() //新的临时存放值那个更改过的值的map
-								this.$nextTick(()=>{
-									this.carList.forEach(function(value, key) {
-										if(key != value.id){
-											specMap.set(value.id,value)
-										}else{
-											specMap.set(key,value)
-										}
-									})
-									this.carList = specMap
-								})
-								this.$nextTick(()=>{
-									for(let i=0;i<purchaseDetails[0].stockLogList1.length;i++){
-										purchaseDetails[0].stockLogList1[i].name = this.sliceMsg(purchaseDetails[0].stockLogList1[i].attributeList)
-										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 += 
-												Number(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 += Number(purchaseDetails[0].stockLogList1[i].productCount)
-										if(this.carList.get(id).stockLogList.get('{"颜色":"均色","尺码":"均码"}').productCount == 0 &&purchaseDetails[0].stockLogList1.length > 0){
-											this.carList.get(id).stockLogList.delete('{"颜色":"均色","尺码":"均码"}')
-										}
-									}
-									this.carList.get(id).price = this.carList.get(id).productCount * this.carList.get(id).discountAmount
-								})
-								this.$nextTick(()=>{
-									this.getAllPrice()
-									this.oneGoodsId = ''
-								})
-							}else{
-								this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
-							}
-						
-					} else {
-						uni.showModal({
-							title: "提示",
-							content: "抱歉：小助手对" + this.getMsg + "的部分商品未识别，请检查识别信息是否正确",
-							success: function(res) {}
-						})
-					}
-				}).catch((res) => {
-					this.tui.toast(res)
-				})
+				} else {
+					this.tui.request("/app/sale/buyAi", "POST", {
+						aiMsg: this.getMsg
+					}, false, true).then((res) => {
+						if (res.code == 200) {
+							this.voiceText = ''
+							this.voiceText1 = ''
+							this.$refs.popup.close()
+							this.aiNotRecognition = res.result.aiNotRecognition
+							// if (this.isInventory == true) {
+							let newData = []
+
+							for (let i = 0; i < res.result.data.length; i++) {
+								let newList = []
+								if (res.result.data[i].productId == null) {
+									res.result.data[i].isNew = true
+									res.result.data[i].productId = res.result.data[i].productSn || res.result
+										.data[
+											i].productName
+								} else {
+									res.result.data[i].isNew = false
+								}
+								// res.result.data[i].productCount = 0
+								if (res.result.data[i].stockLogList1.length > 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 {
+									let data = {
+										attributeList: '{"颜色":"均色","尺码":"均码"}',
+										name: '均色 | 均码',
+										productCount: 0,
+										productNum: null
+									}
+									newList.push(data)
+								}
+
+
+								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 (res.result.aiNotRecognition != '') {
+								this.$refs.AiNoPopup.open()
+							}
+							this.$nextTick(() => {
+								this.AiHandleData()
+							})
+						} else {
+							this.tui.toast("抱歉：小助手对" + this.getMsg + "的部分商品未识别，请检查识别信息是否正确")
+						}
+					}).catch((res) => {
+						this.tui.toast(res)
+					})
+				}
 			},
-			delDefaultCate(index,value,index1){
+			//去掉空格和换行
+			trimWhitespace(str) {
+				return str.replace(/\s+/g, '');
+			},
+			//编辑挂单信息
+			async setOneDetail(e) {
+				let that = this;
+				if (this.voiceText == '') {
+					this.tui.toast('识别内容不能为空')
+					return
+				}
+				let convertedStr = this.trimWhitespace(this.voiceText);
+				convertedStr = this.convertChineseToArabic(convertedStr);
+				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, '数量')
+				}
+				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)
+				}
+				if (convertedStr.startsWith("号")) {
+					convertedStr = "货号" + convertedStr.substr(1);
+				}
+				this.getMsg = convertedStr
+				let regexCount = /-?\d+/g;
+				if (this.isQuantityFollowsProductCode(convertedStr) || (convertedStr.indexOf('色') == -1 && convertedStr
+						.indexOf('码') == -1)) {
+					try {
+						console.log('convertedStr', convertedStr)
+						const regex = /货号.*?(?=货号|$)/g;
+						convertedStr = convertedStr.match(regex);
+						for (let i = 0; i < convertedStr.length; i++) {
+							let voiceData = this.extractInfo(convertedStr[i] + '。')
+							console.log('voiceData', voiceData)
+							if (voiceData.productSn) {
+								voiceData.productSn = voiceData.productSn.replace(/[沟勾钩]/g, 'J');
+							}
+							if (voiceData.productCount) {
+								voiceData.productCount = voiceData.productCount.match(regexCount);
+							}
+							if (voiceData.wholesalePrice) {
+								voiceData.wholesalePrice = this.replaceCharAfterNumber(voiceData.wholesalePrice, '块',
+									'.')
+								voiceData.wholesalePrice = this.replaceCharAfterNumber(
+									voiceData.wholesalePrice, '元', '')
+								voiceData.wholesalePrice = voiceData.wholesalePrice.replace(/[^0-9.]/g, "");
+							}
+							if (voiceData.wholesalePrice1) {
+								voiceData.wholesalePrice1 = this.replaceCharAfterNumber(voiceData.wholesalePrice1, '块',
+									'.')
+								voiceData.wholesalePrice1 = this.replaceCharAfterNumber(
+									voiceData.wholesalePrice1, '元', '')
+								voiceData.wholesalePrice = voiceData.wholesalePrice1.replace(/[^0-9.]/g, "");
+							}
+							this.tui.request('/app/product/getByProductSn', "post", {
+								productSn: voiceData.productSn
+							}, false, true).then((res) => {
+								if (res.code == 200) {
+									if (res.result != '') {
+										this.voiceText = ''
+										this.voiceText1 = ''
+										this.$refs.popup.close();
+										this.tui.request(
+											"/app/productAttribute/selectAttributeAndValueByCategoryId",
+											"POST", {
+												categoryId: res.result[0].attrId
+											}, false, true).then((res1) => {
+											if (res1.code == 200) {
+												let data = {
+													attributeList: '{"颜色":"均色","尺码":"均码"}',
+													productCount: Number(voiceData.productCount),
+													stockCount: null
+												}
+												if (res1.result.stock.length > 0) {
+													for (let i = 0; i < res1.result.stock
+														.length; i++) {
+														if (res1.result.stock[i].attributeList ==
+															'{"颜色":"均色","尺码":"均码"}') {
+															console.log("进来了")
+															data = {
+																attributeList: '{"颜色":"均色","尺码":"均码"}',
+																productCount: Number(voiceData
+																	.productCount),
+																stockCount: res1.result.stock[i]
+																	.stockCount
+															}
+														}
+													}
+												} else {
+
+												}
+
+												setTimeout(ress => {
+													res.result[0].productId = res.result[0].id
+													res.result[0].stockLogList1 = []
+													res.result[0].stockLogList1.push(data)
+													if (voiceData.wholesalePrice) {
+														res.result[0].wholesalePrice =
+															voiceData.wholesalePrice
+													}
+													let purchaseDetails = res.result
+
+													let id = this.oneGoodsId
+													if (purchaseDetails.length > 0) {
+
+														console.log('this.carList', this
+															.carList)
+														if (this.carList.get(id).productSn !=
+															'') {
+															for (let j = 0; j < purchaseDetails
+																.length; j++) {
+																for (let i = 0; i <
+																	purchaseDetails[j]
+																	.stockLogList1.length; i++
+																) {
+																	if (this.carList.get(id)
+																		.productName == '') {
+																		this.carList.get(id)
+																			.productName =
+																			purchaseDetails[0]
+																			.productName
+																	}
+																	if (this.carList.get(id)
+																		.wholesalePrice == ''
+																	) {
+																		this.carList.get(id)
+																			.wholesalePrice =
+																			purchaseDetails[0]
+																			.wholesalePrice
+																	}
+																	if (this.carList.get(id)
+																		.productCount == '') {
+																		if (purchaseDetails[0]
+																			.productCount < 0
+																		) {
+																			this.carList.get(
+																					id)
+																				.returnCount =
+																				purchaseDetails[
+																					0]
+																				.productCount
+																			this.carList.get(
+																					id)
+																				.returnPrice =
+																				purchaseDetails[
+																					0]
+																				.wholesalePrice
+																		} else {
+																			this.carList.get(
+																					id)
+																				.productCount =
+																				purchaseDetails[
+																					0]
+																				.productCount
+																		}
+
+																	}
+																	if (purchaseDetails[0]
+																		.wholesalePrice) {
+																		this.carList.get(id)
+																			.discountAmount =
+																			purchaseDetails[0]
+																			.wholesalePrice
+																	}
+																	if (this.carList.get(id)
+																		.unitPrice == '') {
+																		this.carList.get(id)
+																			.unitPrice =
+																			purchaseDetails[0]
+																			.wholesalePrice
+																	}
+																	if (this.carList.get(id)
+																		.categoryId == '') {
+																		this.carList.get(id)
+																			.categoryId =
+																			purchaseDetails[0]
+																			.categoryId
+																	}
+																	if (this.carList.get(id)
+																		.categoryName == '') {
+																		this.carList.get(id)
+																			.categoryName =
+																			purchaseDetails[0]
+																			.categoryName
+																	}
+																	if (this.carList.get(id)
+																		.attrId == '') {
+																		this.carList.get(id)
+																			.attrId =
+																			purchaseDetails[0]
+																			.attrId
+																	}
+																	if (this.carList.get(id)
+																		.purchasePrice == '' ||
+																		this.carList.get(id)
+																		.purchasePrice == null
+																	) {
+																		this.carList.get(id)
+																			.purchasePrice =
+																			purchaseDetails[0]
+																			.purchasePrice
+																	}
+																	if (this.carList.get(id)
+																		.productPicture == ''
+																	) {
+																		this.carList.get(id)
+																			.productPicture =
+																			purchaseDetails[0]
+																			.productPicture
+																	}
+																	if (this.carList.get(id)
+																		.returnPrice == '') {
+																		this.carList.get(id)
+																			.returnPrice =
+																			purchaseDetails[0]
+																			.wholesalePrice
+																	}
+																	console.log('this.carList',
+																		this.carList)
+																	console.log(
+																		'purchaseDetails3450',
+																		purchaseDetails)
+																	if (this.carList.get(id)
+																		.productId == '') {
+																		this.carList.get(id)
+																			.productId =
+																			purchaseDetails[0]
+																			.id
+																	}
+																	purchaseDetails[j]
+																		.stockLogList1[i]
+																		.name = this.sliceMsg(
+																			purchaseDetails[j]
+																			.stockLogList1[i]
+																			.attributeList)
+																	if (this.carList.get(id)
+																		.stockLogList.size == 0
+																	) {
+																		this.carList.get(id)
+																			.stockLogList.set(
+																				purchaseDetails[
+																					j]
+																				.stockLogList1[
+																					i]
+																				.attributeList,
+																				purchaseDetails[
+																					j]
+																				.stockLogList1[
+																					i])
+																	} else {
+																		if (this.carList.get(
+																				id)
+																			.stockLogList.has(
+																				purchaseDetails[
+																					j]
+																				.stockLogList1[
+																					i]
+																				.attributeList
+																			) == true) {
+																			this.carList.get(
+																					id)
+																				.stockLogList
+																				.get(
+																					purchaseDetails[
+																						j]
+																					.stockLogList1[
+																						i]
+																					.attributeList
+																				)
+																				.productCount +=
+																				purchaseDetails[
+																					j]
+																				.stockLogList1[
+																					i]
+																				.productCount
+																		} else {
+																			this.carList.get(
+																					id)
+																				.stockLogList
+																				.set(
+																					purchaseDetails[
+																						j]
+																					.stockLogList1[
+																						i]
+																					.attributeList,
+																					purchaseDetails[
+																						j]
+																					.stockLogList1[
+																						i])
+																		}
+																	}
+																	this.carList.get(id)
+																		.productCount +=
+																		purchaseDetails[j]
+																		.stockLogList1[i]
+																		.productCount
+																}
+															}
+															if (this.carList.get(id)
+																.stockLogList.get(
+																	'{"颜色":"均色","尺码":"均码"}')
+																.productCount == 0 &&
+																purchaseDetails[0]
+																.stockLogList1.length > 0) {
+																this.carList.get(id)
+																	.stockLogList.delete(
+																		'{"颜色":"均色","尺码":"均码"}'
+																	)
+															}
+															this.carList.get(id).price = this
+																.carList.get(id).productCount *
+																this.carList.get(id)
+																.wholesalePrice
+														} else {
+
+															let isTrue = false
+															this.carList.forEach(function(
+																value, key) {
+																if (value.productSn ==
+																	purchaseDetails[0]
+																	.productSn) {
+																	isTrue = true
+																	that.tui.toast(
+																		'该货号被页面其他商品占用,请重新输入！'
+																	)
+																	that.carList.get(
+																			id)
+																		.productSn = ''
+																	setTimeout(res => {
+																		that.$forceUpdate()
+																	}, 2000)
+																	throw Error('被占用')
+																}
+															})
+
+															this.$nextTick(() => {
+																if (this.carList.get(
+																		id)
+																	.productName == ''
+																) {
+																	this.carList.get(
+																			id)
+																		.productName =
+																		purchaseDetails[
+																			0]
+																		.productName
+																}
+																if (isTrue == false &&
+																	this.carList.get(
+																		id)
+																	.productSn == '') {
+																	this.carList.get(
+																			id)
+																		.productSn =
+																		purchaseDetails[
+																			0]
+																		.productSn
+																}
+																if (isTrue == false) {
+																	if (purchaseDetails[
+																			0]
+																		.productId) {
+																		this.carList
+																			.get(id)
+																			.id =
+																			purchaseDetails[
+																				0]
+																			.productId
+																		this.carList
+																			.get(id)
+																			.isNew =
+																			false
+																		id = purchaseDetails[
+																				0]
+																			.productId
+																	} else if (
+																		purchaseDetails[
+																			0]
+																		.productSn ==
+																		'' ||
+																		purchaseDetails[
+																			0]
+																		.productSn ==
+																		null) {
+																		this.carList
+																			.get(id)
+																			.id =
+																			purchaseDetails[
+																				0]
+																			.productName
+																		id = purchaseDetails[
+																				0]
+																			.productName
+																	} else if (
+																		purchaseDetails[
+																			0]
+																		.productSn ==
+																		'货号') {
+																		this.carList
+																			.get(id)
+																			.productSn =
+																			purchaseDetails[
+																				0]
+																			.productName
+																		this.carList
+																			.get(id)
+																			.id =
+																			purchaseDetails[
+																				0]
+																			.productName
+																		id = purchaseDetails[
+																				0]
+																			.productName
+																	} else if (
+																		purchaseDetails[
+																			0]
+																		.productSn) {
+																		this.carList
+																			.get(id)
+																			.id =
+																			purchaseDetails[
+																				0]
+																			.productSn
+																		id = purchaseDetails[
+																				0]
+																			.productSn
+																	}
+																}
+																this.$forceUpdate()
+															})
+															if (this.carList.get(id)
+																.purchasePrice == '' || this
+																.carList.get(id)
+																.purchasePrice == null) {
+																this.carList.get(id)
+																	.purchasePrice =
+																	purchaseDetails[0]
+																	.purchasePrice
+															}
+															if (this.carList.get(id)
+																.productPicture == '') {
+																this.carList.get(id)
+																	.productPicture =
+																	purchaseDetails[0]
+																	.productPicture
+															}
+															if (this.carList.get(id)
+																.productId == '') {
+																this.carList.get(id)
+																	.productId =
+																	purchaseDetails[0].id
+															}
+															if (this.carList.get(id)
+																.returnPrice == '') {
+																this.carList.get(id)
+																	.returnPrice =
+																	purchaseDetails[0]
+																	.wholesalePrice
+															}
+															this.carList.get(id).returnCount =
+																0
+															this.carList.get(id).productCount =
+																0
+															if (purchaseDetails[0].productId) {
+																this.carList.get(id).attrId =
+																	purchaseDetails[0].attrId
+																this.carList.get(id)
+																	.wholesalePrice =
+																	purchaseDetails[0]
+																	.wholesalePrice
+																this.carList.get(id)
+																	.discountAmount =
+																	purchaseDetails[0]
+																	.wholesalePrice
+																this.carList.get(id).lsPrice =
+																	purchaseDetails[0].price
+																this.carList.get(id).price =
+																	purchaseDetails[0]
+																	.wholesalePrice * this
+																	.carList.get(id)
+																	.productCount
+
+															} else {
+																this.carList.get(id)
+																	.productId =
+																	purchaseDetails[0].id
+																this.carList.get(id)
+																	.wholesalePrice =
+																	purchaseDetails[0]
+																	.wholesalePrice
+																this.carList.get(id)
+																	.discountAmount =
+																	purchaseDetails[0]
+																	.wholesalePrice
+																this.carList.get(id).lsPrice =
+																	purchaseDetails[0].price
+																this.carList.get(id).price =
+																	purchaseDetails[0]
+																	.wholesalePrice * this
+																	.carList.get(id)
+																	.productCount
+															}
+
+															let specMap =
+																new Map() //新的临时存放值那个更改过的值的map
+															this.$nextTick(() => {
+																this.carList.forEach(
+																	function(value,
+																		key) {
+																		if (key !=
+																			value
+																			.id) {
+																			specMap
+																				.set(
+																					value
+																					.id,
+																					value
+																				)
+																		} else {
+																			specMap
+																				.set(
+																					key,
+																					value
+																				)
+																		}
+																	})
+																this.carList = specMap
+															})
+															this.$nextTick(() => {
+																for (let j = 0; j <
+																	purchaseDetails
+																	.length; j++) {
+																	for (let i = 0; i <
+																		purchaseDetails[
+																			j]
+																		.stockLogList1
+																		.length; i++) {
+																		purchaseDetails
+																			[j]
+																			.stockLogList1[
+																				i]
+																			.name =
+																			this
+																			.sliceMsg(
+																				purchaseDetails[
+																					j]
+																				.stockLogList1[
+																					i]
+																				.attributeList
+																			)
+																		if (this
+																			.carList
+																			.get(id)
+																			.stockLogList
+																			.size == 0
+																		) {
+																			this.carList
+																				.get(
+																					id)
+																				.stockLogList
+																				.set(
+																					purchaseDetails[
+																						j
+																					]
+																					.stockLogList1[
+																						i
+																					]
+																					.attributeList,
+																					purchaseDetails[
+																						j
+																					]
+																					.stockLogList1[
+																						i
+																					]
+																				)
+																		} else {
+																			if (this
+																				.carList
+																				.get(
+																					id)
+																				.stockLogList
+																				.has(
+																					purchaseDetails[
+																						j
+																					]
+																					.stockLogList1[
+																						i
+																					]
+																					.attributeList
+																				) ==
+																				true) {
+																				this.carList
+																					.get(
+																						id
+																					)
+																					.stockLogList
+																					.get(
+																						purchaseDetails[
+																							j
+																						]
+																						.stockLogList1[
+																							i
+																						]
+																						.attributeList
+																					)
+																					.productCount +=
+																					purchaseDetails[
+																						j
+																					]
+																					.stockLogList1[
+																						i
+																					]
+																					.productCount
+																				this.carList
+																					.get(
+																						id
+																					)
+																					.stockLogList
+																					.get(
+																						purchaseDetails[
+																							j
+																						]
+																						.stockLogList1[
+																							i
+																						]
+																						.attributeList
+																					)
+																					.productNum =
+																					purchaseDetails[
+																						j
+																					]
+																					.stockLogList1[
+																						i
+																					]
+																					.stockCount
+																			} else {
+																				this.carList
+																					.get(
+																						id
+																					)
+																					.stockLogList
+																					.set(
+																						purchaseDetails[
+																							j
+																						]
+																						.stockLogList1[
+																							i
+																						]
+																						.attributeList,
+																						purchaseDetails[
+																							j
+																						]
+																						.stockLogList1[
+																							i
+																						]
+																					)
+																			}
+																		}
+																		if (purchaseDetails[
+																				j]
+																			.stockLogList1[
+																				i]
+																			.productCount <
+																			0) {
+																			this.carList
+																				.get(
+																					id)
+																				.returnCount +=
+																				Math
+																				.abs(
+																					purchaseDetails[
+																						j
+																					]
+																					.stockLogList1[
+																						i
+																					]
+																					.productCount
+																				)
+																		} else {
+																			this.carList
+																				.get(
+																					id)
+																				.productCount +=
+																				purchaseDetails[
+																					j]
+																				.stockLogList1[
+																					i]
+																				.productCount
+																		}
+
+																	}
+																}
+																this.carList.get(id)
+																	.price = this
+																	.carList.get(id)
+																	.productCount *
+																	this.carList.get(
+																		id)
+																	.wholesalePrice
+																if (this.carList.get(
+																		id)
+																	.stockLogList.get(
+																		'{"颜色":"均色","尺码":"均码"}'
+																	)
+																	.productCount ==
+																	0 &&
+																	purchaseDetails[0]
+																	.stockLogList1
+																	.length > 0) {
+																	this.carList.get(
+																			id)
+																		.stockLogList
+																		.delete(
+																			'{"颜色":"均色","尺码":"均码"}'
+																		)
+																}
+															})
+														}
+
+														this.$nextTick(() => {
+															this.getAllPrice()
+															this.oneGoodsId = ''
+														})
+													} else {
+														this.tui.toast(
+															"抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+													}
+												}, 500)
+											} else {
+												this.tui.toast(res1.message)
+											}
+										}).catch((res) => {})
+
+
+									} else {
+										this.voiceText = ''
+										this.voiceText1 = ''
+										this.$refs.popup.close()
+										console.log('voiceData3070', voiceData)
+										if (voiceData.productCount) {
+											let regexZCount = /\d+/g;
+											voiceData.productCount = voiceData.productCount[0].match(
+												regexZCount);
+										}
+										if (voiceData.wholesalePrice) {
+											voiceData.wholesalePrice = this.replaceCharAfterNumber(voiceData
+												.wholesalePrice, '块', '.')
+											this.voiceData.wholesalePrice = this.replaceCharAfterNumber(this
+												.voiceData.wholesalePrice, '元', '')
+											voiceData.wholesalePrice = voiceData.wholesalePrice.replace(
+												/[^0-9.]/g, "");
+										}
+										if (voiceData.wholesalePrice1) {
+											voiceData.wholesalePrice1 = this.replaceCharAfterNumber(voiceData
+												.wholesalePrice1, '块', '.')
+											voiceData.wholesalePrice1 = this.replaceCharAfterNumber(
+												voiceData.wholesalePrice1, '元', '')
+											voiceData.wholesalePrice = voiceData.wholesalePrice1.replace(
+												/[^0-9.]/g, "");
+										}
+										let data = {
+											id: voiceData.productSn,
+											productCount: voiceData.productCount || 0,
+											productName: voiceData.productName,
+											productSn: voiceData.productSn,
+											categoryId: this.fenleiList.categoryId,
+											categoryName: this.fenleiList.categoryName,
+											unitPrice: voiceData.wholesalePrice || 0,
+											discountAmount: voiceData.wholesalePrice || 0,
+											wholesalePrice: voiceData.wholesalePrice || 0,
+											stockLogList1: [{
+												attributeList: '{"颜色":"均色","尺码":"均码"}',
+												productCount: Number(voiceData.productCount),
+												stockCount: null
+											}]
+										}
+										console.log(data)
+										let purchaseDetails = []
+										purchaseDetails.push(data)
+										let id = this.oneGoodsId
+										if (purchaseDetails.length > 0) {
+											if (this.carList.get(id).productSn != '') {
+												for (let j = 0; j < purchaseDetails.length; j++) {
+													for (let i = 0; i < purchaseDetails[j].stockLogList1
+														.length; i++) {
+														if (this.carList.get(id).productName == '') {
+															this.carList.get(id).productName = purchaseDetails[
+																0].productName
+														}
+														if (this.carList.get(id).attrId == '') {
+															this.carList.get(id).attrId = purchaseDetails[0]
+																.attrId
+														}
+														if (this.carList.get(id).purchasePrice == '' || this
+															.carList.get(id).purchasePrice == null) {
+															this.carList.get(id).purchasePrice =
+																purchaseDetails[0].purchasePrice
+														}
+														if (this.carList.get(id).returnPrice == '') {
+															this.carList.get(id).returnPrice = purchaseDetails[
+																0].wholesalePrice
+														}
+														if (this.carList.get(id).productPicture == '') {
+															this.carList.get(id).productPicture =
+																purchaseDetails[0].productPicture
+														}
+														if (this.carList.get(id).wholesalePrice == '') {
+															this.carList.get(id).wholesalePrice =
+																purchaseDetails[0].wholesalePrice
+														}
+														if (this.carList.get(id).productCount == '') {
+															this.carList.get(id).productCount =
+																purchaseDetails[0].productCount
+														}
+														if (this.carList.get(id).discountAmount == '') {
+															this.carList.get(id).discountAmount =
+																purchaseDetails[0].wholesalePrice
+														}
+														if (this.carList.get(id).unitPrice == '') {
+															this.carList.get(id).unitPrice = purchaseDetails[0]
+																.wholesalePrice
+														}
+														if (this.carList.get(id).categoryId == '') {
+															this.carList.get(id).categoryId = purchaseDetails[
+																0].categoryId
+														}
+														if (this.carList.get(id).categoryName == '') {
+															this.carList.get(id).categoryName =
+																purchaseDetails[0].categoryName
+														}
+														purchaseDetails[j].stockLogList1[i].name = this
+															.sliceMsg(purchaseDetails[j].stockLogList1[i]
+																.attributeList)
+														if (this.carList.get(id).stockLogList.size == 0) {
+															this.carList.get(id).stockLogList.set(
+																purchaseDetails[j].stockLogList1[i]
+																.attributeList, purchaseDetails[j]
+																.stockLogList1[i])
+														} else {
+															if (this.carList.get(id).stockLogList.has(
+																	purchaseDetails[j].stockLogList1[i]
+																	.attributeList) == true) {
+																this.carList.get(id).stockLogList.get(
+																		purchaseDetails[j].stockLogList1[i]
+																		.attributeList).productCount +=
+																	purchaseDetails[j].stockLogList1[i]
+																	.productCount
+															} else {
+																this.carList.get(id).stockLogList.set(
+																	purchaseDetails[j].stockLogList1[i]
+																	.attributeList, purchaseDetails[j]
+																	.stockLogList1[i])
+															}
+														}
+														this.carList.get(id).productCount += purchaseDetails[j]
+															.stockLogList1[i].productCount
+													}
+												}
+												if (this.carList.get(id).stockLogList.get(
+														'{"颜色":"均色","尺码":"均码"}').productCount == 0 &&
+													purchaseDetails[0].stockLogList1.length > 0) {
+													this.carList.get(id).stockLogList.delete(
+														'{"颜色":"均色","尺码":"均码"}')
+												}
+												this.carList.get(id).price = this.carList.get(id)
+													.productCount * this.carList.get(id).wholesalePrice
+											} else {
+
+												let isTrue = false
+												this.carList.forEach(function(value, key) {
+													if (value.productSn == purchaseDetails[0]
+														.productSn) {
+														isTrue = true
+														that.tui.toast('该货号被页面其他商品占用,请重新输入！')
+														that.carList.get(id).productSn = ''
+														setTimeout(res => {
+															that.$forceUpdate()
+														}, 2000)
+														throw Error('被占用')
+													}
+												})
+
+												this.$nextTick(() => {
+													if (this.carList.get(id).productName == '') {
+														this.carList.get(id).productName =
+															purchaseDetails[0].productName
+													}
+													if (isTrue == false && this.carList.get(id)
+														.productSn == '') {
+														this.carList.get(id).productSn =
+															purchaseDetails[0].productSn
+													}
+													if (isTrue == false) {
+														if (purchaseDetails[0].productId) {
+															this.carList.get(id).id = purchaseDetails[
+																0].productId
+															this.carList.get(id).isNew = false
+															id = purchaseDetails[0].productId
+														} else if (purchaseDetails[0].productSn ==
+															'' || purchaseDetails[0].productSn ==
+															null) {
+															this.carList.get(id).id = purchaseDetails[
+																0].productName
+															id = purchaseDetails[0].productName
+														} else if (purchaseDetails[0].productSn ==
+															'货号') {
+															this.carList.get(id).productSn =
+																purchaseDetails[0].productName
+															this.carList.get(id).id = purchaseDetails[
+																0].productName
+															id = purchaseDetails[0].productName
+														} else if (purchaseDetails[0].productSn) {
+															this.carList.get(id).id = purchaseDetails[
+																0].productSn
+															id = purchaseDetails[0].productSn
+														}
+													}
+													this.$forceUpdate()
+												})
+												if (this.carList.get(id).purchasePrice == '' || this.carList
+													.get(id).purchasePrice == null) {
+													this.carList.get(id).purchasePrice = purchaseDetails[0]
+														.purchasePrice
+												}
+												if (this.carList.get(id).productPicture == '') {
+													this.carList.get(id).productPicture = purchaseDetails[0]
+														.productPicture
+												}
+												if (this.carList.get(id).returnPrice == '') {
+													this.carList.get(id).returnPrice = purchaseDetails[0]
+														.wholesalePrice
+												}
+												if (purchaseDetails[0].productId) {
+													this.carList.get(id).attrId = purchaseDetails[0].attrId
+
+													this.carList.get(id).lsPrice = purchaseDetails[0].lsPrice
+												}
+												this.carList.get(id).wholesalePrice = purchaseDetails[0]
+													.wholesalePrice
+												this.carList.get(id).discountAmount = purchaseDetails[0]
+													.wholesalePrice
+												this.carList.get(id).unitPrice = purchaseDetails[0]
+													.wholesalePrice
+												this.carList.get(id).lsPrice = purchaseDetails[0].price
+												this.carList.get(id).price = purchaseDetails[0]
+													.wholesalePrice * purchaseDetails[0].productCount
+												let specMap = new Map() //新的临时存放值那个更改过的值的map
+												this.$nextTick(() => {
+													this.carList.forEach(function(value, key) {
+														if (key != value.id) {
+															specMap.set(value.id, value)
+														} else {
+															specMap.set(key, value)
+														}
+													})
+													this.carList = specMap
+												})
+												this.$nextTick(() => {
+													for (let j = 0; j < purchaseDetails.length; j++) {
+														for (let i = 0; i < purchaseDetails[j]
+															.stockLogList1.length; i++) {
+															purchaseDetails[j].stockLogList1[i].name =
+																this.sliceMsg(purchaseDetails[j]
+																	.stockLogList1[i].attributeList)
+															if (this.carList.get(id).stockLogList
+																.size == 0) {
+																this.carList.get(id).stockLogList.set(
+																	purchaseDetails[j]
+																	.stockLogList1[i]
+																	.attributeList,
+																	purchaseDetails[j]
+																	.stockLogList1[i])
+															} else {
+																if (this.carList.get(id).stockLogList
+																	.has(purchaseDetails[j]
+																		.stockLogList1[i].attributeList
+																	) == true) {
+																	this.carList.get(id).stockLogList
+																		.get(purchaseDetails[j]
+																			.stockLogList1[i]
+																			.attributeList)
+																		.productCount +=
+																		purchaseDetails[j]
+																		.stockLogList1[i].productCount
+																} else {
+																	this.carList.get(id).stockLogList
+																		.set(purchaseDetails[j]
+																			.stockLogList1[i]
+																			.attributeList,
+																			purchaseDetails[j]
+																			.stockLogList1[i])
+																}
+															}
+															this.carList.get(id).productCount +=
+																purchaseDetails[j].stockLogList1[i]
+																.productCount
+														}
+													}
+													this.carList.get(id).price = this.carList.get(id)
+														.productCount * this.carList.get(id)
+														.wholesalePrice
+													if (this.carList.get(id).stockLogList.get(
+															'{"颜色":"均色","尺码":"均码"}').productCount ==
+														0 && purchaseDetails[0].stockLogList1.length >
+														0) {
+														this.carList.get(id).stockLogList.delete(
+															'{"颜色":"均色","尺码":"均码"}')
+													}
+												})
+											}
+
+											this.$nextTick(() => {
+												this.getAllPrice()
+												this.oneGoodsId = ''
+											})
+										} else {
+											this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+										}
+
+									}
+								}
+							})
+						}
+
+					} catch (e) {
+						await this.tui.request("/purchaseOcrPicture/callWithMessageOfPurchase", "POST", {
+							questionMsg: this.getMsg
+						}, false, true).then((res) => {
+							if (res.code == 200) {
+								this.voiceText = ''
+								this.voiceText1 = ''
+								this.$refs.popup.close()
+								let purchaseDetails = res.result.data.purchaseDetails
+								let id = this.oneGoodsId
+								if (purchaseDetails.length > 0) {
+									if (this.carList.get(id).productName == '') {
+										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
+										}
+									})
+									if (isTrue) {
+										this.carList.get(id).productSn = ''
+										this.carList.get(id).productName = ''
+										this.$forceUpdate()
+										this.tui.toast('该货号被页面其他商品占用,请重新输入！')
+										return
+									}
+									this.$nextTick(() => {
+										if (isTrue == false && this.carList.get(id).productSn == '') {
+											this.carList.get(id).productSn = purchaseDetails[0]
+												.productSn
+										}
+										if (isTrue == false) {
+											if (purchaseDetails[0].productId) {
+
+												this.carList.get(id).id = purchaseDetails[0].productId
+												this.carList.get(id).productId = purchaseDetails[0]
+													.productId
+												this.carList.get(id).isNew = false
+												id = purchaseDetails[0].productId
+											} else if (purchaseDetails[0].productSn == '' ||
+												purchaseDetails[0].productSn ==
+												null) {
+												this.carList.get(id).id = purchaseDetails[0]
+													.productName
+												id = purchaseDetails[0].productName
+											} else if (purchaseDetails[0].productSn == '货号') {
+												this.carList.get(id).productSn = purchaseDetails[0]
+													.productName
+												this.carList.get(id).id = purchaseDetails[0]
+													.productName
+												id = purchaseDetails[0].productName
+											} else if (purchaseDetails[0].productSn) {
+
+												this.carList.get(id).id = purchaseDetails[0].productSn
+												id = purchaseDetails[0].productSn
+											}
+										}
+										this.$forceUpdate()
+									})
+									// if(this.carList.get(id).purchasePrice == '' || this.carList.get(id).purchasePrice == 0){
+									if (this.carList.get(id).purchasePrice == '' || this.carList.get(id)
+										.purchasePrice == null && purchaseDetails[0].productId != null) {
+										this.carList.get(id).purchasePrice = purchaseDetails[0].purchasePrice
+									}
+									if (this.carList.get(id).productPicture == '' || this.carList.get(id)
+										.productPicture == null && purchaseDetails[0].productId != null) {
+										this.carList.get(id).productPicture = purchaseDetails[0].productPicture
+									}
+									if (purchaseDetails[0].productId) {
+										this.carList.get(id).wholesalePrice = purchaseDetails[0].wholesalePrice
+										this.carList.get(id).lsPrice = purchaseDetails[0].lsPrice
+									} else {
+										this.carList.get(id).wholesalePrice = purchaseDetails[0].wholesalePrice
+										this.carList.get(id).unitPrice = purchaseDetails[0].wholesalePrice
+										this.carList.get(id).discountAmount = purchaseDetails[0].wholesalePrice
+									}
+
+									let specMap = new Map() //新的临时存放值那个更改过的值的map
+									this.$nextTick(() => {
+										this.carList.forEach(function(value, key) {
+											if (key != value.id) {
+												specMap.set(value.id, value)
+											} else {
+												specMap.set(key, value)
+											}
+										})
+										this.carList = specMap
+									})
+									this.$nextTick(() => {
+										for (let i = 0; i < purchaseDetails[0].stockLogList1
+											.length; i++) {
+											purchaseDetails[0].stockLogList1[i].name = this.sliceMsg(
+												purchaseDetails[0].stockLogList1[i].attributeList)
+											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 +=
+														Number(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 += Number(
+												purchaseDetails[0].stockLogList1[i].productCount)
+											if (this.carList.get(id).stockLogList.get(
+													'{"颜色":"均色","尺码":"均码"}').productCount == 0 &&
+												purchaseDetails[0].stockLogList1.length > 0) {
+												this.carList.get(id).stockLogList.delete(
+													'{"颜色":"均色","尺码":"均码"}')
+											}
+										}
+										this.carList.get(id).price = this.carList.get(id)
+											.productCount * this.carList.get(id).discountAmount
+									})
+									this.$nextTick(() => {
+										this.getAllPrice()
+										this.oneGoodsId = ''
+									})
+								} else {
+									this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+								}
+
+							} else {
+								uni.showModal({
+									title: "提示",
+									content: "抱歉：小助手对" + this.getMsg + "的部分商品未识别，请检查识别信息是否正确",
+									success: function(res) {}
+								})
+							}
+						}).catch((res) => {
+							this.tui.toast(res)
+						})
+					}
+				} else {
+					await this.tui.request("/purchaseOcrPicture/callWithMessageOfPurchase", "POST", {
+						questionMsg: this.getMsg
+					}, false, true).then((res) => {
+						if (res.code == 200) {
+							this.voiceText = ''
+							this.voiceText1 = ''
+							this.$refs.popup.close()
+							let purchaseDetails = res.result.data.purchaseDetails
+							let id = this.oneGoodsId
+							if (purchaseDetails.length > 0) {
+								if (this.carList.get(id).productName == '') {
+									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
+									}
+								})
+								if (isTrue) {
+									this.carList.get(id).productSn = ''
+									this.carList.get(id).productName = ''
+									this.$forceUpdate()
+									this.tui.toast('该货号被页面其他商品占用,请重新输入！')
+									return
+								}
+								this.$nextTick(() => {
+									if (isTrue == false && this.carList.get(id).productSn == '') {
+										this.carList.get(id).productSn = purchaseDetails[0].productSn
+									}
+									if (isTrue == false) {
+										if (purchaseDetails[0].productId) {
+
+											this.carList.get(id).id = purchaseDetails[0].productId
+											this.carList.get(id).productId = purchaseDetails[0]
+												.productId
+											this.carList.get(id).isNew = false
+											id = purchaseDetails[0].productId
+										} else if (purchaseDetails[0].productSn == '' ||
+											purchaseDetails[0].productSn ==
+											null) {
+											this.carList.get(id).id = purchaseDetails[0].productName
+											id = purchaseDetails[0].productName
+										} else if (purchaseDetails[0].productSn == '货号') {
+											this.carList.get(id).productSn = purchaseDetails[0]
+												.productName
+											this.carList.get(id).id = purchaseDetails[0].productName
+											id = purchaseDetails[0].productName
+										} else if (purchaseDetails[0].productSn) {
+
+											this.carList.get(id).id = purchaseDetails[0].productSn
+											id = purchaseDetails[0].productSn
+										}
+									}
+									this.$forceUpdate()
+								})
+								// if(this.carList.get(id).purchasePrice == '' || this.carList.get(id).purchasePrice == 0){
+								if (this.carList.get(id).purchasePrice == '' || this.carList.get(id)
+									.purchasePrice == null && purchaseDetails[0].productId != null) {
+									this.carList.get(id).purchasePrice = purchaseDetails[0].purchasePrice
+								}
+								if (this.carList.get(id).productPicture == '' || this.carList.get(id)
+									.productPicture == null && purchaseDetails[0].productId != null) {
+									this.carList.get(id).productPicture = purchaseDetails[0].productPicture
+								}
+								if (purchaseDetails[0].productId) {
+									this.carList.get(id).wholesalePrice = purchaseDetails[0].wholesalePrice
+									this.carList.get(id).lsPrice = purchaseDetails[0].lsPrice
+								} else {
+									this.carList.get(id).wholesalePrice = purchaseDetails[0].wholesalePrice
+									this.carList.get(id).unitPrice = purchaseDetails[0].wholesalePrice
+									this.carList.get(id).discountAmount = purchaseDetails[0].wholesalePrice
+								}
+
+								let specMap = new Map() //新的临时存放值那个更改过的值的map
+								this.$nextTick(() => {
+									this.carList.forEach(function(value, key) {
+										if (key != value.id) {
+											specMap.set(value.id, value)
+										} else {
+											specMap.set(key, value)
+										}
+									})
+									this.carList = specMap
+								})
+								this.$nextTick(() => {
+									for (let i = 0; i < purchaseDetails[0].stockLogList1.length; i++) {
+										purchaseDetails[0].stockLogList1[i].name = this.sliceMsg(
+											purchaseDetails[0].stockLogList1[i].attributeList)
+										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 +=
+													Number(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 += Number(purchaseDetails[0]
+											.stockLogList1[i].productCount)
+										if (this.carList.get(id).stockLogList.get(
+												'{"颜色":"均色","尺码":"均码"}')) {
+											if (this.carList.get(id).stockLogList.get(
+													'{"颜色":"均色","尺码":"均码"}').productCount == 0 &&
+												purchaseDetails[0].stockLogList1.length > 0) {
+												this.carList.get(id).stockLogList.delete(
+													'{"颜色":"均色","尺码":"均码"}')
+											}
+										}
+
+									}
+									this.carList.get(id).price = this.carList.get(id).productCount *
+										this.carList.get(id).discountAmount
+								})
+								this.$nextTick(() => {
+									this.getAllPrice()
+									this.oneGoodsId = ''
+								})
+							} else {
+								this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+							}
+
+						} else {
+							uni.showModal({
+								title: "提示",
+								content: "抱歉：小助手对" + this.getMsg + "的部分商品未识别，请检查识别信息是否正确",
+								success: function(res) {}
+							})
+						}
+					}).catch((res) => {
+						this.tui.toast(res)
+					})
+				}
+			},
+			delDefaultCate(index, value, index1) {
 				let data = this.goodsDetail.attributeList[index].value[index1]
 				this.goodsDetail.attributeList[index].value.splice(index1, 1);
 				this.tui.request("/app/productAttributeValue/delById", "post", {
@@ -2976,14 +4754,325 @@
 						})
 					}
 				})
-			},
-			//编辑每一个的单价
-			clickCollapse(e, id) {
-				this.carList.get(id).discountAmount = Number(e)
-				this.carList.get(id).unitPrice = Number(e)
-				this.carList.get(id).returnPrice = this.carList.get(id).discountAmount
-				this.carList.get(id).price = this.carList.get(id).productCount * this.carList.get(id).discountAmount
-				this.getAllPrice()
+			},
+			//编辑每一个的单价
+			clickCollapse(e, id) {
+				this.carList.get(id).discountAmount = Number(e)
+				this.carList.get(id).unitPrice = Number(e)
+				this.carList.get(id).returnPrice = this.carList.get(id).discountAmount
+				this.carList.get(id).price = this.carList.get(id).productCount * this.carList.get(id).discountAmount
+				this.getAllPrice()
+			},
+			voiceGetOne() {
+				this.voiceGetOneData = !this.voiceGetOneData
+			},
+			// clickGetOne(oneData) {
+			// 	this.$refs.oneDataPopup.close()
+			// 	this.getOneData(oneData)
+			// },
+			async getOneData(oneData, type) {
+				console.log('oneData4666', oneData)
+				this.tui.request('/app/product/getShareList', "post", {
+					categoryId: "",
+					pageNum: 1,
+					pageSize: '10',
+					searchStr: oneData.productSn
+				}, false, false).then((res) => {
+					if (res.code == 200) {
+						if (res.result.records != '') {
+							if (res.result.records.length > 1) {
+
+
+								for (let i = 0; i < res.result.records.length; i++) {
+									if (oneData.wholesalePrice) {
+										res.result.records[i].wholesalePrice = oneData.wholesalePrice
+										res.result.records[i].unitPrice = oneData.wholesalePrice
+										res.result.records[i].discountAmount = oneData.wholesalePrice
+
+									}
+									res.result.records[i].productCount = oneData.productCount[0]
+								}
+								this.$nextTick(() => {
+									this.moreData.push(res.result.records)
+									this.oneData = oneData
+								})
+
+							} else {
+								this.voiceText = ''
+								this.voiceText1 = ''
+								this.$refs.popup.close();
+								// this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
+								// 	"POST", {
+								// 		categoryId: res.result.records[0].attrId
+								// 	}, false, true).then((res1) => {
+								// 	if (res1.code == 200) {
+								let data = {
+									attributeList: '{"颜色":"均色","尺码":"均码"}',
+									productCount: Number(oneData.productCount[0]),
+									stockCount: res.result.records[0].defaultStockCount
+								}
+								// if (res1.result.stock.length > 0) {
+								// 	for (let i = 0; i < res1.result.stock.length; i++) {
+								// 		if (res1.result.stock[i].attributeList ==
+								// 			'{"颜色":"均色","尺码":"均码"}') {
+								// 			console.log("进来了")
+								// 			data.stockCount = res1.result.stock[i].stockCount
+
+								// 		}
+								// 	}
+								// } else {
+
+								// }
+
+								setTimeout(ress => {
+									res.result.records[0].productId = res.result.records[0]
+										.id
+									res.result.records[0].stockLogList1 = []
+									res.result.records[0].stockLogList1.push(data)
+									if (oneData.wholesalePrice) {
+										res.result.records[0].wholesalePrice = oneData
+											.wholesalePrice
+										res.result.records[0].unitPrice = oneData
+											.wholesalePrice
+										res.result.records[0].discountAmount = oneData
+											.wholesalePrice
+									}
+									// if(res.result[0].productCount == '' || ){
+									// 	if(voiceData.productCount < 0){
+									// 		res.result[0].returnCount = voiceData.productCount
+									// 		res.result[0].returnPrice = voiceData.wholesalePrice
+									// 	}else{
+									// 		res.result[0].productCount = voiceData.productCount
+									// 	}
+									// }
+									let purchaseDetails = res.result.records
+
+									let id = this.oneGoodsId
+									console.log('purchaseDetails4693', purchaseDetails)
+									if (purchaseDetails.length > 0) {
+										this.carList1 = purchaseDetails
+										// this.$nextTick(() => {
+										this.AiHandleData()
+										// })
+
+									} else {
+										this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+									}
+								}, 300)
+								// 	} else {
+								// 		this.tui.toast(res1.message)
+								// 	}
+								// }).catch((res) => {})
+							}
+
+
+
+						} else {
+							this.voiceText = ''
+							this.voiceText1 = ''
+							this.$refs.popup.close()
+							console.log('oneData3070', oneData)
+							if (oneData.productCount) {
+								let regexZCount = /\d+/g;
+								oneData.productCount = oneData.productCount[0].match(regexZCount);
+							}
+							if (oneData.wholesalePrice) {
+								oneData.wholesalePrice = this.replaceCharAfterNumber(oneData.wholesalePrice,
+									'块', '.')
+								this.voiceData.wholesalePrice = this.replaceCharAfterNumber(this
+									.voiceData.wholesalePrice, '元', '')
+								oneData.wholesalePrice = oneData.wholesalePrice.replace(/[^0-9.]/g, "");
+							}
+							if (oneData.wholesalePrice1) {
+								oneData.wholesalePrice1 = this.replaceCharAfterNumber(oneData.wholesalePrice1,
+									'块', '.')
+								oneData.wholesalePrice1 = this.replaceCharAfterNumber(
+									oneData.wholesalePrice1, '元', '')
+								oneData.wholesalePrice = oneData.wholesalePrice1.replace(/[^0-9.]/g, "");
+							}
+							let data = {
+								id: oneData.productSn,
+								productId: oneData.productSn,
+								productCount: oneData.productCount[0] || 0,
+								productName: oneData.productName,
+								productSn: oneData.productSn,
+								isNew: true,
+								categoryId: this.fenleiList.categoryId,
+								categoryName: this.fenleiList.categoryName,
+								unitPrice: oneData.wholesalePrice || 0,
+								discountAmount: oneData.wholesalePrice || 0,
+								wholesalePrice: oneData.wholesalePrice || 0,
+								stockLogList1: [{
+									attributeList: '{"颜色":"均色","尺码":"均码"}',
+									productCount: Number(oneData.productCount[0]),
+									stockCount: null
+								}]
+							}
+							console.log(data)
+							let purchaseDetails = []
+							purchaseDetails.push(data)
+
+							setTimeout(ress => {
+								if (purchaseDetails.length > 0) {
+									this.carList1 = purchaseDetails
+									this.AiHandleData()
+
+								} else {
+									this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+								}
+							}, 500)
+
+						}
+						setTimeout(res => {
+							if (type == true && this.moreData.length > 0) {
+								this.$refs.popup.close()
+								this.$refs.oneDataPopup.open()
+								this.showPopup(0)
+							}
+						}, 300)
+
+					}
+				})
+				// this.$nextTick(()=>{
+				// 	console.log('moreData', this.moreData)
+				// 	if (type == true && this.moreData.length > 0) {
+				// 		this.$refs.popup.close()
+				// 		this.$refs.oneDataPopup.open()
+				// 		this.showPopup(0)
+				// 	}
+				// })
+
+			},
+			showPopup(index) {
+				this.currentPopupIndex = index;
+				this.showTan = true;
+			},
+			clickGetOne(item) {
+				console.log('选择了:', item);
+
+				// 如果还有下一个弹出层，则显示下一个
+				if (this.currentPopupIndex + 1 < this.moreData.length) {
+					this.showTan = false; // 先关闭当前弹出层
+					this.voiceText = ''
+					this.voiceText1 = ''
+					this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
+						"POST", {
+							categoryId: item.attrId
+						}, false, true).then((res1) => {
+						if (res1.code == 200) {
+							let data = {
+								attributeList: '{"颜色":"均色","尺码":"均码"}',
+								productCount: Number(item.productCount),
+								stockCount: null
+							}
+							if (res1.result.stock.length > 0) {
+								for (let i = 0; i < res1.result.stock.length; i++) {
+									if (res1.result.stock[i].attributeList ==
+										'{"颜色":"均色","尺码":"均码"}') {
+										console.log("进来了")
+										data.stockCount = res1.result.stock[i].stockCount
+
+									}
+								}
+							} else {
+
+							}
+
+							this.$nextTick(() => {
+								item.productId = item.id
+								item.stockLogList1 = []
+								item.stockLogList1.push(data)
+
+								// if(res.result[0].productCount == '' || ){
+								// 	if(voiceData.productCount < 0){
+								// 		res.result[0].returnCount = voiceData.productCount
+								// 		res.result[0].returnPrice = voiceData.wholesalePrice
+								// 	}else{
+								// 		res.result[0].productCount = voiceData.productCount
+								// 	}
+								// }
+								let purchaseDetails = item
+
+								let id = this.oneGoodsId
+								console.log('purchaseDetails4827', purchaseDetails)
+								if (purchaseDetails) {
+									this.carList1.push(purchaseDetails)
+									this.$nextTick(() => {
+										this.AiHandleData()
+									})
+
+								} else {
+									this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+								}
+							})
+						} else {
+							this.tui.toast(res1.message)
+						}
+					}).catch((res) => {})
+					setTimeout(() => {
+						this.showTan = true; // 再显示下一个弹出层
+						this.currentPopupIndex += 1;
+					}, 0);
+				} else {
+					this.showTan = false; // 如果没有更多弹出层，则关闭最后一个弹出层
+					this.voiceText = ''
+					this.voiceText1 = ''
+					this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
+						"POST", {
+							categoryId: item.attrId
+						}, false, true).then((res1) => {
+						if (res1.code == 200) {
+							let data = {
+								attributeList: '{"颜色":"均色","尺码":"均码"}',
+								productCount: Number(item.productCount),
+								stockCount: null
+							}
+							if (res1.result.stock.length > 0) {
+								for (let i = 0; i < res1.result.stock.length; i++) {
+									if (res1.result.stock[i].attributeList ==
+										'{"颜色":"均色","尺码":"均码"}') {
+										console.log("进来了")
+										data.stockCount = res1.result.stock[i].stockCount
+
+									}
+								}
+							} else {
+
+							}
+
+							this.$nextTick(() => {
+								item.productId = item.id
+								item.stockLogList1 = []
+								item.stockLogList1.push(data)
+
+								// if(res.result[0].productCount == '' || ){
+								// 	if(voiceData.productCount < 0){
+								// 		res.result[0].returnCount = voiceData.productCount
+								// 		res.result[0].returnPrice = voiceData.wholesalePrice
+								// 	}else{
+								// 		res.result[0].productCount = voiceData.productCount
+								// 	}
+								// }
+								let purchaseDetails = item
+
+								let id = this.oneGoodsId
+								console.log('purchaseDetails4888', purchaseDetails)
+								if (purchaseDetails) {
+									this.moreData = []
+									this.carList1.push(purchaseDetails)
+									this.$nextTick(() => {
+										this.AiHandleData()
+									})
+
+								} else {
+									this.tui.toast("抱歉：小助手本次未识别到商品信息，请检查识别信息是否正确")
+								}
+							})
+						} else {
+							this.tui.toast(res1.message)
+						}
+					}).catch((res) => {})
+				}
 			},
 			//弹出商品规格选择
 			toggle(type, id) {
@@ -2999,252 +5088,269 @@
 					this.getGategoryList()
 					this.$refs.typePopup.open()
 				} else if (type == 'oneGoods') {
-					this.oneGoodsId = id
-					this.initRecord();
-					this.voiceText = ''
+					this.oneGoodsId = id
+					this.initRecord();
+					this.voiceText = ''
+					this.voiceText1 = ''
 					this.$refs.popup.open('center')
 				} else {
 					this.initRecord();
 					this.voiceText = ''
+					this.voiceText1 = ''
 					this.$refs.popup.open(type)
 				}
-			},
-			getName(e, id) {
-				this.carList.get(id).productName = e.detail.value
-			},
-			sninput(e ,id){
-				this.carList.get(id).productSn = e.detail.value
-				this.$forceUpdate()
-			},
-			//货号是否重复
-			getSnIsRepeat(e, id) {
-				let that = this;
-				let isTrue = false
-				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 != '') {
-								isTrue = true
-								that.tui.toast('当前货号已被商品：“' + res1.result[0].productName + '”占用，请重新输入')
-								that.carList.get(id).productSn = ''
-								that.carList.get(id).id = ''
-								setTimeout(res=>{
-									that.$forceUpdate()
-								},2000)
-								throw Error('11')
-							}else {
-								this.carList.forEach(function(value, key) {
-									if(value.id != id){
-										if(value.productSn == e.detail.value){
-											isTrue = true
-											uni.showToast({
-												title:  "该货号被页面其他商品占用,请重新输入！",
-												icon: 'none'
-											})
-											that.carList.get(id).productSn = ''
-											that.carList.get(id).id = ''
-											that.$forceUpdate()
-											throw Error('11')
-										}
-									}
-								})
-							}
-					
-						}
-					})
-					
-					this.$nextTick(()=>{
-						if(isTrue == false){
-							if (that.carList.get(id).productId) {
-								this.carList.get(id).id = that.carList.get(id).productId
-								this.carList.get(id).isNew = false
-								id = that.carList.get(id).productId
-							} else if (that.carList.get(id).productSn == '' || that.carList.get(id).productSn ==
-								null) {
-												
-								this.carList.get(id).id = that.carList.get(id).productName
-								id = that.carList.get(id).productName
-							} else if (that.carList.get(id).productSn == '货号') {
-								this.carList.get(id).productSn = that.carList.get(id).productName
-								this.carList.get(id).id = that.carList.get(id).productName
-								id = that.carList.get(id).productName
-							}else if (that.carList.get(id).productSn) {
-								
-								this.carList.get(id).id = that.carList.get(id).productSn
-								id = that.carList.get(id).productSn
-							}
-							this.$forceUpdate()
-						}
-					})
-					let specMap = new Map() //新的临时存放值那个更改过的值的map
-					this.$nextTick(()=>{
-						// if(isTrue == false){
-							this.carList.forEach(function(value, key) {
-								if(key != value.id){
-									if(value.id == ''){
-										specMap.set(generateUUID(),value)
-									}else{
-										specMap.set(value.productId?value.productId:value.id,value)
-									}
-								}else{
-									specMap.set(key,value)
-								}
-							})
-							this.carList = specMap
-						// }
-					})
-					
-				}
-			},
-			getOneId(id){
-				this.oneGoodsId = id
-				this.$refs.SNDialog.open('center')
-			},
-			async generateSn(value){
-				await this.tui.request("/app/productSn/getNewProductSn", "POST", {
-					snPre: value
-				}, false, true).then((res) => {
-					if (res.code == 200) {
-						this.carList.get(this.oneGoodsId).productSn = res.result
-						this.$forceUpdate()
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-				await this.$nextTick(()=>{
-					this.oneGoodsId = ''
-					this.numRule = ''
-					this.prefixRule = ''
-				})
-				this.$refs.SNDialog.close()
-			},
-			clickGategroy(item) {
-				this.carList.get(this.productId).categoryName = item.categoryName
-				this.carList.get(this.productId).categoryId = item.id
-				this.$forceUpdate()
-				this.$refs.typePopup.close()
-			},
-			uploadFilePromise(value) {
-				let that = this;
-				uni.chooseMedia({
-					count: 1,
-					mediaType: ['image'],
-					sourceType: ['album', 'camera'],
-					camera: 'back',
-					success(res) {
-						uni.uploadFile({
-							url: that.tui.interfaceUrl() +'/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()
-							}
-						});
-					}
-				})
-			},
-			lunbochange(e) {
-				this.current = e.detail.current
-			},
-			pictureAdd(id,huan) {
-				let that = this
-				uni.showLoading({
-					title: '加载中...',
-					mask:true
-				})
-				if(id != ''){  //上传多图
-					this.childrenId = id
-					if(this.carList.get(id).productPictures.length > 0 && huan !='huan'){
-						this.productPictures = this.carList.get(id).productPictures
-						this.$refs.showImgDiaLog.open()
-						uni.hideLoading();
-						return;
-					}else if(huan == 'huan'){
-						this.$refs.showImgDiaLog.close()
-					}
-				}else{
-					this.childrenId = ''
-				}
-				uni.chooseMedia({
-					count: 9,
-					mediaType: ['image'],
-					sourceType: ['album'],
-					success(res) {
-						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)
-						}
-					},fail(err){
-						uni.hideLoading();
-					}
-				})
-				uni.hideLoading();
-			},
-			async upLoadFile(path,time){
-				let that = this;
-				let hiver_token = uni.getStorageSync("hiver_token")
-				await uni.uploadFile({
-					url: that.tui.interfaceUrl() + '/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)
-							}, 100 * time);
-							
-							// that.addPageGoods(pathData.result)
-						}
-					},
-					fail: (err) => {
-						uni.hideLoading();
-						uni.showToast({
-							title: JSON.stringify(err),
-							icon: 'none'
-						})
-					}
-				});
-				await setTimeout(res=>{
-					uni.hideLoading();
-				},1000)
-			},
-			//获取分类列表
-			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) => {})
+			},
+			getName(e, id) {
+				this.carList.get(id).productName = e.detail.value
+			},
+			sninput(e, id) {
+				this.carList.get(id).productSn = e.detail.value
+				this.$forceUpdate()
+			},
+			//货号是否重复
+			getSnIsRepeat(e, id) {
+				let that = this;
+				let isTrue = false
+				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 != '') {
+								isTrue = true
+								that.tui.toast('当前货号已被商品：“' + res1.result[0].productName + '”占用，请重新输入')
+								that.carList.get(id).productSn = ''
+								that.carList.get(id).id = ''
+								setTimeout(res => {
+									that.$forceUpdate()
+								}, 2000)
+								throw Error('11')
+							} else {
+								this.carList.forEach(function(value, key) {
+									if (value.id != id) {
+										if (value.productSn == e.detail.value) {
+											isTrue = true
+											uni.showToast({
+												title: "该货号被页面其他商品占用,请重新输入！",
+												icon: 'none'
+											})
+											that.carList.get(id).productSn = ''
+											that.carList.get(id).id = ''
+											that.$forceUpdate()
+											throw Error('11')
+										}
+									}
+								})
+							}
+
+						}
+					})
+
+					this.$nextTick(() => {
+						if (isTrue == false) {
+							if (that.carList.get(id).productId) {
+								this.carList.get(id).id = that.carList.get(id).productId
+								this.carList.get(id).isNew = false
+								id = that.carList.get(id).productId
+							} else if (that.carList.get(id).productSn == '' || that.carList.get(id).productSn ==
+								null) {
+
+								this.carList.get(id).id = that.carList.get(id).productName
+								id = that.carList.get(id).productName
+							} else if (that.carList.get(id).productSn == '货号') {
+								this.carList.get(id).productSn = that.carList.get(id).productName
+								this.carList.get(id).id = that.carList.get(id).productName
+								id = that.carList.get(id).productName
+							} else if (that.carList.get(id).productSn) {
+
+								this.carList.get(id).id = that.carList.get(id).productSn
+								id = that.carList.get(id).productSn
+							}
+							this.$forceUpdate()
+						}
+					})
+					let specMap = new Map() //新的临时存放值那个更改过的值的map
+					this.$nextTick(() => {
+						// if(isTrue == false){
+						this.carList.forEach(function(value, key) {
+							if (key != value.id) {
+								if (value.id == '') {
+									specMap.set(generateUUID(), value)
+								} else {
+									specMap.set(value.productId ? value.productId : value.id, value)
+								}
+							} else {
+								specMap.set(key, value)
+							}
+						})
+						this.carList = specMap
+						// }
+					})
+
+				}
+			},
+			getOneId(id) {
+				this.oneGoodsId = id
+				this.$refs.SNDialog.open('center')
+			},
+			async generateSn(value) {
+				await this.tui.request("/app/productSn/getNewProductSn", "POST", {
+					snPre: value
+				}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.carList.get(this.oneGoodsId).productSn = res.result
+						this.$forceUpdate()
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+				await this.$nextTick(() => {
+					this.oneGoodsId = ''
+					this.numRule = ''
+					this.prefixRule = ''
+				})
+				this.$refs.SNDialog.close()
+			},
+			clickGategroy(item) {
+				this.carList.get(this.productId).categoryName = item.categoryName
+				this.carList.get(this.productId).categoryId = item.id
+				this.$forceUpdate()
+				this.$refs.typePopup.close()
+			},
+			changeMore(e) {
+
+				if (e.show == false) {
+					this.moreData = []
+				}
+			},
+			uploadFilePromise(value) {
+				let that = this;
+				uni.chooseMedia({
+					count: 1,
+					mediaType: ['image'],
+					sourceType: ['album', 'camera'],
+					camera: 'back',
+					success(res) {
+						uni.uploadFile({
+							url: that.tui.interfaceUrl() + '/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()
+							}
+						});
+					}
+				})
+			},
+			lunbochange(e) {
+				this.current = e.detail.current
+			},
+			getZhuBigImage(path) {
+				console.log(path)
+				let paths = []
+				paths.push(path)
+				uni.previewImage({
+					urls: paths
+				});
+			},
+			pictureAdd(id, huan) {
+				let that = this
+				uni.showLoading({
+					title: '加载中...',
+					mask: true
+				})
+				if (id != '') { //上传多图
+					this.childrenId = id
+					if (this.carList.get(id).productPictures.length > 0 && huan != 'huan') {
+						this.productPictures = this.carList.get(id).productPictures
+						this.$refs.showImgDiaLog.open()
+						uni.hideLoading();
+						return;
+					} else if (huan == 'huan') {
+						this.$refs.showImgDiaLog.close()
+					}
+				} else {
+					this.childrenId = ''
+				}
+				uni.chooseMedia({
+					count: 9,
+					mediaType: ['image'],
+					sourceType: ['album'],
+					success(res) {
+						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)
+						}
+					},
+					fail(err) {
+						uni.hideLoading();
+					}
+				})
+				uni.hideLoading();
+			},
+			async upLoadFile(path, time) {
+				let that = this;
+				let hiver_token = uni.getStorageSync("hiver_token")
+				await uni.uploadFile({
+					url: that.tui.interfaceUrl() + '/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)
+							}, 100 * time);
+
+							// that.addPageGoods(pathData.result)
+						}
+					},
+					fail: (err) => {
+						uni.hideLoading();
+						uni.showToast({
+							title: JSON.stringify(err),
+							icon: 'none'
+						})
+					}
+				});
+				await setTimeout(res => {
+					uni.hideLoading();
+				}, 1000)
+			},
+			//获取分类列表
+			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) => {})
 			},
 			//整体选择是批发价还是零售价
 			async priceChange(e, index) {
@@ -3256,15 +5362,15 @@
 				this.priceType = e
 				that.priceCurrent = index
 				await this.carList.forEach(function(value, key) {
-					that.index = value.productId || value.id
-					if(value.isNew != true){
-						if (e == '0') { //零售
-							value.discountAmount = value.lsprice
-							value.returnPrice= value.lsprice
-						} else { //批发
-							value.discountAmount = value.wholesalePrice
-							value.returnPrice= value.wholesalePrice
-						}
+					that.index = value.productId || value.id
+					if (value.isNew != true) {
+						if (e == '0') { //零售
+							value.discountAmount = value.lsprice
+							value.returnPrice = value.lsprice
+						} else { //批发
+							value.discountAmount = value.wholesalePrice
+							value.returnPrice = value.wholesalePrice
+						}
 					}
 				})
 				// await this.getAllPrice()
@@ -3275,7 +5381,7 @@
 				this.$forceUpdate()
 			},
 			//商品上选择是零售价还是批发价
-			checkPay(price,returnPrice) {
+			checkPay(price, returnPrice) {
 
 				if (price == undefined || price == null) {
 					this.tui.toast("暂无拿货记录")
@@ -3284,9 +5390,9 @@
 				let that = this;
 				let num = this.carList.get(this.index)
 
-				num.discountAmount = price
-				if(returnPrice != ''){
-					num.returnPrice = returnPrice
+				num.discountAmount = price
+				if (returnPrice != '') {
+					num.returnPrice = returnPrice
 				}
 				num.unitPrice = price;
 				num.price = price * num.productCount;
@@ -3298,8 +5404,8 @@
 				that.relPrice = that.shouldPay
 				that.priceOk = that.shouldPay
 				// this.getAllPrice()
-				this.getAmountAndWho()
-				this.customPrice = ''
+				this.getAmountAndWho()
+				this.customPrice = ''
 				this.returnPrice = ''
 			},
 			//整体选择时使用批发价、零售价，选择整体折扣的方法
@@ -3318,8 +5424,8 @@
 							price = value.wholesalePrice
 						}
 					}
-					if(value.isNew != true){
-						value.unitPrice = price;
+					if (value.isNew != true) {
+						value.unitPrice = price;
 					}
 					if (that.discountType == 1) { //整体折扣
 						value.discountAmount = value.unitPrice * (that.discountNum / 10)
@@ -3342,138 +5448,139 @@
 				// 	that.noPay = this.relPrice - this.priceOk
 				// }
 			},
-			AiAddSpec(value,current) {
-				this.getById(value,current);
+			AiAddSpec(value, current) {
+				this.getById(value, current);
 			},
 			//通过商品id查询商品详细信息
-			async getById(id,current) {
-				let that = this;
-				//判断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++) {
-							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)
-							}
-							let specs1 = {
-								specs: []
-							}
-							that.goodsList.push(specs1)
-						}
-						this.$refs.shopPopup.open('bottom')
-					}else{
-						that.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
-							"POST", {
-								categoryId: that.goodsDetail.attrId
-							}, false, true).then((res1) => {
-							if (res1.code == 200) {
-								that.goodsList = []
-								if (typeof(res1.result.attributeAndValue) == 'string') {
-									let newObj = JSON.parse(res1.result.attributeAndValue)
-									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 specs1 = {
-											specs: []
-										}
-										that.goodsList.push(specs1)
-									}
-								} else {
-									that.tui.toast('失败了')
-								}
-								that.getKCList(res1.result.stock);
-							} else {
-								that.tui.toast(res1.message)
-							}
-						}).catch((res) => {})
-					}
-					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: values.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: values.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
-					}
-				}else{
+			async getById(id, current) {
+				let that = this;
+				//判断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++) {
+							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)
+							}
+							let specs1 = {
+								specs: []
+							}
+							that.goodsList.push(specs1)
+						}
+						this.$refs.shopPopup.open('bottom')
+					} else {
+						that.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId",
+							"POST", {
+								categoryId: that.goodsDetail.attrId
+							}, false, true).then((res1) => {
+							if (res1.code == 200) {
+								that.goodsList = []
+								if (typeof(res1.result.attributeAndValue) == 'string') {
+									let newObj = JSON.parse(res1.result.attributeAndValue)
+									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 specs1 = {
+											specs: []
+										}
+										that.goodsList.push(specs1)
+									}
+								} else {
+									that.tui.toast('失败了')
+								}
+								that.getKCList(res1.result.stock);
+							} else {
+								that.tui.toast(res1.message)
+							}
+						}).catch((res) => {})
+					}
+					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: values.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: values.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
+					}
+				} else {
 					this.pageOldTemList = []
 					await this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
 						if (res.code == 200) {
@@ -3482,7 +5589,7 @@
 								return
 							}
 							that.goodsDetail = res.result;
-							that.temporaryList = []
+							that.temporaryList = []
 							this.pageOldTemList = []
 							if (that.carList.size > 0) {
 								that.carList.forEach(function(value, key) {
@@ -3496,11 +5603,15 @@
 											}
 											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)) {
+											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,
+															productCount: values
+																.productCount,
 															name: values.name,
 															attributeList: keys,
 															productNum: values.productNum
@@ -3525,73 +5636,82 @@
 									})
 								})
 							}
-							that.$nextTick(() => {
-								this.tui.request("/app/productAttribute/selectAttributeAndValueByCategoryId", "POST", {
-									categoryId: this.goodsDetail.attrId
-								}, false, true).then((res1) => {
-									if (res1.code == 200) {
-										this.goodsList = []
-										if (typeof(res1.result.attributeAndValue) == 'string') {
-											let newObj = JSON.parse(res1.result.attributeAndValue)
-											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
-													})
-													this.dataObj.set(newObj[val][i], val)
-												}
-												newArr.push({
-													name: val,
-													value: valueObj
-												})
-											}
-											this.goodsDetail.attributeList = newArr;
-											for (var i = 0; i < this.goodsDetail.attributeList.length; i++) {
-												let oldCheck = false
-												let oldValue = []
-												for (var m = 0; m < this.goodsDetail.attributeList[i].value
-													.length; m++) {
-													if (this.goodsDetail.attributeList[i].value[m].isChecked ==
-														true) {
-														oldCheck = true
-														oldValue.push(this.goodsDetail.attributeList[i].value[
-															m].value)
-													}
-												}
-												let specs1 = {
-													specs: []
-												}
-												this.goodsList.push(specs1)
-												oldCheck = false
-												oldValue = []
-											}
-											if(this.temporaryList == ''){
-												this.attrNameChange(0,that.goodsDetail.attributeList[0].value[0].value,0)
-											}
-										} else {
-											this.tui.toast('失败了')
-										}
-										this.getKCList(res1.result.stock)
-									} else {
-										this.tui.toast(res1.message)
-									}
+							that.$nextTick(() => {
+								this.tui.request(
+									"/app/productAttribute/selectAttributeAndValueByCategoryId",
+									"POST", {
+										categoryId: this.goodsDetail.attrId
+									}, false, true).then((res1) => {
+									if (res1.code == 200) {
+										this.goodsList = []
+										if (typeof(res1.result.attributeAndValue) ==
+											'string') {
+											let newObj = JSON.parse(res1.result
+												.attributeAndValue)
+											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
+													})
+													this.dataObj.set(newObj[val][i], val)
+												}
+												newArr.push({
+													name: val,
+													value: valueObj
+												})
+											}
+											this.goodsDetail.attributeList = newArr;
+											for (var i = 0; i < this.goodsDetail.attributeList
+												.length; i++) {
+												let oldCheck = false
+												let oldValue = []
+												for (var m = 0; m < this.goodsDetail
+													.attributeList[i].value
+													.length; m++) {
+													if (this.goodsDetail.attributeList[i]
+														.value[m].isChecked ==
+														true) {
+														oldCheck = true
+														oldValue.push(this.goodsDetail
+															.attributeList[i].value[
+																m].value)
+													}
+												}
+												let specs1 = {
+													specs: []
+												}
+												this.goodsList.push(specs1)
+												oldCheck = false
+												oldValue = []
+											}
+											if (this.temporaryList == '') {
+												this.attrNameChange(0, that.goodsDetail
+													.attributeList[0].value[0].value, 0)
+											}
+										} else {
+											this.tui.toast('失败了')
+										}
+										this.getKCList(res1.result.stock)
+									} else {
+										this.tui.toast(res1.message)
+									}
 								}).catch((res) => {})
 							})
-							
+
 						} else {
 							this.tui.toast(res.message)
 						}
-					}).catch((res) => {})
+					}).catch((res) => {})
 				}
 			},
 			//库存商品详情
 			getKCList(list) {
 				this.yanseList = new Map()
-				this.chimaList = new Map()
+				this.chimaList = new Map()
 				this.$refs.shopPopup.open('bottom')
 				this.pecsList = list
 
@@ -3640,40 +5760,40 @@
 					}
 				}
 				this.zNum = 0
-				for (var i = 0; i < this.temporaryList.length; i++) {
-					if(this.temporaryList[i].productCount > 0){
-						this.zNum += this.temporaryList[i].productCount
+				for (var i = 0; i < this.temporaryList.length; i++) {
+					if (this.temporaryList[i].productCount > 0) {
+						this.zNum += this.temporaryList[i].productCount
 					}
 				}
-			},
-			handleBlur(e) {
-				this.categoryText = e.detail.value
-			},
-			dialogClose() {
-				this.$refs.specDialog.close()
-				this.categoryText = ''
-			},
-			dialogInputConfirm(e) {
-				if (this.categoryText == '') {
-					this.tui.toast("请输入规格值后提交")
-					return
-				}
-				//this.goodsDetail[0]  颜色
-				//this.goodsDetail[1]  尺码
-				this.$refs.inputDialog.close()
-				let data = {
-					isChecked:false,
-					value:this.categoryText
-				}
-				if(this.isOpenId == '0'){
-					this.goodsDetail.attributeList[0].value.push(data)
-					this.dataObj.set(data.value,'颜色')
-				}else if(this.isOpenId == '1'){
-					this.goodsDetail.attributeList[1].value.push(data)
-					this.dataObj.set(data.value,'尺码')
-				}
-				this.$forceUpdate()
-				this.dialogClose()
+			},
+			handleBlur(e) {
+				this.categoryText = e.detail.value
+			},
+			dialogClose() {
+				this.$refs.specDialog.close()
+				this.categoryText = ''
+			},
+			dialogInputConfirm(e) {
+				if (this.categoryText == '') {
+					this.tui.toast("请输入规格值后提交")
+					return
+				}
+				//this.goodsDetail[0]  颜色
+				//this.goodsDetail[1]  尺码
+				this.$refs.inputDialog.close()
+				let data = {
+					isChecked: false,
+					value: this.categoryText
+				}
+				if (this.isOpenId == '0') {
+					this.goodsDetail.attributeList[0].value.push(data)
+					this.dataObj.set(data.value, '颜色')
+				} else if (this.isOpenId == '1') {
+					this.goodsDetail.attributeList[1].value.push(data)
+					this.dataObj.set(data.value, '尺码')
+				}
+				this.$forceUpdate()
+				this.dialogClose()
 			},
 			//折扣种类选择
 			discountChange(e) {
@@ -3714,44 +5834,44 @@
 			change(e) {
 				uni.showLoading({
 					title: '加载中...'
-				})
-				if(this.linshiPrice == e.target.value){
-					this.relPrice = e.target.value
-				}else{
-					if (e.detail.value > 10) {
-						this.discountNum = 10
-					} else if (e.detail.value < 0) {
-						this.discountNum = 0
-					} else if(e.target.value == ''){
-						this.discountNum = this.linshiPrice
-					}else{
-						this.discountNum = e.target.value
-					}
+				})
+				if (this.linshiPrice == e.target.value) {
+					this.relPrice = e.target.value
+				} else {
+					if (e.detail.value > 10) {
+						this.discountNum = 10
+					} else if (e.detail.value < 0) {
+						this.discountNum = 0
+					} else if (e.target.value == '') {
+						this.discountNum = this.linshiPrice
+					} else {
+						this.discountNum = e.target.value
+					}
 				}
 				// this.getAllPrice()
 				this.getAmountAndWho()
 				setTimeout(res => {
 					uni.hideLoading();
 				}, 200)
-			},
-			xiaoshouChange(e) {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				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.getAllPrice(this.shouldPay)
-				// this.getAmountAndWho()
-				setTimeout(res => {
-					uni.hideLoading();
-				}, 200)
+			},
+			xiaoshouChange(e) {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				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.getAllPrice(this.shouldPay)
+				// this.getAmountAndWho()
+				setTimeout(res => {
+					uni.hideLoading();
+				}, 200)
 			},
 			//点击发货方式按钮
 			radioChange(e) {
@@ -3783,205 +5903,218 @@
 					})
 					return
 				}
+				if (popleType == 'khName') {
+					uni.setStorageSync('kaidanBack', true)
+				}
 				let companyType = this.radioType == 1 ? this.wlName.id : ''
 				uni.navigateTo({
 					url: '/package1/index/peopleList?popleType=' + popleType + '&companyType=' + companyType +
 						'&khName=' + JSON.stringify(this.khName)
 				})
-			},
-			clickClose(){
-				this.evalue = []
-				this.oldTemList = []
-				this.allChangeNum = 0
-				for (let i = 0; i < this.goodsDetail.attributeList.length; i++) {
-					this.goodsDetail.attributeList[i].isChecked = false;
-					for (let m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
-						this.goodsDetail.attributeList[i].value[m].isChecked = false
-					}
-				}
+			},
+			clickClose() {
+				this.evalue = []
+				this.oldTemList = []
+				this.allChangeNum = 0
+				for (let i = 0; i < this.goodsDetail.attributeList.length; i++) {
+					this.goodsDetail.attributeList[i].isChecked = false;
+					for (let m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
+						this.goodsDetail.attributeList[i].value[m].isChecked = false
+					}
+				}
 			},
 			//弹窗选择规格后，点击弹窗中选好了按钮
 			temporaryCheck() {
 				uni.showLoading({
 					title: '加载中...'
-				})
-				
+				})
+
 				this.evalue = []
 				let that = this,
-					carList1 = [],
-					newList = []
-				for(let i=0;i<this.temporaryList.length;i++){
-					if(this.temporaryList[i].productCount != 0){
-						newList.push(this.temporaryList[i])
-					}
+					carList1 = [],
+					newList = []
+				for (let i = 0; i < this.temporaryList.length; i++) {
+					if (this.temporaryList[i].productCount != 0) {
+						newList.push(this.temporaryList[i])
+					}
 				}
-				this.$nextTick(()=>{
-					let data = {
-						id: this.goodsDetail.id,
-						price: this.zPrice,
-						num: this.zNum,
-						isNew:this.goodsDetail.isNew,
-						unitPrice:this.goodsDetail.unitPrice,
-						categoryId: this.goodsDetail.categoryId,
-						productName: this.goodsDetail.productName,
-						productSn: this.goodsDetail.productSn,
-						productPicture: this.goodsDetail.productPicture,
-						supplierName: this.goodsDetail.supplierName,
-						saleDetailQueryDTO: newList,
-						wholesalePrice: this.goodsDetail.wholesalePrice,
-						lsprice: this.goodsDetail.price
-					}
-					carList1.push(data)
-					this.temporaryList = []
-					this.oldTemList = []
-					this.purchasePrice = ''
-					this.zPrice = ''
-					this.zNum = ''
-					for (let i = 0; i < this.goodsDetail.attributeList.length; i++) {
-						this.goodsDetail.attributeList[i].isChecked = false;
-						for (let m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
-							this.goodsDetail.attributeList[i].value[m].isChecked = false
-						}
-					}
-					if (this.carList.size == 0) { //当前页没有数据
-						for (let i = 0; i < carList1.length; i++) {
-							let obj = {
-								purchasePrice: carList1[i].price, //采购价
-								price: 0, //总价
-								discount: 10, //折扣
-								unitPrice: carList1[i].unitPrice || 0, //单价
-								categoryId: carList1[i].categoryId,
-								discountAmount: carList1[i].isNew ? (carList1[i].unitPrice || 0) : (carList1[i].wholesalePrice || 0), //折后价
-								returnPrice: carList1[i].isNew ? (carList1[i].unitPrice || 0) : (carList1[i].wholesalePrice || 0),
-								returnCount:0,
-								disNoAmount: 0, //折前价，用于计算整体折扣
-								wholesalePrice: carList1[i].wholesalePrice, //批发价
-								lsprice: carList1[i].lsprice, //零售价
-								productCount: 0, //总数量
-								productId: carList1[i].id,
-								productName: carList1[i].productName,
-								productPicture: carList1[i].productPicture,
-								productSn: carList1[i].productSn,
-								stockLogList: new Map(),
-								stockLogList1: [],
-								supplierName: carList1[i].supplierName //供应商
-							}
-							for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
-					
-								var data1 = {
-									productCount: carList1[i].saleDetailQueryDTO[m].productCount,
-									name: carList1[i].saleDetailQueryDTO[m].name,
-									productNum: carList1[i].saleDetailQueryDTO[m].productNum
-								}
-								obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-								if(carList1[i].saleDetailQueryDTO[m].productCount > 0){
-									obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
-								}else{
-									obj.returnCount += Math.abs(carList1[i].saleDetailQueryDTO[m].productCount)
-								}
-							}
-							this.carList.set(carList1[i].id, obj)
-						}
-						carList1 = []
-					
-					} 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) { //商品相同
-								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,
-											productNum: carList1[i].saleDetailQueryDTO[m].productNum
-										}
-										this.carList.get(carList1[i].id).stockLogList.set(carList1[i].saleDetailQueryDTO[
-											m].attributeList, data1)
-					
-									} else { //规格不同
-										var data1 = {
-											productCount: carList1[i].saleDetailQueryDTO[m].productCount,
-											name: carList1[i].saleDetailQueryDTO[m].name,
-											productNum: carList1[i].saleDetailQueryDTO[m].productNum
-										}
-										this.carList.get(carList1[i].id).stockLogList.set(carList1[i].saleDetailQueryDTO[
-											m].attributeList, data1)
-									}
-									if(carList1[i].saleDetailQueryDTO[m].productCount > 0){
-										this.carList.get(carList1[i].id).productCount += carList1[i].saleDetailQueryDTO[m].productCount
-									}else{
-										this.carList.get(carList1[i].id).returnCount += Math.abs(carList1[i].saleDetailQueryDTO[m].productCount)
-									}
-									that.carList.get(carList1[i].id).price = that.carList.get(carList1[i].id).productCount *
-										that.carList.get(carList1[i].id).unitPrice
-								}
-							} else { //商品不同
-								let obj = {
-									purchasePrice: carList1[i].price, //采购价
-									price: 0,
-									discount: 10,
-									discountAmount: carList1[i].isNew ? (carList1[i].unitPrice || 0) : (carList1[i].wholesalePrice || 0),
-									returnPrice: carList1[i].isNew ? (carList1[i].unitPrice || 0) : (carList1[i].wholesalePrice || 0),
-									returnCount:0,
-									disNoAmount: 0, //折前价，用于计算整体折扣
-									unitPrice: carList1[i].unitPrice, //单价
-									categoryId: carList1[i].categoryId,
-									wholesalePrice: carList1[i].wholesalePrice, //批发价
-									lsprice: carList1[i].lsprice, //零售价
-									productCount: 0,
-									productId: carList1[i].id,
-									productName: carList1[i].productName,
-									productPicture: carList1[i].productPicture,
-									stockLogList: new Map(),
-									stockLogList1: [],
-									productSn: carList1[i].productSn,
-									supplierName: carList1[i].supplierName
-								}
-					
-								for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
-									var data1 = {
-										productCount: carList1[i].saleDetailQueryDTO[m].productCount,
-										name: carList1[i].saleDetailQueryDTO[m].name,
-										productNum: carList1[i].saleDetailQueryDTO[m].productNum
-									}
-									obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)
-									if(carList1[i].saleDetailQueryDTO[m].productCount > 0){
-										obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
-									}else{
-										obj.returnCount += Math.abs(carList1[i].saleDetailQueryDTO[m].productCount)
-									}
-									
-								}
-								this.carList.set(carList1[i].id, obj)
-							}
-						}
-						carList1 = []
-					}
-					this.carList.forEach(function(value, key) {
-						if(value.isNew != true){
-							if (that.priceType == 0) { //零售
-								value.unitPrice = value.lsprice
-							} else if (that.priceType == 1) { //批发
-								value.unitPrice = value.wholesalePrice
-							}
-							if (that.discountType == 1) { //整体折扣
-								value.price = value.unitPrice * 10000 * value.productCount * that.discountNum / 10 / 10000
-							}
-						}
-						
-					})
-					// this.getAllPrice()
-					this.getAmountAndWho();
-					this.noPay = this.shouldPay
-					this.$refs.shopPopup.close()
-					setTimeout(res => {
-						uni.hideLoading();
-					}, 1000)
+				this.$nextTick(() => {
+					let data = {
+						id: this.goodsDetail.id,
+						price: this.zPrice,
+						num: this.zNum,
+						isNew: this.goodsDetail.isNew,
+						unitPrice: this.goodsDetail.unitPrice,
+						categoryId: this.goodsDetail.categoryId,
+						productName: this.goodsDetail.productName,
+						productSn: this.goodsDetail.productSn,
+						productPicture: this.goodsDetail.productPicture,
+						supplierName: this.goodsDetail.supplierName,
+						saleDetailQueryDTO: newList,
+						wholesalePrice: this.goodsDetail.wholesalePrice,
+						lsprice: this.goodsDetail.price
+					}
+					carList1.push(data)
+					this.temporaryList = []
+					this.oldTemList = []
+					this.purchasePrice = ''
+					this.zPrice = ''
+					this.zNum = ''
+					for (let i = 0; i < this.goodsDetail.attributeList.length; i++) {
+						this.goodsDetail.attributeList[i].isChecked = false;
+						for (let m = 0; m < this.goodsDetail.attributeList[i].value.length; m++) {
+							this.goodsDetail.attributeList[i].value[m].isChecked = false
+						}
+					}
+					if (this.carList.size == 0) { //当前页没有数据
+						for (let i = 0; i < carList1.length; i++) {
+							let obj = {
+								purchasePrice: carList1[i].price, //采购价
+								price: 0, //总价
+								discount: 10, //折扣
+								unitPrice: carList1[i].unitPrice || 0, //单价
+								categoryId: carList1[i].categoryId,
+								discountAmount: carList1[i].isNew ? (carList1[i].unitPrice || 0) : (carList1[i]
+									.wholesalePrice || 0), //折后价
+								returnPrice: carList1[i].isNew ? (carList1[i].unitPrice || 0) : (carList1[i]
+									.wholesalePrice || 0),
+								returnCount: 0,
+								disNoAmount: 0, //折前价，用于计算整体折扣
+								wholesalePrice: carList1[i].wholesalePrice, //批发价
+								lsprice: carList1[i].lsprice, //零售价
+								productCount: 0, //总数量
+								productId: carList1[i].id,
+								productName: carList1[i].productName,
+								productPicture: carList1[i].productPicture,
+								productSn: carList1[i].productSn,
+								stockLogList: new Map(),
+								stockLogList1: [],
+								supplierName: carList1[i].supplierName //供应商
+							}
+							for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
+
+								var data1 = {
+									productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+									name: carList1[i].saleDetailQueryDTO[m].name,
+									productNum: carList1[i].saleDetailQueryDTO[m].productNum
+								}
+								obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)
+								if (carList1[i].saleDetailQueryDTO[m].productCount > 0) {
+									obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
+								} else {
+									obj.returnCount += Math.abs(carList1[i].saleDetailQueryDTO[m].productCount)
+								}
+							}
+							this.carList.set(carList1[i].id, obj)
+						}
+						carList1 = []
+
+					} 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) { //商品相同
+								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,
+											productNum: carList1[i].saleDetailQueryDTO[m].productNum
+										}
+										this.carList.get(carList1[i].id).stockLogList.set(carList1[i]
+											.saleDetailQueryDTO[
+												m].attributeList, data1)
+
+									} else { //规格不同
+										var data1 = {
+											productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+											name: carList1[i].saleDetailQueryDTO[m].name,
+											productNum: carList1[i].saleDetailQueryDTO[m].productNum
+										}
+										this.carList.get(carList1[i].id).stockLogList.set(carList1[i]
+											.saleDetailQueryDTO[
+												m].attributeList, data1)
+									}
+									if (carList1[i].saleDetailQueryDTO[m].productCount > 0) {
+										this.carList.get(carList1[i].id).productCount += carList1[i]
+											.saleDetailQueryDTO[m].productCount
+									} else {
+										this.carList.get(carList1[i].id).returnCount += Math.abs(carList1[i]
+											.saleDetailQueryDTO[m].productCount)
+									}
+									that.carList.get(carList1[i].id).price = that.carList.get(carList1[i].id)
+										.productCount *
+										that.carList.get(carList1[i].id).unitPrice
+								}
+							} else { //商品不同
+								let obj = {
+									purchasePrice: carList1[i].price, //采购价
+									price: 0,
+									discount: 10,
+									discountAmount: carList1[i].isNew ? (carList1[i].unitPrice || 0) : (
+										carList1[i].wholesalePrice || 0),
+									returnPrice: carList1[i].isNew ? (carList1[i].unitPrice || 0) : (carList1[
+										i].wholesalePrice || 0),
+									returnCount: 0,
+									disNoAmount: 0, //折前价，用于计算整体折扣
+									unitPrice: carList1[i].unitPrice, //单价
+									categoryId: carList1[i].categoryId,
+									wholesalePrice: carList1[i].wholesalePrice, //批发价
+									lsprice: carList1[i].lsprice, //零售价
+									productCount: 0,
+									productId: carList1[i].id,
+									productName: carList1[i].productName,
+									productPicture: carList1[i].productPicture,
+									stockLogList: new Map(),
+									stockLogList1: [],
+									productSn: carList1[i].productSn,
+									supplierName: carList1[i].supplierName
+								}
+
+								for (let m = 0; m < carList1[i].saleDetailQueryDTO.length; m++) {
+									var data1 = {
+										productCount: carList1[i].saleDetailQueryDTO[m].productCount,
+										name: carList1[i].saleDetailQueryDTO[m].name,
+										productNum: carList1[i].saleDetailQueryDTO[m].productNum
+									}
+									obj.stockLogList.set(carList1[i].saleDetailQueryDTO[m].attributeList, data1)
+									if (carList1[i].saleDetailQueryDTO[m].productCount > 0) {
+										obj.productCount += carList1[i].saleDetailQueryDTO[m].productCount
+									} else {
+										obj.returnCount += Math.abs(carList1[i].saleDetailQueryDTO[m].productCount)
+									}
+
+								}
+								this.carList.set(carList1[i].id, obj)
+							}
+						}
+						carList1 = []
+					}
+					this.carList.forEach(function(value, key) {
+						if (value.isNew != true) {
+							if (that.priceType == 0) { //零售
+								value.unitPrice = value.lsprice
+							} else if (that.priceType == 1) { //批发
+								value.unitPrice = value.wholesalePrice
+							}
+							if (that.discountType == 1) { //整体折扣
+								value.price = value.unitPrice * 10000 * value.productCount * that
+									.discountNum / 10 / 10000
+							}
+						}
+
+					})
+					// this.getAllPrice()
+					this.getAmountAndWho();
+					this.noPay = this.shouldPay
+					this.$refs.shopPopup.close()
+					setTimeout(res => {
+						uni.hideLoading();
+					}, 1000)
 				})
 			},
 			//是否平台取货
@@ -3998,25 +6131,33 @@
 			close() {
 				this.$refs.popup.close()
 			},
+			onInput(e) {
+				this.textareaValue = e.detail.value;
+				// 调整滚动条位置到最底部
+				this.$nextTick(() => {
+					const textarea = this.$refs.textareaRef;
+					textarea.scrollTop = textarea.scrollHeight;
+				});
+			},
 			//按住语音识别，开始
-			kaishi() {
-				// manager.stop()
-				if(this.isVoice == false){
-					this.recordState = true
-					uni.vibrateShort();
-					manager.start({
-						duration: 60000,
-						lang: "zh_CN"
-					});
+			kaishi() {
+				// manager.stop()
+				if (this.isVoice == false) {
+					this.recordState = true
+					uni.vibrateShort();
+					manager.start({
+						duration: 60000,
+						lang: "zh_CN"
+					});
 				}
-				
+
 			},
 			//松开语音识别，结束
-			jieshu() {
-				// uni.showLoading({
-				// 	title: '识别中...',
-				// 	mask:true
-				// })
+			jieshu() {
+				// uni.showLoading({
+				// 	title: '识别中...',
+				// 	mask:true
+				// })
 				manager.stop()
 				this.recordState = false
 			},
@@ -4029,68 +6170,84 @@
 					return match.replace(charToFind, charToReplace);
 				});
 			},
+			removeSpacesAndCommas(str) {
+				// 正则表达式匹配所有空格和逗号
+				const regex = /[ ，,]/g; // 注意这里的空格和全角空格（全角逗号也包括在内）
+
+				// 使用replace()方法替换匹配到的空格和逗号为空字符串
+				return str.replace(regex, '');
+			},
 			//语音识别功能初始化
 			initRecord() {
 				let that = this;
 				// 识别结束事件
 				manager.onStop = (res) => {
-					let convertedStr = this.spliceMsg(this.convertChineseToArabic(res.result));
+					//去掉嗯啊等
+					let convertedStr = this.spliceMsg(this.convertChineseToArabic(res.result));
+					//正则处理“2十9”这种情况
 					convertedStr = this.convertStringCorrectly(convertedStr)
+					//去掉所有空格和中英文逗号
+					convertedStr = this.removeSpacesAndCommas(convertedStr)
+					//去掉所有标点符号
+					convertedStr = this.removePunctuationAndSpaces(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('，') == 0){
-						convertedStr = convertedStr.substr(1)
-					}
-					if (convertedStr.startsWith("号")) {
-						convertedStr = "货号" + convertedStr.substr(1);
 					}
+					if (convertedStr.indexOf('，') == 0) {
+						convertedStr = convertedStr.substr(1)
+					}
+					if (convertedStr.startsWith("号")) {
+						convertedStr = "货号" + convertedStr.substr(1);
+					}
+					convertedStr = convertedStr.replace(/[沟勾钩]/g, 'J');
 					if (that.voiceText == '' || that.voiceText == null) {
 						that.voiceText = convertedStr
+						that.voiceText1 = convertedStr
 					} else {
 						that.voiceText += '\n' + convertedStr
-					}
+						that.voiceText1 =  convertedStr + '\n' + that.voiceText1
+					}
 					// uni.hideLoading()
 				}
 
 				// 识别错误事件
-				manager.onError = (res) => {
-					
-					if(res.retcode == '-30011'){
-						that.isVoice = true
-					}
-					if(res.retcode == '-30003'){
-						that.isVoice = false
-					}
-					if(res.retcode == '-30004'){
-						// uni.hideLoading()
-						that.isVoice = false
-						uni.hideToast()
-						uni.showToast({
-							title: "未识别到声音信息,请重新录入",
-							icon: 'none'
-						})
+				manager.onError = (res) => {
+
+					if (res.retcode == '-30011') {
+						that.isVoice = true
+					}
+					if (res.retcode == '-30003') {
+						that.isVoice = false
+					}
+					if (res.retcode == '-30004') {
+						// uni.hideLoading()
+						that.isVoice = false
+						uni.hideToast()
+						uni.showToast({
+							title: "未识别到声音信息,请重新录入",
+							icon: 'none'
+						})
 					}
 					if (res.retcode == '-40001') {
 						uni.showToast({
@@ -4100,8 +6257,8 @@
 					}
 				}
 			},
-			async showPrice1() {
-				let that = this;
+			async showPrice1(type) {
+				let that = this;
 				this.sellObj = ""
 				if (this.khName == '') {
 					this.tui.toast('请选择客户！')
@@ -4130,169 +6287,210 @@
 				} else {
 					this.tui.toast('请选择发货方式！')
 					return
-				}
-				let obj = {
-					orderByWorker: this.lbgName.workerId || this.kdyName.workerId,
-					oldSaleId: this.saleId || '',
-					sale: {
-						// relPrice:, 
-						alreadyEarn: this.priceOk, //已付金额
-						realAmount: this.relPrice, //实收金额
-						noEarn: this.relPrice - this.priceOk, //欠款
-						totalAmount: this.shouldPay, //总金额
-						debtDeductionAmount:this.qiankuandikou,
-						saleDeductionAmount:this.xiaoshoudikou,
-						balanceDeductionAmount:this.yuedikou,
-						area: this.khName.area,
-						city: this.khName.city,
-						province: this.khName.province,
-						payStatus: 1,
-						payType:this.payType,
-						receiveAddress: this.khName.address || this.khName.receiveAddress,
-						userId: this.khName.id,
-						userName: this.khName.name,
-						transportType: this.radioType1 == 1 ? 2 : this.radioType, //this.radioType
-						modeOfService: this.radioType1,
-						discount: this.discountNum,
-						createBy: this.xsyId,
-						createByName: this.createByName,
-						remark: this.remark,
-						otherExpense: this.otherExpense == '' ? 0 : this.otherExpense, //其他费用
-						shareAddress: this.pbAddress,
-						transCompany: this.wlName.shippingMethodId || this.wlName.id,
-						companyName: this.wlName.shippingMethod || this.wlName.companyName,
-						companyPhone: this.wlName.mobile
-					},
-					saleDetailList: [],
-					saleReturnDTO:{
-						returnSale:[],
-						returnSaleDetailList:[]
-					}
-				}
-				
-				let purchaseDetails = [];
-				let returnList = [];
-				let ZreturnCount = 0
-				await this.carList.forEach(function(value, key) {
-					if(value.productSn == "" || value.productSn == null){
-						that.tui.toast('开单商品货号不能为空')
-						throw Error('1')
-					}
-					let returnGoods = []
-					let goodsList = []
-					value.purchasePrice = value.isNew ?'':value.purchasePrice
-					value.stockLogList.forEach(function(values, keys) {
-						if(values.productCount == 0){
-							that.tui.toast(value.productSn+ '的规格值不能为0')
-							throw Error('1')
-						}
-						if(values.productCount < 0){
-							let obj1 = {
-								productCount: Math.abs(values.productCount),
-								attributeList: keys
-							}
-							returnGoods.push(obj1)
-						}else{
-							let obj1 = {
-								productCount: values.productCount,
-								attributeList: keys
-							}
-							goodsList.push(obj1)
-						}
-						
-					})
-					that.$nextTick(()=>{
-						if(returnGoods.length > 0){
-							let data  = {
-								categoryId: value.categoryId || this.categoryList.categoryId,
-								disNoAmount: value.disNoAmount,
-								discount: value.discount,
-								discountAmount: value.returnPrice,
-								lsprice: value.lsprice?value.lsprice:0,
-								price: value.price,
-								productCount: value.productCount,
-								productId: value.isNew?'':value.productId,
-								productName: value.productName,
-								productPicture: value.productPicture,
-								productSn: value.productSn,
-								purchasePrice: value.purchasePrice,
-								returnCount: value.returnCount,
-								returnPrice: value.returnPrice,
-								stockLogList: value.stockLogList,
-								stockLogList1: returnGoods,
-								supplierName: value.supplierName,
-								unitPrice: value.unitPrice,
-								wholesalePrice: value.wholesalePrice
-							}
-							ZreturnCount += value.returnPrice * value.returnCount
-							returnList.push(data)
-						}
-						if(goodsList.length > 0){
-							let data  = {
-								categoryId: value.categoryId,
-								disNoAmount: value.disNoAmount,
-								discount: value.discount,
-								discountAmount: value.discountAmount,
-								price: value.lsprice?value.lsprice:0,
-								productCount: value.productCount,
-								productId: value.isNew?'':value.productId,
-								productName: value.productName,
-								productPicture: value.productPicture,
-								productPictures:value.productPictures,
-								productSn: value.productSn,
-								purchasePrice: value.purchasePrice,
-								returnCount: value.returnCount,
-								returnPrice: value.returnPrice,
-								stockLogList: value.stockLogList,
-								stockLogList1: goodsList,
-								supplierName: value.supplierName,
-								unitPrice: value.unitPrice,
-								wholesalePrice: value.isNew?value.discountAmount:value.wholesalePrice
-							}
-							purchaseDetails.push(data)
-						}
-					})
-				})
-				await that.$nextTick(()=>{
-					setTimeout(res=>{
-						obj.saleDetailList = purchaseDetails;
-						if(returnList != ''){
-							obj.saleReturnDTO.returnSale = {
-								alreadyEarn: this.priceOk, //已付金额
-								realAmount: this.relPrice, //实收金额
-								noEarn: this.relPrice - this.priceOk, //欠款
-								totalAmount: ZreturnCount, //总金额
-								debtDeductionAmount:this.qiankuandikou,
-								saleDeductionAmount:this.xiaoshoudikou,
-								balanceDeductionAmount:this.yuedikou,
-								area: this.khName.area,
-								city: this.khName.city,
-								province: this.khName.province,
-								payStatus: 1,
-								payType:this.payType,
-								receiveAddress: this.khName.address || this.khName.receiveAddress,
-								userId: this.khName.id,
-								userName: this.khName.name,
-								transportType: 2,
-								modeOfService: this.radioType1,
-								discount: this.discountNum,
-								createBy: this.xsyId,
-								createByName: this.createByName,
-								remark: this.remark,
-								otherExpense: this.otherExpense == '' ? 0 : this.otherExpense, //其他费用
-								shareAddress: this.pbAddress,
-								transCompany: this.wlName.shippingMethodId || this.wlName.id,
-								companyName: this.wlName.shippingMethod || this.wlName.companyName,
-								companyPhone: this.wlName.mobile
-							}
-							obj.saleReturnDTO.returnSaleDetailList = returnList;
-						}else{
-							obj.saleReturnDTO = null
-						}
-					},500)
-				})
+				}
+				let obj = {
+					orderByWorker: this.lbgName.workerId || this.kdyName.workerId,
+					oldSaleId: this.saleId || '',
+					sale: {
+						// relPrice:,
+						status: type == 'hang' ? '7' : '',
+						alreadyEarn: this.priceOk, //已付金额
+						realAmount: this.relPrice, //实收金额
+						noEarn: this.relPrice - this.priceOk, //欠款
+						totalAmount: this.shouldPay, //总金额
+						debtDeductionAmount: this.qiankuandikou,
+						saleDeductionAmount: this.xiaoshoudikou,
+						balanceDeductionAmount: this.yuedikou,
+						area: this.khName.area,
+						city: this.khName.city,
+						province: this.khName.province,
+						payStatus: 1,
+						payType: this.payType,
+						receiveAddress: this.khName.address || this.khName.receiveAddress,
+						userId: this.khName.id,
+						userName: this.khName.name,
+						transportType: this.radioType1 == 1 ? 2 : this.radioType, //this.radioType
+						modeOfService: this.radioType1,
+						discount: this.discountNum,
+						createBy: this.xsyId,
+						createByName: this.createByName,
+						remark: this.remark,
+						otherExpense: this.otherExpense == '' ? 0 : this.otherExpense, //其他费用
+						shareAddress: this.pbAddress,
+						transCompany: this.wlName.shippingMethodId || this.wlName.id,
+						companyName: this.wlName.shippingMethod || this.wlName.companyName,
+						companyPhone: this.wlName.mobile
+					},
+					saleDetailList: [],
+					saleReturnDTO: {
+						returnSale: [],
+						returnSaleDetailList: []
+					}
+				}
+
+				let purchaseDetails = [];
+				let returnList = [];
+				let ZreturnCount = 0
+				await this.carList.forEach(function(value, key) {
+					if (value.productSn == "" || value.productSn == null) {
+						that.tui.toast('开单商品货号不能为空')
+						throw Error('1')
+					}
+					let returnGoods = []
+					let goodsList = []
+					value.purchasePrice = value.isNew ? '' : value.purchasePrice
+					value.stockLogList.forEach(function(values, keys) {
+						if (values.productCount == 0) {
+							that.tui.toast(value.productSn + '的规格值不能为0')
+							throw Error('1')
+						}
+						if (values.productCount < 0) {
+							let obj1 = {
+								productCount: Math.abs(values.productCount),
+								attributeList: keys
+							}
+							returnGoods.push(obj1)
+						} else {
+							let obj1 = {
+								productCount: values.productCount,
+								attributeList: keys
+							}
+							goodsList.push(obj1)
+						}
+
+					})
+					that.$nextTick(() => {
+						if (returnGoods.length > 0) {
+							let data = {
+								categoryId: value.categoryId || this.categoryList.categoryId,
+								disNoAmount: value.disNoAmount,
+								discount: value.discount,
+								discountAmount: value.returnPrice,
+								lsprice: value.lsprice ? value.lsprice : 0,
+								price: value.price,
+								productCount: value.productCount,
+								productId: value.isNew ? '' : value.productId,
+								productName: value.productName,
+								productPicture: value.productPicture,
+								productSn: value.productSn,
+								purchasePrice: value.purchasePrice,
+								returnCount: value.returnCount,
+								returnPrice: value.returnPrice,
+								stockLogList: value.stockLogList,
+								stockLogList1: returnGoods,
+								supplierName: value.supplierName,
+								unitPrice: value.unitPrice,
+								wholesalePrice: value.wholesalePrice
+							}
+							ZreturnCount += value.returnPrice * value.returnCount
+							returnList.push(data)
+						}
+						if (goodsList.length > 0) {
+							let data = {
+								categoryId: value.categoryId,
+								disNoAmount: value.disNoAmount,
+								discount: value.discount,
+								discountAmount: value.discountAmount,
+								price: value.lsprice ? value.lsprice : 0,
+								productCount: value.productCount,
+								productId: value.isNew ? '' : value.productId,
+								productName: value.productName,
+								productPicture: value.productPicture,
+								productPictures: value.productPictures,
+								productSn: value.productSn,
+								purchasePrice: value.purchasePrice,
+								returnCount: value.returnCount,
+								returnPrice: value.returnPrice,
+								stockLogList: value.stockLogList,
+								stockLogList1: goodsList,
+								supplierName: value.supplierName,
+								unitPrice: value.unitPrice,
+								wholesalePrice: value.isNew ? value.discountAmount : value
+									.wholesalePrice
+							}
+							purchaseDetails.push(data)
+						}
+					})
+				})
+				await that.$nextTick(() => {
+					setTimeout(res => {
+						obj.saleDetailList = purchaseDetails;
+						if (returnList != '') {
+							obj.saleReturnDTO.returnSale = {
+								alreadyEarn: this.priceOk, //已付金额
+								realAmount: this.relPrice, //实收金额
+								noEarn: this.relPrice - this.priceOk, //欠款
+								totalAmount: ZreturnCount, //总金额
+								debtDeductionAmount: this.qiankuandikou,
+								saleDeductionAmount: this.xiaoshoudikou,
+								balanceDeductionAmount: this.yuedikou,
+								area: this.khName.area,
+								city: this.khName.city,
+								province: this.khName.province,
+								payStatus: 1,
+								payType: this.payType,
+								receiveAddress: this.khName.address || this.khName.receiveAddress,
+								userId: this.khName.id,
+								userName: this.khName.name,
+								transportType: 2,
+								modeOfService: this.radioType1,
+								discount: this.discountNum,
+								createBy: this.xsyId,
+								createByName: this.createByName,
+								remark: this.remark,
+								otherExpense: this.otherExpense == '' ? 0 : this
+									.otherExpense, //其他费用
+								shareAddress: this.pbAddress,
+								transCompany: this.wlName.shippingMethodId || this.wlName.id,
+								companyName: this.wlName.shippingMethod || this.wlName.companyName,
+								companyPhone: this.wlName.mobile
+							}
+							obj.saleReturnDTO.returnSaleDetailList = returnList;
+						} else {
+							obj.saleReturnDTO = null
+						}
+					}, 500)
+				})
 				this.sellObj = obj
-				this.$refs.showPopup.open()
+				if (type != 'hang') {
+					this.$refs.showPopup.open()
+				}
+			},
+			hangOrderFn() {
+				let that = this;
+				this.showPrice1("hang")
+				uni.showModal({
+					title: "提示",
+					content: "挂单后可从首页挂单中查看，是否继续？",
+					success: function(res) {
+						uni.showLoading({
+							title: '加载中...'
+						})
+						if (res.confirm) {
+							that.sellObj.sale.saleId = that.sellObj.oldSaleId
+							that.tui.request('/app/sale/temporarySaveSale', "post", that.sellObj, false, false)
+								.then((res) => {
+									if (res.code == 200) {
+										uni.showToast({
+											title: "挂单成功",
+											icon: 'none'
+										})
+										setTimeout(res1 => {
+											that.clearAll1()
+											// uni.switchTab({
+											// 	url: '/pages/index/index'
+											// });
+										}, 1000)
+									} else {
+										that.tui.toast(res.message)
+									}
+								})
+						}
+						setTimeout(res => {
+							uni.hideLoading();
+						}, 500)
+					}
+				})
 			},
 			//点击底部开单按钮
 			async goSell() {
@@ -4301,28 +6499,28 @@
 					title: '加载中...'
 				})
 				this.$refs.showPopup.close()
-				let url = ''
-				if (this.saleId != '') {
-					url = '/app/sale/shareToBuyNew'
-				} else {
-					url = '/app/sale/buyNew'
-				}
-				this.tui.request(url, "post", this.sellObj, false, false).then((res) => {
-					if (res.code == 200) {
-						uni.showToast({
-							title: "开单成功",
-							icon: 'none'
-						})
-						setTimeout(res1 => {
-							this.$refs.showPopup.close()
-							that.clearAll1()
-							uni.navigateTo({
-								url: '/package1/index/orderDetail?id='+res.result
-							})
-						}, 1000)
-					} else {
-						this.tui.toast(res.message)
-					}
+				let url = ''
+				if (this.saleId != '') {
+					url = '/app/sale/shareToBuyNew'
+				} else {
+					url = '/app/sale/buyNew'
+				}
+				this.tui.request(url, "post", this.sellObj, false, false).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: "开单成功",
+							icon: 'none'
+						})
+						setTimeout(res1 => {
+							this.$refs.showPopup.close()
+							that.clearAll1()
+							uni.navigateTo({
+								url: '/package1/index/orderDetail?id=' + res.result
+							})
+						}, 1000)
+					} else {
+						this.tui.toast(res.message)
+					}
 				})
 				setTimeout(res => {
 					uni.hideLoading();
@@ -4334,10 +6532,10 @@
 				this.wholesalePrice = this.carList.get(this.index).wholesalePrice
 				this.lsprice = this.carList.get(this.index).lsprice
 				this.$refs.inputDialog.open()
-			},
-			//输入商品自定义退货金额
-			changeReturnPay(e) {
-				this.returnPrice = e.detail.value
+			},
+			//输入商品自定义退货金额
+			changeReturnPay(e) {
+				this.returnPrice = e.detail.value
 			},
 			//输入商品自定义金额
 			changePay(e) {
@@ -4346,19 +6544,19 @@
 			//更改单品折扣
 			changeDis(e, id) {
 				let that = this;
-				let carlist = this.carList.get(id)
-				if(this.linshiPrice == e.target.value){
-					carlist.discount = e.target.value
-				}else{
-					if (e.detail.value > 10) {
-						carlist.discount = 10;
-					} else if (e.detail.value < 0) {
-						carlist.discount = 0;
-					} else if(e.detail.value == ''){
-						carlist.discount = this.linshiPrice
-					}else{
-						carlist.discount = e.detail.value;
-					}
+				let carlist = this.carList.get(id)
+				if (this.linshiPrice == e.target.value) {
+					carlist.discount = e.target.value
+				} else {
+					if (e.detail.value > 10) {
+						carlist.discount = 10;
+					} else if (e.detail.value < 0) {
+						carlist.discount = 0;
+					} else if (e.detail.value == '') {
+						carlist.discount = this.linshiPrice
+					} else {
+						carlist.discount = e.detail.value;
+					}
 				}
 
 				carlist.discountAmount = carlist.unitPrice * carlist.discount / 10
@@ -4404,17 +6602,19 @@
 					title: "提示",
 					content: "确定删除此条规格吗？",
 					success: function(res) {
-						if (res.confirm) {
-							if(that.carList.get(id).stockLogList.get(name).productCount > 0){
-								that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name)
-									.productCount;
-							}else{
-								that.carList.get(id).returnCount -= Math.abs(that.carList.get(id).stockLogList.get(name).productCount);
+						if (res.confirm) {
+							if (that.carList.get(id).stockLogList.get(name).productCount > 0) {
+								that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(
+										name)
+									.productCount;
+							} else {
+								that.carList.get(id).returnCount -= Math.abs(that.carList.get(id).stockLogList
+									.get(name).productCount);
 							}
-							that.carList.get(id).stockLogList.delete(name);
-							that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(
+							that.carList.get(id).stockLogList.delete(name);
+							that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(
 								id).unitPrice
-							
+
 							if (that.carList.get(id).stockLogList.size == 0) {
 								that.carList.delete(id)
 							}
@@ -4425,184 +6625,192 @@
 					}
 				})
 
-			},
-			getCountMethod(){
-				let that = this;
-				if(that.tanyue && that.tanxiaoshou){
-					if(that.zhiqianqiankuan > 0){
-						if(parseFloat(that.returnPay) == 0){
-							this.methodText = '实收金额('+that.relPrice+')=' + that.shouldPay
-						}else{
-							if(parseFloat(that.returnPay) >= parseFloat(that.zhiqianqiankuan)){
-								this.methodText = '实收金额('+that.relPrice+')=' + that.shouldPay +'-'+ that.returnPay +'+'+ that.zhiqianqiankuan
-							}else if(parseFloat(that.returnPay) < parseFloat(that.zhiqianqiankuan)){
-								this.methodText = '实收金额('+that.relPrice+')=' + that.shouldPay
-							}
-						} 
-					}else if(parseFloat(that.zhiqianqiankuan) < 0){
-						if(that.shouldPay > Math.abs(that.zhiqianqiankuan)){
-							this.methodText = '实收金额('+that.relPrice+')=' + that.shouldPay +'+'+ Math.abs(that.zhiqianqiankuan)
-						}else if(that.shouldPay <= Math.abs(that.zhiqianqiankuan)){
-							this.methodText = '实收金额=0'
-						}
-						if(that.returnPay != 0){
-							this.methodText = '客户有余额，余额抵扣了销售，实收金额('+that.relPrice+')=' + this.relPrice
-						}
-					}else if(parseFloat(that.zhiqianqiankuan) == 0){
-						if(parseFloat(that.returnPay) > 0){
-							this.methodText = '实收金额('+that.relPrice+')='+ that.shouldPay +'-'+ that.returnPay
-							if(parseFloat(that.returnPay) >= parseFloat(that.zhiqianqiankuan)){
-								this.methodText = '实收金额('+that.relPrice+')=' + that.shouldPay +'-'+ that.returnPay +'+'+ that.zhiqianqiankuan
-							}else if(parseFloat(that.returnPay) < parseFloat(that.zhiqianqiankuan)){
-								this.methodText = '实收金额('+that.relPrice+')=' + this.shouldPay
-							}
-						}else if(parseFloat(that.returnPay) == 0){
-							this.methodText = '实收金额('+that.relPrice+')=' +this.shouldPay
-						}
-					}
-				}
-				this.$forceUpdate()
-				this.methodMask = !this.methodMask
-				setTimeout(res=>{
-					this.methodMask = !this.methodMask
-				},2000)
+			},
+			getCountMethod() {
+				let that = this;
+				if (that.tanyue && that.tanxiaoshou) {
+					if (that.zhiqianqiankuan > 0) {
+						if (parseFloat(that.returnPay) == 0) {
+							this.methodText = '实收金额(' + that.relPrice + ')=' + that.shouldPay
+						} else {
+							if (parseFloat(that.returnPay) >= parseFloat(that.zhiqianqiankuan)) {
+								this.methodText = '实收金额(' + that.relPrice + ')=' + that.shouldPay + '-' + that.returnPay +
+									'+' + that.zhiqianqiankuan
+							} else if (parseFloat(that.returnPay) < parseFloat(that.zhiqianqiankuan)) {
+								this.methodText = '实收金额(' + that.relPrice + ')=' + that.shouldPay
+							}
+						}
+					} else if (parseFloat(that.zhiqianqiankuan) < 0) {
+						if (that.shouldPay > Math.abs(that.zhiqianqiankuan)) {
+							this.methodText = '实收金额(' + that.relPrice + ')=' + that.shouldPay + '+' + Math.abs(that
+								.zhiqianqiankuan)
+						} else if (that.shouldPay <= Math.abs(that.zhiqianqiankuan)) {
+							this.methodText = '实收金额=0'
+						}
+						if (that.returnPay != 0) {
+							this.methodText = '客户有余额，余额抵扣了销售，实收金额(' + that.relPrice + ')=' + this.relPrice
+						}
+					} else if (parseFloat(that.zhiqianqiankuan) == 0) {
+						if (parseFloat(that.returnPay) > 0) {
+							this.methodText = '实收金额(' + that.relPrice + ')=' + that.shouldPay + '-' + that.returnPay
+							if (parseFloat(that.returnPay) >= parseFloat(that.zhiqianqiankuan)) {
+								this.methodText = '实收金额(' + that.relPrice + ')=' + that.shouldPay + '-' + that.returnPay +
+									'+' + that.zhiqianqiankuan
+							} else if (parseFloat(that.returnPay) < parseFloat(that.zhiqianqiankuan)) {
+								this.methodText = '实收金额(' + that.relPrice + ')=' + this.shouldPay
+							}
+						} else if (parseFloat(that.returnPay) == 0) {
+							this.methodText = '实收金额(' + that.relPrice + ')=' + this.shouldPay
+						}
+					}
+				}
+				this.$forceUpdate()
+				this.methodMask = !this.methodMask
+				setTimeout(res => {
+					this.methodMask = !this.methodMask
+				}, 2000)
 			},
 			//计算总金额和总数量
-			getAllPrice(price,type) {
-				if(type == 'tanyue'){
-					this.tanyue = !this.tanyue
-				}else if(type == 'tanxiaoshou'){
-					this.tanxiaoshou = !this.tanxiaoshou
+			getAllPrice(price, type) {
+				if (type == 'tanyue') {
+					this.tanyue = !this.tanyue
+				} else if (type == 'tanxiaoshou') {
+					this.tanxiaoshou = !this.tanxiaoshou
 				}
 				let that = this;
-				this.totalAmount = 0
+				this.totalAmount = 0
 				that.returnTotalAmount = 0
-				that.returnPay = 0
-				that.qiankuandikou = 0
-				that.xiaoshoudikou = 0
-				that.leijiqiankuan = 0
-				that.yuedikou = 0
-				if(!price){
-					this.shouldPay = 0
-				}
-				this.carList.forEach(function(value, key) {
-					if(!price){
-						that.shouldPay = Number(that.shouldPay) + Number(value.price)
-					}
-					that.returnPay = Number(that.returnPay) + (Number(value.returnPrice) * Math.abs(Number(value.returnCount)))
-					if(!price){
-						if(value.productCount > 0){
-							that.totalAmount = Number(that.totalAmount) + Number(value.productCount)
-						}
-					}
-					that.returnTotalAmount = Number(that.returnTotalAmount) + Number(value.returnCount)
-				})
-				if(!price){
-					that.shouldPay = that.shouldPay.toFixed(2)
-				}
-				that.returnPay = that.returnPay.toFixed(2) 
-				/**
-				 * that.shouldPay   	 销售金额
-				 * that.returnPay   	 退货金额
-				 * that.zhiqianqiankuan  之前欠款
-				 * that.qiankuandikou    欠款抵扣
-				 * that.xiaoshoudikou    销售抵扣
-				 * that.yuedikou		 余额抵扣
-				 * that.leijiqiankuan    累计欠款
-				 * that.relPrice 		 实收金额
-				 * that.priceOk  		 已收金额
-				 */
-				this.$nextTick(()=>{
-					if(that.tanyue && that.tanxiaoshou){
-						if(that.zhiqianqiankuan > 0){
-							if(parseFloat(that.returnPay) == 0){
-								that.relPrice = that.shouldPay
-								that.qiankuandikou = 0
-								that.xiaoshoudikou = 0
-							}else{
-								if(parseFloat(that.returnPay) >= parseFloat(that.zhiqianqiankuan)){
-									that.qiankuandikou = that.zhiqianqiankuan
-									if(parseFloat(that.shouldPay) > parseFloat(that.returnPay) - that.zhiqianqiankuan){
-										that.xiaoshoudikou = that.returnPay - that.zhiqianqiankuan
-									}else if(that.shouldPay <= that.returnPay - that.zhiqianqiankuan){
-										that.xiaoshoudikou = that.shouldPay
-									}
-									that.relPrice = that.shouldPay - (that.returnPay - that.zhiqianqiankuan)
-								}else if(parseFloat(that.returnPay) < parseFloat(that.zhiqianqiankuan)){
-									that.qiankuandikou = that.returnPay
-									that.relPrice = that.shouldPay
-									that.xiaoshoudikou = 0
-									
-								}
-							} 
-						}else if(parseFloat(that.zhiqianqiankuan) < 0){
-							if(that.shouldPay > Math.abs(that.zhiqianqiankuan)){
-								that.yuedikou = Math.abs(that.zhiqianqiankuan)
-								this.relPrice = this.shouldPay - Math.abs(that.zhiqianqiankuan)
-							}else if(that.shouldPay <= Math.abs(that.zhiqianqiankuan)){
-								that.yuedikou = that.shouldPay
-								this.relPrice = 0
-							}
-							if(that.returnPay != 0){
-								this.relPrice = this.relPrice - that.returnPay
-							}
-						}else if(parseFloat(that.zhiqianqiankuan) == 0){
-							if(parseFloat(that.returnPay) > 0){
-								this.relPrice = that.shouldPay - that.returnPay
-								if(parseFloat(that.returnPay) >= parseFloat(that.zhiqianqiankuan)){
-									that.qiankuandikou = that.zhiqianqiankuan
-									if(parseFloat(that.shouldPay) > parseFloat(that.returnPay) - that.zhiqianqiankuan){
-										that.xiaoshoudikou = that.returnPay - that.zhiqianqiankuan
-									}else if(that.shouldPay <= that.returnPay - that.zhiqianqiankuan){
-										that.xiaoshoudikou = that.shouldPay
-									}
-									this.relPrice = that.shouldPay - (that.returnPay - that.zhiqianqiankuan)
-								}else if(parseFloat(that.returnPay) < parseFloat(that.zhiqianqiankuan)){
-									that.qiankuandikou = that.returnPay
-									this.relPrice = this.shouldPay
-									that.xiaoshoudikou = 0
-									
-								}
-							}else if(parseFloat(that.returnPay) == 0){
-								this.relPrice = that.shouldPay
-								that.qiankuandikou = 0
-								that.xiaoshoudikou = 0
-							}
-						}
-					}
-					
-					this.priceOk = this.relPrice
-					that.noPay = this.relPrice - (this.priceOk == '' ? 0 : this.priceOk)
-					that.noPay = that.noPay.toFixed(2)
-					this.leijiqiankuan = Number(this.zhiqianqiankuan) -  Number(this.qiankuandikou) +  Number(this.yuedikou) +  Number(this.noPay)
-					this.$forceUpdate()
+				that.returnPay = 0
+				that.qiankuandikou = 0
+				that.xiaoshoudikou = 0
+				that.leijiqiankuan = 0
+				that.yuedikou = 0
+				if (!price) {
+					this.shouldPay = 0
+				}
+				this.carList.forEach(function(value, key) {
+					if (!price) {
+						that.shouldPay = Number(that.shouldPay) + Number(value.price)
+					}
+					that.returnPay = Number(that.returnPay) + (Number(value.returnPrice) * Math.abs(Number(value
+						.returnCount)))
+					if (!price) {
+						if (value.productCount > 0) {
+							that.totalAmount = Number(that.totalAmount) + Number(value.productCount)
+						}
+					}
+					that.returnTotalAmount = Number(that.returnTotalAmount) + Number(value.returnCount)
 				})
-			},
-			noReturn(){
-				this.priceOk = 0
-				this.noPay = this.relPrice - (this.priceOk == '' ? 0 : this.priceOk)
-				this.noPay = this.noPay.toFixed(2)
-				this.leijiqiankuan = Number(this.zhiqianqiankuan) -  Number(this.qiankuandikou) +  Number(this.yuedikou) +  Number(this.noPay)
-			},
-			getkhName(){
-				this.tui.request("/app/customer/list", "post", {
-					notBuyDays: "",
-					pageNum: 1,
-					pageSize: 10,
-					searchStr: "散客",
-					sort: "",
-				}, false, false).then((res) => {
+				if (!price) {
+					that.shouldPay = that.shouldPay.toFixed(2)
+				}
+				that.returnPay = that.returnPay.toFixed(2)
+				/**
+				 * that.shouldPay   	 销售金额
+				 * that.returnPay   	 退货金额
+				 * that.zhiqianqiankuan  之前欠款
+				 * that.qiankuandikou    欠款抵扣
+				 * that.xiaoshoudikou    销售抵扣
+				 * that.yuedikou		 余额抵扣
+				 * that.leijiqiankuan    累计欠款
+				 * that.relPrice 		 实收金额
+				 * that.priceOk  		 已收金额
+				 */
+				this.$nextTick(() => {
+					if (that.tanyue && that.tanxiaoshou) {
+						if (that.zhiqianqiankuan > 0) {
+							// if (parseFloat(that.returnPay) == 0) {
+								that.relPrice = that.shouldPay
+								that.qiankuandikou = 0
+								that.xiaoshoudikou = 0
+							// } else {
+							// 	if (parseFloat(that.returnPay) >= parseFloat(that.zhiqianqiankuan)) {
+							// 		that.qiankuandikou = that.zhiqianqiankuan
+							// 		if (parseFloat(that.shouldPay) > parseFloat(that.returnPay) - that
+							// 			.zhiqianqiankuan) {
+							// 			that.xiaoshoudikou = that.returnPay - that.zhiqianqiankuan
+							// 		} else if (that.shouldPay <= that.returnPay - that.zhiqianqiankuan) {
+							// 			that.xiaoshoudikou = that.shouldPay
+							// 		}
+							// 		that.relPrice = that.shouldPay - (that.returnPay - that.zhiqianqiankuan)
+							// 	} else if (parseFloat(that.returnPay) < parseFloat(that.zhiqianqiankuan)) {
+							// 		that.qiankuandikou = that.returnPay
+							// 		that.relPrice = that.shouldPay
+							// 		that.xiaoshoudikou = 0
+
+							// 	}
+							// }
+						} else if (parseFloat(that.zhiqianqiankuan) < 0) {
+							if (that.shouldPay > Math.abs(that.zhiqianqiankuan)) {
+								that.yuedikou = Math.abs(that.zhiqianqiankuan)
+								this.relPrice = this.shouldPay - Math.abs(that.zhiqianqiankuan)
+							} else if (that.shouldPay <= Math.abs(that.zhiqianqiankuan)) {
+								that.yuedikou = that.shouldPay
+								this.relPrice = 0
+							}
+							// if (that.returnPay != 0) {
+							// 	this.relPrice = this.relPrice - that.returnPay
+							// }
+						} else if (parseFloat(that.zhiqianqiankuan) == 0) {
+							// if (parseFloat(that.returnPay) > 0) {
+							// 	this.relPrice = that.shouldPay - that.returnPay
+							// 	if (parseFloat(that.returnPay) >= parseFloat(that.zhiqianqiankuan)) {
+							// 		that.qiankuandikou = that.zhiqianqiankuan
+							// 		if (parseFloat(that.shouldPay) > parseFloat(that.returnPay) - that
+							// 			.zhiqianqiankuan) {
+							// 			that.xiaoshoudikou = that.returnPay - that.zhiqianqiankuan
+							// 		} else if (that.shouldPay <= that.returnPay - that.zhiqianqiankuan) {
+							// 			that.xiaoshoudikou = that.shouldPay
+							// 		}
+							// 		this.relPrice = that.shouldPay - (that.returnPay - that.zhiqianqiankuan)
+							// 	} else if (parseFloat(that.returnPay) < parseFloat(that.zhiqianqiankuan)) {
+							// 		that.qiankuandikou = that.returnPay
+							// 		this.relPrice = this.shouldPay
+							// 		that.xiaoshoudikou = 0
+
+							// 	}
+							// } else if (parseFloat(that.returnPay) == 0) {
+								this.relPrice = that.shouldPay
+								that.qiankuandikou = 0
+								that.xiaoshoudikou = 0
+							// }
+						}
+					}
+
+					this.priceOk = this.relPrice
+					that.noPay = this.relPrice - (this.priceOk == '' ? 0 : this.priceOk)
+					that.noPay = that.noPay.toFixed(2)
+					this.leijiqiankuan = Number(this.zhiqianqiankuan) - Number(this.qiankuandikou) + Number(this
+						.yuedikou) + Number(this.noPay)
+					this.$forceUpdate()
+				})
+			},
+			noReturn() {
+				this.priceOk = 0
+				this.noPay = this.relPrice - (this.priceOk == '' ? 0 : this.priceOk)
+				this.noPay = this.noPay.toFixed(2)
+				this.leijiqiankuan = Number(this.zhiqianqiankuan) - Number(this.qiankuandikou) + Number(this.yuedikou) +
+					Number(this.noPay)
+			},
+			getkhName() {
+				this.tui.request("/app/customer/list", "post", {
+					notBuyDays: "",
+					pageNum: 1,
+					pageSize: 10,
+					searchStr: "散客",
+					sort: "",
+				}, false, false).then((res) => {
 					if (res.code == 200) {
-						this.khData = res.result.records[0]
-						this.khName = {
-							id:res.result.records[0].id,
-							name:res.result.records[0].name,
-							noEarn:null
-						}
-					}else{
-						this.tui.toast(res.message)
-					}
-				})
+						this.khData = res.result.records[0]
+						this.khName = {
+							id: res.result.records[0].id,
+							name: res.result.records[0].name,
+							noEarn: null
+						}
+					} else {
+						this.tui.toast(res.message)
+					}
+				})
 			},
 			clearAll1() {
 				let that = this;
@@ -4610,26 +6818,26 @@
 				that.remark = ''
 				that.index = ''
 				that.priceCurrent = ''
-				that.lunbocurrent = 4
+				that.lunbocurrent = 4
 				that.radioType = '2'
 				that.discountType = ''
-				that.pbAddress = ''
-				that.zhiqianqiankuan = 0
-				that.leijiqiankuan = 0
-				that.qiankuandikou = 0
-				that.returnPay = 0
-				that.yuedikou = 0
+				that.pbAddress = ''
+				that.zhiqianqiankuan = 0
+				that.leijiqiankuan = 0
+				that.qiankuandikou = 0
+				that.returnPay = 0
+				that.yuedikou = 0
 				that.xiaoshoudikou = 0
 				that.discountCurrent = ''
 				that.temporaryList = []
 				that.purchasePrice = 0
 				that.zPrice = 0
 				that.zNum = 0
-				that.shouldPay = 0
+				that.shouldPay = 0
 				that.khName = {
-					id:that.khData.id,
-					name:that.khData.name,
-					noEarn:null
+					id: that.khData.id,
+					name: that.khData.name,
+					noEarn: null
 				}
 				that.gysName = []
 				that.wlName = []
@@ -4639,7 +6847,7 @@
 				that.priceOk = 0
 				that.noPay = 0
 				that.otherExpense = 0
-				that.totalAmount = 0
+				that.totalAmount = 0
 				that.returnTotalAmount = 0
 				that.saleId = ''
 				that.$forceUpdate()
@@ -4665,21 +6873,21 @@
 							that.lunbocurrent = 4
 							that.discountType = ''
 							that.discountCurrent = null
-							that.temporaryList = []
-							that.zhiqianqiankuan = 0
-							that.returnPay = 0
-							that.qiankuandikou = 0
-							that.yuedikou = 0
-							that.xiaoshoudikou = 0
+							that.temporaryList = []
+							that.zhiqianqiankuan = 0
+							that.returnPay = 0
+							that.qiankuandikou = 0
+							that.yuedikou = 0
+							that.xiaoshoudikou = 0
 							that.leijiqiankuan = 0
 							that.purchasePrice = 0
 							that.zPrice = 0
 							that.zNum = 0
-							that.shouldPay = 0
+							that.shouldPay = 0
 							that.khName = {
-								id:that.khData.id,
-								name:that.khData.name,
-								noEarn:null
+								id: that.khData.id,
+								name: that.khData.name,
+								noEarn: null
 							}
 							that.gysName = []
 							that.wlName = []
@@ -4689,7 +6897,7 @@
 							that.priceOk = 0
 							that.noPay = 0
 							that.otherExpense = 0
-							that.totalAmount = 0
+							that.totalAmount = 0
 							that.returnTotalAmount = 0
 							that.saleId = ''
 							that.priceCurrent = null
@@ -4875,24 +7083,24 @@
 			background: #fff;
 			height: 60rpx;
 		}
-	}
-	
-	.price-box{
-		width: 95%;
-		margin: 10px auto;
-		background: #eee;
-		height: 80rpx;
-		display: flex;
-		line-height: 80rpx;
-		text-align: center;
-		overflow: hidden;
-		border-radius: 10px;
-		background: #FDF5E6;
-		color: #EEB422;
-		background: linear-gradient(180deg, #fff, #FDF5E6);
-		border: 1px solid #FAEBD7;
-	}
-	
+	}
+
+	.price-box {
+		width: 95%;
+		margin: 10px auto;
+		background: #eee;
+		height: 80rpx;
+		display: flex;
+		line-height: 80rpx;
+		text-align: center;
+		overflow: hidden;
+		border-radius: 10px;
+		background: #FDF5E6;
+		color: #EEB422;
+		background: linear-gradient(180deg, #fff, #FDF5E6);
+		border: 1px solid #FAEBD7;
+	}
+
 	.price-box-title {
 		width: 95%;
 		height: 80rpx;
@@ -4927,8 +7135,9 @@
 	.bottom-left {
 		flex: 1;
 		height: 110rpx;
-		line-height: 110rpx;
 		font-size: 26rpx;
+		display: flex;
+		flex-direction: column;
 	}
 
 	.notice {
@@ -4937,20 +7146,20 @@
 	}
 
 	.bottom-right {
-		width: 50%;
+		width: 70%;
 		display: flex;
 
 		.bottom-btn {
 			margin: 0;
 			padding: 0;
-			width: 45%;
+			width: 30%;
 			line-height: 35px;
 			height: 70rpx;
 			text-align: center;
-			margin-top: 10rpx;
+			margin: 15rpx 0 0 2%;
 			color: #fff;
 			font-size: 28rpx;
-			border-radius: 0;
+			border-radius: 5px;
 		}
 
 		.bottom-btn:first-child {
@@ -4968,14 +7177,14 @@
 	}
 
 	.bottom-left text {
-		line-height: 84rpx;
 		display: inline-block;
 		padding-left: 20rpx;
+		padding-top: 10rpx;
 	}
 
 	.bottom-btn {
 		width: 320rpx;
-		background: linear-gradient(90deg, #60F3FF, #088FEB);
+		background: #D8BFD8;
 		color: #fff;
 		border-radius: 50rpx;
 		height: 85rpx;
@@ -5113,6 +7322,57 @@
 		margin-top: 50rpx;
 	}
 
+	.right-box {
+		width: 100%;
+		height: 190rpx;
+		display: flex;
+		border-bottom: 1px solid #eee;
+		position: relative;
+	}
+
+	.box-left {
+		width: 130rpx;
+		height: 131rpx;
+		background-size: 100%;
+		margin: 25rpx 30rpx 35rpx 10rpx;
+		border-radius: 20rpx;
+	}
+
+	.box-left img {
+		width: 100%;
+		height: 100%;
+
+	}
+
+	.box-right {
+		margin-top: 17rpx;
+	}
+
+	.box-right-name {
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+
+	.box-right-num {
+		padding: 5rpx 0;
+		color: #777;
+	}
+
+	.box-right-price {
+		display: flex;
+		font-size: 25rpx;
+	}
+
+	.voice-price-box {
+		display: flex;
+		flex-direction: column;
+		margin-right: 20rpx;
+	}
+
+	.voice-price-box text:first-child {
+		color: #ffa200
+	}
+
 	.popup-btn {
 		text-align: center;
 		background: linear-gradient(90deg, #60F3FF, #088FEB);
@@ -5269,6 +7529,8 @@
 	.type-popup {
 		width: 500rpx;
 		height: auto;
+		max-height: 900rpx;
+		overflow: scroll;
 		background: #fff;
 		border-radius: 10px;
 		position: relative;
@@ -5360,139 +7622,154 @@
 	.zuni-numbox .zuni-numbox--disabled {
 		color: #c0c0c0 !important;
 		cursor: not-allowed;
-	}
-	.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;
-		text-align: center;
-		border-top-right-radius: 10px;
-	}
-	.u-upload {
-		position: absolute;
-		top: 30rpx;
-		left: 30rpx;
-		opacity: 0;
-		width: 140rpx;
-		height: 140rpx;
-	}
-	.left-btn {
-		font-weight: 800;
-		font-size: 28rpx;
-		color: #fff;
-		background: #088FEB;
-		border-radius: 5px;
-		width: 140rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		text-align: center;
-	}
-	.one-goods{
-		margin-top: 10px;
-		width: 100%;
-		height: 50rpx;
-		background: #088FEB;
-		font-size: 28rpx;
-		text-align: center;
-		line-height: 50rpx;
-		color: #fff;
-		border-radius: 5px;
-		position: relative;
-	}
-	.jiaobiao{
-		width: 40rpx;
-		height: 40rpx;
-		border-radius: 10px;
-		color: #fff;
-		background: red;
-		position: absolute;
-		top: -5px;
-		right: -5px;
-		text-align: center;
-		line-height: 40rpx;
-		font-size: 28rpx;
-	}
-	.sn-content-list {
-		width: 95%;
-		margin: 0 auto;
-		display: flex;
-		height: 80rpx;
-		border-bottom: 1px solid #eee;
-	}
-	
-	.sn-content-list:last-child {
-		border-bottom: none;
-		height: auto;
-	}
-	.sn-list-name {
-		width: 200rpx;
-		text-align: left;
-		line-height: 40px;
-		height: 80rpx;
-		padding-left: 20rpx;
-	}
-	.showImg-box{
-		width: 500rpx;
-		height: 500rpx;
-	}
-	.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;
-	}
-	.sn-list-val {
-		width: 560rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-	}
-	.sn-list-val input {
-		width: 400rpx;
-		height: 60rpx;
-		display: inline-block;
-		line-height: 60rpx;
-		float: left;
-		margin-top: 10rpx;
-		padding-left: 20rpx;
-		border-bottom: 1px solid #088FEB;
 	}
+
+	.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;
+		text-align: center;
+		border-top-right-radius: 10px;
+	}
+
+	.u-upload {
+		position: absolute;
+		top: 30rpx;
+		left: 30rpx;
+		opacity: 0;
+		width: 140rpx;
+		height: 140rpx;
+	}
+
+	.left-btn {
+		font-weight: 800;
+		font-size: 28rpx;
+		color: #fff;
+		background: #088FEB;
+		border-radius: 5px;
+		width: 140rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		text-align: center;
+	}
+
+	.one-goods {
+		margin-top: 10px;
+		width: 100%;
+		height: 50rpx;
+		background: #088FEB;
+		font-size: 28rpx;
+		text-align: center;
+		line-height: 50rpx;
+		color: #fff;
+		border-radius: 5px;
+		position: relative;
+	}
+
+	.jiaobiao {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 10px;
+		color: #fff;
+		background: red;
+		position: absolute;
+		top: -5px;
+		right: -5px;
+		text-align: center;
+		line-height: 40rpx;
+		font-size: 28rpx;
+	}
+
+	.sn-content-list {
+		width: 95%;
+		margin: 0 auto;
+		display: flex;
+		height: 80rpx;
+		border-bottom: 1px solid #eee;
+	}
+
+	.sn-content-list:last-child {
+		border-bottom: none;
+		height: auto;
+	}
+
+	.sn-list-name {
+		width: 200rpx;
+		text-align: left;
+		line-height: 40px;
+		height: 80rpx;
+		padding-left: 20rpx;
+	}
+
+	.showImg-box {
+		width: 700rpx;
+		height: 1000rpx;
+	}
+
+	.swiper-box {
+		height: 900rpx;
+	}
+
+	.swiper-item {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 900rpx;
+		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;
+	}
+
+	.sn-list-val {
+		width: 560rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+
+	.sn-list-val input {
+		width: 400rpx;
+		height: 60rpx;
+		display: inline-block;
+		line-height: 60rpx;
+		float: left;
+		margin-top: 10rpx;
+		padding-left: 20rpx;
+		border-bottom: 1px solid #088FEB;
+	}
+
 	@media screen and (min-width: 470px) {
 		.shop-popup-content {
 			height: 900rpx;
diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue
index 5946201..dc89a55 100644
--- a/pages/inventory/inventory.vue
+++ b/pages/inventory/inventory.vue
@@ -47,7 +47,7 @@
 			</view>
 		</view>
 		<view class="search">
-			<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/货号/供应商" cancelButton="none" @confirm="search" @blur="search" @clear="clearSearch" />
+			<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/货号/供应商" cancelButton="none" @blur="search" @clear="clearSearch" />
 		</view>
 		<view class="content-left" style="height: 78%;float: left;position: fixed;top: 23%;">
 			<view v-if="gateType == ''" class="left-box" v-for="(item, index) in indexList" :key="index"
@@ -57,7 +57,7 @@
 		</view>
 		<view class="content-right" style="width: 570rpx;background: #fff;margin-left:170rpx;margin-top: 300rpx;">
 			<view class="right-box" v-for="(item,index) in shopList" :key="index" @tap="goDetail(item)">
-				<view class="box-left">
+				<view class="box-left" @tap.stop="largeImg(item)">
 					<img :src="item.productPicture" class="img-radius" alt="" v-if="item.productPicture">
 					<view class="noPic" v-else>暂无图片</view>	
 				</view>
@@ -94,13 +94,15 @@
 				</view>
 			</view>
 			<view class="right-box" v-for="(item,index) in shopList1" :key="index" @tap="goDetail(item)">
-				<view class="box-left">
+				<view class="box-left" @tap.stop="largeImg(item)">
 					<img :src="item.productPicture" class="img-radius" alt="" v-if="item.productPicture">
 					<view class="noPic" v-else>暂无图片</view>	
 				</view>
-				<view class="box-right">
-					<view class="box-right-name" style="height: 60rpx;line-height: 60rpx;">{{item.productName}}</view>
-					<view class="box-right-num">货号:{{item.productSn}}</view>
+				<view class="box-right">
+					
+					<view class="box-right-num">货号:{{item.productSn}}</view>
+					<view class="box-right-name">名称:{{item.productName == null?'暂无':item.productName}}</view>
+					<view class="box-right-name">供应商:{{item.supplierName == null?'暂无':item.supplierName}}</view>
 					<!-- 1上架  0下架 -->
 					<view class="up-down" v-if="item.delFlag ==1" @tap.stop="upDown('0',item)">下架</view>
 					<view class="up-down" v-if="item.delFlag ==0" @tap.stop="upDown('1',item)">上架</view>
@@ -146,6 +148,9 @@
 				<view class="popup-pay-container" @tap="onGridClick('5')">
 					<text style="display: inline-block">批量下架</text>
 				</view>
+				<view v-if="type == 0" class="popup-pay-container" @tap="onGridClick('6')">
+					<text style="display: inline-block">批量删除商品</text>
+				</view>
 			</view>
 		</uni-popup>
 		<!-- 弹出输入框 -->
@@ -168,6 +173,18 @@
 				<button open-type="share" @tap="$refs.sharePopup.close()" class="popup-photo">分享给微信好友</button>
 				<view @tap="$refs.sharePopup.close()" class="popup-photo" style="border-bottom:0;border-top:10px solid #eee;">取消</view>
 			</view>
+		</uni-popup>
+		<!-- 弹出多图轮播 -->
+		<uni-popup ref="imgPopup" 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 bigImg" :key="index">
+						<view class="swiper-item">
+							<image mode='aspectFit' show-menu-by-longpress :src="item.productPicture" alt="" style="width: 100%;height: 100%;border-radius: 10px;" /></image>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
 		</uni-popup>
 	</view>
 </template>
@@ -182,6 +199,8 @@
 			return {
 				size: 30,
 				indexList: [],
+				bigImg:[],
+				swiperDotIndex:0,
 				// status: 'loadmore',
 				pageNum: 1, //分页的页码
 				shopList: [],
@@ -204,7 +223,10 @@
 				uni.redirectTo({
 					url: "/package1/index/downStearmList?khid=" + option.khid
 				})
-			}
+			}
+			// if(uni.getStorageSync('noReload') == true){
+			// 	uni.removeStorageSync('noReload')
+			// }
 			let that = this
 			this.type=uni.getStorageSync('type')
 			uni.getSystemInfo({
@@ -223,19 +245,48 @@
 		onReachBottom() {
 			if (this.pageNum >= this.pages) return;
 			// this.status = 'loading';
-			this.pageNum ++;
-			this.getShareList();
+			this.pageNum ++;
+			if(this.gateType == 'search'){
+				this.getShareList('search');
+			}else{
+				this.getShareList();
+			}
+			
 		},
 		onShow() {
-			if(uni.getStorageSync('noReload') == true){
+			if(uni.getStorageSync('noReload') == true){
+				this.searchName = ''
 				uni.removeStorageSync('noReload')
-			}else{
+			}else{
+				this.searchName = ''
 				this.getGategoryList()
 			}
 			this.getWarnMsg()
 			this.getweiruku()
 		},
 		methods: {
+			lunbochange(e) {
+				this.current = e.detail.current
+			},
+			largeImg(img) {
+				if(img.productPicture == null &&img.productPictures == null ){
+					this.tui.toast("暂无可展示的图片",1000)
+					return
+				}
+				this.bigImg = []
+				if(img.productPicture != null){
+					let data = {
+						productPicture:img.productPicture
+					}
+					this.bigImg.push(data)
+				}
+				if(img.productPictures != null){
+					for(let i=0;i<img.productPictures.length;i++){
+						this.bigImg.push(img.productPictures[i])
+					}
+				}
+				this.$refs.imgPopup.open()
+			},
 			checkPay(type){
 				this.tui.request("/app/productShare/save", "POST", {
 					shareType: '2',
@@ -396,7 +447,7 @@
 			},
 			oneShare(item){
 				this.goodsData = item
-				this.picture = item.productPicture == null ?'https://jewel-shop.oss-cn-beijing.aliyuncs.com/70c3d9a274ff4feeb6df0bcb8be0f733.jpg':item.productPicture
+				this.picture = item.productPicture == null || item.productPicture == "" ?'https://jewel-shop.oss-cn-beijing.aliyuncs.com/70c3d9a274ff4feeb6df0bcb8be0f733.jpg':item.productPicture
 				this.$refs.sharePriceDialog.open()
 			},
 			//商品上下架
@@ -443,10 +494,16 @@
 			},
 			//搜索接口
 			search(e){
-				if(e.value == ''){
+				if(e.value == ''){
+					this.pageNum = 1
+										this.shopList1 = []
+										this.shopList = []
 					this.searchName = ""
 					this.getShareList()
-				}else{
+				}else{
+					this.pageNum = 1
+					this.shopList1 = []
+					this.shopList = []
 					this.searchName = e.value
 					this.getShareList('search')
 					
@@ -482,11 +539,16 @@
 						url: "/package1/inventory/batchPrint"
 					})
 					this.$refs.payDialog.close()
-				}else{
+				}else if(target == '5'){
 					uni.navigateTo({
 						url: "/package1/inventory/goodsDelisting"
 					})
 					this.$refs.payDialog.close()
+				}else{
+					uni.navigateTo({
+						url: "/package1/inventory/goodsDelete"
+					})
+					this.$refs.payDialog.close()
 				}
 			}
 		}
@@ -720,6 +782,24 @@
 		border-top: 1px solid #eee;
 		color: #fff;
 	}
+	.showImg-box{
+		width: 700rpx;
+		height: 1000rpx;
+		border-radius: 10px;
+	}
+	.swiper-box {
+		height: 1000rpx;
+	}
+	.swiper-item {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 1000rpx;
+		color: #fff;
+		background-color: #cee1fd;
+		border-radius: 10px;
+	}
 	.popup-photo{
 		height: 110rpx;
 		line-height: 110rpx;
diff --git a/pages/inventory/inventoryDetail.vue b/pages/inventory/inventoryDetail.vue
index 8de80da..078455a 100644
--- a/pages/inventory/inventoryDetail.vue
+++ b/pages/inventory/inventoryDetail.vue
@@ -48,7 +48,7 @@
 			<view v-show="current === 0">
 				<view class="container-box" v-for="(item,index) in pecsList" :key='index'>
 					<view class="prec-list">
-						<view class="prec-list-box" :style="{width:isPrint?'40%':'70%'}">
+						<view class="prec-list-box" :style="{width:isPrint?'40%':'64%'}">
 							{{item.attributeList | sliceMsg}}
 						</view>
 						<view class="prec-list-box" style="font-size: 26rpx;width: 26%;">
@@ -56,7 +56,8 @@
 						</view>
 						<view>
 							<uni-number-box v-if="isPrint" v-model="item.productCount" max="10000"
-								@change="changeNumBtn(item)" style="margin-top: 10rpx;display: block;" />
+								@change="changeNumBtn(item)" style="margin-top: 10rpx;display: block;" />
+							<uni-icons type="close" @tap="delSpec(item)" v-if="isPrint == false" size="30" color="#777"></uni-icons>
 						</view>
 					</view>
 				</view>
@@ -406,9 +407,11 @@
 						}
 						if(this.current==1){
 							for(let i=0;i<this.detailList.length;i++){
-								this.detailList[i].lirun = 0
+								this.detailList[i].lirun = 0
+								this.detailList[i].productCount = 0
 								for(let m=0;m<this.detailList[i].saleDetailDTOList.length;m++){
-									this.detailList[i].lirun += (this.detailList[i].saleDetailDTOList[m].discountAmount - this.detailList[i].saleDetailDTOList[m].purchasePrice) * this.detailList[i].saleDetailDTOList[m].stockLogList1[0].productCount
+									this.detailList[i].lirun += (this.detailList[i].saleDetailDTOList[m].discountAmount - this.detailList[i].saleDetailDTOList[m].purchasePrice) * this.detailList[i].saleDetailDTOList[m].stockLogList1[0].productCount
+									this.detailList[i].productCount += this.detailList[i].saleDetailDTOList[m].stockLogList1[0].productCount
 								}
 							}
 						}else if(this.current==2){
@@ -551,6 +554,37 @@
 				uni.navigateTo({
 					url: "/package1/inventory/addGoods?dataList="+JSON.stringify(this.dataList)
 				})
+			},
+			delSpec(item){
+				let that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条库存吗？",
+					success: function(res) {
+						if(res.confirm){
+							that.tui.request('/app/stock/deleteStockById', "post", {
+								id:item.id
+							}, false, true).then((res1) => {
+								if (res1.code == 200) {
+									uni.showToast({
+										title: "删除成功",
+										icon: 'none'
+									})
+									that.getShareList()
+									if(item.stockCount > 0){
+										that.dataList.stockCount = that.dataList.stockCount - item.stockCount
+										uni.removeStorageSync('noReload')
+									}
+								} else {
+									uni.showToast({
+										title: "删除失败",
+										icon: 'none'
+									})
+								}
+							})
+						}
+					}
+				})
 			},
 			sliceMsg(val) {
 				var name = ''
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 669cd9d..e311b6f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -183,10 +183,13 @@
 						if (res.code == 200) {
 							this.toggle("center");
 							this.shopList = res.result
-						}else{
+						}else{
+							this.getCaptchaImg()
 							this.tui.toast(res.message)
 						}
-					}).catch((res) => {})
+					}).catch((res) => {
+						this.getCaptchaImg()
+					})
 				}else{
 					this.tui.request(loginUrl, "POST", data, true, true).then((res) => {
 						if (res.code == 200) {
@@ -209,10 +212,14 @@
 							}else{
 								this.checkShop(res.result.shopList[0])
 							}
-						} else {
+						} else {
+							this.getCaptchaImg()
 							this.tui.toast(res.message)
 						}
-					}).catch((res) => {})
+					}).catch((res) => {
+						
+						this.getCaptchaImg()
+					})
 				}
 				
 			},
@@ -255,7 +262,8 @@
 									uni.setStorageSync('shopName',item.shopName)
 									uni.setStorageSync('shopIcon',res.result.shopIcon)
 									uni.setStorageSync('shopAddress',res.result.shopAddress)
-									uni.setStorageSync('shopRemark',res.result.remark)
+									uni.setStorageSync('shopRemark',res.result.remark)
+									uni.setStorageSync("shopOwnerPhone", item.shopOwnerPhone)
 									setTimeout(() => {
 										uni.reLaunch({
 											url: '/pages/index/index'
@@ -428,6 +436,8 @@
 		padding: 15px;
 		width: 500rpx;
 		height: auto;
+		overflow: scroll;
+		max-height: 900rpx;
 		background-color: #fff;
 	}