xt / xcx-book · Commits

Go to a project

Commit 2d3d38564896c4b36ecd6e8f85615da9ccdb2949

Authored by wangfan
1 parent a1c8bd9e
build: skipped

C端调整

Inline Side-by-side
Showing 6 changed files with 101 additions and 10 deletions
@@ -3,7 +3,12 @@ Component({ @@ -3,7 +3,12 @@ Component({
3 /** 3 /**
4 * 组件的属性列表 4 * 组件的属性列表
5 */ 5 */
6 - properties: {}, 6 + properties: {
  7 + seller:{
  8 + type:Object,
  9 + value:{}
  10 + }
  11 + },
7 12
8 /** 13 /**
9 * 组件的初始数据 14 * 组件的初始数据
@@ -7,10 +7,41 @@ @@ -7,10 +7,41 @@
7 </view> 7 </view>
8 <view class="slogan">致电商家时，请说明是一键订平台的客户</view> 8 <view class="slogan">致电商家时，请说明是一键订平台的客户</view>
9 <view class="list"> 9 <view class="list">
10 - <view class="item flex-ll">  
11 - <view class="left flex-vc">123213</view> 10 + <view class="item flex-ll" wx:for="{{seller.activity}}">
  11 + <view class="left flex-vc">
  12 + <block wx:if="{{item.type==1}}"><!--//满减-->
  13 + <view class="flex-ll block">
  14 + <view class="min-font">¥</view>
  15 + <view class="flx"></view>
  16 + <view class="max-font">{{item.min_num}}</view>
  17 + </view>
  18 + <view class="info">满{{item.max_num}}立减</view>
  19 + </block>
  20 + <block wx:elif="{{item.type==2}}"><!--//满赠-->
  21 + <view>满赠</view>
  22 + </block>
  23 + <block wx:elif="{{item.type==3}}"><!--//折扣-->
  24 + <view class="flex-ll block">
  25 + <view class="max-font">{{item.min_num}}</view>
  26 + <view class="flx"></view>
  27 + <view class="min-font">折</view>
  28 + </view>
  29 + <view class="info">满{{item.max_num}}立享</view>
  30 + </block>
  31 + <block wx:elif="{{item.type==4}}"><!--//代金券-->
  32 + <view class="flex-ll block">
  33 + <view class="min-font">¥</view>
  34 + <view class="flx"></view>
  35 + <view class="max-font">{{item.min_num}}</view>
  36 + </view>
  37 + <view class="info">{{item.max_num}}元代金券</view>
  38 + </block>
  39 + <block wx:else=""><!--//会员价-->
  40 + <view>会员价</view>
  41 + </block>
  42 + </view>
12 <view class="right flex-vc"> 43 <view class="right flex-vc">
13 - 123321312 44 + {{item.desc}}
14 </view> 45 </view>
15 </view> 46 </view>
16 </view> 47 </view>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 margin-top: 40rpx; 50 margin-top: 40rpx;
51 } 51 }
52 .item .left{ 52 .item .left{
53 - width: 200rpx; 53 + width: 220rpx;
54 height: 190rpx; 54 height: 190rpx;
55 color: #fff; 55 color: #fff;
56 } 56 }
@@ -59,4 +59,28 @@ @@ -59,4 +59,28 @@
59 height: 190rpx; 59 height: 190rpx;
60 margin-left: 50rpx; 60 margin-left: 50rpx;
61 font-size: 28rpx; 61 font-size: 28rpx;
  62 +}
  63 +.item .info{
  64 + font-size: 24rpx;
  65 + height: 34rpx;
  66 + line-height: 34rpx;
  67 +}
  68 +.item .block{
  69 + height: 74rpx;
  70 + align-items: flex-end;
  71 +}
  72 +.item .min-font{
  73 + font-size: 32rpx;
  74 + height: 32rpx;
  75 + line-height: 32rpx;
  76 +}
  77 +.item .max-font{
  78 + font-size: 52rpx;
  79 + height: 52rpx;
  80 + line-height: 52rpx;
  81 +}
  82 +.item .flx{
  83 + height: 52rpx;
  84 + line-height: 52rpx;
  85 + width: 10rpx;
62 } 86 }
@@ -48,15 +48,19 @@ @@ -48,15 +48,19 @@
48 <view class="activity-left"> 48 <view class="activity-left">
49 <view class="activity-first flex-ll" style="align-items: flex-start"> 49 <view class="activity-first flex-ll" style="align-items: flex-start">
50 <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image> 50 <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
51 - {{seller.activity[0].desc}} 51 + <view class="flex-cc discount" wx:for="{{seller.activity}}" wx:if="{{index<2}}">
  52 + <view class="discount-left"></view>
  53 + <view class="discount-text">{{item.title}}</view>
  54 + <view class="discount-right"></view>
  55 + </view>
52 </view> 56 </view>
53 </view> 57 </view>
54 <view class="activity-right flex-rr Semibold"> 58 <view class="activity-right flex-rr Semibold">
55 - <view>更多</view> 59 + <view></view>
56 <view class="more"></view> 60 <view class="more"></view>
57 </view> 61 </view>
58 </view> 62 </view>
59 - <view class="activity-text" wx:if="{{seller.activity[1]}}"> 63 + <view class="activity-text">
60 该优惠仅适用于一键订平台预订客户 64 该优惠仅适用于一键订平台预订客户
61 </view> 65 </view>
62 </view> 66 </view>
@@ -142,4 +146,4 @@ @@ -142,4 +146,4 @@
142 </view> 146 </view>
143 <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone">拨打电话预定</as> 147 <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone">拨打电话预定</as>
144 <getpos bindpos="onpos" id="getpos"></getpos> 148 <getpos bindpos="onpos" id="getpos"></getpos>
145 -<discount id="discount"></discount>  
  149 +<discount id="discount" seller="{{seller}}"></discount>
@@ -297,4 +297,31 @@ @@ -297,4 +297,31 @@
297 margin-left: 20rpx; 297 margin-left: 20rpx;
298 margin-right: 20rpx; 298 margin-right: 20rpx;
299 height: 24rpx; 299 height: 24rpx;
  300 +}
  301 +.discount{
  302 + margin-right: 20rpx;
  303 +}
  304 +.discount:last-child{
  305 + margin-right: 0;
  306 +}
  307 +.discount .discount-left{
  308 + background-image: url("http://qn.colorcun.com/reserve/images/%E5%B7%A6%E8%BE%B9.png");
  309 + width: 12rpx;
  310 + height: 40rpx;
  311 + background-size: 100% 100%;
  312 +}
  313 +.discount .discount-text{
  314 + background-image: url("http://qn.colorcun.com/reserve/images/%E4%B8%AD%E9%97%B4.jpg");
  315 + height: 40rpx;
  316 + min-width: 100rpx;
  317 + background-size: 100% 100%;
  318 + line-height: 40rpx;
  319 + color:#F8E6C4;
  320 + padding: 0 10rpx;
  321 +}
  322 +.discount .discount-right{
  323 + background-image: url("http://qn.colorcun.com/reserve/images/%E5%8F%B3%E8%BE%B9.png");
  324 + width: 12rpx;
  325 + height: 40rpx;
  326 + background-size: 100% 100%;
300 } 327 }
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 "list": [] 43 "list": []
44 }, 44 },
45 "miniprogram": { 45 "miniprogram": {
46 - "current": 51, 46 + "current": 39,
47 "list": [ 47 "list": [
48 { 48 {
49 "id": 0, 49 "id": 0,