diff --git a/pages/AppointmentRecord/AppointmentRecord.vue b/pages/AppointmentRecord/AppointmentRecord.vue deleted file mode 100644 index 27ee482..0000000 --- a/pages/AppointmentRecord/AppointmentRecord.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - - - diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index 1718d2c..e953b1a 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -754,17 +754,19 @@ // e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e // .receiveAddress // }) - var list = res.data.filter(e => e.defaultAddressFlag == 1) - if (list.length >= 1) { - this.updata.receiver = list[0].receiveName - this.updata.receiveAddress = list[0].areaName + list[0].receiveAddress - this.updata.phone = list[0].receivePhone - this.userid = list[0].id - } else { - this.updata.receiver = res.data[0].receiveName - this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress - this.updata.phone = res.data[0].receivePhone - this.userid = res.data[0].id + if (res.data.length > 0) { + var list = res.data.filter(e => e.defaultAddressFlag == 1) + if (list.length >= 1) { + this.updata.receiver = list[0].receiveName + this.updata.receiveAddress = list[0].areaName + list[0].receiveAddress + this.updata.phone = list[0].receivePhone + this.userid = list[0].id + } else { + this.updata.receiver = res.data[0].receiveName + this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress + this.updata.phone = res.data[0].receivePhone + this.userid = res.data[0].id + } } }) }, @@ -792,24 +794,26 @@ that.goodsDetailsinfo(that.goodsInfoId, value) goodPatientInfo(value).then(res => { if (res.code == 200) { - var user = res.data.filter(e => e.id == that.userid) - if (user.length >= 1) { - // user[0].address = user[0].provinceName + user[0].cityName + user[0].regionName + user[0] - // .streetName + user[0].receiveAddress - that.updata.receiver = user[0].receiveName - that.updata.receiveAddress = user[0].areaName + user[0].receiveAddress - that.updata.phone = user[0].receivePhone - that.userid = user[0].id - } else { - // res.data.forEach(e => { - // e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e - // .receiveAddress - // }) - that.updata.receiver = res.data[0].receiveName - // this.updata.receiveAddress = res.data[0].address - that.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress - that.updata.phone = res.data[0].receivePhone - that.userid = res.data[0].id + if (res.data.length > 0) { + var user = res.data.filter(e => e.id == that.userid) + if (user.length >= 1) { + // user[0].address = user[0].provinceName + user[0].cityName + user[0].regionName + user[0] + // .streetName + user[0].receiveAddress + that.updata.receiver = user[0].receiveName + that.updata.receiveAddress = user[0].areaName + user[0].receiveAddress + that.updata.phone = user[0].receivePhone + that.userid = user[0].id + } else { + // res.data.forEach(e => { + // e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e + // .receiveAddress + // }) + that.updata.receiver = res.data[0].receiveName + // this.updata.receiveAddress = res.data[0].address + that.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress + that.updata.phone = res.data[0].receivePhone + that.userid = res.data[0].id + } } } }) diff --git a/pages/coupon/coupon.scss b/pages/coupon/coupon.scss index 8acc4dc..055159e 100644 --- a/pages/coupon/coupon.scss +++ b/pages/coupon/coupon.scss @@ -1,6 +1,23 @@ .app { padding: 0; + .noorder { + margin-top: 20%; + + image { + display: block; + margin: 0 auto; + width: 200rpx; + height: 240rpx; + } + + view { + margin-top: 100rpx; + text-align: center; + font-size: 36rpx; + color: #BFBFBF; + } + } .content { width: 96%; margin: 20rpx auto 0; diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue index 190bd35..d42b9a8 100644 --- a/pages/coupon/coupon.vue +++ b/pages/coupon/coupon.vue @@ -31,7 +31,7 @@ 已过期 - + @@ -67,6 +67,12 @@ + + + + 暂无可兑换商品 + + @@ -80,7 +86,7 @@ return { pageNum: 1, pageSize: 10, - couponlist: null, + couponlist: [], total: 0, couponstatus: '', //状态 patientId: null, diff --git a/pages/integral/integral.scss b/pages/integral/integral.scss index a25be69..b3bfdfb 100644 --- a/pages/integral/integral.scss +++ b/pages/integral/integral.scss @@ -3,7 +3,23 @@ .masks { z-index: 999; } +.noorder { + margin-top: 20%; + image { + display: block; + margin: 0 auto; + width: 200rpx; + height: 240rpx; + } + + view { + margin-top: 100rpx; + text-align: center; + font-size: 36rpx; + color: #BFBFBF; + } + } .information { width: 70%; height: 400rpx; diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue index 15fbf7b..d905b4c 100644 --- a/pages/integral/integral.vue +++ b/pages/integral/integral.vue @@ -24,7 +24,7 @@ 积分兑换 - + @@ -43,6 +43,12 @@ + + + + 暂无优惠券 + + @@ -212,7 +218,7 @@ pageNum: 1, pageSize: 10, goodstotal: 0, - goodslist: null, + goodslist: [], goodsitem: null, userid: null, updata: { @@ -267,17 +273,19 @@ that.updata.patientId = value goodPatientInfo(value).then(res => { if (res.code == 200) { - var user = res.data.filter(e => e.id == that.userid) - if (user.length >= 1) { - that.updata.receiver = user[0].receiveName - that.updata.receiveAddress = user[0].areaName + user[0].receiveAddress - that.updata.phone = user[0].receivePhone - that.userid = user[0].id - } else { - that.updata.receiver = res.data[0].receiveName - that.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress - that.updata.phone = res.data[0].receivePhone - that.userid = res.data[0].id + if (res.data.length > 0) { + var user = res.data.filter(e => e.id == that.userid) + if (user.length >= 1) { + that.updata.receiver = user[0].receiveName + that.updata.receiveAddress = user[0].areaName + user[0].receiveAddress + that.updata.phone = user[0].receivePhone + that.userid = user[0].id + } else { + that.updata.receiver = res.data[0].receiveName + that.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress + that.updata.phone = res.data[0].receivePhone + that.userid = res.data[0].id + } } } }) @@ -586,17 +594,19 @@ // 收件人 goodsList() { goodPatientInfo(this.patientId).then(res => { - var list = res.data.filter(e => e.defaultAddressFlag == 1) - if (list.length >= 1) { - this.updata.receiver = list[0].receiveName - this.updata.receiveAddress = list[0].areaName + list[0].receiveAddress - this.updata.phone = list[0].receivePhone - this.userid = list[0].id - } else { - this.updata.receiver = res.data[0].receiveName - this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress - this.updata.phone = res.data[0].receivePhone - this.userid = res.data[0].id + if (res.data.length > 0) { + var list = res.data.filter(e => e.defaultAddressFlag == 1) + if (list.length >= 1) { + this.updata.receiver = list[0].receiveName + this.updata.receiveAddress = list[0].areaName + list[0].receiveAddress + this.updata.phone = list[0].receivePhone + this.userid = list[0].id + } else { + this.updata.receiver = res.data[0].receiveName + this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress + this.updata.phone = res.data[0].receivePhone + this.userid = res.data[0].id + } } }) }, diff --git a/pages/materialbenefits/materialbenefits.vue b/pages/materialbenefits/materialbenefits.vue index bdd68b4..86a935b 100644 --- a/pages/materialbenefits/materialbenefits.vue +++ b/pages/materialbenefits/materialbenefits.vue @@ -32,7 +32,7 @@ 已过期 --> - + + + + + 暂无 + + @@ -104,7 +110,7 @@ usershow: false, pageNum: 1, pageSize: 10, - couponlist: null, + couponlist: [], total: 0, couponstatus: '', //状态 patientId: null, @@ -202,6 +208,24 @@ .app { padding: 0; + .noorder { + margin-top: 20%; + + image { + display: block; + margin: 0 auto; + width: 200rpx; + height: 240rpx; + } + + view { + margin-top: 100rpx; + text-align: center; + font-size: 36rpx; + color: #BFBFBF; + } + } + .mask { .information { width: 70%; diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue index 39cfa37..f80c631 100644 --- a/pages/shopping/shopping.vue +++ b/pages/shopping/shopping.vue @@ -110,7 +110,7 @@