Merge pull request 'feature/add_xy' (#27) from feature/add_xy into master

Reviewed-on: http://8.136.139.249:3000/wmtx/sdk/pulls/27

Application/Media/Controller/ArticleController.class.php

@@ -363,14 +363,28 @@ class ArticleController extends HomeController {
 			$this->error('分类不存在或被禁用！');
 		}
 	}
-    
-    public function agreement() {
-    	$category=D('category')->where(array('name'=>'agreement'))->find();
-        $docu=D('document')->where(array('category_id'=>$category['id'],'status'=>1))->find();
+	public function agreement() {
+		$this->getDocument('用户协议');
+    }
+	public function privacy() {
+		$this->getDocument('隐私政策');
+    }
+	public function cancellation() {
+		$this->getDocument('注销协议');
+    }
+	public function otherDirectory() {
+		$this->getDocument('第三方SDK目录');
+    }
+
+	private function getDocument($title)
+	{
+		$category=D('category')->where(array('name'=>'agreement'))->find();
+        $docu=D('document')->where(array('category_id'=>$category['id'],'status'=>1,'title'=>['like',"%{$title}"]))->find();
     	$document_article=D('document_article')->where(array('id'=>$docu['id']))->find();
     	$this->assign('article',$document_article['content']); 
-        $this->display();
-    }
+        $this->display('agreement');
+	}
+
     protected function list_data($model){
 		$game  = M($model['m_name'],$model['prefix']);
 		$map = $model['map'];

Application/Media/View/default/Public/loginreg.html

@@ -41,6 +41,27 @@
         <h1 class="user-single-title">用户注册协议</h1>
     </div>
 </div>
+<elseif condition="ACTION_NAME eq privacy" />
+<div class="user-single-head">
+	<div class="user-single-h">
+        <a href="{:U('Index/index')}" target="_blank" title="" class="user-single-logo"><img src="{:get_cover(C('PC_SET_LOGO'),'path')}" width="105" height="36" /></a>
+        <h1 class="user-single-title">隐私政策</h1>
+    </div>
+</div>
+<elseif condition="ACTION_NAME eq cancellation" />
+<div class="user-single-head">
+	<div class="user-single-h">
+        <a href="{:U('Index/index')}" target="_blank" title="" class="user-single-logo"><img src="{:get_cover(C('PC_SET_LOGO'),'path')}" width="105" height="36" /></a>
+        <h1 class="user-single-title">注销协议</h1>
+    </div>
+</div>
+<elseif condition="ACTION_NAME eq otherDirectory" />
+<div class="user-single-head">
+	<div class="user-single-h">
+        <a href="{:U('Index/index')}" target="_blank" title="" class="user-single-logo"><img src="{:get_cover(C('PC_SET_LOGO'),'path')}" width="105" height="36" /></a>
+        <h1 class="user-single-title">第三方SDK目录</h1>
+    </div>
+</div>
 <elseif condition="ACTION_NAME eq supervise" />
 <div class="user-single-head">
     <div class="user-single-h">