Merge remote-tracking branch 'origin/master'

components/default/Header.vue

@@ -159,6 +159,7 @@
           window.location.href = '/personalMaterial'
         } else {
           if (tempEnterprise.isVendor === 313) {
+            // window.location.href = '/vendor'
             window.location.href = '/vendor#/index'
           } else {
             window.location.href = '/register-saler'

components/mobile/share/store/CommodityList.vue

@@ -57,6 +57,7 @@
     .share_title {
       font-weight: bold;
       margin-top: 0.06rem;
+      float: left;
       span {
         width: 0.08rem;
         height: 0.3rem;
@@ -86,18 +87,28 @@
     .title {
       margin-bottom: .2rem;
       display: flex;
+      &::after {
+        content: ' ';
+        clear: both;
+        display: block;
+        visibility: hidden;
+        zoom: 1;
+      }
       img {
         width: 1.59rem;
         height: .45rem;
       }
       .date {
         flex: 1;
-        display: inline-block;
+        // display: inline-block;
         font-size: .21rem;
         color: #fa3f46;
-        position: relative;
-        top: .06rem;
-        left: .32rem;
+        // position: relative;
+        // top: .06rem;
+        // left: .32rem;
+        margin-left: .32rem;
+        margin-top: .06rem;
+        float: left;
         span {
           color: #fff;
           font-size: .24rem;
@@ -138,13 +149,13 @@
               color: #fb6f03;
             }
             span {
-              font-size: .21rem;
+              font-size: .24rem;
               color: #666;
             }
           }
           &.fr {
             // float: none;
-            font-size: .26rem;
+            font-size: .28rem;
             color: #e21616;
             line-height: .82rem;
             // width: 1.8rem;

nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://10.1.51.125:8080/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : '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/')
 
 module.exports = {
@@ -119,6 +119,12 @@ module.exports = {
     '/user/**': baseUrl,
     '/user**': baseUrl,
     '/login/**': baseUrl,
+    '/newLogin/**': baseUrl,
+    '/mPassWord/page': baseUrl,
+    '/mEmail/page': baseUrl,
+    '/mPhone/page': baseUrl,
+    '/mQuestion/page': baseUrl,
+    '/realNameAuth/page': baseUrl,
     '/register/**': baseUrl,
     '/logout/**': baseUrl,
     '/static/**': baseUrl,

pages/vendor/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="container" style="height: 300px;line-height: 300px;text-align: center;font-size: 24px;">
-    暂未开放卖家中心SSR版
+    
+    <!-- 暂未开放卖家中心SSR版 -->
   </div>
 </template>
 <script>