feats

config/dev.js

@@ -3,6 +3,11 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
+    HOST: '"https://zcloud.njyunzhi.com"', //正式
+    WSS_HOST: '"wss://zcloud.njyunzhi.com"',
+    OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
+    OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
+    Version: '"V3.5.29-20201112"'
   },
   mini: {},
   h5: {}

config/index.js

@@ -1,3 +1,5 @@
+const path = require('path')
+
 const config = {
   projectName: 'miniapp',
   date: '2021-5-12',
@@ -12,6 +14,14 @@ const config = {
   plugins: [],
   defineConstants: {
   },
+  alias: {
+    '@/actions': path.resolve(__dirname, '..', 'src/actions'),
+    '@/components': path.resolve(__dirname, '..', 'src/components'),
+    '@/layout': path.resolve(__dirname, '..', 'src/layout'),
+    '@/constants': path.resolve(__dirname, '..', 'src/constants'),
+    '@/reducers': path.resolve(__dirname, '..', 'src/reducers'),
+    '@/utils': path.resolve(__dirname, '..', 'src/utils'),
+  },
   copy: {
     patterns: [
     ],

config/prod.js

@@ -3,6 +3,11 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
+    HOST: '"https://zcloud.njyunzhi.com"', //正式
+    WSS_HOST: '"wss://zcloud.njyunzhi.com"',
+    OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
+    OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
+    Version: '"V3.5.29-20201112"'
   },
   mini: {},
   h5: {

src/actions/user.js

@@ -0,0 +1,86 @@
+import {
+  USER_INFO,
+  // USER_QUERY_INFO,
+  USER_SIGNIN,
+  USER_GOODS,
+  UPDATE_USER_INFO
+} from '@/constants/user'
+
+import {
+  API_USER_INFO,
+  // API_QUERY_USER_INFO,
+  API_USER_SIGNIN,
+  API_QUERY_CUSTOMER_INFO,
+  API_QUERY_MYREPORT,
+  API_QUERY_USERINFO_BYID,
+  API_QUERY_DOCUMENTVERIFY
+} from '@/constants/api'
+
+import { createAction,createActionNormal } from '@/utils/redux'
+
+/**
+ * 获取用户信息
+ * @param {*} payload
+ */
+export const dispatchUpdateUserInfo = payload => createAction({
+  url: API_USER_INFO,
+  type: USER_INFO,
+  payload,
+  method: 'POST'
+})
+
+// export const dispatchQueryUserInfo = payload => createAction({
+//   url: API_QUERY_USER_INFO,
+//   type: USER_QUERY_INFO,
+//   payload
+// })
+
+export const dispatchUpdateUserInfoNew = id => createAction({
+  url: `${API_QUERY_USERINFO_BYID}/${id}`,
+  type: UPDATE_USER_INFO
+})
+
+
+
+/**
+ * 个人签到
+ * @param {*} payload
+ */
+export const dispatchUserSignin = payload => createAction({
+  url: API_USER_SIGNIN,
+  type: USER_SIGNIN,
+  payload,
+  method: 'POST'
+})
+
+
+/**
+ * 更新我的商品兑换记录
+ * @param {*} payload
+ */
+export const dispatchUserGoods = payload => {
+  return dispatch => dispatch({ type: USER_GOODS, payload })
+}
+
+/**
+ * 我的客户列表
+ * @param {*} payload
+ */
+export const dispatchCustomerInfo = payload => createAction({
+  url: API_QUERY_CUSTOMER_INFO,
+  type: '',
+  payload,
+  method: 'GET'
+})
+
+/**
+ * 我报备的客户列表
+ * @param {*} payload
+ */
+export const dispatchMyReport = payload =>createAction({
+  url: API_QUERY_MYREPORT,
+  type: '',
+  payload,
+  method: 'GET'
+})
+

src/constants/activity.js

@@ -0,0 +1 @@
+export const ACTIVITY_SIGNIN = 'ACTIVITY_SIGNIN'

src/constants/api.js

@@ -0,0 +1,237 @@
+/**
+ * NOTE HOST、HOST_M 是在 config 中通过 defineConstants 配置的
+ * 只所以不在代码中直接引用，是因为 eslint 会报 no-undef 的错误，因此用如下方式处理
+ */
+/* eslint-disable */
+export const host = HOST
+export const wss_host = WSS_HOST
+
+/* eslint-enable */
+
+export const pathname = '/api/wx'
+
+const resolvePath = api => `${host + pathname}/${api}`
+
+// common
+export const API_PRELOAD = resolvePath('preload')
+export const API_QRCODE = resolvePath('qrcode')
+export const API_BANNER_LIST = resolvePath('extendContent')
+export const API_QUERY_CODE_SCENE = resolvePath('qrcode/scene')
+
+// user
+export const API_USER_LOGIN = resolvePath('login')
+export const API_USER_INFO = resolvePath('signup')
+export const API_USER_SIGNIN = resolvePath('user/signin')
+export const API_USER_PHONE = resolvePath('userPhone')
+export const API_QUERY_USER_INFO = resolvePath('user/info')
+export const API_QUERY_USERINFO_BYID = resolvePath('onePerson')
+export const API_QUERY_CUSTOMER_INFO = resolvePath('customer/myCustomer')
+export const API_QUERY_MYREPORT = resolvePath('customer/myReport')
+export const API_QUERY_DOCUMENTVERIFY = resolvePath('documentVerify')
+
+export const API_QUERY_DOCUMENTVERIFY_list = resolvePath('documentVerify/list')
+export const API_QUERY_TADRAINGE = resolvePath('taDrainage')
+
+
+// chat
+export const API_CHAT_HISTORY = resolvePath('chat/history')
+export const API_CHAT_SEND = wss_host + '/wx/chat'
+export const API_CHAT_FRIENDS = resolvePath('chat/with')
+export const API_UPLOAD_IMAGE = resolvePath('image')
+export const API_CHAT_READED = resolvePath('chat/message')
+
+// card
+export const API_CARDS_LIST = resolvePath('cards')
+export const API_CARDS_APPLY = resolvePath('cards/apply')
+export const API_FORM_ID = resolvePath('formid')
+export const API_UPDATE_PHOTO = resolvePath('userInfo/updatePhoto')
+
+// project
+export const API_INDEX_CUSTOMER = resolvePath('indexCustomer')
+export const API_ITEMS_LIST = resolvePath('building/list')
+export const API_ITEMS_DETAIL = resolvePath('buildingSelectId')
+export const API_ITEMS_TYPE = resolvePath('tdBuildingType')
+export const API_ACTIVITY_GROUP = resolvePath('helpActivityAndGroup')
+export const API_LOCATION_CITYP = resolvePath('location/city')
+export const API_TACUSTOMIMG = resolvePath('taCustomImg')
+export const API_INDEX_PROJECTS = resolvePath('building/main')
+export const API_INDEX_ICONS = resolvePath('taMiniappOrgIcon')
+
+
+
+export const API_HOUSE_LIST = resolvePath('listHousingResources')
+export const API_PRESELECTION_RECORD = resolvePath('listPreselectionRecord')
+export const API_RAISE_CHECK = resolvePath('check/raise')
+export const API_RAISE_PROFILE = resolvePath('taRaise')
+export const API_SAVE_RAISE_RECORD = resolvePath('taRaiseRecord')
+export const API_RATSE_RECORD = resolvePath('taRaiseRecord/list')
+export const API_RATSE_DETAIL = resolvePath('taRaiseRecord')
+export const API_RATSE_ORDER = resolvePath('unifiedOrder')
+export const API_CANCEL_ORDER = resolvePath('cancel')
+export const API_HOUSE_DETAIL = resolvePath('getHousingDetailById')
+export const API_ADD_PRESELECTION = resolvePath('taPreselectionRecord')
+export const API_CANCEL_PRESELECTION = resolvePath('taPreselectionRecordCancel')
+export const API_APARTMENT_TYPE = resolvePath('listBuildApartmentBySalesBatchId')
+export const API_SALESBATCH_LIST = resolvePath('taSalesBatch/choice')
+export const API_NOTICE_INFO = resolvePath('getNoticeInfo')
+export const API_SALES_BATCH = resolvePath('taSalesBatch')
+export const API_ADDLIVE_NUM = resolvePath('addVisitNum')
+export const API_LIVE_DEATIL = resolvePath('taLiveActivity')
+// /wx/location/city?location=lon,lat
+
+//sign
+export const API_CONTRACT_USER = resolvePath('contract/user/add')
+export const API_CONTRACT_GET = resolvePath('contract/user/get')
+export const API_CONTRACT_AUTO = resolvePath('contract/auto')
+export const API_CONTRACT_MANUAL = resolvePath('contract/manual')
+export const API_CONTRACT_CHECK = resolvePath('contract/check')
+
+// shop
+export const API_GOODS_LIST = resolvePath('goods')
+export const API_GOODS_BUILDING = resolvePath('goodsToBuilding')
+export const API_GOODS_EXCHANGE = resolvePath('goods/exchange')
+export const API_GOODS_EXCHANGE_RECORDS = resolvePath('taPointsExchange')
+export const API_POINTS_RECORDS = resolvePath('taPointsRecords')
+export const API_POINTS_RULE = resolvePath('tdPointsRules')
+export const API_POINTS_ADRESS = resolvePath('person/city')
+export const API_GOODS_BELONGS = resolvePath('goodsToBuilding')
+
+// client
+export const API_CLIENT_LIST = resolvePath('customer/recommend/mine')
+export const API_RECOMENT_CLIENT = resolvePath('customer/new')
+export const API_CLIENT_PROGRESS = resolvePath('customer')
+export const API_TYPE_DATA = resolvePath('awesome/dict/recommendcustomer')
+
+// report
+export const API_REPORT_LIST = resolvePath('myReport')
+export const API_REPORT_CLIENT = resolvePath('customer/report')
+export const API_RECOMMEND_GET = resolvePath('customer/recommend/get')
+export const API_RECOMMEND_EDIT = resolvePath('customer/recommend/edit')
+
+// common
+export const API_ITEMS_UV = resolvePath('project/hot')
+export const API_CARDS_UV = resolvePath('consultant/hot')
+export const API_ACTIVITY_UV = resolvePath('activity/pvNum')
+export const API_NEWS_UV = resolvePath('taNews/pvNum')
+
+export const API_CARDS_LIKE = resolvePath('consultant/like')
+export const API_ITEMS_LIKE = resolvePath('project/like')
+export const API_ACTIVITY_LIKE = resolvePath('activity/like')
+export const API_NEWS_LIKE = resolvePath('news/like')
+
+export const API_CARDS_SHARE = resolvePath('consultant/share')
+export const API_ITEMS_SHARE = resolvePath('project/share')
+export const API_ACTIVITY_SHARE = resolvePath('activity/share')
+export const API_HELP_SHARE = resolvePath('help/share')
+export const API_GROUP_SHARE = resolvePath('group/share')
+export const API_HFIVE_SHARE = resolvePath('h5/share')
+export const API_NEWS_SHARE = resolvePath('news/share')
+export const API_HOUSE_SHARE = resolvePath('houseApp/share')
+export const API_HOUSE_POSTER = resolvePath('housePost/share')
+export const API_LIVE_SHARE = resolvePath('liveApp/share')
+export const API_LIVE_POSTER = resolvePath('livePost/share')
+
+export const API_INDEX_SHARE = resolvePath('main/share')
+
+export const API_ACTIVITY_FAVOR = resolvePath('activity/save')
+export const API_NEWS_FAVOR = resolvePath('news/save')
+export const API_CARD_FAVOR = resolvePath('card/save')
+export const API_PROJECT_FAVOR = resolvePath('project/save')
+
+// 埋点接口
+export const API_BURIED_POINT = resolvePath('taPersonVisitRecord')
+
+
+// activity
+export const API_ACTIVITY_LIST = resolvePath('buildingDynamiceList')
+//拼团
+export const API_GROUP_LIST = resolvePath('taShareRecord')
+//助力
+export const API_HELP_LIST = resolvePath('helpInitiateRecord')
+
+// save activity
+export const API_ACTIVITY_SAVE = resolvePath('save/buildingDynamiceList')
+
+export const API_ACTIVITY_DETAIL = resolvePath('buildingDynamiceInfo')
+// signup
+export const API_ACTIVITY_SIGNUP = resolvePath('activityDynamicEnlistAdd')
+// signin
+export const API_ACTIVITY_SIGNIN = resolvePath('taCheckin/activity')
+
+// news
+export const API_NEWS_LIST = resolvePath('taNews')
+
+
+// feedback
+export const API_FEEDBACK_SUBMIT = resolvePath('taCustomerMessage')
+
+
+// getCode
+export const API_GET_CODE = resolvePath('captcha')
+
+// checkCode
+export const API_CHECK_CODE = resolvePath('check/captcha')
+
+
+// /wx/registerConsultantOneClick
+// registerConsultant
+export const API_PUT_REGISTER = resolvePath('registerConsultant')
+
+// registerConsultantOneClick
+export const API_PUT_REGISTERCONSULTANT = resolvePath('registerConsultantOneClick')
+
+// city
+export const API_CITY_LIST = resolvePath('tdCity')
+
+
+// policy
+export const API_POLICY_LIST = resolvePath('taPolicy')
+
+//agent
+
+export const API_AGENT_LIST = resolvePath('agent/recommend/mine')
+
+export const API_REGISTER_AGENT = resolvePath('registerAgent')
+
+// agent change
+export const API_AGENT_CHANNEL = resolvePath('customer/recommend/becomeChannel')
+
+export const API_AGENT_CURRENT = resolvePath('user/current')
+
+export const API_EDIT_AGENT = resolvePath('editPerson')
+
+// 活动列表-新
+export const API_ACTNEW_LIST = resolvePath('activity/list')
+
+// 助力
+export const API_HELP_DETAIL = resolvePath('helpActivity')
+export const API_HELP_CREATE = resolvePath('helpInitiateRecord')
+export const API_HELP_FRIEND = resolvePath('helpRecord')
+
+//签到
+export const API_CHECKIN_DETAILS = resolvePath('buildingDynamiceEnlistInfo')
+export const API_CHECKIN_ACTIVE = resolvePath('buildingDynamicCheckin')
+
+// 拼团
+export const API_GROUP_DETAIL = resolvePath('taShareActivity')
+export const API_GROUP_CREATE = resolvePath('taShareRecord')
+export const API_GROUP_JOIN = resolvePath('taShareChildRecord')
+
+//person
+export const API_MY_CUSTOMER = resolvePath('inventory/customer/statistics')
+export const API_CUSTOMER_LIST = resolvePath('inventory/customer/statistics')
+export const API_CUSTOMER_DETAIL = resolvePath('inventory/customer')
+export const API_VISIT_RECORD = resolvePath('taPersonVisitRecord')
+export const API_ACTIVITY_LIST_CUSTOMER = resolvePath('customer/activity/list')
+export const API_FOLLOW_LIST = resolvePath('taCustomerFollowUpRecord')
+export const API_SEX_INFO = resolvePath('genderStatistic')
+export const API_ECHERTS_DAILY = resolvePath('customerStatisticDaily')
+export const API_ECHERTS_MONTH = resolvePath('customerStatisticMonthly')
+export const API_BUILDING_TYPE = resolvePath('getByBuildingIdSelectBuildingProjectType')
+export const API_CONSULTANT_VISIT_RECORD = resolvePath('activityVisitRecord')
+export const API_MORE_ACTIVITY = resolvePath('visitRecord/activity')
+export const API_SHARE_LIST = resolvePath('shareRecords')
+export const API_SHARE_INFOLIST = resolvePath('sharePersonInfoList')
+export const API_BIND_CUSTOMER = resolvePath('judgeBindCustomer')
+// 消息模板
+export const API_TEMPLATE_TYPE = resolvePath('template/of/')

src/constants/card.js

@@ -0,0 +1,5 @@
+export const CARD_INFO = 'CARD_INFO'
+export const CARD_LIST = 'CARD_LIST'
+export const CARD_LIKE = 'CARD_LIKE'
+export const CARD_UNLIKE = 'CARD_UNLIKE'
+

src/constants/checkin.js

@@ -0,0 +1,2 @@
+export const CHECKIN_DETAILS = 'CHECKIN_DETAILS'
+export const CHECKIN_ACTIVE = 'CHECKIN_ACTIVE'

src/constants/city.js

@@ -0,0 +1,2 @@
+export const CITY_LIST = 'CITY_LIST'
+export const CITY_SELECTED = 'CITY_SELECTED'

src/constants/common.js

@@ -0,0 +1,20 @@
+// 通知消息
+export const TPL_NOTICE = "notice";
+
+// 助力消息
+export const TPL_HELP = "help-result";
+
+// 拼团消息
+export const TPL_GROUP = "group-result";
+
+// 预选消息
+export const TPL_HOUSE = "house";
+
+// 签署合同消息
+export const TPL_SIGN = "contract-signing";
+
+// 更新预拉取数据
+export const UPDATE_PRELOAD = "UPDATE_PRELOAD";
+
+// 同步系统信息
+export const SYNC_SYSTEMINFO = "SYNC_SYSTEMINFO";

src/constants/house.js

@@ -0,0 +1,21 @@
+
+// 加入选择-暂存
+export const ADD_CART = 'ADD_CART'
+
+// 取消选择-暂存
+export const SUB_CART = 'SUB_CART'
+
+// 所有进入-暂存
+export const FLUSH_TO_CART = 'FLUSH_TO_CART'
+
+// 置业顾问列表
+export const ADD_CONSULTANT = 'ADD_CONSULTANT'
+
+// 临时选择置业
+export const CHOOSE_CONSULTANT = 'CHOOSE_CONSULTANT'
+
+// 获取预选记录
+export const MY_PRESELECT_RECORD = 'MY_PRESELECT_RECORD'
+
+//
+export const SET_ONLINE_PROTOCOL = 'SET_ONLINE_PROTOCOL'

src/constants/login.js

@@ -0,0 +1 @@
+export const USER_LOGIN = 'USER_LOGIN'

src/constants/news.js

@@ -0,0 +1,4 @@
+export const NEWS_LIST = 'NEWS_LIST'
+export const NEWS_DETAIL = 'NEWS_DETAIL'
+
+

src/constants/project.js

@@ -0,0 +1,5 @@
+export const PROJECT_LIST = 'PROJECT_LIST'
+export const PROJECT_DETAIL = 'PROJECT_DETAIL'
+export const PROJECT_SCREEN = 'PROJECT_SCREEN'
+export const SET_SCREEN_SHOWED = 'SET_SCREEN_SHOWED'
+export const LOCATION_CITY = 'LOCATION_CITY'

src/constants/shop.js

@@ -0,0 +1,7 @@
+export const GOODS_LIST = 'GOODS_LIST'
+export const GOODS_DETAIL = 'GOODS_DETAIL'
+export const GOODS_EXCHANGE = 'GOODS_EXCHANGE'
+export const GOODS_EXCHANGE_RECORDS = 'GOODS_EXCHANGE_RECORDS'
+export const POINTS_RECORDS = 'POINTS_RECORDS'
+export const POINTS_RULE = 'POINTS_RULE'
+export const POINTS_ADRESS = 'POINTS_ADRESS'

src/constants/user.js

@@ -0,0 +1,18 @@
+export const USER_INFO = 'USER_INFO'
+// export const USER_QUERY_INFO = 'USER_QUERY_INFO'
+export const USER_SIGNIN = 'USER_SIGNIN'
+export const USER_GOODS = 'USER_GOODS'
+export const ASSIGN_UNREADNUM = 'ASSIGN_UNREADNUM'
+export const INCREASE_UNREADNUM = 'INCREASE_UNREADNUM'
+export const DECREASE_UNREADNUM = 'DECREASE_UNREADNUM'
+export const API_QUERY_CUSTOMER_INFO = 'API_QUERY_CUSTOMER_INFO'
+export const API_QUERY_MYREPORT = 'API_QUERY_MYREPORT'
+export const UPDATE_USER_INFO = 'UPDATE_USER_INFO'
+
+export const ROLE_CODE = {
+  CONSULTANT: 'Realty Consultant', // 置业顾问
+  ESTATE_AGENT: 'estate agent', // 独立经纪人
+  CHANNEL_AGENT: 'channel agent', // 渠道经纪人
+  DRIFT: 'drift', // 游客
+  CUSTOMER: 'customer' // 客户
+}

src/layout/Basic.jsx

@@ -0,0 +1,21 @@
+import { Component } from 'react'
+import { connect } from 'react-redux'
+import { View } from '@tarojs/components'
+
+import './style.scss'
+
+@connect(({ user }) => ({...user}))
+class BasicLayout extends Component {
+  render () {
+    const person = this.props.person
+    const loading = !person || !person.personId
+
+    return (
+      <View className='demo'>
+      </View>
+    )
+  }
+}
+
+export default BasicLayout
+

src/layout/style.scss

@@ -0,0 +1,40 @@
+.demo {
+  width: 100px;
+  height: 100px;
+  border-radius: 100%;
+  animation: demo1 1.6s linear infinite;
+  border: 4px solid #f3f3f3;
+  margin: 100px auto;
+  display: inline-block;
+}
+
+@keyframes demo1 {
+  0% {
+    border-left-color: red;
+    transform:rotate(0deg);
+  }
+
+  25% {
+    border-left-color: red;
+    border-top-color: red;
+    transform:rotate(180deg);
+  }
+
+  50% {
+    border-left-color: red;
+    border-top-color: red;
+    border-bottom-color: red;
+    transform:rotate(180deg);
+  }
+
+  75% {
+    border-left-color: red;
+    border-top-color: red;
+    transform:rotate(180deg);
+  }
+
+  100% {
+    border-left-color: red;
+    transform:rotate(360deg);
+  }
+}

src/pages/index/index.jsx

@@ -1,45 +1,11 @@
 import { Component } from 'react'
-import { connect } from 'react-redux'
-import { View, Button, Text } from '@tarojs/components'
 
-import { add, minus, asyncAdd } from '../../actions/counter'
+import BasicLayout from '@/layout/Basic'
 
-import './index.scss'
-
-
-@connect(({ counter }) => ({
-  counter
-}), (dispatch) => ({
-  add () {
-    dispatch(add())
-  },
-  dec () {
-    dispatch(minus())
-  },
-  asyncAdd () {
-    dispatch(asyncAdd())
-  }
-}))
 class Index extends Component {
-  componentWillReceiveProps (nextProps) {
-    console.log(this.props, nextProps)
-  }
-
-  componentWillUnmount () { }
-
-  componentDidShow () { }
-
-  componentDidHide () { }
-
   render () {
     return (
-      <View className='index'>
-        <Button className='add_btn' onClick={this.props.add}>+</Button>
-        <Button className='dec_btn' onClick={this.props.dec}>-</Button>
-        <Button className='dec_btn' onClick={this.props.asyncAdd}>async</Button>
-        <View><Text>{this.props.counter.num}</Text></View>
-        <View><Text>Hello, World</Text></View>
-      </View>
+      <BasicLayout />
     )
   }
 }

src/reducers/index.js

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

src/reducers/user.js

@@ -0,0 +1,127 @@
+import { mergeNotNull } from '@/utils/tools'
+
+import {
+  USER_INFO,
+  // USER_QUERY_INFO,
+  USER_SIGNIN,
+  ASSIGN_UNREADNUM,
+  INCREASE_UNREADNUM,
+  DECREASE_UNREADNUM,
+  UPDATE_USER_INFO,
+} from '@/constants/user'
+
+const INITIAL_STATE = {
+  userInfo: {
+    person: {},
+    extraInfo: {},
+    miniApp: {},
+  },
+  unReadNum: 0
+}
+
+export default function user(state = INITIAL_STATE, action) {
+  switch (action.type) {
+    case USER_INFO: {
+      if (!(state.userInfo || {}).person) {
+        return {
+          ...state,
+          userInfo: {
+            ...action.payload
+          }
+        }
+      } else {
+        const { person, extraInfo, miniApp } = action.payload || {}
+        const newPerson = mergeNotNull(state.userInfo.person, person)
+        const newExtraInfo = mergeNotNull(state.userInfo.extraInfo, extraInfo)
+        const newMiniApp = mergeNotNull(state.userInfo.miniApp, miniApp)
+        return {
+          ...state,
+          userInfo: {
+            ...state.userInfo,
+            ...action.payload,
+            person: newPerson,
+            extraInfo: newExtraInfo,
+            miniApp: newMiniApp,
+          }
+        }
+      }
+    }
+    // case USER_QUERY_INFO: {
+    //   const { person } = state.userInfo
+    //   return {
+    //     ...state,
+    //     userInfo: {
+    //       person,
+    //       extraInfo: {
+    //         ...action.payload
+    //       }
+
+    //     }
+    //   }
+    // }
+    case UPDATE_USER_INFO: {
+      // debugger
+      const { person, extraInfo, miniApp = {} } = state.userInfo
+      const newPerson = mergeNotNull(person, action.payload)
+
+      return {
+        ...state,
+        userInfo: {
+          extraInfo,
+          person: newPerson,
+          miniApp,
+        }
+      }
+    }
+    case USER_SIGNIN: {
+      let { person, extraInfo, miniApp = {} } = state.userInfo
+      return {
+        ...state,
+        userInfo: {
+          person: {
+            ...person,
+            points: (person.points + 1)
+          },
+          extraInfo: {
+            ...extraInfo,
+            havaSigned: 1
+          },
+          miniApp,
+        }
+      }
+    }
+    case ASSIGN_UNREADNUM: {
+      let { unReadNum } = action.payload
+      return {
+        ...state,
+        unReadNum
+      }
+    }
+    case INCREASE_UNREADNUM: {
+      let { unReadNum } = state
+      return {
+        ...state,
+        unReadNum: unReadNum + 1
+      }
+    }
+    case DECREASE_UNREADNUM: {
+      let { unReadNum } = state
+
+      if (action.payload === undefined) {
+        unReadNum = 0
+      } else {
+        unReadNum = unReadNum - action.payload
+        if (unReadNum < 0) {
+          unReadNum = 0
+        }
+      }
+
+      return {
+        ...state,
+        unReadNum,
+      }
+    }
+    default:
+      return state
+  }
+}

src/utils/redux.js

@@ -0,0 +1,30 @@
+/**
+ * 适当封装 Redux，简化调用
+ */
+/* eslint-disable import/prefer-default-export */
+import { fetch } from './request'
+
+export function createAction(options) {
+  const { url, payload, method, fetchOptions, cb, type } = options
+  return (dispatch) => {
+    try {
+      return fetch({ url, payload, method, ...fetchOptions }).then((res) => {
+        dispatch({ type, payload: cb ? cb(res) : res })
+        return res
+      })
+    } catch (e) {
+      throw e
+    }
+  }
+}
+
+// 跟后端不交互
+export function createActionNormal(options) {
+  const { payload, type } = options
+  return (dispatch) => {
+    return new Promise(resolve => {
+      dispatch({ type, payload })
+      resolve(payload)
+    })
+  }
+}

src/utils/request.js

@@ -0,0 +1,173 @@
+import Taro from '@tarojs/taro'
+import * as apis from '@/constants/api'
+// import login from '@/utils/login'
+import rtLog from './rtLog'
+
+const CODE_SUCCESS = 1000
+const CODE_UNLOGIN = 1001
+const CODE_AUTH_EXPIRED = 1002
+const accountInfo = wx.getAccountInfoSync();
+const appId = accountInfo.miniProgram.appId
+
+export { apis };
+
+export const getStorage = function (key) {
+  return Taro.getStorage({ key }).then(res => res.data).catch(() => '')
+}
+
+export const setStorage = function (key, data) {
+  return Taro.setStorage({ key, data })
+}
+
+/**
+ * 简易封装网络请求
+ * // NOTE 需要注意 RN 不支持 *StorageSync，此处用 async/await 解决
+ * @param {*} options
+ */
+export const fetch = async (options) => {
+  const opts = optionBuilder(options)
+
+  return Taro.request(opts[0])
+    .then((res) => reqSuccess(res, opts))
+    .catch((err) => reqFail(err, opts))
+}
+
+export const uploadFiles = async (files) => {
+  const uploads = []
+  const token = await getStorage('token')
+  const authHeader = token ? { 'authorization': `Bearer ${token}` } : {}
+  for (var i = 0; i < files.length; i++) {
+    uploads[i] = new Promise((resolve, reject) => {
+      wx.uploadFile({
+        url: apis.API_UPLOAD_IMAGE,
+        filePath: files[i],
+        header: {
+          ...authHeader,
+          'appId': appId,
+          'x-action': 'miniapp'
+        },
+        name: 'file',
+        success: function (res) {
+          // debugger
+          const _data = JSON.parse(res.data)
+          if (_data.code !== CODE_SUCCESS) {
+            reject(new Error(_data.message))
+          }
+
+          resolve(_data.data)
+        },
+        fail(err) {
+          reject(err)
+        }
+      })
+    })
+  }
+
+  return Promise.all(uploads)
+}
+
+export function optionBuilder(options) {
+  const { url, payload = {}, method = 'GET', showToast = true, autoLogin = true, header } = options
+  const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
+  const consultant = Taro.getStorageSync('consultantId') || ''
+  const recommender = Taro.getStorageSync('recommender') || ''
+
+  return [
+    {
+      url,
+      method,
+      data: payload,
+      header: {
+        'content-type': 'application/json',
+        'authorization': `Bearer ${Taro.getStorageSync('token')}`,
+        'appId': appId,
+        'x-action': 'miniapp',
+        'x-version': Version,
+        'x-consultant': consultant,
+        'x-recommender': recommender,
+        ...header || {},
+      }
+    },
+    {
+      showMessage,
+      autoLogin
+    }
+  ]
+}
+
+export function reqSuccess(res, opts) {
+  const [, settings] = opts || []
+  const { showMessage, autoLogin = true } = settings || {}
+
+  if (res.statusCode === 500) {
+    Taro.showToast({
+      title: "请检查网络",
+      icon: 'none'
+    })
+    console.error(res)
+    throw new Error('请检查网络')
+  }
+
+  const { data, code, message } = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
+  if (code === CODE_SUCCESS) {
+    return data
+  } else {
+    const isExpired = (code === CODE_AUTH_EXPIRED || code === CODE_UNLOGIN)
+    const defaultMsg = isExpired ? '登录失效' : message
+    if (isExpired && autoLogin) {
+      // token失效，重新登录后，跳转到首页
+      login({}, () => {
+        Taro.switchTab({
+          url: '/pages/project/index'
+        })
+      })
+    } else {
+      if (showMessage) {
+        Taro.showToast({
+          title: defaultMsg,
+          icon: 'none'
+        })
+      }
+    }
+    if (showMessage) {
+
+      Taro.showToast({
+        title: message,
+        icon: 'none'
+      })
+    }
+
+    throw res.data
+  }
+}
+
+export function reqFail(err, opts) {
+  const [reqParams, settings] = opts || []
+  const { showMessage } = settings || {}
+
+  rtLog.error('[request]', "==================================")
+  rtLog.error('[request]', err)
+  rtLog.error('[request]', reqParams.url)
+  rtLog.error('[request]', wx.getLaunchOptionsSync())
+  rtLog.error('[request]', "==================================")
+
+  let errMessage = `请求失败: ${err.errMsg}`
+  if (err.errMsg) {
+    errMessage = '请检查网络'
+  }
+
+  if (err.message) {
+    console.error('请求失败', err.message)
+    errMessage = err.message.indexOf('java') > -1 ? '服务内部错误' : err.message
+  }
+
+  if (showMessage) {
+    Taro.showToast({
+      title: errMessage,
+      icon: 'none',
+      duration: 3000
+    })
+  }
+
+  throw new Error(errMessage)
+}

src/utils/rtLog.js

@@ -0,0 +1,30 @@
+
+let logger = wx.getRealtimeLogManager ? wx.getRealtimeLogManager() : null;
+
+function info(...args) {
+  // 本地打印
+  console.info(...args)
+
+  // 远程提交
+  if (logger) {
+    logger.info(...args)
+  }
+}
+
+function error(...args) {
+  console.error(...args)
+
+  if (logger) {
+    logger.error(...args)
+  }
+}
+
+function warn(...args) {
+  console.warn(...args)
+
+  if (logger) {
+    logger.warn(...args)
+  }
+}
+
+export default { info, error, warn }

src/utils/tools.js

@@ -0,0 +1,317 @@
+import Taro from "@tarojs/taro";
+import store from "../store";
+import rtLog from "./rtLog";
+
+/**
+ * 是否为空
+ * @param {*} o
+ */
+export function isEmpty(o) {
+  if (typeof o === "string") {
+    if (!o || o === "null" || o === "undefined") {
+      return true;
+    }
+  }
+
+  if (typeof o === "object") {
+    return !Object.keys(o).length;
+  }
+
+  if (Array.isArray(o)) {
+    return !o.length;
+  }
+
+  if (o === null || o === undefined) {
+    return true;
+  }
+
+  return false;
+}
+
+export function ifNull(o, def) {
+  return isEmpty(o) ? def : o;
+}
+
+/**
+ * 是否函数
+ * @param {*} f
+ */
+export function isFunction(f) {
+  return typeof f === "function";
+}
+
+/**
+ * 是否分享场景(含扫码)
+ * @param {*} scene
+ */
+export function sceneInShare(scene) {
+  return (
+    [1007, 1008, 1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048, 1049].indexOf(
+      scene
+    ) > -1
+  );
+}
+
+/**
+ * 造空数组
+ * @param {int}} n
+ */
+export function times(n) {
+  return n > 0 ? "*".repeat(n - 1).split("*") : [];
+}
+
+/**
+ * 屏蔽手机中间 4 位
+ * @param {*} phone
+ */
+export function maskPhone(phone) {
+  return phone.replace(/^(\d{3})(\d{4})/, "$1****");
+}
+
+/**
+ * 将 b 中不为 null 或者 undefined 的值合并到 a 中
+ * @param {*} a
+ * @param {*} b
+ */
+export function mergeNotNull(a, b) {
+  const bKeys = Object.keys(b || {});
+  if (!bKeys.length) {
+    return a;
+  }
+
+  let res = { ...(a || {}) };
+
+  bKeys.forEach(k => {
+    const v = b[k];
+    if (v === null || v === undefined) {
+      return;
+    }
+
+    res[k] = v;
+  });
+
+  return res;
+}
+
+const ossPath = OSS_PATH;
+const ossFastPath = OSS_FAST_PATH;
+
+/**
+ *
+ * @param {*} img
+ * @param {*} quality  仅支持 70,50,30,5
+ */
+export function getThumbnail(img, quality) {
+  if (!img) return img;
+
+  if (img.indexOf(ossPath) === 0 || img.indexOf(ossFastPath) === 0) {
+    return `${img.replace(
+      ossPath,
+      ossFastPath
+    )}?x-oss-process=style/compress${quality || 30}`;
+  }
+
+  return img;
+}
+
+export function resizeImage(img, size) {
+  if (!img) return img;
+
+  if (img.indexOf(ossPath) === 0 || img.indexOf(ossFastPath) === 0) {
+    return `${img.replace(
+      ossPath,
+      ossFastPath
+    )}?x-oss-process=style/resize${size || 750}`;
+  }
+
+  return img;
+}
+
+/**
+ * 压缩图片 80%, 最大宽度 750
+ * @param {*} img
+ */
+export function transferImage(img) {
+  if (!img) return img;
+
+  if (img.indexOf(ossPath) === 0 || img.indexOf(ossFastPath) === 0) {
+    if (store.getState().system.systemInfo.platform !== "ios") {
+      // ios 暂时不支持 webp
+      return `${img.replace(
+        ossPath,
+        ossFastPath
+      )}?x-oss-process=style/transwebp`;
+    }
+
+    return `${img.replace(
+      ossPath,
+      ossFastPath
+    )}?x-oss-process=image/resize,m_lfit,w_750/quality,Q_80`;
+  }
+
+  return img;
+}
+
+/**
+ * 简易版解析 url
+ * @param {*} url
+ */
+export function parseURL(url) {
+  if (!url) return undefined;
+
+  let strTmp;
+  let query;
+  let hash;
+
+  const gotHash = url.split("#");
+  strTmp = gotHash[0];
+  if (gotHash.length > 1) {
+    hash = gotHash[1];
+  }
+
+  const gotQuery = strTmp.split("?");
+  strTmp = gotQuery[0];
+  if (gotQuery.length > 1) {
+    query = gotQuery[1];
+  }
+
+  // 小程序只支持 https 开头
+  const [_, origin, path] = /(https?:\/\/[^/]+)(.*)/.exec(strTmp);
+
+  return {
+    origin,
+    path,
+    query,
+    hash
+  };
+}
+
+/**
+ * 解析 queryString   a=b&c=d  ==> { a:b, c:d }
+ * @param {*} queryString
+ */
+export function parseQueryString(queryString) {
+  if (!queryString || "?" === queryString) return undefined;
+
+  const query =
+    queryString.indexOf("?") === 0
+      ? queryString.replace(/^\?/, "")
+      : queryString;
+
+  return query
+    .split("&")
+    .filter(x => x)
+    .reduce((acc, it) => {
+      const [k, v] = it.split("=");
+      const val = Object.prototype.hasOwnProperty.call(acc, k)
+        ? [...[].concat(acc[k]), v]
+        : v;
+
+      return {
+        ...acc,
+        [`${k}`]: ifNull(val, undefined)
+      };
+    }, {});
+}
+
+export function toQueryString(o) {
+  const obj = o || {};
+  return Object.keys(obj)
+    .map(key => `${key}=${obj[key]}`)
+    .join("&");
+}
+
+/**
+ *
+ * @param {*} url
+ * @param {*} params
+ */
+export function mergeQueryParams(from, to) {
+  const originParams = parseQueryString(from) || {};
+  const newParams = {
+    ...originParams,
+    ...(parseQueryString(to) || {})
+  };
+
+  return Object.keys(newParams)
+    .map(key => `${key}=${newParams[key]}`)
+    .join("&");
+}
+
+/**
+ * 格式化剩余时间为 xx天xx小时xx分xx秒
+ * @param {int} leftTime 时间毫秒数
+ */
+export function formateLeftTime(leftTime, unit) {
+  const nd = 1000 * 24 * 60 * 60;
+  const nh = 1000 * 60 * 60;
+  const nm = 1000 * 60;
+  const ns = 1000;
+
+  const day = Math.floor(leftTime / nd);
+  const hour = Math.floor((leftTime % nd) / nh);
+  const min = Math.floor(((leftTime % nd) % nh) / nm);
+  const sec = Math.floor((((leftTime % nd) % nh) % nm) / ns);
+
+  switch (unit) {
+    case "min":
+      return `${day}天${hour}小时${min}分`;
+    default:
+      return `${day}天${hour}小时${min}分${sec}秒`;
+  }
+}
+
+export function getDownloadURL(url, type) {
+  if (!url) return url;
+
+  switch (type) {
+    case "avatar":
+      return url
+        .replace("https://wx.qlogo.cn/", `${HOST}/qlogo/`)
+        .replace("https://thirdwx.qlogo.cn/", `${HOST}/thirdwx/`);
+    case "alioss":
+      return url
+        .replace(ossPath, `${HOST}/alioss/`)
+        .replace(ossFastPath, `${HOST}/alioss/`);
+    default:
+      return url;
+  }
+}
+
+/**
+ * @description 获取当前页url
+ */
+export const getCurrentPageUrl = () => {
+  let pages = Taro.getCurrentPages();
+  let currentPage = pages[pages.length - 1];
+  let url = currentPage.route;
+  return url;
+};
+
+export const pageToLogin = () => {
+  let path = getCurrentPageUrl();
+  if (!path.includes("login")) {
+    Taro.navigateTo({
+      url: "/pages/login/login"
+    });
+  }
+};
+
+export const isObject = function(value) {
+  var type = typeof value;
+  return value != null && type === "object";
+};
+
+//使用递归的方式实现数组、对象的深拷贝
+export const deepClone = function(obj) {
+  if (!isObject(obj)) {
+    throw new Error("obj 不是一个对象！");
+  }
+  let isArray = Array.isArray(obj);
+  let cloneObj = isArray ? [] : {};
+  for (let key in obj) {
+    cloneObj[key] = isObject(obj[key]) ? deepClone(obj[key]) : obj[key];
+  }
+
+  return cloneObj;
+};