Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu

src/components/knockGold/index.jsx

@@ -484,6 +484,11 @@ export default class addKnockGold extends Component {
       return false
     }
 
+    if (this.state.model.day_budget - 0 < this.state.model.reduce_amount - 0) {
+      Notify.error('单天预算发放上限必须大于面额')
+      return false
+    }
+
     if (
       parseInt(this.state.model.all_budget / this.state.model.reduce_amount) <
       this.state.model.receive_number - 0

src/components/knockGold/index.less

@@ -16,6 +16,8 @@
 	box-sizing: border-box;
 	font-size: 16px;
 	overflow: scroll;
+	min-width: 375px !important;
+	width: auto !important;
 
 
 	.couponShow {
@@ -44,6 +46,7 @@
 		text-align: center;
 		font-weight: bold;
 		font-size: 36px;
+		padding: 0 5px;
 	}
 
 	.coupon_money>span {
@@ -118,7 +121,7 @@
 
 	/*说明*/
 	.coupon_explain {
-		width: 100%;
+		width: 375px;
 		text-align: center;
 		padding: 0 15px;
 		box-sizing: border-box;

src/pages/exchangecode/add/add.js

@@ -450,7 +450,7 @@ export default class acclist extends React.Component {
             newObj.only = item.channel_activity_id //批次号
             newObj.type = 2 //类型
             newObj.checked = item?.checked
-            newObj.upstream = item.channel === '1' ? '支付宝' : '微信' //上游
+            newObj.upstream = String(item.channel) === '1' ? '支付宝' : '微信' //上游
             newObj.edit = 'edit'
             newObj.effectDate = item.effectDate
               ? item.effectDate

src/pages/exchangecode/edit/edit.js

@@ -710,7 +710,7 @@ export default class exchangedit extends React.Component {
             newObj.only = item.channel_activity_id //批次号
             newObj.type = 2 //类型
             newObj.checked = item?.checked
-            newObj.upstream = item.channel === '1' ? '支付宝' : '微信' //上游
+            newObj.upstream = String(item.channel) === '1' ? '支付宝' : '微信' //上游
             newObj.edit = 'edit'
             newObj.effectDate = item.effectDate
               ? item.effectDate

src/pages/plan/add/step2.js

@@ -345,7 +345,7 @@ export default class acclist extends React.Component {
             newObj.only = item.channel_activity_id //批次号
             newObj.type = 2 //类型
             newObj.checked = item?.checked
-            newObj.upstream = item.channel === '1' ? '支付宝' : '微信' //上游
+            newObj.upstream = String(item.channel) === '1' ? '支付宝' : '微信' //上游
             newObj.edit = 'edit'
             newObj.effectDate = item.effectDate
               ? item.effectDate

src/pages/plan/key/edit.js

@@ -186,7 +186,8 @@ export default class acclist extends React.Component {
                     item.product.reduce.map((item1) => {
                       item1.type = 2
                       item1.only = item1.channel_activity_id
-                      item1.upstream = item.channel === '1' ? '支付宝' : '微信' //上游
+                      item1.upstream =
+                        String(item.channel) === '1' ? '支付宝' : '微信' //上游
                       item1.origin = item1
                     })
                     item.product = [
@@ -459,7 +460,7 @@ export default class acclist extends React.Component {
             newObj.only = item.channel_activity_id //批次号
             newObj.type = 2 //类型
             newObj.checked = item?.checked
-            newObj.upstream = item.channel === '1' ? '支付宝' : '微信' //上游
+            newObj.upstream = String(item.channel) === '1' ? '支付宝' : '微信' //上游
             newObj.edit = 'edit'
             newObj.effectDate = item.effectDate
               ? item.effectDate