From e81220f5946b61a372f33d35a1dedf3d66419e79 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Mon, 13 Jun 2022 18:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E3=80=90=E5=85=91?=
 =?UTF-8?q?=E6=8D=A2=E7=A0=81=E6=89=B9=E6=AC=A1=E3=80=91=E5=9C=A8=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=92=8C=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?channel=E4=B8=BA1=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/exchangecode/commodity/commodity.js | 3 ++-
 src/pages/exchangecode/edit/edit.js           | 5 +++--
 src/pages/plan/add/edit.js                    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/exchangecode/commodity/commodity.js b/src/pages/exchangecode/commodity/commodity.js
index 1fc6b9d7..594b3834 100644
--- a/src/pages/exchangecode/commodity/commodity.js
+++ b/src/pages/exchangecode/commodity/commodity.js
@@ -162,7 +162,8 @@ export default class commoditylist extends React.Component {
                   product_type_text: '立减金',
                   only: item.entity.channel_activity_id,
                   id: item.id,
-                  upstream: item.entity.channel === '1' ? '支付宝' : '微信',
+                  upstream:
+                    String(item.entity.channel) === '1' ? '支付宝' : '微信',
                   code_batch_id: item.code_batch_id,
                   contract_price: item.entity.price,
                   create_time: item.create_time,
diff --git a/src/pages/exchangecode/edit/edit.js b/src/pages/exchangecode/edit/edit.js
index d10d30f2..29b0a927 100644
--- a/src/pages/exchangecode/edit/edit.js
+++ b/src/pages/exchangecode/edit/edit.js
@@ -128,7 +128,8 @@ export default class exchangedit extends React.Component {
               req.update_product.reduce.map((item1) => {
                 item1.type = 2
                 item1.only = item1.channel_activity_id
-                item1.upstream = item1.channel === '1' ? '支付宝' : '微信' //上游
+                item1.upstream =
+                  String(item1.channel) === '1' ? '支付宝' : '微信' //上游
                 item1.origin = item1
               })
               req.update_product = [
@@ -328,7 +329,7 @@ export default class exchangedit extends React.Component {
           product_type_text: '立减金',
           only: item.entity.channel_activity_id,
           id: item.entity.goods_id,
-          upstream: item.entity.channel === '1' ? '支付宝' : '微信',
+          upstream: String(item.entity.channel) === '1' ? '支付宝' : '微信',
           code_batch_id: item.code_batch_id,
           contract_price: item.entity.price,
           create_time: item.create_time,
diff --git a/src/pages/plan/add/edit.js b/src/pages/plan/add/edit.js
index 57e03fad..fd56ff5c 100644
--- a/src/pages/plan/add/edit.js
+++ b/src/pages/plan/add/edit.js
@@ -224,7 +224,7 @@ export default class add extends React.Component {
           obj.channel_activity_id = item3.channel_activity_id //批次号
           obj.only = item3.channel_activity_id
           obj.type = 2 //类型
-          obj.upstream = item3.channel === '1' ? '支付宝' : '微信' //上游
+          obj.upstream = String(item3.channel) === '1' ? '支付宝' : '微信' //上游
           obj.effectDate =
             item3.time_limit.effect_time.start_time +
             ' 至 ' +