From bc07aeb4626f07e202b60586de230fcd92870975 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Sun, 16 Aug 2020 15:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/my.js                 | 3 +++
 js/trade_rule.js         | 7 ++++++-
 templete/my.html         | 4 ++--
 templete/trade_rule.html | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/js/my.js b/js/my.js
index 3075042..40c4fcb 100644
--- a/js/my.js
+++ b/js/my.js
@@ -274,6 +274,9 @@ var localAuthType = localStorage.getItem("authType");
 			$('.mydata-content').on('tap', '.setting', function() {
 				JZL.openWindow('setting.html', 'setting.html')
 			})
+			$('.mydata-content').on('tap', '.tradeRule', function() {
+				JZL.openWindow('trade_rule.html', 'trade_rule.html')
+			})
 			$('.mydata-content').on('tap', '.shoppingcart', function() {
 				JZL.openWindow('shoppingcart_warp.html', 'shoppingcart_warp.html')
 			})
diff --git a/js/trade_rule.js b/js/trade_rule.js
index 135830a..71e1bad 100644
--- a/js/trade_rule.js
+++ b/js/trade_rule.js
@@ -38,7 +38,12 @@ const app = new Vue({
 		var localData = localStorage.getItem("LOCAL_RULE");
 		this.loadData();
 		if(localData){
-			this.noteData = JSON.parse(localData);
+			try {
+				JSON.parse(localData);
+				this.ruleData = JSON.parse(localData);
+			} catch (e) {
+				
+			}
 		}
 	}
 })
\ No newline at end of file
diff --git a/templete/my.html b/templete/my.html
index 82567c9..ba32fe6 100644
--- a/templete/my.html
+++ b/templete/my.html
@@ -113,11 +113,11 @@
 								<p>微吧</p>
 							</a>
 						</div>
-						<div class="mydata-table-view-cell userPaymentvoucher">
+						<div class="mydata-table-view-cell tradeRule">
 							<a href="javascript:;">
 								<div class="orderimg">
 									<img src="../img/pingzheng.png" /></div>
-								<p>付款凭证</p>
+								<p>交易规则</p>
 							</a>
 						</div>
 						<div class="mydata-table-view-cell shoppingcart">
diff --git a/templete/trade_rule.html b/templete/trade_rule.html
index d922d06..57b2774 100644
--- a/templete/trade_rule.html
+++ b/templete/trade_rule.html
@@ -20,8 +20,8 @@
 		<div class="block" id="app" v-cloak>
 			<div class="row shadown_wai" v-for="(each, index) in ruleData" :data-id="index" @click="detail(index)">
 				<div class="left">
-					<div class="name">{{each.name}}</div>
-					<div class="small_title">在{{each.announced_at}}时发布</div>
+					<div class="name" style="height: 2.2rem;">{{each.title}}</div>
+					<div class="small_title">在{{each.create_time}}时发布</div>
 				</div>
 				<img class="right youjiantou" src="../img/youjiantou.png" />
 			</div>