Merge branch 'dev' of ssh://git.bgbg.live:18150/root/SEONexus into dev

# Conflicts:
#	code/app/services/VideoService.php
#	code/extend/template/taglib/Video.php

doc/TemplateTag.md

@@ -52,18 +52,41 @@
 # 视频分类 首页 url
 {site:vciurl   class="dianying" /}
 
+# 视频详情 url
+{site:vurl v_id="$Video.v_id" v_py="$Video.v_name_en"/}
+
+
+# 视频播放 url
+{site:vpurl v_id="$arrVideo.v_id" v_py="$arrVideo.v_name_en" play_type="default" play_index="1" /}
+{site:vpurl v_id="$Video.v_id" v_py="$Video.v_name_en" play_type="$Request.route.strPlayType" play_index="$Request.route.intPlayIndex" /}
+
 
 # 视频分类 分页 url
 # 传参与默认值(传参用下面的变量名，名称不需要$符号, 值的话如果用第三方变量作为值，需要带$符号)：
-
 'vclurl' => ['attr' => 'category,class,area,lang,year,order,page', 'close' => 0],
 # 样例
-{site:vclurl  class="dianying" category="" area="" lang="" year="" order=""  page="1"/}
+{site:vclurl  class="dianying" category="all" area="all" lang="all" year="all" order="all"  page="1"/}
 {site:vclurl  class="$Request.route.strClass" category="$arrChildrenCategory.v_category_en" area="all" lang="all" year="all" order="all"  page="1"/}
 
+
+# 视频排行榜 列表 url
+# 传参与默认值(传参用下面的变量名，名称不需要$符号, 值的话如果用第三方变量作为值，需要带$符号)：
+$sort_type ?? "daily";  # 排序方式:
+                                        # * *  'daily'     => '天',
+                                        # * *  'weekly'    => '周',
+                                        # * *  'monthly'   => '月',
+                                        # * *  'total'     => '总',
+'vrlurl' => ['attr' => 'category,class,sort_type,page', 'close' => 0],
+# 样例
+{site:vrlurl  class="dianying" category="all" sort_type="all"  page="1"/}
+{site:vrlurl  class="$Request.route.strClass" category="$arrChildrenCategory.v_category_en" sort_type="all"  page="1"/}
+
+
 # 视频详情 url
 {site:nurl n_id="$Novel->n_id" n_py="$Novel->n_name_pinyin"/}
 
+# 视频搜索详情 url
+{site:vsurl key="哈哈" p="1"/}
 
 
 # 图片加密