From 069f45154e288ee48c0ad0146d21734b31767a57 Mon Sep 17 00:00:00 2001 From: yezian Date: Tue, 7 May 2024 19:33:43 +0800 Subject: [PATCH 1/4] init --- next.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next.config.js b/next.config.js index bdac122..a6235c5 100644 --- a/next.config.js +++ b/next.config.js @@ -4,7 +4,7 @@ const nextConfig = { return [ { source: "/api/:path*", - destination: "https://api.tiefen.fun/api/:path*", + destination: "https://api.wishpal.cn/api/:path*", }, { source: "/cors/:path*", -- 2.41.0 From 3a7be77dcb3cbd03a27845a7d0955b93ae4b2fe0 Mon Sep 17 00:00:00 2001 From: yezian Date: Tue, 7 May 2024 19:37:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/pay/page.jsx | 6 +++--- app/vip/page.jsx | 6 +++--- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 94acacb..2caccbf 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -273,7 +273,7 @@ export default function Pay() { )}
-
+
- {/*
+
-
*/} +
diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 87b7312..d99e4b9 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -246,7 +246,7 @@ export default function Vip() {
-
+
createOrder("alipay_h5")} className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" @@ -257,7 +257,7 @@ export default function Vip() {

- {/*
+
createOrder("wxpay_h5")} className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" @@ -272,7 +272,7 @@ export default function Vip() { 微信支付

-
*/} +

确认购买即视为同意 diff --git a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx index 1150c36..557a2cd 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -305,7 +305,7 @@ export default function Pay({ params }) {

-
+
createOrder("alipay_h5")} className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" @@ -316,7 +316,7 @@ export default function Pay({ params }) {

- {/*
+
createOrder("wxpay_h5")} className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" @@ -331,7 +331,7 @@ export default function Pay({ params }) { 微信支付

-
*/} +

确认购买即视为同意 -- 2.41.0 From b8d413ca096f2b99501eecbfc5f90e92d9d23b30 Mon Sep 17 00:00:00 2001 From: yezian Date: Tue, 7 May 2024 20:21:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/[user_id]/_components/WechatBar/index.jsx | 4 ++-- app/pay/page.jsx | 2 +- app/purchased/page.jsx | 2 +- app/vip/page.jsx | 2 +- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/[user_id]/_components/WechatBar/index.jsx b/app/[user_id]/_components/WechatBar/index.jsx index 9f3bc4d..59713a3 100644 --- a/app/[user_id]/_components/WechatBar/index.jsx +++ b/app/[user_id]/_components/WechatBar/index.jsx @@ -68,9 +68,9 @@ export default function WechatBar({ break; case "wxpay_h5": router.push( - `https://weixin.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( + `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( temData.data.wxpay_h5_param_str + - "&redirect_url=https%3A%2F%2Fweixin.tiefen.fun%2Fpurchased" + "&redirect_url=https%3A%2F%2Fshop.tiefen.fun%2Fpurchased" )}` ); break; diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 2caccbf..8646dfe 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -134,7 +134,7 @@ export default function Pay() { break; case "wxpay_h5": router.push( - `https://weixin.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( + `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( data.data.wxpay_h5_param_str )}` ); diff --git a/app/purchased/page.jsx b/app/purchased/page.jsx index d1629ae..a7c76b7 100644 --- a/app/purchased/page.jsx +++ b/app/purchased/page.jsx @@ -13,7 +13,7 @@ export default function Purchased() { const router = useRouter(); useEffect(() => { const prepare = async () => { - if (window.location.origin === "https://weixin.tiefen.fun") { + if (window.location.origin === "https://shop.tiefen.fun") { router.replace("https://tiefen.fun/purchased"); return; } diff --git a/app/vip/page.jsx b/app/vip/page.jsx index d99e4b9..f6bad47 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -125,7 +125,7 @@ export default function Vip() { break; case "wxpay_h5": router.push( - `https://weixin.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( + `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( data.data.wxpay_h5_param_str )}` ); diff --git a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx index 557a2cd..2320063 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -140,7 +140,7 @@ export default function Pay({ params }) { break; case "wxpay_h5": router.push( - `https://weixin.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( + `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( data.data.wxpay_h5_param_str )}` ); -- 2.41.0 From 937becc7486d9685bf28209f5521152001aa7639 Mon Sep 17 00:00:00 2001 From: yezian Date: Tue, 7 May 2024 21:04:01 +0800 Subject: [PATCH 4/4] revert 069f45154e288ee48c0ad0146d21734b31767a57 revert init --- next.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next.config.js b/next.config.js index a6235c5..bdac122 100644 --- a/next.config.js +++ b/next.config.js @@ -4,7 +4,7 @@ const nextConfig = { return [ { source: "/api/:path*", - destination: "https://api.wishpal.cn/api/:path*", + destination: "https://api.tiefen.fun/api/:path*", }, { source: "/cors/:path*", -- 2.41.0