Merge branch 'master' into houdong

app/Lib/Action/Vip/PkTopAction.class.php

@@ -439,10 +439,12 @@ class PkTopAction extends IdentityAction{
             if($mfrom==1||$mfrom==2){
                 $userId = I('userId', '',intval);
                 if($mfrom==1){
-                    $referer=$referer?$referer:'ios_banner';
+//                    $referer=$referer?$referer:'ios_banner';
+                    $referer=$referer?$referer:(I('place')?I('place'):'ios_banner');
                 }
                 if($mfrom==2){
-                    $referer=$referer?$referer:'android_banner';
+//                    $referer=$referer?$referer:'android_banner';
+                    $referer=$referer?$referer:(I('place')?I('place'):'android_banner');
                 }
 
             }else{
@@ -1368,6 +1370,8 @@ class PkTopAction extends IdentityAction{
             $referer = I('hFrom');
         } elseif (I('from')) {
             $referer = I('from');
+        }elseif (I('place')) {
+            $referer = I('place');
         } else {
             $referer = $_SERVER['HTTP_REFERER'];
         }

app/Tpl/Vip/Index/jiang.html

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
   <meta name="referrer" content="origin">
 
-  <title>2023模拟炒股大赛,叩富全民炼股有奖大赛赛程及奖项安排-叩富简投</title>
+  <title>叩富全民炼股有奖大赛-2023年模拟炒股大赛-叩富简投</title>
   <meta name="description" content="叩富简投全民炼股2023模拟炒股大赛，赢10万现金大奖。自2007年开赛以来，已累积举办200多期模拟炒股大奖赛。每周、每月都有现金大奖。软件、手机APP、网页同步参赛">
   <meta name="keywords" content="2023模拟炒股大赛,模拟炒股大赛,模拟炒股,模拟股票大赛,炒股大赛,模拟炒股有奖大赛,模拟股市大赛,股票模拟大赛,股票大赛,腾讯A股大赛,凤凰炒股大赛">
   <link rel="stylesheet" href="__PUBLIC__/Home/css/g2023.css{$Think.config.css_version}">

app/Tpl/Vip/Index/saicheng.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
     <meta name="referrer" content="origin">
 
-    <title>叩富全民炼股有奖大赛全民分赛场赛制介绍-2023年模拟炒股大赛-叩富简投</title>
+    <title>叩富全民炼股有奖大赛全民分赛场赛程及奖项安排-2023年模拟炒股大赛-叩富简投</title>
     <meta name="description" content="叩富简投全民炼股2023模拟炒股大赛，赢10万现金大奖。自2007年开赛以来，已累积举办200多期模拟炒股大奖赛。每周、每月都有现金大奖。软件、手机APP、网页同步参赛">
     <meta name="keywords" content="2023模拟炒股大赛,模拟炒股大赛,模拟炒股,模拟股票大赛,炒股大赛,模拟炒股有奖大赛,模拟股市大赛,股票模拟大赛,股票大赛,腾讯A股大赛,凤凰炒股大赛">
 

app/Tpl/Vip/PkTop/choujiang.html

@@ -35,6 +35,7 @@
             line-height: 100%;position: absolute;right: 0px;top: 0px;
             margin-right: -8px;
         }
+        .overHide{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
     </style>
     <script type="text/javascript">
         AppBridge.init();
@@ -57,7 +58,7 @@
         <div class="header-h">
             <a href="javascript:;" class="header-h-a"><span class="back-btn back-btn-a"></span></a>
             <span class="header-share"></span>
-            <ul class="header-title"> <li class="one-li">叩富全民炼股有奖大赛全民分赛场瓜分十万-2023年模拟炒股大赛-叩富简投</li></ul>
+            <ul class="header-title"> <li class="one-li overHide">叩富全民炼股有奖大赛全民分赛场瓜分十万-2023年模拟炒股大赛-叩富简投</li></ul>
         </div>
     </div>
     <div class="head-fit"></div>

app/Tpl/Vip/PkTop/index.html

@@ -35,6 +35,7 @@
             line-height: 100%;position: absolute;right: 0px;top: 0px;
             margin-right: -8px;
         }
+        .overHide{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
     </style>
     <script type="text/javascript">
         AppBridge.init();
@@ -50,7 +51,9 @@
         <div class="header-h">
             <a href="javascript:;" class="header-h-a"><span class="back-btn back-btn-a"></span></a>
             <span class="header-share"></span>
-            <ul class="header-title"> <li class="one-li">叩富全民炼股有奖大赛全民分赛场赛程及奖项安排-2023年模拟炒股大赛-叩富简投</li></ul>
+            <ul class="header-title"> <li class="one-li overHide"  >
+                叩富全民炼股有奖大赛全民分赛场赛程及奖项安排-2023年模拟炒股大赛-叩富简投
+            </li></ul>
         </div>
     </div>
     <div class="head-fit"></div>

app/Tpl/Vip/PkTop/phbOther.html

@@ -35,6 +35,7 @@
             line-height: 100%;position: absolute;right: 0px;top: 0px;
             margin-right: -8px;
         }
+        .overHide{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
     </style>
     <script type="text/javascript">
         AppBridge.init();
@@ -50,7 +51,7 @@
         <div class="header-h">
             <a href="javascript:;" class="header-h-a"><span class="back-btn back-btn-a"></span></a>
             <span class="header-share"></span>
-            <ul class="header-title"> <li class="one-li">叩富全民炼股有奖大赛全民分赛场获奖榜-2023年模拟炒股大赛-叩富简投</li></ul>
+            <ul class="header-title"> <li class="one-li overHide"  >叩富全民炼股有奖大赛全民分赛场获奖榜-2023年模拟炒股大赛-叩富简投</li></ul>
         </div>
     </div>
     <div class="head-fit"></div>

app/Tpl/Vip/PkTop/phbWeek.html

@@ -35,6 +35,7 @@
             line-height: 100%;position: absolute;right: 0px;top: 0px;
             margin-right: -8px;
         }
+        .overHide{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
     </style>
     <script type="text/javascript">
         AppBridge.init();
@@ -49,7 +50,7 @@
         <div class="header-h">
             <a href="javascript:;" class="header-h-a"><span class="back-btn back-btn-a"></span></a>
             <span class="header-share"></span>
-            <ul class="header-title"> <li class="one-li">叩富全民炼股有奖大赛全民分赛场获奖榜-2023年模拟炒股大赛-叩富简投</li></ul>
+            <ul class="header-title"> <li class="one-li overHide">叩富全民炼股有奖大赛全民分赛场获奖榜-2023年模拟炒股大赛-叩富简投</li></ul>
         </div>
     </div>
     <div class="head-fit"></div>