diff --git a/packages/card/index.vue b/packages/card/index.vue index f85e432..8738dd1 100644 --- a/packages/card/index.vue +++ b/packages/card/index.vue @@ -43,7 +43,8 @@ indicatorActiveColor: '#b98b44', currentSwiperIndex: 0, form: { - code: '', + code: '', + limit_tag:1 }, banner3:[] @@ -87,7 +88,7 @@ this.$u.api.getDates(this.form).then(res => { uni.setStorageSync('vuex_card_state', { card_number: this.form.card_number, - card: res.card + card: res.card, }) uni.navigateTo({ url: '/packages/card/detail' diff --git a/packages/order/order.vue b/packages/order/order.vue index 90b8562..f015555 100644 --- a/packages/order/order.vue +++ b/packages/order/order.vue @@ -357,13 +357,7 @@ this.form.password = uni.getStorageSync("vuex_card") ? uni.getStorageSync("vuex_card").password : '' // uni.removeStorageSync("vuex_card") } - // 温馨提示 - const configs = uni.getStorageSync("configs") - configs.map(item => { - if (item.key === 'tips') { - this.tips = item.value - } - }) + this.getAddress() this.getDates() // this.getExpress() @@ -468,7 +462,21 @@ } } else { toast("当前无可提货时间") - } + } + + // 温馨提示 + let product = res.product + if(!isNull(res.product.tip)){ + this.tips = res.product.tip + }else{ + const configs = uni.getStorageSync("configs") + configs.map(item => { + if (item.key === 'tips') { + this.tips = item.value + } + }) + } + }).then(res => { })