Merge branch 'feature/product' into develop

@@ -157,6 +157,7 @@
     <show-box :is-last="true">
     <show-box :is-last="true">
         <h2>商品详情</h2>
         <h2>商品详情</h2>
         <i>DETAILS</i>
         <i>DETAILS</i>
+
         <p v-if="entity.brand && entity.brand.brandIntro">
         <p v-if="entity.brand && entity.brand.brandIntro">
             {{{entity.brand.brandIntro}}}
             {{{entity.brand.brandIntro}}}
         </p>
         </p>
@@ -164,11 +165,12 @@
         <p v-if="entity.brand && intro.productIntroBo">
         <p v-if="entity.brand && intro.productIntroBo">
             {{{intro.productIntroBo.productIntro}}}
             {{{intro.productIntroBo.productIntro}}}
         </p>
         </p>
+
     </show-box>
     </show-box>
 
 
     <div class="control-box">
     <div class="control-box">
         <button class="button control-button" style="flex: 1">
         <button class="button control-button" style="flex: 1">
-            <a href="javascript:void(0);" @click="yoho.goShopingCart()">
+            <a href="javascript:void(0);" @click="yoho.goShopingCart()" style="position: relative;">
                 <i class="icon icon-bag"></i>
                 <i class="icon icon-bag"></i>
                 <span v-if="cartCount > 0" class="badge badge-tr">{{cartCount}}</span>
                 <span v-if="cartCount > 0" class="badge badge-tr">{{cartCount}}</span>
             </a>
             </a>
@@ -218,7 +220,6 @@
             font-size: 28px;
             font-size: 28px;
             color: #b0b0b0;
             color: #b0b0b0;
         }
         }
-
     }
     }
 
 
     .separator {
     .separator {
@@ -420,7 +421,7 @@
                         buyNumber: 1
                         buyNumber: 1
                     }).then((result)=> {
                     }).then((result)=> {
                         if (yoho.goShopingKey && result.data.shopping_key) {
                         if (yoho.goShopingKey && result.data.shopping_key) {
-                            yoho.goShopingKey(result.data.shopping_key);
+                            yoho.goShopingKey({shoppingKey: result.data.shopping_key});
                         }
                         }
 
 
                         // TODO: 库存不足 后台暂未实现
                         // TODO: 库存不足 后台暂未实现

@@ -10,6 +10,7 @@
         border-top: 1px solid #eee;
         border-top: 1px solid #eee;
         border-bottom: 1px solid #eee;
         border-bottom: 1px solid #eee;
         padding: 30px;
         padding: 30px;
+        word-wrap: break-word;
 
 
         img {
         img {
             max-width: 100%;
             max-width: 100%;