new

src/pages/indexEcharts/components/NewUsers.jsx

@@ -92,7 +92,7 @@ const NewUsers = (props) => {
     <>
       <div>
         <div >
-          <p onClick={()=>router.push('/indexEcharts/newUsers')}><span style={{borderBottom:'1px solid #f02d40',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> <span style={{fontSize:'0.09rem',color:'#888',marginLeft:'0.06rem'}}>最近七天</span></p>
+          <p onClick={()=>router.push('/indexEcharts/newUsers')}><span style={{borderBottom:'1px solid #f02d40',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
        </div>
         <EChart options={options} style={piestyles} onClick={()=>router.push('/indexEcharts/newUsers')} />
       </div>

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -121,7 +121,7 @@ const UserBehavior = (props) => {
         {/* onSuccess={(e) => onTabledatas(e)} */}
         <p onClick={() => router.push('/indexEcharts/userBehavior')}>
           <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
-          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}></span>}
+          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
         </p>
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
           {!props.BuildSelectHide && <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>}

src/pages/indexEcharts/components/UserConversion.jsx

@@ -19,11 +19,11 @@ const UserSource = props => {
   }, [])
 
  function UserConversionRate(params) {
+   
       request({
         ...apis.indexEcharts.userConversion,
         params,
       }).then(data => {
-        // console.log("data: ", data)
         setDataset(data, params.conversion)
       })
   }
@@ -72,8 +72,6 @@ const UserSource = props => {
       name: '转化率',
       radius: ['34%', '52%'],
       data: theCurrent,
-      // data:[ { name: '授权手机', value: 6 },
-      // { name: '其余', value: 5 },]
     },
   }
 

src/pages/indexEcharts/components/UserSource.jsx

@@ -103,7 +103,7 @@ const UserSource = (props) => {
   return (
     <>
       <div>
-      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> <span style={{fontSize:'0.09rem',color:'#888',marginLeft:'0.06rem'}}>最近七天</span></p>
+      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
 
         <EChart onClick={() => router.push('/indexEcharts/userSource')} options={baroptions} style={barstyle} />
 

src/pages/indexEcharts/newUsers.jsx

@@ -102,7 +102,7 @@ const header = props => {
         搜索
           </Button>
       <div>
-        <NewUsers endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
+        <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
         {/* */}
       </div>
     </div>

src/pages/indexEcharts/userBehavior.jsx

@@ -103,7 +103,7 @@ const header = props => {
       padding: '32PX 28px',
       boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
       borderRadius: '12px',
-      minHeight: '1000vh'
+      minHeight: '60vh'
     }}>
     <div>
     <Radio.Group buttonStyle="solid" defaultValue="a">
@@ -126,17 +126,17 @@ const header = props => {
      
       <div style={{ display: 'flex', margin: '24px 0' }}>
       <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
-        <Select placeholder="所有事件组" style={{ width: '14%',minWidth:'160px',marginRight:'2%' }} onChange={handleChange}>
+        <Select placeholder="所有事件组" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
           <Option value="jack">Jack</Option>
           <Option value="lucy">Lucy</Option>
           <Option value="Yiminghe">yiminghe</Option>
         </Select>
-        <Select placeholder="请选择事件" style={{ width: '14%',minWidth:'160px',marginRight:'2%' }} onChange={handleChange}>
+        <Select placeholder="请选择事件" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
           <Option value="jack">Jack</Option>
           <Option value="lucy">Lucy</Option>
           <Option value="Yiminghe">yiminghe</Option>
         </Select>
-        <Select placeholder="请选择属性" style={{ width: '14%',minWidth:'160px' }} onChange={handleChange}>
+        <Select placeholder="请选择属性" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
           <Option value="jack">Jack</Option>
           <Option value="lucy">Lucy</Option>
           <Option value="Yiminghe">yiminghe</Option>

src/pages/indexEcharts/userSource.jsx

@@ -146,7 +146,6 @@ const header = props => {
 
 
 
-
   return (<>
     <div style={{
       backgroundColor: '#fff',
@@ -178,16 +177,14 @@ const header = props => {
           <div style={{
             width: '1060px',
             height: '560px',
-
             paddingTop: '40px',
             marginRight: ' 40px',
           }}>
-            <UserSource endDate={endDate} startDate={startDate} onSuccess={(e) => onTabledatas(e)}></UserSource>
+            <UserSource BuildSelectHide={true} endDate={endDate} startDate={startDate} onSuccess={(e) => onTabledatas(e)}></UserSource>
           </div>
           <div style={{
             width: '509px',
             height: '600px',
-
             paddingTop: '40px',
 
           }}>
@@ -199,7 +196,7 @@ const header = props => {
           <Option value='registered'>注册用户</Option>
         </Select>
 
-        <Table dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
+        <Table style={{marginTop:'20px'}} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
       </div>
     </div>
   </>