Merge branch 'master' of http://113.105.137.151:22280/lixy/vue-ssr

assets/main.css

@@ -2,6 +2,7 @@ body {
   background: #f2f2f2;
   height: 100%;
   width: 100%;
+  min-width: 1120px;
 }
 #newBridge .nb-middle{
   display: none !important;
@@ -72,6 +73,7 @@ body {
 .main-container{
   margin-top:120px;
   min-height: 600px;
+  min-width: 1120px;
 }
 
 a{

components/footer.vue

@@ -70,9 +70,8 @@
   }
 
   .footer-scan img{
-    width: 100px;
-    height: 100px;
-    padding: 5px;
+    width: 120px;
+    margin: 5px;
   }
   .footer-scan:last-child{
     border: none;

env.js

 module.exports = {
   dev: {
     MODE: 'development',
-    ENV_API: 'https://xxtest.upyuns.com'   //测试服务器地址
+    ENV_API: 'https://xxtest.upyuns.com',   //测试服务器地址
+    ROUTER_PATH:"/"
+  },
+  test: {
+    MODE: 'test',
+    ENV_API: 'https://xxtest.upyuns.com',   //测试服务器地址
+    ROUTER_PATH:"/rvwebsite/"
   },
   pro: {
     MODE: 'production',
-    ENV_API: 'https://mgmt.dfangche.com'  // 正式服务器地址
+    ENV_API: 'https://mgmt.dfangche.com',  // 正式服务器地址
+    ROUTER_PATH:"/"
   }
 }
\ No newline at end of file

pages/activityList/_id.vue

@@ -137,7 +137,7 @@
     width: 100%;
   }
   .content-detail .cc-title{
-    padding: 5px;
+    margin: 20px;
   }
   .swiper-wrapper-thu{
     /*max-width: 293px;*/