通过
2 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 2162ede 渲染星享体验等模块页面
From http://114.215.101.231:8099/jinglong/xingqiu
2162ede..ec01f9b master -> origin/master
Checking out ec01f9be as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xingqiu
$ git pull
From http://114.215.101.231:8099/jinglong/xingqiu
2162ede..ec01f9b master -> origin/master
Updating 2162ede..ec01f9b
Fast-forward
app/portal/controller/CommonController.php | 26 +--
app/portal/controller/IndexController.php | 2 +-
app/portal/controller/LoginController.php | 49 ++---
app/portal/controller/ScoutController.php | 6 +-
public/themes/simpleboot3/portal/index/index.html | 7 +
public/themes/simpleboot3/portal/login/login.html | 104 +++++++++++
.../themes/simpleboot3/portal/login/register.html | 150 ++++++++++++++++
.../simpleboot3/portal/login/third_login.html | 53 ++++++
.../themes/simpleboot3/portal/scenery_detail.html | 46 +++++
.../portal/scout/get_travel_detail.html | 90 ++++++++++
public/themes/simpleboot3/portal/scout/index.html | 62 ++++---
.../public/assets/css/activity_Travel.css | 145 +++++++++++++++
.../public/assets/css/activity_wares.css | 92 ++++++++++
.../simpleboot3/public/assets/css/header.css | 22 ++-
.../themes/simpleboot3/public/assets/css/login.css | 197 +++++++++++++++++++++
.../simpleboot3/public/assets/css/login_third.css | 10 ++
.../themes/simpleboot3/public/assets/css/mask.css | 12 ++
.../simpleboot3/public/assets/css/register.css | 34 ++++
.../themes/simpleboot3/public/assets/js/public.js | 23 ++-
public/themes/simpleboot3/public/header.html | 4 +-
20 files changed, 1050 insertions(+), 84 deletions(-)
create mode 100644 public/themes/simpleboot3/portal/login/login.html
create mode 100644 public/themes/simpleboot3/portal/login/register.html
create mode 100644 public/themes/simpleboot3/portal/login/third_login.html
create mode 100644 public/themes/simpleboot3/portal/scenery_detail.html
create mode 100644 public/themes/simpleboot3/portal/scout/get_travel_detail.html
create mode 100644 public/themes/simpleboot3/public/assets/css/activity_Travel.css
create mode 100644 public/themes/simpleboot3/public/assets/css/activity_wares.css
create mode 100644 public/themes/simpleboot3/public/assets/css/login.css
create mode 100644 public/themes/simpleboot3/public/assets/css/login_third.css
create mode 100644 public/themes/simpleboot3/public/assets/css/mask.css
create mode 100644 public/themes/simpleboot3/public/assets/css/register.css
Build succeeded