From 75d873f419ad2fb9a32c0ef8bdf526b3e4b50aa3 Mon Sep 17 00:00:00 2001
From: "tianyi@bogon" <ittianyi@163.com>
Date: Sun, 12 Nov 2023 11:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/addHangOrder.vue  |  1 -
 pages/index/order.vue         | 18 ++++--------------
 pages/index/shareStyle.vue    |  2 +-
 pages/inventory/inventory.vue |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue
index 27cccf8..c952c15 100644
--- a/pages/index/addHangOrder.vue
+++ b/pages/index/addHangOrder.vue
@@ -620,7 +620,6 @@
 					obj.remark = item.remark
 					dataList.push(obj)
 				}
-				console.log('前一页的',dataList)
 				uni.setStorageSync('carList1',JSON.stringify(dataList))
 				uni.switchTab({
 					url: '/pages/inventory/goodsList1'
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 677290c..221c6c4 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -95,21 +95,9 @@
 			},
 			//带参数跳转到开单页
 			goSaleGoods(item) {
-				let obj = {
-					id:'',
-					lsprice:0,
-					num:0,
-					price:0,
-					productName:'',
-					producticture:'',
-					productSn:'',
-					saleDetailQueryDTO:[],
-					supplierName:'',
-					wholesalePrice:0,
-					remark:item.remark
-				},
-				dataList = []
+				let dataList = []
 				for (let i=0;i<item.saleDetailDTOList.length;i++) {
+					let obj = {}
 					obj.saleDetailQueryDTO = item.saleDetailDTOList[i].stockLogList1
 					obj.id = item.saleDetailDTOList[i].productId
 					obj.lsprice = item.saleDetailDTOList[i].price
@@ -119,6 +107,8 @@
 					obj.producticture = item.saleDetailDTOList[i].productPicture
 					obj.productSn = item.saleDetailDTOList[i].productSn
 					obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
+					obj.saleId = item.saleDetailDTOList[i].saleId
+					obj.remark = item.remark
 					dataList.push(obj)
 				}
 				uni.setStorageSync('carList1',JSON.stringify(dataList))
diff --git a/pages/index/shareStyle.vue b/pages/index/shareStyle.vue
index e98f6bc..079009e 100644
--- a/pages/index/shareStyle.vue
+++ b/pages/index/shareStyle.vue
@@ -220,7 +220,7 @@
 					data = {
 						shopId: '002',
 						shareType: '2', //2 分享勾选商品
-						shareProductId: this.checkbox //勾选商品的id string类型 中间通过”,“连接
+						shareProductId: this.carList //勾选商品的id string类型 中间通过”,“连接
 					}
 				}
 				this.tui.request("/app/productShare/save", "POST", data, false, true).then((res) => {
diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue
index 67fe615..b468560 100644
--- a/pages/inventory/inventory.vue
+++ b/pages/inventory/inventory.vue
@@ -64,7 +64,7 @@
 						<view class="up-down" v-if="item.delFlag ==0" @tap.stop="upDown('1',item)">上架</view>
 						<view class="box-right-price">
 							<view class="price-box">
-								<text v-if="item.purchasePrice==null" style="color: red;">未入库</text>
+								<text v-if="item.purchasePrice==null" style="color: red;">新商品</text>
 								<text v-else>{{item.purchasePrice}}</text>
 								<text>采购价</text>
 							</view>