From 0e3ab46b88e60c193488220e92b9609fad8ddfa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E7=81=BF=E6=A1=A2?= <xdzcz@outlook.com>
Date: Sun, 19 Jun 2016 22:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=95=8C=E9=9D=A2=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/UserController.php       |  2 +-
 public/css/create_records/style.css           | 43 +++++++++----------
 public/js/user-information.js                 |  1 -
 .../create_records/album_order.blade.php      |  4 +-
 resources/views/layouts/content.blade.php     | 18 ++++----
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9e16aae..98bdfd3 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -71,7 +71,7 @@ public function editInfo(){
 		if(!isset($_SESSION)){
 			session_start();
 		}
-		$name=$_SESSION['username'];
+		$name=$_GET['username'];
 		$email=$_GET['email'];
 
 
diff --git a/public/css/create_records/style.css b/public/css/create_records/style.css
index cb6d16c..97240bc 100644
--- a/public/css/create_records/style.css
+++ b/public/css/create_records/style.css
@@ -814,14 +814,14 @@ img
 {
     color: #7f543a;
     font-weight: bold;
-    font-family: '楷体';
-    font-size: 22px;
+    font-family: '微软雅黑';
+    font-size: 16px;
     line-height: 22px;
 }
 .create_text textarea
 {
-    font-style: '楷体';
-    font-size: 15px;
+    font-family: '微软雅黑';
+    font-size: 16px;
 	background:transparent;
 	border:1px solid #7C5037;
     margin-left: 3px;
@@ -839,9 +839,8 @@ img
 
 .about_text
 {
-    font-size: 12px;
+    font-size: 15px;
     line-height: 20px;
-
     display: inline;
     float: left;
 
@@ -851,8 +850,8 @@ img
 }
 .about_text h1
 {
-    font-family: '楷体';
-    font-size: 32px;
+    font-family:'微软雅黑';
+    font-size: 16px;
     line-height: 32px;
 }
 .about_text p
@@ -964,7 +963,7 @@ img
 .user_time
 {
     font-size: 16px;
-    font-family: "楷体";
+    font-family: "微软雅黑";
     line-height: 20px;
     display: inline;
     float: left;
@@ -1065,8 +1064,8 @@ img
 .geam_l,
 .game_list
 {
-    font-size: 12px;
-
+    font-size: 15px;
+    font-family:'微软雅黑';
     width: 350px;
     height: 500px;
     margin: 100px auto auto 100px;
@@ -1436,8 +1435,8 @@ img
 }
 .datep{
 	color:#FFFFFF;
-	font-size : 27px;
-	font-family : 楷体;
+	font-size : 16px;
+	font-family : 微软雅黑;
 	background-color:#7C5037;
 	font-weight:bold;
 	padding-left:10px;
@@ -1445,8 +1444,8 @@ img
 
 .datep1{
     color:#FFFFFF;
-    font-size : 27px;
-    font-family : 楷体;
+    font-size : 16x;
+    font-family : 微软雅黑;
     background-color:#7C5037;
     font-weight:bold;
     padding-left:10px;
@@ -1459,8 +1458,8 @@ img
 
 .diary{
 	color:black;
-	font-size : 20px;
-	font-family : 楷体;
+	font-size : 16px;
+	font-family : 微软雅黑;
 	padding-left:10px;
 }
 
@@ -1514,7 +1513,7 @@ img
     /*border: 1px solid #000;*/
 }
 .order_text p{
-    font-family: "楷体";
+    font-family: "微软雅黑";
     font-size: 20px;
 }
 #kai32{
@@ -1542,19 +1541,19 @@ img
     margin-left: 15px;
 }
 .send_order{
-    font-family: "楷体";
+    font-family: "微软雅黑";
     width: 400px;
     line-height: 20px;
     display: inline;
     float: left;
     margin: 75px auto auto 70px;
     color: #7f543a;
-    font-size: 18px;
+    font-size: 15px;
     /*border: 1px solid #000;*/
 }
 .send_order p{
-    font-family: "楷体";
-    font-size: 20px;
+    font-family: "微软雅黑";
+    font-size: 16px;
 }
 #price{
     color:red;
diff --git a/public/js/user-information.js b/public/js/user-information.js
index 40570f8..471f165 100644
--- a/public/js/user-information.js
+++ b/public/js/user-information.js
@@ -120,7 +120,6 @@ yinjiApp.controller('userInfoCtrl',
 
         //更改用户信息（邮箱）
         $scope.editInfo = function(){
-            console.log($scope.emailName);
             var email = $scope.emailName+"@"+$scope.emailSuffix+".com";
             $http({
                 method:'GET',
diff --git a/resources/views/create_records/album_order.blade.php b/resources/views/create_records/album_order.blade.php
index 7a253e0..958537f 100644
--- a/resources/views/create_records/album_order.blade.php
+++ b/resources/views/create_records/album_order.blade.php
@@ -26,7 +26,7 @@
         </div>
 
         <div class="index_left page_left geam_l">
-            选择一个模版吧~
+            选择一个模版吧
             <div class="order_text">
                 <!--<img src = "/company/template/yinji/1.jpg" title = "1">
                 <img src = "/company/template/yinji/2.jpg">
@@ -71,7 +71,7 @@
                     <img class="pay" src="images/create_records/applepay.jpg" alt="中国工商银行" />
                 </div>-->
                 <div class="send_button">
-                <input  class="button button-glow button-rounded button-highlight" type="submit" value="确认">
+                <input class="btn btn-lg" type="submit" style="float:right;" value="确认">
                 </div>
             </div>
         </div>   
diff --git a/resources/views/layouts/content.blade.php b/resources/views/layouts/content.blade.php
index 528a2a0..85c457b 100644
--- a/resources/views/layouts/content.blade.php
+++ b/resources/views/layouts/content.blade.php
@@ -26,19 +26,21 @@
 									<li><a href="/create_album">创建纪念册</a></li>
 								</ul> 
 							</li>
-							<li class = "topLine"><a href="">刊印</a>
+
+							<li class = "topLine"><a href="">我的</a>
 								<ul>
-									<li class = "spec"><a href="/orderInfo">查看订单</a></li>
-								</ul> 
-							</li>
+									<li class = "spec"><a href="/orderInfo">我的订单</a></li>
+									<li><a href="/user-information">个人信息</a></li>
+								</ul>
 							</li>
-							<li class = "topLine"><a href="">个人信息</a>
+
+							<li class = "topLine"><a href="">关于</a>
 								<ul>
-									<li class = "spec"><a href="/user-information">查看个人信息</a></li>
+									<li class = "spec"><a href="/about_us">关于我们</a></li>
+									<li><a href="/contact_us">联系我们</a></li>
 								</ul>
 							</li>
-							<li class = "topLine"><a href="/about_us">关于</a></li>
-							<li class = "topLine"><a href="/contact_us">联系我们</a></li>
+
 						</ul>
 					</div>
 				</div>