Эх сурвалжийг харах

Merge branch 'development'

liangan 4 өдөр өмнө
parent
commit
07b76f6fda

+ 2 - 0
env/.env

@@ -9,6 +9,8 @@ VITE_APP_PUBLIC_BASE=/
 
 # 登录页面
 VITE_LOGIN_URL = '/pages/login/login'
+
+VITE_H5_BASE_URL = 'http://124.222.152.234:8078'
 # 第一个请求地址
 VITE_SERVER_BASEURL = 'https://api.banhubuy.com'
 # VITE_SERVER_BASEURL = 'http://124.222.152.234:8101'

+ 1 - 1
src/pages/forgotPassword/forgotPassword.vue

@@ -70,7 +70,7 @@ async function getVerificationCode() {
     })
 
     // 调用获取验证码接口
-    await getCode(formData.value.phone)
+    await getCode(`88${formData.value.phone}`)
 
     uni.hideLoading()
     toast.success(t('auth.forgotPassword.success.codeSent'))

+ 3 - 3
src/pages/mine/share.vue

@@ -21,11 +21,12 @@ const systemInfo = uni.getSystemInfoSync()
 const safeAreaInsets = systemInfo.safeAreaInsets
 
 const userStore = useUserStore()
+const baseUrl = import.meta.env.VITE_H5_BASE_URL
 
 // 推荐码
 const userInfo = computed(() => getUserInfoHook())
 const qrcodeConfig = ref<any>({
-  val: `http://124.222.152.234:8078?referrer=${userInfo.value.invitedCode}`, // 推荐链接
+  val: `${baseUrl}?referrer=${userInfo.value.invitedCode}`, // 推荐链接
   size: 500,
   background: '#ffffff',
   foreground: '#000000',
@@ -67,11 +68,10 @@ function copyReferrerCode() {
     success: () => {},
   })
 }
-
 // 生成邀请注册分享链接
 function generateInviteShareLink() {
   // 邀请注册链接
-  const inviteUrl = `http://124.222.152.234:8078?referrer=${userInfo.value.invitedCode}`
+  const inviteUrl = `${baseUrl}?referrer=${userInfo.value.invitedCode}`
 
   // 分享文案格式:[BandhuBuy] + 邀请注册链接 + 邀请文案
   const shareText = `[BandhuBuy] ${inviteUrl} Your friend invited you to register`

+ 1 - 1
src/pages/productDetail/productDetail.vue

@@ -367,10 +367,10 @@ const socialPlatforms = ref([
 
 const showShare = ref<boolean>(false)
 
+const baseUrl = import.meta.env.VITE_H5_BASE_URL
 // 生成商品分享链接
 function generateShareLink() {
   // 基础域名 - 根据需求使用bandhubuy.shop.com
-  const baseUrl = 'http://124.222.152.234:8078'
   const productUrl = `${baseUrl}/pages/productDetail/productDetail?productId=${productId.value}`
 
   // 分享文案格式:[BandhuBuy] + 商品链接 + 商品名称 + 邀请文案

+ 1 - 1
src/pages/register/register.vue

@@ -66,7 +66,7 @@ async function getVerificationCode() {
     })
 
     // 调用获取验证码接口
-    await getCode(formData.value.phone)
+    await getCode(`88${formData.value.phone}`)
 
     uni.hideLoading()
     toast.success(t('auth.register.success.codeSent'))