xt / xcx-book · Commits

Go to a project

Commit fbbabd41923d22cafbcab5b7e1babcd13eeb1734

Authored by pengye
1 parent 2c72accd
build: skipped

新邀请函餐厅没有环境图片字段问题处理

Inline Side-by-side
Showing 7 changed files with 32 additions and 32 deletions
@@ -458,12 +458,12 @@ Page({ @@ -458,12 +458,12 @@ Page({
458 // 根据券ID获取券详情 458 // 根据券ID获取券详情
459 this.getActivityByIdFun(couponList, couponList.length) 459 this.getActivityByIdFun(couponList, couponList.length)
460 // 根据充值ID获取充值详情 460 // 根据充值ID获取充值详情
461 - if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) { 461 + if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {
462 this.getRechargeDetail(marketing.recharge_data.id) 462 this.getRechargeDetail(marketing.recharge_data.id)
463 } 463 }
464 - if (store && store.images.length > 0) store.images = util.determine(store.images);  
465 - if (signboard && signboard.images) signboard.images = util.determine(signboard.images);  
466 - if (marketing && marketing.is_online_book == '1' && marketing.is_transpond == '1') { 464 + if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
  465 + if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
  466 + if (marketing && marketing.is_online_book && marketing.is_online_book == '1' && marketing.is_transpond == '1') {
467 this.setData({ 467 this.setData({
468 between: true 468 between: true
469 }) 469 })
@@ -459,12 +459,12 @@ Page({ @@ -459,12 +459,12 @@ Page({
459 // 根据券ID获取券详情 459 // 根据券ID获取券详情
460 this.getActivityByIdFun(couponList, couponList.length) 460 this.getActivityByIdFun(couponList, couponList.length)
461 // 根据充值ID获取充值详情 461 // 根据充值ID获取充值详情
462 - if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) { 462 + if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {
463 this.getRechargeDetail(marketing.recharge_data.id) 463 this.getRechargeDetail(marketing.recharge_data.id)
464 } 464 }
465 - if (store && store.images.length > 0) store.images = util.determine(store.images);  
466 - if (signboard && signboard.images) signboard.images = util.determine(signboard.images);  
467 - if (marketing && marketing.is_online_book == '1' && marketing.is_transpond == '1') { 465 + if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
  466 + if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
  467 + if (marketing && marketing.is_online_book && marketing.is_online_book == '1' && marketing.is_transpond == '1') {
468 this.setData({ 468 this.setData({
469 between: true 469 between: true
470 }) 470 })
@@ -459,12 +459,12 @@ Page({ @@ -459,12 +459,12 @@ Page({
459 // 根据券ID获取券详情 459 // 根据券ID获取券详情
460 this.getActivityByIdFun(couponList, couponList.length) 460 this.getActivityByIdFun(couponList, couponList.length)
461 // 根据充值ID获取充值详情 461 // 根据充值ID获取充值详情
462 - if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) { 462 + if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {
463 this.getRechargeDetail(marketing.recharge_data.id) 463 this.getRechargeDetail(marketing.recharge_data.id)
464 } 464 }
465 - if (store && store.images.length > 0) store.images = util.determine(store.images);  
466 - if (signboard && signboard.images) signboard.images = util.determine(signboard.images);  
467 - if (marketing && marketing.is_online_book == '1' && marketing.is_transpond == '1') { 465 + if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
  466 + if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
  467 + if (marketing && marketing.is_online_book && marketing.is_online_book == '1' && marketing.is_transpond == '1') {
468 this.setData({ 468 this.setData({
469 between: true 469 between: true
470 }) 470 })
@@ -458,12 +458,12 @@ Page({ @@ -458,12 +458,12 @@ Page({
458 // 根据券ID获取券详情 458 // 根据券ID获取券详情
459 this.getActivityByIdFun(couponList, couponList.length) 459 this.getActivityByIdFun(couponList, couponList.length)
460 // 根据充值ID获取充值详情 460 // 根据充值ID获取充值详情
461 - if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) { 461 + if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {
462 this.getRechargeDetail(marketing.recharge_data.id) 462 this.getRechargeDetail(marketing.recharge_data.id)
463 } 463 }
464 - if (store && store.images.length > 0) store.images = util.determine(store.images);  
465 - if (signboard && signboard.images) signboard.images = util.determine(signboard.images);  
466 - if (marketing && marketing.is_online_book == '1' && marketing.is_transpond == '1') { 464 + if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
  465 + if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
  466 + if (marketing && marketing.is_online_book && marketing.is_online_book == '1' && marketing.is_transpond == '1') {
467 this.setData({ 467 this.setData({
468 between: true 468 between: true
469 }) 469 })
@@ -407,16 +407,16 @@ Page({ @@ -407,16 +407,16 @@ Page({
407 // 根据券ID获取券详情 407 // 根据券ID获取券详情
408 this.getActivityByIdFun(couponList, couponList.length) 408 this.getActivityByIdFun(couponList, couponList.length)
409 // 根据充值ID获取充值详情 409 // 根据充值ID获取充值详情
410 - if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) { 410 + if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {
411 this.getRechargeDetail(marketing.recharge_data.id) 411 this.getRechargeDetail(marketing.recharge_data.id)
412 } 412 }
413 - if (store && store.images.length > 0) store.images = util.determine(store.images);  
414 - if (signboard && signboard.images) signboard.images = util.determine(signboard.images);  
415 - if (marketing && marketing.is_online_book == '1' && marketing.is_transpond == '1') {  
416 - this.setData({  
417 - between: true  
418 - })  
419 - } 413 + if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
  414 + if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
  415 + if (marketing && marketing.is_online_book && marketing.is_online_book == '1' && marketing.is_transpond == '1') {
  416 + this.setData({
  417 + between: true
  418 + })
  419 + }
420 if (themeColor == 'turmeric' || themeColor == 'golden') { 420 if (themeColor == 'turmeric' || themeColor == 'golden') {
421 whiteBj = true 421 whiteBj = true
422 } else { 422 } else {
@@ -458,12 +458,12 @@ Page({ @@ -458,12 +458,12 @@ Page({
458 // 根据券ID获取券详情 458 // 根据券ID获取券详情
459 this.getActivityByIdFun(couponList, couponList.length) 459 this.getActivityByIdFun(couponList, couponList.length)
460 // 根据充值ID获取充值详情 460 // 根据充值ID获取充值详情
461 - if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) { 461 + if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {
462 this.getRechargeDetail(marketing.recharge_data.id) 462 this.getRechargeDetail(marketing.recharge_data.id)
463 } 463 }
464 - if (store && store.images.length > 0) store.images = util.determine(store.images);  
465 - if (signboard && signboard.images) signboard.images = util.determine(signboard.images);  
466 - if (marketing && marketing.is_online_book == '1' && marketing.is_transpond == '1') { 464 + if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
  465 + if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
  466 + if (marketing && marketing.is_online_book && marketing.is_online_book == '1' && marketing.is_transpond == '1') {
467 this.setData({ 467 this.setData({
468 between: true 468 between: true
469 }) 469 })
@@ -457,12 +457,12 @@ Page({ @@ -457,12 +457,12 @@ Page({
457 // 根据券ID获取券详情 457 // 根据券ID获取券详情
458 this.getActivityByIdFun(couponList, couponList.length) 458 this.getActivityByIdFun(couponList, couponList.length)
459 // 根据充值ID获取充值详情 459 // 根据充值ID获取充值详情
460 - if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) { 460 + if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {
461 this.getRechargeDetail(marketing.recharge_data.id) 461 this.getRechargeDetail(marketing.recharge_data.id)
462 } 462 }
463 - if (store && store.images.length > 0) store.images = util.determine(store.images);  
464 - if (signboard && signboard.images) signboard.images = util.determine(signboard.images);  
465 - if (marketing && marketing.is_online_book == '1' && marketing.is_transpond == '1') { 463 + if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
  464 + if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
  465 + if (marketing && marketing.is_online_book && marketing.is_online_book == '1' && marketing.is_transpond == '1') {
466 this.setData({ 466 this.setData({
467 between: true 467 between: true
468 }) 468 })