邀请函18到22模板调整3.0

@@ -62,7 +62,7 @@
             <view class="font40r">尊敬的贵宾您好！</view>
             <view class="font40r">尊敬的贵宾您好！</view>
             <view class="font26r texts">很荣幸能为您提供专属接待和服务</view>
             <view class="font26r texts">很荣幸能为您提供专属接待和服务</view>
             <view class="contactBtns">
             <view class="contactBtns">
-                <view wx:if="{{staffinfo.phone}}" class="font24r brownFont" data-phone="{{staffinfo.phone}}" bindtap="call">
+                <view wx:if="{{staffinfo.phone}}" class="font24r brownFont brownFont1Img" data-phone="{{staffinfo.phone}}" bindtap="call">
                     <image src="https://qn.colorcun.com/invitation10Phone1.png" mode="" /><text>联系我</text>
                     <image src="https://qn.colorcun.com/invitation10Phone1.png" mode="" /><text>联系我</text>
                 </view>
                 </view>
                 <view wx:if="{{staffinfo.wechat}}" class="font24r brownFont" bindtap="copyWeChat">
                 <view wx:if="{{staffinfo.wechat}}" class="font24r brownFont" bindtap="copyWeChat">

@@ -215,6 +215,12 @@
     margin-right: 10rpx;
     margin-right: 10rpx;
 }
 }
 
 
+.brownFont1Img image{
+    width: 18rpx;
+    height: 24rpx;
+    margin-right: 10rpx;
+}
+
 .publicModule {
 .publicModule {
     margin: 20rpx;
     margin: 20rpx;
     padding: 20rpx 20rpx 40rpx 20rpx;
     padding: 20rpx 20rpx 40rpx 20rpx;
@@ -491,16 +497,18 @@
     color: #CC9B6A;
     color: #CC9B6A;
     font-weight: 600;
     font-weight: 600;
     padding: 0 20rpx;
     padding: 0 20rpx;
+    height: 40rpx;
+    line-height: 40rpx;
 }
 }
 
 
 .discountText {
 .discountText {
 	text-align: center;
 	text-align: center;
-	color: #FFEFC5;
+	color: #fff;
 	border-radius: 6rpx;
 	border-radius: 6rpx;
 	font-family: PingFang SC;
 	font-family: PingFang SC;
 	background: #FD4D59;
 	background: #FD4D59;
 	width: max-content;
 	width: max-content;
-	padding: 6rpx;
+	padding: 2rpx 8rpx;
 	position: absolute;
 	position: absolute;
 	left: 16rpx;
 	left: 16rpx;
 	top: 12rpx;
 	top: 12rpx;

@@ -721,8 +721,8 @@ Page({
             let bookType = this.data.bookType;
             let bookType = this.data.bookType;
             let urlsArr = this.data.urlsArr
             let urlsArr = this.data.urlsArr
             marketing.wecomle = (reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle) ? marketing.wecomle : ''
             marketing.wecomle = (reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle) ? marketing.wecomle : ''
-            if (bookType == '1' && home && home.image) urlsArr.push(home.image)
-            if (bookType == '1' && marketing && marketing.logo) urlsArr.push(marketing.logo)
+            if (home && home.image) urlsArr.push(home.image)
+            if (marketing && marketing.logo) urlsArr.push(marketing.logo)
             let obj = {
             let obj = {
                 chef,
                 chef,
                 marketing,
                 marketing,
@@ -740,7 +740,7 @@ Page({
                 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond == '1',
                 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond == '1',
                 isComments: is_comments == '1' && marketing && marketing.is_comments_coupon == '1',
                 isComments: is_comments == '1' && marketing && marketing.is_comments_coupon == '1',
                 colors: bookType == '1' ? '#17220C' : bookType == '2' ? '#B9A99A' : '',
                 colors: bookType == '1' ? '#17220C' : bookType == '2' ? '#B9A99A' : '',
-                urlsArr
+                urlsArr,
             }
             }
             console.log('获取数据GetSellerTemplateConf--------------------', {
             console.log('获取数据GetSellerTemplateConf--------------------', {
                 ...obj
                 ...obj

@@ -12,7 +12,7 @@
             <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text>
             <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text>
             <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text>
             <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text>
         </view>
         </view>
-        <view wx:if="{{bookType == '2' && urlsArr && urlsArr.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
+        <view wx:if="{{bookType == '2' && urlsArr && urlsArr.length>0}}" class="{{urlsArr.length=='1'?'pageSpacing':'pageSpacing1'}}">
             <view wx:for="{{urlsArr}}" class="imgs" wx:key="index" bindtap="previewImage" data-url="{{item}}" data-imgs="{{urlsArr}}">
             <view wx:for="{{urlsArr}}" class="imgs" wx:key="index" bindtap="previewImage" data-url="{{item}}" data-imgs="{{urlsArr}}">
                 <image class="imageStyle" mode="aspectFill" src="{{item}}"></image>
                 <image class="imageStyle" mode="aspectFill" src="{{item}}"></image>
             </view>
             </view>

@@ -618,6 +618,8 @@
     color: #D2541C;
     color: #D2541C;
     font-weight: 600;
     font-weight: 600;
     padding: 0 30rpx;
     padding: 0 30rpx;
+    height: 42rpx;
+    line-height: 42rpx;
 }
 }
 
 
 .preferentialCoupon .orderingFood2 {
 .preferentialCoupon .orderingFood2 {