iPhone头像授权

config/dev.js

@@ -4,8 +4,9 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"https://www.newhousehold.cn"',
-    // HOST: '"http://127.0.0.1:8567"',
+    // HOST: '"https://www.newhousehold.cn"',
+    HOST: '"http://192.168.89.147:8081"',
+
     WSS_HOST: '"wss://www.newhousehold.cn"',
     // WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',

config/prod.js

@@ -3,9 +3,9 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://www.newhousehold.cn"', //正式
+    // HOST: '"http://192.168.89.147:8081"', //正式
     WSS_HOST: '"wss://www.newhousehold.cn"',
-    // HOST: '"https://xlk.njyz.tech"', //正式
+    HOST: '"https://xlk.njyz.tech"',
     // WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxc96058d57e77f373",
+	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.config.js

@@ -45,6 +45,9 @@ export default {
   permission: {
     "scope.userLocation": {
       desc: "你的位置信息将用于显示当前区域信息"
+    },
+    "scope.userInfo": {
+      desc: "你的信息将用于页面展示"
     }
   },
 }

src/components/Auth/AuthAvatar.jsx

@@ -13,7 +13,8 @@ export default (props) => {
 
   const handleUserProfile = (detail) => {
     const { errMsg, ...data } = detail || {}
-    if (errMsg === 'getUserProfile:ok') {
+
+    if (errMsg === 'getUserProfile:ok' || errMsg === 'getUserInfo:ok') {
       setLoading(true)
       updateUserInfo(data).then(() => {
         setLoading(false)

src/components/Auth/AuthBox.jsx

@@ -7,12 +7,17 @@ export default (props) => {
   const { loading, title, openType, onGetUserInfo, onGetPhoneNumber, onCancel = (x => x) } = props
 
   const handleGetUserInfo = () => {
-    Taro.getUserProfile({
-      lang: 'zh_CN',
+    const getUserInfo = Taro.canIUse('getUserProfile') ? Taro.getUserProfile : Taro.getUserInfo
+    getUserInfo({
       desc: '用于完善个人资料',
+      lang: 'zh_CN',
       success: (res) => {
+        console.log('授权成功', res);
         onGetUserInfo(res)
-      }
+      },
+      fali: (res) => {
+        console.log('授权错误', res);
+      },
     })
   }
 
@@ -36,6 +41,7 @@ export default (props) => {
             <Button
               className='auth-btn'
               type='default'
+              openType='getUserInfo'
               onClick={handleGetUserInfo}
               loading={loading}
             >确定</Button>

src/components/Auth/AuthPage/index.jsx

@@ -15,7 +15,7 @@ export default (props) => {
 
   const [loading, setLoading] = useState(false)
   const { updatePhoneNumber } = useAuth(consultant, router, page)
-  
+
   const handlePhoneNumber = (e) => {
     const { errMsg, ...data } = e?.detail || {}
     // debugger

src/components/Auth/AuthPhone.jsx

@@ -11,8 +11,8 @@ export default (props) => {
     router,
     page,
     onCancel = (x => x),
-    onSuccess = () => {},
-    onError = () => {},
+    onSuccess = () => { },
+    onError = () => { },
   } = props;
 
   const [loading, setLoading] = useState(false)

src/layout/index.js

@@ -57,7 +57,7 @@ export default (ChildComponent) => (props) => {
   useEffect(() => {
     if (isSinglePage) return;
 
-    reportCustomer(person, consultant, false).catch(() => {})
+    reportCustomer(person, consultant, false).catch(() => { })
   }, [person, consultant, isSinglePage])
 
   // 请求埋点设置
@@ -67,7 +67,7 @@ export default (ChildComponent) => (props) => {
     if (id) {
       setShareContent({})
     }
-  } ,[id, page.type, isSinglePage])
+  }, [id, page.type, isSinglePage])
 
   // 埋点数据
   useEffect(() => {
@@ -91,13 +91,13 @@ export default (ChildComponent) => (props) => {
 
   useEffect(() => {
     setLoading((!person || !person.personId) || (scene && !qrInited))
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [person, scene, qrInited])
 
   return (
     <>
       {/* 菊花转 */}
-      <Overlay visible={loading} style={{background: '#fff'}}>
+      <Overlay visible={loading} style={{ background: '#fff' }}>
         <Loading />
       </Overlay>
 
@@ -116,7 +116,7 @@ export default (ChildComponent) => (props) => {
       </Overlay>
 
       {/* 授权头像-全屏 */}
-      { authPage && !isSinglePage && <AuthPage consultant={consultant} router={router} page={page} /> }
+      {authPage && !isSinglePage && <AuthPage consultant={consultant} router={router} page={page} />}
 
       {/* 显示分享朋友圈 */}
       <ShareToCircle visible={shareTimelineVisible && !isSinglePage} onClose={() => setShareTimelineVisible(false)} />