From 627d9fa5e6d8efba8849a62aaaef6418a86fe451 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Wed, 12 Aug 2020 22:29:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=82=E7=AC=94=E5=A4=B4OK?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/notepad.css             |  1 +
 js/common.js                | 12 +++---
 templete/notepad.html       | 75 ++++++++++++++++++++++++-------------
 templete/notepad_index.html | 40 ++++++++++++++++++++
 4 files changed, 97 insertions(+), 31 deletions(-)
 create mode 100644 templete/notepad_index.html

diff --git a/css/notepad.css b/css/notepad.css
index 21de033..6a63b61 100644
--- a/css/notepad.css
+++ b/css/notepad.css
@@ -22,6 +22,7 @@
 	color: black;
 	line-height: 42px;
 	padding-left: 5px;
+	font-weight: bolder;
 }
 
 [v-cloak] {
diff --git a/js/common.js b/js/common.js
index c19d22c..193fefe 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,10 +1,10 @@
 var is_app = 1;
-var imgUrl = 'http://img.zgqlg.com.cn/';
-var webUrl = 'http://www.zgqlg.com.cn/';
-var webUrl1 = 'http://www.zgqlg.com.cn/';
-// var imgUrl = 'http://qlg.tsgz.moe:233/';
-// var webUrl = 'http://qlg.tsgz.moe:233/';
-// var webUrl1 = 'http://qlg.tsgz.moe:233/';
+// var imgUrl = 'http://img.zgqlg.com.cn/';
+// var webUrl = 'http://www.zgqlg.com.cn/';
+// var webUrl1 = 'http://www.zgqlg.com.cn/';
+var imgUrl = 'http://qlg.qgmzbxs.com/';
+var webUrl = 'http://qlg.qgmzbxs.com/';
+var webUrl1 = 'http://qlg.qgmzbxs.com/';
 var cssUrl = localStorage.getItem("cssUrl");
 var jsUrl = localStorage.getItem("jsUrl");
 var version = localStorage.getItem("version");
diff --git a/templete/notepad.html b/templete/notepad.html
index 8f642d5..f0b53d9 100644
--- a/templete/notepad.html
+++ b/templete/notepad.html
@@ -16,28 +16,33 @@
 				<p class="title">烂笔头</p>
 			</div>
 		</div>
-		<div class="z"></div>
-		<div class="block" id="app" v-cloak>
-			<div class="row clearfix" v-for="(each, index) in noteData" :data-id="each.id">
-				<div class="left" v-if="!each.currentDelete" @click="edit(index)">
-					<div class="name">{{each.name}}</div>
-					<div class="created_time">创建时间：{{each.created_at}}</div>
-					<div class="updated_time">更改时间：{{each.updated_at}}</div>
-				</div>
-				<div class="left" v-else>
-					<div class="name" style="color: red;font-weight: bolder;">你确定要删除么？</div>
-					<div class="small_title">{{each.name}}</div>
-				</div>
-				<div class="right" v-if="!each.currentDelete">
-					<div class="operation edit" @click.stop.prevent="edit(each.id)">编辑</div>
-					<div class="delete operation" @click.stop.prevent="triggerDelete(index)">删除</div>
-				</div>
-				<div class="right" v-else>
-					<div class="operation delete confirm" @click.stop.prevent="confirmDelete(index)">确认</div>
-					<div class="operation edit cancel" @click.stop.prevent="cancelDelete(index)">取消</div>
-				</div>
-			</div>
+		<div style="height: 36px;"></div>
+		<style>
+			.indicator {
+				display: inline-block;
+				width: 33%;
+				padding: 10px 0;
+				margin: 0 10px;
+				text-align: center;
+				color: black;
+				background-color: #ddd;
+			}
+			.act.indicator {
+				color: white;
+				background-color: #444;
+			}
+			#subPage {
+				height: calc(100vh - 140px);
+				width: 100vw;
+				border: none;
+			}
+		</style>
+		<div class="block" style="display: flex;width: 100vw;">
+			<div class="indicator act" data-url="notepad_index.html">备忘记</div>
+			<div class="indicator" data-url="notepad_index.html">信用卡</div>
+			<div class="indicator" data-url="notepad_index.html">阅看越想</div>
 		</div>
+		<iframe id="subPage" src="notepad_index.html"></iframe>
 		<div class="footer">
 			新增记事
 		</div>
@@ -45,7 +50,6 @@
 	<script src="../js/mui.min.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../js/jquery-3.2.1.min.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../js/common.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../lib/vue/vue.min.js" type="text/javascript" charset="utf-8"></script>
 	<script type="text/javascript">
 		mui.plusReady(function() {
 			var element;
@@ -56,13 +60,34 @@
 			element.onload = function() {
 				var style = [JZL.getCssUrl('notepad.css'), JZL.getCssUrl("global.css"), JZL.getCssUrl("header.css")];
 				JZL.css_init(style);
-				var script = [JZL.getJsUrl('notepad.js')];
-				JZL.js_init(script);
+//				var script = [JZL.getJsUrl('notepad.js')];
+//				JZL.js_init(script);
 				setTimeout(function() {
 					parent.style.visibility = "visible";
 				}, 100);
 			};
+			$('#subPage').attr('src', 'notepad_index.html');
+			$('.indicator').click(function(){
+				$('.indicator').removeClass('act');
+				$(this).addClass('act');
+				$('#subPage').attr('src', $(this).data('url'));
+			})
+		})
+		mui.plusReady(function(){
+			$(".footer").click(function(){
+				mui.openWindow({
+					url: "notepad_edit.html",
+					id: "notepad_edit"+0,
+					extras: {
+						noteId: 0
+					},
+					createNew: false, //是否重复创建同样id的webview，默认为false:不重复创建，直接显示
+					waiting: {
+						autoShow: true, //自动显示等待框，默认为true
+						title: '正在加载...', //等待对话框上显示的提示内容
+					}
+				})
+			})
 		})
-		
 	</script>
 </html>
diff --git a/templete/notepad_index.html b/templete/notepad_index.html
new file mode 100644
index 0000000..06b9515
--- /dev/null
+++ b/templete/notepad_index.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title></title>
+	</head>
+	<body>
+		<div id="app" v-cloak>
+				<div class="row clearfix" v-for="(each, index) in noteData" :data-id="each.id">
+					<div class="left" v-if="!each.currentDelete" @click="edit(index)">
+						<div class="name">{{each.title}}</div>
+						<div class="created_time">创建时间：{{each.create_time}}</div>
+						<div class="updated_time">更改时间：{{each.update_time}}</div>
+					</div>
+					<div class="left" v-else>
+						<div class="name" style="color: red;font-weight: bolder;">你确定要删除么？</div>
+						<div class="small_title">{{each.title}}</div>
+					</div>
+					<div class="right" v-if="!each.currentDelete">
+						<div class="operation edit" @click.stop.prevent="edit(each.id)">编辑</div>
+						<div class="delete operation" @click.stop.prevent="triggerDelete(index)">删除</div>
+					</div>
+					<div class="right" v-else>
+						<div class="operation delete confirm" @click.stop.prevent="confirmDelete(index)">确认</div>
+						<div class="operation edit cancel" @click.stop.prevent="cancelDelete(index)">取消</div>
+					</div>
+				</div>
+			</div>
+	</body>
+	<script src="../js/mui.min.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../js/jquery-3.2.1.min.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../js/common.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../lib/vue/vue.min.js" type="text/javascript" charset="utf-8"></script>
+	<script type="text/javascript">
+		var style = [JZL.getCssUrl('notepad.css'), JZL.getCssUrl("global.css"), JZL.getCssUrl("header.css")];
+						JZL.css_init(style);
+						var script = [JZL.getJsUrl('notepad.js')];
+						JZL.js_init(script);
+		</script>
+</html>