From 4756f0168f074b437848ec2d8f36f0797a2c9ffc Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Thu, 11 Jul 2019 11:06:39 +0800
Subject: [PATCH] =?UTF-8?q?chore[litemall-vue]:=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-vue/src/views/items/detail/index.vue | 109 ++++++++----------
 1 file changed, 50 insertions(+), 59 deletions(-)

diff --git a/litemall-vue/src/views/items/detail/index.vue b/litemall-vue/src/views/items/detail/index.vue
index f93b04e2..81e413fc 100755
--- a/litemall-vue/src/views/items/detail/index.vue
+++ b/litemall-vue/src/views/items/detail/index.vue
@@ -36,7 +36,7 @@
       :goods="skuGoods"
       :goodsId="goods.info.id"
       @buy-clicked="buyGoods"
-      @add-cart="addCart"    
+      @add-cart="addCart"
     />
     <van-popup v-model="propsPopup" position="bottom">
       <popup-props :propsStr="props_str"></popup-props>
@@ -83,13 +83,13 @@ export default {
       goods: {
         userHasCollect: 0,
         info: {
-          gallery:[]
+          gallery: []
         }
       },
       sku: {
         tree: [],
         list: [],
-        price: '1.00', // 默认价格（单位元）
+        price: '1.00' // 默认价格（单位元）
       },
       skuGoods: {
         // 商品标题
@@ -109,8 +109,7 @@ export default {
     };
   },
 
-
-computed: {
+  computed: {
     props_str() {
       let props_arr = [];
       _.each(this.goods.attribute, json => {
@@ -129,17 +128,14 @@ computed: {
       this.showSku = true;
     },
     initData() {
-      goodsDetail({id: this.itemId}).then(
-        res => {
-          this.goods = res.data.data;
-          this.skuAdapter();
-        }
-      );
+      goodsDetail({ id: this.itemId }).then(res => {
+        this.goods = res.data.data;
+        this.skuAdapter();
+      });
 
       cartGoodsCount().then(res => {
         this.cartInfo = res.data.data;
       });
-
     },
     toCart() {
       this.$router.push({
@@ -147,18 +143,16 @@ computed: {
       });
     },
     addCollect() {
-      collectAddOrDelete({valueId: this.itemId, type: 0}).then(res => {
-        if(this.goods.userHasCollect === 1){
-          this.goods.userHasCollect = 0
-        }
-        else{
-          this.goods.userHasCollect = 1
+      collectAddOrDelete({ valueId: this.itemId, type: 0 }).then(res => {
+        if (this.goods.userHasCollect === 1) {
+          this.goods.userHasCollect = 0;
+        } else {
+          this.goods.userHasCollect = 1;
           this.$toast({
             message: '收藏成功',
             duration: 1500
-        });          
+          });
         }
-
       });
     },
     getProductId(s1, s2) {
@@ -169,8 +163,7 @@ computed: {
         _.each(specification.valueList, specValue => {
           if (specValue.id === s1) {
             s1_name = specValue.value;
-          }
-          else if (specValue.id === s2) {
+          } else if (specValue.id === s2) {
             s2_name = specValue.value;
           }
         });
@@ -216,18 +209,16 @@ computed: {
           message: '目前仅支持两规格',
           duration: 1500
         });
-        return
-      }
-      else if (_.has(data.selectedSkuComb, 's2')) {
+        return;
+      } else if (_.has(data.selectedSkuComb, 's2')) {
         params.productId = this.getProductId(
           data.selectedSkuComb.s1,
           data.selectedSkuComb.s2
         );
+      } else {
+        params.productId = this.getProductIdByOne(data.selectedSkuComb.s1);
       }
-      else {
-        params.productId = this.getProductIdByOne(data.selectedSkuComb.s1)
-      }
-     cartAdd(params).then(() => {
+      cartAdd(params).then(() => {
         this.cartInfo = this.cartInfo + data.selectedNum;
         this.$toast({
           message: '已添加至购物车',
@@ -248,22 +239,20 @@ computed: {
           message: '目前仅支持两规格',
           duration: 1500
         });
-        return
-      }
-      else if (_.has(data.selectedSkuComb, 's2')) {
+        return;
+      } else if (_.has(data.selectedSkuComb, 's2')) {
         params.productId = this.getProductId(
           data.selectedSkuComb.s1,
           data.selectedSkuComb.s2
         );
+      } else {
+        params.productId = this.getProductIdByOne(data.selectedSkuComb.s1);
       }
-      else {
-        params.productId = this.getProductIdByOne(data.selectedSkuComb.s1)
-      }
-     cartFastAdd(params).then(res => {
-      let cartId = res.data.data;
-      setLocalStorage({CartId: cartId})
-      that.showSku = false;
-        this.$router.push({ name: 'placeOrderEntity'});
+      cartFastAdd(params).then(res => {
+        let cartId = res.data.data;
+        setLocalStorage({ CartId: cartId });
+        that.showSku = false;
+        this.$router.push({ name: 'placeOrderEntity' });
       });
     },
     skuAdapter() {
@@ -284,23 +273,23 @@ computed: {
       this.skuGoods = {
         title: this.goods.info.name,
         picture: this.goods.info.picUrl
-      }
+      };
     },
     setSkuList() {
       var sku_list = [];
-        _.each(this.goods.productList, v => {
-            var sku_list_obj = {};
-            _.each(v.specifications, (specificationName, index) => {
-              sku_list_obj[
-                's' + (~~index + 1)
-              ] = this.findSpecValueIdByName(specificationName);
-            });
-          
-          sku_list_obj.price = v.price * 100;
-          sku_list_obj.stock_num = v.number;
-          sku_list.push(sku_list_obj);
+      _.each(this.goods.productList, v => {
+        var sku_list_obj = {};
+        _.each(v.specifications, (specificationName, index) => {
+          sku_list_obj['s' + (~~index + 1)] = this.findSpecValueIdByName(
+            specificationName
+          );
         });
-    
+
+        sku_list_obj.price = v.price * 100;
+        sku_list_obj.stock_num = v.number;
+        sku_list.push(sku_list_obj);
+      });
+
       return sku_list;
     },
     findSpecValueIdByName(name) {
@@ -312,7 +301,7 @@ computed: {
             return;
           }
         });
-        if(id !== 0){
+        if (id !== 0) {
           return;
         }
       });
@@ -329,7 +318,7 @@ computed: {
             id: vv.id,
             name: vv.value,
             imUrl: vv.picUrl
-          })
+          });
         });
 
         specifications.push({
@@ -341,7 +330,7 @@ computed: {
 
       return specifications;
     }
-  },    
+  },
 
   components: {
     [Popup.name]: Popup,
@@ -351,9 +340,9 @@ computed: {
     [GoodsAction.name]: GoodsAction,
     [GoodsActionButton.name]: GoodsActionButton,
     [GoodsActionIcon.name]: GoodsActionIcon,
-    [popupProps.name]: popupProps    
+    [popupProps.name]: popupProps
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -402,8 +391,10 @@ computed: {
 
 .item_desc {
   background-color: #fff;
-  p {
+  /deep/ p {
     padding: 0 10px;
+    margin-block-start: 0 !important;
+    margin-block-end: 0 !important;
   }
   /deep/ img {
     max-width: 100%;