diff --git a/apps/frontend/src/App.vue b/apps/frontend/src/App.vue index e9737bb..a8e5b63 100644 --- a/apps/frontend/src/App.vue +++ b/apps/frontend/src/App.vue @@ -8,6 +8,7 @@ import { useAuthStore } from '@/stores/auth'; import footerCom from './components/footerBeiAn/index.vue'; import {isWeChatBrowser} from '@deotaland/utils'; const authStore = useAuthStore(); +console.log('更新西悉尼'); authStore.updateUserInfo() const route = useRoute() // 判断当前是否为登录页面 diff --git a/apps/frontend/src/components/OrderProcessModal/index.vue b/apps/frontend/src/components/OrderProcessModal/index.vue index bd25ee1..f04d723 100644 --- a/apps/frontend/src/components/OrderProcessModal/index.vue +++ b/apps/frontend/src/components/OrderProcessModal/index.vue @@ -78,20 +78,20 @@ const emit = defineEmits(['close', 'acknowledge']) 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 - } + // 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/components/PurchaseModal/index.vue b/apps/frontend/src/components/PurchaseModal/index.vue index 49d9caf..c343fe0 100644 --- a/apps/frontend/src/components/PurchaseModal/index.vue +++ b/apps/frontend/src/components/PurchaseModal/index.vue @@ -113,7 +113,7 @@ -
+

@@ -141,7 +141,7 @@

-
+

{{ $t('checkout.shipping') }}

@@ -206,7 +206,8 @@
- + +
@@ -235,9 +236,10 @@ import { CloseBold, Search } from '@element-plus/icons-vue' import StripePaymentForm from '@/components/StripePaymentForm.vue' import { Country, State } from 'country-state-city' import { useI18n } from 'vue-i18n' -import { PayServer } from '@deotaland/utils' +import { PayServer,isWeChatBrowser } from '@deotaland/utils' import { requestUtils,clientApi,environmentUtils } from '@deotaland/utils' import { PurchaseModal as PurchaseModalClass } from './index.js' +import { WechatBus } from '@deotaland/utils' const payserver = new PayServer(); const purchaseModal = new PurchaseModalClass(); const props = defineProps({ @@ -279,7 +281,7 @@ const loadingShops = ref(false) // 计算支付按钮是否禁用 const isPayButtonDisabled = computed(() => { - return !( + return (!( shipping.value.firstName.trim() && shipping.value.lastName.trim() && shipping.value.state.trim() && @@ -287,7 +289,7 @@ const isPayButtonDisabled = computed(() => { shipping.value.address1.trim() && shipping.value.phone.trim() && ipName.value.trim() - ) + )) }) const unt = ref(''); const price = ref(0); @@ -404,7 +406,7 @@ const goShopify = () => {//用户点击购买 } let params ={ quantity:qty.value, - project_id:props.modelData.projectId, + project_id:props.modelData.project_id, project_details:project_details, order_info:order_info, } @@ -426,6 +428,17 @@ const goShopify = () => {//用户点击购买 saveLocal() // 在控制台打印整理后的信息 params.product_id = seriesId.value + params.amount = (amountCents.value).toFixed(2) + + if(isWeChatBrowser()){ + const token = window.localStorage.getItem('token') + console.log(params,'params'); + WechatBus.BusWechartForNavigate('/pages/pay/pay',{ + method:'pay', + payData:JSON.stringify({...params,token:token}) + }) + return + } payserver.createPayorOrder(params); } const saveLocal = () => { diff --git a/apps/frontend/src/components/auth/PhoneLoginForm.vue b/apps/frontend/src/components/auth/PhoneLoginForm.vue index 378da99..aabc05b 100644 --- a/apps/frontend/src/components/auth/PhoneLoginForm.vue +++ b/apps/frontend/src/components/auth/PhoneLoginForm.vue @@ -161,7 +161,22 @@
- + + + +