diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index af3b0784..26d64a48 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -21,7 +21,7 @@ export default class topNav extends React.Component{
showlinkmenu(e,item){
let self=this;
try{
- item.child.forEach(item=>{
+ item.children.forEach(item=>{
if(item.level ===5){
sessionStorage.setItem('pathname2',item.router);
throw '终止循环'
@@ -30,11 +30,11 @@ export default class topNav extends React.Component{
}catch(e){
}
self.setState({'linkshowname':item.title});
- self.setState({'menulinklist':item.child});
+ self.setState({'menulinklist':item.children});
// 防止刷新页面,导航签清空
- sessionStorage.setItem('menulinklist',JSON.stringify(item.child));
+ sessionStorage.setItem('menulinklist',JSON.stringify(item.children));
sessionStorage.setItem('showflag',true);
sessionStorage.setItem('linkshowname',item.title);
}
@@ -80,7 +80,7 @@ export default class topNav extends React.Component{
{
this.state.navlists.map((item,i)=>{
return (
- item.child&&item.child.length>0?this.showlinkmenu(e,item)} >{item.title}:null
+ item.children&&item.children.length>0?this.showlinkmenu(e,item)} >{item.title}:null
)
})
@@ -95,7 +95,7 @@ export default class topNav extends React.Component{
{
this.state.menulinklist.map((item,key)=>{
- return(item.level==5?this.btnfn(item)} className={pathnameBreak==item.router&&item.child.length>=1?'menuactive':''}>{item.title}:null)
+ return(item.level==5?this.btnfn(item)} className={pathnameBreak==item.router&&item.children.length>=1?'menuactive':''}>{item.title}:null)
}) }
数据最后更新时间:{window.timeshow}
diff --git a/src/pages/login/loginform.js b/src/pages/login/loginform.js
index 30c4bfee..8f68965c 100644
--- a/src/pages/login/loginform.js
+++ b/src/pages/login/loginform.js
@@ -46,21 +46,16 @@ function FormDom(props) {
//首次进来进行商品获取
getProductList();
-
-
-
-
-
- sessionStorage.setItem('showflag',true);
+ sessionStorage.setItem('showflag',true);
let menuList=response.menu;
if(response.menu&&response.menu.length>0){
sessionStorage.setItem('activeMenu',JSON.stringify(response.menu));
try{
menuList.forEach(item=>{
- if(item.child&&item.child.length>0){
- let obj=item.child.filter(item=>item.level==5);
+ if(item.children&&item.children.length>0){
+ let obj=item.children.filter(item=>item.level==5);
sessionStorage.setItem('pathname2',obj[0].router);
- sessionStorage.setItem('menulinklist',JSON.stringify(item.child));
+ sessionStorage.setItem('menulinklist',JSON.stringify(item.children));
if(item.id==16){
sessionStorage.setItem('linkshowname',"营销计划管理");
setTimeout(()=>{
diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index 8ae646fb..e48508b8 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -32,7 +32,7 @@ const Column = [
type: "normal",
width:'100px'
}, {
- title: '兑换码-批次ID',
+ title: 'key-批次ID',
name: 'key_batch_id',
prop:'key_batch_id',
type: "normal",
diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js
index f3ce7915..c391d21a 100644
--- a/src/pages/plan/list/list.js
+++ b/src/pages/plan/list/list.js
@@ -295,139 +295,32 @@ export default class acclist extends React.Component{
return
}
-
if(key == 1)
{
- let data ={
- "type":"sms"
- }
-
- planResend(row.id,data).then((res)=>{
+ planIsSend(row.id).then((res)=>{
handelResponse(res,(req,msg)=>{
-
- Notify.success("发送成功")
-
- },(err)=>{
- Notify.error(err)
- })
- })
- }
-
- if(key == 2)
- {
- let data ={
- "type":"email"
- }
-
- planResend(row.id,data).then((res)=>{
- handelResponse(res,(req,msg)=>{
-
- Notify.success("发送成功")
- },(err)=>{
- Notify.error(err)
- })
- })
- }
-
-
- if(key == 3)
- {
- let email = ""
- let self = this;
- openDialog({
- closeBtn:true,
- dialogId: 1, // id is used to close the dialog
- title: '请输入接收邮箱',
- children: ,
- footer: ,
- onClose() {
- console.log('outer dialog closed');
- },
- });
-
- }
-
- if(key == 4)
- {
- let phone = ""
- let self = this
- openDialog({
- closeBtn:true,
- dialogId: 2, // id is used to close the dialog
- title: '请输入接收手机',
- children: ,
- footer: ,
- onClose() {
- console.log('outer dialog closed');
- },
+
+ })
});
+
+
+
}
+
+
+
}
//清空
clearFn(){