xt / xcx-book · Commits

Go to a project

Commit 7d343be4f0d993faa63932f77aabe26d74a0618e

Authored by pengye
1 parent 3fcb5106
build: skipped

邀请函新模板

Inline Side-by-side
Showing 16 changed files with 314 additions and 294 deletions
@@ -142,17 +142,10 @@ Page({ @@ -142,17 +142,10 @@ Page({
142 // 支付失败回调 types 1邀请函 2提前点餐 3商家端app分享 142 // 支付失败回调 types 1邀请函 2提前点餐 3商家端app分享
143 callbackFun() { 143 callbackFun() {
144 let that = this; 144 let that = this;
145 - let url = '/pages/customer/detail_owner_invitation_new1?id=' + that.data.opt.detail.oid; 145 + let url = '/pages/customer/detail_owner_invitation1?id=' + that.data.opt.detail.oid;
146 if(that.data.opt.types == '1'){ 146 if(that.data.opt.types == '1'){
147 console.log('StyleType',this.data.StyleType); 147 console.log('StyleType',this.data.StyleType);
148 - switch (this.data.StyleType) {  
149 - case '1':  
150 - url = '/pages/customer/detail_owner_invitation_new1?id=' + that.data.opt.detail.oid;  
151 - break;  
152 - case '2':  
153 - url = '/pages/customer/detail_owner_invitation_new2?id=' + that.data.opt.detail.oid;  
154 - break;  
155 - } 148 + url = `/pages/customer/detail_owner_invitation${that.data.StyleType}?id=${that.data.opt.detail.oid}`;
156 } 149 }
157 if (that.data.opt.types == '2') { 150 if (that.data.opt.types == '2') {
158 let data={} 151 let data={}
@@ -178,17 +171,8 @@ Page({ @@ -178,17 +171,8 @@ Page({
178 console.log('充值完成跳转', this.data.opt.detail.oid); 171 console.log('充值完成跳转', this.data.opt.detail.oid);
179 console.log('StyleType',this.data.StyleType); 172 console.log('StyleType',this.data.StyleType);
180 this.closeModal() 173 this.closeModal()
181 - let url=`/pages/customer/detail_owner_invitation_new1?id=${this.data.opt.detail.oid}&hasInvitation=1&hasSellerShare=1&tplid=1`  
182 - switch (this.data.StyleType) {  
183 - case '1':  
184 - url = `/pages/customer/detail_owner_invitation_new1?id=${this.data.opt.detail.oid}&hasInvitation=1&hasSellerShare=1&tplid=1`  
185 - break;  
186 - case '2':  
187 - url = `/pages/customer/detail_owner_invitation_new2?id=${this.data.opt.detail.oid}&hasInvitation=1&hasSellerShare=1&tplid=1`  
188 - break;  
189 - }  
190 wx.reLaunch({ 174 wx.reLaunch({
191 - url 175 + url:`/pages/customer/detail_owner_invitation${this.data.StyleType}?id=${this.data.opt.detail.oid}&hasInvitation=1&hasSellerShare=1&tplid=1`
192 }) 176 })
193 }, 177 },
194 // 绑定名称 178 // 绑定名称
@@ -355,17 +339,8 @@ Page({ @@ -355,17 +339,8 @@ Page({
355 navEvent() { 339 navEvent() {
356 // 1 邀请函 2 提前点餐 3商家端分享 340 // 1 邀请函 2 提前点餐 3商家端分享
357 if (this.data.opt.types == '1') { 341 if (this.data.opt.types == '1') {
358 - let url='/pages/customer/detail_owner_invitation_new1?id=' + this.data.opt.detail.oid;  
359 - switch (this.data.StyleType) {  
360 - case '1':  
361 - url = '/pages/customer/detail_owner_invitation_new1?id=' + this.data.opt.detail.oid;  
362 - break;  
363 - case '2':  
364 - url = '/pages/customer/detail_owner_invitation_new1?id=' + this.data.opt.detail.oid;  
365 - break;  
366 - }  
367 return wx.reLaunch({ 342 return wx.reLaunch({
368 - url, 343 + url:`/pages/customer/detail_owner_invitation${this.data.StyleType}?id=${this.data.opt.detail.oid}`
369 }) 344 })
370 } 345 }
371 if (this.data.opt.types == '2') { 346 if (this.data.opt.types == '2') {
@@ -67,17 +67,8 @@ Page({ @@ -67,17 +67,8 @@ Page({
67 App.Seller.GetSellerTemplateConf({ 67 App.Seller.GetSellerTemplateConf({
68 sid:this.detail.seller.id 68 sid:this.detail.seller.id
69 }).then(res => { 69 }).then(res => {
70 - let url=`/pages/customer/detail_owner_invitation_new1?id=${detail.id}}&hasInvitation=1&hasSellerShare=1&tplid=1`  
71 - switch (res.data.type) {  
72 - case '1':  
73 - url = `/pages/customer/detail_owner_invitation_new1?id=${detail.id}}&hasInvitation=1&hasSellerShare=1&tplid=1`  
74 - break;  
75 - case '2':  
76 - url = `/pages/customer/detail_owner_invitation_new2?id=${detail.id}}&hasInvitation=1&hasSellerShare=1&tplid=1`  
77 - break;  
78 - }  
79 wx.navigateTo({ 70 wx.navigateTo({
80 - url, 71 + url:`/pages/customer/detail_owner_invitation${this.data.StyleType}?id=${detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`
81 }) 72 })
82 }) 73 })
83 }, 74 },
1 /* pages/customer/detail_customer.wxss */ 1 /* pages/customer/detail_customer.wxss */
2 @import "../tpl/tpls.wxss"; 2 @import "../tpl/tpls.wxss";
3 3
4 -.pages{  
5 - width: 100%;  
6 - background-size: 100%;  
7 - font-size: 34rpx;  
8 - position: fixed;  
9 - left: 0;  
10 - top: 0;  
11 - bottom: 0;  
12 -}  
13 -  
14 -image{  
15 - width: 100%;  
16 - height: 100%;  
17 -}  
18 -.buts-share{  
19 - background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E5%8F%91%E9%82%80%E8%AF%B7%E5%87%BD.png");  
20 -}  
21 -.buts-share.customer{  
22 - background-image: url("http://nosqn.colorcun.com/manager-invitation/wx/%E7%A1%AE%E8%AE%A4%E6%94%B6%E5%88%B0.png");  
23 -}  
24 -  
25 -.shangwu{  
26 - margin-top: 52rpx;  
27 -}  
28 -.shangwu .seller{  
29 - margin-bottom: 42rpx;  
30 -}  
31 -.shangwu .invit-logo.owner{  
32 - width: 380rpx;  
33 - height: 200rpx;  
34 - background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E9%A2%84%E8%AE%A2%E5%AE%89%E6%8E%92.png");  
35 -}  
36 -.shangwu .invit-logo.customer{  
37 - width: 352rpx;  
38 - height: 164rpx;  
39 - background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/invit-logo.png");  
40 -}  
41 -  
42 -  
43 -.wenxin-mask{  
44 - margin-top: 20rpx;  
45 -}  
46 -.wenxin-baitou{  
47 - margin-top: 20rpx;  
48 -}  
49 -.wenxin .seller{  
50 - margin-bottom: 22rpx;  
51 -}  
52 -.wenxin .invit-logo.owner{  
53 - width: 340rpx;  
54 - height: 184rpx;  
55 - background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E9%A2%84%E8%AE%A2%E5%AE%89%E6%8E%92-%E6%B8%A9%E9%A6%A8.png");  
56 -}  
57 -.wenxin .invit-logo.customer{  
58 - width: 344rpx;  
59 - height: 198rpx;  
60 - background-image: url("http://nosqn.colorcun.com/manager-invitation/wx/%E9%82%80%E8%AF%B7%E5%87%BD.png");  
61 -}  
62 -  
63 -.bottom{  
64 - position: fixed;  
65 - bottom: 0;  
66 - height: 90rpx;  
67 - line-height: 90rpx;  
68 - background-color: #ECD9B7;  
69 - width: 100%;  
70 - font-size: 30rpx;  
71 - box-sizing: border-box;  
72 -}  
73 -.bottom .dingbaojian{  
74 - background-color: #262628;  
75 - color: #ECD9B7;  
76 - min-width: 160rpx;  
77 - height: 90rpx;  
78 - line-height: 90rpx;  
79 - border-top: 2rpx solid #ECD9B7;  
80 - box-sizing: border-box;  
81 -}  
82 -.bottom .dingbaojian .icon{  
83 - width: 30rpx;  
84 - height: 30rpx;  
85 -}  
86 -.bottom .dingbaojian .text{  
87 - height:34rpx;  
88 - font-size:24rpx;  
89 - color:rgba(236,217,183,1);  
90 - line-height:34rpx;  
91 - margin-top: 8rpx;  
92 -}  
93 -.bottom .sendmsg{  
94 - background-color: #262628;  
95 - color: #ECD9B7;  
96 - min-width: 25%;  
97 -}  
98 -.bottom .diancan{  
99 - text-align: center;  
100 - color: #794F28;  
101 - height: 66rpx;  
102 - line-height: 66rpx;  
103 - min-width: 33%;  
104 - width: 100%;  
105 -}  
106 -.bottom .diancan .buts-text{  
107 - height: 66rpx;  
108 - line-height: 66rpx;  
109 -}  
110 -.bottom .diancan.left-border{  
111 - border-left: 2rpx solid #D3BF9C;  
112 -}  
113 -.bottom .jiushui{  
114 - text-align: center;  
115 - color: #794F28;  
116 - height: 90rpx;  
117 - line-height: 90rpx;  
118 - min-width: 33%;  
119 - width: 70%;  
120 -}  
121 -.bottom .diancan .icon{  
122 - width: 40rpx;  
123 - height: 34rpx;  
124 - margin-right: 40rpx;  
125 -}  
126 -.bottom .jiushui .icon{  
127 - width: 32rpx;  
128 - height: 38rpx;  
129 - margin-right: 40rpx;  
130 -}  
131 -.buts-text{  
132 - height: 90rpx;  
133 - line-height: 90rpx;  
134 -}  
135 -.vline{  
136 - background-color: #D3BF9C;  
137 - width: 6rpx;  
138 - height: 66rpx;  
139 - min-width: 6rpx;  
140 -}  
141 -.opt-view-tip{  
142 - font-size: 30rpx;  
143 - color:#ccc;  
144 -}  
145 -.service-view{  
146 - width:88rpx;  
147 - height:64rpx;  
148 - background:rgba(0,0,0,0.15);  
149 - border-radius:50rpx;  
150 - border:1rpx solid rgba(255,255,255,0.25);  
151 - box-sizing: border-box;  
152 - margin-right: 20rpx;  
153 -}  
154 -.service-icon{  
155 - background-image: url("http://nosqn.colorcun.com/shead2.png");  
156 - background-size: 100% 100%;  
157 - width:36rpx;  
158 - height:36rpx;  
159 -}  
160 -.coupon{ 4 +.pages {
  5 + width: 100%;
  6 + background-size: 100%;
  7 + font-size: 34rpx;
  8 + position: fixed;
  9 + left: 0;
  10 + top: 0;
  11 + bottom: 0;
  12 +}
  13 +
  14 +image {
  15 + width: 100%;
  16 + height: 100%;
  17 +}
  18 +
  19 +.buts-share {
  20 + background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E5%8F%91%E9%82%80%E8%AF%B7%E5%87%BD.png");
  21 +}
  22 +
  23 +.buts-share.customer {
  24 + background-image: url("http://nosqn.colorcun.com/manager-invitation/wx/%E7%A1%AE%E8%AE%A4%E6%94%B6%E5%88%B0.png");
  25 +}
  26 +
  27 +.shangwu {
  28 + margin-top: 52rpx;
  29 +}
  30 +
  31 +.shangwu .seller {
  32 + margin-bottom: 42rpx;
  33 +}
  34 +
  35 +.shangwu .invit-logo.owner {
  36 + width: 380rpx;
  37 + height: 200rpx;
  38 + background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E9%A2%84%E8%AE%A2%E5%AE%89%E6%8E%92.png");
  39 +}
  40 +
  41 +.shangwu .invit-logo.customer {
  42 + width: 352rpx;
  43 + height: 164rpx;
  44 + background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/invit-logo.png");
  45 +}
  46 +
  47 +
  48 +.wenxin-mask {
  49 + margin-top: 20rpx;
  50 +}
  51 +
  52 +.wenxin-baitou {
  53 + margin-top: 20rpx;
  54 +}
  55 +
  56 +.wenxin .seller {
  57 + margin-bottom: 22rpx;
  58 +}
  59 +
  60 +.wenxin .invit-logo.owner {
  61 + width: 340rpx;
  62 + height: 184rpx;
  63 + background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E9%A2%84%E8%AE%A2%E5%AE%89%E6%8E%92-%E6%B8%A9%E9%A6%A8.png");
  64 +}
  65 +
  66 +.wenxin .invit-logo.customer {
  67 + width: 344rpx;
  68 + height: 198rpx;
  69 + background-image: url("http://nosqn.colorcun.com/manager-invitation/wx/%E9%82%80%E8%AF%B7%E5%87%BD.png");
  70 +}
  71 +
  72 +.bottom {
  73 + position: fixed;
  74 + bottom: 0;
  75 + height: 90rpx;
  76 + line-height: 90rpx;
  77 + background-color: #ECD9B7;
  78 + width: 100%;
  79 + font-size: 30rpx;
  80 + box-sizing: border-box;
  81 +}
  82 +
  83 +.bottom .dingbaojian {
  84 + background-color: #262628;
  85 + color: #ECD9B7;
  86 + min-width: 160rpx;
  87 + height: 90rpx;
  88 + line-height: 90rpx;
  89 + border-top: 2rpx solid #ECD9B7;
  90 + box-sizing: border-box;
  91 +}
  92 +
  93 +.bottom .dingbaojian .icon {
  94 + width: 30rpx;
  95 + height: 30rpx;
  96 +}
  97 +
  98 +.bottom .dingbaojian .text {
  99 + height: 34rpx;
  100 + font-size: 24rpx;
  101 + color: rgba(236, 217, 183, 1);
  102 + line-height: 34rpx;
  103 + margin-top: 8rpx;
  104 +}
  105 +
  106 +.bottom .sendmsg {
  107 + background-color: #262628;
  108 + color: #ECD9B7;
  109 + min-width: 25%;
  110 +}
  111 +
  112 +.bottom .diancan {
  113 + text-align: center;
  114 + color: #794F28;
  115 + height: 66rpx;
  116 + line-height: 66rpx;
  117 + min-width: 33%;
  118 + width: 100%;
  119 +}
  120 +
  121 +.bottom .diancan .buts-text {
  122 + height: 66rpx;
  123 + line-height: 66rpx;
  124 +}
  125 +
  126 +.bottom .diancan.left-border {
  127 + border-left: 2rpx solid #D3BF9C;
  128 +}
  129 +
  130 +.bottom .jiushui {
  131 + text-align: center;
  132 + color: #794F28;
  133 + height: 90rpx;
  134 + line-height: 90rpx;
  135 + min-width: 33%;
  136 + width: 70%;
  137 +}
  138 +
  139 +.bottom .diancan .icon {
  140 + width: 40rpx;
  141 + height: 34rpx;
  142 + margin-right: 40rpx;
  143 +}
  144 +
  145 +.bottom .jiushui .icon {
  146 + width: 32rpx;
  147 + height: 38rpx;
  148 + margin-right: 40rpx;
  149 +}
  150 +
  151 +.buts-text {
  152 + height: 90rpx;
  153 + line-height: 90rpx;
  154 +}
  155 +
  156 +.vline {
  157 + background-color: #D3BF9C;
  158 + width: 6rpx;
  159 + height: 66rpx;
  160 + min-width: 6rpx;
  161 +}
  162 +
  163 +.opt-view-tip {
  164 + font-size: 30rpx;
  165 + color: #ccc;
  166 +}
  167 +
  168 +.service-view {
  169 + width: 88rpx;
  170 + height: 64rpx;
  171 + background: rgba(0, 0, 0, 0.15);
  172 + border-radius: 50rpx;
  173 + border: 1rpx solid rgba(255, 255, 255, 0.25);
  174 + box-sizing: border-box;
  175 + margin-right: 20rpx;
  176 +}
  177 +
  178 +.service-icon {
  179 + background-image: url("http://nosqn.colorcun.com/shead2.png");
  180 + background-size: 100% 100%;
  181 + width: 36rpx;
  182 + height: 36rpx;
  183 +}
  184 +
  185 +.coupon {
161 position: fixed; 186 position: fixed;
162 left: 0; 187 left: 0;
163 right: 0; 188 right: 0;
164 top: 0; 189 top: 0;
165 bottom: 0; 190 bottom: 0;
166 - background: rgba(0,0,0,.5); 191 + background: rgba(0, 0, 0, .5);
167 } 192 }
168 -.coupon-content{ 193 +
  194 +.coupon-content {
169 width: 658rpx; 195 width: 658rpx;
170 position: absolute; 196 position: absolute;
171 left: 0; 197 left: 0;
@@ -173,13 +199,15 @@ image{ @@ -173,13 +199,15 @@ image{
173 top: 50%; 199 top: 50%;
174 margin: auto; 200 margin: auto;
175 } 201 }
176 -.coupon-bg{ 202 +
  203 +.coupon-bg {
177 width: 658rpx; 204 width: 658rpx;
178 height: 468rpx; 205 height: 468rpx;
179 background: url(http://nosqn.colorcun.com/coupon.jpg) center center no-repeat; 206 background: url(http://nosqn.colorcun.com/coupon.jpg) center center no-repeat;
180 - background-size:contain; 207 + background-size: contain;
181 } 208 }
182 -.coupon-info{ 209 +
  210 +.coupon-info {
183 width: 502rpx; 211 width: 502rpx;
184 border-radius: 20rpx; 212 border-radius: 20rpx;
185 overflow: hidden; 213 overflow: hidden;
@@ -188,76 +216,92 @@ image{ @@ -188,76 +216,92 @@ image{
188 top: -152rpx; 216 top: -152rpx;
189 margin: 0 auto; 217 margin: 0 auto;
190 } 218 }
191 -.coupon-header{ 219 +
  220 +.coupon-header {
192 width: 100%; 221 width: 100%;
193 height: 152rpx; 222 height: 152rpx;
194 } 223 }
195 -.coupon-header>view:first-child{ 224 +
  225 +.coupon-header>view:first-child {
196 font-size: 48rpx; 226 font-size: 48rpx;
197 } 227 }
198 -.coupon-header>view{ 228 +
  229 +.coupon-header>view {
199 background: linear-gradient(to bottom, #FFFFFF, #FAECA5); 230 background: linear-gradient(to bottom, #FFFFFF, #FAECA5);
200 -webkit-background-clip: text; 231 -webkit-background-clip: text;
201 line-height: 1.4; 232 line-height: 1.4;
202 -webkit-text-fill-color: transparent; 233 -webkit-text-fill-color: transparent;
203 } 234 }
204 -.coupon-button{ 235 +
  236 +.coupon-button {
205 width: 100%; 237 width: 100%;
206 padding: 20rpx 0; 238 padding: 20rpx 0;
207 line-height: 34rpx; 239 line-height: 34rpx;
208 position: relative; 240 position: relative;
209 } 241 }
210 -.coupon-list{ 242 +
  243 +.coupon-list {
211 width: 502rpx; 244 width: 502rpx;
212 max-height: 360rpx; 245 max-height: 360rpx;
213 overflow-y: scroll; 246 overflow-y: scroll;
214 } 247 }
215 -.coupon-single{ 248 +
  249 +.coupon-single {
216 width: 452rpx; 250 width: 452rpx;
217 height: 134rpx; 251 height: 134rpx;
218 border-radius: 20rpx; 252 border-radius: 20rpx;
219 line-height: 1.4; 253 line-height: 1.4;
220 - margin:0 auto 16rpx; 254 + margin: 0 auto 16rpx;
221 background: #FFFFFF; 255 background: #FFFFFF;
222 } 256 }
223 -.coupon-main{ 257 +
  258 +.coupon-main {
224 width: 310rpx; 259 width: 310rpx;
225 height: 100%; 260 height: 100%;
226 padding-left: 30rpx; 261 padding-left: 30rpx;
227 box-sizing: border-box; 262 box-sizing: border-box;
228 } 263 }
229 -.coupon-border{ 264 +
  265 +.coupon-border {
230 width: 32rpx; 266 width: 32rpx;
231 height: 100%; 267 height: 100%;
232 } 268 }
233 -.circle{ 269 +
  270 +.circle {
234 width: 20rpx; 271 width: 20rpx;
235 height: 10rpx; 272 height: 10rpx;
236 background: #F65636; 273 background: #F65636;
237 - border:2rpx solid #F65636; 274 + border: 2rpx solid #F65636;
238 } 275 }
239 -.circle-top{ 276 +
  277 +.circle-top {
240 border-radius: 10rpx 10rpx 0 0; 278 border-radius: 10rpx 10rpx 0 0;
241 } 279 }
242 -.coupon-line{ 280 +
  281 +.coupon-line {
243 width: 2rpx; 282 width: 2rpx;
244 height: 114rpx; 283 height: 114rpx;
245 - background: rgba(246,86,54,.2); 284 + background: rgba(246, 86, 54, .2);
246 } 285 }
247 -.circle-bottom{ 286 +
  287 +.circle-bottom {
248 border-radius: 0 0 10rpx 10rpx; 288 border-radius: 0 0 10rpx 10rpx;
249 } 289 }
250 -.use-button{ 290 +
  291 +.use-button {
251 width: 92rpx; 292 width: 92rpx;
252 height: 44rpx; 293 height: 44rpx;
253 border-radius: 22rpx; 294 border-radius: 22rpx;
254 background: #E84033; 295 background: #E84033;
255 color: #FFFFFF; 296 color: #FFFFFF;
256 } 297 }
  298 +
257 ::-webkit-scrollbar { 299 ::-webkit-scrollbar {
258 - display: none; /* Chrome Safari */ 300 + display: none;
  301 + /* Chrome Safari */
259 } 302 }
260 -.care{ 303 +
  304 +.care {
261 width: 380px; 305 width: 380px;
262 height: 84px; 306 height: 84px;
263 /* position: absolute; 307 /* position: absolute;
@@ -267,11 +311,13 @@ image{ @@ -267,11 +311,13 @@ image{
267 box-sizing: border-box; 311 box-sizing: border-box;
268 background: #E84033; 312 background: #E84033;
269 } 313 }
270 -.get-button{ 314 +
  315 +.get-button {
271 background: transparent; 316 background: transparent;
272 padding: 30rpx 0; 317 padding: 30rpx 0;
273 } 318 }
274 -.menu{ 319 +
  320 +.menu {
275 width: 100rpx; 321 width: 100rpx;
276 height: 100rpx; 322 height: 100rpx;
277 border-radius: 50%; 323 border-radius: 50%;
@@ -281,28 +327,32 @@ image{ @@ -281,28 +327,32 @@ image{
281 background: url(http://nosqn.colorcun.com/invite_menu.png) center center no-repeat; 327 background: url(http://nosqn.colorcun.com/invite_menu.png) center center no-repeat;
282 background-size: contain; 328 background-size: contain;
283 } 329 }
284 -.menu-list{ 330 +
  331 +.menu-list {
285 position: fixed; 332 position: fixed;
286 left: 0; 333 left: 0;
287 right: 0; 334 right: 0;
288 top: 0; 335 top: 0;
289 bottom: 0; 336 bottom: 0;
290 - background: rgba(0,0,0,.69); 337 + background: rgba(0, 0, 0, .69);
291 z-index: 100; 338 z-index: 100;
292 padding-left: 40rpx; 339 padding-left: 40rpx;
293 padding-bottom: 40rpx; 340 padding-bottom: 40rpx;
294 box-sizing: border-box; 341 box-sizing: border-box;
295 } 342 }
296 -.menu-item{ 343 +
  344 +.menu-item {
297 height: 100rpx; 345 height: 100rpx;
298 margin-bottom: 40rpx; 346 margin-bottom: 40rpx;
299 } 347 }
300 -.menu-item-image{ 348 +
  349 +.menu-item-image {
301 width: 100rpx; 350 width: 100rpx;
302 height: 100rpx; 351 height: 100rpx;
303 margin-right: 20rpx; 352 margin-right: 20rpx;
304 border-radius: 50%; 353 border-radius: 50%;
305 } 354 }
  355 +
306 /* .menu-item-book{ 356 /* .menu-item-book{
307 width: 100rpx; 357 width: 100rpx;
308 height: 100rpx; 358 height: 100rpx;
@@ -313,53 +363,62 @@ image{ @@ -313,53 +363,62 @@ image{
313 background: url(http://nosqn.colorcun.com/invite_menu.png) center center no-repeat; 363 background: url(http://nosqn.colorcun.com/invite_menu.png) center center no-repeat;
314 background-size: contain; 364 background-size: contain;
315 } */ 365 } */
316 -.menu-list{ 366 +.menu-list {
317 position: fixed; 367 position: fixed;
318 left: 0; 368 left: 0;
319 right: 0; 369 right: 0;
320 top: 0; 370 top: 0;
321 bottom: 0; 371 bottom: 0;
322 - background: rgba(0,0,0,.69); 372 + background: rgba(0, 0, 0, .69);
323 z-index: 100; 373 z-index: 100;
324 padding-left: 40rpx; 374 padding-left: 40rpx;
325 padding-bottom: 40rpx; 375 padding-bottom: 40rpx;
326 box-sizing: border-box; 376 box-sizing: border-box;
327 } 377 }
328 -.menu-item{ 378 +
  379 +.menu-item {
329 height: 100rpx; 380 height: 100rpx;
330 margin-bottom: 40rpx; 381 margin-bottom: 40rpx;
331 } 382 }
332 -.menu-item-image{ 383 +
  384 +.menu-item-image {
333 width: 100rpx; 385 width: 100rpx;
334 height: 100rpx; 386 height: 100rpx;
335 margin-right: 20rpx; 387 margin-right: 20rpx;
336 border-radius: 50%; 388 border-radius: 50%;
337 } 389 }
338 -.menu-item-book{ 390 +
  391 +.menu-item-book {
339 background: url(http://nosqn.colorcun.com/menu-book.png) center center no-repeat; 392 background: url(http://nosqn.colorcun.com/menu-book.png) center center no-repeat;
340 background-size: contain; 393 background-size: contain;
341 } 394 }
342 -.menu-item-buy{ 395 +
  396 +.menu-item-buy {
343 background: url(http://nosqn.colorcun.com/menu-buy.png) center center no-repeat; 397 background: url(http://nosqn.colorcun.com/menu-buy.png) center center no-repeat;
344 background-size: contain; 398 background-size: contain;
345 } 399 }
346 -.menu-item-buy-nouse{ 400 +
  401 +.menu-item-buy-nouse {
347 background: url(http://nosqn.colorcun.com/menu-buy-nouse.png) center center no-repeat; 402 background: url(http://nosqn.colorcun.com/menu-buy-nouse.png) center center no-repeat;
348 background-size: contain; 403 background-size: contain;
349 } 404 }
350 -.menu-item-check{ 405 +
  406 +.menu-item-check {
351 background: url(http://nosqn.colorcun.com/menu-check.png) center center no-repeat; 407 background: url(http://nosqn.colorcun.com/menu-check.png) center center no-repeat;
352 background-size: contain; 408 background-size: contain;
353 } 409 }
354 -.menu-item-check-nouse{ 410 +
  411 +.menu-item-check-nouse {
355 background: url(http://nosqn.colorcun.com/menu-check-nouse.png) center center no-repeat; 412 background: url(http://nosqn.colorcun.com/menu-check-nouse.png) center center no-repeat;
356 background-size: contain; 413 background-size: contain;
357 } 414 }
358 -.menu-item-back{ 415 +
  416 +.menu-item-back {
359 background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat; 417 background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat;
360 background-size: contain; 418 background-size: contain;
361 } 419 }
362 -.click-icon{ 420 +
  421 +.click-icon {
363 width: 12rpx; 422 width: 12rpx;
364 height: 12rpx; 423 height: 12rpx;
365 border-top: 2rpx solid #FFFFFF; 424 border-top: 2rpx solid #FFFFFF;
@@ -367,30 +426,37 @@ image{ @@ -367,30 +426,37 @@ image{
367 transform: rotate(45deg); 426 transform: rotate(45deg);
368 margin-left: -6rpx; 427 margin-left: -6rpx;
369 } 428 }
370 -.gray-font{ 429 +
  430 +.gray-font {
371 color: #999999; 431 color: #999999;
372 } 432 }
373 -.menu-item-buy{ 433 +
  434 +.menu-item-buy {
374 background: url(http://nosqn.colorcun.com/menu-buy.png) center center no-repeat; 435 background: url(http://nosqn.colorcun.com/menu-buy.png) center center no-repeat;
375 background-size: contain; 436 background-size: contain;
376 } 437 }
377 -.menu-item-buy-nouse{ 438 +
  439 +.menu-item-buy-nouse {
378 background: url(http://nosqn.colorcun.com/menu-buy-nouse.png) center center no-repeat; 440 background: url(http://nosqn.colorcun.com/menu-buy-nouse.png) center center no-repeat;
379 background-size: contain; 441 background-size: contain;
380 } 442 }
381 -.menu-item-check{ 443 +
  444 +.menu-item-check {
382 background: url(http://nosqn.colorcun.com/menu-check.png) center center no-repeat; 445 background: url(http://nosqn.colorcun.com/menu-check.png) center center no-repeat;
383 background-size: contain; 446 background-size: contain;
384 } 447 }
385 -.menu-item-check-nouse{ 448 +
  449 +.menu-item-check-nouse {
386 background: url(http://nosqn.colorcun.com/menu-check-nouse.png) center center no-repeat; 450 background: url(http://nosqn.colorcun.com/menu-check-nouse.png) center center no-repeat;
387 background-size: contain; 451 background-size: contain;
388 } 452 }
389 -.menu-item-back{ 453 +
  454 +.menu-item-back {
390 background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat; 455 background: url(http://nosqn.colorcun.com/menu-back.png) center center no-repeat;
391 background-size: contain; 456 background-size: contain;
392 } 457 }
393 -.click-icon{ 458 +
  459 +.click-icon {
394 width: 12rpx; 460 width: 12rpx;
395 height: 12rpx; 461 height: 12rpx;
396 border-top: 2rpx solid #FFFFFF; 462 border-top: 2rpx solid #FFFFFF;
@@ -398,18 +464,21 @@ image{ @@ -398,18 +464,21 @@ image{
398 transform: rotate(45deg); 464 transform: rotate(45deg);
399 margin-left: -6rpx; 465 margin-left: -6rpx;
400 } 466 }
401 -.gray-font{ 467 +
  468 +.gray-font {
402 color: #999999; 469 color: #999999;
403 } 470 }
404 -.last-book-food{ 471 +
  472 +.last-book-food {
405 width: 202rpx; 473 width: 202rpx;
406 height: 62rpx; 474 height: 62rpx;
407 - background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275); 475 + background: linear-gradient(to right, #E1B275, #FEEFBC, #E1B275);
408 border-radius: 32rpx; 476 border-radius: 32rpx;
409 position: relative; 477 position: relative;
410 z-index: 100; 478 z-index: 100;
411 } 479 }
412 -.notice{ 480 +
  481 +.notice {
413 width: 20rpx; 482 width: 20rpx;
414 height: 20rpx; 483 height: 20rpx;
415 border-radius: 50%; 484 border-radius: 50%;
@@ -360,7 +360,7 @@ Page({ @@ -360,7 +360,7 @@ Page({
360 let data = res.data 360 let data = res.data
361 console.log('data', data); 361 console.log('data', data);
362 let coupon_dataList = [] 362 let coupon_dataList = []
363 - let themeColor, themeSixteen, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse; 363 + let themeColor, StyleType, themeSixteen, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse;
364 chef = util.determine(data.chef); 364 chef = util.determine(data.chef);
365 reserve = util.determine(data.reserve); 365 reserve = util.determine(data.reserve);
366 marketing = util.determine(data.marketing); 366 marketing = util.determine(data.marketing);
@@ -368,6 +368,7 @@ Page({ @@ -368,6 +368,7 @@ Page({
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 themeColor = data.lite_class;
  371 + StyleType = data.type;
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 : '';
@@ -410,7 +411,7 @@ Page({ @@ -410,7 +411,7 @@ Page({
410 coupon_dataList, 411 coupon_dataList,
411 swich_phone, 412 swich_phone,
412 is_comments, 413 is_comments,
413 - StyleType: res.data.type, 414 + StyleType,
414 themeColor, 415 themeColor,
415 } 416 }
416 console.log('获取数据', { 417 console.log('获取数据', {
@@ -452,7 +453,7 @@ Page({ @@ -452,7 +453,7 @@ Page({
452 scoreInfo, 453 scoreInfo,
453 swich_phone, 454 swich_phone,
454 is_comments, 455 is_comments,
455 - StyleType: res.data.type, 456 + StyleType,
456 themeColor, 457 themeColor,
457 themeSixteen, 458 themeSixteen,
458 }) 459 })
@@ -67,7 +67,6 @@ @@ -67,7 +67,6 @@
67 .handle { 67 .handle {
68 display: flex; 68 display: flex;
69 flex-direction: column; 69 flex-direction: column;
70 - color: #999999;  
71 font-family: PingFang SC; 70 font-family: PingFang SC;
72 font-weight: 500; 71 font-weight: 500;
73 font-size: 26rpx; 72 font-size: 26rpx;
@@ -361,7 +361,7 @@ Page({ @@ -361,7 +361,7 @@ Page({
361 let data = res.data 361 let data = res.data
362 console.log('data', data); 362 console.log('data', data);
363 let coupon_dataList = [] 363 let coupon_dataList = []
364 - let themeColor, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse; 364 + let themeColor, StyleType, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse;
365 chef = util.determine(data.chef); 365 chef = util.determine(data.chef);
366 reserve = util.determine(data.reserve); 366 reserve = util.determine(data.reserve);
367 marketing = util.determine(data.marketing); 367 marketing = util.determine(data.marketing);
@@ -369,6 +369,7 @@ Page({ @@ -369,6 +369,7 @@ Page({
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 themeColor = data.lite_class;
  372 + StyleType = data.type;
372 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 373 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
373 if (marketing) { 374 if (marketing) {
374 is_comments = marketing.is_comments ? marketing.is_comments : ''; 375 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -411,7 +412,7 @@ Page({ @@ -411,7 +412,7 @@ Page({
411 coupon_dataList, 412 coupon_dataList,
412 swich_phone, 413 swich_phone,
413 is_comments, 414 is_comments,
414 - StyleType: res.data.type, 415 + StyleType,
415 themeColor, 416 themeColor,
416 } 417 }
417 console.log('获取数据', { 418 console.log('获取数据', {
@@ -458,7 +459,7 @@ Page({ @@ -458,7 +459,7 @@ Page({
458 scoreInfo, 459 scoreInfo,
459 swich_phone, 460 swich_phone,
460 is_comments, 461 is_comments,
461 - StyleType: res.data.type, 462 + StyleType,
462 themeColor, 463 themeColor,
463 whiteBj, 464 whiteBj,
464 }) 465 })
@@ -361,7 +361,7 @@ Page({ @@ -361,7 +361,7 @@ Page({
361 let data = res.data 361 let data = res.data
362 console.log('data', data); 362 console.log('data', data);
363 let coupon_dataList = [] 363 let coupon_dataList = []
364 - let themeColor, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse; 364 + let themeColor, StyleType, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse;
365 chef = util.determine(data.chef); 365 chef = util.determine(data.chef);
366 reserve = util.determine(data.reserve); 366 reserve = util.determine(data.reserve);
367 marketing = util.determine(data.marketing); 367 marketing = util.determine(data.marketing);
@@ -369,6 +369,7 @@ Page({ @@ -369,6 +369,7 @@ Page({
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 themeColor = data.lite_class;
  372 + StyleType = data.type;
372 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 373 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
373 if (marketing) { 374 if (marketing) {
374 is_comments = marketing.is_comments ? marketing.is_comments : ''; 375 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -411,7 +412,7 @@ Page({ @@ -411,7 +412,7 @@ Page({
411 coupon_dataList, 412 coupon_dataList,
412 swich_phone, 413 swich_phone,
413 is_comments, 414 is_comments,
414 - StyleType: res.data.type, 415 + StyleType,
415 themeColor, 416 themeColor,
416 } 417 }
417 console.log('获取数据', { 418 console.log('获取数据', {
@@ -458,7 +459,7 @@ Page({ @@ -458,7 +459,7 @@ Page({
458 scoreInfo, 459 scoreInfo,
459 swich_phone, 460 swich_phone,
460 is_comments, 461 is_comments,
461 - StyleType: res.data.type, 462 + StyleType,
462 themeColor, 463 themeColor,
463 whiteBj, 464 whiteBj,
464 }) 465 })
@@ -360,7 +360,7 @@ Page({ @@ -360,7 +360,7 @@ Page({
360 let data = res.data 360 let data = res.data
361 console.log('data', data); 361 console.log('data', data);
362 let coupon_dataList = [] 362 let coupon_dataList = []
363 - let themeColor, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse; 363 + let themeColor, StyleType, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse;
364 chef = util.determine(data.chef); 364 chef = util.determine(data.chef);
365 reserve = util.determine(data.reserve); 365 reserve = util.determine(data.reserve);
366 marketing = util.determine(data.marketing); 366 marketing = util.determine(data.marketing);
@@ -368,6 +368,7 @@ Page({ @@ -368,6 +368,7 @@ Page({
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 themeColor = data.lite_class;
  371 + StyleType = data.type;
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 : '';
@@ -410,7 +411,7 @@ Page({ @@ -410,7 +411,7 @@ Page({
410 coupon_dataList, 411 coupon_dataList,
411 swich_phone, 412 swich_phone,
412 is_comments, 413 is_comments,
413 - StyleType: res.data.type, 414 + StyleType,
414 themeColor, 415 themeColor,
415 } 416 }
416 console.log('获取数据', { 417 console.log('获取数据', {
@@ -457,7 +458,7 @@ Page({ @@ -457,7 +458,7 @@ Page({
457 scoreInfo, 458 scoreInfo,
458 swich_phone, 459 swich_phone,
459 is_comments, 460 is_comments,
460 - StyleType: res.data.type, 461 + StyleType,
461 themeColor, 462 themeColor,
462 whiteBj, 463 whiteBj,
463 }) 464 })
@@ -307,7 +307,7 @@ Page({ @@ -307,7 +307,7 @@ Page({
307 let data = res.data 307 let data = res.data
308 console.log('data', data); 308 console.log('data', data);
309 let coupon_dataList = [] 309 let coupon_dataList = []
310 - let themeColor, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse; 310 + let themeColor, StyleType, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse;
311 chef = util.determine(data.chef); 311 chef = util.determine(data.chef);
312 reserve = util.determine(data.reserve); 312 reserve = util.determine(data.reserve);
313 marketing = util.determine(data.marketing); 313 marketing = util.determine(data.marketing);
@@ -315,6 +315,7 @@ Page({ @@ -315,6 +315,7 @@ Page({
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 + StyleType = data.type;
318 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 319 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
319 if (marketing) { 320 if (marketing) {
320 is_comments = marketing.is_comments ? marketing.is_comments : ''; 321 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -357,7 +358,7 @@ Page({ @@ -357,7 +358,7 @@ Page({
357 coupon_dataList, 358 coupon_dataList,
358 swich_phone, 359 swich_phone,
359 is_comments, 360 is_comments,
360 - StyleType: res.data.type, 361 + StyleType,
361 themeColor, 362 themeColor,
362 } 363 }
363 console.log('获取数据', { 364 console.log('获取数据', {
@@ -404,7 +405,7 @@ Page({ @@ -404,7 +405,7 @@ Page({
404 scoreInfo, 405 scoreInfo,
405 swich_phone, 406 swich_phone,
406 is_comments, 407 is_comments,
407 - StyleType: res.data.type, 408 + StyleType,
408 themeColor, 409 themeColor,
409 whiteBj, 410 whiteBj,
410 }) 411 })
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 {{home.slogan}} 10 {{home.slogan}}
11 </view> 11 </view>
12 </view> 12 </view>
13 - <image wx:if="{{home.image}}" src="{{home.image}}" class="homeImage" mode="aspectFill"></image> 13 + <image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" class="homeImage" mode="aspectFill"></image>
14 <view class="reservationInfo flex-ll"> 14 <view class="reservationInfo flex-ll">
15 <view class="line"> 15 <view class="line">
16 </view> 16 </view>
@@ -249,10 +249,7 @@ @@ -249,10 +249,7 @@
249 <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 249 <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
250 点击了解更多会员优惠政策 250 点击了解更多会员优惠政策
251 </view> 251 </view>
252 - <image wx:if="{{marketing && marketing.logo}}" src="{{marketing.logo?marketing.logo:''}}" mode="heightFix" />  
253 - <view class="news" wx:if="{{marketing && marketing.wecomle}}">  
254 - {{marketing?marketing.wecomle:''}}  
255 - </view> 252 + <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo?marketing.logo:''}}" mode="heightFix" />
256 </view> 253 </view>
257 <view class="more" wx:if="{{showMoreTip}}"> 254 <view class="more" wx:if="{{showMoreTip}}">
258 <view class="moreText">滑动查看更多</view> 255 <view class="moreText">滑动查看更多</view>
@@ -521,14 +521,6 @@ @@ -521,14 +521,6 @@
521 padding-bottom: 180rpx; 521 padding-bottom: 180rpx;
522 } 522 }
523 523
524 -.vips .news {  
525 - text-align: center;  
526 - color: #000000;  
527 - font-family: FangSong;  
528 - font-size: 40rpx;  
529 - margin: 0 0 100rpx 0;  
530 -}  
531 -  
532 .vips .text { 524 .vips .text {
533 text-align: center; 525 text-align: center;
534 color: #515151; 526 color: #515151;
@@ -360,14 +360,15 @@ Page({ @@ -360,14 +360,15 @@ Page({
360 let data = res.data 360 let data = res.data
361 console.log('data', data); 361 console.log('data', data);
362 let coupon_dataList = [] 362 let coupon_dataList = []
363 - let themeColor, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse; 363 + let themeColor, StyleType, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store, priceInfo, certificate, scoreInfo, recharge_list, stringifyUse;
364 chef = util.determine(data.chef); 364 chef = util.determine(data.chef);
365 reserve = util.determine(data.reserve); 365 reserve = util.determine(data.reserve);
366 marketing = util.determine(data.marketing); 366 marketing = util.determine(data.marketing);
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 + themeColor = data.lite_class;
  371 + StyleType = data.type;
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 : '';
@@ -410,7 +411,7 @@ Page({ @@ -410,7 +411,7 @@ Page({
410 coupon_dataList, 411 coupon_dataList,
411 swich_phone, 412 swich_phone,
412 is_comments, 413 is_comments,
413 - StyleType: res.data.type, 414 + StyleType,
414 themeColor, 415 themeColor,
415 } 416 }
416 console.log('获取数据', { 417 console.log('获取数据', {
@@ -452,7 +453,7 @@ Page({ @@ -452,7 +453,7 @@ Page({
452 scoreInfo, 453 scoreInfo,
453 swich_phone, 454 swich_phone,
454 is_comments, 455 is_comments,
455 - StyleType: res.data.type, 456 + StyleType,
456 themeColor, 457 themeColor,
457 }) 458 })
458 }).catch(res => { 459 }).catch(res => {
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <nav hasHome class="navhome" place="{{true}}"></nav> 3 <nav hasHome class="navhome" place="{{true}}"></nav>
4 <scroll-view scroll-y class="{{themeColor}}"> 4 <scroll-view scroll-y class="{{themeColor}}">
5 <view class="reservationInfo"> 5 <view class="reservationInfo">
6 - <image wx:if="{{home.image}}" src="{{home.image}}" class="homeImage" mode="aspectFill"></image> 6 + <image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" class="homeImage" mode="aspectFill"></image>
7 <view class="begin"> 7 <view class="begin">
8 <view class="font40r">尊敬的贵宾，您好！非常感谢您选择</view> 8 <view class="font40r">尊敬的贵宾，您好！非常感谢您选择</view>
9 <view class="centerBox font40r">【{{seller.name?seller.name:reserve.seller_name}}】</view> 9 <view class="centerBox font40r">【{{seller.name?seller.name:reserve.seller_name}}】</view>
@@ -168,7 +168,7 @@ Page({ @@ -168,7 +168,7 @@ Page({
168 }, 168 },
169 gotoDetailHan(e){ 169 gotoDetailHan(e){
170 console.log(util.attr(e,'id')) 170 console.log(util.attr(e,'id'))
171 - let url='/pages/customer/detail_owner_invitation_new1?id='+util.attr(e,'id')+'&hasInvitation=1&hasSellerShare=1&tplid=1' 171 + let url='/pages/customer/detail_owner_invitation1?id='+util.attr(e,'id')+'&hasInvitation=1&hasSellerShare=1&tplid=1'
172 wx.navigateTo({ 172 wx.navigateTo({
173 url:url, 173 url:url,
174 }) 174 })
@@ -29,17 +29,8 @@ Page({ @@ -29,17 +29,8 @@ Page({
29 App.Seller.GetSellerTemplateConf({ 29 App.Seller.GetSellerTemplateConf({
30 sid:this.data.sid 30 sid:this.data.sid
31 }).then(res => { 31 }).then(res => {
32 - let url='/pages/customer/detail_owner_invitation_new1?id='+that.data.oid  
33 - switch (res.data.type) {  
34 - case '1':  
35 - url = '/pages/customer/detail_owner_invitation_new1?id='+that.data.oid  
36 - break;  
37 - case '2':  
38 - url = '/pages/customer/detail_owner_invitation_new2?id='+that.data.oid  
39 - break;  
40 - }  
41 return wx.reLaunch({ 32 return wx.reLaunch({
42 - url, 33 + url:`/pages/customer/detail_owner_invitation${res.data.type}?id=${that.data.oid}`
43 }) 34 })
44 }) 35 })
45 }, 36 },
@@ -628,14 +628,14 @@ @@ -628,14 +628,14 @@
628 { 628 {
629 "name": "邀请函-----6", 629 "name": "邀请函-----6",
630 "pathName": "pages/customer/detail_owner_invitation6", 630 "pathName": "pages/customer/detail_owner_invitation6",
631 - "query": "id=400386&hasInvitation=1&hasSellerShare=1&tplid=1", 631 + "query": "id=400725&hasInvitation=1&hasSellerShare=1&tplid=1",
632 "launchMode": "default", 632 "launchMode": "default",
633 "scene": null 633 "scene": null
634 }, 634 },
635 { 635 {
636 "name": "邀请函-----7", 636 "name": "邀请函-----7",
637 "pathName": "pages/customer/detail_owner_invitation7", 637 "pathName": "pages/customer/detail_owner_invitation7",
638 - "query": "id=400725&hasInvitation=1&hasSellerShare=1&tplid=1", 638 + "query": "id=400386&hasInvitation=1&hasSellerShare=1&tplid=1",
639 "launchMode": "default", 639 "launchMode": "default",
640 "scene": null 640 "scene": null
641 }, 641 },