diff --git a/src/App.vue b/src/App.vue index c997206..a39d9f8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,30 +1,72 @@ diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue index 7f2d082..206eada 100644 --- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue @@ -406,6 +406,10 @@ export default class stoOutboundDom extends BasePage { diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue index 1957bfd..8dd52f1 100644 --- a/src/pages/product/warehouse/wholeCollect/index.vue +++ b/src/pages/product/warehouse/wholeCollect/index.vue @@ -36,7 +36,7 @@ - + diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue index 54b9cf3..be0478f 100644 --- a/src/pages/product/warehouse/wholeLnventory/index.vue +++ b/src/pages/product/warehouse/wholeLnventory/index.vue @@ -37,11 +37,11 @@ - + - + diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue index 13fe7d4..936ef5f 100644 --- a/src/pages/raw/handover/returning/index.vue +++ b/src/pages/raw/handover/returning/index.vue @@ -47,12 +47,12 @@ - + - + diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue index 04cd8cf..01e0e3e 100644 --- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue +++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue @@ -48,7 +48,7 @@ {{ $t('message.Cumulative') }} - + @@ -548,39 +548,39 @@ export default class dnReceiptDom extends BasePage { } } } - .library { - width: 100%; - height: 100rpx; - display: flex; - .library-left { - width: 50%; - height: 100%; - display: flex; - view { - width: 100rpx; - line-height: 100rpx; - } - .search { - padding-left: 30px; - } - } - .library-right { - width: 50%; - height: 100%; - display: flex; - .library-right-title { - width: 120rpx; - height: 100%; - line-height: 100rpx; - } - .input { - width: 200rpx; - height: 70rpx; - margin-top: 15rpx; - margin-left: 15rpx; - } - } - } + // .library { + // width: 100%; + // height: 100rpx; + // display: flex; + // .library-left { + // width: 50%; + // height: 100%; + // display: flex; + // view { + // width: 100rpx; + // line-height: 100rpx; + // } + // .search { + // padding-left: 30px; + // } + // } + // .library-right { + // width: 50%; + // height: 100%; + // display: flex; + // .library-right-title { + // width: 120rpx; + // height: 100%; + // line-height: 100rpx; + // } + // .input { + // width: 200rpx; + // height: 70rpx; + // margin-top: 15rpx; + // margin-left: 15rpx; + // } + // } + // } .add { width: 100%; height: 100rpx; diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue index 444326c..b4af540 100644 --- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue +++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue @@ -48,7 +48,7 @@ {{ $t('message.Cumulative') }} - + @@ -575,39 +575,39 @@ export default class dnReceiptDom extends BasePage { } } } - .library { - width: 100%; - height: 100rpx; - display: flex; - .library-left { - width: 50%; - height: 100%; - display: flex; - view { - width: 100rpx; - line-height: 100rpx; - } - .search { - padding-left: 30px; - } - } - .library-right { - width: 50%; - height: 100%; - display: flex; - .library-right-title { - width: 120rpx; - height: 100%; - line-height: 100rpx; - } - .input { - width: 200rpx; - height: 70rpx; - margin-top: 15rpx; - margin-left: 15rpx; - } - } - } + // .library { + // width: 100%; + // height: 100rpx; + // display: flex; + // .library-left { + // width: 50%; + // height: 100%; + // display: flex; + // view { + // width: 100rpx; + // line-height: 100rpx; + // } + // .search { + // padding-left: 30px; + // } + // } + // .library-right { + // width: 50%; + // height: 100%; + // display: flex; + // .library-right-title { + // width: 120rpx; + // height: 100%; + // line-height: 100rpx; + // } + // .input { + // width: 200rpx; + // height: 70rpx; + // margin-top: 15rpx; + // margin-left: 15rpx; + // } + // } + // } .add { width: 100%; height: 100rpx; diff --git a/src/utils/request.ts b/src/utils/request.ts index 0762f42..41a7d3c 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -113,18 +113,41 @@ http.interceptors.response.use( } else if (error) { switch (error.statusCode) { /* eslint-disable */ - case 400: error.message = vm.$t('message.request_Tip1') as string; break - case 401: error.message = vm.$t('message.request_Tip2') as string; break - case 403: error.message = vm.$t('message.request_Tip3') as string; break - case 404: error.message = vm.$t('message.request_Tip4') as string + error.config.url; break - case 408: error.message = vm.$t('message.request_Tip5') as string; break - case 500: error.message = vm.$t('message.request_Tip6') as string; break - case 501: error.message = vm.$t('message.request_Tip7') as string; break - case 502: error.message = vm.$t('message.request_Tip8') as string; break - case 503: error.message = vm.$t('message.request_Tip9') as string; break - case 504: error.message = vm.$t('message.request_Tip10') as string; break - case 505: error.message = vm.$t('message.request_Tip11') as string; break - default: break + case 400: + error.message = vm.$t('message.request_Tip1') as string; + break; + case 401: + error.message = vm.$t('message.request_Tip2') as string; + break; + case 403: + error.message = vm.$t('message.request_Tip3') as string; + break; + case 404: + error.message = (vm.$t('message.request_Tip4') as string) + error.config.url; + break; + case 408: + error.message = vm.$t('message.request_Tip5') as string; + break; + case 500: + error.message = vm.$t('message.request_Tip6') as string; + break; + case 501: + error.message = vm.$t('message.request_Tip7') as string; + break; + case 502: + error.message = vm.$t('message.request_Tip8') as string; + break; + case 503: + error.message = vm.$t('message.request_Tip9') as string; + break; + case 504: + error.message = vm.$t('message.request_Tip10') as string; + break; + case 505: + error.message = vm.$t('message.request_Tip11') as string; + break; + default: + break; /* eslint-enable */ } } @@ -149,9 +172,16 @@ function errorLog(error: Error, hideError: boolean) { } // 显示提示 hideError || - uni.showToast({ - icon: 'none', - title: error.message, + // uni.showToast({ + // icon: 'none', + // title: error.message, + // }); + uni.showModal({ + title: '', + content: error.message, + confirmText: vm.$t('message.workArea_Confirm') as string, + cancelText: vm.$t('message.Cancel') as string, + showCancel: false, }); }