From 9fab3f85198dc982a7dad725fd35b047ef72f486 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 16 Nov 2023 20:45:20 +0800
Subject: [PATCH] 11

---
 pages/index/order.vue          |  2 +-
 pages/index/orderDetail.vue    |  2 +-
 pages/inventory/goodsList1.vue | 74 ++++++++++++++++++++++++++++++----
 3 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/pages/index/order.vue b/pages/index/order.vue
index 1d0b941..3d3c034 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -104,7 +104,7 @@
 					obj.num = item.saleDetailDTOList[i].productCount
 					obj.price = item.saleDetailDTOList[i].discountAmount
 					obj.productName = item.saleDetailDTOList[i].productName
-					obj.producticture = item.saleDetailDTOList[i].productPicture
+					obj.productPicture = item.saleDetailDTOList[i].productPicture+'?time='+new Date().getTime()
 					obj.productSn = item.saleDetailDTOList[i].productSn
 					obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
 					obj.saleId = item.saleDetailDTOList[i].saleId
diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue
index 664050e..4a73c4f 100644
--- a/pages/index/orderDetail.vue
+++ b/pages/index/orderDetail.vue
@@ -166,7 +166,7 @@
 				</view>
 			</view>
 		</view>
-		<u-popup :show="popupShow" @close="close" @open="open" mode="bottom">
+		<u-popup :show="popupShow" @close="close" @open="open" mode="bottom"> 
 			<view class="popupBox">
 			</view>
 		</u-popup>
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 23dbf2e..091c592 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -74,7 +74,7 @@
 						<view class="shop-productName">
 							<view style="color:#FF5809;">品名：{{value[1].productName}} （{{value[1].productSn}}）</view>
 							<view>单价：{{value[1].unitPrice}} 数量：{{value[1].productCount}} 总价：{{value[1].price}}</view>
-							<view>供应商：{{value[1].supplierName}}</view>
+							<view v-if="value[1].supplierName !=undefined">供应商：{{value[1].supplierName}}</view>
 						</view>
 						<view style="position: absolute;top: 110rpx;right: 40rpx;color: blue;text-decoration: underline;"
 							@tap="clickPrice(value[0])">
@@ -226,9 +226,10 @@
 			<view class="bottom-left">
 				<text>合计：{{totalAmount}}</text>
 				<text style="color: #ffa200;">￥{{shouldPay}}</text>
-			</view>
-			<view class="bottom-right">
-				<button class="bottom-btn" @tap="goSell">开单</button>
+			</view>
+			<view class="bottom-right">
+				<button class="bottom-btn" @tap="clearAll">清空全部</button>
+				<button class="bottom-btn" @tap="goSell">开单</button>
 			</view>
 		</view>
 		<!-- 弹出输入框 -->
@@ -1012,6 +1013,38 @@
 				that.carList.forEach(function(value, key) {
 					that.shouldPay += value.price
 				})
+			},
+			//清空全部数据
+			clearAll(){
+				let that = this;
+				// window.location.reload()
+				// 页面重载
+				// const pages = getCurrentPages() 
+				// const curPage = pages[pages.length - 1] 
+				// uni.showModal({
+				// 	title: "提示",
+				// 	content: "确定清空全部数据吗？",
+				// 	success: function(res) {
+						
+
+						that.carList.clear()
+						that.remark = ''
+						that.temporaryList = []
+						that.purchasePrice = ''
+						that.zPrice = ''
+						that.zNum = ''
+						that.shouldPay = ''
+						that.gysName = []
+						that.wlName = []
+						that.kdyName = []
+						that.lbgName = []
+						that.relPrice = ''
+						that.priceOk = ''
+						that.noPay = ''
+						that.otherExpense = ''
+						that.totalAmount = ''
+				// 	}
+				// })
 			}
 		}
 	}
@@ -1226,10 +1259,35 @@
 		line-height: 110rpx;
 	}
 
-	.bottom-right {
-		flex: 1;
-		height: 110rpx;
-		line-height: 110rpx;
+	.bottom-right {
+		width: 60%;
+		display: flex;
+	
+		.bottom-btn {
+			margin: 0;
+			padding: 0;
+			width: 45%;
+			line-height: 35px;
+			height: 70rpx;
+			text-align: center;
+			margin-top: 10rpx;
+			color: #fff;
+			font-size: 28rpx;
+			border-radius: 0;
+		}
+	
+		.bottom-btn:first-child {
+			background: linear-gradient(90deg, #FF9797, #FFC1E0);
+			border-top-left-radius: 70rpx;
+			border-bottom-left-radius: 70rpx;
+			margin-left: 20rpx;
+		}
+	
+		.bottom-btn:last-child {
+			background: linear-gradient(90deg, #60F3FF, #088FEB);
+			border-top-right-radius: 70rpx;
+			border-bottom-right-radius: 70rpx;
+		}
 	}
 
 	.bottom-left text {