通过
3 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at ec01f9b 渲染登录注册，等详情页
From http://114.215.101.231:8099/jinglong/xingqiu
ec01f9b..2786d93 master -> origin/master
Checking out 2786d938 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xingqiu
$ git pull
From http://114.215.101.231:8099/jinglong/xingqiu
ec01f9b..2786d93 master -> origin/master
Updating ec01f9b..2786d93
Fast-forward
app/portal/controller/LoginController.php | 21 +-
app/portal/controller/RegionController.php | 1 +
app/portal/controller/StarController.php | 72 +-
app/portal/validate/CommentValidate.php | 4 +-
public/themes/simpleboot3/portal/enjoy_detail.html | 5 +
public/themes/simpleboot3/portal/index/index.html | 92 +-
.../themes/simpleboot3/portal/login/edit_info.html | 76 ++
public/themes/simpleboot3/portal/login/info.html | 83 ++
public/themes/simpleboot3/portal/login/login.html | 2 +-
.../portal/region/get_future_detail.html | 5 +
.../simpleboot3/portal/region/get_more_video.html | 143 +++
.../simpleboot3/portal/region/get_note_detail.html | 5 +
.../simpleboot3/portal/region/get_star_detail.html | 5 +
.../portal/scout/get_travel_detail.html | 2 -
.../simpleboot3/portal/star/get_more_hotel.html | 130 +++
.../simpleboot3/portal/star/get_more_travel.html | 75 ++
.../simpleboot3/portal/star/get_story_detail.html | 5 +
.../simpleboot3/portal/star/get_travel_detail.html | 69 ++
public/themes/simpleboot3/portal/star/index.html | 316 ++++++
.../simpleboot3/public/assets/css/enjoyment.css | 4 +
.../themes/simpleboot3/public/assets/css/happy.css | 1048 ++++++++++++++++++++
.../simpleboot3/public/assets/css/happy_index.css | 747 ++++++++++++++
.../simpleboot3/public/assets/css/header.css | 17 +-
.../themes/simpleboot3/public/assets/css/index.css | 44 +-
.../themes/simpleboot3/public/assets/css/mask.css | 12 +-
.../simpleboot3/public/assets/css/person.css | 108 ++
.../themes/simpleboot3/public/assets/css/show.css | 218 ++++
.../public/assets/js/lay/modules/layer.js | 2 -
.../public/assets/js/lay/modules/laypage.js | 2 -
.../themes/simpleboot3/public/assets/js/public.js | 60 +-
.../simpleboot3/public/assets/js/uploadfile.js | 223 +++++
.../simpleboot3/public/assets/starImg/down.png | Bin 0 -> 379 bytes
.../simpleboot3/public/assets/starImg/up.png | Bin 0 -> 305 bytes
public/themes/simpleboot3/public/comment.html | 57 +-
public/themes/simpleboot3/public/footer.html | 6 +-
public/themes/simpleboot3/public/header.html | 28 +-
simplewind/cmf/controller/HomeBaseController.php | 19 +-
37 files changed, 3553 insertions(+), 153 deletions(-)
create mode 100644 public/themes/simpleboot3/portal/login/edit_info.html
create mode 100644 public/themes/simpleboot3/portal/login/info.html
create mode 100644 public/themes/simpleboot3/portal/region/get_more_video.html
create mode 100644 public/themes/simpleboot3/portal/star/get_more_hotel.html
create mode 100644 public/themes/simpleboot3/portal/star/get_more_travel.html
create mode 100644 public/themes/simpleboot3/portal/star/get_travel_detail.html
create mode 100644 public/themes/simpleboot3/portal/star/index.html
create mode 100644 public/themes/simpleboot3/public/assets/css/happy.css
create mode 100644 public/themes/simpleboot3/public/assets/css/happy_index.css
create mode 100644 public/themes/simpleboot3/public/assets/css/person.css
delete mode 100644 public/themes/simpleboot3/public/assets/js/lay/modules/layer.js
delete mode 100644 public/themes/simpleboot3/public/assets/js/lay/modules/laypage.js
create mode 100644 public/themes/simpleboot3/public/assets/js/uploadfile.js
create mode 100644 public/themes/simpleboot3/public/assets/starImg/down.png
create mode 100644 public/themes/simpleboot3/public/assets/starImg/up.png
Build succeeded