diff --git a/env/.env.development b/env/.env.development index 764ee04..8d364d2 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DELETE_CONSOLE=false #本地环境 -VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api -#VITE_SERVER_BASEURL=http://192.168.5.4:8080 +#VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api +VITE_SERVER_BASEURL=http://192.168.5.11:8080 #VITE_SERVER_BASEURL=http://192.168.0.148:8888 #VITE_SERVER_BASEURL=http://liuyao.nat100.top/meiguowaimai \ No newline at end of file diff --git a/src/locale/en.json b/src/locale/en.json index 31ea387..059d17f 100644 --- a/src/locale/en.json +++ b/src/locale/en.json @@ -483,7 +483,8 @@ "uploadPaidVoucher": "I've paid — upload proof", "voucherSubmitSuccess": "Proof submitted", "voucherSubmitFailed": "Submit failed, please try again", - "voucherUploadFailed": "Upload failed, please try again" + "voucherUploadFailed": "Upload failed, please try again", + "pleaseBindCreditCard": "No bank card linked. Please add a card before paying." }, "store": { "addToCart": "Add to cart", diff --git a/src/locale/zh-Hans.json b/src/locale/zh-Hans.json index f414640..8d79dc8 100644 --- a/src/locale/zh-Hans.json +++ b/src/locale/zh-Hans.json @@ -483,7 +483,8 @@ "uploadPaidVoucher": "我已支付,上传凭证", "voucherSubmitSuccess": "凭证已提交", "voucherSubmitFailed": "提交失败,请重试", - "voucherUploadFailed": "上传失败,请重试" + "voucherUploadFailed": "上传失败,请重试", + "pleaseBindCreditCard": "未绑定银行卡,请先绑定后再支付" }, "store": { "addToCart": "加入购物车", diff --git a/src/manifest.json b/src/manifest.json index 860c259..c7ce6e2 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "CHEFLINK delivery", "appid" : "__UNI__06509BE", "description" : "", - "versionName" : "3.1.2", - "versionCode" : 312, + "versionName" : "3.1.3", + "versionCode" : 313, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages-store/pages/order/index.vue b/src/pages-store/pages/order/index.vue index 2a228cc..4e8d8d2 100644 --- a/src/pages-store/pages/order/index.vue +++ b/src/pages-store/pages/order/index.vue @@ -188,6 +188,7 @@ const callPhoneFn = (phone: string) => { const payMethodOptions = ref({ orderId: '', cardId: '', + cardNumber: '', payMethod: 1, // 支付方式 1信用卡 2余额 payPassword: '', }) @@ -216,9 +217,20 @@ function goPay() { // 如果是余额支付,弹出支付密码弹窗 if(payMethodOptions.value.payMethod === 2) { passwordInputRef.value?.showPasswordInput() - } else { - appMerchantOrderPayOrder() + return } + // 信用卡支付:必须已绑定卡(与 appMerchantOrderPayOrder 入参一致,避免 cardId/cardNumber 为空仍请求) + if (payMethodOptions.value.payMethod === 1) { + const cardId = String(payMethodOptions.value.cardId || '').trim() + if (!cardId) { + uni.showToast({ + title: t('pages-store.order.pleaseBindCreditCard'), + icon: 'none', + }) + return + } + } + appMerchantOrderPayOrder() } function payPawSuccess(password: string) { payMethodOptions.value.payPassword = password