From 8b70f364b4516c1a8716a246cb4083506fcc9105 Mon Sep 17 00:00:00 2001
From: yirenyishi <mail_yanpeng@163.com>
Date: Sun, 2 Dec 2018 20:48:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=94=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/PageController.go | 10 ++++++++++
 views/iframe/note.html        | 11 ++++++-----
 views/note.html               |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/controllers/PageController.go b/controllers/PageController.go
index 0ab6a06..2a6bec1 100644
--- a/controllers/PageController.go
+++ b/controllers/PageController.go
@@ -40,6 +40,16 @@ func (this *PageController) IframeUser() {
 
 // @router /iframe/note [get]
 func (this *PageController) IframeNote() {
+	uid := this.GetSession("userid")
+	if uid == nil {
+		this.Data["IsLogin"] =  false
+	}else {
+		this.Data["IsLogin"] = true
+		noteColls,err:=service.GetNoteColl(uid.(int64))
+		if err== nil {
+			this.Data["NoteColl"] = noteColls
+		}
+	}
 	this.TplName = "iframe/note.html"
 }
 
diff --git a/views/iframe/note.html b/views/iframe/note.html
index 0b99d5d..7e6a15d 100644
--- a/views/iframe/note.html
+++ b/views/iframe/note.html
@@ -28,11 +28,9 @@
         <span>所属文件夹:</span>
         <span style="flex: 1">
             <select class="form-control " style="display: inline-block;height: 32px" id="catory">
-                <option>1</option>
-                <option>2</option>
-                <option>3</option>
-                <option>4</option>
-                <option>5</option>
+            {{range .NoteColl}}
+                <option value="{{.Id}}">{{.Title}}</option>
+            {{end}}
             </select>
         </span>
     </div>
@@ -47,6 +45,9 @@
 </body>
 <script>
     $(function () {
+        if (!{{.IsLogin}}) {
+            parent.location.href = "/login"
+        }
         $("#saveBtn").click(function () {
             var pid = $("#catory").val()
             var title = $("#lable").val()
diff --git a/views/note.html b/views/note.html
index 8c8f890..5527f3b 100644
--- a/views/note.html
+++ b/views/note.html
@@ -63,7 +63,7 @@
             <ul class="sub-menu" value="{{.Id}}">
             {{range .Notes}}
                 <li>
-                    <a href="javascript:void(0)" onclick="noteClick({{.Id}})" value="{{.Id}}">{{.Id}}-{{.Title}}</a>
+                    <a href="javascript:void(0)" onclick="noteClick({{.Id}})" value="{{.Id}}">{{.Title}}</a>
                 </li>
             {{end}}
             </ul>