ipanel-rnapp-ajb-base 1.0.20 → 1.0.21

package/app/base.js

@@ -202,19 +202,17 @@ global.base.getIPanelCloudDomain = () => {
 
 // 获取当前家庭云家服务实例名(如a2)，跟当前登录的ipanelcloud用户有关
 global.base.getHomeCloudServiceInstanceName = async () => {
-  return NativeModules?.RNToNativeEmitter?.appName === '禺乐慧家'
+  const activeAddr = await storage.get('activeAddr');
+  const sub_domain = activeAddr?.sub_domain
+  return sub_domain ? sub_domain : (NativeModules?.RNToNativeEmitter?.appName === '禺乐慧家'
     ? 'a21'
-    : 'a2';
+    : 'a2');
 };
 
 // 获取当前`homed`域名（`正式homed用户`域名优先于`homed游客`域名）
 global.base.getHomedDomain = async () => {
   const activeAddr = await storage.get('activeAddr');
-  if (
-    activeAddr &&
-    activeAddr.domain &&
-    (await storage.get('homedAccessToken'))
-  ) {
+  if (activeAddr?.domain) {
     // console.log('正式homed用户域名', activeAddr.domain);
     return activeAddr.domain;
   }

package/app/screens/CommonScreens/BossScreen/index.js

@@ -1,11 +1,11 @@
-import React, {useEffect, useState} from 'react';
-import {View} from 'react-native';
-import {WebView} from 'react-native-webview';
-import {bindBossAccount, getUserInfo, getAssets} from '../../../api';
-const {ScreenBackHeader} = global.base.commonComponents;
-const {storage} = global.base;
+import React, { useEffect, useState } from 'react';
+import { View } from 'react-native';
+import { WebView } from 'react-native-webview';
+import { bindBossAccount, getUserInfo, getAssets } from '../../../api';
+const { ScreenBackHeader } = global.base.commonComponents;
+const { storage } = global.base;
 
-export default ({navigation, route}) => {
+export default ({ navigation, route }) => {
   const module = route?.params?.module;
   const [uri, setUri] = useState('');
   const [state, setState] = useState('');
@@ -15,25 +15,26 @@ export default ({navigation, route}) => {
   }, []);
   const init = async () => {
     const accountData = await storage.get('accountData');
-    const binding = 1; // 1：绑定，0：解绑
+    const binding = 1; // 1：绑定，0：解绑.
     const redirect_uri =
       'https://ipanelcloud2.ipanel.cn:50443/iapp/ajbstatic/bind_boss_account/'; // 绑定后跳转地址
     const state2 = generateRandomString(8);
     setState(state2);
     setUri(
-      `https://boss.ipanel.cn/ipanelTask/api/cas_open/isport/Isport_cloud_mall_c/binding?agentid=119&oauth2_id=2a90c35712f488009a53bffe956195e5&redirect_uri=${redirect_uri}&open_id=${accountData.account_id}&binding=${binding}&scope=snsapi_base&response_type=code&state=${state2}`,
+      `https://boss.ipanel.cn/ipanelTask/api/cas_open/isport/Isport_cloud_mall_c/binding?agentid=133&oauth2_id=72d2453f689fc99548187dca4b922a5b&redirect_uri=${redirect_uri}&open_id=${accountData.user?.user_id}&binding=${binding}&scope=snsapi_base&response_type=code&state=${state2}`
     );
   };
 
-  const onMessage = async e => {
+  const onMessage = async (e) => {
     const data = JSON.parse(e.nativeEvent.data);
     console.log('onMessage', data);
     if (data.ret === 0 && data.code && data.state === state) {
       global.loading.showLoading('正在绑定...');
       const res = await bindBossAccount({
         code: data.code,
-        oauth2: '2a90c35712f488009a53bffe956195e5',
+        oauth2: '72d2453f689fc99548187dca4b922a5b',
       });
+      console.log(res, 'bindBossAccount');
       global.loading.hideLoading('正在绑定...');
       if (res.code === 0) {
         global.toast.showToast('绑定成功');
@@ -49,6 +50,7 @@ export default ({navigation, route}) => {
 
   const get_user_info = async () => {
     const res = await getUserInfo();
+    console.log(res, 'getUserInfo');
     if (
       res?.code === 0 &&
       res.result?.user_list &&
@@ -58,7 +60,7 @@ export default ({navigation, route}) => {
       // accountData.user.bind_list = res.result?.user_list[0].bind_list;
       // await storage.set('accountData', accountData);
       // const bossData = accountData.user.bind_list
-      const bossData = res.result?.user_list[0].bind_list.filter(item => {
+      const bossData = res.result?.user_list[0].bind_list.filter((item) => {
         return item.third_type === 'boss';
       });
       console.log(bossData[0]);
@@ -84,14 +86,14 @@ export default ({navigation, route}) => {
     if (appID) {
       params.appid = appID;
     }
-    getAssets(params).then(res => {
+    getAssets(params).then((res) => {
       if (res?.code === 0) {
         if (
           res?.result &&
           res?.result?.asset_list &&
           res?.result?.asset_list?.length
         ) {
-          const current = res.result?.asset_list.filter(item => {
+          const current = res.result?.asset_list.filter((item) => {
             return item.currency === 20000;
           });
           if (current.length) {
@@ -103,7 +105,7 @@ export default ({navigation, route}) => {
     });
   };
 
-  const generateRandomString = length => {
+  const generateRandomString = (length) => {
     const characters =
       'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; // Add any additional special characters you want to include
     let result = '';
@@ -115,17 +117,17 @@ export default ({navigation, route}) => {
   };
 
   return (
-    <View style={{flex: 1}}>
+    <View style={{ flex: 1 }}>
       <ScreenBackHeader title="BOSS登录" />
-      <View style={{flex: 1}}>
+      <View style={{ flex: 1 }}>
         <WebView
           bounces={false}
-          domStorageEnabled={false}
+          // domStorageEnabled={false}
           javaScriptEnabled
           useWebKit
           source={{
             uri: uri,
-            headers: {'Cache-Control': 'no-store'},
+            headers: { 'Cache-Control': 'no-store' },
           }}
           incognito={true}
           onMessage={onMessage}

package/app/screens/CommonScreens/ScanQRCodeScreen/index.js

@@ -98,10 +98,10 @@ export default class ScanQRCode extends Component {
       if (data.includes('action=redirect')) {
         /**
          *  action=redirect  重定向APP页面
-            mop=ipanel  operatorId（模块运营商，未来有可能废弃）
-            m=shop 商城模块
-            s=detail  screenName
-            a/b/c 传给商城模块的参数
+         mop=ipanel  operatorId（模块运营商，未来有可能废弃）
+         m=shop 商城模块
+         s=detail  screenName
+         a/b/c 传给商城模块的参数
          */
         const querys = data.substring(data.indexOf('?') + 1).split('&');
         const params = {};
@@ -179,10 +179,10 @@ export default class ScanQRCode extends Component {
         if (data.includes('action=redirect')) {
           /**
            *  action=redirect  重定向APP页面
-              mop=ipanel  operatorId（模块运营商，未来有可能废弃）
-              m=shop 商城模块
-              s=detail  screenName
-              a/b/c 传给商城模块的参数
+           mop=ipanel  operatorId（模块运营商，未来有可能废弃）
+           m=shop 商城模块
+           s=detail  screenName
+           a/b/c 传给商城模块的参数
            */
           const querys = data.substring(data.indexOf('?') + 1).split('&');
           const params = {};
@@ -254,7 +254,7 @@ export default class ScanQRCode extends Component {
                 flex: 1,
               }}>
               <View
-                style={{height: px(500), backgroundColor: 'rgba(34,34,34,0.7)'}}
+                style={{flex: 1, maxHeight: px(500), backgroundColor: 'rgba(34,34,34,0.7)'}}
               />
               <View
                 style={{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.20",
-  "ipanelVersion": "1.0.345",
+  "version": "1.0.21",
+  "ipanelVersion": "1.0.348",
   "description": "",
   "main": "index.js",
   "bin": {