diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
index d681d182..212977be 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
@@ -183,8 +183,10 @@ class CreateCustomerLogic extends AbstractControllerLogic
             }
         }
 
-        // Track affiliate registration if user came from affiliate link
-        $this->tracksAffiliateRegistration->execute($user, $request->get('tracking'));
+        // Track affiliate registration if user came from affiliate link.
+        // Prefer ?tracking= from request; fallback to cookie set by TrackAffiliateClick on /signup visit.
+        $code = $request->get('tracking') ?? $request->cookie(\App\Classes\Modules\Affiliate\Services\TracksAffiliateClick::COOKIE_NAME);
+        $this->tracksAffiliateRegistration->execute($user, $code);
 
         return $this->response($this->authenticationProcessor->execute($request, false));
 
diff --git a/resources/views/pages/landing/1688-vip-payment-landing-page-general-fb.blade.php b/resources/views/pages/landing/1688-vip-payment-landing-page-general-fb.blade.php
index 02e836dc..b42064e9 100644
--- a/resources/views/pages/landing/1688-vip-payment-landing-page-general-fb.blade.php
+++ b/resources/views/pages/landing/1688-vip-payment-landing-page-general-fb.blade.php
@@ -531,7 +531,7 @@
             </div>
 
             <div class="cta-buttons">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FCLPB1002" class="btn btn-primary" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=FCLPB1002" class="btn btn-primary" target="_blank">立即获取子账号</a>
             </div>
         </div>
     </section>
@@ -881,7 +881,7 @@
             </div>
             
             <div style="text-align: center; margin-top: 50px;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FCLPB2002" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=FCLPB2002" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">立即获取子账号</a>
             </div>
         </div>
     </section>
@@ -1233,7 +1233,7 @@
                 </p>
             </div>
             <div style="margin: 40px 0;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FCLPB3002" class="btn btn-primary" style="margin: 10px;" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=FCLPB3002" class="btn btn-primary" style="margin: 10px;" target="_blank">立即获取子账号</a>
             </div>
             <p style="margin-top: 20px; font-size: 0.95em; opacity: 0.9;">
                 🕐 客服时间：周一至周五 9:00 AM - 6:00 PM（马来西亚时间）<br>
diff --git a/resources/views/pages/landing/1688-vip-payment-landing-page-general-google.blade.php b/resources/views/pages/landing/1688-vip-payment-landing-page-general-google.blade.php
index 6fd84a11..abeede71 100644
--- a/resources/views/pages/landing/1688-vip-payment-landing-page-general-google.blade.php
+++ b/resources/views/pages/landing/1688-vip-payment-landing-page-general-google.blade.php
@@ -531,7 +531,7 @@
             </div>
 
             <div class="cta-buttons">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GCLPB1005" class="btn btn-primary" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=GCLPB1005" class="btn btn-primary" target="_blank">立即获取子账号</a>
             </div>
         </div>
     </section>
@@ -881,7 +881,7 @@
             </div>
             
             <div style="text-align: center; margin-top: 50px;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GCLPB2005" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=GCLPB2005" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">立即获取子账号</a>
             </div>
         </div>
     </section>
@@ -1233,7 +1233,7 @@
                 </p>
             </div>
             <div style="margin: 40px 0;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GCLPB3005" class="btn btn-primary" style="margin: 10px;" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=GCLPB3005" class="btn btn-primary" style="margin: 10px;" target="_blank">立即获取子账号</a>
             </div>
             <p style="margin-top: 20px; font-size: 0.95em; opacity: 0.9;">
                 🕐 客服时间：周一至周五 9:00 AM - 6:00 PM（马来西亚时间）<br>
diff --git a/resources/views/pages/landing/1688-vip-payment-landing-page-wf-comparison-fb.blade.php b/resources/views/pages/landing/1688-vip-payment-landing-page-wf-comparison-fb.blade.php
index 218d3e75..f79e7ca6 100644
--- a/resources/views/pages/landing/1688-vip-payment-landing-page-wf-comparison-fb.blade.php
+++ b/resources/views/pages/landing/1688-vip-payment-landing-page-wf-comparison-fb.blade.php
@@ -530,7 +530,7 @@
             </div>
 
             <div class="cta-buttons">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FCLPB1003" class="btn btn-primary" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=FCLPB1003" class="btn btn-primary" target="_blank">立即获取子账号</a>
             </div>
         </div>
     </section>
@@ -887,7 +887,7 @@
             </div>
             
             <div style="text-align: center; margin-top: 50px;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FCLPB2003" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=FCLPB2003" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">立即获取子账号</a>
             </div>
         </div>
     </section>
@@ -1264,7 +1264,7 @@
                 </p>
             </div>
             <div style="margin: 40px 0;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FCLPB3003" class="btn btn-primary" style="margin: 10px;" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=FCLPB3003" class="btn btn-primary" style="margin: 10px;" target="_blank">立即获取子账号</a>
             </div>
             <p style="margin-top: 20px; font-size: 0.95em; opacity: 0.9;">
                 🕐 客服时间：周一至周五 9:00 AM - 6:00 PM（马来西亚时间）<br>
diff --git a/resources/views/pages/landing/1688-vip-payment-landing-page-wf-comparison-google.blade.php b/resources/views/pages/landing/1688-vip-payment-landing-page-wf-comparison-google.blade.php
index 8598d363..b1a97636 100644
--- a/resources/views/pages/landing/1688-vip-payment-landing-page-wf-comparison-google.blade.php
+++ b/resources/views/pages/landing/1688-vip-payment-landing-page-wf-comparison-google.blade.php
@@ -530,7 +530,7 @@
             </div>
 
             <div class="cta-buttons">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GCLPB1006" class="btn btn-primary" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=GCLPB1006" class="btn btn-primary" target="_blank">立即获取子账号</a>
             </div>
         </div>
     </section>
@@ -887,7 +887,7 @@
             </div>
             
             <div style="text-align: center; margin-top: 50px;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GCLPB2006" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=GCLPB2006" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">立即获取子账号</a>
             </div>
         </div>
     </section>
@@ -1264,7 +1264,7 @@
                 </p>
             </div>
             <div style="margin: 40px 0;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GCLPB3006" class="btn btn-primary" style="margin: 10px;" target="_blank">立即获取子账号</a>
+                <a href="{{ url('/signup') }}?tracking=GCLPB3006" class="btn btn-primary" style="margin: 10px;" target="_blank">立即获取子账号</a>
             </div>
             <p style="margin-top: 20px; font-size: 0.95em; opacity: 0.9;">
                 🕐 客服时间：周一至周五 9:00 AM - 6:00 PM（马来西亚时间）<br>
diff --git a/resources/views/pages/landing/en-1688-vip-landing-page-general-fb.blade.php b/resources/views/pages/landing/en-1688-vip-landing-page-general-fb.blade.php
index dcaf9f5e..5298dd3e 100644
--- a/resources/views/pages/landing/en-1688-vip-landing-page-general-fb.blade.php
+++ b/resources/views/pages/landing/en-1688-vip-landing-page-general-fb.blade.php
@@ -578,7 +578,7 @@
             </div>
 
             <div class="cta-buttons">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FLPB1001" class="btn btn-primary" target="_blank">Get Your Sub-Account Now</a>
+                <a href="{{ url('/signup') }}?tracking=FLPB1001" class="btn btn-primary" target="_blank">Get Your Sub-Account Now</a>
             </div>
         </div>
     </section>
@@ -928,7 +928,7 @@
             </div>
             
             <div style="text-align: center; margin-top: 50px;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FLPB2001" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">Get Your Sub-Account Now</a>
+                <a href="{{ url('/signup') }}?tracking=FLPB2001" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">Get Your Sub-Account Now</a>
             </div>
         </div>
     </section>
@@ -1280,7 +1280,7 @@
                 </p>
             </div>
             <div style="margin: 40px 0;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=FLPB3001" class="btn btn-primary" style="margin: 10px;" target="_blank">Get Your Sub-Account Now</a>
+                <a href="{{ url('/signup') }}?tracking=FLPB3001" class="btn btn-primary" style="margin: 10px;" target="_blank">Get Your Sub-Account Now</a>
             </div>
             <p style="margin-top: 20px; font-size: 0.95em; opacity: 0.9;">
                 🕐 Customer Service Hours: Monday to Friday 9:00 AM - 6:00 PM (Malaysia Time)<br>
diff --git a/resources/views/pages/landing/en-1688-vip-landing-page-general-google.blade.php b/resources/views/pages/landing/en-1688-vip-landing-page-general-google.blade.php
index 1ef2e46e..a24c12e5 100644
--- a/resources/views/pages/landing/en-1688-vip-landing-page-general-google.blade.php
+++ b/resources/views/pages/landing/en-1688-vip-landing-page-general-google.blade.php
@@ -578,7 +578,7 @@
             </div>
 
             <div class="cta-buttons">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GLPB1004" class="btn btn-primary" target="_blank">Get Your Sub-Account Now</a>
+                <a href="{{ url('/signup') }}?tracking=GLPB1004" class="btn btn-primary" target="_blank">Get Your Sub-Account Now</a>
             </div>
         </div>
     </section>
@@ -928,7 +928,7 @@
             </div>
             
             <div style="text-align: center; margin-top: 50px;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GLPB2004" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">Get Your Sub-Account Now</a>
+                <a href="{{ url('/signup') }}?tracking=GLPB2004" class="btn btn-primary" style="padding: 18px 50px; font-size: 1.2em;" target="_blank">Get Your Sub-Account Now</a>
             </div>
         </div>
     </section>
@@ -1280,7 +1280,7 @@
                 </p>
             </div>
             <div style="margin: 40px 0;">
-                <a href="https://gentle-toronto-bbndz4uacdz6.vapor-farm-a1.com/signup?tracking=GLPB3004" class="btn btn-primary" style="margin: 10px;" target="_blank">Get Your Sub-Account Now</a>
+                <a href="{{ url('/signup') }}?tracking=GLPB3004" class="btn btn-primary" style="margin: 10px;" target="_blank">Get Your Sub-Account Now</a>
             </div>
             <p style="margin-top: 20px; font-size: 0.95em; opacity: 0.9;">
                 🕐 Customer Service Hours: Monday to Friday 9:00 AM - 6:00 PM (Malaysia Time)<br>
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
index dbd1c9de..45a8bf2a 100644
--- a/resources/views/pages/settings.blade.php
+++ b/resources/views/pages/settings.blade.php
@@ -78,6 +78,29 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="affiliateSettings">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_affiliate_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M86,21.5c-35.56369,0 -64.5,28.93631 -64.5,64.5c0,35.56369 28.93631,64.5 64.5,64.5c35.56369,0 64.5,-28.93631 64.5,-64.5c0,-35.56369 -28.93631,-64.5 -64.5,-64.5zM86,32.25c29.63631,0 53.75,24.11369 53.75,53.75c0,29.63631 -24.11369,53.75 -53.75,53.75c-29.63631,0 -53.75,-24.11369 -53.75,-53.75c0,-29.63631 24.11369,-53.75 53.75,-53.75zM86,48.375c-20.81887,0 -37.625,16.80613 -37.625,37.625c0,20.81887 16.80613,37.625 37.625,37.625c20.81887,0 37.625,-16.80613 37.625,-37.625c0,-20.81887 -16.80613,-37.625 -37.625,-37.625zM86,59.125c14.81887,0 26.875,12.05613 26.875,26.875c0,14.81887 -12.05613,26.875 -26.875,26.875c-14.81887,0 -26.875,-12.05613 -26.875,-26.875c0,-14.81887 12.05613,-26.875 26.875,-26.875z" fill="url(#color-4_affiliate_gr4)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Affiliate</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <template v-if="$store.getters.isSuperAdmin">
                                     <div class="row m-b-5">
                                         <div class="col">
diff --git a/routes/api.php b/routes/api.php
index 26a4560d..a4e66591 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -81,6 +81,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
             require __DIR__ . '/key_value_pair.php';
 
             require __DIR__ . '/setting.php';
+            
+            require __DIR__ . '/affiliate.php';
 
             //        require __DIR__ . '/rate.php';
             //        require __DIR__ . '/receipt.php';