0904

.vscode/settings.json

@@ -5,5 +5,8 @@
 	"i18n-ally.localesPaths": "locales",
 	"i18n-ally.keystyle": "flat",
 	"react-i18n.i18nPaths": "locales",
-	"i18n-ally.sourceLanguage": "zh-CN"
+	"i18n-ally.sourceLanguage": "zh-CN",
+	"editor.formatOnPaste": true,
+	"editor.formatOnSave": true,
+	"editor.formatOnType": true
 }

App.tsx

@@ -12,6 +12,8 @@ import useColorScheme from './hooks/useColorScheme';
 import Navigation from './navigation';
 import useModel from 'flooks';
 
+import { useTranslation } from 'react-i18next';
+
 import theme from './constants/Theme';
 import request from './utils/RequestUtils';
 
@@ -19,7 +21,9 @@ import User from './stores/User';
 
 export default function App() {
   const isLoadingComplete = useCachedResources();
-  const colorScheme = useColorScheme();
+	const colorScheme = useColorScheme();
+	
+	const { i18n } = useTranslation();
 
   const { id, getInit, initialRouteName } = useModel(User, [
     'id',
@@ -54,7 +58,7 @@ export default function App() {
                 bottom={50}
                 left={20}
               >
-                骑手端测试版 (0820) 版本三
+                骑手端测试版 (0904) 语言包导入
               </Button>
               <Navigation colorScheme={colorScheme} />
             </Div>

locales/en.json

@@ -1,93 +1,173 @@
 {
-  "welcom": "Welcome to use Dingdong takeaway platform",
+  "welcom": "Welcome to Dingdong Takeaway Platform",
   "login_form_1": "phone number",
-  "login_pla_1": "Enter merchant phone number",
+  "login_pla_1": "Enter business phone number",
   "psd": "password",
-  "deng-lu": "log in",
-  "qi-shou-zhu-ce": "Rider registration",
+  "yan-zheng-ma-deng-lu": "Verification code login",
   "shou-ji-hao": "phone number",
+  "shu-ru-shang-jia-ming-cheng": "Enter business name",
   "shu-ru-mi-ma": "enter password",
   "wang-ji-mi-ma": "forget password",
+  "qi-shou-zhu-ce": "Rider registration",
+  "deng-lu": "log in",
+  "shu-ru-shou-ji-hao": "Enter your phone number",
+  "yan-zheng-ma": "Verification code",
   "shu-ru-yan-zheng-ma": "Enter confirmation code",
-  "shu-ru-shang-jia-ming-cheng": "Enter business name",
-  "shu-ru-shou-ji-hao": "input mobile phone number",
-  "yan-zheng-ma-deng-lu": "Verification code login",
-  "yan-zheng-ma": "Captcha",
-  "mi-ma-deng-lu": "Password login",
   "mi-ma": "password",
-  "dian-dong-che": "Electric car",
-  "ding-dong-wai-mai-qi-shou-yin-si-zheng-ce": "\"Privacy Policy for Ding Dong Takeaway Riders\"",
-  "ding-dong-wai-mai-qi-shou-zhu-ce-xie-yi": "\"Dingdong Takeaway Rider Registration Agreement\"",
-  "failresult": "Sorry, the verification information you submitted failed",
-  "failresult2": "You can re-apply for riders to settle in!",
-  "gong-zuo-di-dian": "work place",
-  "guide1": "Welcome to join the Dingdong family",
+  "mi-ma-deng-lu": "Password login",
+  "qi-shou-ke-hu-duan": "Rider client",
+  "guide1": "Welcome to the big family of Dingdong",
   "guide2": "I believe that on the Dingdong platform, you will definitely gain a lot.",
+  "que-ren-mi-ma": "confirm password",
+  "zai-ci-shu-ru-que-ren-mi-ma": "Enter the confirm password again",
+  "yi-jing-yue-du-bing-tong-yi": "Have read and agreed",
+  "ding-dong-wai-mai-qi-shou-zhu-ce-xie-yi": "Dingdong Express Delivery Service Agreement",
   "he": "with",
-  "jia-shi-zheng-zheng-fan-mian": "Front and back of driver's license",
-  "jia-zai-zhong": "Loading",
-  "jiao-tong-gong-ju-zhao-pian": "Vehicle photos",
-  "li-ji-bo-da": "Call now",
+  "xia-yi-bu": "Next step",
   "lian-xi-ke-fu": "Contact Customer Service",
-  "mei-you": "No",
-  "mo-tuo-che": "motorcycle",
-  "nin-de-shen-qing-yi-ti-jiao-cheng-gong": "Your application has been submitted successfully",
-  "qi-shou-de-gong-zuo-qu-yu-wei-yi-gong-zuo-di-dian-ban-jing-3km-de-qu-yu": "The working area of ​​the rider is an area with a radius of 3km from the working place",
-  "qi-shou-ke-hu-duan": "Rider client",
-  "qi-shou-shen-he": "Rider review",
-  "qi-ta": "other",
-  "qing-nai-xin-deng-dai": "please wait patiently",
-  "qing-xuan-ze-di-dian": "Please choose a location",
+  "ti-shi": "Reminder",
   "qu-xiao": "cancel",
   "que-ren": "confirm",
-  "que-ren-mi-ma": "confirm password",
-  "shen-fen-ren-zheng-xin-xi": "Identity authentication information",
-  "shen-fen-zheng-hao": "ID number",
-  "shen-fen-zheng-zheng-fan-mian": "ID card front and back",
-  "shou-chi-shen-fen-zheng": "Holding ID card",
-  "shu-ru-xing-ming": "Enter name",
-  "shu-ru-zheng-jian-hao-ma": "Enter ID number",
-  "shuo-ming": "Explanation",
-  "song-can-jiao-tong-gong-ju": "Food delivery vehicles",
-  "song-can-jiao-tong-gong-ju-xin-xi": "Food delivery transportation information",
-  "ti-jiao-shen-he": "Submit review",
-  "ti-shi": "prompt",
   "tips1": "Make sure to call customer service",
-  "xia-yi-bu": "Next step",
-  "xuan-ze-di-dian": "Choose a location",
-  "xuan-ze-gong-zuo-di-dian": "Choose work location",
-  "yi-jing-yue-du-bing-tong-yi": "Have read and agreed",
-  "you": "Have",
-  "you-wu-jia-shi-zheng": "Driver's license",
-  "zai-ci-shu-ru-que-ren-mi-ma": "Enter the confirm password again",
+  "li-ji-bo-da": "Call now",
+  "jia-zai-zhong": "Loading",
+  "mo-tuo-che": "Motorcycle",
+  "dian-dong-che": "Electric bicycle",
+  "qi-ta": "other",
+  "mei-you": "no",
   "zhen-shi-xing-ming": "actual name",
+  "shu-ru-xing-ming": "Enter name",
+  "shen-fen-zheng-hao": "ID number",
+  "shu-ru-zheng-jian-hao-ma": "Enter the ID number",
+  "shen-fen-zheng-zheng-fan-mian": "Front and back of ID card",
+  "shou-chi-shen-fen-zheng": "Hand holding ID card",
+  "song-can-jiao-tong-gong-ju": "Food delivery transportation tool information",
+  "jiao-tong-gong-ju-zhao-pian": "Transport tool photos",
+  "you-wu-jia-shi-zheng": "With or without a driver's license",
+  "you": "Have",
+  "jia-shi-zheng-zheng-fan-mian": "Front and back of driver's license",
+  "gong-zuo-di-dian": "work place",
+  "qing-xuan-ze-di-dian": "Please choose a location",
+  "shuo-ming": "Description",
+  "qi-shou-de-gong-zuo-qu-yu-wei-yi-gong-zuo-di-dian-ban-jing-3km-de-qu-yu": "The working area of the rider is an area with a radius of 3km from the working place",
+  "ti-jiao-shen-he": "Submit review",
+  "nin-de-shen-qing-yi-ti-jiao-cheng-gong": "Your application has been submitted successfully",
+  "qing-nai-xin-deng-dai": "Please wait patiently",
+  "failresult": "Sorry, the verification information you submitted failed",
+  "failresult2": "You can reapply for a rider to settle in!",
   "zhong-xin-shen-qing": "Re-apply",
-  "bang-ding-yin-hang-ka": "Bind bank card",
-  "bao-cun": "save",
-  "ding-dan": "Orders",
-  "geng-gai-mi-ma": "change the password",
-  "geng-xin-cheng-gong": "update completed",
+  "xuan-ze-di-dian": "Select location",
+  "qi-shou-shen-he": "Rider review",
+  "xuan-ze-gong-zuo-di-dian": "Choose a work location",
+  "shen-fen-ren-zheng-xin-xi": "Identity authentication information",
   "gong-xi-nin-de-shen-qing-yi-tong-guo": "Congratulations!!! Your application has been passed",
-  "ji-ben-xin-xi": "Basic Information",
-  "jin-ri-huan-mei-you-zhang-dan-xin-xio": "There is no bill information today~",
-  "jin-ri-shou-ru": "Today's income",
-  "jin-ri-zhang-dan": "Today's bill",
-  "jin-ri-zhi-chu": "Spend today",
   "nin-de-gong-hao-wei": "Your job number is",
-  "qing-shu-ru-xin-mi-ma": "Please enter a new password",
+  "tui-chu-cheng-gong": "exit successfully",
+  "geng-xin-cheng-gong": "update completed",
+  "tou-xiang": "Avatar",
+  "yuan-mi-ma": "old password",
   "qing-shu-ru-yuan-mi-ma": "Please enter the original password",
+  "xin-mi-ma": "new password",
+  "qing-shu-ru-xin-mi-ma": "Please enter a new password",
   "qing-zhong-fu-shu-ru-xin-mi-ma": "Please repeat the new password",
-  "shou-ru": "income",
-  "ti-xian": "withdraw",
-  "tou-xiang": "Avatar",
-  "tui-chu-cheng-gong": "exit successfully",
+  "bao-cun": "save",
+  "ji-ben-xin-xi": "Basic Information",
+  "geng-gai-mi-ma": "change the password",
+  "ding-dan": "Order",
+  "xiao-xi": "news",
   "wo-de": "mine",
   "wo-de-ding-dong-bi": "My dingdong coin",
-  "wo-de-dui-zhang-dan": "My statement",
-  "xiao-xi": "news",
-  "xin-mi-ma": "new password",
-  "xuan-ze-yin-hang-ka": "Choose bank card",
+  "shou-ru": "income",
+  "zhi-chu": "expenditure",
+  "jin-ri-huan-mei-you-zhang-dan-xin-xio": "There is no bill information today~",
+  "ti-xian": "withdraw",
   "yu-e": "Balance",
-  "yuan-mi-ma": "old password",
-  "zhi-chu": "expenditure"
+  "jin-ri-zhang-dan": "Today's bill",
+  "jin-ri-shou-ru": "Today's income",
+  "jin-ri-zhi-chu": "Today's expenses",
+  "wo-de-dui-zhang-dan": "My statement",
+  "xuan-ze-yin-hang-ka": "Choose a silver card",
+  "bang-ding-yin-hang-ka": "Bind Silver Card",
+  "shen-qing-shi-jian": "application time",
+  "yin-hang-ka": "Silver card",
+  "ti-xian-jin-e": "Withdrawal Amount",
+  "ti-xian-shi-bai": "Withdrawal failed",
+  "ti-xian-cheng-gong": "Successful withdrawal",
+  "ti-xian-chu-li-zhong": "Withdrawal processing",
+  "ke-yong-yu-e": "Available balance",
+  "yuan": "yuan",
+  "yu-ji-liang-xiao-shi-nei-dao-zhang-que-ren-ti-xian": "It is expected to arrive within two hours, confirm the withdrawal",
+  "nothing1": "There is no bank card information yet",
+  "qu-tian-jia": "Go add",
+  "yin-hang-ming-cheng": "Silver name",
+  "shu-ru-yin-hang-ming-cheng": "Enter bank name",
+  "ka-hao": "card number",
+  "shu-ru-yin-hang-ka-hao": "Enter bank card number",
+  "xing-ming": "Name",
+  "shu-ru-shen-fen-zheng-hao": "Enter ID number",
+  "ti-jiao-cheng-gong": "Submitted successfully",
+  "quan-bu": "All",
+  "ti-xian-jie-guo": "Withdrawal result",
+  "wo-de-ping-jia": "my comment",
+  "fei-chang-cha": "very bad",
+  "yi-ban": "Average",
+  "chao-zan": "Awesome",
+  "wu-shu-ju": "No data",
+  "dao-di-le": "In the end",
+  "wo-de-tou-su": "My complaint",
+  "she-zhi": "Set up",
+  "tong-zhi-he-ti-shi-yin-she-zhi": "Notification and reminder sound settings",
+  "qi-shou-fu-wu-he-zuo-xie-yi": "Rider Service Cooperation Agreement",
+  "wei-jie-dan": "Missed orders",
+  "dai-qu-can": "Meal waiting",
+  "dai-song-da": "To be delivered",
+  "tui-chu-dang-qian-zhang-hu": "Exit current account",
+  "tou-su-lei-xing": "Type of complaint",
+  "tou-su-shi-jian": "Complaint time",
+  "ni-cheng": "nickname",
+  "gong-hao": "Job number",
+  "di-zhi": "address",
+  "dian-hua": "Phone call",
+  "gong-zuo-fan-wei": "Scope of work",
+  "dan-liang-re-li-tu": "Single calorimetric diagram",
+  "pei-xun-zhong-xin": "Training centered",
+  "que-ren-yao-tui-chu-dang-qian-zhang-hao-ma": "Are you sure you want to log out of the current account?",
+  "she-zhi-cheng-gong": "Set successfully",
+  "xin-xiao-xi-tong-zhi": "New message notification",
+  "xin-dan-ti-shi-yin": "New single reminder tone",
+  "cui-dan-ti-shi-yin": "Reminder reminder tone",
+  "liao-tian-xiao-xi-ti-xing": "Chat message reminder",
+  "liao-tian": "to chat with",
+  "xi-tong-ti-xing": "System reminder",
+  "ding-dan-xiang-qing": "order details",
+  "di-tu": "map",
+  "qing-shu-ru-liao-tian-nei-rong": "Please enter chat content",
+  "xiao-xi-zhong-xin": "In the news",
+  "xi-tong-xiao-xi": "system information",
+  "yong-hu-xiao-xi": "User message",
+  "zan-wu-shu-ju": "No data temporarily",
+  "song-da": "service",
+  "jie-dan": "Orders",
+  "cha-kan-dao-hang": "View navigation",
+  "wo-yi-dao-dian": "I have arrived",
+  "pai-zhao-qu-huo": "Take photos",
+  "que-ren-song-da": "Confirm delivery",
+  "jie-dan-cheng-gong": "Successful order",
+  "shang-pin-xin-xi": "Product information",
+  "fen": "Share",
+  "lian-xi-shang-jia": "Contact the merchant",
+  "shang-jia-xin-xi": "Business information",
+  "lian-xi-ke-hu": "contact clients",
+  "yong-hu-xin-xi": "Use user information",
+  "ordertips": "To avoid cargo disputes, please check and take photos for evidence when picking up the cargo",
+  "wo-yi-qu-huo": "I have picked up",
+  "liu-shui-hao": "Streaming number",
+  "yu-ji-song-da-shi-jian": "Estimated delivery time",
+  "yong-hu-shou-dao-shi-jian": "User received time",
+  "ben-dan-pai-song-shou-ru": "Delivery income of this order",
+  "shu-ru-zhen-shi-xing-ming": "Enter real name",
+  "ding-dong-wai-mai-kuai-jie-zhi-fu-fu-wu-xie-yi": "\"Dingdong Takeaway Express Payment Service Agreement\"",
+  "ding-dong-wai-mai-qi-shou-yin-si-zheng-ce": "\"Privacy Policy for Ding Dong Takeaway Riders\"",
+  "lu-xian-gui-hua": "Route planning",
+  "song-can-jiao-tong-gong-ju-xin-xi": "Food delivery transportation information"
 }

locales/th.json

@@ -1,93 +1,173 @@
 {
-  "welcom": "ยินดีต้อนรับสู่แพลตฟอร์มDing dong",
+  "welcom": "ยินดีต้อนรับสู่การใช้แพลตฟอร์ม Dingdong Food",
   "login_form_1": "หมายเลขโทรศัพท์",
-  "login_pla_1": "ใส่หมายเลขโทรศัพท์",
+  "login_pla_1": "ป้อนหมายเลขโทรศัพท์มือถือของร้านค้า",
   "psd": "รหัสผ่าน",
-  "deng-lu": "เข้าสู่ระบบ",
-  "qi-shou-zhu-ce": "การลงทะเบียนผู้ขับขี่",
+  "yan-zheng-ma-deng-lu": "เข้าสู่ระบบรหัสยืนยัน",
   "shou-ji-hao": "หมายเลขโทรศัพท์",
+  "shu-ru-shang-jia-ming-cheng": "ป้อนชื่อธุรกิจ",
   "shu-ru-mi-ma": "ใส่รหัสผ่าน",
   "wang-ji-mi-ma": "ลืมรหัสผ่าน",
-  "shu-ru-yan-zheng-ma": "ใส่รหัสยืนยัน",
-  "shu-ru-shang-jia-ming-cheng": "ป้อนชื่อธุรกิจ",
+  "qi-shou-zhu-ce": "ลงทะเบียนผู้ขับขี่",
+  "deng-lu": "เข้าสู่ระบบ",
   "shu-ru-shou-ji-hao": "ใส่หมายเลขโทรศัพท์มือถือ",
-  "yan-zheng-ma-deng-lu": "รหัสยืนยัน",
-  "yan-zheng-ma": "แจ้งลบความคิดเห็น",
-  "mi-ma-deng-lu": "รหัสผ่านเข้าสู่ระบบ",
+  "yan-zheng-ma": "รหัสยืนยัน",
+  "shu-ru-yan-zheng-ma": "ใส่รหัสยืนยัน",
   "mi-ma": "รหัสผ่าน",
-  "dian-dong-che": "รถยนต์ไฟฟ้า",
-  "ding-dong-wai-mai-qi-shou-yin-si-zheng-ce": "\"นโยบายความเป็นส่วนตัวสำหรับนักเดินทางที่ต้องเดินทางอย่างจุงตง\"",
-  "ding-dong-wai-mai-qi-shou-zhu-ce-xie-yi": "\"ข้อตกลงการลงทะเบียนขับขี่ Dongdong Takeaway\"",
-  "failresult": "ขออภัยข้อมูลการยืนยันที่คุณส่งมาล้มเหลว",
-  "failresult2": "คุณสามารถสมัครใหม่เพื่อให้ผู้ขับขี่ลงหลักปักฐานได้!",
-  "gong-zuo-di-dian": "สถานที่ทำงาน",
-  "guide1": "ยินดีต้อนรับสู่เข้าร่วมตระกูล Dingdong",
-  "guide2": "ฉันเชื่อว่าบนแพลตฟอร์ม Dingdong คุณจะได้รับมากแน่นอน",
+  "mi-ma-deng-lu": "รหัสผ่านเข้าสู่ระบบ",
+  "qi-shou-ke-hu-duan": "ผู้ขับขี่",
+  "guide1": "ยินดีต้อนรับสู่ครอบครัวใหญ่ของ Dingdong",
+  "guide2": "ฉันเชื่อว่าบนแพลตฟอร์ม Dingdong คุณจะ",
+  "que-ren-mi-ma": "ยืนยันรหัสผ่าน",
+  "zai-ci-shu-ru-que-ren-mi-ma": "ป้อนรหัสผ่านยืนยันอีกครั้ง",
+  "yi-jing-yue-du-bing-tong-yi": "อ่านเรียบร้อยและเห็นด้วย",
+  "ding-dong-wai-mai-qi-shou-zhu-ce-xie-yi": "ข้อตกลงบริการการชำระเงินด่วน",
   "he": "กับ",
-  "jia-shi-zheng-zheng-fan-mian": "ด้านหน้าและด้านหลังใบขับขี่",
-  "jia-zai-zhong": "กำลังโหลด",
-  "jiao-tong-gong-ju-zhao-pian": "รูปถ่ายยานพาหนะ",
-  "li-ji-bo-da": "โทรเลย",
+  "xia-yi-bu": "ขั้นตอนต่อไป",
   "lian-xi-ke-fu": "ติดต่อฝ่ายบริการลูกค้า",
-  "mei-you": "ไม่",
-  "mo-tuo-che": "รถจักรยานยนต์",
-  "nin-de-shen-qing-yi-ti-jiao-cheng-gong": "ส่งใบสมัครของคุณเรียบร้อยแล้ว",
-  "qi-shou-de-gong-zuo-qu-yu-wei-yi-gong-zuo-di-dian-ban-jing-3km-de-qu-yu": "พื้นที่ทำงานของผู้ขับขี่เป็นพื้นที่ที่มีรัศมี 3 กม. จากสถานที่ทำงาน",
-  "qi-shou-ke-hu-duan": "ลูกค้าไรเดอร์",
-  "qi-shou-shen-he": "รีวิวไรเดอร์",
-  "qi-ta": "อื่น ๆ",
-  "qing-nai-xin-deng-dai": "โปรดอดใจรอ",
-  "qing-xuan-ze-di-dian": "กรุณาเลือกสถานที่",
+  "ti-shi": "แจ้งเตือน",
   "qu-xiao": "ยกเลิก",
   "que-ren": "ยืนยัน",
-  "que-ren-mi-ma": "ยืนยันรหัสผ่าน",
-  "shen-fen-ren-zheng-xin-xi": "ข้อมูลการรับรองความถูกต้องของข้อมูลประจำตัว",
-  "shen-fen-zheng-hao": "หมายเลขประจำตัว",
+  "tips1": "อย่าลืมโทรติดต่อฝ่ายบริการลูกค้า",
+  "li-ji-bo-da": "โทรตอนนี้",
+  "jia-zai-zhong": "กำลังโหลด",
+  "mo-tuo-che": "รถจักรยานยนต์",
+  "dian-dong-che": "รถยนต์ไฟฟ้า",
+  "qi-ta": "อื่น ๆ",
+  "mei-you": "ไม่มี",
+  "zhen-shi-xing-ming": "ชื่อจริง",
+  "shu-ru-xing-ming": "กรอกชื่อจริง",
+  "shen-fen-zheng-hao": "เลขประจำตัวประชาชน",
+  "shu-ru-zheng-jian-hao-ma": "ป้อนหมายเลขบัตรประชาชน",
   "shen-fen-zheng-zheng-fan-mian": "บัตรประชาชนด้านหน้าและด้านหลัง",
   "shou-chi-shen-fen-zheng": "ถือบัตรประชาชน",
-  "shu-ru-xing-ming": "ใส่ชื่อ",
-  "shu-ru-zheng-jian-hao-ma": "ป้อนหมายเลข ID",
+  "song-can-jiao-tong-gong-ju": "ข้อมูลการขนส่งจัดส่งอาหาร",
+  "jiao-tong-gong-ju-zhao-pian": "ภาพถ่ายยานพาหนะ",
+  "you-wu-jia-shi-zheng": "ใบขับขี่",
+  "you": "มี",
+  "jia-shi-zheng-zheng-fan-mian": "ใบขับขี่ด้านหน้าและด้านหลัง",
+  "gong-zuo-di-dian": "สถานที่ทำงาน",
+  "qing-xuan-ze-di-dian": "โปรดเลือกสถานที่",
   "shuo-ming": "คำอธิบาย",
-  "song-can-jiao-tong-gong-ju": "ยานพาหนะส่งอาหาร",
-  "song-can-jiao-tong-gong-ju-xin-xi": "ข้อมูลการขนส่งการจัดส่งอาหาร",
-  "ti-jiao-shen-he": "ส่งคำวิจารณ์",
-  "ti-shi": "รวดเร็ว",
-  "tips1": "ตรวจสอบให้แน่ใจว่าได้ติดต่อฝ่ายบริการลูกค้า",
-  "xia-yi-bu": "ขั้นตอนต่อไป",
+  "qi-shou-de-gong-zuo-qu-yu-wei-yi-gong-zuo-di-dian-ban-jing-3km-de-qu-yu": "พื้นที่ทำงานของผู้ขับขี่คือพื้นที่ที่มีรัศมี 3 กม.",
+  "ti-jiao-shen-he": "ส่งตรวจสอบ",
+  "nin-de-shen-qing-yi-ti-jiao-cheng-gong": "ส่งใบสมัครของคุณเรียบร้อยแล้ว",
+  "qing-nai-xin-deng-dai": "ได้โปรดรอ",
+  "failresult": "ขออภัยข้อมูลการยืนยันที่คุณส่งมาล้มเหลว",
+  "failresult2": "คุณสามารถสมัครอีกครั้ง",
+  "zhong-xin-shen-qing": "สมัครใหม่",
   "xuan-ze-di-dian": "เลือกสถานที่",
+  "qi-shou-shen-he": "ตรวจสอบผู้ขับขี่",
   "xuan-ze-gong-zuo-di-dian": "เลือกสถานที่ทำงาน",
-  "yi-jing-yue-du-bing-tong-yi": "ได้อ่านและตกลง",
-  "you": "มี",
-  "you-wu-jia-shi-zheng": "ใบขับขี่",
-  "zai-ci-shu-ru-que-ren-mi-ma": "ป้อนรหัสผ่านยืนยันอีกครั้ง",
-  "zhen-shi-xing-ming": "ชื่อจริง",
-  "zhong-xin-shen-qing": "ทาซ้ำ",
-  "bang-ding-yin-hang-ka": "ผูกบัตรธนาคาร",
-  "bao-cun": "บันทึก",
-  "ding-dan": "ใบสั่ง",
-  "geng-gai-mi-ma": "เปลี่ยนรหัสผ่าน",
+  "shen-fen-ren-zheng-xin-xi": "ข้อมูลการพิสูจน์ตัวตน",
+  "gong-xi-nin-de-shen-qing-yi-tong-guo": "ขอแสดงความยินดี !!! การสมัครของคุณ",
+  "nin-de-gong-hao-wei": "หมายเลขงานของคุณคือ",
+  "tui-chu-cheng-gong": "ออกสำเร็จ",
   "geng-xin-cheng-gong": "การอัปเดตเสร็จสมบูรณ์",
-  "gong-xi-nin-de-shen-qing-yi-tong-guo": "ขอแสดงความยินดี !!! ใบสมัครของคุณผ่านไปแล้ว",
+  "tou-xiang": "รูปโปรไฟล์",
+  "yuan-mi-ma": "รหัสผ่านเดิม",
+  "qing-shu-ru-yuan-mi-ma": "กรุณากรอกรหัสผ่านเดิม",
+  "xin-mi-ma": "รหัสผ่านใหม่",
+  "qing-shu-ru-xin-mi-ma": "กรุณากรอกรหัสผ่านใหม่",
+  "qing-zhong-fu-shu-ru-xin-mi-ma": "กรุณากรอกรหัสผ่านใหม่อีกครั้ง",
+  "bao-cun": "บันทึก",
   "ji-ben-xin-xi": "ข้อมูลพื้นฐาน",
-  "jin-ri-huan-mei-you-zhang-dan-xin-xio": "ไม่มีข้อมูลการเรียกเก็บเงินในวันนี้ ~",
-  "jin-ri-shou-ru": "รายได้ของวันนี้",
-  "jin-ri-zhang-dan": "ค่าของวันนี้",
-  "jin-ri-zhi-chu": "ใช้จ่ายวันนี้",
-  "nin-de-gong-hao-wei": "หมายเลขงานของคุณคือ",
-  "qing-shu-ru-xin-mi-ma": "กรุณาใส่รหัสผ่านใหม่",
-  "qing-shu-ru-yuan-mi-ma": "กรุณาใส่รหัสผ่านเดิม",
-  "qing-zhong-fu-shu-ru-xin-mi-ma": "กรุณาทำซ้ำรหัสผ่านใหม่",
-  "shou-ru": "เงินได้",
-  "ti-xian": "ถอน",
-  "tou-xiang": "สัญลักษณ์",
-  "tui-chu-cheng-gong": "ออกเรียบร้อยแล้ว",
-  "wo-de": "เหมือง",
-  "wo-de-ding-dong-bi": "เหรียญ dingdong ของฉัน",
-  "wo-de-dui-zhang-dan": "คำสั่งของฉัน",
+  "geng-gai-mi-ma": "เปลี่ยนรหัสผ่าน",
+  "ding-dan": "ใบสั่งซื้อ",
   "xiao-xi": "ข่าว",
-  "xin-mi-ma": "รหัสผ่านใหม่",
+  "wo-de": "ของฉัน",
+  "wo-de-ding-dong-bi": "เหรียญ dingdong ของฉัน",
+  "shou-ru": "รายได้",
+  "zhi-chu": "รายจ่าย",
+  "jin-ri-huan-mei-you-zhang-dan-xin-xio": "ไม่มีข้อมูลบิลวันนี้ ~",
+  "ti-xian": "ถอนเงิน",
+  "yu-e": "คงเหลือ",
+  "jin-ri-zhang-dan": "บิลวันนี้",
+  "jin-ri-shou-ru": "รายได้วันนี้",
+  "jin-ri-zhi-chu": "รายจ่ายวันนี้",
+  "wo-de-dui-zhang-dan": "บิลของฉัน",
   "xuan-ze-yin-hang-ka": "เลือกบัตรธนาคาร",
-  "yu-e": "สมดุล",
-  "yuan-mi-ma": "รหัสผ่านเก่า",
-  "zhi-chu": "รายจ่าย"
+  "bang-ding-yin-hang-ka": "ผูกบัตรธนาคาร",
+  "shen-qing-shi-jian": "เวลาสมัคร",
+  "yin-hang-ka": "บัตรเครดิตธนาคาร",
+  "ti-xian-jin-e": "จำนวนเงินที่ถอนได้",
+  "ti-xian-shi-bai": "การถอนล้มเหลว",
+  "ti-xian-cheng-gong": "ถอนได้สำเร็จ",
+  "ti-xian-chu-li-zhong": "ดำเนินการถอน",
+  "ke-yong-yu-e": "ยอดเงินคงเหลือ",
+  "yuan": "หยวน",
+  "yu-ji-liang-xiao-shi-nei-dao-zhang-que-ren-ti-xian": "ใช้ระยะเวลาประมาณสองชั่วโมงถึงถอนเงิน",
+  "nothing1": "ยังไม่มีข้อมูลบัตรธนาคาร",
+  "qu-tian-jia": "ไปเพิ่มเติม",
+  "yin-hang-ming-cheng": "ชื่อธนาคาร",
+  "shu-ru-yin-hang-ming-cheng": "ป้อนชื่อธนาคาร",
+  "ka-hao": "หมายเลขบัตร",
+  "shu-ru-yin-hang-ka-hao": "ป้อนหมายเลขบัตรธนาคาร",
+  "xing-ming": "ชื่อ",
+  "shu-ru-shen-fen-zheng-hao": "ป้อนหมายเลขบัตรประชาชน",
+  "ti-jiao-cheng-gong": "ส่งเรียบร้อยแล้ว",
+  "quan-bu": "ทั้งหมด",
+  "ti-xian-jie-guo": "ผลการถอนเงิน",
+  "wo-de-ping-jia": "ความคิดเห็นของฉัน",
+  "fei-chang-cha": "รู้สึกแย่มาก",
+  "yi-ban": "ทั่วไป",
+  "chao-zan": "รู้สึกดี",
+  "wu-shu-ju": "ไม่มีข้อมูล",
+  "dao-di-le": "ในที่สุด",
+  "wo-de-tou-su": "การร้องเรียนของฉัน",
+  "she-zhi": "ตั้งค่า",
+  "tong-zhi-he-ti-shi-yin-she-zhi": "การตั้งค่าการแจ้งเตือนและโทนเสียง",
+  "qi-shou-fu-wu-he-zuo-xie-yi": "ข้อตกลงความร่วมมือด้านบริการของผู้ขับขี่",
+  "wei-jie-dan": "คำสั่งซื้อที่ไม่ได้รับ",
+  "dai-qu-can": "รอมื้ออาหาร",
+  "dai-song-da": "ที่จะจัดส่ง",
+  "tui-chu-dang-qian-zhang-hu": "ออกจากบัญชีปัจจุบัน",
+  "tou-su-lei-xing": "ประเภทของการร้องเรียน",
+  "tou-su-shi-jian": "เวลาร้องเรียน",
+  "ni-cheng": "ชื่อเล่น",
+  "gong-hao": "หมายเลขงาน",
+  "di-zhi": "ที่อยู่",
+  "dian-hua": "โทรศัพท์",
+  "gong-zuo-fan-wei": "ขอบเขตของงาน",
+  "dan-liang-re-li-tu": "แผนที่ความร้อน",
+  "pei-xun-zhong-xin": "ศูนย์ฝึกอบรม",
+  "que-ren-yao-tui-chu-dang-qian-zhang-hao-ma": "แน่ใจไหมว่าต้องการออกจากระบบบัญชีปัจ",
+  "she-zhi-cheng-gong": "ตั้งค่าเรียบร้อยแล้ว",
+  "xin-xiao-xi-tong-zhi": "การแจ้งเตือนข้อความใหม่",
+  "xin-dan-ti-shi-yin": "แจ้งเตือนรับคำสั่งซื้อใหม่",
+  "cui-dan-ti-shi-yin": "แจ้งเตือน",
+  "liao-tian-xiao-xi-ti-xing": "การแจ้งเตือนข้อความแชท",
+  "liao-tian": "แชทพูดคุย",
+  "xi-tong-ti-xing": "ระบบเตือนความจำ",
+  "ding-dan-xiang-qing": "รายละเอียดการสั่งซื้อ",
+  "di-tu": "แผนที่",
+  "qing-shu-ru-liao-tian-nei-rong": "โปรดป้อนเนื้อหาการแชท",
+  "xiao-xi-zhong-xin": "ศูนย์ข้อความ",
+  "xi-tong-xiao-xi": "ข้อมูลระบบ",
+  "yong-hu-xiao-xi": "ข้อความของผู้ใช้",
+  "zan-wu-shu-ju": "ไม่มีข้อมูล",
+  "song-da": "จัดส่ง",
+  "jie-dan": "คำสั่งซื้อ",
+  "cha-kan-dao-hang": "ดูการนำทาง",
+  "wo-yi-dao-dian": "ฉันมาถึงร้านแล้ว",
+  "pai-zhao-qu-huo": "ถ่ายภาพรับสินค้า",
+  "que-ren-song-da": "ยืนยันการจัดส่ง",
+  "jie-dan-cheng-gong": "คำสั่งซื้อสำเร็จ",
+  "shang-pin-xin-xi": "ข้อมูลผลิตภัณฑ์",
+  "fen": "แบ่ง",
+  "lian-xi-shang-jia": "ติดต่อผู้ขาย",
+  "shang-jia-xin-xi": "ข้อมูลธุรกิจ",
+  "lian-xi-ke-hu": "ติดต่อลูกค้า",
+  "yong-hu-xin-xi": "ข้อมูลผู้ใช้",
+  "ordertips": "เพื่อหลีกเลี่ยงข้อพิพาทในการขนส่งสินค้า",
+  "wo-yi-qu-huo": "ฉันได้รับสินค้า",
+  "liu-shui-hao": "หมายเลขลำดับ",
+  "yu-ji-song-da-shi-jian": "เวลาจัดส่งโดยประมาณ",
+  "yong-hu-shou-dao-shi-jian": "เวลาที่ลูกค้าไ้ด้รับ",
+  "ben-dan-pai-song-shou-ru": "รายได้การจัดส่งของคำสั่งซื้อนี้",
+  "shu-ru-zhen-shi-xing-ming": "ใส่ชื่อจริง",
+  "ding-dong-wai-mai-qi-shou-yin-si-zheng-ce": "\"นโยบายความเป็นส่วนตัวสำหรับ Ding Dong Takeaway Riders\"",
+  "ding-dong-wai-mai-kuai-jie-zhi-fu-fu-wu-xie-yi": "\"ข้อตกลงบริการการชำระเงินด่วน Dingdong Takeaway\"",
+  "lu-xian-gui-hua": "การวางแผนเส้นทาง",
+  "song-can-jiao-tong-gong-ju-xin-xi": "ข้อมูลการขนส่งจัดส่งอาหาร"
 }

mine/SettingScreen.tsx

@@ -10,7 +10,7 @@ import User from '../stores/User';
 import { alert } from '../utils/SystemUtils';
 
 export default function SettingScreen({ navigation }: StackScreenProps) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
 
   const { logout } = useModel(User, []);
   return (
@@ -62,7 +62,32 @@ export default function SettingScreen({ navigation }: StackScreenProps) {
         </Button>
 
         <Button
-          w={112}
+          bg="white"
+          px={12}
+          h={52}
+          py={0}
+          block
+          mt={10}
+          rounded="none"
+          onPress={() => {
+            const languages = ['zh', 'en', 'th'];
+            console.log(i18n.languages);
+            const index = languages.findIndex((item) => {
+              return i18n.languages.indexOf(item) != -1;
+            });
+            console.log(index);
+            i18n.changeLanguage(languages[(index + 1) % 3]);
+          }}
+        >
+          <Div row justifyContent="space-between" flex={1}>
+            <Text fontSize="sm">当前语言为{i18n.language}</Text>
+            <Icon name="right" />
+          </Div>
+        </Button>
+
+        <Button
+          // w={112}
+          minW={112}
           bg="white"
           color="black"
           borderWidth={1}

wallet/MineRecordScreen.tsx

@@ -16,7 +16,7 @@ import ReacordCom from './ReacordCom';
 
 import { PopoverPicker } from '../utils/SystemUtils';
 
-// import { PopoverPicker } from 'teaset';
+import { PopoverPicker } from 'teaset';
 
 interface Result {
   list: Item[];