Merge branch 'master' of igamebox/mtb_store_frontend into stable

app/Http/Controllers/ContactController.php

@@ -92,6 +92,7 @@ class ContactController extends Controller
                 'business_model' => $distInquiry->business_model,
                 'content' => $distInquiry->content,
                 'referer_url' => $distInquiry->referer_url,
+                'ip'=>  $request->ip(),
             ];
 
 

app/Models/SitePageTag.php

@@ -26,7 +26,7 @@ class SitePageTag extends Model
     // 根据slug获取标签和关联的页面
     public static function getBySlug($slug, $perPage = 10)
     {
-        $tag = self::where('slug', $slug)->first();
+        $tag = self::where('slug', $slug)->where('dist_id', getDistId())->first();
 
         if (!$tag) {
             return null; // 没找到标签