diff --git a/pages/index/index.js b/pages/index/index.js index a19fe80..01a1228 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -271,9 +271,9 @@ Page({ //公众号关注组件 officialaccount(e){ if(e.detail.status == 0&&!app.getStorageByKey("stopNotice")&&!this.data.isShowReport){ - this.setData({ - isShowNotice:true, - }) + // this.setData({ + // isShowNotice:true, + // }) } }, diff --git a/pages/order/edit/index.js b/pages/order/edit/index.js index 6c325fc..f6f885c 100644 --- a/pages/order/edit/index.js +++ b/pages/order/edit/index.js @@ -445,7 +445,7 @@ Page({ icon: 'none' }) } - else if(this.data.srv_ids.length == 0 && this.data.userInfo.biz_type != 3){ + else if(this.data.srv_ids.length == 0 && this.data.userInfo.biz_type == 1){ wx.showToast({ title: '请选择代办内容', icon: 'none' @@ -855,7 +855,7 @@ Page({ if(that.data.fine_ids.length>0){ params['fine_ids'] = that.data.fine_ids; } - if(that.data.priceinfo.fine_money){ + if(that.data.priceinfo.fine_money && that.data.userInfo.biz_type == 1){ params['if_fine'] = that.data.if_fine?'1':'0'; if(that.data.if_fine&&that.data.disc_fine_money!= ''){ params['disc_fine_money'] = that.data.disc_fine_money; diff --git a/pages/order/edit/index.wxml b/pages/order/edit/index.wxml index a8fc4b0..60f8515 100644 --- a/pages/order/edit/index.wxml +++ b/pages/order/edit/index.wxml @@ -114,53 +114,55 @@ - - 精品尊享包{{priceinfo.fine_money}}元 - - - - - - 精品优惠 - - - - - - - - 代办相关* - - 当前代办费用:{{srv_total}}元 + + + 精品尊享包{{priceinfo.fine_money}}元 + + - - - - - - - - - - - 精品赠送 - - 精品价值:{{fine_total}}元 + + 精品优惠 + + + - - - - {{item.title}} - - - + + + 代办相关* + + 当前代办费用:{{srv_total}}元 + + + + + + + + + - + + + 精品赠送 + + 精品价值:{{fine_total}}元 + + + + + + {{item.title}} + + + + + + @@ -223,31 +225,33 @@ 车身优惠 {{disc_money}}元 - 其他信息 - - 精品尊享包 - {{priceinfo.fine_money}}元 - - - 精品优惠 - {{disc_fine_money}}元 - - - 代办相关 - - - {{item.title}} - + + 其他信息 + + 精品尊享包 + {{priceinfo.fine_money}}元 - - - 精品赠送 - - - {{item.title}} - + + 精品优惠 + {{disc_fine_money}}元 - + + 代办相关 + + + {{item.title}} + + + + + 精品赠送 + + + {{item.title}} + + + + diff --git a/pages/order/register/index.js b/pages/order/register/index.js index a9ff956..965b216 100644 --- a/pages/order/register/index.js +++ b/pages/order/register/index.js @@ -218,7 +218,7 @@ Page({ icon: 'none' }) } - else if(this.data.srv_ids.length == 0 && this.data.userInfo.biz_type != 3){ + else if(this.data.srv_ids.length == 0 && this.data.userInfo.biz_type == 1){ wx.showToast({ title: '请选择代办内容', icon: 'none' @@ -690,7 +690,7 @@ Page({ if(that.data.fine_ids.length>0){ params['fine_ids'] = that.data.fine_ids; } - if(that.data.priceinfo.fine_money){ + if(that.data.priceinfo.fine_money && that.data.userInfo.biz_type == 1){ params['if_fine'] = that.data.if_fine?'1':'0'; if(that.data.if_fine&&that.data.disc_fine_money!= ''){ params['disc_fine_money'] = that.data.disc_fine_money; diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml index 695423d..5a9d685 100644 --- a/pages/order/register/index.wxml +++ b/pages/order/register/index.wxml @@ -203,53 +203,55 @@ - - 精品尊享包{{priceinfo.fine_money}}元 - - - - - - 精品优惠 - - - - - - - - 代办相关* - - 当前代办费用:{{srv_total}}元 + + + 精品尊享包{{priceinfo.fine_money}}元 + + - - - - - - - - - - - 精品赠送 - - 精品价值:{{fine_total}}元 + + 精品优惠 + + + - - - - {{item.title}} - - - + + + 代办相关* + + 当前代办费用:{{srv_total}}元 + + + + + + + + + - + + + 精品赠送 + + 精品价值:{{fine_total}}元 + + + + + + {{item.title}} + + + + + + @@ -376,31 +378,33 @@ 车身优惠 {{disc_money}}元 - 其他信息 - - 精品尊享包 - {{priceinfo.fine_money}}元 - - - 精品优惠 - {{disc_fine_money}}元 - - - 代办相关 - - - {{item.title}} - + + 其他信息 + + 精品尊享包 + {{priceinfo.fine_money}}元 - - - 精品赠送 - - - {{item.title}} - + + 精品优惠 + {{disc_fine_money}}元 - + + 代办相关 + + + {{item.title}} + + + + + 精品赠送 + + + {{item.title}} + + + +