diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 0336a7a..d939c88 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -48,7 +48,7 @@ const install = (Vue, vm) => { provider: 'weixin', success: (res) => { let url = baseUrl + - '/api/mobile/user/login' + '​/api​/mobile​/user​/applet-login' uni.request({ url: url, data:{ diff --git a/packages/card/detail.vue b/packages/card/detail.vue index f5e12f4..4951663 100644 --- a/packages/card/detail.vue +++ b/packages/card/detail.vue @@ -202,12 +202,12 @@ width: 140rpx; line-height: 80rpx; color: #fff; - font-size: 24rpx; + font-size: 26rpx; border-right: 1rpx solid #f6d9b6; } .listitem text { - font-size: 24rpx; + font-size: 26rpx; line-height: 80rpx; color: #f6d9b6; padding-left: 20rpx; @@ -218,7 +218,7 @@ height: 74rpx; line-height: 74rpx; background: #b98b44; - font-size: 24rpx; + font-size: 26rpx; color: #fff; margin: 0 auto; text-align: center; diff --git a/packages/card/index.vue b/packages/card/index.vue index 2f8556f..dd82564 100644 --- a/packages/card/index.vue +++ b/packages/card/index.vue @@ -215,7 +215,7 @@ height: 74rpx; line-height: 74rpx; color: #676767 !important; - font-size: 20rpx !important; + font-size: 26rpx !important; padding-left: 94rpx; padding-right: 30rpx; background-position: left 30rpx center; @@ -233,7 +233,7 @@ /deep/ .u-btn { color: #b98b44 !important; - font-size: 24rpx !important; + font-size: 26rpx !important; font-weight: bold; padding: 0; height: 74rpx !important; diff --git a/packages/my/score.vue b/packages/my/score.vue index e9f3484..dcc7af5 100644 --- a/packages/my/score.vue +++ b/packages/my/score.vue @@ -1,27 +1,29 @@ @@ -375,10 +373,12 @@ methods: { async getAddress() { const res = await this.$u.api.getUserAddress() - this.listAddress = res.address - if (!this.type == 'edit') { + this.listAddress = res.address + console.log("this.type",this.type) + if (!(this.type == 'edit')) { this.showAddress = this.listAddress.length > 0 ? true : false - } + } + console.log("this.type",this.type,this.showAddress) }, // async getExpress() { // const res = await this.$u.api.getExpress() @@ -406,11 +406,13 @@ await this.$u.api.getDates({ card_number: this.form.card_number }).then(res => { - let data = res.card + let data = res.card + if(data.open_dates && data.open_dates.length===0){ + toast("当前无可提货时间") + return + } if (data.open_dates) { for (var k in data.open_dates) { - // 剩余数量大于0 - if (data.open_dates[k]['quantity'] - data.open_dates[k]['booked'] > 0) { if(this.isAfterTwoDays(k)){ let _k = this.momentDay(k) @@ -419,9 +421,10 @@ ..._k }) } - } } + }else{ + toast("当前无可提货时间") } }).then(res => {