diff --git a/public/css/create_album.css b/public/css/create_album.css index f21b40b..40ae0a2 100644 --- a/public/css/create_album.css +++ b/public/css/create_album.css @@ -614,7 +614,7 @@ Volton Template } @font-face { - font-family: 'robotobold'; + font-family: '微软雅黑'; font-weight: normal; font-style: normal; @@ -1283,9 +1283,8 @@ hr h3.profile-title { - font-family: 'robotobold'; - font-size: 18px; - + font-family: '微软雅黑'; + font-size: 15px; margin-bottom: 5px; /*color: white;*/ @@ -1293,7 +1292,7 @@ h3.profile-title } p.profile-description { - font-family: 'robotobold'; + font-family: '微软雅黑'; font-size: 18px; margin-bottom: 5px; diff --git a/public/js/create_album.js b/public/js/create_album.js index d24a8e4..07461c0 100644 --- a/public/js/create_album.js +++ b/public/js/create_album.js @@ -103,6 +103,13 @@ yinjiApp.controller('albumController', // }); + $scope.userName = "尊敬的"; + + $http.get('/getUserName') + .success(function(response){ + $scope.userName += (response + ",您好"); + }); + //创建纪念册 $scope.createAlbum = function () { //输入验证通过 @@ -112,8 +119,7 @@ yinjiApp.controller('albumController', //console.log(ff); //document.getElementById("subBtn").submit(); //$("imgForm").submit(); - - + if ($scope.checkAlbumInput()) { if ($scope.nameOfAuthor == null || $scope.nameOfAuthor == "") //$scope.nameOfAuthor = $_SESSION['userName']; diff --git a/resources/views/create_album.blade.php b/resources/views/create_album.blade.php index 707d783..f3bcc5b 100644 --- a/resources/views/create_album.blade.php +++ b/resources/views/create_album.blade.php @@ -1,6 +1,6 @@ @extends('layouts.content') -@section('title','生成相簿') +@section('title','生成纪念册') @section('header') @parent @@ -36,8 +36,7 @@
创建一本时光书
+创建一本时光书
+