From f086d82f87a0303eba7a09ddcf5a5776a967d30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=A3=9A?= <849005670@qq.com> Date: Thu, 23 Dec 2021 14:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/comm.js | 19 ------------------- src/pages/plan/key/detail/list.js | 12 +++--------- src/pages/plan/key/list.js | 2 +- src/pages/plan/list/list.js | 2 ++ 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/assets/comm.js b/src/assets/comm.js index 2e8bf3ab..01c06f66 100644 --- a/src/assets/comm.js +++ b/src/assets/comm.js @@ -31,22 +31,3 @@ function buling (num) { } } -const common ={ - translateStar (str,start,end) { - - let translate_str = "" - for(let i = 0;i < str.length;i++) - { - console.log(str[i]) - if(i >= start && i < end) - { - translate_str += "*" - } - else{ - translate_str += str[i] - } - } - return translate_str; -} -} -export default common; \ No newline at end of file diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js index fe149d8b..60be74c7 100644 --- a/src/pages/plan/key/detail/list.js +++ b/src/pages/plan/key/detail/list.js @@ -11,7 +11,7 @@ import Filterbar from "../../../../components/filterbar/main.js" import {planIsSend,getPlanList,handelResponse,startOrStopPlan,getAllEnum,resKeyEmail,planSend,planResend,planReceive,getReseller,getkeyDetailList} from "../../../../assets/api.js" import _ from "lodash"; import menu from "../../../../assets/enum.js" -import common from "../../../../assets/comm.js" + const PAGE_SIZE_OPTIONS = [10, 20, 30]; // // @@ -290,20 +290,15 @@ export default class acclist extends React.Component{ } checkChange ={this.selection.bind(this)} ComponentHandler={(com,rowData)=>{ - if(com == "key") - { - let str = common.translateStar(rowData,4,7) - return {str} - } if(com == "dates") { - return {rowData.begin_time} 至 {rowData.end_time} + return {rowData.begin_time} 至 {rowData.end_time} } if(com == "title") { - return {this.linkTo(rowData)} }>{rowData.title} + return {this.linkTo(rowData)} }>{rowData.title} } if(com == "switch") { @@ -311,7 +306,6 @@ export default class acclist extends React.Component{ } if(com == "status") { - return

{rowData.status_text}

} if(com == "opearo") diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js index 407e3e3f..39613e97 100644 --- a/src/pages/plan/key/list.js +++ b/src/pages/plan/key/list.js @@ -498,7 +498,7 @@ linkTo(row){ {path:'/home/key-list',name:row.plan_title+'key列表'}, {path:'/home/key-detail',name:row.batch_name+'key码列表'} ]}] - sessionStorage.setItem("plan_item",JSON.stringify(row)) + // sessionStorage.setItem("plan_item",JSON.stringify(row)) sessionStorage.setItem('breakchangenav',JSON.stringify(arr)); sessionStorage.setItem('linkshowname',"营销计划管理"); sessionStorage.setItem("key_batch_id",row.id) diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js index 5c029482..9037ac04 100644 --- a/src/pages/plan/list/list.js +++ b/src/pages/plan/list/list.js @@ -301,6 +301,8 @@ export default class acclist extends React.Component{ } menuItemClick(e,key,row){ + this.setState({plan_id:row.id}) + if(row.status ==6 ||row.status == 0 ) {