Commit 66f90fc9ca1e9d4b428a41ae9eb5350077b86caa

Authored by yvan.ni
1 parent 1810d1f7

1. 小程序顶部图片

2. 服务卡的详情
packageA/pages/goodsInfo/goodsInfo.js
@@ -398,6 +398,7 @@ Page({ @@ -398,6 +398,7 @@ Page({
398 'data.image_url': t.data.data.imgUrl, 398 'data.image_url': t.data.data.imgUrl,
399 'data.goods_id': t.data.data.id, 399 'data.goods_id': t.data.data.id,
400 'data.id': t.data.data.id, 400 'data.id': t.data.data.id,
  401 + 'data.sales_sum': t.data.data.sales_sum,
401 }); 402 });
402 403
403 404
packageA/pages/goodsInfo/goodsInfo.wxml
@@ -37,17 +37,13 @@ @@ -37,17 +37,13 @@
37 <view class="co-red"><text class="rel yuan">¥</text>{{filters.toFix(data.shop_price,2)}}</view> 37 <view class="co-red"><text class="rel yuan">¥</text>{{filters.toFix(data.shop_price,2)}}</view>
38 <view class="goods-title"> <view class="goods-name elli">{{data.goods_name}}</view></view> 38 <view class="goods-title"> <view class="goods-name elli">{{data.goods_name}}</view></view>
39 </view> 39 </view>
  40 +
  41 + <view class="goods-num" style="margin-bottom: 10rpx;">
  42 + <view class="sales">销量:{{data.sales_sum}}</view>
  43 + <view class="sales">有效天数:{{data.validDays}}</view>
  44 + </view>
40 45
41 - <view wx:if="{{service_list}}">  
42 - <view class="fs32 c-5" style="margin-bottom: 10rpx;">服务项目信息</view>  
43 - <block wx:for="{{service_list}}">  
44 - <view class="goods-num" style="margin-bottom: 10rpx;">  
45 - <view class="sales">耗时:{{item.timeConsuming}}</view>  
46 - <view class="stock">次数:{{item.frequency}}</view>  
47 - <view class="stock">有效天数:{{data.validDays}}</view>  
48 - </view>  
49 - </block>  
50 - </view> 46 +
51 47
52 </view> 48 </view>
53 </block> 49 </block>
@@ -100,10 +96,28 @@ @@ -100,10 +96,28 @@
100 <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image><text>详情</text> 96 <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image><text>详情</text>
101 </view> 97 </view>
102 </view> 98 </view>
  99 +
  100 + <view wx:if="{{service_list}}">
  101 + <view class="goods-num" style="font-size: 26rpx; background-color: #f6f5f4;">
  102 + <view class="stock">项目名称</view>
  103 + <view class="stock">耗时(分)</view>
  104 + <view class="stock">手工费</view>
  105 + <view class="stock">次数</view>
  106 + </view>
  107 + <block wx:for="{{service_list}}">
  108 + <view class="goods-num" style="margin-bottom: 10rpx;font-size: 22rpx;">
  109 + <view class="stock">{{item.projectName}}</view>
  110 + <view class="stock">{{item.timeConsuming}}</view>
  111 + <view class="stock">{{item.money}}</view>
  112 + <view class="stock">{{item.frequency}}</view>
  113 + </view>
  114 + </block>
  115 + </view>
  116 +
103 <view class="wxParse"> 117 <view class="wxParse">
104 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> 118 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
105 </view> 119 </view>
106 - 120 +
107 </view> 121 </view>
108 122
109 <!-- 推荐商品 --> 123 <!-- 推荐商品 -->
packageA/pages/goodsInfo/goodsInfo.wxss
@@ -2732,4 +2732,5 @@ button.custom-service::after{ @@ -2732,4 +2732,5 @@ button.custom-service::after{
2732 } 2732 }
2733 .quan_price{ 2733 .quan_price{
2734 background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx; 2734 background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx;
2735 -}  
2736 \ No newline at end of file 2735 \ No newline at end of file
  2736 +}
  2737 +.stock{ width: 25%; height: 60rpx; border: 1rpx solid #eee; text-align: center; line-height: 60rpx;}
2737 \ No newline at end of file 2738 \ No newline at end of file
pages/cart/cart/cart.wxml
@@ -2,9 +2,17 @@ @@ -2,9 +2,17 @@
2 <template is="tabBar" data="{{tabBar}}" /> 2 <template is="tabBar" data="{{tabBar}}" />
3 --> 3 -->
4 <!-- 广告图片 --> 4 <!-- 广告图片 -->
  5 +
5 <navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}"> 6 <navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}">
6 <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image> 7 <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
7 </navigator> 8 </navigator>
  9 +
  10 +<navigator bindtap="nav_goto" class="picture" data-url="{{ad_data.ad_weapplink}}" wx:if="{{ad_data}}">
  11 + <image class="picture" src="{{ad_data.ad_code}}"></image>
  12 +</navigator>
  13 +
  14 +
  15 +
8 <view class="container" wx:if="{{requestData.length>0}}"> 16 <view class="container" wx:if="{{requestData.length>0}}">
9 <!-- 购物车商品框架 --> 17 <!-- 购物车商品框架 -->
10 <view class="login-in"> 18 <view class="login-in">