diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js
index a589dd72..2c48f98d 100644
--- a/src/pages/exchangecode/add/add.js
+++ b/src/pages/exchangecode/add/add.js
@@ -356,7 +356,7 @@ export default class acclist extends React.Component {
     let direct_reseller_ids = this.state.direct_reseller_id;
     if (direct_reseller_ids <= 0) {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
 
@@ -921,7 +921,7 @@ export default class acclist extends React.Component {
       this.setState({ drawerVisible2: true });
     } else {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
   }
diff --git a/src/pages/exchangecode/edit/edit.js b/src/pages/exchangecode/edit/edit.js
index d98ca5e3..c67745ee 100644
--- a/src/pages/exchangecode/edit/edit.js
+++ b/src/pages/exchangecode/edit/edit.js
@@ -104,6 +104,7 @@ export default class exchangedit extends React.Component {
     let code_batch_id = sessionStorage.getItem("code_id");
     let approval_id = sessionStorage.getItem("approval_id");
     let approval_status = sessionStorage.getItem("approval_status");
+    console.log("approval_id ==>", Number(approval_id));
     if (Number(approval_id) > 0) {
       getApprovalsInfo(approval_id)
         .then((res) => {
@@ -240,13 +241,14 @@ export default class exchangedit extends React.Component {
               this.setState({ plan_time: req.plan.end_time });
               //获取分销商
               getReseller(req.plan.reseller_id).then((res) => {
-                handelResponse(res, (req, msg) => {
-                  req.receive_email = req.contact_email[0];
-                  this.setState({ reseller: req });
-                  this.setState({ phone_list: req.contact_phone });
-                  this.setState({ email_list: req.contact_email });
+                handelResponse(res, (req1, msg) => {
+                  console.log("req ==>1", req1);
+                  req.receive_email = req1.contact_email[0];
+                  this.setState({ reseller: req1 });
+                  this.setState({ phone_list: req1.contact_phone });
+                  this.setState({ email_list: req1.contact_email });
                   this.setState({
-                    direct_reseller_id: req.direct_reseller_id,
+                    direct_reseller_id: req1.direct_reseller_id,
                   });
                 });
               });
@@ -429,7 +431,7 @@ export default class exchangedit extends React.Component {
   submit() {
     if (this.state.direct_reseller_id <= 0) {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
     if (this.refs.code_info.validator() && this.refs.code_rule.validator()) {
@@ -526,7 +528,7 @@ export default class exchangedit extends React.Component {
     let direct_reseller_ids = this.state.direct_reseller_id;
     if (direct_reseller_ids <= 0) {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
     this.setState({
@@ -785,6 +787,7 @@ export default class exchangedit extends React.Component {
   }
 
   productEditShow(rowData) {
+    console.log("direct_reseller_id ==>", this.state.direct_reseller_id);
     console.log("rowData 12==>", rowData);
     if (this.state.direct_reseller_id > 0) {
       this.setState({
@@ -805,7 +808,7 @@ export default class exchangedit extends React.Component {
       );
     } else {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
   }
diff --git a/src/pages/login/login.less b/src/pages/login/login.less
index 559ecbd1..3642fb68 100644
--- a/src/pages/login/login.less
+++ b/src/pages/login/login.less
@@ -107,6 +107,7 @@ overflow: hidden;
 	.zent-form-control[data-zv="9.11.0"]{
 		float: left;
 	}
+	display: flex;
 }
 .yzmcode{
 	width: 38%;
diff --git a/src/pages/plan/add/add.js b/src/pages/plan/add/add.js
index efadd636..0d9acc87 100644
--- a/src/pages/plan/add/add.js
+++ b/src/pages/plan/add/add.js
@@ -171,7 +171,7 @@ export default class add extends React.Component {
     if (this.state.curstep == 3) {
       if (this.state.direct_reseller_id <= 0) {
         // 老数据不能进行新增商品操作
-        Notify.error(`请编辑映射分销商`);
+        Notify.error(`请添加映射分销商`);
         return;
       }
 
diff --git a/src/pages/plan/add/edit.js b/src/pages/plan/add/edit.js
index 3fa446a4..69254495 100644
--- a/src/pages/plan/add/edit.js
+++ b/src/pages/plan/add/edit.js
@@ -237,7 +237,7 @@ export default class add extends React.Component {
 
       if (this.state.direct_reseller_id <= 0) {
         // 老数据不能进行新增商品操作
-        Notify.error(`请编辑映射分销商`);
+        Notify.error(`请添加映射分销商`);
         return;
       }
 
@@ -419,7 +419,7 @@ export default class add extends React.Component {
               };
               if (this.state.direct_reseller_id <= 0) {
                 // 老数据不能进行新增商品操作
-                Notify.error(`请编辑映射分销商`);
+                Notify.error(`请添加映射分销商`);
                 return;
               }
               approvals(plan_id, data).then((res) => {
diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js
index f06b91f3..9b50f0f6 100644
--- a/src/pages/plan/add/step2.js
+++ b/src/pages/plan/add/step2.js
@@ -241,7 +241,7 @@ export default class acclist extends React.Component {
     console.log("direct_reseller_ids =>", direct_reseller_ids);
     if (direct_reseller_ids <= 0) {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
     this.setState({
@@ -742,7 +742,7 @@ export default class acclist extends React.Component {
       );
     } else {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
   }
diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js
index df0f4fcb..1ff99a0c 100644
--- a/src/pages/plan/key/edit.js
+++ b/src/pages/plan/key/edit.js
@@ -225,7 +225,7 @@ export default class acclist extends React.Component {
     let valide = false;
     if (this.state.direct_reseller_id <= 0) {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
     if (this.refs.form1.validator()) {
@@ -330,7 +330,7 @@ export default class acclist extends React.Component {
     let direct_reseller_ids = this.state.direct_reseller_id;
     if (direct_reseller_ids <= 0) {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
 
@@ -980,7 +980,7 @@ export default class acclist extends React.Component {
       this.setState({ drawerVisible2: true });
     } else {
       // 老数据不能进行新增商品操作
-      Notify.error(`请编辑映射分销商`);
+      Notify.error(`请添加映射分销商`);
       return;
     }
   }