diff --git a/src/pages.json b/src/pages.json index 0a435f4..152c649 100644 --- a/src/pages.json +++ b/src/pages.json @@ -13,6 +13,7 @@ {"path": "pages/mine/MyOrders"}, {"path": "pages/mine/MyPets"}, {"path": "pages/mine/Profile"}, + {"path": "pages/video-player/videoPlayer"}, {"path": "pages/report-view/reportView"} ], "globalStyle": { diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue index 52032f8..f2927fe 100644 --- a/src/pages/login/Login.vue +++ b/src/pages/login/Login.vue @@ -230,6 +230,11 @@ const onWechatLoginNotInMp = () => { showToast('微信授权登录仅支持在微信小程序内使用,请使用验证码登录') } +const getWxLoginPhone = (res) => { + if (!isHttpOk(res)) return '' + return uString(res?.data?.user?.phone || res?.data?.phone) +} + /** * 微信小程序:用户同意授权后携带 code,服务端换手机号并登录。 * @see https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/getPhoneNumber.html @@ -273,8 +278,9 @@ const onWxGetPhoneNumberBoss = async (e) => { loginLoading.value = true try { const res = await wxPhoneLogin(code) - if (res.code === 200 && res.data?.phone) { - bossForm.phone = res.data.phone + const phone = getWxLoginPhone(res) + if (phone) { + bossForm.phone = phone bossForm.wxPhoneAuto = true showToast('手机号已获取') } else { @@ -297,8 +303,9 @@ const onWxGetPhoneNumberStaff = async (e) => { loginLoading.value = true try { const res = await wxPhoneLogin(code) - if (res.code === 200 && res.data?.phone) { - staffForm.phone = res.data.phone + const phone = getWxLoginPhone(res) + if (phone) { + staffForm.phone = phone staffForm.wxPhoneAuto = true showToast('手机号已获取') } else { diff --git a/src/pages/video-player/videoPlayer.vue b/src/pages/video-player/videoPlayer.vue new file mode 100644 index 0000000..f102b76 --- /dev/null +++ b/src/pages/video-player/videoPlayer.vue @@ -0,0 +1,93 @@ + + + + +