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

assets/main.css

@@ -146,11 +146,24 @@ h2{
 .new-item:hover, .activity-item:hover, .content-new:hover, .vehicle-item:hover, .item-c:hover{
   box-shadow: 0 0 5px #ccc;
 }
+.gallery-thumbs-box img{
+  cursor: pointer;
+}
 .total-div{
   margin: 20px 0;
   background: #fff;
   padding: 10px;
 }
+.vehicle-desc{
+  height: 100px;
+  color: #666;
+  font-size: 14px;
+}
+.vehicle-item .config{
+  margin-right: 20px;
+  color: #666;
+  font-size: 12px;
+}
 .buttonDetails:hover{
   background: #1D9D87 !important;
 }

package.json

 {
-  "name": "yu",
+  "name": "li",
   "version": "1.0.0",
   "description": "Nuxt.js project",
-  "author": "yutao <haiyan.xu.vip@gmail.com>",
+  "author": "lixy <929545354@qq.com>",
   "private": true,
-  "nuxt": {
-    "host": "10.1.37.172",
-    "port": "3000"
-  },
   "scripts": {
-    "test": "nuxt --hostname 10.1.37.172 --port 3333",
+    "test": "nuxt --hostname 10.5.52.3 --port 3000",
+    "lxy": "nuxt --hostname 10.1.37.172 --port 3333",
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",

pages/vehicle.vue

@@ -25,7 +25,11 @@
             <img :src="item.coverPic" alt="房车租赁" style="width:30%;height:100%;" />
             <div style="margin-left: 20px;width: 50%;">
               <h2 style="font-size: 18px;margin:10px 0">{{ item.name }}</h2>
-              <div>{{item.keyword}}</div>
+              <div class="vehicle-desc">{{item.intro}}</div>
+              <div class="flex-aic">
+                <span class="flex-aic config" v-for="iitem in item.uccnCataList" :key="iitem.id"><img src="../assets/images/license.png"/>{{iitem.name}}</span>
+                <nuxt-link :to="item.link"><span class="more-set">+更多配置</span></nuxt-link>
+              </div>
             </div>
             <nuxt-link :to="item.link" class="flex-aic">
               <button class="buttonDetails">租车详情</button>
@@ -160,10 +164,16 @@
   .clearfix {
     *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
   }
-  .wrap {
-    width: 1200px;
-    margin: 0 auto;
-    background: #fff;
+ .more-set:hover{
+   border:1px solid #1bbb9f;
+   color: #1bbb9f;
+ }
+  .more-set{
+    border: 1px solid #999;
+    padding: 3px 10px;
+    color: #999;
+    font-size: 12px;
+    cursor: pointer;
   }
   .banner {
     /* background-color: #fff; */