xt / xcx-book · Commits

Go to a project

Commit 8c50e9f40f2a2e2ca1a071534db3447a30f31405

Authored by yiren
1 parent 2f9e39aa
build: skipped

”新邀请函默认样式”

Inline Side-by-side
Showing 4 changed files with 31 additions and 1 deletions
@@ -14,6 +14,7 @@ Page({ @@ -14,6 +14,7 @@ Page({
14 }, 14 },
15 detail:{}, 15 detail:{},
16 between: false, 16 between: false,
  17 + is_display:true,
17 id: null, 18 id: null,
18 msgTpl: '', 19 msgTpl: '',
19 chef: {}, 20 chef: {},
@@ -133,6 +134,7 @@ Page({ @@ -133,6 +134,7 @@ Page({
133 detail: this.formatDatail(reserev, dateSmart), 134 detail: this.formatDatail(reserev, dateSmart),
134 seller: { 135 seller: {
135 name: reserev.seller.sellername, 136 name: reserev.seller.sellername,
  137 + sid:reserev.sid,
136 room: tables.join('、'), 138 room: tables.join('、'),
137 date: dateSmart, 139 date: dateSmart,
138 region: regions.join('、'), 140 region: regions.join('、'),
@@ -146,6 +148,11 @@ Page({ @@ -146,6 +148,11 @@ Page({
146 soltName: reserev.soltName 148 soltName: reserev.soltName
147 } 149 }
148 }) 150 })
  151 + if(this.data.seller.sid=="677" || this.data.seller.sid=="26" || this.data.seller.sid=="8" || this.data.seller.sid=="4352"){
  152 + this.setData({
  153 + is_display : false
  154 + })
  155 + }
149 console.log(reserev,'reserevreserevreserevreserevreserev'); 156 console.log(reserev,'reserevreserevreserevreserevreserev');
150 console.log(this.data.seller,'sellersellersellerseller'); 157 console.log(this.data.seller,'sellersellersellerseller');
151 console.log(this.data.detail,'detaildetaildetaildetail'); 158 console.log(this.data.detail,'detaildetaildetaildetail');
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
177 </view> 177 </view>
178 </view> 178 </view>
179 </view> 179 </view>
180 - <view class="specialServices" wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}"> 180 + <view class="specialServices" wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel && is_display}}">
181 <view class="rubric"> 181 <view class="rubric">
182 特供服务 182 特供服务
183 </view> 183 </view>
@@ -72,6 +72,7 @@ @@ -72,6 +72,7 @@
72 72
73 .homeImage { 73 .homeImage {
74 width: 100%; 74 width: 100%;
  75 + height: auto;
75 } 76 }
76 77
77 .reservationInfo { 78 .reservationInfo {
@@ -487,6 +488,7 @@ @@ -487,6 +488,7 @@
487 .vips image { 488 .vips image {
488 width: 80%; 489 width: 80%;
489 margin-top: 36rpx; 490 margin-top: 36rpx;
  491 + height: auto;
490 } 492 }
491 493
492 .vips { 494 .vips {
  1 +Exception: STATUS_ACCESS_VIOLATION at rip=0010042535E
  2 +rax=000000000000005F rbx=00000000FFFFFFFA rcx=0000000000000000
  3 +rdx=0000000000000004 rsi=00000000FFFFC200 rdi=0000000000000013
  4 +r8 =00000000FFFFC200 r9 =0000000000000000 r10=0000000000000000
  5 +r11=0000000000000246 r12=0000000000000001 r13=0000000000000004
  6 +r14=0000000000000018 r15=00000001004E8600
  7 +rbp=00000000FFFFC1A0 rsp=00000000FFFFC120
  8 +program=C:\Program Files\Git\usr\bin\mintty.exe, pid 46, thread main
  9 +cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
  10 +Stack trace:
  11 +Frame Function Args
  12 +000FFFFC1A0 0010042535E (00000000000, 00F00000002, 000D90D6627, 01300000018)
  13 +000FFFFC2D0 00100440C09 (00000000000, 00000000070, FFFFFFFFFFFFFFFF, FFFFFFFFFFFFFFFF)
  14 +000FFFFC2D0 0010044A753 (7FFFD7BA30D5, 00000000000, 00000000022, 000000A0E14)
  15 +000FFFFC570 7FFFD7B98281 (0010044A170, 000000A0E14, 000FFFFC5D0, 00000000008)
  16 +000FFFFC570 7FFFD7B97D41 (00000000001, 00800053CB0, 00800042070, 00800000001)
  17 +000FFFFC570 00100460B83 (001801BA45A, 00000000000, 0000000000E, 000FFFFCD30)
  18 +000FFFFCD30 00180049B91 (00000000000, 00000000000, 00000000000, 00000000000)
  19 +000FFFFFFF0 00180047716 (00000000000, 00000000000, 00000000000, 00000000000)
  20 +000FFFFFFF0 001800477C4 (00000000000, 00000000000, 00000000000, 00000000000)
  21 +End of stack trace