diff --git a/.env b/.env index 954f749..b162418 100644 --- a/.env +++ b/.env @@ -18,8 +18,7 @@ VITE_OAUTH2_APP_CLIENT='mini:mini' # 图片访问基础地址 #VITE_IMAGE_BASE_PATH = http://localhost:9999 -# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 -# VITE_IMAGE_BASE_PATH = http://192.168.101.37:9999 # 邓-本地 +# VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 # VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 @@ -27,9 +26,9 @@ VITE_OAUTH2_APP_CLIENT='mini:mini' VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 # ******************** start 开发环境 start ******************** -VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 +# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api -# VITE_APP_DEV_SERVICE = http://192.168.101.60:9999 # 邓-本地 +VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上 # VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上 diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue index 5ef0c9b..e386eb0 100644 --- a/src/pages/pay/scanPay.vue +++ b/src/pages/pay/scanPay.vue @@ -130,6 +130,7 @@ const handleDelete = () => { // 点击支付 const handlePay = async () => { + if (!scanData.value.id || !scanData.value.name) return uni.showToast({ title: "扫码信息不存在", icon: "none" }) if (!amount.value) { uni.showToast({ title: "请输入金额", icon: "none" }) return @@ -141,7 +142,7 @@ const handlePay = async () => { try { uni.showLoading({ title: "支付中...", mask: true }) const res = await payApi.createQrCodeOrder({ - id: scanData.value.id, + merchantId: scanData.value.id, customPrice: storePrice(Number(amount.value)), }) if (res.code === 0) {