From 082b43dd26bcf346912f79e4b6008e243bcf0a71 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Tue, 21 Nov 2023 14:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E7=AB=8B=E5=87=8F=E9=87=91=E3=80=81=E7=BA=A2=E5=8C=85=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81H5=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/knockGold/index.jsx  | 20 +++++++++++++++++++-
 src/components/redPackets/index.jsx | 18 +++++++++++++++++-
 src/components/redPackets/static.js |  1 +
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx
index 627a1a92..c08ed26f 100644
--- a/src/components/knockGold/index.jsx
+++ b/src/components/knockGold/index.jsx
@@ -102,7 +102,8 @@ export default class addKnockGold extends Component {
         irregularTime: [[]], //不规则时间
         ruleDate: [[]], //规则日期
         ruleWeek: [], //规则周
-        provider: "voucher_wechat_lsxd" //主体名称
+        provider: "voucher_wechat_lsxd", //主体名称
+        receive_mode: 1
       },
       TimeDiffer: "",
       visible: false, //加框弹窗
@@ -204,6 +205,7 @@ export default class addKnockGold extends Component {
       model.card_type = this.props.data.card_type.map((item) => String(item))
       model.receive_number = this.props.data.receive_conf.num
       model.receive_type = this.props.data.receive_conf.type
+      model.receive_mode = this.props.data.receive_mode
       model.timer[0] = this.props.data.time_limit.receive_time.start_time
       model.timer[1] = this.props.data.time_limit.receive_time.end_time
       model.timer_type = !this.props.data.time_limit.receive_time?.start_time ? "1" : "2"
@@ -470,6 +472,7 @@ export default class addKnockGold extends Component {
     const transformData = {}
     transformData.channel = this.state.model.channel
     transformData.provider = this.state.model.provider
+    transformData.receive_mode = this.state.model.receive_mode
     /* 是支付宝立减金 才进行模板赋值操作 */
     if (transformData.channel == 1) {
       transformData.temp_no = this.state.model.temp_no
@@ -758,6 +761,9 @@ export default class addKnockGold extends Component {
                   } else {
                     this.onHandleChange("", "instruction")
                   }
+                  if (target.value !== 1) {
+                    this.onHandleChange(1, "receive_mode")
+                  }
                 }}
                 value={this.state.model.channel}
               >
@@ -778,6 +784,18 @@ export default class addKnockGold extends Component {
                 <RadioButton value={"voucher_wechat_fjxw"}>福建兴旺</RadioButton>
               </RadioGroup>
             </FormItem>
+            <FormItem labelname="领取方式" prop="receive_mode" id="receive_mode" key="receive_mode">
+              <RadioGroup
+                disabled={this.state.model.channel != 1 ? true : false}
+                onChange={({ target }) => {
+                  this.onHandleChange(target.value, "receive_mode")
+                }}
+                value={this.state.model.receive_mode}
+              >
+                <RadioButton value={1}>支付宝</RadioButton>
+                <RadioButton value={2}>H5页面</RadioButton>
+              </RadioGroup>
+            </FormItem>
             <FormItem labelname="立减金平台批次号" prop="channel_activity_id" id="batch_number">
               <Ipt
                 onChange={(value) => {
diff --git a/src/components/redPackets/index.jsx b/src/components/redPackets/index.jsx
index c20be02a..d248d4ce 100644
--- a/src/components/redPackets/index.jsx
+++ b/src/components/redPackets/index.jsx
@@ -234,7 +234,7 @@ export default class addKnockGold extends Component {
   echoFun(UserSelectList = []) {
     const model = cloneDeep(this.props.data)
     if (model) {
-      const { early_notifier, early_per, begin_time, end_time } = model
+      const { early_notifier, early_per, begin_time, end_time, receive_mode } = model
       model.early_notifier = early_notifier
         .map((item) => {
           return UserSelectList.map((items) => {
@@ -246,6 +246,7 @@ export default class addKnockGold extends Component {
         .filter((item1) => item1)
       model.effect_date = []
       model.effect_date[0] = begin_time
+      model.receive_mode = receive_mode || 1
       model.effect_date[1] = end_time
       model.copy && (model.cash_activity_id = uuid(8)) /* 是否是复制 */
       /* 以下操作 筛选出输入框的预警值并经行填充 */
@@ -522,6 +523,9 @@ export default class addKnockGold extends Component {
                   } else {
                     this.onHandleChange("", "instruction")
                   }
+                  if (target.value !== 1) {
+                    this.onHandleChange(1, "receive_mode")
+                  }
                 }}
                 value={this.state.model.channel}
               >
@@ -547,6 +551,18 @@ export default class addKnockGold extends Component {
                 <RadioButton value={"2"}>随机</RadioButton>
               </RadioGroup>
             </FormItem>
+            <FormItem labelname="领取方式" prop="receive_mode" id="receive_mode" key="receive_mode">
+              <RadioGroup
+                disabled={this.state.model.channel != 1 ? true : false}
+                onChange={({ target }) => {
+                  this.onHandleChange(target.value, "receive_mode")
+                }}
+                value={this.state.model.receive_mode}
+              >
+                <RadioButton value={1}>支付宝</RadioButton>
+                <RadioButton value={2}>H5页面</RadioButton>
+              </RadioGroup>
+            </FormItem>
             <FormItem labelname="红包批次号" prop="channel_activity_id" id="batch_number">
               <Ipt
                 disabled={true}
diff --git a/src/components/redPackets/static.js b/src/components/redPackets/static.js
index 194f858e..63ca7a28 100644
--- a/src/components/redPackets/static.js
+++ b/src/components/redPackets/static.js
@@ -54,6 +54,7 @@ export function model({ data }) {
       end_time: "" /* 生效结束时间 */,
       receive_type: 0, //领取时间类型
       wishing: "",
+      receive_mode: 1,
       /* 不规则时间 */
       receive_irregular: [
         {