Merge branch 'online_talenkid' of http://gogs.efunbox.cn:3000/Rankin/2BTV-Web into online_talenkid

config/gulpfile.js

@@ -17,7 +17,6 @@ var replace = require('gulp-replace');
 var babel = require('gulp-babel');
 var es2015 = require('babel-preset-es2015');
 var gulpif = require('gulp-if');
-
 var basePath = process.env.PJ_PATH;
 //var absPath = 'http://127.0.0.1:8080/efunbox-to-b/1.0.0';
 var absPath = 'http://lj-web.api.ai160.com/build';

src/res/values/api.json

@@ -1,4 +1,4 @@
 {
-    "api_url_": "https://talenkid.lingjiao.cn",
-    "api_url": "http://tt-web.api.ai160.com"
-}
+    "api_url": "https://talenkid.lingjiao.cn",
+    "api_url_": "http://tt-web.api.ai160.com"
+}

src/stage/index/style/GlobalGoodDetail.less

@@ -63,7 +63,7 @@
                 font-size: 0.3rem;
                 margin-top: 0.2rem;
                 width: 100%;
-                height: 4.29rem;
+                height: 5.29rem;
                 line-height: .45rem;
                 overflow: hidden;
                 text-align: justify;