feat

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"',
   },
   defineConstants: {
-    // HOST: '"http://127.0.0.1:9087"',
-    HOST: '""',
+    HOST: '"http://127.0.0.1:9087"',
+    // HOST: '""',
     // HOST: '"https://wmcj.huoshannews.com"',
     MAPHOST: '"/api2"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',

config/index.js

@@ -30,7 +30,10 @@ export default defineConfig(async (merge, { command, mode }) => {
     plugins: [],
     defineConstants: {},
     copy: {
-      patterns: [{ from: "src/assets/tabbar/", to: "dist/assets/tabbar/" }],
+      patterns: [
+        { from: "src/assets/tabbar/", to: "dist/assets/tabbar/" },
+        { from: "src/assets/js/", to: "dist/assets/js/" },
+      ],
       options: {},
     },
     framework: "react",

src/assets/js/smartcitysdk.js

@@ -0,0 +1,614 @@
+;(function(undefined) {
+
+    var _initBridge = false;
+
+    function SmartCity(){}
+  
+    function setupWebViewJavascriptBridge(callback) {
+        if (window.WebViewJavascriptBridge) {
+            return callback(WebViewJavascriptBridge);
+        }else{
+            document.addEventListener('WebViewJavascriptBridgeReady', function() {
+                return callback(WebViewJavascriptBridge);
+            }, false);
+        }
+        if (window.WVJBCallbacks) {
+            return window.WVJBCallbacks.push(callback);
+        }
+        window.WVJBCallbacks = [callback];
+        var WVJBIframe = document.createElement('iframe');
+        WVJBIframe.style.display = 'none';
+        WVJBIframe.src = 'https://__bridge_loaded__';
+        document.documentElement.appendChild(WVJBIframe);
+        setTimeout(function() { document.documentElement.removeChild(WVJBIframe) }, 0)
+    }
+    
+    function getMobileDevice(){
+        var mbldevice = navigator.userAgent.toLowerCase()
+        if (/iphone|ipod|ipad/gi.test(mbldevice)) {
+            return 'iOS'
+        } else if (/android/gi.test(mbldevice)) {
+            return 'Android'
+        } else {
+            return 'other'
+        }
+    }
+
+    function isSmartCity(){
+        var mbldevice = navigator.userAgent.toLowerCase();
+        console.log(mbldevice)
+        if (/m2osmartcity/gi.test(mbldevice) || /workcall/gi.test(mbldevice) || /html5plus/gi.test(mbldevice)
+        ) {
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    function callHandler(api, param, callback){
+        if(!isSmartCity()){
+            // alert('请在app中打开');
+            return;
+        }
+        setupWebViewJavascriptBridge(function(bridge){
+            if(typeof bridge.init != 'undefined' && bridge.init instanceof Function){
+                if(!_initBridge){
+                bridge.init(function(message, responseCallback) {});
+                _initBridge = true;
+                }
+            }
+            if (api == 'getLocation') {
+                bridge.registerHandler('getLocation', function (response, responseCallback) {
+                    response = typeof response === 'string' ? JSON.parse(response) : response;
+                    callback && callback(response);
+                    responseCallback('success');
+                });
+            }
+            bridge.callHandler(api, param , function(response) {
+                response = typeof response === 'string' ? JSON.parse(response) : response;
+                callback && callback(response);
+            });
+        });
+    }
+
+    SmartCity.prototype = {
+
+        constructor: this,
+
+        //判断是否在厚建客户端
+        isSmartCityApp : function(){
+            return isSmartCity();
+        },
+
+        //获取用户信息
+        getUserInfo : function(callback){
+            callHandler('getUserInfo', null , function(response) {
+                callback && callback(response);
+            })
+        },
+        //获取用户信息(hmas)
+        getHMASUserInfo : function(param,callback){
+            callHandler('getHMASUserInfo', param , function(response) {
+                callback && callback(response);
+            })
+        },
+        //获取设备信息
+        getSystemInfo : function(callback){
+            callHandler('getSystemInfo', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //获取位置信息
+        getLocation : function(callback){
+            callHandler('getLocation', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //去登录页
+        goLogin : function(){
+            callHandler('goLogin', null , null);
+        },
+
+        //回到上一页
+        goBack : function(){
+            callHandler('goBack', null , null);
+        },
+
+        //打电话
+        makeCall : function(param){
+            callHandler('makeCall', param , null);
+        },
+
+        //发邮件
+        sendMail : function(param){
+            callHandler('sendMail', param , null);
+        },
+
+        //发短信
+        makeMsm : function(param){
+            callHandler('makeMsm', param , null);
+        },
+
+        //去用户中心
+        goUcenter : function(){
+            callHandler('goUcenter', null , null);
+        },
+
+        //退出当前页面        
+        goAbort : function(){
+            callHandler('goAbort', null , null);
+        },
+
+        //返回首页
+        goRoot : function(){
+            callHandler('goRoot', null , null);
+        },
+
+        //分享
+        shareTo : function(param, callback){
+            callHandler('shareTo', param , function(response){
+                callback && callback(response); 
+            });
+        },
+
+        //分享成功
+        onShareSuccess : function(callback){
+            callHandler('onShareSuccess', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        showKakuAnimations : function(callback){
+            callHandler('showKakuAnimations', null, function(response){
+                callback && callback(response)
+            })
+        },
+
+        //内链跳转
+        linkTo : function(param){
+            callHandler('linkTo', param , null);
+        },
+
+        //去地图
+        goMap : function(param){
+            callHandler('goMap', param , null);
+        },
+
+        //大图预览（单张）
+        clickImage : function(param){
+            callHandler('clickImage', param , null);
+        },
+
+        //大图预览（单张）
+        showBigImage : function(param){
+            callHandler('showBigImage', param , null);
+        },
+
+        //图片保存
+        saveImage : function(param){
+            callHandler('saveImage', param , null);
+        },
+
+        //显示分享按钮
+        showShareBtn : function(param){
+            callHandler('showShareBtn', param , null);
+        },
+
+        //隐藏导航栏
+        hideTopView : function(param){
+            callHandler('hideTopView', param , null);
+        },
+
+        //全屏播放
+        fullScreenPlay : function(param){
+            callHandler('fullScreenPlay', param , null);
+        },
+
+        //清空历史信息
+        clearHistory : function(){
+            callHandler('clearHistory', null , null);
+        },
+
+        //获取头加密信息
+        getRequestHeader: function(callback){
+            callHandler('getRequestHeader', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //选择图片
+        chooseImage : function(param,callback){
+            callHandler('chooseImage', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        openSmartDialog : function(param, callback){
+            callHandler('openSmartDialog', param, function(response){
+                callback && callback(response);
+            })
+
+        },
+
+
+        //图片预览
+        previewImage : function(param){
+            callHandler('previewImage', param , null);
+        },
+
+        //扫描二维码
+        scanQRCode : function(callback){
+            callHandler('scanQRCode', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //跳转绑定手机号页面
+        goBind : function(){
+            callHandler('goBind', null , null);
+        },
+
+        //跳转人脸识别实名认证组件
+        goToAuthentication : function(callback){
+            callHandler('goToAuthentication', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+		 //跳转禾点点人脸识别
+        goToJXMealCardLivingStyle : function(callback){
+            callHandler('goToJXMealCardLivingStyle', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //跳转禾点点银行控件
+        goToJXMealCardSafetyKeyboard : function(callback){
+            callHandler('goToJXMealCardSafetyKeyboard', null , function(response) {
+                callback && callback(response);
+            })
+        },
+ 
+        //内蒙本地相册选取视频
+        chooseVideo : function(callback){
+            callHandler('chooseVideo', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        // 跳转实人认证页面
+        goToRealPersionAuth : function (param,callback) {
+            callHandler('goToRealPersionAuth', param , function(response) {
+                callback && callback(response);
+            })
+        },
+        
+        // 获取每日运动量 add by Neil@20220318
+        getStepDayData : function(param, callback) {
+            callHandler('getStepDayData', param, function(response) {
+                callback && callback(response)
+            })
+        },
+
+        // 获取健康数据 add by Neil@20220318
+        getHealthDayData : function(param, callback) {
+            callHandler('getHealthDayData', param, function(response) {
+                callback && callback(response)
+            })
+        },
+
+        //跳转拍照页面
+        goToCamera : function(param,callback){
+            callHandler('goToCamera', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //跳转拍照身份证页面
+        optionalAreaForPhotos : function(param,callback){
+            callHandler('optionalAreaForPhotos', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //跳转活体认证页面
+        goToLivingStyle : function(callback){
+            callHandler('goToLivingStyle', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //请求接口数据
+        requestApi : function(param,callback){
+            callHandler('requestApi', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //是否禁止侧滑返回
+        interactivePopDisabled : function(param){
+            callHandler('interactivePopDisabled', param , null);
+        },
+
+        //发送云统计数据
+        sendAnalysisData : function(param){
+            callHandler('sendAnalysisData', param , null);
+        },
+
+        //请求跳转子app
+        linkToSubApp : function(param){
+            callHandler('linkToSubApp', param , null);
+        },
+
+        //播放vr视频
+        goVRPlayer : function(param){
+            callHandler('goVRPlayer', param , null);
+        },
+
+        //加载播放器
+        embedVideoPlayer : function(param){
+            callHandler('embedVideoPlayer', param , null);
+        },
+
+        //销毁播放器
+        destroyVideoPlayer : function(){
+            callHandler('destroyVideoPlayer', null , null);
+        },
+
+         //跳转数字人民币
+        goUniWallet : function(param){
+            callHandler('goUniWallet', param , null);
+        },
+
+        //加载弹幕
+        loadBarrageData : function(param){
+            callHandler('loadBarrageData', param , null);
+        },
+
+        //请求接口数据
+        getRelateNews : function(callback){
+            callHandler('getRelateNews', null , function(response) {
+                callback && callback(response);
+            })
+        },
+  
+        goSubscription : function(param,callback){
+            callHandler('goSubscription', param , function(response) {
+                callback && callback(response);
+            })
+        },
+  
+        getPraiseInfo : function(callback){
+            callHandler('getPraiseInfo', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        goPraise : function(){
+            callHandler('goPraise', null , null)
+        },
+
+        getMyPraise : function(callback){
+            callHandler('getMyPraise', null , function(response) {
+                callback && callback(response);
+            })
+        },
+  
+        getDiggInfo : function(callback){
+            callHandler('getDiggInfo', null , function(response) {
+                callback && callback(response);
+            })
+        },
+  
+        getCommentList : function(callback){
+            callHandler('getCommentList', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        getCommentCount : function(callback){
+            callHandler('getCommentCount', null , function(response) {
+                callback && callback(response);
+            })
+        },
+  
+        getMoreComment : function(){
+            callHandler('getMoreComment', null , null)
+        },
+
+        showCommentInput : function(param){
+            callHandler('showCommentInput', param , null)
+        },
+  
+        getSubsInfo : function(callback){
+            callHandler('getSubsInfo', null , function(response) {
+                callback && callback(response);
+            })
+        },
+  
+        newsZan : function(callback){
+            callHandler('newsZan', null , function(response) {
+                callback && callback(response);
+            })
+        },
+  
+        commentZan : function(param,callback){
+            callHandler('commentZan', param , function(response) {
+                callback && callback(response);
+            })
+        },
+        
+        commentReply : function(param){
+            callHandler('commentReply', param , null)
+        },
+  
+        digg : function(param,callback){
+            callHandler('digg', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //获取电讯广告
+        getNewsDetailCDSPAd : function(callback){
+            callHandler('getNewsDetailCDSPAd', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //读新闻
+        readNewsContent : function(param){
+            callHandler('readNewsContent', param , null)
+        },
+
+        //设置字体大小
+        setFontSize : function(param){
+            callHandler('setFontSize', param , null)
+        },
+
+        //获取夜间模式状态
+        getNightStatus : function(callback){
+            callHandler('getNightStatus', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //融合号跳转
+        getSubsInfoOfPlus : function(param){
+            callHandler('getSubsInfoOfPlus', param , null)
+        },
+
+        //订阅"订阅状态：0或者1"
+        goSubscriptionOfPlus : function(param,callback){
+            callHandler('goSubscriptionOfPlus', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //获取网易信息流点赞数量
+        getPraiseNum : function(callback){
+            callHandler('getPraiseNum', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //获取网易信息流点击量
+        getPraiseNum : function(callback){
+            callHandler('getClickNum', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //打赏
+        goToReward : function(){
+            callHandler('goToReward', null , null);
+        },
+
+        getViewPagerInfo : function(param){
+            callHandler('getViewPagerInfo', param , null);
+        },
+
+        //开始录音
+        startRecord : function(callback){
+            callHandler('startRecord', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //停止录音
+        stopRecord : function(callback){
+            callHandler('stopRecord', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //开始播放
+        playVoice : function(param){
+            callHandler('playVoice', param , null);
+        },
+        
+        //结束播放
+        pauseVoice : function(param){
+            callHandler('pauseVoice', param , null);
+        },
+
+        //上传文件
+        uploadFile : function(param,callback){
+            callHandler('uploadFile', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //云闪付
+        appTLUnifyAllinpay : function(param){
+            callHandler('appTLUnifyAllinpay', param , null);
+        },
+
+        //微信支付
+        appCommonPay : function(param){
+            callHandler('appCommonPay', param , null);
+        },
+
+        //浏览器返回劫持
+        stopUnload: function(param,callback){
+            callHandler('stopUnload', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //震动反馈
+        vibrateFeedback: function(param,callback){
+            callHandler('vibrateFeedback', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //状态管理
+        applicationState: function(callback){
+            callHandler('applicationState', null , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        // 拍视频
+        videoRecording: function(param,callback) {
+            callHandler('videoRecording', param , function(response) {
+                callback && callback(response);
+            })
+        },
+
+        //关闭web的弹性下拉
+        closeWebViewBounces: function(param){
+            callHandler('closeWebViewBounces', param , null);
+        },
+        // 添加快捷方式到桌面
+        createShortCut: function (param) {
+            callHandler('createShortCut', param , null)
+        },
+        // 天目云服务埋点
+        getServicePage: function (param) {
+            callHandler('getServicePage', param , null)
+        },
+
+        //更新每日任务和积分
+        creditRulesUpdate : function(param){
+            callHandler('creditRulesUpdate', param , null);
+        },
+
+        //禾点点禁止截屏
+        canScreenshot : function(param){
+            callHandler('canScreenshot', param , null);
+        },
+
+        //建行支付
+        appCCBPay : function(param){
+            callHandler('appCCBPay', param , null);
+        },
+        // 返回上一级
+        webGoBack: function(param) {
+            callHandler('webGoBack', param , null);
+        }
+    }
+    window.SmartCity = new SmartCity();
+}());

src/index.html

@@ -16,11 +16,13 @@
       charset="utf-8"
       src="https://map.qq.com/api/gljs?v=1.exp&key=HTPBZ-HHJA7-XD2XD-PRS37-H3HVJ-U5BAA&libraries=service"
     ></script>
-    <!-- <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+    <!-- <script src="./assets/js/smartcitysdk.js"></script> -->
+    <script src="http://wmcj.ycjcjy.com/h5/assets/js/smartcitysdk.js"></script>
+    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
     <script>
       // VConsole 默认会挂载到 `window.VConsole` 上
       var vConsole = new window.VConsole();
-    </script> -->
+    </script>
 
     <title>civilized-miniapp</title>
     <script>

src/layouts/index.jsx

@@ -12,64 +12,52 @@ import { useEffect } from "react";
 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  const { user, duty, current: currentUser } = useModel("user");
+  const { person, user, duty } = useModel('user');
+
   const containerClass = `${laySty["page-conatiner"]} ${
     tabBar ? laySty["with-tabbar"] : ""
   } ${className}`;
 
-  const userRef = useRef();
-  // const personRef = useRef();
+  React.useEffect(() => {
+    const currentPage = Taro.getCurrentPages().slice().pop();
+
+    if (!person || !user) {
+      if (!currentPage.route.includes("pages/login/index")) {
+        Taro.navigateTo({
+          url: "/pages/login/index",
+        });
+
+        return;
+      }
+    }
+  }, [person, user]);
+
 
   // React.useEffect(() => {
-  //   if (!userRef.current && !personRef.current) {
-  //     userRef.current = person;
-  //     personRef.current = user;
-  //   }
-  //   if (!user) {
-  //     userRef.current = null;
-  //   }
   //   console.log("personRef******************");
-  //   console.log(personRef.current);
+  //   // console.log(person);
   //   console.log("userRef******************");
-  //   console.log(userRef.current);
-  //   console.log(personRef.current && !userRef.current);
+  //   console.log(user);
+  //   console.log(!user);
+  //   // if (!userRef.current&&user) {
+  //   //   userRef.current = user;
+  //   // }
 
-  //   if (personRef.current && !userRef.current) {
-  //     const currentPage = Taro.getCurrentPages().slice().pop();
-  //     console.log(currentPage.route);
-  //     if ("pages/login/index" !== currentPage.route) {
-  //       Taro.navigateTo({
-  //         url: "/pages/login/index",
-  //       });
-  //     }
+  //   if (!user) {
+  //     currentUser().catch(() => {
+  //       const currentPage = Taro.getCurrentPages().slice().pop();
+  //       if (!currentPage.route.includes("pages/login/index")) {
+  //         Taro.navigateTo({
+  //           url: "/pages/login/index",
+  //         });
+  //       }
+  //     });
   //   }
-  // }, [person, user]);
-
-  React.useEffect(() => {
-    console.log("personRef******************");
-    // console.log(person);
-    console.log("userRef******************");
-    console.log(user);
-    console.log(!user);
-    // if (!userRef.current&&user) {
-    //   userRef.current = user;
-    // }
-
-    if (!user) {
-      currentUser().catch(() => {
-        const currentPage = Taro.getCurrentPages().slice().pop();
-        if (!currentPage.route.includes("pages/login/index")) {
-          Taro.navigateTo({
-            url: "/pages/login/index",
-          });
-        }
-      });
-    }
-  }, [user]);
+  // }, [user]);
 
   Taro.useShareAppMessage(() => {
     return {
-      title: "文明霍山",
+      title: "文明城市",
     };
   });
 
@@ -81,6 +69,7 @@ export default (props) => {
       // 设置解码后的标题
       document.title = decodedTitle;
   }, []);
+
   return (
     <View className={laySty["page-wrapper"]}>
       <Notify id="vanNotify" />

src/pages/login/components/Bottom.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import Taro from '@tarojs/taro';
 import { View, Image, Button } from '@tarojs/components';
 // import Icon from '@/assets/image/WeChat.png';
 import { useModel } from '@/store';
@@ -7,7 +8,7 @@ import style from './bottom.module.less';
 
 export default (props) => {
 
-  const { signinByPhone } = useModel('user');
+  const { signinByPhone, signup } = useModel('user');
 
   const onGetPhoneNumber = (e) => {
     console.log(e)
@@ -15,18 +16,47 @@ export default (props) => {
     signinByPhone(code).then(props.onSuccess);
   }
 
+  const onClick = () => {
+    // eslint-disable-next-line no-undef
+    SmartCity.getUserInfo(function(res){
+      console.log(res);
+      if( res && res.userInfo){
+        console.log("=========SmartCity.getUserInfo==========");
+        console.log(res);
+
+        const data = {
+          openid: res.userInfo.id,
+          name: res.userInfo.member_nickname,
+          phone: res.userInfo.member_mobile,
+          avatar: res.userInfo.member_avatar,
+        };
+
+        Taro.showLoading({ title: '登录中...' });
+        signup(data).then(res2 => {
+          Taro.hideLoading();
+          props.onSuccess();
+        }).catch(err => {
+          Taro.hideLoading();
+        })
+      }else{
+          // eslint-disable-next-line no-undef
+          SmartCity.goLogin();
+      }
+    })
+  }
+
   return (
     <View>
-      <View className={style['txt-box2']}>—— 没有账号？手机号快捷登录 ——</View>
-      <View className={style['img-box2']}>
+      {/* <View className={style['txt-box2']}>—— 没有账号？手机号快捷登录 ——</View> */}
+      {/* <View className={style['img-box2']}>
         <Button openType="getPhoneNumber" onGetPhoneNumber={onGetPhoneNumber}>
-          {/* <Image className={style['img-wechat']}
+          <Image className={style['img-wechat']}
             src={Icon}
-          /> */}
+          />
           <Icon name="phone" size="32px" color='green' style={{ marginTop: '10px' }} />
         </Button>
-      </View>
-      <View className={style['wechat-login']}>手机号快捷登录</View>
+      </View> */}
+      <View className={style['wechat-login']} onClick={onClick}>市民入口</View>
     </View>
   )
 }

src/pages/login/components/bottom.module.less

@@ -27,8 +27,10 @@
   }
 }
 .wechat-login {
-  font-size: 25px;
-  color: rgb(174, 174, 174);
+  // font-size: 25px;
+  // color: rgb(174, 174, 174);
+  font-size: 32px;
+  color: var(--main-bg-color);
   text-align: center;
-  margin: 12px auto;
+  margin: 48px auto;
 }

src/pages/login/index.jsx

@@ -4,7 +4,7 @@ import { View } from '@tarojs/components';
 import Page from '@/layouts/index';
 import Head from "./components/Head";
 // import Form1 from "./components/Form1";
-// import Bottom from "./components/Bottom";
+import Bottom from "./components/Bottom";
 import './index.less'
 import Forms from './components/Forms';
 import Form1 from './components/Form1';
@@ -23,7 +23,7 @@ export default (props) => {
         <Head />
         <Form1 onSuccess={onSuccess} />
         {/* H5此无功能 */}
-        {/* <Bottom onSuccess={onSuccess} /> */}
+        <Bottom onSuccess={onSuccess} />
       </View>
     </Page>
   )

src/services/wxma.js

@@ -37,3 +37,6 @@ export const currentUser = () => request(`/api/ma/current`);
  * 修改密码
  */
 export const changePwd = (data) => request(`/api/ma/change-password`, { method: 'post', data });
+
+
+export const signup = (data) => request(`/api/ma/signup`, { method: 'post', data });

src/store/user.js

@@ -9,8 +9,10 @@ import {
   authUser,
 } from "@/services/wxma";
 import { changePassword } from "@/services/sysuser";
+import { signup } from '@/services/wxma';
 import { ROLE_CITIZEN } from "@/utils/user";
 import { setToken } from "@/utils/token";
+import { resolve } from "path";
 
 export default function useUser() {
   const [person, setPerson] = React.useState();
@@ -62,6 +64,16 @@ export default function useUser() {
     });
   };
 
+  const maSignup = (data) => {
+    return new Promise((resolve, reject) => {
+      signup(data).then(res => {
+        setPerson(res.person);
+        setUser(res.user);
+        resolve(res);
+      }).catch(reject);
+    });
+  }
+
   const current = () => {
     return new Promise((resolve, reject) => {
       currentUser()
@@ -130,6 +142,7 @@ export default function useUser() {
     authProfile,
     signOut,
     changePwd,
-    // setPerson,
+    setPerson,
+    signup: maSignup,
   };
 }