xt / xcx-book · Commits

Go to a project

Commit 3fcb510669a06d9b482a97e15f214045a7d23801

Authored by pengye
1 parent 74cfc99b
build: skipped

邀请函新模板

Inline Side-by-side
Showing 19 changed files with 393 additions and 251 deletions
@@ -43,7 +43,7 @@ Page({ @@ -43,7 +43,7 @@ Page({
43 tableinfo: [], 43 tableinfo: [],
44 StyleType: '', 44 StyleType: '',
45 showMoreTip: true, 45 showMoreTip: true,
46 - themeColor: 'lanCaiHe', 46 + themeColor: '',
47 screenHeight: '', 47 screenHeight: '',
48 }, 48 },
49 tablestr: '', 49 tablestr: '',
@@ -367,6 +367,7 @@ Page({ @@ -367,6 +367,7 @@ Page({
367 signboard = util.determine(data.signboard); 367 signboard = util.determine(data.signboard);
368 store = util.determine(data.store); 368 store = util.determine(data.store);
369 home = util.determine(data.home); 369 home = util.determine(data.home);
  370 + themeColor = data.lite_class;
370 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 371 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
371 if (marketing) { 372 if (marketing) {
372 is_comments = marketing.is_comments ? marketing.is_comments : ''; 373 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -410,6 +411,7 @@ Page({ @@ -410,6 +411,7 @@ Page({
410 swich_phone, 411 swich_phone,
411 is_comments, 412 is_comments,
412 StyleType: res.data.type, 413 StyleType: res.data.type,
  414 + themeColor,
413 } 415 }
414 console.log('获取数据', { 416 console.log('获取数据', {
415 ...obj 417 ...obj
@@ -439,24 +441,6 @@ Page({ @@ -439,24 +441,6 @@ Page({
439 between: true 441 between: true
440 }) 442 })
441 } 443 }
442 - // themeColor = 'crimson' // 深中国红  
443 - // themeSixteen = '#86201B'  
444 - themeColor = 'chinaRed' // 中国红  
445 - themeSixteen = '#AF231C'  
446 - // themeColor = 'lanCaiHe' // 蓝采和  
447 - // themeSixteen = '#06436F'  
448 - // themeColor = 'stoneGreen' // 石绿  
449 - // themeSixteen = '#206864'  
450 - // themeColor = 'turmeric' // 姜黄  
451 - // themeSixteen = '#B39437'  
452 - // themeColor = 'greenishYellow' // 苍黄  
453 - // themeSixteen = '#C85306'  
454 - // themeColor = 'golden' // 金黄  
455 - // themeSixteen = '#C67B3A'  
456 - // themeColor = 'ultramarine' // 群青  
457 - // themeSixteen = '#0143A3'  
458 - // themeColor = 'moroccanBlue' // 摩洛哥蓝  
459 - // themeSixteen = '#19516A'  
460 this.setData({ 444 this.setData({
461 chef, 445 chef,
462 marketing, 446 marketing,
@@ -14,30 +14,30 @@ @@ -14,30 +14,30 @@
14 </view> 14 </view>
15 <view class="reservationInfo"> 15 <view class="reservationInfo">
16 <view class="flex-11" wx:if="{{seller.date}}"> 16 <view class="flex-11" wx:if="{{seller.date}}">
17 - <view class="label">【就餐日期】</view>  
18 - <view class="contentData">{{seller.date}}</view> 17 + <view class="label font36r">【就餐日期】</view>
  18 + <view class="contentData font36r">{{seller.date}}</view>
19 </view> 19 </view>
20 <view class="flex-11" wx:if="{{seller.soltName}}"> 20 <view class="flex-11" wx:if="{{seller.soltName}}">
21 - <view class="label">【就餐时间】</view>  
22 - <view class="contentData">{{seller.soltName}}</view> 21 + <view class="label font36r">【就餐时间】</view>
  22 + <view class="contentData font36r">{{seller.soltName}}</view>
23 </view> 23 </view>
24 <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}"> 24 <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}">
25 - <view class="label">【就餐人数】</view>  
26 - <view class="contentData">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view> 25 + <view class="label font36r">【就餐人数】</view>
  26 + <view class="contentData font36r">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view>
27 </view> 27 </view>
28 <view class="flex-11" wx:if="{{seller.tablesText}}"> 28 <view class="flex-11" wx:if="{{seller.tablesText}}">
29 - <view class="label">【就餐位置】</view>  
30 - <view class="contentData bold">{{seller.tablesText}}</view> 29 + <view class="label font36r">【就餐位置】</view>
  30 + <view class="contentData font34r">{{seller.tablesText}}</view>
31 </view> 31 </view>
32 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}"> 32 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
33 - <view class="label">【停车信息】</view>  
34 - <view class="contentData">{{reserve.park_info}}</view> 33 + <view class="label font36r">【停车信息】</view>
  34 + <view class="contentData font34r">{{reserve.park_info}}</view>
35 </view> 35 </view>
36 <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}"> 36 <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}">
37 - <view class="label">【联系餐厅】</view>  
38 - <view class="contentData">{{detail.seller.phone}}</view> 37 + <view class="label font36r">【联系餐厅】</view>
  38 + <view class="contentData font36r">{{detail.seller.phone}}</view>
39 </view> 39 </view>
40 - <view wx:if="{{roomimage && roomimage.length>0}}" class="page-section-spacing"> 40 + <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
41 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 41 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
42 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image> 42 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image>
43 <text>{{item.name}}</text> 43 <text>{{item.name}}</text>
@@ -108,6 +108,7 @@ @@ -108,6 +108,7 @@
108 <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 108 <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
109 <image src="{{item}}" mode="aspectFill" /> 109 <image src="{{item}}" mode="aspectFill" />
110 </block> 110 </block>
  111 + <view class="lines"></view>
111 </view> 112 </view>
112 </view> 113 </view>
113 <view class="introduce famousChefBox" wx:if="{{chef}}"> 114 <view class="introduce famousChefBox" wx:if="{{chef}}">
@@ -120,6 +121,7 @@ @@ -120,6 +121,7 @@
120 </view> 121 </view>
121 </view> 122 </view>
122 <image src="{{chef.image}}" mode="aspectFill" /> 123 <image src="{{chef.image}}" mode="aspectFill" />
  124 + <view class="lines"></view>
123 </view> 125 </view>
124 </view> 126 </view>
125 <!-- 菜品展示 swich为1展示 --> 127 <!-- 菜品展示 swich为1展示 -->
@@ -131,6 +133,7 @@ @@ -131,6 +133,7 @@
131 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 133 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
132 <image src="{{item}}" mode="aspectFill" /> 134 <image src="{{item}}" mode="aspectFill" />
133 </block> 135 </block>
  136 + <view class="lines"></view>
134 </view> 137 </view>
135 </view> 138 </view>
136 <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 139 <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 24
25 25
26 .reservationInfo .flex-11 { 26 .reservationInfo .flex-11 {
27 - margin-left: 30rpx; 27 + margin: 0 30rpx;
28 display: flex; 28 display: flex;
29 line-height: 64rpx; 29 line-height: 64rpx;
30 font-family: PingFang SC; 30 font-family: PingFang SC;
@@ -34,18 +34,16 @@ @@ -34,18 +34,16 @@
34 .label { 34 .label {
35 flex-shrink: 0; 35 flex-shrink: 0;
36 font-family: PingFang SC; 36 font-family: PingFang SC;
37 - font-size: 32rpx;  
38 } 37 }
39 38
40 .contentData { 39 .contentData {
41 flex: 1; 40 flex: 1;
42 line-height: 60rpx; 41 line-height: 60rpx;
43 font-family: PingFang SC; 42 font-family: PingFang SC;
44 - font-size: 32rpx;  
45 } 43 }
46 44
47 .handleInfo { 45 .handleInfo {
48 - margin: 50rpx 40rpx 42rpx 40rpx; 46 + margin: 50rpx 30rpx 42rpx 30rpx;
49 display: flex; 47 display: flex;
50 justify-content: space-between; 48 justify-content: space-between;
51 align-items: center; 49 align-items: center;
@@ -80,6 +78,9 @@ @@ -80,6 +78,9 @@
80 .handlePhone { 78 .handlePhone {
81 height: 100rpx; 79 height: 100rpx;
82 color: #515151; 80 color: #515151;
  81 + margin: 0 20rpx;
  82 + width: 45%;
  83 + overflow-y: scroll;
83 } 84 }
84 85
85 .brownFont { 86 .brownFont {
@@ -88,6 +89,7 @@ @@ -88,6 +89,7 @@
88 border: 2rpx solid #0143A3; 89 border: 2rpx solid #0143A3;
89 border-radius: 22rpx; 90 border-radius: 22rpx;
90 text-align: center; 91 text-align: center;
  92 + width: 130rpx;
91 } 93 }
92 94
93 .brownFont:nth-of-type(1) { 95 .brownFont:nth-of-type(1) {
@@ -105,7 +107,6 @@ @@ -105,7 +107,6 @@
105 .positioningBox { 107 .positioningBox {
106 display: flex; 108 display: flex;
107 justify-content: center; 109 justify-content: center;
108 - height: 232rpx;  
109 } 110 }
110 111
111 .positioning { 112 .positioning {
@@ -114,7 +115,7 @@ @@ -114,7 +115,7 @@
114 box-sizing: border-box; 115 box-sizing: border-box;
115 flex-direction: column; 116 flex-direction: column;
116 background: #fff; 117 background: #fff;
117 - padding: 30rpx 0 34rpx 30rpx; 118 + padding: 30rpx 30rpx 34rpx 30rpx;
118 border-radius: 10rpx 10rpx 0 0; 119 border-radius: 10rpx 10rpx 0 0;
119 flex: 1; 120 flex: 1;
120 color: #000; 121 color: #000;
@@ -127,15 +128,15 @@ @@ -127,15 +128,15 @@
127 } 128 }
128 129
129 .positioning .name { 130 .positioning .name {
130 - width: 80%; 131 + width: 95%;
131 display: flex; 132 display: flex;
132 align-items: center; 133 align-items: center;
133 font-family: PingFang SC; 134 font-family: PingFang SC;
134 - font-size: 28rpx;  
135 margin-top: 10rpx; 135 margin-top: 10rpx;
136 } 136 }
137 137
138 .positioning .name text { 138 .positioning .name text {
  139 + width: 100%;
139 line-height: 50rpx; 140 line-height: 50rpx;
140 } 141 }
141 142
@@ -148,23 +149,23 @@ @@ -148,23 +149,23 @@
148 } 149 }
149 150
150 .imgMask { 151 .imgMask {
151 - margin: 20rpx 40rpx;  
152 - padding-bottom: 18rpx;  
153 - border-bottom: 2rpx solid #DBDBDB; 152 + margin: 0 20rpx;
154 } 153 }
155 154
156 -.famousChefBox .labelBox {  
157 - border-bottom: none; 155 +.lines {
  156 + height: 2rpx;
  157 + margin: 20rpx;
  158 + margin-bottom: 20rpx;
  159 + background-color: #DBDBDB;
158 } 160 }
159 161
160 -.imgMask image {  
161 - margin: 0 15rpx; 162 +.famousChefBox .labelBox {
  163 + border-bottom: none;
162 } 164 }
163 165
164 .labelBox { 166 .labelBox {
165 - width: 100%; 167 + margin: 0 20rpx 0 20rpx;
166 display: flex; 168 display: flex;
167 - margin-bottom: 20rpx;  
168 position: relative; 169 position: relative;
169 padding-bottom: 20rpx; 170 padding-bottom: 20rpx;
170 border-bottom: 2rpx solid #DBDBDB; 171 border-bottom: 2rpx solid #DBDBDB;
@@ -195,12 +196,18 @@ @@ -195,12 +196,18 @@
195 } 196 }
196 197
197 .imgMask image { 198 .imgMask image {
198 - width: 95%; 199 + width: 100%;
199 display: block; 200 display: block;
200 } 201 }
201 202
202 -.famousChefBox { 203 +.famousChefBox,
  204 +.vegetableBox {
203 position: relative; 205 position: relative;
  206 + margin-top: 20rpx;
  207 +}
  208 +
  209 +.vegetableBox .chefText {
  210 + margin-top: 0;
204 } 211 }
205 212
206 .Introducepublic { 213 .Introducepublic {
@@ -213,8 +220,8 @@ @@ -213,8 +220,8 @@
213 220
214 .chefText { 221 .chefText {
215 font-family: PingFang SC; 222 font-family: PingFang SC;
216 - margin-bottom: 20rpx;  
217 font-weight: 500; 223 font-weight: 500;
  224 + margin: 20rpx;
218 } 225 }
219 226
220 .specialServices { 227 .specialServices {
@@ -241,7 +248,7 @@ @@ -241,7 +248,7 @@
241 .endStyle { 248 .endStyle {
242 display: flex; 249 display: flex;
243 justify-content: flex-end; 250 justify-content: flex-end;
244 - height: 60rpx; 251 + height: 54rpx;
245 margin: 20rpx 0; 252 margin: 20rpx 0;
246 } 253 }
247 254
@@ -259,7 +266,7 @@ @@ -259,7 +266,7 @@
259 } 266 }
260 267
261 .preferential { 268 .preferential {
262 - margin: 16rpx 40rpx 20rpx 40rpx; 269 + margin: 0 40rpx 20rpx 40rpx;
263 } 270 }
264 271
265 .rubric1 { 272 .rubric1 {
@@ -301,11 +308,13 @@ @@ -301,11 +308,13 @@
301 } 308 }
302 309
303 .itemTop text:nth-of-type(1) { 310 .itemTop text:nth-of-type(1) {
  311 + max-width: 65%;
304 font-weight: 600; 312 font-weight: 600;
305 color: #515151; 313 color: #515151;
306 } 314 }
307 315
308 .itemTop .discountText { 316 .itemTop .discountText {
  317 + text-align: center;
309 padding: 0 6rpx; 318 padding: 0 6rpx;
310 color: #E34D59; 319 color: #E34D59;
311 border: 2rpx solid #E34D59; 320 border: 2rpx solid #E34D59;
@@ -426,7 +435,7 @@ @@ -426,7 +435,7 @@
426 } 435 }
427 436
428 .evaluateBox { 437 .evaluateBox {
429 - margin: 16rpx 84rpx 16rpx 40rpx; 438 + margin: 0 84rpx 40rpx 40rpx;
430 display: flex; 439 display: flex;
431 align-items: center; 440 align-items: center;
432 justify-content: space-between; 441 justify-content: space-between;
@@ -464,10 +473,11 @@ @@ -464,10 +473,11 @@
464 height: 30rpx; 473 height: 30rpx;
465 } 474 }
466 475
467 -.page-section-spacing {  
468 - margin-top: 20rpx; 476 +.pageSpacing {
469 position: relative; 477 position: relative;
470 display: flex; 478 display: flex;
  479 + justify-content: center;
  480 + align-items: center;
471 white-space: nowrap; 481 white-space: nowrap;
472 width: auto; 482 width: auto;
473 overflow-x: scroll; 483 overflow-x: scroll;
@@ -475,8 +485,15 @@ @@ -475,8 +485,15 @@
475 border-bottom-right-radius: 10rpx; 485 border-bottom-right-radius: 10rpx;
476 } 486 }
477 487
478 -.imgs:nth-of-type(1) {  
479 - margin-left: 48rpx; 488 +.pageSpacing1 {
  489 + position: relative;
  490 + display: flex;
  491 + white-space: nowrap;
  492 + width: auto;
  493 + overflow-x: scroll;
  494 + border-bottom-left-radius: 10rpx;
  495 + border-bottom-right-radius: 10rpx;
  496 + padding-left: 30rpx;
480 } 497 }
481 498
482 .scroll-view { 499 .scroll-view {
@@ -527,6 +544,70 @@ @@ -527,6 +544,70 @@
527 color: #86201B; 544 color: #86201B;
528 } 545 }
529 546
  547 +
  548 +/* 黑蓝过渡 */
  549 +.blackBlueGradient .reservationInfo,
  550 +.blackBlueGradient .positioningBox {
  551 + background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%);
  552 +}
  553 +
  554 +.blackBlueGradient .chefText,
  555 +.blackBlueGradient .welcome,
  556 +.blackBlueGradient .rubric {
  557 + color: #0143A3;
  558 +}
  559 +
  560 +
  561 +/* 石绿过渡 */
  562 +.stoneGreenGradient .reservationInfo,
  563 +.stoneGreenGradient .positioningBox {
  564 + background: linear-gradient(121.52deg, #438e93 1.76%, #206864 42.99%, #206864 75.66%, #42a5ff 120.1%);
  565 +}
  566 +
  567 +.stoneGreenGradient .chefText,
  568 +.stoneGreenGradient .welcome,
  569 +.stoneGreenGradient .rubric {
  570 + color: #206864;
  571 +}
  572 +
  573 +
  574 +/* 中国红过渡 */
  575 +.chinaRedGradient .reservationInfo,
  576 +.chinaRedGradient .positioningBox {
  577 + background: linear-gradient(309.04deg, #af231c -2.27%, #86201b 44.37%, #af231c 91.74%);
  578 +}
  579 +
  580 +.chinaRedGradient .chefText,
  581 +.chinaRedGradient .welcome,
  582 +.chinaRedGradient .rubric {
  583 + color: #86201B;
  584 +}
  585 +
  586 +
  587 +/* 群青过渡 */
  588 +.ultramarineGradient .reservationInfo,
  589 +.ultramarineGradient .positioningBox {
  590 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
  591 +}
  592 +
  593 +.ultramarineGradient .chefText,
  594 +.ultramarineGradient .welcome,
  595 +.ultramarineGradient .rubric {
  596 + color: #0143A3;
  597 +}
  598 +
  599 +/* 深中国红 */
  600 +.crimson .reservationInfo,
  601 +.crimson .positioningBox {
  602 + background: #86201B;
  603 +}
  604 +
  605 +.crimson .chefText,
  606 +.crimson .welcome,
  607 +.crimson .rubric {
  608 + color: #86201B;
  609 +}
  610 +
530 /* 中国红 */ 611 /* 中国红 */
531 .chinaRed .reservationInfo, 612 .chinaRed .reservationInfo,
532 .chinaRed .positioningBox { 613 .chinaRed .positioningBox {
@@ -43,7 +43,7 @@ Page({ @@ -43,7 +43,7 @@ Page({
43 tableinfo: [], 43 tableinfo: [],
44 StyleType: '', 44 StyleType: '',
45 showMoreTip: true, 45 showMoreTip: true,
46 - themeColor: 'lanCaiHe', 46 + themeColor: '',
47 screenHeight: '', 47 screenHeight: '',
48 whiteBj: false, 48 whiteBj: false,
49 }, 49 },
@@ -368,6 +368,7 @@ Page({ @@ -368,6 +368,7 @@ Page({
368 signboard = util.determine(data.signboard); 368 signboard = util.determine(data.signboard);
369 store = util.determine(data.store); 369 store = util.determine(data.store);
370 home = util.determine(data.home); 370 home = util.determine(data.home);
  371 + themeColor = data.lite_class;
371 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 372 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
372 if (marketing) { 373 if (marketing) {
373 is_comments = marketing.is_comments ? marketing.is_comments : ''; 374 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -411,6 +412,7 @@ Page({ @@ -411,6 +412,7 @@ Page({
411 swich_phone, 412 swich_phone,
412 is_comments, 413 is_comments,
413 StyleType: res.data.type, 414 StyleType: res.data.type,
  415 + themeColor,
414 } 416 }
415 console.log('获取数据', { 417 console.log('获取数据', {
416 ...obj 418 ...obj
@@ -440,19 +442,6 @@ Page({ @@ -440,19 +442,6 @@ Page({
440 between: true 442 between: true
441 }) 443 })
442 } 444 }
443 - // themeColor = 'blackBlueGradient' // 黑蓝过渡  
444 - // themeColor = 'stoneGreenGradient' // 石绿过渡  
445 - // themeColor = 'chinaRedGradient' // 中国红过渡  
446 - // themeColor = 'ultramarineGradient' // 群青过渡  
447 - // themeColor = 'crimson' // 深中国红  
448 - // themeColor = 'chinaRed' // 中国红  
449 - // themeColor = 'lanCaiHe' // 蓝采和  
450 - // themeColor = 'stoneGreen' // 石绿  
451 - // themeColor = 'turmeric' // 姜黄  
452 - // themeColor = 'greenishYellow' // 苍黄  
453 - // themeColor = 'golden' // 金黄  
454 - themeColor = 'ultramarine' // 群青  
455 - // themeColor = 'moroccanBlue' // 摩洛哥蓝  
456 if (themeColor == 'turmeric' || themeColor == 'golden') { 445 if (themeColor == 'turmeric' || themeColor == 'golden') {
457 whiteBj = true 446 whiteBj = true
458 } else { 447 } else {
@@ -10,39 +10,39 @@ @@ -10,39 +10,39 @@
10 {{home.slogan}} 10 {{home.slogan}}
11 </view> 11 </view>
12 </view> 12 </view>
13 - <view wx:if="{{roomimage && roomimage.length>0}}" class="page-section-spacing {{roomimage.length=='1'?'centerBox':''}}"> 13 + <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
14 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 14 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
15 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image> 15 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image>
16 <text>{{item.name}}</text> 16 <text>{{item.name}}</text>
17 </view> 17 </view>
18 </view> 18 </view>
19 - <view class="begin font40r">  
20 - <view>尊敬的贵宾，您好！</view>  
21 - <view>非常感谢您选择【{{seller.name?seller.name:reserve.seller_name}}】！</view> 19 + <view class="begin">
  20 + <view class="font40r">尊敬的贵宾，您好！</view>
  21 + <view class="font40r">非常感谢您选择【{{seller.name?seller.name:reserve.seller_name}}】！</view>
22 </view> 22 </view>
23 <view class="flex-11" wx:if="{{seller.date}}"> 23 <view class="flex-11" wx:if="{{seller.date}}">
24 - <view class="label">【日期】</view>  
25 - <view class="contentData">{{seller.date}}</view> 24 + <view class="label font36r">【日期】</view>
  25 + <view class="contentData font36r">{{seller.date}}</view>
26 </view> 26 </view>
27 <view class="flex-11" wx:if="{{seller.soltName}}"> 27 <view class="flex-11" wx:if="{{seller.soltName}}">
28 - <view class="label">【餐段】</view>  
29 - <view class="contentData">{{seller.soltName}}</view> 28 + <view class="label font36r">【餐段】</view>
  29 + <view class="contentData font36r">{{seller.soltName}}</view>
30 </view> 30 </view>
31 <view class="flex-11" wx:if="{{seller.tablesText}}"> 31 <view class="flex-11" wx:if="{{seller.tablesText}}">
32 - <view class="label">【餐位】</view>  
33 - <view class="contentData bold">{{seller.tablesText}}</view> 32 + <view class="label font36r">【餐位】</view>
  33 + <view class="contentData bold font36r">{{seller.tablesText}}</view>
34 </view> 34 </view>
35 <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}"> 35 <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}">
36 - <view class="label">【人数】</view>  
37 - <view class="contentData">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view> 36 + <view class="label font36r">【人数】</view>
  37 + <view class="contentData font36r">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view>
38 </view> 38 </view>
39 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}"> 39 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
40 - <view class="label">【停车】</view>  
41 - <view class="contentData">{{reserve.park_info}}</view> 40 + <view class="label font36r">【停车】</view>
  41 + <view class="contentData font36r">{{reserve.park_info}}</view>
42 </view> 42 </view>
43 <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}"> 43 <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}">
44 - <view class="label">【联系】</view>  
45 - <view class="contentData">{{detail.seller.phone}}</view> 44 + <view class="label font36r">【联系】</view>
  45 + <view class="contentData font36r">{{detail.seller.phone}}</view>
46 </view> 46 </view>
47 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 47 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
48 <view class="handleInfo"> 48 <view class="handleInfo">
@@ -115,6 +115,7 @@ @@ -115,6 +115,7 @@
115 <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 115 <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
116 <image src="{{item}}" mode="aspectFill" /> 116 <image src="{{item}}" mode="aspectFill" />
117 </block> 117 </block>
  118 + <view class="lines"></view>
118 </view> 119 </view>
119 </view> 120 </view>
120 <view class="introduce famousChefBox" wx:if="{{chef}}"> 121 <view class="introduce famousChefBox" wx:if="{{chef}}">
@@ -127,6 +128,7 @@ @@ -127,6 +128,7 @@
127 </view> 128 </view>
128 </view> 129 </view>
129 <image src="{{chef.image}}" mode="aspectFill" /> 130 <image src="{{chef.image}}" mode="aspectFill" />
  131 + <view class="lines"></view>
130 </view> 132 </view>
131 </view> 133 </view>
132 <!-- 菜品展示 swich为1展示 --> 134 <!-- 菜品展示 swich为1展示 -->
@@ -138,6 +140,7 @@ @@ -138,6 +140,7 @@
138 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 140 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
139 <image src="{{item}}" mode="aspectFill" /> 141 <image src="{{item}}" mode="aspectFill" />
140 </block> 142 </block>
  143 + <view class="lines"></view>
141 </view> 144 </view>
142 </view> 145 </view>
143 <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 146 <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
@@ -22,20 +22,34 @@ @@ -22,20 +22,34 @@
22 top: -68rpx; 22 top: -68rpx;
23 color: #d8c46b; 23 color: #d8c46b;
24 font-family: FangSong; 24 font-family: FangSong;
25 - margin: 18rpx 0 36rpx 0; 25 + margin: 18rpx 20rpx 36rpx 20rpx;
  26 + overflow: hidden;
  27 + word-break: break-all;
  28 + text-overflow: ellipsis;
  29 + display: -webkit-box;
  30 + -webkit-box-orient: vertical;
  31 + -webkit-line-clamp: 2;
26 } 32 }
27 33
28 .title { 34 .title {
29 text-align: center; 35 text-align: center;
30 font-family: PingFang SC; 36 font-family: PingFang SC;
31 - font-size: 72rpx; 37 + font-size: 64rpx;
32 position: relative; 38 position: relative;
33 top: -70rpx; 39 top: -70rpx;
34 color: #FFD200; 40 color: #FFD200;
  41 + font-weight: 500;
  42 + overflow: hidden;
  43 + word-break: break-all;
  44 + text-overflow: ellipsis;
  45 + display: -webkit-box;
  46 + -webkit-box-orient: vertical;
  47 + -webkit-line-clamp: 2;
  48 + margin: 0 20rpx;
35 } 49 }
36 50
37 .begin { 51 .begin {
38 - margin: 20rpx 0 30rpx 30rpx; 52 + margin: 20rpx 30rpx 30rpx 30rpx;
39 color: #FBF6F1; 53 color: #FBF6F1;
40 font-family: PingFang SC; 54 font-family: PingFang SC;
41 } 55 }
@@ -44,17 +58,6 @@ @@ -44,17 +58,6 @@
44 line-height: 64rpx; 58 line-height: 64rpx;
45 } 59 }
46 60
47 -.info {  
48 - text-align: center;  
49 - font-family: FangSong;  
50 - font-size: 40rpx;  
51 - background-image: -webkit-linear-gradient(bottom, #eeae74, #EEAE74);  
52 - -webkit-background-clip: text;  
53 - -webkit-text-fill-color: transparent;  
54 - position: relative;  
55 - top: -68rpx;  
56 -}  
57 -  
58 .reservationInfo { 61 .reservationInfo {
59 min-height: 200rpx; 62 min-height: 200rpx;
60 padding: 20rpx 0; 63 padding: 20rpx 0;
@@ -66,29 +69,25 @@ @@ -66,29 +69,25 @@
66 69
67 70
68 .reservationInfo .flex-11 { 71 .reservationInfo .flex-11 {
69 - margin-left: 30rpx;  
70 - width: 100%; 72 + margin: 0 30rpx;
71 display: flex; 73 display: flex;
72 line-height: 60rpx; 74 line-height: 60rpx;
73 font-family: PingFang SC; 75 font-family: PingFang SC;
74 - font-size: 32rpx;  
75 } 76 }
76 77
77 .label { 78 .label {
78 flex-shrink: 0; 79 flex-shrink: 0;
79 font-family: PingFang SC; 80 font-family: PingFang SC;
80 - font-size: 32rpx;  
81 } 81 }
82 82
83 .contentData { 83 .contentData {
84 flex: 1; 84 flex: 1;
85 line-height: 60rpx; 85 line-height: 60rpx;
86 font-family: PingFang SC; 86 font-family: PingFang SC;
87 - font-size: 32rpx;  
88 } 87 }
89 88
90 .handleInfo { 89 .handleInfo {
91 - margin: 50rpx 40rpx 42rpx 40rpx; 90 + margin: 16rpx 40rpx 16rpx 40rpx;
92 display: flex; 91 display: flex;
93 justify-content: space-between; 92 justify-content: space-between;
94 align-items: center; 93 align-items: center;
@@ -96,7 +95,7 @@ @@ -96,7 +95,7 @@
96 95
97 .welcome { 96 .welcome {
98 text-align: center; 97 text-align: center;
99 - margin: 42rpx 40rpx 8rpx 40rpx; 98 + margin: 30rpx 40rpx 16rpx 40rpx;
100 font-weight: 500; 99 font-weight: 500;
101 letter-spacing: 2rpx; 100 letter-spacing: 2rpx;
102 color: #FBF6F1; 101 color: #FBF6F1;
@@ -121,6 +120,9 @@ @@ -121,6 +120,9 @@
121 120
122 .handlePhone { 121 .handlePhone {
123 height: 100rpx; 122 height: 100rpx;
  123 + margin: 0 20rpx;
  124 + width: 45%;
  125 + overflow-y: scroll;
124 } 126 }
125 127
126 .brownFont { 128 .brownFont {
@@ -129,6 +131,7 @@ @@ -129,6 +131,7 @@
129 border: 2rpx solid #FBF6F1; 131 border: 2rpx solid #FBF6F1;
130 border-radius: 22rpx; 132 border-radius: 22rpx;
131 text-align: center; 133 text-align: center;
  134 + width: 130rpx;
132 } 135 }
133 136
134 .brownFont:nth-of-type(1) { 137 .brownFont:nth-of-type(1) {
@@ -146,7 +149,7 @@ @@ -146,7 +149,7 @@
146 .positioning { 149 .positioning {
147 display: flex; 150 display: flex;
148 justify-content: center; 151 justify-content: center;
149 - margin: 8rpx 30rpx 0 30rpx; 152 + margin: 0 30rpx 0 30rpx;
150 display: flex; 153 display: flex;
151 box-sizing: border-box; 154 box-sizing: border-box;
152 flex-direction: column; 155 flex-direction: column;
@@ -173,6 +176,7 @@ @@ -173,6 +176,7 @@
173 } 176 }
174 177
175 .positioning .name text { 178 .positioning .name text {
  179 + width: 100%;
176 line-height: 50rpx; 180 line-height: 50rpx;
177 } 181 }
178 182
@@ -185,23 +189,23 @@ @@ -185,23 +189,23 @@
185 } 189 }
186 190
187 .imgMask { 191 .imgMask {
188 - margin: 20rpx 40rpx;  
189 - padding-bottom: 18rpx;  
190 - border-bottom: 2rpx solid #DBDBDB; 192 + margin: 0 20rpx;
191 } 193 }
192 194
193 -.famousChefBox .labelBox {  
194 - border-bottom: none; 195 +.lines {
  196 + height: 2rpx;
  197 + margin: 20rpx;
  198 + margin-bottom: 20rpx;
  199 + background-color: #DBDBDB;
195 } 200 }
196 201
197 -.imgMask image {  
198 - margin: 0 15rpx; 202 +.famousChefBox .labelBox {
  203 + border-bottom: none;
199 } 204 }
200 205
201 .labelBox { 206 .labelBox {
202 - width: 100%;  
203 display: flex; 207 display: flex;
204 - margin-bottom: 20rpx; 208 + margin: 0 20rpx 0 20rpx;
205 position: relative; 209 position: relative;
206 padding-bottom: 20rpx; 210 padding-bottom: 20rpx;
207 border-bottom: 2rpx solid #DBDBDB; 211 border-bottom: 2rpx solid #DBDBDB;
@@ -232,12 +236,18 @@ @@ -232,12 +236,18 @@
232 } 236 }
233 237
234 .imgMask image { 238 .imgMask image {
235 - width: 95%; 239 + width: 100%;
236 display: block; 240 display: block;
237 } 241 }
238 242
239 -.famousChefBox { 243 +.famousChefBox,
  244 +.vegetableBox {
240 position: relative; 245 position: relative;
  246 + margin-top: 20rpx;
  247 +}
  248 +
  249 +.vegetableBox .chefText {
  250 + margin-top: 0;
241 } 251 }
242 252
243 .Introducepublic { 253 .Introducepublic {
@@ -250,7 +260,7 @@ @@ -250,7 +260,7 @@
250 260
251 .chefText { 261 .chefText {
252 font-family: PingFang SC; 262 font-family: PingFang SC;
253 - margin-bottom: 20rpx; 263 + margin: 20rpx;
254 font-weight: 500; 264 font-weight: 500;
255 } 265 }
256 266
@@ -338,6 +348,7 @@ @@ -338,6 +348,7 @@
338 } 348 }
339 349
340 .itemTop text:nth-of-type(1) { 350 .itemTop text:nth-of-type(1) {
  351 + max-width: 65%;
341 font-weight: 600; 352 font-weight: 600;
342 color: #515151; 353 color: #515151;
343 } 354 }
@@ -509,20 +520,6 @@ @@ -509,20 +520,6 @@
509 height: 30rpx; 520 height: 30rpx;
510 } 521 }
511 522
512 -.page-section-spacing {  
513 - position: relative;  
514 - display: flex;  
515 - white-space: nowrap;  
516 - width: auto;  
517 - overflow-x: scroll;  
518 - border-bottom-left-radius: 10rpx;  
519 - border-bottom-right-radius: 10rpx;  
520 -}  
521 -  
522 -.imgs:nth-of-type(1) {  
523 - margin-left: 100rpx;  
524 -}  
525 -  
526 .scroll-view { 523 .scroll-view {
527 white-space: nowrap; 524 white-space: nowrap;
528 width: 100%; 525 width: 100%;
@@ -559,8 +556,27 @@ @@ -559,8 +556,27 @@
559 border-radius: 16rpx; 556 border-radius: 16rpx;
560 } 557 }
561 558
562 -.centerBox { 559 +.pageSpacing {
  560 + position: relative;
  561 + display: flex;
563 justify-content: center; 562 justify-content: center;
  563 + align-items: center;
  564 + white-space: nowrap;
  565 + width: auto;
  566 + overflow-x: scroll;
  567 + border-bottom-left-radius: 10rpx;
  568 + border-bottom-right-radius: 10rpx;
  569 +}
  570 +
  571 +.pageSpacing1 {
  572 + position: relative;
  573 + display: flex;
  574 + white-space: nowrap;
  575 + width: auto;
  576 + overflow-x: scroll;
  577 + border-bottom-left-radius: 10rpx;
  578 + border-bottom-right-radius: 10rpx;
  579 + padding-left: 126rpx;
564 } 580 }
565 581
566 /* 黑蓝过渡 */ 582 /* 黑蓝过渡 */
@@ -43,7 +43,7 @@ Page({ @@ -43,7 +43,7 @@ Page({
43 tableinfo: [], 43 tableinfo: [],
44 StyleType: '', 44 StyleType: '',
45 showMoreTip: true, 45 showMoreTip: true,
46 - themeColor: 'lanCaiHe', 46 + themeColor: '',
47 screenHeight: '', 47 screenHeight: '',
48 whiteBj: false, 48 whiteBj: false,
49 }, 49 },
@@ -368,6 +368,7 @@ Page({ @@ -368,6 +368,7 @@ Page({
368 signboard = util.determine(data.signboard); 368 signboard = util.determine(data.signboard);
369 store = util.determine(data.store); 369 store = util.determine(data.store);
370 home = util.determine(data.home); 370 home = util.determine(data.home);
  371 + themeColor = data.lite_class;
371 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 372 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
372 if (marketing) { 373 if (marketing) {
373 is_comments = marketing.is_comments ? marketing.is_comments : ''; 374 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -411,6 +412,7 @@ Page({ @@ -411,6 +412,7 @@ Page({
411 swich_phone, 412 swich_phone,
412 is_comments, 413 is_comments,
413 StyleType: res.data.type, 414 StyleType: res.data.type,
  415 + themeColor,
414 } 416 }
415 console.log('获取数据', { 417 console.log('获取数据', {
416 ...obj 418 ...obj
@@ -440,19 +442,6 @@ Page({ @@ -440,19 +442,6 @@ Page({
440 between: true 442 between: true
441 }) 443 })
442 } 444 }
443 - // themeColor = 'blackBlueGradient' // 黑蓝过渡  
444 - // themeColor = 'stoneGreenGradient' // 石绿过渡  
445 - // themeColor = 'chinaRedGradient' // 中国红过渡  
446 - // themeColor = 'ultramarineGradient' // 群青过渡  
447 - // themeColor = 'crimson' // 深中国红  
448 - // themeColor = 'chinaRed' // 中国红  
449 - // themeColor = 'lanCaiHe' // 蓝采和  
450 - // themeColor = 'stoneGreen' // 石绿  
451 - // themeColor = 'turmeric' // 姜黄  
452 - // themeColor = 'greenishYellow' // 苍黄  
453 - // themeColor = 'golden' // 金黄  
454 - // themeColor = 'ultramarine' // 群青  
455 - themeColor = 'moroccanBlue' // 摩洛哥蓝  
456 if (themeColor == 'turmeric' || themeColor == 'golden') { 445 if (themeColor == 'turmeric' || themeColor == 'golden') {
457 whiteBj = true 446 whiteBj = true
458 } else { 447 } else {
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <view class="leftLine"></view> 10 <view class="leftLine"></view>
11 <view class="leftInfo font36r">{{seller.date}} {{seller.soltName}}</view> 11 <view class="leftInfo font36r">{{seller.date}} {{seller.soltName}}</view>
12 <view class="leftInfo font36r">{{seller.time}}</view> 12 <view class="leftInfo font36r">{{seller.time}}</view>
13 - <view class="leftInfo font36r">{{seller.tablesText}}</view> 13 + <view class="leftInfo font36r over">{{seller.tablesText}}</view>
14 <view class="leftInfo font36r tables" wx:if="{{detail.seller.phone}}">预订台 {{detail.seller.phone}}</view> 14 <view class="leftInfo font36r tables" wx:if="{{detail.seller.phone}}">预订台 {{detail.seller.phone}}</view>
15 </view> 15 </view>
16 <view class="line"></view> 16 <view class="line"></view>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <text>邀请函</text> 18 <text>邀请函</text>
19 </view> 19 </view>
20 </view> 20 </view>
21 - <view wx:if="{{roomimage && roomimage.length>0}}" class="page-section-spacing"> 21 + <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
22 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 22 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
23 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image> 23 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image>
24 <text>{{item.name}}</text> 24 <text>{{item.name}}</text>
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 <block wx:if="{{store}}"> 85 <block wx:if="{{store}}">
86 <view class="imgMask"> 86 <view class="imgMask">
87 <view class="IntroduceColor"> 87 <view class="IntroduceColor">
88 - <view class="text font36r rubric">餐厅介绍</view> 88 + <view class="text font36r rubric texts">餐厅介绍</view>
89 <view class="labelBox font24r"> 89 <view class="labelBox font24r">
90 {{store.introduce}} 90 {{store.introduce}}
91 </view> 91 </view>
@@ -94,31 +94,34 @@ @@ -94,31 +94,34 @@
94 <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 94 <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
95 <image src="{{item}}" mode="aspectFill" /> 95 <image src="{{item}}" mode="aspectFill" />
96 </block> 96 </block>
  97 + <view class="lines"></view>
97 </view> 98 </view>
98 </block> 99 </block>
99 <block wx:if="{{chef}}"> 100 <block wx:if="{{chef}}">
100 <view class="imgMask"> 101 <view class="imgMask">
101 <view class="IntroduceColor noneBor"> 102 <view class="IntroduceColor noneBor">
102 - <view class="text font36r rubric">主厨介绍</view> 103 + <view class="text font36r rubric texts">主厨介绍</view>
103 <view class="labelBox font24r"> 104 <view class="labelBox font24r">
104 {{chef.introduce}} 105 {{chef.introduce}}
105 </view> 106 </view>
106 </view> 107 </view>
107 <image src="{{chef.image}}" mode="aspectFill" /> 108 <image src="{{chef.image}}" mode="aspectFill" />
  109 + <view class="lines"></view>
108 </view> 110 </view>
109 </block> 111 </block>
110 <block wx:if="{{signboard && signboard.swich=='1'}}"> 112 <block wx:if="{{signboard && signboard.swich=='1'}}">
111 <view class="imgMask"> 113 <view class="imgMask">
112 <view class="IntroduceColor noneBor"> 114 <view class="IntroduceColor noneBor">
113 - <view class="text font36r rubric">特色菜品</view> 115 + <view class="text font36r rubric texts">特色菜品</view>
114 </view> 116 </view>
115 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 117 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
116 <image src="{{item}}" mode="aspectFill" /> 118 <image src="{{item}}" mode="aspectFill" />
117 </block> 119 </block>
  120 + <view class="lines"></view>
118 </view> 121 </view>
119 </block> 122 </block>
120 <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 123 <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
121 - <view class="rubric"> 124 + <view class="rubric texts">
122 提前点餐 125 提前点餐
123 </view> 126 </view>
124 <view class="news"> 127 <view class="news">
@@ -133,7 +136,7 @@ @@ -133,7 +136,7 @@
133 </view> 136 </view>
134 </view> 137 </view>
135 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 138 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
136 - <view class="rubric rubric1"> 139 + <view class="rubric rubric1 texts">
137 特别优惠 140 特别优惠
138 </view> 141 </view>
139 <!-- 当前日期要大于限制结束日期 --> 142 <!-- 当前日期要大于限制结束日期 -->
@@ -5,13 +5,13 @@ @@ -5,13 +5,13 @@
5 top: 0; 5 top: 0;
6 left: 0; 6 left: 0;
7 width: 750rpx; 7 width: 750rpx;
8 - height: 770rpx;  
9 position: relative; 8 position: relative;
  9 + padding-bottom: 20rpx;
10 } 10 }
11 11
12 .line { 12 .line {
13 width: 2rpx; 13 width: 2rpx;
14 - height: 364rpx; 14 + height: 400rpx;
15 background: #FFD200; 15 background: #FFD200;
16 margin: 0 20rpx 0 20rpx; 16 margin: 0 20rpx 0 20rpx;
17 } 17 }
@@ -86,14 +86,14 @@ @@ -86,14 +86,14 @@
86 86
87 87
88 .handleInfo { 88 .handleInfo {
89 - margin: 0 50rpx 0 44rpx; 89 + margin: 0 40rpx 0 40rpx;
90 display: flex; 90 display: flex;
91 justify-content: space-between; 91 justify-content: space-between;
92 align-items: center; 92 align-items: center;
93 } 93 }
94 94
95 .chefText { 95 .chefText {
96 - margin: 58rpx 40rpx 40rpx 40rpx; 96 + margin: 44rpx;
97 text-align: right; 97 text-align: right;
98 font-weight: 500; 98 font-weight: 500;
99 padding-bottom: 24rpx; 99 padding-bottom: 24rpx;
@@ -121,6 +121,9 @@ @@ -121,6 +121,9 @@
121 .handlePhone { 121 .handlePhone {
122 height: 100rpx; 122 height: 100rpx;
123 color: #515151; 123 color: #515151;
  124 + margin: 0 20rpx;
  125 + width: 45%;
  126 + overflow-y: scroll;
124 } 127 }
125 128
126 .brownFont { 129 .brownFont {
@@ -129,6 +132,7 @@ @@ -129,6 +132,7 @@
129 border: 2rpx solid #0143A3; 132 border: 2rpx solid #0143A3;
130 border-radius: 22rpx; 133 border-radius: 22rpx;
131 text-align: center; 134 text-align: center;
  135 + width: 130rpx;
132 } 136 }
133 137
134 .brownFont:nth-of-type(1) { 138 .brownFont:nth-of-type(1) {
@@ -137,7 +141,7 @@ @@ -137,7 +141,7 @@
137 141
138 142
139 .positioning { 143 .positioning {
140 - margin: 22rpx 40rpx 62rpx 40rpx; 144 + margin: 22rpx 70rpx 40rpx 70rpx;
141 display: flex; 145 display: flex;
142 justify-content: space-between; 146 justify-content: space-between;
143 border-radius: 10rpx; 147 border-radius: 10rpx;
@@ -157,17 +161,23 @@ @@ -157,17 +161,23 @@
157 161
158 .imgMask { 162 .imgMask {
159 position: relative; 163 position: relative;
160 - margin: 0 40rpx 20rpx 40rpx;  
161 - border-bottom: 2rpx solid #DBDBDB;  
162 - padding-bottom: 18rpx; 164 + margin: 0 20rpx;
  165 +}
  166 +
  167 +.lines {
  168 + height: 2rpx;
  169 + margin: 20rpx;
  170 + margin-bottom: 20rpx;
  171 + background-color: #DBDBDB;
163 } 172 }
164 173
165 .imgMask .IntroduceColor { 174 .imgMask .IntroduceColor {
166 border-bottom: 2rpx solid #DBDBDB; 175 border-bottom: 2rpx solid #DBDBDB;
  176 + margin: 0 20rpx 20rpx 20rpx;
167 } 177 }
168 178
169 -.IntroduceColor {  
170 - margin-bottom: 20rpx; 179 +.texts {
  180 + margin: 0 20rpx 20rpx 0 !important;
171 } 181 }
172 182
173 .imgMask .text { 183 .imgMask .text {
@@ -181,7 +191,6 @@ @@ -181,7 +191,6 @@
181 191
182 .imgMask image { 192 .imgMask image {
183 display: block !important; 193 display: block !important;
184 - margin-bottom: 4rpx;  
185 width: 100%; 194 width: 100%;
186 display: block; 195 display: block;
187 vertical-align: top; 196 vertical-align: top;
@@ -211,7 +220,7 @@ @@ -211,7 +220,7 @@
211 font-family: PingFang SC; 220 font-family: PingFang SC;
212 font-weight: 500; 221 font-weight: 500;
213 font-size: 36rpx; 222 font-size: 36rpx;
214 - margin-bottom: 10rpx; 223 + margin: 0 0 10rpx 20rpx;
215 } 224 }
216 225
217 .specialServices .news { 226 .specialServices .news {
@@ -228,9 +237,16 @@ @@ -228,9 +237,16 @@
228 justify-content: flex-end; 237 justify-content: flex-end;
229 height: 54rpx; 238 height: 54rpx;
230 margin: 20rpx 0; 239 margin: 20rpx 0;
231 - padding: 16rpx 0;  
232 } 240 }
233 241
  242 +.over {
  243 + overflow: hidden;
  244 + word-break: break-all;
  245 + text-overflow: ellipsis;
  246 + display: -webkit-box;
  247 + -webkit-box-orient: vertical;
  248 + -webkit-line-clamp: 2;
  249 +}
234 250
235 .orderingFood { 251 .orderingFood {
236 padding: 0 26rpx; 252 padding: 0 26rpx;
@@ -244,7 +260,7 @@ @@ -244,7 +260,7 @@
244 } 260 }
245 261
246 .preferential { 262 .preferential {
247 - margin: 16rpx 40rpx 20rpx 40rpx; 263 + margin: 0 40rpx 20rpx 40rpx;
248 } 264 }
249 265
250 .preferentialItems { 266 .preferentialItems {
@@ -287,6 +303,7 @@ @@ -287,6 +303,7 @@
287 } 303 }
288 304
289 .top text:nth-of-type(1) { 305 .top text:nth-of-type(1) {
  306 + max-width: 65%;
290 font-weight: 600; 307 font-weight: 600;
291 color: #515151; 308 color: #515151;
292 } 309 }
@@ -454,10 +471,6 @@ @@ -454,10 +471,6 @@
454 border-radius: 16rpx; 471 border-radius: 16rpx;
455 } 472 }
456 473
457 -.imgs:nth-of-type(1) {  
458 - margin-left: 48rpx;  
459 -}  
460 -  
461 .scroll-view { 474 .scroll-view {
462 white-space: nowrap; 475 white-space: nowrap;
463 width: 100%; 476 width: 100%;
@@ -486,14 +499,27 @@ @@ -486,14 +499,27 @@
486 border-bottom-right-radius: 16rpx; 499 border-bottom-right-radius: 16rpx;
487 } 500 }
488 501
489 -.page-section-spacing { 502 +.pageSpacing {
490 position: relative; 503 position: relative;
491 display: flex; 504 display: flex;
  505 + justify-content: center;
  506 + align-items: center;
492 white-space: nowrap; 507 white-space: nowrap;
493 width: auto; 508 width: auto;
494 overflow-x: scroll; 509 overflow-x: scroll;
  510 + border-bottom-left-radius: 10rpx;
  511 + border-bottom-right-radius: 10rpx;
  512 +}
  513 +
  514 +.pageSpacing1 {
495 position: relative; 515 position: relative;
496 - top: -13%; 516 + display: flex;
  517 + white-space: nowrap;
  518 + width: auto;
  519 + overflow-x: scroll;
  520 + border-bottom-left-radius: 10rpx;
  521 + border-bottom-right-radius: 10rpx;
  522 + padding-left: 48rpx;
497 } 523 }
498 524
499 .itemsLeft { 525 .itemsLeft {
@@ -367,6 +367,7 @@ Page({ @@ -367,6 +367,7 @@ Page({
367 signboard = util.determine(data.signboard); 367 signboard = util.determine(data.signboard);
368 store = util.determine(data.store); 368 store = util.determine(data.store);
369 home = util.determine(data.home); 369 home = util.determine(data.home);
  370 + themeColor = data.lite_class;
370 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 371 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
371 if (marketing) { 372 if (marketing) {
372 is_comments = marketing.is_comments ? marketing.is_comments : ''; 373 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -410,6 +411,7 @@ Page({ @@ -410,6 +411,7 @@ Page({
410 swich_phone, 411 swich_phone,
411 is_comments, 412 is_comments,
412 StyleType: res.data.type, 413 StyleType: res.data.type,
  414 + themeColor,
413 } 415 }
414 console.log('获取数据', { 416 console.log('获取数据', {
415 ...obj 417 ...obj
@@ -439,19 +441,6 @@ Page({ @@ -439,19 +441,6 @@ Page({
439 between: true 441 between: true
440 }) 442 })
441 } 443 }
442 - // themeColor = 'blackBlueGradient' // 黑蓝过渡  
443 - // themeColor = 'stoneGreenGradient' // 石绿过渡  
444 - // themeColor = 'chinaRedGradient' // 中国红过渡  
445 - // themeColor = 'ultramarineGradient' // 群青过渡  
446 - // themeColor = 'crimson' // 深中国红  
447 - // themeColor = 'chinaRed' // 中国红  
448 - // themeColor = 'lanCaiHe' // 蓝采和  
449 - // themeColor = 'stoneGreen' // 石绿  
450 - // themeColor = 'turmeric' // 姜黄  
451 - // themeColor = 'greenishYellow' // 苍黄  
452 - // themeColor = 'golden' // 金黄  
453 - // themeColor = 'ultramarine' // 群青  
454 - themeColor = 'moroccanBlue' // 摩洛哥蓝  
455 if (themeColor == 'turmeric' || themeColor == 'golden') { 444 if (themeColor == 'turmeric' || themeColor == 'golden') {
456 whiteBj = true 445 whiteBj = true
457 } else { 446 } else {
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <view class="leftLine"></view> 11 <view class="leftLine"></view>
12 <view class="leftInfo font32r">{{seller.date}} {{seller.soltName}}</view> 12 <view class="leftInfo font32r">{{seller.date}} {{seller.soltName}}</view>
13 <view class="leftInfo font32r">{{seller.time}}</view> 13 <view class="leftInfo font32r">{{seller.time}}</view>
14 - <view class="leftInfo font32r">{{seller.tablesText}}</view> 14 + <view class="leftInfo font32r over">{{seller.tablesText}}</view>
15 <view class="leftInfo font32r" wx:if="{{detail.seller.phone}}">预订台 {{detail.seller.phone}}</view> 15 <view class="leftInfo font32r" wx:if="{{detail.seller.phone}}">预订台 {{detail.seller.phone}}</view>
16 <view class="font32r addressInfo" bindtap="looklocation" wx:if="{{seller.addr|| reserev.seller.map_address}}"> 16 <view class="font32r addressInfo" bindtap="looklocation" wx:if="{{seller.addr|| reserev.seller.map_address}}">
17 <image src="https://qn.colorcun.com/whiteAddress.png" mode="" /> 17 <image src="https://qn.colorcun.com/whiteAddress.png" mode="" />
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 </view> 19 </view>
20 </view> 20 </view>
21 </view> 21 </view>
22 - <view wx:if="{{roomimage && roomimage.length>0}}" class="page-section-spacing"> 22 + <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
23 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 23 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
24 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image> 24 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image>
25 <text>{{item.name}}</text> 25 <text>{{item.name}}</text>
@@ -29,8 +29,8 @@ @@ -29,8 +29,8 @@
29 <view class="handleInfo"> 29 <view class="handleInfo">
30 <image wx:if="{{staffinfo && staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image> 30 <image wx:if="{{staffinfo && staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>
31 <view class="handle handlePhone"> 31 <view class="handle handlePhone">
32 - <view class="font28r">专属服务：{{staffinfo.name}}</view>  
33 - <view class="font28r">服务电话：{{staffinfo.phone}}</view> 32 + <view class="font28r">专属服务:{{staffinfo.name}}</view>
  33 + <view class="font28r">服务电话:{{staffinfo.phone}}</view>
34 </view> 34 </view>
35 <view class="handle"> 35 <view class="handle">
36 <view wx:if="{{staffinfo.phone}}" class="font22r brownFont" bindtap="call">拨打电话</view> 36 <view wx:if="{{staffinfo.phone}}" class="font22r brownFont" bindtap="call">拨打电话</view>
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 <block wx:if="{{store}}"> 80 <block wx:if="{{store}}">
81 <view class="imgMask"> 81 <view class="imgMask">
82 <view class="IntroduceColor"> 82 <view class="IntroduceColor">
83 - <view class="text font36r rubric">餐厅介绍</view> 83 + <view class="text font36r rubric texts">餐厅介绍</view>
84 <view class="labelBox font24r"> 84 <view class="labelBox font24r">
85 {{store.introduce}} 85 {{store.introduce}}
86 </view> 86 </view>
@@ -89,31 +89,34 @@ @@ -89,31 +89,34 @@
89 <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 89 <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
90 <image src="{{item}}" mode="aspectFill" /> 90 <image src="{{item}}" mode="aspectFill" />
91 </block> 91 </block>
  92 + <view class="lines"></view>
92 </view> 93 </view>
93 </block> 94 </block>
94 <block wx:if="{{chef}}"> 95 <block wx:if="{{chef}}">
95 <view class="imgMask"> 96 <view class="imgMask">
96 <view class="IntroduceColor noneBor"> 97 <view class="IntroduceColor noneBor">
97 - <view class="text font36r rubric">主厨介绍</view> 98 + <view class="text font36r rubric texts">主厨介绍</view>
98 <view class="labelBox font24r"> 99 <view class="labelBox font24r">
99 {{chef.introduce}} 100 {{chef.introduce}}
100 </view> 101 </view>
101 </view> 102 </view>
102 <image src="{{chef.image}}" mode="aspectFill" /> 103 <image src="{{chef.image}}" mode="aspectFill" />
  104 + <view class="lines"></view>
103 </view> 105 </view>
104 </block> 106 </block>
105 <block wx:if="{{signboard && signboard.swich=='1'}}"> 107 <block wx:if="{{signboard && signboard.swich=='1'}}">
106 <view class="imgMask"> 108 <view class="imgMask">
107 <view class="IntroduceColor noneBor"> 109 <view class="IntroduceColor noneBor">
108 - <view class="text font36r rubric">特色菜品</view> 110 + <view class="text font36r rubric texts">特色菜品</view>
109 </view> 111 </view>
110 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 112 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
111 <image src="{{item}}" mode="aspectFill" /> 113 <image src="{{item}}" mode="aspectFill" />
112 </block> 114 </block>
  115 + <view class="lines"></view>
113 </view> 116 </view>
114 </block> 117 </block>
115 <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 118 <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
116 - <view class="rubric"> 119 + <view class="rubric texts">
117 提前点餐 120 提前点餐
118 </view> 121 </view>
119 <view class="news"> 122 <view class="news">
@@ -20,6 +20,13 @@ @@ -20,6 +20,13 @@
20 font-family: PingFang SC; 20 font-family: PingFang SC;
21 color: #FFD200; 21 color: #FFD200;
22 font-weight: 500; 22 font-weight: 500;
  23 + overflow: hidden;
  24 + word-break: break-all;
  25 + text-overflow: ellipsis;
  26 + display: -webkit-box;
  27 + -webkit-box-orient: vertical;
  28 + -webkit-line-clamp: 1;
  29 + margin-right: 20rpx;
23 } 30 }
24 31
25 .infoBox .boxLeft { 32 .infoBox .boxLeft {
@@ -33,7 +40,7 @@ @@ -33,7 +40,7 @@
33 width: 95%; 40 width: 95%;
34 height: 2rpx; 41 height: 2rpx;
35 background: #FFD200; 42 background: #FFD200;
36 - margin: 20rpx 0; 43 + margin: 20rpx 20rpx 20rpx 0;
37 } 44 }
38 45
39 .leftInfo { 46 .leftInfo {
@@ -43,6 +50,7 @@ @@ -43,6 +50,7 @@
43 flex-wrap: wrap; 50 flex-wrap: wrap;
44 word-break: break-all; 51 word-break: break-all;
45 font-family: PingFang SC; 52 font-family: PingFang SC;
  53 + margin-right: 20rpx;
46 } 54 }
47 55
48 .infoBox { 56 .infoBox {
@@ -93,14 +101,14 @@ @@ -93,14 +101,14 @@
93 } 101 }
94 102
95 .handleInfo { 103 .handleInfo {
96 - margin: 50rpx 50rpx 0 44rpx; 104 + margin: 50rpx 40rpx 0 40rpx;
97 display: flex; 105 display: flex;
98 justify-content: space-between; 106 justify-content: space-between;
99 align-items: center; 107 align-items: center;
100 } 108 }
101 109
102 .chefText { 110 .chefText {
103 - margin: 34rpx 0 10rpx 0; 111 + margin: 30rpx 20rpx 10rpx 20rpx;
104 text-align: center; 112 text-align: center;
105 font-weight: 500; 113 font-weight: 500;
106 padding-bottom: 20rpx; 114 padding-bottom: 20rpx;
@@ -127,6 +135,10 @@ @@ -127,6 +135,10 @@
127 135
128 .handlePhone { 136 .handlePhone {
129 height: 100rpx; 137 height: 100rpx;
  138 + color: #fff;
  139 + margin: 0 10rpx;
  140 + width: 45%;
  141 + overflow-y: scroll;
130 } 142 }
131 143
132 .brownFont { 144 .brownFont {
@@ -135,6 +147,7 @@ @@ -135,6 +147,7 @@
135 border: 2rpx solid #fff; 147 border: 2rpx solid #fff;
136 border-radius: 22rpx; 148 border-radius: 22rpx;
137 text-align: center; 149 text-align: center;
  150 + width: 130rpx;
138 } 151 }
139 152
140 .brownFont:nth-of-type(1) { 153 .brownFont:nth-of-type(1) {
@@ -147,13 +160,24 @@ @@ -147,13 +160,24 @@
147 160
148 .imgMask { 161 .imgMask {
149 position: relative; 162 position: relative;
150 - margin: 0 40rpx 20rpx 40rpx;  
151 - border-bottom: 2rpx solid #DBDBDB;  
152 - padding-bottom: 18rpx; 163 + margin: 0 20rpx;
153 } 164 }
154 165
  166 +.lines {
  167 + height: 2rpx;
  168 + margin: 20rpx;
  169 + margin-bottom: 20rpx;
  170 + background-color: #DBDBDB;
  171 +}
  172 +
  173 +
155 .imgMask .IntroduceColor { 174 .imgMask .IntroduceColor {
156 border-bottom: 2rpx solid #DBDBDB; 175 border-bottom: 2rpx solid #DBDBDB;
  176 + margin: 0 20rpx 20rpx 20rpx;
  177 +}
  178 +
  179 +.texts {
  180 + margin: 0 20rpx 20rpx 0 !important;
157 } 181 }
158 182
159 .IntroduceColor { 183 .IntroduceColor {
@@ -171,7 +195,6 @@ @@ -171,7 +195,6 @@
171 195
172 .imgMask image { 196 .imgMask image {
173 display: block !important; 197 display: block !important;
174 - margin-bottom: 4rpx;  
175 width: 100%; 198 width: 100%;
176 display: block; 199 display: block;
177 vertical-align: top; 200 vertical-align: top;
@@ -201,7 +224,7 @@ @@ -201,7 +224,7 @@
201 font-family: PingFang SC; 224 font-family: PingFang SC;
202 font-weight: 500; 225 font-weight: 500;
203 font-size: 36rpx; 226 font-size: 36rpx;
204 - margin-bottom: 10rpx; 227 + margin: 0 0 10rpx 20rpx;
205 } 228 }
206 229
207 .specialServices .news { 230 .specialServices .news {
@@ -269,7 +292,17 @@ @@ -269,7 +292,17 @@
269 text-align: left; 292 text-align: left;
270 } 293 }
271 294
  295 +.over {
  296 + overflow: hidden;
  297 + word-break: break-all;
  298 + text-overflow: ellipsis;
  299 + display: -webkit-box;
  300 + -webkit-box-orient: vertical;
  301 + -webkit-line-clamp: 2;
  302 +}
  303 +
272 .top text:nth-of-type(1) { 304 .top text:nth-of-type(1) {
  305 + max-width: 65%;
273 font-weight: 600; 306 font-weight: 600;
274 color: #515151; 307 color: #515151;
275 } 308 }
@@ -441,10 +474,6 @@ @@ -441,10 +474,6 @@
441 border-radius: 16rpx; 474 border-radius: 16rpx;
442 } 475 }
443 476
444 -.imgs:nth-of-type(1) {  
445 - margin-left: 48rpx;  
446 -}  
447 -  
448 .scroll-view { 477 .scroll-view {
449 white-space: nowrap; 478 white-space: nowrap;
450 width: 100%; 479 width: 100%;
@@ -473,14 +502,31 @@ @@ -473,14 +502,31 @@
473 border-bottom-right-radius: 16rpx; 502 border-bottom-right-radius: 16rpx;
474 } 503 }
475 504
476 -.page-section-spacing { 505 +
  506 +.pageSpacing {
  507 + position: relative;
  508 + display: flex;
  509 + justify-content: center;
  510 + align-items: center;
  511 + white-space: nowrap;
  512 + width: auto;
  513 + overflow-x: scroll;
  514 + border-bottom-left-radius: 10rpx;
  515 + border-bottom-right-radius: 10rpx;
  516 +}
  517 +
  518 +.pageSpacing1 {
477 position: relative; 519 position: relative;
478 display: flex; 520 display: flex;
479 white-space: nowrap; 521 white-space: nowrap;
480 width: auto; 522 width: auto;
481 overflow-x: scroll; 523 overflow-x: scroll;
  524 + border-bottom-left-radius: 10rpx;
  525 + border-bottom-right-radius: 10rpx;
  526 + padding-left: 48rpx;
482 } 527 }
483 528
  529 +
484 .more { 530 .more {
485 height: 80rpx; 531 height: 80rpx;
486 width: 100%; 532 width: 100%;
@@ -314,7 +314,7 @@ Page({ @@ -314,7 +314,7 @@ Page({
314 signboard = util.determine(data.signboard); 314 signboard = util.determine(data.signboard);
315 store = util.determine(data.store); 315 store = util.determine(data.store);
316 home = util.determine(data.home); 316 home = util.determine(data.home);
317 - themeColor = data.lite_class 317 + themeColor = data.lite_class;
318 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 318 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
319 if (marketing) { 319 if (marketing) {
320 is_comments = marketing.is_comments ? marketing.is_comments : ''; 320 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -358,6 +358,7 @@ Page({ @@ -358,6 +358,7 @@ Page({
358 swich_phone, 358 swich_phone,
359 is_comments, 359 is_comments,
360 StyleType: res.data.type, 360 StyleType: res.data.type,
  361 + themeColor,
361 } 362 }
362 console.log('获取数据', { 363 console.log('获取数据', {
363 ...obj 364 ...obj
@@ -16,32 +16,32 @@ @@ -16,32 +16,32 @@
16 </view> 16 </view>
17 <view class="infoRight"> 17 <view class="infoRight">
18 <view class="begin"> 18 <view class="begin">
19 - <view>尊敬的贵宾，您好！</view>  
20 - <view>非常感谢您选择【{{seller.name?seller.name:reserve.seller_name}}】！</view> 19 + <view class="font40r">尊敬的贵宾，您好！</view>
  20 + <view class="font40r">非常感谢您选择【{{seller.name?seller.name:reserve.seller_name}}】！</view>
21 </view> 21 </view>
22 <view class="flex-11" wx:if="{{seller.date}}"> 22 <view class="flex-11" wx:if="{{seller.date}}">
23 - <view class="label">【日期】</view>  
24 - <view class="contentData">{{seller.date}}</view> 23 + <view class="label font36r">【日期】</view>
  24 + <view class="contentData font36r">{{seller.date}}</view>
25 </view> 25 </view>
26 <view class="flex-11" wx:if="{{seller.soltName}}"> 26 <view class="flex-11" wx:if="{{seller.soltName}}">
27 - <view class="label">【餐段】</view>  
28 - <view class="contentData">{{seller.soltName}}</view> 27 + <view class="label font36r">【餐段】</view>
  28 + <view class="contentData font36r">{{seller.soltName}}</view>
29 </view> 29 </view>
30 <view class="flex-11" wx:if="{{seller.tablesText}}"> 30 <view class="flex-11" wx:if="{{seller.tablesText}}">
31 - <view class="label">【包间】</view>  
32 - <view class="contentData bold">{{seller.tablesText}}</view> 31 + <view class="label font36r">【包间】</view>
  32 + <view class="contentData bold font36r">{{seller.tablesText}}</view>
33 </view> 33 </view>
34 <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}"> 34 <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}">
35 - <view class="label">【人数】</view>  
36 - <view class="contentData">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view> 35 + <view class="label font36r">【人数】</view>
  36 + <view class="contentData font36r">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view>
37 </view> 37 </view>
38 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}"> 38 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
39 - <view class="label">【停车】</view>  
40 - <view class="contentData">{{reserve.park_info}}</view> 39 + <view class="label font36r">【停车】</view>
  40 + <view class="contentData font36r">{{reserve.park_info}}</view>
41 </view> 41 </view>
42 <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}"> 42 <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}">
43 - <view class="label">【联系】</view>  
44 - <view class="contentData">{{detail.seller.phone}}</view> 43 + <view class="label font36r">【联系】</view>
  44 + <view class="contentData font36r">{{detail.seller.phone}}</view>
45 </view> 45 </view>
46 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 46 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
47 <view class="handleInfo"> 47 <view class="handleInfo">
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 font-size: 40rpx; 29 font-size: 40rpx;
30 color: #D8C46B; 30 color: #D8C46B;
31 position: relative; 31 position: relative;
32 - top: -68rpx; 32 + top: -50rpx;
33 } 33 }
34 34
35 .homeImage { 35 .homeImage {
@@ -47,7 +47,8 @@ @@ -47,7 +47,8 @@
47 position: absolute; 47 position: absolute;
48 width: 4rpx; 48 width: 4rpx;
49 height: 98%; 49 height: 98%;
50 - margin: 0 16rpx 0 0; 50 + margin: 0 20rpx 0 0;
  51 + margin-right: 20rpx;
51 background: linear-gradient(270deg, #eeae74 20%, #0c0f0e 124%); 52 background: linear-gradient(270deg, #eeae74 20%, #0c0f0e 124%);
52 } 53 }
53 54
@@ -60,11 +61,10 @@ @@ -60,11 +61,10 @@
60 margin-top: 20rpx; 61 margin-top: 20rpx;
61 color: #000000; 62 color: #000000;
62 font-family: PingFang SC; 63 font-family: PingFang SC;
63 - font-size: 32rpx;  
64 } 64 }
65 65
66 .begin view { 66 .begin view {
67 - line-height: 50rpx; 67 + line-height: 64rpx;
68 } 68 }
69 69
70 .flex-11 { 70 .flex-11 {
@@ -72,14 +72,12 @@ @@ -72,14 +72,12 @@
72 line-height: 60rpx; 72 line-height: 60rpx;
73 color: #000000; 73 color: #000000;
74 font-family: PingFang SC; 74 font-family: PingFang SC;
75 - font-size: 32rpx;  
76 } 75 }
77 76
78 .label { 77 .label {
79 flex-shrink: 0; 78 flex-shrink: 0;
80 color: #000000; 79 color: #000000;
81 font-family: PingFang SC; 80 font-family: PingFang SC;
82 - font-size: 32rpx;  
83 } 81 }
84 82
85 .contentData { 83 .contentData {
@@ -87,7 +85,6 @@ @@ -87,7 +85,6 @@
87 line-height: 60rpx; 85 line-height: 60rpx;
88 color: #000000; 86 color: #000000;
89 font-family: PingFang SC; 87 font-family: PingFang SC;
90 - font-size: 32rpx;  
91 } 88 }
92 89
93 .handleInfo { 90 .handleInfo {
@@ -95,6 +92,7 @@ @@ -95,6 +92,7 @@
95 display: flex; 92 display: flex;
96 justify-content: space-between; 93 justify-content: space-between;
97 align-items: center; 94 align-items: center;
  95 + margin: 8rpx 0;
98 } 96 }
99 97
100 .welcome { 98 .welcome {
@@ -130,6 +128,9 @@ @@ -130,6 +128,9 @@
130 .handlePhone { 128 .handlePhone {
131 height: 100rpx; 129 height: 100rpx;
132 color: #515151; 130 color: #515151;
  131 + margin: 0 20rpx;
  132 + width: 45%;
  133 + overflow-y: scroll;
133 } 134 }
134 135
135 .brownFont { 136 .brownFont {
@@ -138,6 +139,7 @@ @@ -138,6 +139,7 @@
138 border: 2rpx solid #0143A3; 139 border: 2rpx solid #0143A3;
139 border-radius: 22rpx; 140 border-radius: 22rpx;
140 text-align: center; 141 text-align: center;
  142 + width: 130rpx;
141 } 143 }
142 144
143 .handle text { 145 .handle text {
@@ -213,11 +215,6 @@ @@ -213,11 +215,6 @@
213 position: relative; 215 position: relative;
214 } 216 }
215 217
216 -.famousChefBox .imgMask,  
217 -.vegetableBox .imgMask {  
218 - margin: 0 0 18rpx 0;  
219 -}  
220 -  
221 .imgMask image { 218 .imgMask image {
222 height: calc(100vw * 0.82) !important; 219 height: calc(100vw * 0.82) !important;
223 } 220 }
@@ -235,7 +232,7 @@ @@ -235,7 +232,7 @@
235 } 232 }
236 233
237 .shopName { 234 .shopName {
238 - margin: 16rpx 0 20rpx 0; 235 + margin: 22rpx 0;
239 color: #ffffff; 236 color: #ffffff;
240 font-family: PingFang SC; 237 font-family: PingFang SC;
241 } 238 }
@@ -361,7 +358,7 @@ @@ -361,7 +358,7 @@
361 358
362 .englishText { 359 .englishText {
363 font-family: PingFang SC; 360 font-family: PingFang SC;
364 - margin: 30rpx 0 0 0; 361 + margin: 20rpx 0 0 0;
365 color: #b39437; 362 color: #b39437;
366 } 363 }
367 364
@@ -390,6 +387,10 @@ @@ -390,6 +387,10 @@
390 justify-content: flex-end; 387 justify-content: flex-end;
391 } 388 }
392 389
  390 +.famousChefBox .labelBox .label {
  391 + margin-right: 0;
  392 +}
  393 +
393 .specialServices { 394 .specialServices {
394 margin: 16rpx 40rpx; 395 margin: 16rpx 40rpx;
395 border-bottom: 2rpx solid #DBDBDB; 396 border-bottom: 2rpx solid #DBDBDB;
@@ -477,6 +478,7 @@ @@ -477,6 +478,7 @@
477 } 478 }
478 479
479 .top text:nth-of-type(1) { 480 .top text:nth-of-type(1) {
  481 + max-width: 65%;
480 font-weight: 600; 482 font-weight: 600;
481 color: #515151; 483 color: #515151;
482 } 484 }
@@ -623,7 +625,7 @@ @@ -623,7 +625,7 @@
623 } 625 }
624 626
625 .evaluateBox { 627 .evaluateBox {
626 - margin: 16rpx 84rpx 16rpx 40rpx; 628 + margin: 20rpx 84rpx 40rpx 40rpx;
627 display: flex; 629 display: flex;
628 align-items: center; 630 align-items: center;
629 justify-content: space-between; 631 justify-content: space-between;
@@ -43,7 +43,7 @@ Page({ @@ -43,7 +43,7 @@ Page({
43 tableinfo: [], 43 tableinfo: [],
44 StyleType: '', 44 StyleType: '',
45 showMoreTip: true, 45 showMoreTip: true,
46 - themeColor: 'lanCaiHe', 46 + themeColor: '',
47 screenHeight: '', 47 screenHeight: '',
48 }, 48 },
49 tablestr: '', 49 tablestr: '',
@@ -411,6 +411,7 @@ Page({ @@ -411,6 +411,7 @@ Page({
411 swich_phone, 411 swich_phone,
412 is_comments, 412 is_comments,
413 StyleType: res.data.type, 413 StyleType: res.data.type,
  414 + themeColor,
414 } 415 }
415 console.log('获取数据', { 416 console.log('获取数据', {
416 ...obj 417 ...obj
@@ -29,12 +29,10 @@ @@ -29,12 +29,10 @@
29 29
30 30
31 .reservationInfo .flex-11 { 31 .reservationInfo .flex-11 {
32 - margin-left: 30rpx;  
33 - width: 100%; 32 + margin: 0 30rpx;
34 display: flex; 33 display: flex;
35 line-height: 70rpx; 34 line-height: 70rpx;
36 font-family: PingFang SC; 35 font-family: PingFang SC;
37 - font-size: 32rpx;  
38 align-items: center; 36 align-items: center;
39 } 37 }
40 38
@@ -83,6 +81,11 @@ @@ -83,6 +81,11 @@
83 81
84 .handlePhone { 82 .handlePhone {
85 height: 100rpx; 83 height: 100rpx;
  84 + margin: 0 20rpx;
  85 + color: #515151;
  86 + margin: 0 20rpx;
  87 + width: 45%;
  88 + overflow-y: scroll;
86 } 89 }
87 90
88 .brownFont { 91 .brownFont {
@@ -91,6 +94,7 @@ @@ -91,6 +94,7 @@
91 border: 2rpx solid #FBF6F1; 94 border: 2rpx solid #FBF6F1;
92 border-radius: 22rpx; 95 border-radius: 22rpx;
93 text-align: center; 96 text-align: center;
  97 + width: 130rpx;
94 } 98 }
95 99
96 .brownFont:nth-of-type(1) { 100 .brownFont:nth-of-type(1) {
@@ -126,7 +130,7 @@ @@ -126,7 +130,7 @@
126 } 130 }
127 131
128 .positioning .name { 132 .positioning .name {
129 - width: 80%; 133 + width: 95%;
130 display: flex; 134 display: flex;
131 align-items: center; 135 align-items: center;
132 font-family: PingFang SC; 136 font-family: PingFang SC;
@@ -136,6 +140,7 @@ @@ -136,6 +140,7 @@
136 140
137 .positioning .name text { 141 .positioning .name text {
138 line-height: 50rpx; 142 line-height: 50rpx;
  143 + width: 100%;
139 } 144 }
140 145
141 .positioning .name text:nth-of-type(2) { 146 .positioning .name text:nth-of-type(2) {
@@ -306,12 +311,13 @@ @@ -306,12 +311,13 @@
306 } 311 }
307 312
308 .itemTop text:nth-of-type(1) { 313 .itemTop text:nth-of-type(1) {
  314 + max-width: 65%;
309 font-weight: 600; 315 font-weight: 600;
310 color: #515151; 316 color: #515151;
311 } 317 }
312 318
313 .itemTop .discountText { 319 .itemTop .discountText {
314 - padding: 0 6rpx; 320 + text-align: center;
315 color: #E34D59; 321 color: #E34D59;
316 border: 2rpx solid #E34D59; 322 border: 2rpx solid #E34D59;
317 border-radius: 6rpx; 323 border-radius: 6rpx;
@@ -149,7 +149,7 @@ Page({ @@ -149,7 +149,7 @@ Page({
149 } 149 }
150 } else { 150 } else {
151 if (opt.hasInvitation == 1 && configType) { 151 if (opt.hasInvitation == 1 && configType) {
152 - url = '/pages/customer/detail_owner_invitation_new' + configType; 152 + url = '/pages/customer/detail_owner_invitation' + configType;
153 } else if (res.data.openid == opt.openid) { 153 } else if (res.data.openid == opt.openid) {
154 url = '/pages/customer/detail_owner'; 154 url = '/pages/customer/detail_owner';
155 } else { 155 } else {
@@ -600,7 +600,7 @@ @@ -600,7 +600,7 @@
600 { 600 {
601 "name": "邀请函-----2", 601 "name": "邀请函-----2",
602 "pathName": "pages/customer/detail_owner_invitation2", 602 "pathName": "pages/customer/detail_owner_invitation2",
603 - "query": "id=401339&hasInvitation=1&hasSellerShare=1&tplid=1", 603 + "query": "id=400725&hasInvitation=1&hasSellerShare=1&tplid=1",
604 "launchMode": "default", 604 "launchMode": "default",
605 "scene": null 605 "scene": null
606 }, 606 },