From bc98d6fa088b6d92da5a6c996db028012074890f Mon Sep 17 00:00:00 2001
From: zhangguoping <jackzgp@aliyun.com>
Date: Tue, 22 Oct 2024 19:00:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 combining.html             | 17 ++++++++++++++---
 packkey/combining.html     | 17 ++++++++++++++---
 packkey/wx-combining.html  |  8 +++++---
 packkey/ysf-combining.html |  8 +++++---
 wx-combining.html          |  8 +++++---
 xw-pages/wx-combining.html |  6 ++++--
 ysf-combining.html         |  8 +++++---
 7 files changed, 52 insertions(+), 20 deletions(-)

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;
+        }
     </style>
 </head>
 
@@ -78,6 +86,7 @@
                                         已使用({{item.voucher.num}}/{{item.voucher.send_num}})</p>
                                     <p class="g-b-but" v-if="item.voucher.status === 5" style="font-size: 0.1rem;">
                                         领取失败({{item.voucher.num}}/{{item.voucher.send_num}})</p>
+                                    <p class="period_tips_text" v-if="item.voucher.period_tips_text">{{item.voucher.period_tips_text}}</p>
                                 </li>
                             </ul>
                             <p class="notis" :style="{color:dynamicStyle.notis_color}" v-show="goods.product.length>3">
@@ -97,9 +106,9 @@
                         <template
                             v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm">
+                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'"
+                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
                                 v-model="form.receive_account">
                         </template>
 
@@ -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;
+        }
     </style>
 </head>
 
@@ -79,6 +87,7 @@
                                         已使用({{item.voucher.num}}/{{item.voucher.send_num}})</p>
                                     <p class="g-b-but" v-if="item.voucher.status === 5" style="font-size: 0.1rem;">
                                         领取失败({{item.voucher.num}}/{{item.voucher.send_num}})</p>
+                                    <p class="period_tips_text" v-if="item.voucher.period_tips_text">{{item.voucher.period_tips_text}}</p>
                                 </li>
                             </ul>
                             <p class="notis" :style="{color:dynamicStyle.notis_color}" v-show="goods.product.length>3">
@@ -98,9 +107,9 @@
                         <template
                             v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm">
+                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'"
+                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
                                 v-model="form.receive_account">
                         </template>
 
@@ -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 @@
                         <template
                             v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm">
+                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'"
+                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
                                 v-model="form.receive_account">
                         </template>
 
@@ -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 @@
                         <template
                             v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm">
+                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'"
+                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
                                 v-model="form.receive_account">
                         </template>
 
@@ -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 @@
                         <template
                             v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm">
+                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'"
+                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
                                 v-model="form.receive_account">
                         </template>
 
@@ -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 @@
                         <template
                             v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm">
+                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'"
+                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
                                 v-model="form.receive_account">
                         </template>
 
@@ -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 @@
                         <template
                             v-if="goods.send_status !== 2 && (goods.group_info.channel==3||goods.group_info.channel==1&&goods.group_info.receive_mode==2)">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" v-model="form.confirm">
+                                :placeholder="goods.group_info.channel==3?'请输入手机号':'请输入账号'" :disabled="!!goods.account" v-model="form.confirm">
                             <input type="text" maxlength="50"
-                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'"
+                                :placeholder="goods.group_info.channel==3?'请再次输入手机号':'请再次输入账号'" :disabled="!!goods.account"
                                 v-model="form.receive_account">
                         </template>
 
@@ -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,