update 1.4.2

src/components/sp-page/index.js

@@ -304,7 +304,7 @@ function SpPage (props, ref) {
                 })}
                 onClick={() => {
                   if (alwaysBackUrl) {
-                    Taro.redirectTo({
+                    Taro.navigateTo({
                       url: alwaysBackUrl,
                     })
                     return

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',
+  colorPrimary: '#000',
-  colorMarketing: '#fba629',
+  // colorMarketing: '#fba629',
+  colorMarketing: '#000',
   colorAccent: '#2e3030'
 }
 

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 => {
+    if (isLogin && userInfo) {
-      draft.formInfo = {
+      setState(draft => {
-        username: userInfo.username,
+        draft.formInfo = {
-        mobile: userInfo.mobile,
+          username: userInfo.username,
-      }
+          mobile: userInfo.mobile,
-    })
+        }
+      })
+    }
   }, [userInfo])
 
   const getActiveDetail = async () => {
@@ -118,7 +124,9 @@ export default function detail () {
         </View>
       </View>
       {/* <View onClick={handleConfirm} className={"btn"}>{!status ? '确认报名' : status === 'pending' ? '报名中' : '已报名'}</View> */}
-      <View onClick={handleConfirm} className={"btn"}>{!activeInfo.status ? '确认报名' : '报名详情'}</View>
+      <SpLogin onChange={getActiveDetail}>
+        <View onClick={handleConfirm} className={"btn"}>{!activeInfo.status ? '确认报名' : '报名详情'}</View>
+      </SpLogin>
     </View>
   }