diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..760176f Binary files /dev/null and b/dist.zip differ diff --git a/release.zip b/release.zip new file mode 100644 index 0000000..86101d3 Binary files /dev/null and b/release.zip differ diff --git a/src/pages/change-pwd/index.config.js b/src/pages/change-pwd/index.config.js index 29558ac..9d6286b 100644 --- a/src/pages/change-pwd/index.config.js +++ b/src/pages/change-pwd/index.config.js @@ -1,3 +1,3 @@ export default definePageConfig({ - navigationBarTitleText: '找回密码' + navigationBarTitleText: '修改交易密码' }) diff --git a/src/pages/change-pwd/index.jsx b/src/pages/change-pwd/index.jsx index 6b8f210..ec93c44 100644 --- a/src/pages/change-pwd/index.jsx +++ b/src/pages/change-pwd/index.jsx @@ -63,7 +63,7 @@ const Login = () => { return } loading('密码重置中,请稍后~') - const re = await pwdManage('login_password', { + const re = await pwdManage('pay_password', { confirm_password: confirmPwd, password: pwd, phone: account, @@ -80,7 +80,7 @@ const Login = () => { return - 修改密码 + 修改交易密码 diff --git a/src/pages/goods-detail/index.jsx b/src/pages/goods-detail/index.jsx index 0559e71..13895c8 100644 --- a/src/pages/goods-detail/index.jsx +++ b/src/pages/goods-detail/index.jsx @@ -44,7 +44,7 @@ function Index() { if (re.thumbnails?.length) { let images = re.thumbnails if (!!re.cover_image) { - images.shift(re.cover_image) + images.unshift(re.cover_image) } setThumbnails(images) } diff --git a/src/pages/invite/index.jsx b/src/pages/invite/index.jsx index ebd0c0b..260f2d9 100644 --- a/src/pages/invite/index.jsx +++ b/src/pages/invite/index.jsx @@ -25,7 +25,7 @@ const Index = () => { userDetail().then(rs => { if (!rs) return setUser(rs) - const img = jrQrcode.getQrBase64(window.location.origin + '/#/pages/index/index?code=' + rs.invite_code) + const img = jrQrcode.getQrBase64(window.location.origin + '/#/pages/register/index?code=' + rs.invite_code) setCode(img) }) diff --git a/src/pages/login/index.jsx b/src/pages/login/index.jsx index 7b76e75..a1f75a3 100644 --- a/src/pages/login/index.jsx +++ b/src/pages/login/index.jsx @@ -119,14 +119,14 @@ const Login = () => { - 注册账号 + {/* 注册账号 */} 忘记密码 - { + {/* { Taro.redirectTo({ url: '/pages/login-quick/index' }) - }}>快捷登录 + }}>快捷登录 */} diff --git a/src/pages/register/index.jsx b/src/pages/register/index.jsx index 319303b..acca282 100644 --- a/src/pages/register/index.jsx +++ b/src/pages/register/index.jsx @@ -9,11 +9,12 @@ 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() @@ -63,7 +64,7 @@ const Login = () => { return } Taro.showLoading({ title: '正在注册中~', }) - const inviteCode = GetData("inviteCode") + const inviteCode = param.code ? param.code : GetData("inviteCode") const c = inviteCode ? inviteCode : '' const re = await register({ nick_name: mobile, diff --git a/src/pages/transfer/index.jsx b/src/pages/transfer/index.jsx index 9d4b6d5..f2735b9 100644 --- a/src/pages/transfer/index.jsx +++ b/src/pages/transfer/index.jsx @@ -47,7 +47,7 @@ const Login = () => { errorNotice("两次账号输入不一致") return } - if (num == 0 || num > user.score) { + if (!num || Number(num) > Number(user.score)) { errorNotice("转赠数量不正确") return } diff --git a/src/pages/user-info/index.jsx b/src/pages/user-info/index.jsx index 71d8183..ce41e29 100644 --- a/src/pages/user-info/index.jsx +++ b/src/pages/user-info/index.jsx @@ -107,7 +107,7 @@ function Index() { { navigateTo('/pages/change-pwd/index') }}> - 修改密码 + 修改交易密码 diff --git a/test.zip b/test.zip new file mode 100644 index 0000000..9f867f5 Binary files /dev/null and b/test.zip differ