Commit 3a934e8a342ca3f43a1297f80d81024c4c70aa3c

Authored by pengye
1 parent 5b51af7c

邀请函自定义文字换行显示

@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 109 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
110 <block wx:for="{{reserveData.content}}" wx:key="index"> 110 <block wx:for="{{reserveData.content}}" wx:key="index">
111 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/> 111 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
112 - <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view> 112 + <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
113 </block> 113 </block>
114 </view> 114 </view>
115 <!-- 餐厅介绍图文分开 --> 115 <!-- 餐厅介绍图文分开 -->
@@ -492,6 +492,7 @@ @@ -492,6 +492,7 @@
492 margin-bottom: 20rpx; 492 margin-bottom: 20rpx;
493 color: #000; 493 color: #000;
494 font-family: PingFang SC; 494 font-family: PingFang SC;
  495 + display: block;
495 } 496 }
496 497
497 .more { 498 .more {
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 117 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
118 <block wx:for="{{reserveData.content}}" wx:key="index"> 118 <block wx:for="{{reserveData.content}}" wx:key="index">
119 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/> 119 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
120 - <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view> 120 + <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
121 </block> 121 </block>
122 </view> 122 </view>
123 <!-- 餐厅介绍图文分开 --> 123 <!-- 餐厅介绍图文分开 -->
@@ -532,6 +532,7 @@ @@ -532,6 +532,7 @@
532 margin-bottom: 20rpx; 532 margin-bottom: 20rpx;
533 color: #000; 533 color: #000;
534 font-family: PingFang SC; 534 font-family: PingFang SC;
  535 + display: block;
535 } 536 }
536 537
537 .more { 538 .more {
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 96 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
97 <block wx:for="{{reserveData.content}}" wx:key="index"> 97 <block wx:for="{{reserveData.content}}" wx:key="index">
98 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/> 98 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
99 - <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view> 99 + <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
100 </block> 100 </block>
101 </view> 101 </view>
102 <!-- 餐厅介绍图文分开 --> 102 <!-- 餐厅介绍图文分开 -->
@@ -504,6 +504,7 @@ @@ -504,6 +504,7 @@
504 margin-bottom: 20rpx; 504 margin-bottom: 20rpx;
505 color: #000; 505 color: #000;
506 font-family: PingFang SC; 506 font-family: PingFang SC;
  507 + display: block;
507 } 508 }
508 509
509 .scroll-view { 510 .scroll-view {
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 93 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
94 <block wx:for="{{reserveData.content}}" wx:key="index"> 94 <block wx:for="{{reserveData.content}}" wx:key="index">
95 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/> 95 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
96 - <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view> 96 + <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
97 </block> 97 </block>
98 </view> 98 </view>
99 <!-- 餐厅介绍图文分开 --> 99 <!-- 餐厅介绍图文分开 -->
@@ -496,6 +496,7 @@ @@ -496,6 +496,7 @@
496 margin-bottom: 20rpx; 496 margin-bottom: 20rpx;
497 color: #000; 497 color: #000;
498 font-family: PingFang SC; 498 font-family: PingFang SC;
  499 + display: block;
499 } 500 }
500 501
501 .scroll-view { 502 .scroll-view {
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 116 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
117 <block wx:for="{{reserveData.content}}" wx:key="index"> 117 <block wx:for="{{reserveData.content}}" wx:key="index">
118 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/> 118 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
119 - <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view> 119 + <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
120 </block> 120 </block>
121 </view> 121 </view>
122 <!-- 品牌介绍类型 图文合并 --> 122 <!-- 品牌介绍类型 图文合并 -->
@@ -665,6 +665,7 @@ @@ -665,6 +665,7 @@
665 margin-bottom: 20rpx; 665 margin-bottom: 20rpx;
666 color: #000; 666 color: #000;
667 font-family: PingFang SC; 667 font-family: PingFang SC;
  668 + display: block;
668 } 669 }
669 670
670 .more { 671 .more {
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 111 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
112 <block wx:for="{{reserveData.content}}" wx:key="index"> 112 <block wx:for="{{reserveData.content}}" wx:key="index">
113 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/> 113 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
114 - <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view> 114 + <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
115 </block> 115 </block>
116 </view> 116 </view>
117 <!-- 餐厅介绍图文分开 --> 117 <!-- 餐厅介绍图文分开 -->
@@ -494,6 +494,7 @@ @@ -494,6 +494,7 @@
494 margin-bottom: 20rpx; 494 margin-bottom: 20rpx;
495 color: #000; 495 color: #000;
496 font-family: PingFang SC; 496 font-family: PingFang SC;
  497 + display: block;
497 } 498 }
498 499
499 .more { 500 .more {
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 98 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
99 <block wx:for="{{reserveData.content}}" wx:key="index"> 99 <block wx:for="{{reserveData.content}}" wx:key="index">
100 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/> 100 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
101 - <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view> 101 + <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
102 </block> 102 </block>
103 </view> 103 </view>
104 <!-- 餐厅介绍图文分开 --> 104 <!-- 餐厅介绍图文分开 -->
@@ -513,6 +513,7 @@ @@ -513,6 +513,7 @@
513 margin-bottom: 20rpx; 513 margin-bottom: 20rpx;
514 color: #000; 514 color: #000;
515 font-family: PingFang SC; 515 font-family: PingFang SC;
  516 + display: block;
516 } 517 }
517 518
518 .more { 519 .more {