From 5ac25d333bf50eab99fd7b333e6dc9f73bf3b433 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 28 Dec 2023 18:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/addHangOrder.vue     | 38 +++++++++++++++++++++++++-------
 pages/index/downarrears.vue      |  2 +-
 pages/inventory/addinventory.vue | 14 +++++++-----
 pages/inventory/goodsList1.vue   |  2 +-
 pages/login/login.vue            |  6 ++---
 5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue
index f5f3a2c..8283990 100644
--- a/pages/index/addHangOrder.vue
+++ b/pages/index/addHangOrder.vue
@@ -64,9 +64,12 @@
 							<text style="color:red;font-size:22rpx;">*长按“语音”按钮录入，系统将自动识别</text>
 						</view>
 						<view class="popup-bottom">
-							<view class="popup-btn" @touchstart="kaishi" @touchend="jieshu">语音</view>
+							<view class="popup-btn" @tap="clearText">清空</view>
 							<view class="popup-btn" @tap="setDetail">确认</view>
 						</view>
+					</view>
+					<view class="voice-btn" @touchstart="kaishi" @touchend="jieshu">
+						<img src="/static/images/maikefeng.png" style="width: 80%;height: 80%;margin: 10%;" alt="">
 					</view>
 				</view>
 			</uni-popup>
@@ -273,17 +276,22 @@
 				manager.stop()
 				//有新的识别内容返回，则会调用此事件
 				manager.onRecognize = (res) => {
-					this.voiceText = res.result
+					// this.voiceText = res.result
 				}
 				manager.onStart = function(res) {
-					this.voiceText = "onStart:" + res.msg + "正在录音"
+					// this.voiceText = "onStart:" + res.msg + "正在录音"
 				}
 				// 识别结束事件
-				manager.onStop = (res) => {
-					this.voiceText = res.result
-					if (res.result == '') {
-						this.showRecordEmptyTip()
-						return
+				manager.onStop = (res) => {
+					if (res.result == '') {
+						this.showRecordEmptyTip()
+						return
+					}
+					if(this.voiceText == ''){
+						this.voiceText = res.result
+					}else{
+						res.result = '\n' + res.result
+						this.voiceText += res.result
 					}
 				}
 
@@ -508,6 +516,10 @@
 						this.tui.toast(res.message)
 					}
 				}).catch((res) => {})
+			},
+			//清空语音输入的文字
+			clearText(){
+				this.voiceText = ''
 			},
 			//查看大图
 			largeImg(img) {
@@ -639,6 +651,7 @@
 						obj.createByName = item.createByName
 						dataList.push(obj)
 					}
+					console.log(dataList);
 					uni.setStorageSync('carList1', JSON.stringify(dataList))
 					uni.setStorageSync('khName', '')
 				}
@@ -1000,5 +1013,14 @@
 		border-bottom: 1px solid #eee;
 		border-top: 1px solid #eee;
 		color: #fff;
+	}
+	.voice-btn{
+		position: absolute;
+		bottom: -300rpx;
+		left: 30%;
+		width: 200rpx;
+		height: 200rpx;
+		background: #eee;
+		border-radius: 50%;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/index/downarrears.vue b/pages/index/downarrears.vue
index a888aa8..581d35a 100644
--- a/pages/index/downarrears.vue
+++ b/pages/index/downarrears.vue
@@ -4,7 +4,7 @@
 		<view class="ulList" v-if="list.length > 0">
 			<ul>
 				<li v-for="item in list" @tap="returnPrice(item)">
-					<uni-card :title="item.companyName == null ?'暂无':item.companyName" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'订单金额:￥'+(item.totalAmount == null ?'暂无':item.totalAmount)"
+					<uni-card :title="item.userName == null ?'暂无':item.userName" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'订单金额:￥'+(item.totalAmount == null ?'暂无':item.totalAmount)"
 						thumbnail="/static/images/dingdan/dd1.png">
 						<view class="uni-body"><text class="cardText">销售员：</text> {{item.createByName == null ?'暂无':item.createByName}}</view>
 						<view class="uni-body"> <text class="cardText"> 销售总额：</text> <text class="priceText">
diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue
index 454b122..3d5b9bf 100644
--- a/pages/inventory/addinventory.vue
+++ b/pages/inventory/addinventory.vue
@@ -578,12 +578,16 @@
 					})
 					return
 				}else{
-					if(this.storageType==0 && this.shouldPay == 0){
-						uni.showToast({
-							title: "管理员必须维护价格！",
-							icon: 'none'
+					if(this.storageType==0){
+						this.carList.forEach(function(value, key) {
+							if(value.purchasePrice == '' || value.purchasePrice == 0){
+								uni.showToast({
+									title: value.productName + "的价格必须维护！",
+									icon: 'none'
+								})
+								throw new Error("End");
+							}
 						})
-						return
 					}
 				}
 				let that = this;
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index f406475..6f912bd 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -1076,7 +1076,7 @@
 						otherExpense: this.otherExpense == '' ? 0 : this.otherExpense, //其他费用
 						shareAddress: this.pbAddress,
 						transCompany: this.wlName.shippingMethodId || this.wlName.id,
-						companyName: this.wlName.companyName,
+						companyName: this.wlName.shippingMethod || this.wlName.companyName,
 					},
 					saleDetailList: []
 				}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 77b146b..ad219c2 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -76,11 +76,11 @@
 	export default {
 		data() {
 			return {
-				// mobile: '15630117759',
-				username: '15101147760',
+				mobile: '',
+				username: '',
 				// username: '15630117759',
 				code: '',
-				password: '123456',
+				password: '',
 				// password: '19950123kang',
 				loginWay: true, //true账号密码登录  false验证码登录
 				captchaImg: '',