Commit 79dad6347c3d1f8bc8d92fa01876c8e289bcef40

Authored by pengye
1 parent 1d019c86

优惠券券说明、充值备注换行显示、充值活动名称文字多显示

@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 券说明 87 券说明
88 </view> 88 </view>
89 </view> 89 </view>
90 - <view class="explain_news"><text>{{detail.explain}}</text></view> 90 + <text class="explain_news">{{detail.explain}}</text>
91 <view class="hei"></view> 91 <view class="hei"></view>
92 </scroll-view> 92 </scroll-view>
93 <view class="fixed_box"> 93 <view class="fixed_box">
@@ -83,6 +83,7 @@ page { @@ -83,6 +83,7 @@ page {
83 font-family: PingFang SC; 83 font-family: PingFang SC;
84 font-size: 24rpx; 84 font-size: 24rpx;
85 line-height: 48rpx; 85 line-height: 48rpx;
  86 + display: block;
86 } 87 }
87 88
88 .fixed_box { 89 .fixed_box {
@@ -64,5 +64,5 @@ @@ -64,5 +64,5 @@
64 券说明 64 券说明
65 </view> 65 </view>
66 </view> 66 </view>
67 - <view class="recharge_news">{{detail.explain}}</view> 67 + <text class="recharge_news">{{detail.explain}}</text>
68 </view> 68 </view>
@@ -61,4 +61,5 @@ @@ -61,4 +61,5 @@
61 font-family: PingFang SC; 61 font-family: PingFang SC;
62 font-size: 24rpx; 62 font-size: 24rpx;
63 line-height: 48rpx; 63 line-height: 48rpx;
  64 + display: block;
64 } 65 }
1 <!--pack-activity/pack/vipRecharge.wxml--> 1 <!--pack-activity/pack/vipRecharge.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 <nav>{{opt.name}}</nav> 3 <nav>{{opt.name}}</nav>
4 -<view class="wrap"> 4 +<view class="wrapBox">
5 <view class="info"> 5 <view class="info">
6 <view class="info_left font32r"> 6 <view class="info_left font32r">
7 活动名称 7 活动名称
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 备注 100 备注
101 </view> 101 </view>
102 </view> 102 </view>
103 - <view class="explain_news">{{detail.explain}}</view> 103 + <text class="explain_news">{{detail.explain}}</text>
104 </view> 104 </view>
105 <view class="fixed_box"> 105 <view class="fixed_box">
106 <button class="font32r btns" bindtap="submitOrder">提交充值 106 <button class="font32r btns" bindtap="submitOrder">提交充值
@@ -3,12 +3,15 @@ page { @@ -3,12 +3,15 @@ page {
3 background-color: #fff; 3 background-color: #fff;
4 } 4 }
5 5
  6 +.wrapBox{
  7 + padding-bottom: 180rpx;
  8 +}
  9 +
6 .info { 10 .info {
7 padding: 28rpx 32rpx 28rpx 0; 11 padding: 28rpx 32rpx 28rpx 0;
8 box-sizing: border-box; 12 box-sizing: border-box;
9 display: flex; 13 display: flex;
10 justify-content: space-between; 14 justify-content: space-between;
11 - align-items: center;  
12 margin-left: 32rpx; 15 margin-left: 32rpx;
13 border-bottom: 2rpx solid #E7E7E7; 16 border-bottom: 2rpx solid #E7E7E7;
14 } 17 }
@@ -21,6 +24,8 @@ page { @@ -21,6 +24,8 @@ page {
21 } 24 }
22 25
23 .info_left { 26 .info_left {
  27 + flex-shrink: 0;
  28 + margin-right: 20rpx;
24 color: #515151; 29 color: #515151;
25 font-family: PingFang SC; 30 font-family: PingFang SC;
26 } 31 }
@@ -28,6 +33,7 @@ page { @@ -28,6 +33,7 @@ page {
28 .info_right { 33 .info_right {
29 display: flex; 34 display: flex;
30 align-items: center; 35 align-items: center;
  36 + text-align: right;
31 } 37 }
32 38
33 39
@@ -42,6 +48,7 @@ page { @@ -42,6 +48,7 @@ page {
42 font-family: PingFang SC; 48 font-family: PingFang SC;
43 font-size: 24rpx; 49 font-size: 24rpx;
44 line-height: 48rpx; 50 line-height: 48rpx;
  51 + display: block;
45 } 52 }
46 53
47 .fixed_box { 54 .fixed_box {
@@ -109,10 +109,10 @@ @@ -109,10 +109,10 @@
109 <image src="https://nosqn.colorcun.com/evaluate2.png" mode="" /> 109 <image src="https://nosqn.colorcun.com/evaluate2.png" mode="" />
110 </view> 110 </view>
111 <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}"> 111 <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}">
112 - <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 112 + <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
113 <block wx:for="{{reserveData.content}}" wx:key="index"> 113 <block wx:for="{{reserveData.content}}" wx:key="index">
114 - <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix" />  
115 - <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 114 + <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
  115 + <text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
116 </block> 116 </block>
117 </view> 117 </view>
118 <!-- 餐厅介绍 --> 118 <!-- 餐厅介绍 -->