Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/mobile/center/user/index.vue
#	pages/mobile/center/vendor/index.vue

components/default/Header.vue

@@ -116,7 +116,7 @@
       onRegisterClick () {
         this.$http.get('/register/page').then(response => {
           if (response.data) {
-            window.location.href = response.data.content
+            window.location.href = response.data.content + '&baseUrl=' + encodeURIComponent(window.location.protocol + '//' + window.location.host + '/newLogin/other')
           }
         })
       },

components/mobile/Home.vue

@@ -10,9 +10,9 @@
             <div class="swiper-slide">
               <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_02.jpg" alt="">
             </div>
-            <div class="swiper-slide">
-              <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_03.png" alt="">
-            </div>
+            <!--<div class="swiper-slide">-->
+              <!--<img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_03.png" alt="">-->
+            <!--</div>-->
           </div>
           <div class="swiper-pagination swiper-pagination-bullets"></div>
         </div>

nuxt.config.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 // b2c后台
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.3:36006')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.121:9090/platform-b2c/')
 // 公共询价
 const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 // 公共物料