Merge branch 'master' into 'houdong'

# Conflicts:
#   app/Lib/Action/Vip/PkTopAction.class.php
#   app/Tpl/Vip/PkTop/index.html

app/Tpl/Vip/Index/jiang.html

@@ -428,7 +428,7 @@
   var time = 50;
   var mytimer=setInterval(scrollUp,time);
 </script>
-<script type="text/javascript" src="__PUBLIC__/js/popad_mini_jiang.js{$Think.config.js_version}"></script>
+<script type="text/javascript" src="__PUBLIC__/js/popad_mini_jiang.js{$Think.config.js_version}111"></script>
 </html>
 
 <!--userId:{$user.userID}-userName:{$user.userName}-->
\ No newline at end of file

app/Tpl/Vip/PkTop/item2.html

@@ -71,49 +71,49 @@
     </notempty>
 
 </in>
-
-<!--<in name="type" value="pkList">-->
-    <!--<notempty name="pkList">-->
-        <!--<foreach name="pkList" key='key' item="vo">-->
-            <!--<div class="outer-cont">-->
-                <!--<div class='my-pk-cont  <eq name="vo.pk_status" value="1">resWin</eq><eq name="vo.pk_status" value="2">resLose</eq> '>-->
-                    <!--<div class="pk-cont-info">-->
-                        <!--<div class="pk-info left">-->
-                            <!--<span class="pk-user"><img src="{:getPortraitPath($vo['active_id'], 'small', true)}" alt=""></span>-->
-                            <!--<p class="pk-user-name">{$vo.active_name}</p>-->
-                            <!--<p class="pk-user-rate">周收益率-->
-                                <!--<if condition="empty($vo['active_lastweekup']) or $vo['active_lastweekup'] egt 0">-->
-                                    <!--<span class="red">{$vo.active_lastweekup|default=0}%</span>-->
-                                    <!--<else/>-->
-                                    <!--<span class="green">{$vo.active_lastweekup|default=0}%</span>-->
-                                <!--</if>-->
-                            <!--</p>-->
-                        <!--</div>-->
-                        <!--<div class="pk-info right">-->
-                            <!--<span class="pk-user" ><img src="{:getPortraitPath($vo['passive_id'], 'small', true)}" alt=""></span>-->
-                            <!--<p class="pk-user-name">{$vo.passive_name}</p>-->
-                            <!--<p class="pk-user-rate">周收益率-->
-                                <!--<if condition="empty($vo['passive_lastweekup']) or $vo['passive_lastweekup'] egt 0">-->
-                                    <!--<span class="red">{$vo.passive_lastweekup|default=0}%</span>-->
-                                    <!--<else/>-->
-                                    <!--<span class="green">{$vo.passive_lastweekup|default=0}%</span>-->
-                                <!--</if>-->
-                            <!--</p>-->
-                        <!--</div>-->
-                    <!--</div>-->
-                    <!--<div class="pk-img"></div>-->
-                    <!--<eq name="vo.pk_status" value="1"><span class="win-flag"></span></eq>-->
-                    <!--<eq name="vo.pk_status" value="2"><span class="lose-flag"></span></eq>-->
-                <!--</div>-->
-            <!--</div>-->
-        <!--</foreach>-->
-        <!--<else/>-->
-        <!--<div class="no-data">-->
-            <!--<img class="no-data-img" src="__PUBLIC__/Home/images/group/cc-nodata.png" alt="">-->
-            <!--<p class="no-data-msg" >当前没有挑战榜排行</p>-->
-        <!--</div>-->
-    <!--</notempty>-->
-<!--</in>-->
+<in name="type" value="pkList">
+    <notempty name="pkList">
+        <!--item2--3.html-->
+        <foreach name="pkList" key='key' item="vo">
+            <div class="outer-cont">
+                <div class='my-pk-cont  <eq name="vo.pk_status" value="1">resWin</eq><eq name="vo.pk_status" value="2">resLose</eq> '>
+                    <div class="pk-cont-info">
+                        <div class="pk-info left">
+                            <span class="pk-user"><img src="{:getPortraitPath($vo['active_id'], 'small', true)}" alt=""></span>
+                            <p class="pk-user-name">{$vo.active_name}</p>
+                            <p class="pk-user-rate">周收益率
+                                <if condition="empty($vo['active_lastweekup']) or $vo['active_lastweekup'] egt 0">
+                                    <span class="red">{$vo.active_lastweekup|default=0}%</span>
+                                    <else/>
+                                    <span class="green">{$vo.active_lastweekup|default=0}%</span>
+                                </if>
+                            </p>
+                        </div>
+                        <div class="pk-info right">
+                            <span class="pk-user" ><img src="{:getPortraitPath($vo['passive_id'], 'small', true)}" alt=""></span>
+                            <p class="pk-user-name">{$vo.passive_name}</p>
+                            <p class="pk-user-rate">周收益率
+                                <if condition="empty($vo['passive_lastweekup']) or $vo['passive_lastweekup'] egt 0">
+                                    <span class="red">{$vo.passive_lastweekup|default=0}%</span>
+                                    <else/>
+                                    <span class="green">{$vo.passive_lastweekup|default=0}%</span>
+                                </if>
+                            </p>
+                        </div>
+                    </div>
+                    <div class="pk-img"></div>
+                    <eq name="vo.pk_status" value="1"><span class="win-flag"></span></eq>
+                    <eq name="vo.pk_status" value="2"><span class="lose-flag"></span></eq>
+                </div>
+            </div>
+        </foreach>
+        <else/>
+        <div class="no-data">
+            <img class="no-data-img" src="__PUBLIC__/Home/images/group/cc-nodata.png" alt="">
+            <p class="no-data-msg" >当前没有挑战榜排行</p>
+        </div>
+    </notempty>
+</in>
 
 
 <script>