editorial

@@ -498,7 +498,7 @@ const setBrandIntro = brand => {
 
 
     if (brand) {
     if (brand) {
         let text = _.replace(brand.brandIntro, /<\/?[^>]*>|\s*|(\n)|(\t)|(\r)/g, ''),
         let text = _.replace(brand.brandIntro, /<\/?[^>]*>|\s*|(\n)|(\t)|(\r)/g, ''),
-            more = `... <a href="javascript:;" class="more-brand-intro blue">了解更多>></a>`;
+            more = '... <a href="javascript:;" class="more-brand-intro blue">了解更多>></a>';
 
 
         barndIntro = {
         barndIntro = {
             brand: {
             brand: {

@@ -8,6 +8,7 @@
 
 
 const isProduction = process.env.NODE_ENV === 'production';
 const isProduction = process.env.NODE_ENV === 'production';
 const isTest = process.env.NODE_ENV === 'test';
 const isTest = process.env.NODE_ENV === 'test';
+const isUseOneapm = process.env.USE_ONEAPM === 'true';
 
 
 module.exports = {
 module.exports = {
     app: 'web',
     app: 'web',
@@ -99,7 +100,7 @@ if (isProduction) {
             session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             timeout: 3000
             timeout: 3000
         },
         },
-        useOneapm: true,
+        useOneapm: isUseOneapm,
         useCache: true,
         useCache: true,
         pay: {
         pay: {
             serviceNotify: 'http://service.yoho.cn/'
             serviceNotify: 'http://service.yoho.cn/'
@@ -109,10 +110,10 @@ if (isProduction) {
     Object.assign(module.exports, {
     Object.assign(module.exports, {
         appName: 'www.yohoblk.com for test',
         appName: 'www.yohoblk.com for test',
         domains: {
         domains: {
-            singleApi: 'http://192.168.102.31:8092/brower',
-            api: 'http://testapi.yoho.cn:28078/',
-            service: 'http://testservice.yoho.cn:28077/',
-            search: 'http://192.168.102.216:8080/yohosearch/'
+            singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/brower',
+            api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
+            service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
+            search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'
         },
         },
         useOneapm: true,
         useOneapm: true,
         useCache: true,
         useCache: true,

@@ -37,6 +37,8 @@ var balanceTpl = require('../../tpl/shopping/balance.hbs');
 
 
 var pkgCache = {};
 var pkgCache = {};
 
 
+var suredCoin = 0;
+
 var $pkgList;
 var $pkgList;
 
 
 require('yoho-jquery-placeholder');
 require('yoho-jquery-placeholder');
@@ -218,8 +220,10 @@ $coinSure.click(function() {
         return;
         return;
     }
     }
 
 
+    suredCoin = getCoinUsed();
+
     // 切换显示
     // 切换显示
-    compute(getCoinUsed());
+    compute(suredCoin);
 
 
     toggleCoinPanel();
     toggleCoinPanel();
 });
 });
@@ -257,7 +261,7 @@ $('.print-price-radio').check({
 $('#balance-list').on('click', '#submit-order', function() {
 $('#balance-list').on('click', '#submit-order', function() {
     var reqParam = {
     var reqParam = {
         address_id: $('.address.focus').data('id'),
         address_id: $('.address.focus').data('id'),
-        use_yoho_coin: getCoinUsed(),
+        use_yoho_coin: suredCoin,
         remark: $('#remark-content').val(),
         remark: $('#remark-content').val(),
         isPrintPrice: $printPrice.printPrice
         isPrintPrice: $printPrice.printPrice
     };
     };

@@ -14,6 +14,11 @@
 
 
         .brand-logo {
         .brand-logo {
             display: inline-block;
             display: inline-block;
+            height: 45px;
+
+            > img {
+                height: 100%;
+            }
         }
         }
 
 
         .opt > * {
         .opt > * {