通过
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 da13a89 合并分支 'wangxiaogang' 到 'master'
From http://114.215.101.231:8099/anyv/xkeasy
da13a89..ad1aa47 master -> origin/master
Checking out ad1aa47f as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xkeasy
$ git pull
From http://114.215.101.231:8099/anyv/xkeasy
da13a89..ad1aa47 master -> origin/master
Updating da13a89..ad1aa47
Fast-forward
app/admin/controller/StatisticalController.php | 93 ++++++
app/portal/controller/LoadController.php | 24 ++
app/portal/controller/PayController.php | 1 +
app/portal/controller/PersonalcenterController.php | 129 +++++++-
app/portal/controller/ShopcartController.php | 1 +
data/lang/zh-cn/admin_menu.php | 3 +
public/index.php | 2 +-
.../admin/statistical/financial_list.html | 40 +++
.../admin/statistical/spending_list.html | 36 +++
.../themes/simpleboot3/portal/order/get_one.html | 19 +-
.../portal/personalcenter/invitation_list.html | 21 +-
.../portal/personalcenter/mall_profit.html | 339 +++++++++++++++++++++
.../portal/personalcenter/my_wallet.html | 2 +-
.../portal/personalcenter/personal_center.html | 2 +-
.../portal/personalcenter/salesman_center.html | 2 +-
15 files changed, 689 insertions(+), 25 deletions(-)
create mode 100644 app/admin/controller/StatisticalController.php
create mode 100644 public/themes/admin_simpleboot3/admin/statistical/financial_list.html
create mode 100644 public/themes/admin_simpleboot3/admin/statistical/spending_list.html
create mode 100644 public/themes/simpleboot3/portal/personalcenter/mall_profit.html
Build succeeded