Merge branch 'feature/currency' into release/5.2

@@ -165,7 +165,6 @@
                 font-size: 28px;
                 font-size: 28px;
                 background: #e0e0e0;
                 background: #e0e0e0;
                 display: none;
                 display: none;
-                padding-bottom: 8px;
 
 
                 li{
                 li{
                     border-bottom:1px solid #fff;
                     border-bottom:1px solid #fff;

@@ -66,7 +66,7 @@
                 <i class="iconfont hide up">&#xe615;</i>
                 <i class="iconfont hide up">&#xe615;</i>
             </h3>
             </h3>
             <ul>
             <ul>
-                <li class="dispatch-time-info">快递公司会尽力按您选择的送货时间配送，如遇特殊情况（天气、环境等）无法按您要求时间配送，还请您谅解。</li>
+                <li class="dispatch-time-info">快递公司会尽力按您选择的送货时间配送，如遇特殊情况(天气、环境等)无法按您要求时间配送，还请您谅解。</li>
                 {{#each dispatchTime}}
                 {{#each dispatchTime}}
                 <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
                 <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
                     <span>{{name}}</span>
                     <span>{{name}}</span>

@@ -17,8 +17,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关
 
 
 #dev环境
 #dev环境
 
 
-define('API_URL', 'http://api-test1.yohops.com:9999/');
-define('SERVICE_URL', 'http://service-test1.yohops.com:9999/');
+define('API_URL', 'http://api-test3.yohops.com:9999/');
+define('SERVICE_URL', 'http://service-test3.yohops.com:9999/');
 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
 define('SERVICE_NOTIFY', 'http://service-test1.yohops.com:9999/');
 define('SERVICE_NOTIFY', 'http://service-test1.yohops.com:9999/');