wishpal_ironfan
/
tiefen_space_web
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'test' (#80) from test into main 

Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/tiefen_space_web/pulls/80
This commit is contained in:
yezian 2024-05-07 21:08:19 +08:00
parent 974accaf73 937becc748
commit aee24cb026
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/[user_id]/_components/WechatBar/index.jsx
View File

@ -68,9 +68,9 @@ export default function WechatBar({
break; break;
case "wxpay_h5": case "wxpay_h5":
router.push( router.push(
`https://weixin.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent(
temData.data.wxpay_h5_param_str + 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; break;

8
app/pay/page.jsx
View File

@ -134,7 +134,7 @@ export default function Pay() {
break; break;
case "wxpay_h5": case "wxpay_h5":
router.push( router.push(
`https://weixin.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent(
data.data.wxpay_h5_param_str data.data.wxpay_h5_param_str
)}` )}`
); );
@ -273,7 +273,7 @@ export default function Pay() {
</div> </div>
)} )}
<div className="flex mt-auto mb-12"> <div className="flex mt-auto mb-12">
<div className="w-full px-2"> <div className="basis-1/2 px-2">
<button <button
onClick={() => createOrder("alipay_h5")} onClick={() => createOrder("alipay_h5")}
className="flex flex-row h-12 w-full items-center justify-center bg-primary rounded-full py-2" className="flex flex-row h-12 w-full items-center justify-center bg-primary rounded-full py-2"
@ -287,7 +287,7 @@ export default function Pay() {
<p className="text-white text-base ml-1">支付宝</p> <p className="text-white text-base ml-1">支付宝</p>
</button> </button>
</div> </div>
{/* <div className="w-full px-2"> <div className="basis-1/2 px-2">
<button <button
onClick={() => createOrder("wxpay_h5")} onClick={() => createOrder("wxpay_h5")}
className="flex flex-row h-12 w-full items-center justify-center bg-primary rounded-full py-2" className="flex flex-row h-12 w-full items-center justify-center bg-primary rounded-full py-2"
@ -300,7 +300,7 @@ export default function Pay() {
</svg> </svg>
<p className="text-white text-base ml-1">微信支付</p> <p className="text-white text-base ml-1">微信支付</p>
</button> </button>
</div> */} </div>
</div> </div>
</div> </div>
</section> </section>

2
app/purchased/page.jsx
View File

@ -13,7 +13,7 @@ export default function Purchased() {
const router = useRouter(); const router = useRouter();
useEffect(() => { useEffect(() => {
const prepare = async () => { 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"); router.replace("https://tiefen.fun/purchased");
return; return;
} }

8
app/vip/page.jsx
View File

@ -125,7 +125,7 @@ export default function Vip() {
break; break;
case "wxpay_h5": case "wxpay_h5":
router.push( router.push(
`https://weixin.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent(
data.data.wxpay_h5_param_str data.data.wxpay_h5_param_str
)}` )}`
); );
@ -246,7 +246,7 @@ export default function Vip() {
<div className="h-12 bg-gradient-to-t from-[#07050AE5] to-[#07050A00]"></div> <div className="h-12 bg-gradient-to-t from-[#07050AE5] to-[#07050A00]"></div>
<div className="flex flex-col pt-3 pb-11 px-4 bg-[#07050AE5]"> <div className="flex flex-col pt-3 pb-11 px-4 bg-[#07050AE5]">
<div className="flex flex-row justify-between"> <div className="flex flex-row justify-between">
<div className="w-full px-2"> <div className="basis-1/2 px-2">
<div <div
onClick={() => createOrder("alipay_h5")} onClick={() => createOrder("alipay_h5")}
className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" 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() {
</p> </p>
</div> </div>
</div> </div>
{/* <div className="w-full px-2"> <div className="basis-1/2 px-2">
<div <div
onClick={() => createOrder("wxpay_h5")} onClick={() => createOrder("wxpay_h5")}
className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" 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() {
微信支付 微信支付
</p> </p>
</div> </div>
</div> */} </div>
</div> </div>
<p className="text-secondary text-xs font-medium mt-4 text-center mb-1"> <p className="text-secondary text-xs font-medium mt-4 text-center mb-1">
确认购买即视为同意 确认购买即视为同意

8
app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx
View File

@ -140,7 +140,7 @@ export default function Pay({ params }) {
break; break;
case "wxpay_h5": case "wxpay_h5":
router.push( router.push(
`https://weixin.tiefen.fun/pay/wxpay_h5/${encodeURIComponent( `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent(
data.data.wxpay_h5_param_str data.data.wxpay_h5_param_str
)}` )}`
); );
@ -305,7 +305,7 @@ export default function Pay({ params }) {
<div className="h-12 bg-gradient-to-t from-[#07050AE5] to-[#07050A00]"></div> <div className="h-12 bg-gradient-to-t from-[#07050AE5] to-[#07050A00]"></div>
<div className="flex flex-col pt-3 pb-11 px-4 bg-[#07050AE5]"> <div className="flex flex-col pt-3 pb-11 px-4 bg-[#07050AE5]">
<div className="flex flex-row justify-between"> <div className="flex flex-row justify-between">
<div className="w-full px-2"> <div className="basis-1/2 px-2">
<div <div
onClick={() => createOrder("alipay_h5")} onClick={() => createOrder("alipay_h5")}
className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" 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 }) {
</p> </p>
</div> </div>
</div> </div>
{/* <div className="w-full px-2"> <div className="basis-1/2 px-2">
<div <div
onClick={() => createOrder("wxpay_h5")} onClick={() => createOrder("wxpay_h5")}
className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" 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 }) {
微信支付 微信支付
</p> </p>
</div> </div>
</div> */} </div>
</div> </div>
<p className="text-secondary text-xs font-medium mt-4 text-center mb-1"> <p className="text-secondary text-xs font-medium mt-4 text-center mb-1">
确认购买即视为同意 确认购买即视为同意