diff --git a/combining.html b/combining.html index 765c96f..eb422b7 100644 --- a/combining.html +++ b/combining.html @@ -22,6 +22,14 @@ height: 100%; overflow: hidden; } + .content .box .g-b-u li{ + position: relative; + } + .content .box .g-b-u li .period_tips_text { + position: absolute; + font-size: 0.1rem; + top: 0; + } @@ -78,6 +86,7 @@ 已使用({{item.voucher.num}}/{{item.voucher.send_num}})
领取失败({{item.voucher.num}}/{{item.voucher.send_num}})
+{{item.voucher.period_tips_text}}
@@ -97,9 +106,9 @@ + :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm"> @@ -489,6 +498,8 @@ }).then(res => { if (res.code == 200) { this.goods = res.data; + this.form.receive_account = this.goods.account || ''; + this.form.confirm = this.goods.account || ''; // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false; @@ -688,7 +699,7 @@ self.loading = false; }, 5000); - if (this.goods.send_status === 3 || this.goods.send_status === 4) { + if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) { let params = { token: localStorage.getItem("token"), code_batch_id: this.code_batch_id, diff --git a/packkey/combining.html b/packkey/combining.html index 1081dbd..c6e32e9 100644 --- a/packkey/combining.html +++ b/packkey/combining.html @@ -23,6 +23,14 @@ height: 100%; overflow: hidden; } + .content .box .g-b-u li{ + position: relative; + } + .content .box .g-b-u li .period_tips_text { + position: absolute; + font-size: 0.1rem; + top: 0; + } @@ -79,6 +87,7 @@ 已使用({{item.voucher.num}}/{{item.voucher.send_num}})
领取失败({{item.voucher.num}}/{{item.voucher.send_num}})
+{{item.voucher.period_tips_text}}
@@ -98,9 +107,9 @@ + :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm"> @@ -491,6 +500,8 @@ }).then(res => { if (res.code == 200) { this.goods = res.data; + this.form.receive_account = this.goods.account || ''; + this.form.confirm = this.goods.account || ''; // 支付宝组合商品 // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 this.popMsg = res.data.send_status === 2 || res.data.send_status === 3 || res.data.send_status === 4 ? true : false; @@ -726,7 +737,7 @@ self.loading = false; }, 5000); - if (this.goods.send_status === 3 || this.goods.send_status === 4) { + if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) { let params = { token: localStorage.getItem("token"), code_batch_id: this.code_batch_id, diff --git a/packkey/wx-combining.html b/packkey/wx-combining.html index ff8772e..634b196 100644 --- a/packkey/wx-combining.html +++ b/packkey/wx-combining.html @@ -109,9 +109,9 @@ + :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm"> @@ -338,6 +338,8 @@ new_data.product = self.computeNum(new_data.product); self.goods = new_data; + this.form.receive_account = this.goods.account || ''; + this.form.confirm = this.goods.account || ''; // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; @@ -709,7 +711,7 @@ self.loading = false; }, 5000); - if (this.goods.send_status === 3 || this.goods.send_status === 4) { + if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) { let params = { token: localStorage.getItem("token"), code_batch_id: this.code_batch_id, diff --git a/packkey/ysf-combining.html b/packkey/ysf-combining.html index cad5bee..9955e27 100644 --- a/packkey/ysf-combining.html +++ b/packkey/ysf-combining.html @@ -108,9 +108,9 @@ + :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm"> @@ -337,6 +337,8 @@ new_data.product = self.computeNum(new_data.product); self.goods = new_data; + this.form.receive_account = this.goods.account || ''; + this.form.confirm = this.goods.account || ''; // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; @@ -676,7 +678,7 @@ self.loading = false; }, 5000); - if (this.goods.send_status === 3 || this.goods.send_status === 4) { + if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) { let params = { token: localStorage.getItem("token"), code_batch_id: this.code_batch_id, diff --git a/wx-combining.html b/wx-combining.html index 3538059..d32efa2 100644 --- a/wx-combining.html +++ b/wx-combining.html @@ -109,9 +109,9 @@ + :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm"> @@ -337,6 +337,8 @@ new_data.product = self.computeNum(new_data.product); self.goods = new_data; + this.form.receive_account = this.goods.account || ''; + this.form.confirm = this.goods.account || ''; // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; @@ -667,7 +669,7 @@ self.loading = false; }, 5000); - if (this.goods.send_status === 3 || this.goods.send_status === 4) { + if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) { let params = { token: localStorage.getItem("token"), code_batch_id: this.code_batch_id, diff --git a/xw-pages/wx-combining.html b/xw-pages/wx-combining.html index 21465c5..e63a33b 100644 --- a/xw-pages/wx-combining.html +++ b/xw-pages/wx-combining.html @@ -109,9 +109,9 @@ + :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm"> @@ -337,6 +337,8 @@ new_data.product = self.computeNum(new_data.product); self.goods = new_data; + this.form.receive_account = this.goods.account || ''; + this.form.confirm = this.goods.account || ''; // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; diff --git a/ysf-combining.html b/ysf-combining.html index 680adc5..7ef6349 100644 --- a/ysf-combining.html +++ b/ysf-combining.html @@ -108,9 +108,9 @@ + :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm"> @@ -336,6 +336,8 @@ new_data.product = self.computeNum(new_data.product); self.goods = new_data; + this.form.receive_account = this.goods.account || ''; + this.form.confirm = this.goods.account || ''; // send_status 1发放中,2全部成功 ,3全部失败,4部分失败 ,5未领取 self.popMsg = self.goods.send_status === 2 || self.goods.send_status === 3 || self.goods.send_status === 4 ? true : false; @@ -635,7 +637,7 @@ self.loading = false; }, 5000); - if (this.goods.send_status === 3 || this.goods.send_status === 4) { + if (!this.goods.period_type || this.goods.period_type == 1 && (this.goods.send_status === 3 || this.goods.send_status === 4)) { let params = { token: localStorage.getItem("token"), code_batch_id: this.code_batch_id,