diff --git a/src/assets/comm.css b/src/assets/comm.css index 2fdbc6b7..74badab5 100644 --- a/src/assets/comm.css +++ b/src/assets/comm.css @@ -32,6 +32,11 @@ display: flex; align-items: center; } +.dfleac{ + display: flex; + justify-content: flex-start; + align-items: center; +} .dflexs{ display: flex; justify-content: flex-start; diff --git a/src/pages/distributor/adddistributorinfo/adddistributorinfo.js b/src/pages/distributor/adddistributorinfo/adddistributorinfo.js index cbdb2309..d3c34e8c 100644 --- a/src/pages/distributor/adddistributorinfo/adddistributorinfo.js +++ b/src/pages/distributor/adddistributorinfo/adddistributorinfo.js @@ -260,6 +260,8 @@ export default class adduserinfo extends React.Component{ if(this.state.phone_nums>5){ Notify.clear(); Notify.error('添加的手机号码数量已经达到上限!'); + num=5; + this.setState({phone_nums:num}) }else{ let contacts_email=[ { type: "required", message: "请输入联系人手机号码"}, @@ -271,14 +273,17 @@ export default class adduserinfo extends React.Component{ rules["phone"+ this.state.phone_nums] = contacts_email; this.setState({rules:rules}); } + } //添加邮箱 addEmailArr(){ let emilnum = this.state.email_nums + 1; - this.setState({email_nums:emilnum}) + + if(this.state.email_nums>5){ Notify.clear(); Notify.error('添加的联系人邮箱数量已经达到上限!'); + emilnum=5; }else{ let contacts_phone=[ { type: "required", message: "请输入联系人邮箱"}, @@ -290,6 +295,8 @@ export default class adduserinfo extends React.Component{ rules["email"+ this.state.email_nums] = contacts_phone; this.setState({rules:rules}); } + this.setState({email_nums:emilnum}) + console.log(this.state); } render(){ const companyOptions =this.state.companyList; @@ -404,7 +411,7 @@ export default class adduserinfo extends React.Component{ }} onClearItem={(e)=>{ - + console.log(this.state.phone_nums); let model2 = this.state.model; model2.phone1 = ""; this.setState({model:model2}) diff --git a/src/pages/distributor/list/list.js b/src/pages/distributor/list/list.js index 7c812d78..e1f8d6eb 100644 --- a/src/pages/distributor/list/list.js +++ b/src/pages/distributor/list/list.js @@ -106,7 +106,8 @@ export default class acclist extends React.Component{ page:1, total:0, resellerList:[], - menuList:[{id:0,name:"分销商状态",check:false}] + menuList:[{id:0,name:"分销商状态",check:false}], + filterList:[{id:0,label:"分销商状态",menuList:[{id:0,name:"开启"},{id:1,name:"关闭"}]}], } } clickFn(){ diff --git a/src/pages/exchangecode/list/list.js b/src/pages/exchangecode/list/list.js index 02f63222..6d5a5f26 100644 --- a/src/pages/exchangecode/list/list.js +++ b/src/pages/exchangecode/list/list.js @@ -255,7 +255,7 @@ export default class acclist extends React.Component{ getCodeListFn(time={},menu=null){ let _self=this; let {page,limit,key_word}=_self.state; - let data={key_batch_id:93,page,limit} + let data={page,limit} if(this.state.combinedValue&&this.state.combinedValue[0]){ diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index 9a6ba744..54f9a9cc 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -1,7 +1,7 @@ import ReactDOM from 'react-dom'; import React, { Component } from 'react'; import { Link } from "react-router-dom"; -import { Button,Notify,Alert,CombinedDateRangePicker,Sweetalert,Icon} from 'zent'; +import { Button,Notify,Select,Alert,CombinedDateRangePicker,Sweetalert,Icon} from 'zent'; import "./list.less" import "../../../assets/comm.css" import Ipt from "../../../components/input/main" @@ -14,6 +14,16 @@ import {getOrderList,getOrderExport,handelResponse,putOrderSuccess,putOrderCance var moment = require("moment"); let day = moment(nowDay()).format("YYYY-MM-DD"); let tomonth = moment(nowMonth()).format("YYYY-MM-DD"); +const options = [ + { + key: '1', + text: '查询key', + }, + { + key: '2', + text: '通用查询', + } +]; const Column = [ { title: '订单号', @@ -434,7 +444,7 @@ componentDidUpdate(prevProps,prevState){ const { current, pageSize } = this.state; return( -
@@ -442,9 +452,12 @@ componentDidUpdate(prevProps,prevState){ */}
- +