Authored by weiqingting

Merge branch 'feature_student' into release/4.9.1

# Conflicts:
#	apps/activity/controllers/student.js
#	apps/product/views/action/detail/detail.hbs
'use strict';
const fs = require('fs');
let devHost = 'localhost';
let devHost = '172.16.6.159';
fs.readFile('.devhost', (err, buf)=> {
if (!err) {
... ...

1 KB | W: | H:

1.67 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -374,7 +374,7 @@
background-repeat: no-repeat;
background-size: contain;
width: 77px;
height: 26px;
height: 28px;
line-height: 26px;
position: absolute;
right: -87px;
... ...