Merge remote-tracking branch 'origin/master'

demo/src/main/java/com/example/demo/userCenter/controller/personInforController2.java

@@ -29,7 +29,6 @@ public class personInforController2 {
         user.setTelephoneNum(request.getParameter("phoneNum"));
         user.setAddress(request.getParameter("address"));
         userInfoService.updateUser(user);
-        String data = JSONObject.toJSONString(user);
+        response.sendRedirect("personalCenter.html");
-        response.getWriter().print(data);
     }
 }

demo/src/main/resources/static/personInfor.html

@@ -82,7 +82,7 @@
 			<div class="title-name text-left">个人详细资料</div>
 				<div id="pluginContent">
 				<div class="info_list clearfix padding15" id="VerifyTips">
-					<form id="daf" method="get" action="/iy">
+				  <form id="daf" action="/iy" method="get" >
 					<div class=" clearfix content_look mb15">
 						<label class="label_name">昵称：</label>
 						<span class="info_data"><input type="text" name="userName" id="userName" /></span>
@@ -104,13 +104,16 @@
 							<input data-name="简介" name="register" type="text"  id="register" readonly="true"/>
 						</div>
 					</div>
-						   <button  type="button" onclick="check1()">点击前往修改</button>
+					   
-					</form>
+					     <div align="right">
+					       <input type="submit"  value="提交" name="dadgg">
+			               </div>
+				  </form>
 				</div>
 			</div>
 		</div>
 <script type="text/javascript">
-
+    // onClick="check1()"
 </script>
 	</body>
 </html>

demo/src/main/resources/static/personalCenter.html

@@ -62,7 +62,7 @@
                             <div class="aui-flex-box">
                                 <h2 id="username">***</h2>
                             </div>
-                        <!--<div class="aui-account-arrow"></div>-->
+                        <div class="aui-account-arrow"></div>
                     </div> </a>
                 </div>
 <footer class="aui-footer aui-footer-fixed"> <a href="javascript:;" class="aui-tabBar-item aui-tabBar-item-active"> <span class="aui-tabBar-item-icon"> <i class="icon icon-home"></i> </span> <span class="aui-tabBar-item-text">首页</span> </a> <a href="javascript:;" class="aui-tabBar-item "> <span class="aui-tabBar-item-icon"> <i class="icon icon-credit"></i></span> <span class="aui-tabBar-item-text">资讯</span></a> <a href="javascript:;" class="aui-tabBar-item "> <span class="aui-tabBar-item-icon"> <i class="icon icon-credit"></i> </span> <span class="aui-tabBar-item-text">商城</span> </a> <a href="javascript:;" class="aui-tabBar-item "> <span class="aui-tabBar-item-icon"> <i class="icon icon-me"></i> </span> <span class="aui-tabBar-item-text">我的</span> </a> </footer>