Merge branch 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program

* 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program:
  details

pages/details/details.js

@@ -10,6 +10,7 @@ Page({
     imgUrls: [],
     datas: {},
     getOneSummary: [],
+    webViewUrl: '',
     indicatorDots: true,
     vertical: false,
     autoplay: true,
@@ -24,6 +25,7 @@ Page({
     this.getDatas(options.goods_id)
   },
   getDatas(goods_id) {
+    let webViewUrl = `https://passport.lrlz.com/mobile/index.php?act=goods_common&op=detail&goods_id=${goods_id}&client_type=ios`
     var self = this
     getReq({
       act: 'goods_common',
@@ -36,13 +38,15 @@ Page({
           return item.goods_id == goods_id
         })
         console.log('---')
-        console.log(getOneSummary)
-        console.log(res.datas)
+        
+        console.log(res.datas.common_info.attrs)
+        console.log(getOneSummary[0])
 
         self.setData({
           datas: res.datas,
-          getOneSummary,
-          imgUrls: res.datas.common_info.images
+          getOneSummary: getOneSummary[0],
+          imgUrls: res.datas.common_info.images,
+          webViewUrl
         })
         
       }

pages/details/details.wxml

@@ -11,8 +11,8 @@
     <view class="comment_swiper">
       <navigator>
         <image src="{{datas.comment.member_avatar}}"></image>
-        <text class="nickname">{{datas.comment.nickname}}:</text>
-        <text class="comment_content">{{datas.comment.content}}</text>
+        <text class="nickname" decode="{{true}}">&nbsp;&nbsp;{{datas.comment.nickname}}:</text>
+        <text class="comment_content one_line_hidden">{{datas.comment.content}}</text>
       </navigator>
     </view>
     <view class="details_collection">已收藏人数 {{getOneSummary.goods_collect}}</view>
@@ -24,29 +24,33 @@
       <view class="one_line_hidden col333 f28">{{getOneSummary.goods_jingle}}</view>
     </view>
     <view class="bonus_price flex_center">
-      <text>￥87.5</text>
-      <text class="goods_price">天猫价 125.00</text>
+      <text decode="{{true}}">￥{{getOneSummary['act_type'] == 0?getOneSummary.bonus_price:getOneSummary['goods_promotion_price']}}&nbsp;&nbsp;</text>
+      <text class="goods_price" decode="{{true}}">天猫价&nbsp;{{getOneSummary.goods_price}}</text>
+    </view>
+
+    <view class="goods_desc">
+      <text wx:if="{{getOneSummary['act_type'] == 0}}" decode="{{true}}" style="display:inline">红包抵{{getOneSummary.goods_price - getOneSummary.bonus_price}}元&nbsp;/</text>
+      <text decode="{{true}}" style="display:inline">已售{{getOneSummary.goods_salenum}}件&nbsp;/&nbsp;库存{{getOneSummary.goods_storage}}件</text>
     </view>
-    <view class="goods_desc">红包抵37.50元 / 已售35件 / 库存16件</view>
   </view>
 
-  <view class="congratulation_text">恭喜，您的红包已经达到员工内买价格～</view>
+  <view wx:if="{{getOneSummary['act_type'] == 0}}" class="congratulation_text one_line_hidden">{{getOneSummary.gap_desc}}</view>
   <view class="details_stamps">
     <view class="stamps_item">
-      <image class="goods_logo" src="https://passport.lrlz.com/data/upload/shop/country/faguo.png"></image>
-      法国品牌
+      <image class="goods_logo" src="{{getOneSummary.brand_country_logo}}"></image>
+      {{getOneSummary.brand_country}}品牌
     </view>
     <view class="stamps_item">
-      <image class="goods_logo" src="https://passport.lrlz.com/data/upload/shop/country/faguo.png"></image>
-      法国品牌
+      <image class="goods_logo" src="../../image/small_logo.png"></image>
+      熊猫美妆自营
     </view>
     <view class="stamps_item">
-      <image class="goods_logo" src="https://passport.lrlz.com/data/upload/shop/country/faguo.png"></image>
-      法国品牌
+      <image class="goods_logo" src="../../image/authorize_icon.png"></image>
+      {{getOneSummary.brand_author_desc}}
     </view>
     <view class="stamps_item">
-      <image class="goods_logo" src="https://passport.lrlz.com/data/upload/shop/country/faguo.png"></image>
-      法国品牌
+      <image class="goods_logo" src="../../image/seven_icon.png"></image>
+      7天无理由退货
     </view>
   </view>
 
@@ -54,7 +58,7 @@
 
   <view class="comments_block">
     <view>用户评价
-      <text class="colef524d">(33)</text>
+      <text class="colef524d">({{datas.common_info.comments}})</text>
     </view>
     <view class="f24">查看全部评论 > </view>
   </view>
@@ -62,49 +66,32 @@
   <view class="comment">
     <view class="user">
       <view class="member_avatar f_left">
-        <image src="http://thirdwx.qlogo.cn/mmopen/vi_32/ZTKGY5ONARyDibLfHNI4IB0WrNqQrqTAiaP35IicoatNAyOcePn4d1Ynmd2l2mTSMsGfHHK2vGFGxnibqXRVHRgBLg/132">
+        <image src="{{datas.comment.member_avatar}}">
         </image>
       </view>
-      <view class="f28 f_left">菜鸟小仙女🍼</view>
+      <view class="f28 f_left">{{datas.comment.nickname}}</view>
       <view class="scores f_right">
         <view>
-        <image class="star" src="../../image/star.png"></image>
-        <image class="star" src="../../image/star.png"></image>
-        <image class="star" src="../../image/star.png"></image>
-        <image class="star" src="../../image/star.png"></image>
-        <image class="star" src="../../image/star.png"></image>
-          <!-- <text class="star"></text>
-          <text class="star"></text>
-          <text class="star"></text>
-          <text class="star"></text>
-          <text class="star"></text> -->
+          <image class="star" src="../../image/star.png" wx:for="{{datas.comment.scores}}" wx:key="*this"></image>
         </view>
-        <view class="comment_time">2018.3.14</view>
+        <view class="comment_time">{{datas.comment.comment_time}}</view>
       </view>
     </view>
-    <view class="spec">规格:M402</view>
-    <view class="content">还可以</view>
+    <view class="spec">规格:{{datas.comment.goods_spec}}</view>
+    <view class="content">{{datas.comment.content}}</view>
     <view class="content_img"></view>
   </view>
 
   <view class="place-bac247"></view>
 
   <view class="comments_block">
-    <view>产品参数</view>   
+    <view>产品参数</view>
   </view>
 
   <view class="vux-1px-b">
-    <view class="attr_list_item">
-      <text>功效</text>
-      <text class="col333">华丽着色</text>
-    </view>
-    <view class="attr_list_item">
-      <text>功效</text>
-      <text class="col333">华丽着色</text>
-    </view>
-    <view class="attr_list_item">
-      <text>功效</text>
-      <text class="col333">华丽着色</text>
+    <view class="attr_list_item" wx:for="{{datas.common_info.attrs}}" wx:key="*this">
+      <text>{{item.name}}</text>
+      <text class="col333">{{item.value}}</text>
     </view>
   </view>
 

pages/details/details.wxss

@@ -18,11 +18,21 @@
   font-size: 24rpx;
 }
 
+ .comment_content {
+  max-width: 220rpx;
+  display: inline-block;
+  vertical-align: middle;
+} 
+.nickname {
+  display: inline-block;
+  vertical-align: middle;
+}
 .comment_swiper image {
   width: 40rpx;
   height: 40rpx;
   border-radius: 50rpx;
   display: inline-block;
+  vertical-align: middle;
 }
 
 .details_collection {
@@ -69,13 +79,13 @@
 
 .goods_desc {
   font-size: 24rpx;
-  display: -webkit-box;
+   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   overflow: hidden;
   color: #7e7e7e;
   min-height: 56rpx;
-  line-height: 28rpx;
+  line-height: 28rpx; 
 }
 
 .congratulation_text {
@@ -90,7 +100,7 @@
   content: " ";
   position: absolute;
   left: 0;
-  bottom: 0;
+  bottom: 1rpx;
   right: 0;
   height: 1rpx;
   border-bottom: 1px solid #c7c7c7;
@@ -149,6 +159,7 @@
   position: absolute;
   bottom: 0;
   right: 0;
+  left: 0;
   width: 726px;
   height: 1px;
   border-bottom: 1px solid #c7c7c7;