ipanel-rnapp-ajb-base 1.0.40 → 1.0.41

package/app/App.js

@@ -45,10 +45,10 @@ import { appReport } from "./utils/common";
 
 // 基础导航页、登录页
 import BaseScreen from "./screens/BaseScreen";
-import SimpleBaseScreen from "./screens/SimpleBaseScreen.js";//简单导航：非爱家宝
-import LoginScreen from "./screens/LoginScreen";
-import NewLoginScreen from "./screens/LoginScreen/indexNew";
-import LoginEduScreen from "./screens/LoginScreen/indexEdu";//教鞭登录页
+import SimpleBaseScreen from "./screens/SimpleBaseScreen.js"; //简单导航：非爱家宝
+import LoginScreen from "./screens/LoginScreen/index";
+import SbkLoginScreen from "./screens/LoginScreen/indexSbk"; // 声必可屏登录页
+import LoginEduScreen from "./screens/LoginScreen/indexEdu"; //教鞭登录页
 import ResePasswordScreen from "./screens/ResePassword";
 import SbkScreen from "./screens/SbkScreen";
 
@@ -121,7 +121,7 @@ if (Platform.OS === "android") {
 // 公共 栈路由页面
 const CommonScreens = {
   Home: {
-    component: appName==='教鞭'?SimpleBaseScreen:BaseScreen,
+    component: appName === "教鞭" ? SimpleBaseScreen : BaseScreen,
     screenOptions: {
       title: "首页",
       headerShown: false,
@@ -129,7 +129,12 @@ const CommonScreens = {
     },
   },
   Login: {
-    component: appName==='教鞭'?LoginEduScreen:(DeviceInfo.getBrand() === "Allwinner" ? LoginScreen : NewLoginScreen),
+    component:
+      appName === "教鞭"
+        ? LoginEduScreen
+        : DeviceInfo.getBrand() === "Allwinner"
+        ? SbkLoginScreen /* 声必可屏 */
+        : LoginScreen,
     screenOptions: {
       title: "登录",
       headerShown: false,

package/app/components/common/Cell/index.js

@@ -85,7 +85,7 @@ const Index = ({
               editable={editable}
               keyboardType={keyboardType}
               maxLength={maxLength}
-              returnKeyType={returnKeyType}
+              returnKeyType={returnKeyType ? returnKeyType : 'done'}
             />
             <View style={styles.inputIconBox}>{inputIcon}</View>
           </View>

package/app/components/common/Dialog/prompt.js

@@ -96,6 +96,7 @@ const Prompt = ({ modelRef, setModalVisible }) => {
               autoFocus={!!modelRef?.autoFocus}
               onChangeText={setInput}
               keyboardType={modelRef?.keyboardType}
+              returnKeyType={modelRef?.returnKeyType||'done'}
               leftIcon={modelRef?.leftIcon}
               containerStyle={{
                 height: 31,
@@ -148,6 +149,7 @@ const Prompt = ({ modelRef, setModalVisible }) => {
                 autoFocus={!!modelRef?.autoFocus2}
                 onChangeText={setInput2}
                 keyboardType={modelRef?.keyboardType2}
+                returnKeyType={modelRef?.returnKeyType2||'done'}
                 leftIcon={modelRef?.leftIcon2}
                 containerStyle={{
                   height: 31,

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

@@ -1,7 +1,12 @@
 import React, { useEffect, useState } from "react";
 import { View } from "react-native";
 import { WebView } from "react-native-webview";
-import { bindBossAccount, getUserInfo, getAssets } from "../../../api";
+import {
+  bindBossAccount,
+  getUserInfo,
+  getAssets,
+  delThirdId,
+} from "../../../api";
 const { ScreenBackHeader } = global.base.commonComponents;
 const { storage } = global.base;
 
@@ -9,6 +14,8 @@ export default ({ navigation, route }) => {
   const module = route?.params?.module;
   const [uri, setUri] = useState("");
   const [state, setState] = useState("");
+  const bind = route?.params?.binding === 0 ? 0 : 1; // 1：绑定，0：解绑
+  console.log("bind嘻嘻", bind);
   useEffect(() => {
     init();
     global.loading.showLoading("加载中...");
@@ -16,7 +23,7 @@ export default ({ navigation, route }) => {
   const init = async () => {
     const accountData = await storage.get("accountData");
     console.log("init", accountData, "accountData");
-    const binding = 1; // 1：绑定，0：解绑.
+    const binding = bind; // 1：绑定，0：解绑
     const redirect_uri =
       "https://ipanelcloud2.ipanel.cn:50443/iapp/ajbstatic/bind_boss_account/"; // 绑定后跳转地址
     const state2 = generateRandomString(8);
@@ -33,7 +40,7 @@ export default ({ navigation, route }) => {
     const data = JSON.parse(e.nativeEvent.data);
     console.log("onMessage", data);
     if (data.ret === 0 && data.code && data.state === state) {
-      global.loading.showLoading("正在绑定...");
+      global.loading.showLoading(bind === 1 ? "正在绑定..." : "正在解绑...");
       const res = await bindBossAccount({
         code: data.code,
         oauth2: "72d2453f689fc99548187dca4b922a5b",
@@ -41,8 +48,12 @@ export default ({ navigation, route }) => {
       console.log(res, "bindBossAccount");
       global.loading.hideLoading("正在绑定...");
       if (res.code === 0) {
-        global.toast.showToast("绑定成功");
-        await get_user_info();
+        if (bind === 1) {
+          global.toast.showToast("绑定成功");
+          await get_user_info();
+        } else {
+          await delBind();
+        }
         // navigation.goBack();
       } else {
         navigation.goBack();
@@ -52,6 +63,36 @@ export default ({ navigation, route }) => {
     }
   };
 
+  const delBind = async () => {
+    try {
+      const bossData = await storage.get("bossData");
+      const appID = await global.base.getAppId();
+      const params = {
+        third_type: bossData?.third_type,
+        third_id: bossData?.third_id,
+        user_id: bossData?.user_id,
+      };
+      if (appID) {
+        params.appid = appID;
+      }
+      const res = await delThirdId(params);
+      global.loading.hideLoading("正在解绑...");
+      console.log(res, "delThirdId");
+      if (res.code === 0) {
+        await get_user_info();
+        global.toast.showToast("解绑成功");
+      } else {
+        global.toast.showToast("解绑失败");
+        navigation.goBack();
+      }
+    } catch (error) {
+      console.error("delBind error:", error);
+      global.loading.hideLoading("正在解绑...");
+      global.toast.showToast("解绑失败");
+      navigation.goBack();
+    }
+  };
+
   const get_user_info = async () => {
     try {
       const res = await getUserInfo();
@@ -71,7 +112,11 @@ export default ({ navigation, route }) => {
         console.log(bossData[0]);
         if (bossData[0]) {
           await storage.set("bossData", bossData[0]);
+        } else {
+          await storage.set("bossData", {});
         }
+      } else {
+        await storage.set("bossData", {});
       }
       if (module === "shop") {
         await get_assets();
@@ -108,7 +153,11 @@ export default ({ navigation, route }) => {
           });
           if (current.length) {
             await storage.set("isportData", current[0]);
+          } else {
+            await storage.set("isportData", {});
           }
+        } else {
+          await storage.set("isportData", {});
         }
       }
     } catch (error) {

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

@@ -340,6 +340,7 @@ export default ({ navigation, route }) => {
               value={item.value}
               onChangeText={value => onChangeText(item.name, value)}
               placeholder={item.placeholder}
+              returnKeyType="done"
             />
             {item.name === 'telephone' && telMsg ? (
               <Text style={styles.msg}>{telMsg}</Text>