xt / xcx-book · Commits

Go to a project

Commit 4d5fb5e97e566d1c1c43b170963f23740b6bbd13

Authored by yiren
1 parent 80385e07

无数据样式修改、商家地址字段取值修改

Inline Side-by-side
Showing 3 changed files with 46 additions and 57 deletions
@@ -56,7 +56,6 @@ @@ -56,7 +56,6 @@
56 "pages/tcads/cmyy", 56 "pages/tcads/cmyy",
57 "pages/pinglun/video", 57 "pages/pinglun/video",
58 "pages/customer/detail_owner_invitation_new", 58 "pages/customer/detail_owner_invitation_new",
59 - "components/modal",  
60 "pages/me/coupon_news" 59 "pages/me/coupon_news"
61 ], 60 ],
62 "requiredPrivateInfos": [ 61 "requiredPrivateInfos": [
@@ -97,10 +97,10 @@ Page({ @@ -97,10 +97,10 @@ Page({
97 looklocation: function () { 97 looklocation: function () {
98 wx.reportMonitor('1015', 1) 98 wx.reportMonitor('1015', 1)
99 wx.openLocation({ 99 wx.openLocation({
100 - latitude: Number(this.data.reserve.lat),  
101 - longitude: Number(this.data.reserve.long), 100 + latitude: Number(this.data.seller.lat),
  101 + longitude: Number(this.data.seller.long),
102 scale: 17, 102 scale: 17,
103 - address: this.data.reserve.address, 103 + address: this.data.seller.addr,
104 success: function (res) { 104 success: function (res) {
105 console.log(res) 105 console.log(res)
106 } 106 }
@@ -150,7 +150,9 @@ Page({ @@ -150,7 +150,9 @@ Page({
150 is_set_ddate: reserev.is_set_ddate, 150 is_set_ddate: reserev.is_set_ddate,
151 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 151 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
152 tel: reserev.seller.seller_tel.split(',')[0], 152 tel: reserev.seller.seller_tel.split(',')[0],
153 - soltName: reserev.soltName 153 + soltName: reserev.soltName,
  154 + lat:reserev.seller.lat,
  155 + long:reserev.seller.long,
154 } 156 }
155 }) 157 })
156 if(this.data.seller.sid=="677" || this.data.seller.sid=="26" || this.data.seller.sid=="8" || this.data.seller.sid=="4352"){ 158 if(this.data.seller.sid=="677" || this.data.seller.sid=="26" || this.data.seller.sid=="8" || this.data.seller.sid=="4352"){
@@ -158,9 +160,9 @@ Page({ @@ -158,9 +160,9 @@ Page({
158 is_display : false 160 is_display : false
159 }) 161 })
160 } 162 }
161 - console.log(reserev,'reserevreserevreserevreserevreserev');  
162 - console.log(this.data.seller,'sellersellersellerseller');  
163 - console.log(this.data.detail,'detaildetaildetaildetail'); 163 + console.log('reserevreserevreserevreserevreserev',reserev);
  164 + console.log('sellersellersellerseller',this.data.seller);
  165 + console.log('detaildetaildetaildetail',this.data.detail);
164 this.getSellerTemplateConfFun(reserev.sid); 166 this.getSellerTemplateConfFun(reserev.sid);
165 }).catch(res=>{ 167 }).catch(res=>{
166 console.log(res,'详情请求失败'); 168 console.log(res,'详情请求失败');
@@ -238,38 +240,32 @@ Page({ @@ -238,38 +240,32 @@ Page({
238 App.Seller.GetSellerTemplateConf({ 240 App.Seller.GetSellerTemplateConf({
239 sid 241 sid
240 }).then(res => { 242 }).then(res => {
241 - let home = JSON.parse(res.data.home)  
242 - let chef = JSON.parse(res.data.chef)  
243 - let marketing = JSON.parse(res.data.marketing)  
244 - let reserve = JSON.parse(res.data.reserve)  
245 - let signboard = JSON.parse(res.data.signboard)  
246 - let store = JSON.parse(res.data.store)  
247 - console.log('chef', JSON.parse(res.data.chef));  
248 - console.log('home', JSON.parse(res.data.home));  
249 - console.log('marketing', JSON.parse(res.data.marketing));  
250 - console.log('reserve', JSON.parse(res.data.reserve));  
251 - console.log('signboard', JSON.parse(res.data.signboard));  
252 - console.log('store', store);  
253 - if(store.images.length>0) store.images = JSON.parse(store.images) 243 + let home,chef,marketing,reserve,signboard,store,homeColor;
  244 + chef = res.data.chef?JSON.parse(res.data.chef):'';
  245 + reserve = res.data.reserve?JSON.parse(res.data.reserve):'';
  246 + marketing = res.data.marketing?JSON.parse(res.data.marketing):'';
  247 + signboard = res.data.signboard?JSON.parse(res.data.signboard):'';
  248 + store = res.data.store?JSON.parse(res.data.store):'';
  249 + home = res.data.home?JSON.parse(res.data.home):'';
  250 + if(store && store.images.length>0) store.images = JSON.parse(store.images)
254 if(signboard && signboard.images) signboard.images = JSON.parse(signboard.images) 251 if(signboard && signboard.images) signboard.images = JSON.parse(signboard.images)
255 - if (marketing.is_online_book=='1' && marketing.is_transpond =='1') { 252 + if (marketing && marketing.is_online_book=='1' && marketing.is_transpond =='1') {
256 this.setData({ 253 this.setData({
257 between: true 254 between: true
258 }) 255 })
259 } 256 }
260 - let homeColor;  
261 - if(home.red && home.green && home.blue && home.alpha){ 257 + if(home && home.red && home.green && home.blue && home.alpha){
262 homeColor=home.red + ',' + home.green + ',' + home.blue + ',' + home.alpha 258 homeColor=home.red + ',' + home.green + ',' + home.blue + ',' + home.alpha
263 }else{ 259 }else{
264 homeColor ='67,142,147,1' 260 homeColor ='67,142,147,1'
265 } 261 }
266 - console.log('chef', JSON.parse(res.data.chef));  
267 - console.log('home', JSON.parse(res.data.home));  
268 - console.log('marketing', JSON.parse(res.data.marketing));  
269 - console.log('reserve', JSON.parse(res.data.reserve));  
270 - console.log('signboard', JSON.parse(res.data.signboard)); 262 + console.log('chef', chef);
  263 + console.log('reserve', reserve);
  264 + console.log('signboard', signboard);
  265 + console.log('home', home);
271 console.log('store', store); 266 console.log('store', store);
272 - console.log(homeColor,'homeColorhomeColorhomeColor'); 267 + console.log('marketing', marketing);
  268 + console.log('homeColor',homeColor);
273 this.setData({ 269 this.setData({
274 chef, 270 chef,
275 marketing, 271 marketing,
@@ -279,27 +275,21 @@ Page({ @@ -279,27 +275,21 @@ Page({
279 store, 275 store,
280 homeColor //home主题颜色 276 homeColor //home主题颜色
281 }) 277 })
282 - if (home.red == '1' && home.green == '67' && home.blue == '163') { 278 + if (home && home.red == '1' && home.green == '67' && home.blue == '163') {
283 this.setData({ 279 this.setData({
284 theme: 'blue' 280 theme: 'blue'
285 }) 281 })
286 } 282 }
287 - if (home.red == '67' && home.green == '142' && home.blue == '147') { 283 + if (home && home.red == '67' && home.green == '142' && home.blue == '147') {
288 this.setData({ 284 this.setData({
289 theme: 'green' 285 theme: 'green'
290 }) 286 })
291 } 287 }
292 - if (home.red == '12' && home.green == '15' && home.blue == '14') { 288 + if (home && home.red == '12' && home.green == '15' && home.blue == '14') {
293 this.setData({ 289 this.setData({
294 theme: 'blackGold' 290 theme: 'blackGold'
295 }) 291 })
296 } 292 }
297 - console.log('chef', JSON.parse(res.data.chef));  
298 - console.log('home', JSON.parse(res.data.home));  
299 - console.log('marketing', JSON.parse(res.data.marketing));  
300 - console.log('reserve', JSON.parse(res.data.reserve));  
301 - console.log('signboard', JSON.parse(res.data.signboard));  
302 - console.log('store', store);  
303 }).catch(res=>{ 293 }).catch(res=>{
304 this.setData({ 294 this.setData({
305 theme:'green', 295 theme:'green',
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 <scroll-view class="last-book-bg" style="line-height: 1.4;height:{{height}}px;" scroll-y> 6 <scroll-view class="last-book-bg" style="line-height: 1.4;height:{{height}}px;" scroll-y>
7 <view class="titleImg" style="background: rgba({{homeColor}});"> 7 <view class="titleImg" style="background: rgba({{homeColor}});">
8 <image src="{{theme=='green'?'https://qn.colorcun.com/1571679628800_.pic.jpg':theme=='blue'?'https://qn.colorcun.com/1561679628784_.pic.jpg':theme=='blackGold'?'https://qn.colorcun.com/1551679628682_.pic.jpg':''}}" class="titleIcon"></image> 8 <image src="{{theme=='green'?'https://qn.colorcun.com/1571679628800_.pic.jpg':theme=='blue'?'https://qn.colorcun.com/1561679628784_.pic.jpg':theme=='blackGold'?'https://qn.colorcun.com/1551679628682_.pic.jpg':''}}" class="titleIcon"></image>
9 - <view class="title {{theme+'Title'}}">{{home.title?home.title:seller.name}}</view> 9 + <view class="title {{theme+'Title'}}">{{home?home.title:seller.name}}</view>
10 <view class="info {{theme+'Info'}}"> 10 <view class="info {{theme+'Info'}}">
11 - {{home.slogan}} 11 + {{home?home.slogan:''}}
12 </view> 12 </view>
13 </view> 13 </view>
14 - <image src="{{home.image?home.image:detail.seller.seller_image}}" class="homeImage" mode="widthFix"></image> 14 + <image src="{{home?home.image:detail.seller.seller_image}}" class="homeImage" mode="widthFix"></image>
15 <view class="reservationInfo flex-ll"> 15 <view class="reservationInfo flex-ll">
16 <view class="line"> 16 <view class="line">
17 </view> 17 </view>
@@ -40,23 +40,23 @@ @@ -40,23 +40,23 @@
40 <view class="label">【地址】</view> 40 <view class="label">【地址】</view>
41 <view class="contentData">{{reserve.address?reserve.address:detail.seller.map_address}}</view> 41 <view class="contentData">{{reserve.address?reserve.address:detail.seller.map_address}}</view>
42 </view> --> 42 </view> -->
43 - <view class="flex-11" wx:if="{{reserve.park_info}}"> 43 + <view class="flex-11" wx:if="{{reserve && reserve.park_info}}">
44 <view class="label">【停车】</view> 44 <view class="label">【停车】</view>
45 <view class="contentData">{{reserve.park_info}}</view> 45 <view class="contentData">{{reserve.park_info}}</view>
46 </view> 46 </view>
47 - <view class="flex-11" wx:if="{{reserve.seller_phone || detail.seller.phone}}"> 47 + <view class="flex-11" wx:if="{{ reserve && (reserve.seller_phone || detail.seller.phone)}}">
48 <view class="label">【联系】</view> 48 <view class="label">【联系】</view>
49 - <view class="contentData">{{reserve.seller_phone?reserve.seller_phone:detail.seller.phone}}</view> 49 + <view class="contentData">{{reserve?reserve.seller_phone:detail.seller.phone}}</view>
50 </view> 50 </view>
51 <view class="welcome"> 51 <view class="welcome">
52 欢迎垂询，恭候光临！ 52 欢迎垂询，恭候光临！
53 </view> 53 </view>
54 - <block wx:if="{{detail.sid!='677' && reserve.manager_phone && reserve.manager_wechat}}"> 54 + <block wx:if="{{detail.sid!='677' && reserve && reserve.manager_phone && reserve.manager_wechat}}">
55 <view class="handleInfo"> 55 <view class="handleInfo">
56 - <image src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image> 56 + <image wx:if="{{reserve && reserve.manager_image}}" src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image>
57 <view class="handle"> 57 <view class="handle">
58 - <text>专属服务：{{reserve.manager_phone}}</text>  
59 - <text>服务电话：{{reserve.manager_wechat}}</text> 58 + <text>专属服务：{{reserve?reserve.manager_phone:''}}</text>
  59 + <text>服务电话：{{reserve?reserve.manager_wechat:''}}</text>
60 </view> 60 </view>
61 <view class="handle"> 61 <view class="handle">
62 <view class="font22r brownFont" bindtap="call">拨打电话</view> 62 <view class="font22r brownFont" bindtap="call">拨打电话</view>
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <image src="https://qn.colorcun.com/WechatIMG256.png" mode="" /> 70 <image src="https://qn.colorcun.com/WechatIMG256.png" mode="" />
71 <view class="name"> 71 <view class="name">
72 <text>{{seller.name?seller.name:reserve.seller_name}}</text> 72 <text>{{seller.name?seller.name:reserve.seller_name}}</text>
73 - <text>{{reserve.address?reserve.address:detail.seller.map_address}}</text> 73 + <text>{{seller?seller.addr:reserev.seller.map_address}}</text>
74 </view> 74 </view>
75 </view> 75 </view>
76 <!-- <view class="visitor"> 76 <!-- <view class="visitor">
@@ -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 && detail.seller.is_open_order==1 && marketing.is_order=='1'}}"> 180 + <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
181 <view class="rubric"> 181 <view class="rubric">
182 特供服务 182 特供服务
183 </view> 183 </view>
@@ -186,7 +186,7 @@ @@ -186,7 +186,7 @@
186 </view> 186 </view>
187 <view class="endStyle"> 187 <view class="endStyle">
188 <view class="book-item-font second-book-button flex-cc font30r cook" style="position: relative;"> 188 <view class="book-item-font second-book-button flex-cc font30r cook" style="position: relative;">
189 - <view wx:if="{{detail && detail.seller.is_open_order==1 && marketing.is_order=='1'}}" class="menu-item menu-seller-item flex-ll" bindtap="cookbook"> 189 + <view wx:if="{{detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}" class="menu-item menu-seller-item flex-ll" bindtap="cookbook">
190 去点餐 190 去点餐
191 </view> 191 </view>
192 </view> 192 </view>
@@ -196,7 +196,7 @@ @@ -196,7 +196,7 @@
196 <view class="rubric rubric1"> 196 <view class="rubric rubric1">
197 特别优惠 197 特别优惠
198 </view> 198 </view>
199 - <view class="preferentialItems" wx:if="{{marketing.is_coupon=='1'}}"> 199 + <view class="preferentialItems" wx:if="{{marketing && marketing.is_coupon=='1'}}">
200 <view class="left"> 200 <view class="left">
201 <view class="top"> 201 <view class="top">
202 <text>200元代金券</text> 202 <text>200元代金券</text>
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
211 去抢购 211 去抢购
212 </view> 212 </view>
213 </view> 213 </view>
214 - <view class="preferentialItems" wx:if="{{marketing.is_recharge=='1'}}"> 214 + <view class="preferentialItems" wx:if="{{marketing && marketing.is_recharge=='1'}}">
215 <view class="left"> 215 <view class="left">
216 <view class="top"> 216 <view class="top">
217 <text>充1000赠300</text> 217 <text>充1000赠300</text>
@@ -226,9 +226,9 @@ @@ -226,9 +226,9 @@
226 </view> 226 </view>
227 </view> 227 </view>
228 <view class="vips"> 228 <view class="vips">
229 - <image src="{{marketing.logo?marketing.logo:detail.seller.seller_image}}" mode="heightFix" />  
230 - <view class="news" wx:if="{{marketing.wecomle}}">  
231 - {{marketing.wecomle}} 229 + <image wx:if="{{marketing && marketing.logo}}" src="{{marketing.logo?marketing.logo:''}}" mode="heightFix" />
  230 + <view class="news" wx:if="{{marketing && marketing.wecomle}}">
  231 + {{marketing?marketing.wecomle:''}}
232 </view> 232 </view>
233 <!-- <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy"> 233 <!-- <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy">
234 点击了解更多会员优惠政策 234 点击了解更多会员优惠政策