diff --git a/src/components/sp-page/index.js b/src/components/sp-page/index.js
index 3b0d309..c7a4844 100755
--- a/src/components/sp-page/index.js
+++ b/src/components/sp-page/index.js
@@ -304,7 +304,7 @@ function SpPage (props, ref) {
})}
onClick={() => {
if (alwaysBackUrl) {
- Taro.redirectTo({
+ Taro.navigateTo({
url: alwaysBackUrl,
})
return
diff --git a/src/consts/index.js b/src/consts/index.js
index 6c105e9..9a538ac 100755
--- a/src/consts/index.js
+++ b/src/consts/index.js
@@ -4,7 +4,7 @@ export const STATUS_TYPES_MAP = {
WAIT_BUYER_CONFIRM: 'WAIT_BUYER_CONFIRM_GOODS',
DONE: 'TRADE_SUCCESS',
CANCEL: 'TRADE_CLOSED',
- PART_PAYMENT:'WAIT_BUYER_PAY'
+ PART_PAYMENT: 'WAIT_BUYER_PAY'
}
export const AFTER_SALE_STATUS = {
@@ -84,8 +84,9 @@ export const ACTIVITY_STATUS = {
export const DEFAULT_POINT_NAME = '积分'
export const DEFAULT_THEME = {
- colorPrimary: '#d42f29',
- colorMarketing: '#fba629',
+ colorPrimary: '#000',
+ // colorMarketing: '#fba629',
+ colorMarketing: '#000',
colorAccent: '#2e3030'
}
diff --git a/src/pages/recommend/detail.js b/src/pages/recommend/detail.js
index 5cf5e9e..45b8922 100644
--- a/src/pages/recommend/detail.js
+++ b/src/pages/recommend/detail.js
@@ -1,7 +1,7 @@
import React, { useEffect } from 'react'
import { View, Text, Input, Image, Button } from '@tarojs/components'
import Taro, { getCurrentInstance, useDidShow, useShareAppMessage } from '@tarojs/taro'
-import { SpPage, SpHtml, SpCheckbox } from '@/components'
+import { SpPage, SpHtml, SpCheckbox, SpLogin } from '@/components'
import { useSelector } from 'react-redux'
import { getActiveDetail } from '@/api/community'
import { useImmer } from 'use-immer'
@@ -9,6 +9,7 @@ import api from '@/api'
import dayjs from 'dayjs'
import { AtIcon } from 'taro-ui'
import { classNames, navigateTo } from '@/utils'
+import { useLogin } from '@/hooks'
import './detail.scss'
const initState = {
@@ -26,18 +27,23 @@ export default function detail () {
const [state, setState] = useImmer(initState)
const { appName } = useSelector((_state) => _state.sys)
const { userInfo = {} } = useSelector((_state) => _state.user)
+ const { isLogin } = useLogin({
+ autoLogin: true,
+ })
useDidShow(() => {
getActiveDetail()
}, [])
useEffect(() => {
- setState(draft => {
- draft.formInfo = {
- username: userInfo.username,
- mobile: userInfo.mobile,
- }
- })
+ if (isLogin && userInfo) {
+ setState(draft => {
+ draft.formInfo = {
+ username: userInfo.username,
+ mobile: userInfo.mobile,
+ }
+ })
+ }
}, [userInfo])
const getActiveDetail = async () => {
@@ -118,7 +124,9 @@ export default function detail () {
{/* {!status ? '确认报名' : status === 'pending' ? '报名中' : '已报名'} */}
- {!activeInfo.status ? '确认报名' : '报名详情'}
+
+ {!activeInfo.status ? '确认报名' : '报名详情'}
+
}