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 @@
*长按“语音”按钮录入,系统将自动识别
+
+
+
@@ -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%;
}
\ 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 @@
-
-
销售员: {{item.createByName == null ?'暂无':item.createByName}}
销售总额:
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: '',