Browse Source

初始化

HW 4 years ago
parent
commit
7da25426db

+ 1 - 0
.gitignore

@@ -4,3 +4,4 @@ deploy_versions/
 .rn_temp/
 node_modules/
 .DS_Store
+.idea

+ 2 - 1
src/pages/details/index.jsx

@@ -53,10 +53,11 @@ class Details extends Component {
     let token = Taro.getStorageSync('token');
     if(!token){
       Taro.getUserProfile({
-        desc: '用于用户注册',
+        desc: '用于用户登录',
         success: async (res)=> {
           let userInfo = res.userInfo
           let nickName = userInfo.nickName
+          Taro.setStorageSync('userInfor', userInfo);
           await this.login(nickName);
           await this.getSelectProject();
         },

+ 1 - 1
src/pages/index/index.jsx

@@ -111,7 +111,7 @@ class Index extends Component {
     }else{
       Taro.showToast({title:msg.error[0].message,icon:'none'});
       this.setState({
-        listState: 'RELOAD'
+        listState: msg.error[0].field === '403' ? 'NO_DATA' : 'RELOAD'
       })
     }
     Taro.stopPullDownRefresh();

+ 28 - 23
src/pages/user/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from 'react';
 import Taro,{getCurrentPages} from '@tarojs/taro';
-import { connect } from 'react-redux'
-import { View, Image,OpenData } from '@tarojs/components'
+import {connect} from 'react-redux'
+import { View, Image } from '@tarojs/components'
 
 import {set} from '../../actions/counter'
 import { login,getUserOrderList } from '../../utils/servers/servers'
@@ -12,7 +12,7 @@ import './index.less'
 import background from "../../assets/images/background.png";
 import NavBar from "../../components/NavBar";
 
-import user from '../../custom-tab-bar/image/user.png';
+import userIcon from '../../custom-tab-bar/image/user.png';
 
 @connect(({ counter }) => ({
   counter
@@ -31,6 +31,7 @@ class Index extends Component {
       list: [],
       pageNo: 0,
       listState: 'LOADING',
+      userInfor:Taro.getStorageSync('userInfor') || ''
     }
   }
 
@@ -116,7 +117,7 @@ class Index extends Component {
     }else{
       Taro.showToast({title:msg.error[0].message,icon:'none'});
       this.setState({
-        listState: 'RELOAD'
+        listState: msg.error[0].field === '403' ? 'NO_DATA' : 'RELOAD'
       })
     }
     Taro.stopPullDownRefresh();
@@ -133,34 +134,38 @@ class Index extends Component {
           onHome={()=>{}}
         />
         <Image src={background} className='background'/>
-        <View className='userInfor'>
+        <View className='userInfor' onClick={()=>{
+          if(Taro.getStorageSync('token')){
+            return;
+          }
+          Taro.getUserProfile({
+            desc: '用于用户登录',
+            success: async (res)=> {
+              let userInfo = res.userInfo
+              let nickName = userInfo.nickName
+              Taro.setStorageSync('userInfor', userInfo);
+              await this.login(nickName);
+              await this.getUserOrderList();
+              getCurrentPages()[getCurrentPages().length - 1].onLoad()
+            },
+            fail: ()=>{
+              Taro.showToast({title:'请同意授权获取用户信息',icon:'none'});
+            }
+          })
+        }}>
           <View className='avatar'>
             {
               Taro.getStorageSync('token') ?
-                <OpenData type='userAvatarUrl'/> :
-                <Image className='noLogin' src={user}/>
+                <Image src={this.state.userInfor.avatarUrl} className='login'/> :
+                <Image className='noLogin' src={userIcon}/>
             }
 
           </View>
           <View className='nickName'>
             {
               Taro.getStorageSync('token') ?
-                <OpenData type='userNickName'/> :
-                <View onClick={()=>{
-                  Taro.getUserProfile({
-                    desc: '用于用户注册',
-                    success: async (res)=> {
-                      let userInfo = res.userInfo
-                      let nickName = userInfo.nickName
-                      await this.login(nickName);
-                      await this.getUserOrderList();
-                      getCurrentPages()[getCurrentPages().length - 1].onLoad()
-                    },
-                    fail: ()=>{
-                      Taro.showToast({title:'请同意授权获取用户信息',icon:'none'});
-                    }
-                  })
-                }}>点击登录</View>
+                this.state.userInfor.nickName :
+                '点击登录'
             }
           </View>
         </View>

+ 4 - 0
src/pages/user/index.less

@@ -39,6 +39,10 @@
       align-items: center;
       justify-content: center;
       background: #989595;
+      .login{
+        width: 100%;
+        height: 100%;
+      }
       .noLogin{
         width: 68px;
         height: 68px;

+ 1 - 1
src/reducers/counter.js

@@ -1,7 +1,7 @@
 import { ADD, MINUS, SET } from '../constants/counter'
 
 const INITIAL_STATE = {
-  num: 0
+  num: 0,
 }
 
 export default function counter (state = INITIAL_STATE, action) {

+ 3 - 3
src/reducers/index.js

@@ -1,6 +1,6 @@
-import { combineReducers } from 'redux'
-import counter from './counter'
+import { combineReducers } from 'redux';
+import counter from './counter';
 
 export default combineReducers({
-  counter
+  counter,
 })

+ 2 - 2
src/utils/servers/baseUrl.js

@@ -2,10 +2,10 @@ const getBaseUrl = (url) => {
   let BASE_URL = '';
   if (process.env.NODE_ENV === 'development') {
     //开发环境 - 根据请求不同返回不同的BASE_URL
-    BASE_URL = 'https://www.kedexinxi.com'
+    BASE_URL = 'http://172.16.0.188:8088'
   } else {
     // 生产环境
-    BASE_URL = 'https://www.kedexinxi.com'
+    BASE_URL = 'http://172.16.0.188:8088'
   }
   return BASE_URL
 }

+ 4 - 2
src/utils/servers/interceptors.js

@@ -33,7 +33,8 @@ const customInterceptor = (chain) => {
       return Promise.reject("服务端出现了问题")
 
     } else if (res.statusCode === HTTP_STATUS.FORBIDDEN || res.statusCode === HTTP_STATUS.NO_PERMISSION) {
-      Taro.setStorageSync("token", "")
+      Taro.setStorageSync("token", "");
+      Taro.setStorageSync('userInfor', "");
       pageToLogin()
       // TODO 根据自身业务修改
       return;
@@ -45,7 +46,8 @@ const customInterceptor = (chain) => {
 
     } else if (res.statusCode === HTTP_STATUS.SUCCESS) {
       if(res.data.error.length !== 0 && res.data.error[0].field === '403'){
-        Taro.setStorageSync("token", "")
+        Taro.setStorageSync("token", "");
+        Taro.setStorageSync('userInfor', "");
         pageToLogin()
       }
       return res.data