Authored by Aiden Xu

Merge branch 'feature/product' into develop

1 <template> 1 <template>
  2 + <top-nav></top-nav>
2 <show-box :is-first="true"> 3 <show-box :is-first="true">
3 <image-carousel :goods="entity.goodsList"></image-carousel> 4 <image-carousel :goods="entity.goodsList"></image-carousel>
4 <div class="title-box"> 5 <div class="title-box">
5 <h1>{{entity.productName}}</h1> 6 <h1>{{entity.productName}}</h1>
6 -  
7 <i class="price" v-if="entity.productPriceBo.marketPrice > entity.productPriceBo.salesPrice" 7 <i class="price" v-if="entity.productPriceBo.marketPrice > entity.productPriceBo.salesPrice"
8 :class="{'strike-through': entity.productPriceBo.salesPrice > 0}">{{entity.productPriceBo.formatMarketPrice}}</i> 8 :class="{'strike-through': entity.productPriceBo.salesPrice > 0}">{{entity.productPriceBo.formatMarketPrice}}</i>
9 9
@@ -214,6 +214,7 @@ @@ -214,6 +214,7 @@
214 font-size: 28px; 214 font-size: 28px;
215 color: #b0b0b0; 215 color: #b0b0b0;
216 } 216 }
  217 +
217 } 218 }
218 219
219 .separator { 220 .separator {
@@ -234,6 +235,7 @@ @@ -234,6 +235,7 @@
234 border: none; 235 border: none;
235 border-top: 1px solid #eee; 236 border-top: 1px solid #eee;
236 } 237 }
  238 +
237 } 239 }
238 240
239 i.info { 241 i.info {
@@ -275,6 +277,7 @@ @@ -275,6 +277,7 @@
275 &.highlight { 277 &.highlight {
276 color: #d0021b; 278 color: #d0021b;
277 } 279 }
  280 +
278 } 281 }
279 } 282 }
280 283
@@ -327,6 +330,7 @@ @@ -327,6 +330,7 @@
327 line-height: 66px; 330 line-height: 66px;
328 text-align: center; 331 text-align: center;
329 } 332 }
  333 +
330 } 334 }
331 335
332 .wash-condition { 336 .wash-condition {
@@ -353,6 +357,7 @@ @@ -353,6 +357,7 @@
353 color: #c7c7c7; 357 color: #c7c7c7;
354 min-width: 100px; 358 min-width: 100px;
355 } 359 }
  360 +
356 } 361 }
357 362
358 .model-avatar { 363 .model-avatar {
@@ -424,7 +429,8 @@ @@ -424,7 +429,8 @@
424 components: { 429 components: {
425 imageCarousel: require('./image-carousel.vue'), 430 imageCarousel: require('./image-carousel.vue'),
426 featureSelector: require('component/product/feature-selector.vue'), 431 featureSelector: require('component/product/feature-selector.vue'),
427 - showBox: require('./show-box.vue') 432 + showBox: require('./show-box.vue'),
  433 + topNav: require('./top-nav.vue'),
428 }, 434 },
429 methods: { 435 methods: {
430 /** 436 /**
  1 +<template>
  2 + <div class="top-nav">
  3 + <a class="left" href="javascript:alert('TODO');">
  4 + <span class="icon icon-left"></span>
  5 + </a>
  6 +
  7 + <a class="right" href="javascript:alert('TODO');">
  8 + <span class="icon icon-right"></span>
  9 + </a>
  10 + </div>
  11 +</template>
  12 +<style>
  13 + .top-nav {
  14 + position: fixed;
  15 + z-index: 10;
  16 + font-size: 40px;
  17 + padding: 30px;
  18 + width: 100%;
  19 +
  20 + .left {
  21 + float: left;
  22 + }
  23 +
  24 + .right {
  25 + float: right;
  26 + }
  27 + }
  28 +</style>
  29 +<script></script>