From 66f90fc9ca1e9d4b428a41ae9eb5350077b86caa Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 27 Apr 2021 15:16:55 +0800
Subject: [PATCH] 1. 小程序顶部图片 2. 服务卡的详情

---
 packageA/pages/goodsInfo/goodsInfo.js   |  1 +
 packageA/pages/goodsInfo/goodsInfo.wxml | 36 +++++++++++++++++++++++++-----------
 packageA/pages/goodsInfo/goodsInfo.wxss |  3 ++-
 pages/cart/cart/cart.wxml               |  8 ++++++++
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index c40ef4c..7260ba1 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -398,6 +398,7 @@ Page({
 						'data.image_url': t.data.data.imgUrl,
 						'data.goods_id': t.data.data.id,
 						'data.id': t.data.data.id,
+						'data.sales_sum': t.data.data.sales_sum,
 					});		
 								
 					
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index e918429..dd454e5 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -37,17 +37,13 @@
 				<view class="co-red"><text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
                 <view class="goods-title"> <view class="goods-name elli">{{data.goods_name}}</view></view>
             </view>
+			
+			<view class="goods-num" style="margin-bottom: 10rpx;">
+			  <view class="sales">销量：{{data.sales_sum}}</view>
+			  <view class="sales">有效天数：{{data.validDays}}</view>
+			</view>
 
-            <view  wx:if="{{service_list}}">
-				<view class="fs32 c-5" style="margin-bottom: 10rpx;">服务项目信息</view>	
-				<block wx:for="{{service_list}}">
-				   <view class="goods-num" style="margin-bottom: 10rpx;">
-				   <view class="sales">耗时：{{item.timeConsuming}}</view>
-				   <view class="stock">次数：{{item.frequency}}</view>					
-				   <view class="stock">有效天数：{{data.validDays}}</view>
-				   </view>
-			    </block>							
-            </view>
+          
           
           </view>
         </block>
@@ -100,10 +96,28 @@
               <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image><text>详情</text>
             </view>
            </view> 
+		   	   
+		   <view  wx:if="{{service_list}}">
+		       <view class="goods-num" style="font-size: 26rpx; background-color: #f6f5f4;">
+		   	    <view class="stock">项目名称</view>
+		   	    <view class="stock">耗时(分)</view>					
+		   	    <view class="stock">手工费</view>					
+		   	    <view class="stock">次数</view>
+		   	</view>					
+		   	<block wx:for="{{service_list}}">
+		   	   <view class="goods-num" style="margin-bottom: 10rpx;font-size: 22rpx;">
+		   		   <view class="stock">{{item.projectName}}</view>
+		   		   <view class="stock">{{item.timeConsuming}}</view>					
+		   		   <view class="stock">{{item.money}}</view>					
+		   		   <view class="stock">{{item.frequency}}</view>
+		   	   </view>
+		       </block>							
+		   </view>
+		   
 		   <view class="wxParse">
 		     <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
 		   </view>
-           
+          
         </view>
 
         <!-- 推荐商品 -->
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss
index fb9b363..6173baa 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/goodsInfo/goodsInfo.wxss
@@ -2732,4 +2732,5 @@ button.custom-service::after{
 } 
 .quan_price{
 	background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx;
-}
\ No newline at end of file
+}
+.stock{ width: 25%; height: 60rpx; border: 1rpx solid #eee; text-align: center; line-height: 60rpx;}
\ No newline at end of file
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 31c7546..a00cb00 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -2,9 +2,17 @@
 <template is="tabBar" data="{{tabBar}}" />
  -->
 <!-- 广告图片 -->
+
 <navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}">
   <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
 </navigator>
+
+<navigator bindtap="nav_goto" class="picture" data-url="{{ad_data.ad_weapplink}}" wx:if="{{ad_data}}">
+  <image class="picture" src="{{ad_data.ad_code}}"></image>
+</navigator>
+
+
+
 <view class="container" wx:if="{{requestData.length>0}}">
   <!-- 购物车商品框架 -->
   <view class="login-in">
--
libgit2 0.21.4