diff --git a/apps/frontend/src/components/OrderProcessModal/index.vue b/apps/frontend/src/components/OrderProcessModal/index.vue index 96b9918..bd25ee1 100644 --- a/apps/frontend/src/components/OrderProcessModal/index.vue +++ b/apps/frontend/src/components/OrderProcessModal/index.vue @@ -56,6 +56,7 @@ import { ref, computed } from 'vue' import { useI18n } from 'vue-i18n' import { ElIcon } from 'element-plus' +import { isWeChatBrowser,WechatBus } from '@deotaland/utils' import { CloseBold, InfoFilled, @@ -74,9 +75,23 @@ const props = defineProps({ series: { type: String, default: '' } }) const emit = defineEmits(['close', 'acknowledge']) -const handleOverlayClick = () => onClose() -const onClose = () => emit('close') +const handleOverlayClick = () => onClose(); +const onClose = () => emit('close'); const handleAcknowledge = () => { + if(isWeChatBrowser()){ + WechatBus.BusWechartForNavigate('/pages/pay/pay',{ + method:'pay', + payData:JSON.stringify({ + orderId: 1, + series:1, + name:{ + D1:'定制模型', + E1:'定制模型', + }, + }) + }) + return + } emit('acknowledge', props.modelData) onClose() } diff --git a/apps/frontend/src/main.js b/apps/frontend/src/main.js index 7c67bf1..e239749 100644 --- a/apps/frontend/src/main.js +++ b/apps/frontend/src/main.js @@ -20,7 +20,7 @@ import piniaPluginPersistedstate from 'pinia-plugin-persistedstate' // import VueLazyload from 'vue3-lazyload' import 'element-plus/dist/index.css' import 'nprogress/nprogress.css' -import {ElMessage,ElLoading } from 'element-plus' +import {ElMessage} from 'element-plus' import dtUI from '@deotaland/ui' import '@deotaland/ui/style.css' import { environmentUtils,WechatBus,isWeChatBrowser } from '@deotaland/utils'; diff --git a/apps/frontend/src/views/Project/CreateProject.vue b/apps/frontend/src/views/Project/CreateProject.vue index 8d267bb..21fb5a1 100644 --- a/apps/frontend/src/views/Project/CreateProject.vue +++ b/apps/frontend/src/views/Project/CreateProject.vue @@ -136,7 +136,7 @@ @add-prompt-card="handleCanvasSave" /> -