Skip to content

X
xiaomai-cloud-class-web
Commit 87786663 by chenshu
Options

fix:修复部分报错

parent d1cdc1d8
Showing with 14 additions and 14 deletions
src/modules/college-manage/CollegeInfoPage.jsx
...@@ -67,7 +67,7 @@ class CollegeInfoPage extends React.Component { ...@@ -67,7 +67,7 @@ class CollegeInfoPage extends React.Component {
setTimeout(() => { setTimeout(() => {
const okBtnDom = document.querySelector("#headPicModal"); const okBtnDom = document.querySelector("#headPicModal");
const options = { const options = {
size: [500, 282], size: [500, 128],
ok: okBtnDom, ok: okBtnDom,
maxZoom: 3, maxZoom: 3,
style: { style: {
...@@ -290,7 +290,7 @@ class CollegeInfoPage extends React.Component { ...@@ -290,7 +290,7 @@ class CollegeInfoPage extends React.Component {
<div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div> <div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div>
<div className="preview-img"> <div className="preview-img">
<div className="title">效果预览</div> <div className="title">效果预览</div>
<div id="preview-url-box" style={{width:500,height:282}}> <div id="preview-url-box" style={{width:500,height:128}}>
<img src={this.state.dataUrl} style={{ width: '100%' }} alt="" /> <img src={this.state.dataUrl} style={{ width: '100%' }} alt="" />
</div> </div>
<div className="tip-box"> <div className="tip-box">
......
src/modules/college-manage/CollegeInfoPage.less
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.logo-con{ .logo-con{
.logo-img-con{ .logo-img-con{
width: 258px; width: 258px;
height: 60px; height: 66px;
margin-right:8px; margin-right:8px;
.logo-box{ .logo-box{
width: 258px; width: 258px;
......
src/modules/root/CollegeManagePage.jsx
...@@ -149,7 +149,7 @@ export default class CollegeManagePage extends React.Component { ...@@ -149,7 +149,7 @@ export default class CollegeManagePage extends React.Component {
<div className="title">{item.storeName}</div> <div className="title">{item.storeName}</div>
<div className="time">{moment(item.createTime).format('YYYY-MM-DD HH:mm')}</div> <div className="time">{moment(item.createTime).format('YYYY-MM-DD HH:mm')}</div>
<div className="control-box"> <div className="control-box">
{item.userRole === 'StoreManager' && item.state === 'VALID' && {item.userRole === 'StoreManager' && item.state === 'VALID' && !item.mainStore &&
<span <span
className="control-button" className="control-button"
onClick={(e) => { onClick={(e) => {
...@@ -160,7 +160,7 @@ export default class CollegeManagePage extends React.Component { ...@@ -160,7 +160,7 @@ export default class CollegeManagePage extends React.Component {
}} }}
>编辑</span> >编辑</span>
} }
{(item.userRole === 'StoreManager' || item.state !== 'VALID') && {((item.userRole === 'StoreManager' && !item.mainStore) || item.state !== 'VALID') &&
<span <span
className="control-button" className="control-button"
onClick={(e) => { onClick={(e) => {
......
src/modules/root/CollegeManagePage.less
...@@ -75,10 +75,10 @@ ...@@ -75,10 +75,10 @@
} }
} }
.college-list { .college-list {
display: flex;
flex-wrap: wrap;
.college-item,.college-create { .college-item,.college-create {
position: relative; position: relative;
display: inline-block;
overflow: hidden;
width: 376px; width: 376px;
height: 133px; height: 133px;
border: 1px solid #E8E8E8; border: 1px solid #E8E8E8;
......
src/modules/root/CreateCollege.jsx
...@@ -61,7 +61,7 @@ export default class CreateCollege extends React.Component { ...@@ -61,7 +61,7 @@ export default class CreateCollege extends React.Component {
setTimeout(() => { setTimeout(() => {
const okBtnDom = document.querySelector("#headPicModal"); const okBtnDom = document.querySelector("#headPicModal");
const options = { const options = {
size: [500, 282], size: [500, 128],
ok: okBtnDom, ok: okBtnDom,
maxZoom: 3, maxZoom: 3,
style: { style: {
...@@ -291,7 +291,7 @@ export default class CreateCollege extends React.Component { ...@@ -291,7 +291,7 @@ export default class CreateCollege extends React.Component {
<div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div> <div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div>
<div className="preview-img"> <div className="preview-img">
<div className="title">效果预览</div> <div className="title">效果预览</div>
<div id="preview-url-box" style={{width:500,height:282}}> <div id="preview-url-box" style={{width:500,height:128}}>
<img src={this.state.dataUrl} style={{ width: '100%' }} alt="" /> <img src={this.state.dataUrl} style={{ width: '100%' }} alt="" />
</div> </div>
<div className="tip-box"> <div className="tip-box">
......
src/modules/root/CreateCollege.less
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
display: block; display: block;
border: 1px dashed #E9E9E9; border: 1px dashed #E9E9E9;
width: 312px; width: 312px;
height: 73px; height: 82px;
margin: 0 auto 16px; margin: 0 auto 16px;
.image { .image {
width: 100%; width: 100%;
......
src/modules/root/Header.jsx
...@@ -79,7 +79,7 @@ function Header(props) { ...@@ -79,7 +79,7 @@ function Header(props) {
</div> </div>
</div> </div>
<div className="menu"> <div className="menu">
{User.getIsAdmin() === 'true' && {User.getEnterpriseId() &&
<div <div
className="menu-item" className="menu-item"
key="1" key="1"
......
src/modules/store-manage/StoreInfo.jsx
...@@ -89,7 +89,7 @@ class StoreInfo extends React.Component { ...@@ -89,7 +89,7 @@ class StoreInfo extends React.Component {
setTimeout(() => { setTimeout(() => {
const okBtnDom = document.querySelector("#headPicModal"); const okBtnDom = document.querySelector("#headPicModal");
const options = { const options = {
size: [500, 282], size: [500, 128],
ok: okBtnDom, ok: okBtnDom,
maxZoom: 3, maxZoom: 3,
style: { style: {
...@@ -378,7 +378,7 @@ class StoreInfo extends React.Component { ...@@ -378,7 +378,7 @@ class StoreInfo extends React.Component {
<div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div> <div id="clipBtn" style={{ display: "none" }} ref="hiddenBtn"></div>
<div className="preview-img"> <div className="preview-img">
<div className="title">效果预览</div> <div className="title">效果预览</div>
<div id="preview-url-box" style={{width:500,height:282}}> <div id="preview-url-box" style={{width:500,height:128}}>
<img src={this.state.dataUrl} style={{ width: '100%' }} alt="" /> <img src={this.state.dataUrl} style={{ width: '100%' }} alt="" />
</div> </div>
<div className="tip-box"> <div className="tip-box">
......
src/modules/store-manage/StoreInfo.less
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
display: flex; display: flex;
.logo-img-con{ .logo-img-con{
width: 258px; width: 258px;
height: 60px; height: 66px;
margin-right:8px; margin-right:8px;
.logo-box{ .logo-box{
width: 258px; width: 258px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment