Compare commits

..

No commits in common. "4925078075c7b762a90f4f8b3b912d743ae93eaa" and "81bab972e6dea73a6301878d141cc13a7a8592d1" have entirely different histories.

8 changed files with 12 additions and 13 deletions

View File

@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: '修改交易密码'
navigationBarTitleText: '找回密码'
})

View File

@ -63,7 +63,7 @@ const Login = () => {
return
}
loading('密码重置中,请稍后~')
const re = await pwdManage('pay_password', {
const re = await pwdManage('login_password', {
confirm_password: confirmPwd,
password: pwd,
phone: account,
@ -80,7 +80,7 @@ const Login = () => {
return <View className="login-frame bg-slate-50 h-screen text-base">
<View className='addr-detail-title'>
<Image src={backNav} className="square-35 absolute left-10 nav-icon" onClick={backFn} />
修改交易密码
修改密码
</View>
<View className="change-pwd-container relative">

View File

@ -44,7 +44,7 @@ function Index() {
if (re.thumbnails?.length) {
let images = re.thumbnails
if (!!re.cover_image) {
images.unshift(re.cover_image)
images.shift(re.cover_image)
}
setThumbnails(images)
}

View File

@ -25,7 +25,7 @@ const Index = () => {
userDetail().then(rs => {
if (!rs) return
setUser(rs)
const img = jrQrcode.getQrBase64(window.location.origin + '/#/pages/register/index?code=' + rs.invite_code)
const img = jrQrcode.getQrBase64(window.location.origin + '/#/pages/index/index?code=' + rs.invite_code)
setCode(img)
})

View File

@ -119,14 +119,14 @@ const Login = () => {
</View>
</View>
<View className="form-helper">
{/* <View className="forgot-password" onClick={registerFn}>注册账号</View> */}
<View className="forgot-password" onClick={registerFn}>注册账号</View>
<View className="forgot-password" onClick={forgotPasswordFn}>忘记密码</View>
</View>
<View className="login-footer flex flex-col justify-center">
<Button className="login-btn" onClick={loginSubmit}>登录</Button>
{/* <View className="quick-login" onClick={() => {
<View className="quick-login" onClick={() => {
Taro.redirectTo({ url: '/pages/login-quick/index' })
}}>快捷登录</View> */}
}}>快捷登录</View>
</View>
</View>
</View>

View File

@ -9,12 +9,11 @@ import { useState } from "react"
import Taro from "@tarojs/taro"
import { register, sendCode } from "../../utils/api"
import { GetData } from "../../utils/storage"
import { useRouter } from "@tarojs/taro"
const activeEye = eye
const Login = () => {
const param = useRouter().params
const [pwd, setPwd] = useState()
const [confirmPassword, setConfirmPassword] = useState()
const [payPassword, setPayPassword] = useState()
@ -64,7 +63,7 @@ const Login = () => {
return
}
Taro.showLoading({ title: '正在注册中~', })
const inviteCode = param.code ? param.code : GetData("inviteCode")
const inviteCode = GetData("inviteCode")
const c = inviteCode ? inviteCode : ''
const re = await register({
nick_name: mobile,

View File

@ -47,7 +47,7 @@ const Login = () => {
errorNotice("两次账号输入不一致")
return
}
if (!num || Number(num) > Number(user.score)) {
if (num == 0 || num > user.score) {
errorNotice("转赠数量不正确")
return
}

View File

@ -107,7 +107,7 @@ function Index() {
</View>
</View>
<View className='userInfo-form' onClick={() => { navigateTo('/pages/change-pwd/index') }}>
<View className='userInfo-form-name'>修改交易密码</View>
<View className='userInfo-form-name'>修改密码</View>
<View className='flex justify-between items-center ' >
<Image src={next} className='next-icon' />