From e5c1449d5ff2e2c93bfecb5b1e142b445e5dc052 Mon Sep 17 00:00:00 2001 From: chutingting Date: Mon, 13 Nov 2023 17:10:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/components.d.ts | 16 +--------------- src/views/myStore/index.vue | 35 +++++++++++++---------------------- 2 files changed, 14 insertions(+), 37 deletions(-) diff --git a/src/types/components.d.ts b/src/types/components.d.ts index a09e2f0..9a9bd44 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -23,40 +23,26 @@ declare module '@vue/runtime-core' { ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElMenuItemGroup: typeof import('element-plus/es')['ElMenuItemGroup'] - ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButto: typeof import('element-plus/es')['ElRadioButto'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElSelect: typeof import('element-plus/es')['ElSelect'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElText: typeof import('element-plus/es')['ElText'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElUpload: typeof import('element-plus/es')['ElUpload'] GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] - IEpCloseBold: typeof import('~icons/ep/close-bold')['default'] - IEpDelete: typeof import('~icons/ep/delete')['default'] IEpDocumentAdd: typeof import('~icons/ep/document-add')['default'] - IEpDownload: typeof import('~icons/ep/download')['default'] IEpEdit: typeof import('~icons/ep/edit')['default'] IEpGoods: typeof import('~icons/ep/goods')['default'] - IEpLoading: typeof import('~icons/ep/loading')['default'] IEpLock: typeof import('~icons/ep/lock')['default'] IEpMenu: typeof import('~icons/ep/menu')['default'] IEpPhone: typeof import('~icons/ep/phone')['default'] - IEpSearch: typeof import('~icons/ep/search')['default'] IEpUser: typeof import('~icons/ep/user')['default'] - IEpVideoPlay: typeof import('~icons/ep/video-play')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] MyLoading: typeof import('./../components/myLoading.vue')['default'] @@ -72,6 +58,6 @@ declare module '@vue/runtime-core' { WangEditor: typeof import('./../components/WangEditor/index.vue')['default'] } export interface ComponentCustomProperties { - vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll'] + vLoading: typeof import('element-plus/es')['ElLoadingDirective'] } } diff --git a/src/views/myStore/index.vue b/src/views/myStore/index.vue index 8a3e204..da1983d 100644 --- a/src/views/myStore/index.vue +++ b/src/views/myStore/index.vue @@ -91,13 +91,6 @@ - -
+
{ + getStatusOfOrderFunc(orderNumber); + }, 3000); + } else if (res.data.orderStatus == 2) { // 页面就不动, loading....的效果盖在二维码之前,继续定时请求 + loading.value = true setTimeout(() => { getStatusOfOrderFunc(orderNumber); }, 3000); - } else { + } else if (res.data.orderStatus == 3) { // 提示支付成功,关闭当前页 orderCodeDialogShow.value = false; + showPayDialog.value = false ElMessage.success( lanChange.value == "zh-cn" ? `支付成功!` : `Payment is successful!` ); - return; + } else { // 提示支付失败,关闭当前页 + ElMessage.success('支付失败'); } - // if (res.data.orderStatus == 3) { - // orderCodeDialogShow.value = false; - // ElMessage.success( - // lanChange.value == "zh-cn" ? `支付成功!` : `Payment is successful!` - // ); - // return; - // } else { - // setTimeout(() => { - // getStatusOfOrderFunc(orderNumber); - // }, 3000); - // } } else { setTimeout(() => { getStatusOfOrderFunc(orderNumber);