fe / yohobuywap-node · Commits

Go to a project

Authored by weiqingting
Commit d063c4d8f5694006d5f7afbf36e04c835fb1edc9 1 parent d69b2881

Merge branch 'feature_student' into release/4.9.1 

# Conflicts:
#	apps/activity/controllers/student.js
#	apps/product/views/action/detail/detail.hbs
Inline Side-by-side
Showing 3 changed files with 2 additions and 2 deletions
1 'use strict'; 1 'use strict';
2 2
3 const fs = require('fs'); 3 const fs = require('fs');
4 -let devHost = 'localhost'; 4 +let devHost = '172.16.6.159';
5 5
6 fs.readFile('.devhost', (err, buf)=> { 6 fs.readFile('.devhost', (err, buf)=> {
7 if (!err) { 7 if (!err) {

1 KB | W: | H:

1.67 KB | W: | H:

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