|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<view class="normal-login-container">
|
|
|
- <view class="back-icon" :style="`margin-top: ${globalData.statusBarHeight}px`">
|
|
|
+ <view class="back-icon" :style="`margin-top: ${globalData.statusBarHeight}px`">
|
|
|
<up-icon name="arrow-left" size="24" @click="backClick"></up-icon>
|
|
|
</view>
|
|
|
<image src="/static/login13785@1x.png" mode="widthFix" class="wave-img"></image>
|
|
@@ -72,15 +72,15 @@ onLoad((options) => {
|
|
|
// 处理从二维码扫描进入的场景
|
|
|
// debugger
|
|
|
// if (options.scene) {
|
|
|
- console.log('options.scene:>>>>>>>123123s', options.scene)
|
|
|
- const scene = decodeURIComponent(options.scene)
|
|
|
- const params = scene.split(':')
|
|
|
- if (params.length >= 3) {
|
|
|
- loginForm.referrerType = params[0]
|
|
|
- loginForm.referrerId = params[1]
|
|
|
- loginForm.referrerQrCodeVersion = params[2]
|
|
|
- // console.log('从二维码获取参数:', loginForm.referrerType, loginForm.referrerId)
|
|
|
- }
|
|
|
+ console.log('options.scene:>>>>>>>123123s', options.scene)
|
|
|
+ const scene = decodeURIComponent(options.scene)
|
|
|
+ const params = scene.split(':')
|
|
|
+ loginForm.referrerType = params[0]
|
|
|
+ loginForm.referrerId = params[1]
|
|
|
+ if (params.length >= 2) {
|
|
|
+ loginForm.referrerQrCodeVersion = params[2]
|
|
|
+ // console.log('从二维码获取参数:', loginForm.referrerType, loginForm.referrerId)
|
|
|
+ }
|
|
|
// }
|
|
|
|
|
|
// 如果有直接传入的参数也可以获取
|
|
@@ -219,10 +219,10 @@ const pwdLogin = async () => {
|
|
|
console.error('Store is not defined')
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 确保经纬度已添加到loginForm
|
|
|
console.log('发送登录请求,经纬度:', loginForm.latitude, loginForm.longitude)
|
|
|
-
|
|
|
+
|
|
|
store.dispatch('Login', loginForm).then(() => {
|
|
|
loginSuccess()
|
|
|
})
|
|
@@ -282,11 +282,11 @@ const onCheckboxChange = (value) => {
|
|
|
checkboxValue.value = value
|
|
|
}
|
|
|
|
|
|
-const backClick =() =>{
|
|
|
+const backClick = () => {
|
|
|
console.log('back');
|
|
|
-
|
|
|
- wx.navigateBack({
|
|
|
- delta: 1, // 返回上一页
|
|
|
+
|
|
|
+ wx.navigateBack({
|
|
|
+ delta: 1, // 返回上一页
|
|
|
});
|
|
|
}
|
|
|
|
|
@@ -303,6 +303,7 @@ const backClick =() =>{
|
|
|
justify-content: space-between;
|
|
|
z-index: 99;
|
|
|
}
|
|
|
+
|
|
|
.normal-login-container {
|
|
|
width: 100vw;
|
|
|
height: 100vh;
|