diff --git a/src/manifest.json b/src/manifest.json index 0784f5f..0fda72c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "浩拓ERP", "appid" : "__UNI__F79F300", "description" : "浩拓ERP", - "versionName" : "1.1.11", - "versionCode" : 111, + "versionName" : "1.1.12", + "versionCode" : 112, "transformPx" : false, "app-plus" : { "optimization" : { diff --git a/src/pages/storefabric/storeFabricBusinessOutMixin.js b/src/pages/storefabric/storeFabricBusinessOutMixin.js index 6c3f11c..32865ea 100644 --- a/src/pages/storefabric/storeFabricBusinessOutMixin.js +++ b/src/pages/storefabric/storeFabricBusinessOutMixin.js @@ -349,8 +349,8 @@ export default { uni.hideLoading(); const message = e.message || (scanType === 2 ? '删除失败' : '扫码失败'); const mismatchVoice = resolveScanMismatchVoice(message); - if (mismatchVoice) speak(mismatchVoice); - this.showError(message, { skipErrorAudio: !!mismatchVoice }); + speak(mismatchVoice || (scanType === 2 ? '删除失败' : '扫码失败')); + uni.showToast({ title: message, icon: 'none', duration: 2500 }); this.QRBarCode = ''; }); }, diff --git a/src/pages/storegoods/storeGoodsProcessInMixin.js b/src/pages/storegoods/storeGoodsProcessInMixin.js index cc7d63d..0e111f1 100644 --- a/src/pages/storegoods/storeGoodsProcessInMixin.js +++ b/src/pages/storegoods/storeGoodsProcessInMixin.js @@ -622,7 +622,8 @@ export default { uni.hideLoading(); this.phoneContinuousScan = false; const message = e.message || (isDelete ? '删除失败' : '扫码失败'); - this.showError(message); + speak(isDelete ? '删除失败' : '扫码失败'); + uni.showToast({ title: message, icon: 'none', duration: 2500 }); this.QRBarCode = ''; }); }, diff --git a/src/pages/storegoods/storeGoodsProcessOutMixin.js b/src/pages/storegoods/storeGoodsProcessOutMixin.js index 264aa1a..90e3553 100644 --- a/src/pages/storegoods/storeGoodsProcessOutMixin.js +++ b/src/pages/storegoods/storeGoodsProcessOutMixin.js @@ -465,7 +465,8 @@ export default { uni.hideLoading(); this.phoneContinuousScan = false; const message = e.message || (isDelete ? '删除失败' : '扫码失败'); - this.showError(message); + speak(isDelete ? '删除失败' : '扫码失败'); + uni.showToast({ title: message, icon: 'none', duration: 2500 }); this.QRBarCode = ''; }); }, diff --git a/src/pages/storegoods/storeGoodsProcessReturnInMixin.js b/src/pages/storegoods/storeGoodsProcessReturnInMixin.js index aef07d6..105c7c6 100644 --- a/src/pages/storegoods/storeGoodsProcessReturnInMixin.js +++ b/src/pages/storegoods/storeGoodsProcessReturnInMixin.js @@ -522,7 +522,8 @@ export default { uni.hideLoading(); this.phoneContinuousScan = false; const message = e.message || (isDelete ? '删除失败' : '扫码失败'); - this.showError(message); + speak(isDelete ? '删除失败' : '扫码失败'); + uni.showToast({ title: message, icon: 'none', duration: 2500 }); this.QRBarCode = ''; }); }, diff --git a/src/pages/storegoods/storeGoodsPurchaseInMixin.js b/src/pages/storegoods/storeGoodsPurchaseInMixin.js index 6152992..94a8c56 100644 --- a/src/pages/storegoods/storeGoodsPurchaseInMixin.js +++ b/src/pages/storegoods/storeGoodsPurchaseInMixin.js @@ -627,7 +627,8 @@ export default { uni.hideLoading(); this.phoneContinuousScan = false; const message = e.message || (isDelete ? '删除失败' : '扫码失败'); - this.showError(message); + speak(isDelete ? '删除失败' : '扫码失败'); + uni.showToast({ title: message, icon: 'none', duration: 2500 }); this.QRBarCode = ''; }); },