From f50939f970fb8b8c1bb18c77df5a7ad2d093f91c Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Wed, 11 Sep 2024 14:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/public.js                       | 20 ++++++++++++++++----
 app/messageDetail/page.js           |  2 +-
 app/my/addToHome/page.js            |  2 +-
 app/my/setting/editPassword/page.js |  2 ++
 app/my/unlockedWechat/page.jsx      |  2 +-
 app/search/page.js                  | 21 ++++++++++++++++-----
 components/MySlider/index.jsx       |  3 ++-
 7 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/api/public.js b/api/public.js
index 8f6233a..2057ac0 100644
--- a/api/public.js
+++ b/api/public.js
@@ -247,8 +247,11 @@ export const createOrder = async (type = "alipay_h5") => {
 };
 
 //点击获取验证码
-export const handleVerification = async (mobilePhone = "", regionCode) => {
-  // console.log("mobilePhone",mobilePhone.toString())
+export const handleVerification = async (
+  mobilePhone = "",
+  regionCode,
+  callback
+) => {
   //手机号校验
   if (!mobilePhone.toString().match(/^1[3456789]\d{9}$/)) {
     Toast.show({
@@ -260,16 +263,25 @@ export const handleVerification = async (mobilePhone = "", regionCode) => {
   }
   //对手机号进行RSA加密
   const encrypt = new JSEncrypt();
-  encrypt.setPublicKey(process.env.EXPO_PUBLIC_RSA_KEY);
+  encrypt.setPublicKey(process.env.NEXT_PUBLIC_RSA_KEY);
   const mobile_phone = encrypt.encrypt(mobilePhone);
   //发送短信验证码
   try {
-    await requireAPI("POST", `/api/veri_code/send`, {
+    const data = await requireAPI("POST", `/api/veri_code/send`, {
       body: {
         mobile_phone: mobile_phone,
         region_code: regionCode,
       },
     });
+    if (data.ret === -1) {
+      Toast.show({
+        icon: "fail",
+        content: data.msg,
+        position: "top",
+      });
+      return;
+    }
+    callback && callback();
   } catch (error) {
     // console.error(error);
   }
diff --git a/app/messageDetail/page.js b/app/messageDetail/page.js
index 31219b9..7804da4 100644
--- a/app/messageDetail/page.js
+++ b/app/messageDetail/page.js
@@ -377,7 +377,7 @@ export default function MessageDetail({}) {
   };
   return (
     <div className="bg-[#13121F] h-screen overflow-y-auto" ref={scrollBox}>
-      <div className="p-4 fixed top-0 z-10 w-full bg-black">
+      <div className="p-4 fixed top-0 z-10 w-full bg-deepBg">
         <div className="flex items-center justify-center absolute">
           <FontAwesomeIcon
             icon={faAngleLeft}
diff --git a/app/my/addToHome/page.js b/app/my/addToHome/page.js
index 536e9e3..fe84cc3 100644
--- a/app/my/addToHome/page.js
+++ b/app/my/addToHome/page.js
@@ -9,7 +9,7 @@ export default function AddToHome() {
   const router = useRouter();
   return (
     <div>
-      <div className="p-4 fixed top-0 z-10 w-full bg-black">
+      <div className="p-4 fixed top-0 z-10 w-full bg-deepBg">
         <div className="w-9 h-9 flex items-center justify-center bg-[#FFFFFF1A] rounded-full float-left absolute">
           <FontAwesomeIcon
             icon={faAngleLeft}
diff --git a/app/my/setting/editPassword/page.js b/app/my/setting/editPassword/page.js
index fe2fbc5..7443d3b 100644
--- a/app/my/setting/editPassword/page.js
+++ b/app/my/setting/editPassword/page.js
@@ -151,6 +151,8 @@ export default function EditPassword() {
       });
       if (searchParams.get("is_enabled") == "0") {
         router.push("/");
+      } else {
+        router.back();
       }
     } catch (error) {
       // console.error(error);
diff --git a/app/my/unlockedWechat/page.jsx b/app/my/unlockedWechat/page.jsx
index f58408e..22c10f0 100644
--- a/app/my/unlockedWechat/page.jsx
+++ b/app/my/unlockedWechat/page.jsx
@@ -51,7 +51,7 @@ export default function UnlockedWechat() {
   }
   return (
     <div>
-      <div className="p-4 fixed top-0 z-10 w-full bg-black">
+      <div className="p-4 fixed top-0 z-10 w-full bg-deepBg">
         <div className="w-9 h-9 flex items-center justify-center bg-[#FFFFFF1A] rounded-full absolute">
           <FontAwesomeIcon
             icon={faAngleLeft}
diff --git a/app/search/page.js b/app/search/page.js
index a058b85..f0c0242 100644
--- a/app/search/page.js
+++ b/app/search/page.js
@@ -121,6 +121,7 @@ export default function Search() {
       step: 1,
       type: "select",
       items: [
+        "不限",
         "北京市",
         "天津市",
         "河北省",
@@ -167,6 +168,7 @@ export default function Search() {
       type: "select",
       key: "constellation",
       items: [
+        "不限",
         "白羊座",
         "‌金牛座",
         "‌双子座",
@@ -205,7 +207,7 @@ export default function Search() {
     },
     {
       name: "微信价格",
-      desc: "10金币=¥1",
+      desc: "10金币=1元",
       upper_bound: 30000,
       lower_bound: 0,
       default: 24,
@@ -366,6 +368,7 @@ export default function Search() {
     delete currentFilterValue.comprehensiveUsed;
     delete currentFilterValue.priceUsed;
     querryParams = currentFilterValue;
+    console.log("querryParams", querryParams);
     try {
       const data = await requireAPI("POST", "/api/streamer/filter", {
         body: { ...querryParams },
@@ -387,7 +390,7 @@ export default function Search() {
   };
   return (
     <div className="">
-      <div className="flex items-center p-4 sticky top-0 bg-black z-10">
+      <div className="flex items-center p-4 sticky top-0 bg-deepBg z-10">
         <FontAwesomeIcon
           icon={faAngleLeft}
           style={{ maxWidth: "12px" }}
@@ -544,11 +547,13 @@ export default function Search() {
         }}
       >
         <Popup
-          // containerStyle={{ marginTop: 80 }}
           closeOnMaskClick={true}
           maskStyle={{ backgroundColor: "#0000004d" }}
           visible={isFilterVisible.comprehensive}
-          bodyStyle={{ height: "calc(100vh - 110px)" }}
+          bodyStyle={{
+            height: "calc(100vh - 110px)",
+            backgroundColor: "black",
+          }}
           onMaskClick={() =>
             setIsFilterVisible({
               zone_admission_price: false,
@@ -786,7 +791,10 @@ export default function Search() {
         <Popup
           closeOnMaskClick={true}
           maskStyle={{ backgroundColor: "#0000004d" }}
-          bodyStyle={{ height: "calc(100vh - 110px)" }}
+          bodyStyle={{
+            height: "calc(100vh - 110px)",
+            backgroundColor: "black",
+          }}
           onMaskClick={() =>
             setIsFilterVisible({
               zone_admission_price: false,
@@ -878,6 +886,9 @@ export default function Search() {
                 />
               </div>
             ))}
+            <p className="text-sm font-medium mt-1 px-4 text-[#ffffff80]">
+              *{priceFilters[1]?.desc}
+            </p>
             <div className="flex flex-row justify-around items-center mb-4 p-4 absolute bottom-0 w-full">
               <div
                 className="p-2 rounded-xl flex justify-center items-center mr-2"
diff --git a/components/MySlider/index.jsx b/components/MySlider/index.jsx
index 14c760c..a9875f4 100644
--- a/components/MySlider/index.jsx
+++ b/components/MySlider/index.jsx
@@ -272,9 +272,10 @@ export default function MySlider({
             color: "#ff75c8",
           }}
         >
-          -
+          ~
         </span>
         <span
+          className={hasInfinity ? "text-xl" : ""}
           style={{
             color: "#ff75c8",
           }}