diff --git a/pages/funeralreport/funeralreport.vue b/pages/funeralreport/funeralreport.vue index 5bff7a5..ae654ff 100644 --- a/pages/funeralreport/funeralreport.vue +++ b/pages/funeralreport/funeralreport.vue @@ -304,7 +304,6 @@ funeralresult(){ this.from.accessLocation = this.area this.from.accessTime = this.accessTime - // this.info.obituaryType = "网上报丧" if(uni.getStorageSync('dh') == 2){ this.from.obituaryType = "电话报丧" }else{ @@ -312,15 +311,18 @@ } this.from.remarks = this.remarks this.from.userId = uni.getStorageSync("USERS_KEY").userId - // console.log(this.from); - if(this.from.deceasedName == '' || this.from.deceasedAge == '' || this.from.idCardNumber == '' || this.from.ethnicity == '' || this.from.contactName == '' || this.from.contactPhone == '' || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择' || this.area != '请输入详细地址' || this.accessTime != "请选择" || this.remarks != ''){ + console.log("提交数据",this.from,this.sex,this.area,this.accessTime,this.remarks); + if(this.from.deceasedName != '' && this.from.deceasedAge != '' + && this.from.idCardNumber != '' && this.from.ethnicity != '' + && this.from.contactName != '' && this.from.contactPhone != '' + && this.from.deathCase != '' && this.from.deathdate == '请选择' + && this.deceasedSex != '请选择' && this.accessLocation != '请输入详细地址' && this.accessTime != "请选择" && this.remarks != ''){ uni.showToast({ icon:"error", title:"请填写完整必填信息" }) }else{ - // console.log(1123); - this.API.tjwsyy(this.info).then(res=>{ + this.API.tjwsyy(this.from).then(res=>{ console.log("网上报丧",res); }) uni.navigateTo({ @@ -372,7 +374,10 @@ console.log("提交的数据",this.from,this.sex); // return // deceasedName deceasedAge idCardNumber ethnicity contactName contactPhone deathCase deathdate sex - if(this.from.deceasedName == '' || this.from.deceasedAge == '' || this.from.idCardNumber == '' || this.from.ethnicity == '' || this.from.contactName == '' || this.from.contactPhone == '' || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择'){ + if(this.from.deceasedName == '' || this.from.deceasedAge == '' + || this.from.idCardNumber == '' || this.from.ethnicity == '' + || this.from.contactName == '' || this.from.contactPhone == '' + || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择'){ uni.showToast({ title: '请输入完整必填', //将值设置为 success 或者直接不用写icon这个参数 diff --git a/pages/mydeathdetail/mydeathdetail.vue b/pages/mydeathdetail/mydeathdetail.vue index 1ec6eb7..d970125 100644 --- a/pages/mydeathdetail/mydeathdetail.vue +++ b/pages/mydeathdetail/mydeathdetail.vue @@ -109,7 +109,7 @@ return { OrderType: 0, nvConfig:{ - title:"报丧订单详情", + title:"报丧详情", bgColor:"#ffffff", color:"#000000", fixedAssist:{