Browse Source

Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

魏熙美 5 years ago
parent
commit
088c4b1ab2
39 changed files with 135 additions and 114 deletions
  1. 3
    3
      src/global.less
  2. 10
    1
      src/layouts/BasicLayout.jsx
  3. 3
    3
      src/pages/Welcome.jsx
  4. 3
    2
      src/pages/activity/editActivity.jsx
  5. 3
    3
      src/pages/building/list/add/components/base.jsx
  6. 2
    2
      src/pages/building/list/add/components/share.jsx
  7. 1
    1
      src/pages/building/list/index.jsx
  8. 4
    4
      src/pages/building/list/style.css
  9. 3
    3
      src/pages/building/list/style.less
  10. 3
    3
      src/pages/building/list/style.wxss
  11. 3
    3
      src/pages/building/type/style.css
  12. 3
    3
      src/pages/building/type/style.less
  13. 3
    3
      src/pages/building/type/style.wxss
  14. 1
    0
      src/pages/carouselFigure/editAdvertising.jsx
  15. 1
    0
      src/pages/carouselFigure/editCarousel.jsx
  16. 3
    3
      src/pages/customer/customerlist/style.css
  17. 3
    3
      src/pages/customer/customerlist/style.less
  18. 3
    3
      src/pages/customer/customerlist/style.wxss
  19. 3
    3
      src/pages/customer/drift/style.less
  20. 3
    3
      src/pages/customer/independentList/style.css
  21. 3
    3
      src/pages/customer/independentList/style.less
  22. 3
    3
      src/pages/customer/independentList/style.wxss
  23. 3
    3
      src/pages/customer/recommendCustomer/style.css
  24. 3
    3
      src/pages/customer/recommendCustomer/style.less
  25. 3
    3
      src/pages/customer/recommendCustomer/style.wxss
  26. 3
    3
      src/pages/customer/report/style.css
  27. 3
    3
      src/pages/customer/report/style.less
  28. 3
    3
      src/pages/customer/report/style.wxss
  29. 4
    1
      src/pages/indexEcharts/components/UserConversion.jsx
  30. 1
    0
      src/pages/integralMall/editGoods.jsx
  31. 28
    28
      src/pages/news/list/NewsList.jsx
  32. 3
    2
      src/pages/news/list/editNewsList.jsx
  33. 3
    3
      src/pages/news/list/style.less
  34. 1
    0
      src/pages/news/type/editNews.jsx
  35. 3
    3
      src/pages/staff/list/StaffList.jsx
  36. 1
    1
      src/pages/staff/list/style.less
  37. 1
    0
      src/pages/system/editPolicy.jsx
  38. 1
    1
      src/pages/user/login/components/Login/index.jsx
  39. 4
    2
      src/pages/user/login/components/Login/index.less

+ 3
- 3
src/global.less View File

80
 .ant-menu-vertical-right .ant-menu-submenu-title,
80
 .ant-menu-vertical-right .ant-menu-submenu-title,
81
 .ant-menu-inline .ant-menu-submenu-title,
81
 .ant-menu-inline .ant-menu-submenu-title,
82
 .ant-input ,.ant-btn,.ant-select,.ant-table,.ant-form-item,.ant-form label,.ant-tabs-nav-container {
82
 .ant-input ,.ant-btn,.ant-select,.ant-table,.ant-form-item,.ant-form label,.ant-tabs-nav-container {
83
-  font-size: 0.1rem;
83
+  font-size: 0.096rem;
84
   
84
   
85
 }
85
 }
86
 .ant-input{
86
 .ant-input{
120
   margin-bottom: 40px;
120
   margin-bottom: 40px;
121
 }
121
 }
122
 .ant-breadcrumb{
122
 .ant-breadcrumb{
123
-  font-size: 0.1rem;
123
+  font-size: 0.096rem;
124
   .anticon {
124
   .anticon {
125
-    font-size: 0.1rem;
125
+    font-size: 0.096rem;
126
   }
126
   }
127
 } 
127
 } 
128
   .ant-pro-global-header-trigger{
128
   .ant-pro-global-header-trigger{

+ 10
- 1
src/layouts/BasicLayout.jsx View File

31
     </div>
31
     </div>
32
   )
32
   )
33
 }
33
 }
34
+const menuHeaderRender = (logo, title) => {
35
+  return (
36
+    <Link to="/welcome">
37
+      {logo}
38
+      {title}
39
+    </Link>
40
+  );
41
+}
34
 
42
 
35
 const BasicLayout = props => {
43
 const BasicLayout = props => {
36
   const { dispatch, children, settings } = props;
44
   const { dispatch, children, settings } = props;
89
       }}
97
       }}
90
       breadcrumbRender={(routers = []) => [
98
       breadcrumbRender={(routers = []) => [
91
         {
99
         {
92
-          path: '/',
100
+          path: '/welcome',
93
           breadcrumbName: formatMessage({
101
           breadcrumbName: formatMessage({
94
             id: 'menu.home',
102
             id: 'menu.home',
95
             defaultMessage: 'Home',
103
             defaultMessage: 'Home',
107
       }}
115
       }}
108
       footerRender={footerRender}
116
       footerRender={footerRender}
109
       menuDataRender={menuDataRender}
117
       menuDataRender={menuDataRender}
118
+      menuHeaderRender={menuHeaderRender}
110
       // formatMessage={formatMessage}
119
       // formatMessage={formatMessage}
111
       rightContentRender={rightProps => <RightContent {...rightProps} />}
120
       rightContentRender={rightProps => <RightContent {...rightProps} />}
112
       {...props}
121
       {...props}

+ 3
- 3
src/pages/Welcome.jsx View File

29
       <div style={{ display: 'flex', marginBottom: '33px' }}>
29
       <div style={{ display: 'flex', marginBottom: '33px' }}>
30
         <div style={{
30
         <div style={{
31
           textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
31
           textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
32
-          boxShadow: '0px  0.11rem 14px -15px rgba(241,43,62,1)',
32
+          boxShadow: '0px  0.106rem 14px -15px rgba(241,43,62,1)',
33
           borderRadius: '12px', width: '32%', marginRight: '2%'
33
           borderRadius: '12px', width: '32%', marginRight: '2%'
34
         }}>
34
         }}>
35
           <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
35
           <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
37
         </div>
37
         </div>
38
         <div style={{
38
         <div style={{
39
           textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
39
           textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
40
-          boxShadow: '0px  0.11rem 14px -15px rgba(255,126,74,1)',
40
+          boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
41
           borderRadius: '12px', width: '32%', marginRight: '2%'
41
           borderRadius: '12px', width: '32%', marginRight: '2%'
42
         }}>
42
         }}>
43
           <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
43
           <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
45
         </div>
45
         </div>
46
         <div onClick={() => router.push('/indexEcharts/newUsers')} style={{
46
         <div onClick={() => router.push('/indexEcharts/newUsers')} style={{
47
           textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
47
           textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
48
-          boxShadow: '0px  0.11rem 14px -15px rgba(107,130,230,1)',
48
+          boxShadow: '0px  0.106rem 14px -15px rgba(107,130,230,1)',
49
           borderRadius: '12px', width: '32%',
49
           borderRadius: '12px', width: '32%',
50
         }}>
50
         }}>
51
           <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0',cursor: 'pointer' }}>最近7天新增 </span>
51
           <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0',cursor: 'pointer' }}>最近7天新增 </span>

+ 3
- 2
src/pages/activity/editActivity.jsx View File

66
         name: 'imgUrl',
66
         name: 'imgUrl',
67
         type: FieldTypes.ImageUploader,
67
         type: FieldTypes.ImageUploader,
68
         value: dynamicData.imgUrl,
68
         value: dynamicData.imgUrl,
69
+        help: '建议图片尺寸:750px*560px',
69
       },
70
       },
70
       {
71
       {
71
         label: '活动标题',
72
         label: '活动标题',
337
         </div>
338
         </div>
338
       </div>
339
       </div>
339
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
340
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
340
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
341
-        <Input placeholder="请输入海报标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
341
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
342
+        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
342
       </div>
343
       </div>
343
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
344
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
344
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
345
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>

+ 3
- 3
src/pages/building/list/add/components/base.jsx View File

157
               </Select>,
157
               </Select>,
158
             )}
158
             )}
159
           </Form.Item>
159
           </Form.Item>
160
-          <Form.Item label="项目主图" >
160
+          <Form.Item label="项目主图" help="建议图片尺寸:640px*360px">
161
             {getFieldDecorator('avatarImage')(
161
             {getFieldDecorator('avatarImage')(
162
               <ImageListUpload />,
162
               <ImageListUpload />,
163
             )}
163
             )}
164
           </Form.Item>
164
           </Form.Item>
165
-          <Form.Item label="地址图片" >
165
+          <Form.Item label="地址图片" help="建议图片尺寸:750px*455px">
166
             {getFieldDecorator('mapImg')(
166
             {getFieldDecorator('mapImg')(
167
               <ImageUpload />,
167
               <ImageUpload />,
168
             )}
168
             )}
169
           </Form.Item>
169
           </Form.Item>
170
-          <Form.Item label="海报底图" >
170
+          <Form.Item label="海报底图" help="建议图片尺寸:640px*1136px" >
171
             {getFieldDecorator('poster')(
171
             {getFieldDecorator('poster')(
172
               <ImageUpload />,
172
               <ImageUpload />,
173
             )}
173
             )}

+ 2
- 2
src/pages/building/list/add/components/share.jsx View File

80
       </div>
80
       </div>
81
     </div>
81
     </div>
82
     <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
82
     <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
83
-      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
84
-      <Input placeholder="请输入海报标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
83
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
84
+      <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
85
     </div>
85
     </div>
86
     <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
86
     <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
87
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
87
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>

+ 1
- 1
src/pages/building/list/index.jsx View File

137
         <span className={Styles.title}>录入时间</span>
137
         <span className={Styles.title}>录入时间</span>
138
         <span >:{data.createDate}</span>
138
         <span >:{data.createDate}</span>
139
       </p>
139
       </p>
140
-      <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.11rem' }}>
140
+      <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.106rem' }}>
141
       <AuthButton name="admin.building.update.status.put" noRight={null}>
141
       <AuthButton name="admin.building.update.status.put" noRight={null}>
142
         <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
142
         <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
143
           {/* 已发布的时候,需要显示取消发布的字样 */}
143
           {/* 已发布的时候,需要显示取消发布的字样 */}

+ 4
- 4
src/pages/building/list/style.css View File

15
   margin: 10px 0px;
15
   margin: 10px 0px;
16
 }
16
 }
17
 .cardText {
17
 .cardText {
18
-  font-size: 0.11rem;
18
+  font-size: 0.106rem;
19
   color: #333;
19
   color: #333;
20
   line-height: 1.5;
20
   line-height: 1.5;
21
   display: flex;
21
   display: flex;
24
   margin-bottom: 0.08rem;
24
   margin-bottom: 0.08rem;
25
 }
25
 }
26
 .cardItem {
26
 .cardItem {
27
-  font-size: 0.11rem;
27
+  font-size: 0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   display: flex;
30
   display: flex;
31
   align-items: center;
31
   align-items: center;
32
   line-height: 1.5;
32
   line-height: 1.5;
33
-  font-size: 0.11rem;
33
+  font-size: 0.106rem;
34
   margin-bottom: 0.08rem;
34
   margin-bottom: 0.08rem;
35
 
35
 
36
 }
36
 }
37
 .ediText {
37
 .ediText {
38
-  font-size: 0.11rem;
38
+  font-size: 0.106rem;
39
   color: #ff925c;
39
   color: #ff925c;
40
   position: absolute;
40
   position: absolute;
41
   right: 0;
41
   right: 0;

+ 3
- 3
src/pages/building/list/style.less View File

15
   margin: 10px 0px;
15
   margin: 10px 0px;
16
 }
16
 }
17
 .cardText {
17
 .cardText {
18
-  font-size: 0.11rem;
18
+  font-size: 0.106rem;
19
   color: #333;
19
   color: #333;
20
   display: flex;
20
   display: flex;
21
   align-items: center;
21
   align-items: center;
24
   
24
   
25
 }
25
 }
26
 .cardItem{
26
 .cardItem{
27
-  font-size: 0.11rem;
27
+  font-size: 0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   display: flex;
30
   display: flex;
41
   
41
   
42
 }
42
 }
43
 .ediText {
43
 .ediText {
44
-  font-size: 0.11rem;
44
+  font-size: 0.106rem;
45
   color: #ff925c;
45
   color: #ff925c;
46
   position: absolute;
46
   position: absolute;
47
   right: 0;
47
   right: 0;

+ 3
- 3
src/pages/building/list/style.wxss View File

15
   margin: 10px 0px;
15
   margin: 10px 0px;
16
 }
16
 }
17
 .cardText {
17
 .cardText {
18
-  font-size: 0.11rem;
18
+  font-size: 0.106rem;
19
   color: #333;
19
   color: #333;
20
   line-height: 24px;
20
   line-height: 24px;
21
   display: flex;
21
   display: flex;
23
   position: relative;
23
   position: relative;
24
 }
24
 }
25
 .cardItem {
25
 .cardItem {
26
-  font-size: 0.11rem;
26
+  font-size: 0.106rem;
27
   font-weight: 400;
27
   font-weight: 400;
28
   color: #666;
28
   color: #666;
29
   display: flex;
29
   display: flex;
31
   margin-bottom: 0.08rem;
31
   margin-bottom: 0.08rem;
32
 }
32
 }
33
 .ediText {
33
 .ediText {
34
-  font-size: 0.11rem;
34
+  font-size: 0.106rem;
35
   color: #ff925c;
35
   color: #ff925c;
36
   position: absolute;
36
   position: absolute;
37
   right: 0;
37
   right: 0;

+ 3
- 3
src/pages/building/type/style.css View File

16
   margin: 10px 0px;
16
   margin: 10px 0px;
17
 }
17
 }
18
 .cardText {
18
 .cardText {
19
-  font-size:  0.11rem;
19
+  font-size:  0.106rem;
20
   color: #333;
20
   color: #333;
21
   line-height: 24px;
21
   line-height: 24px;
22
   display: flex;
22
   display: flex;
29
   display: flex;
29
   display: flex;
30
   align-items: center;
30
   align-items: center;
31
   line-height: 1.5;
31
   line-height: 1.5;
32
-  font-size: 0.11rem;
32
+  font-size: 0.106rem;
33
   margin-bottom: 0.08rem;
33
   margin-bottom: 0.08rem;
34
 }
34
 }
35
 .ediText {
35
 .ediText {
36
-  font-size: 0.11rem;
36
+  font-size: 0.106rem;
37
   color: #ff925c;
37
   color: #ff925c;
38
   line-height: 24px;
38
   line-height: 24px;
39
   position: absolute;
39
   position: absolute;

+ 3
- 3
src/pages/building/type/style.less View File

21
   align-items: center;
21
   align-items: center;
22
   position: relative;
22
   position: relative;
23
   line-height: 1.5;
23
   line-height: 1.5;
24
-  font-size: 0.11rem;
24
+  font-size: 0.106rem;
25
   margin-bottom: 0.08rem;
25
   margin-bottom: 0.08rem;
26
 
26
 
27
 }
27
 }
30
   display: flex;
30
   display: flex;
31
   align-items: center;  
31
   align-items: center;  
32
   line-height: 1.5;
32
   line-height: 1.5;
33
-  font-size: 0.11rem;
33
+  font-size: 0.106rem;
34
   margin-bottom: 0.08rem;
34
   margin-bottom: 0.08rem;
35
 }
35
 }
36
 .ediText {
36
 .ediText {
37
-  font-size: 0.11rem;
37
+  font-size: 0.106rem;
38
   color: #ff925c;
38
   color: #ff925c;
39
   line-height: 24px;
39
   line-height: 24px;
40
   position: absolute;
40
   position: absolute;

+ 3
- 3
src/pages/building/type/style.wxss View File

16
   margin: 10px 0px;
16
   margin: 10px 0px;
17
 }
17
 }
18
 .cardText {
18
 .cardText {
19
-  font-size:  0.11rem;
19
+  font-size:  0.106rem;
20
   color: #333;
20
   color: #333;
21
   line-height: 24px;
21
   line-height: 24px;
22
   display: flex;
22
   display: flex;
24
   position: relative;
24
   position: relative;
25
 }
25
 }
26
 .cardItem {
26
 .cardItem {
27
-  font-size:  0.11rem;
27
+  font-size:  0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   line-height: 24px;
30
   line-height: 24px;
32
   align-items: center;
32
   align-items: center;
33
 }
33
 }
34
 .ediText {
34
 .ediText {
35
-  font-size:  0.11rem;
35
+  font-size:  0.106rem;
36
   color: #ff925c;
36
   color: #ff925c;
37
   line-height: 24px;
37
   line-height: 24px;
38
   position: absolute;
38
   position: absolute;

+ 1
- 0
src/pages/carouselFigure/editAdvertising.jsx View File

74
         name: 'image',
74
         name: 'image',
75
         type: FieldTypes.ImageUploader,
75
         type: FieldTypes.ImageUploader,
76
         value: data.image,
76
         value: data.image,
77
+        help: '建议图片尺寸:640px*960px',
77
       },
78
       },
78
       {
79
       {
79
         label: '标题',
80
         label: '标题',

+ 1
- 0
src/pages/carouselFigure/editCarousel.jsx View File

53
         name: 'image',
53
         name: 'image',
54
         type: FieldTypes.ImageUploader,
54
         type: FieldTypes.ImageUploader,
55
         value: data.image,
55
         value: data.image,
56
+        help: '建议图片尺寸:640px*330px',
56
       },
57
       },
57
       {
58
       {
58
         label: '标题',
59
         label: '标题',

+ 3
- 3
src/pages/customer/customerlist/style.css View File

19
   margin: 10px 0px;
19
   margin: 10px 0px;
20
 }
20
 }
21
 .cardText {
21
 .cardText {
22
-  font-size:  0.11rem;
22
+  font-size:  0.106rem;
23
   color: #333;
23
   color: #333;
24
   line-height: 24px;
24
   line-height: 24px;
25
   display: flex;
25
   display: flex;
27
   position: relative;
27
   position: relative;
28
 }
28
 }
29
 .cardItem {
29
 .cardItem {
30
-  font-size:  0.11rem;
30
+  font-size:  0.106rem;
31
   font-weight: 400;
31
   font-weight: 400;
32
   color: #666;
32
   color: #666;
33
   line-height: 24px;
33
   line-height: 24px;
35
   align-items: center;
35
   align-items: center;
36
 }
36
 }
37
 .ediText {
37
 .ediText {
38
-  font-size:  0.11rem;
38
+  font-size:  0.106rem;
39
   color: #ff925c;
39
   color: #ff925c;
40
   line-height: 24px;
40
   line-height: 24px;
41
   position: absolute;
41
   position: absolute;

+ 3
- 3
src/pages/customer/customerlist/style.less View File

24
   align-items: center;
24
   align-items: center;
25
   position: relative;
25
   position: relative;
26
   line-height: 1.5;
26
   line-height: 1.5;
27
-  font-size: 0.11rem;
27
+  font-size: 0.106rem;
28
   margin-bottom: 0.08rem;
28
   margin-bottom: 0.08rem;
29
 
29
 
30
 }
30
 }
33
   display: flex;
33
   display: flex;
34
   align-items: center; 
34
   align-items: center; 
35
   line-height: 1.5;
35
   line-height: 1.5;
36
-  font-size: 0.11rem;
36
+  font-size: 0.106rem;
37
   margin-bottom: 0.08rem; 
37
   margin-bottom: 0.08rem; 
38
 }
38
 }
39
 .ediText {
39
 .ediText {
40
-  font-size: 0.11rem;
40
+  font-size: 0.106rem;
41
   color: #ff925c;
41
   color: #ff925c;
42
   line-height: 24px;
42
   line-height: 24px;
43
   position: absolute;
43
   position: absolute;

+ 3
- 3
src/pages/customer/customerlist/style.wxss View File

19
   margin: 10px 0px;
19
   margin: 10px 0px;
20
 }
20
 }
21
 .cardText {
21
 .cardText {
22
-  font-size:  0.11rem;
22
+  font-size:  0.106rem;
23
   color: #333;
23
   color: #333;
24
   line-height: 24px;
24
   line-height: 24px;
25
   display: flex;
25
   display: flex;
27
   position: relative;
27
   position: relative;
28
 }
28
 }
29
 .cardItem {
29
 .cardItem {
30
-  font-size:  0.11rem;
30
+  font-size:  0.106rem;
31
   font-weight: 400;
31
   font-weight: 400;
32
   color: #666;
32
   color: #666;
33
   line-height: 24px;
33
   line-height: 24px;
35
   align-items: center;
35
   align-items: center;
36
 }
36
 }
37
 .ediText {
37
 .ediText {
38
-  font-size:  0.11rem;
38
+  font-size:  0.106rem;
39
   color: #ff925c;
39
   color: #ff925c;
40
   line-height: 24px;
40
   line-height: 24px;
41
   position: absolute;
41
   position: absolute;

+ 3
- 3
src/pages/customer/drift/style.less View File

21
   align-items: center;
21
   align-items: center;
22
   position: relative;
22
   position: relative;
23
   line-height: 1.5;
23
   line-height: 1.5;
24
-  font-size: 0.11rem;
24
+  font-size: 0.106rem;
25
   margin-bottom: 0.08rem;
25
   margin-bottom: 0.08rem;
26
 
26
 
27
 }
27
 }
30
   display: flex;
30
   display: flex;
31
   align-items: center; 
31
   align-items: center; 
32
   line-height: 1.5;
32
   line-height: 1.5;
33
-  font-size: 0.11rem;
33
+  font-size: 0.106rem;
34
   margin-bottom: 0.08rem; 
34
   margin-bottom: 0.08rem; 
35
 }
35
 }
36
 .ediText {
36
 .ediText {
37
-  font-size: 0.11rem;
37
+  font-size: 0.106rem;
38
   color: #ff925c;
38
   color: #ff925c;
39
   line-height: 24px;
39
   line-height: 24px;
40
   position: absolute;
40
   position: absolute;

+ 3
- 3
src/pages/customer/independentList/style.css View File

16
   margin: 10px 0px;
16
   margin: 10px 0px;
17
 }
17
 }
18
 .cardText {
18
 .cardText {
19
-  font-size:  0.11rem;
19
+  font-size:  0.106rem;
20
   color: #333;
20
   color: #333;
21
   line-height: 24px;
21
   line-height: 24px;
22
   display: flex;
22
   display: flex;
24
   position: relative;
24
   position: relative;
25
 }
25
 }
26
 .cardItem {
26
 .cardItem {
27
-  font-size:  0.11rem;
27
+  font-size:  0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   line-height: 24px;
30
   line-height: 24px;
32
   align-items: center;
32
   align-items: center;
33
 }
33
 }
34
 .ediText {
34
 .ediText {
35
-  font-size:  0.11rem;
35
+  font-size:  0.106rem;
36
   color: #ff925c;
36
   color: #ff925c;
37
   line-height: 24px;
37
   line-height: 24px;
38
   position: absolute;
38
   position: absolute;

+ 3
- 3
src/pages/customer/independentList/style.less View File

21
   align-items: center;
21
   align-items: center;
22
   position: relative;
22
   position: relative;
23
   line-height: 1.5;
23
   line-height: 1.5;
24
-  font-size: 0.11rem;
24
+  font-size: 0.106rem;
25
   margin-bottom: 0.08rem;
25
   margin-bottom: 0.08rem;
26
 
26
 
27
 }
27
 }
30
   display: flex;
30
   display: flex;
31
   align-items: center;  
31
   align-items: center;  
32
   line-height: 1.5;
32
   line-height: 1.5;
33
-  font-size: 0.11rem;
33
+  font-size: 0.106rem;
34
   margin-bottom: 0.08rem;
34
   margin-bottom: 0.08rem;
35
 }
35
 }
36
 .ediText {
36
 .ediText {
37
-  font-size: 0.11rem;
37
+  font-size: 0.106rem;
38
   color: #ff925c;
38
   color: #ff925c;
39
   line-height: 24px;
39
   line-height: 24px;
40
   position: absolute;
40
   position: absolute;

+ 3
- 3
src/pages/customer/independentList/style.wxss View File

16
   margin: 10px 0px;
16
   margin: 10px 0px;
17
 }
17
 }
18
 .cardText {
18
 .cardText {
19
-  font-size:  0.11rem;
19
+  font-size:  0.106rem;
20
   color: #333;
20
   color: #333;
21
   line-height: 24px;
21
   line-height: 24px;
22
   display: flex;
22
   display: flex;
24
   position: relative;
24
   position: relative;
25
 }
25
 }
26
 .cardItem {
26
 .cardItem {
27
-  font-size:  0.11rem;
27
+  font-size:  0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   line-height: 24px;
30
   line-height: 24px;
32
   align-items: center;
32
   align-items: center;
33
 }
33
 }
34
 .ediText {
34
 .ediText {
35
-  font-size:  0.11rem;
35
+  font-size:  0.106rem;
36
   color: #ff925c;
36
   color: #ff925c;
37
   line-height: 24px;
37
   line-height: 24px;
38
   position: absolute;
38
   position: absolute;

+ 3
- 3
src/pages/customer/recommendCustomer/style.css View File

16
   margin: 10px 0px;
16
   margin: 10px 0px;
17
 }
17
 }
18
 .cardText {
18
 .cardText {
19
-  font-size:  0.11rem;
19
+  font-size:  0.106rem;
20
   color: #333;
20
   color: #333;
21
   line-height: 24px;
21
   line-height: 24px;
22
   display: flex;
22
   display: flex;
24
   position: relative;
24
   position: relative;
25
 }
25
 }
26
 .cardItem {
26
 .cardItem {
27
-  font-size:  0.11rem;
27
+  font-size:  0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   line-height: 24px;
30
   line-height: 24px;
32
   align-items: center;
32
   align-items: center;
33
 }
33
 }
34
 .ediText {
34
 .ediText {
35
-  font-size:  0.11rem;
35
+  font-size:  0.106rem;
36
   color: #ff925c;
36
   color: #ff925c;
37
   line-height: 24px;
37
   line-height: 24px;
38
   position: absolute;
38
   position: absolute;

+ 3
- 3
src/pages/customer/recommendCustomer/style.less View File

21
   align-items: center;
21
   align-items: center;
22
   position: relative;
22
   position: relative;
23
   line-height: 1.5;
23
   line-height: 1.5;
24
-  font-size: 0.11rem;
24
+  font-size: 0.106rem;
25
   margin-bottom: 0.08rem;
25
   margin-bottom: 0.08rem;
26
 
26
 
27
 }
27
 }
28
 .cardItem{
28
 .cardItem{
29
-  font-size: 0.11rem;
29
+  font-size: 0.106rem;
30
   font-weight: 400;
30
   font-weight: 400;
31
   color: #666;
31
   color: #666;
32
   line-height: 24px;
32
   line-height: 24px;
34
   align-items: center;  
34
   align-items: center;  
35
 }
35
 }
36
 .ediText {
36
 .ediText {
37
-  font-size:  0.11rem;
37
+  font-size:  0.106rem;
38
   color: #ff925c;
38
   color: #ff925c;
39
   line-height: 24px;
39
   line-height: 24px;
40
   position: absolute;
40
   position: absolute;

+ 3
- 3
src/pages/customer/recommendCustomer/style.wxss View File

16
   margin: 10px 0px;
16
   margin: 10px 0px;
17
 }
17
 }
18
 .cardText {
18
 .cardText {
19
-  font-size:  0.11rem;
19
+  font-size:  0.106rem;
20
   color: #333;
20
   color: #333;
21
   line-height: 24px;
21
   line-height: 24px;
22
   display: flex;
22
   display: flex;
24
   position: relative;
24
   position: relative;
25
 }
25
 }
26
 .cardItem {
26
 .cardItem {
27
-  font-size:  0.11rem;
27
+  font-size:  0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   line-height: 24px;
30
   line-height: 24px;
32
   align-items: center;
32
   align-items: center;
33
 }
33
 }
34
 .ediText {
34
 .ediText {
35
-  font-size:  0.11rem;
35
+  font-size:  0.106rem;
36
   color: #ff925c;
36
   color: #ff925c;
37
   line-height: 24px;
37
   line-height: 24px;
38
   position: absolute;
38
   position: absolute;

+ 3
- 3
src/pages/customer/report/style.css View File

16
   margin: 10px 0px;
16
   margin: 10px 0px;
17
 }
17
 }
18
 .cardText {
18
 .cardText {
19
-  font-size:  0.11rem;
19
+  font-size:  0.106rem;
20
   color: #333;
20
   color: #333;
21
   line-height: 24px;
21
   line-height: 24px;
22
   display: flex;
22
   display: flex;
24
   position: relative;
24
   position: relative;
25
 }
25
 }
26
 .cardItem {
26
 .cardItem {
27
-  font-size:  0.11rem;
27
+  font-size:  0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   line-height: 24px;
30
   line-height: 24px;
32
   align-items: center;
32
   align-items: center;
33
 }
33
 }
34
 .ediText {
34
 .ediText {
35
-  font-size:  0.11rem;
35
+  font-size:  0.106rem;
36
   color: #ff925c;
36
   color: #ff925c;
37
   line-height: 24px;
37
   line-height: 24px;
38
   position: absolute;
38
   position: absolute;

+ 3
- 3
src/pages/customer/report/style.less View File

21
   align-items: center;
21
   align-items: center;
22
   position: relative;
22
   position: relative;
23
   line-height: 1.5;
23
   line-height: 1.5;
24
-  font-size: 0.11rem;
24
+  font-size: 0.106rem;
25
   margin-bottom: 0.08rem;
25
   margin-bottom: 0.08rem;
26
 
26
 
27
 }
27
 }
31
   display: flex;
31
   display: flex;
32
   align-items: center;  
32
   align-items: center;  
33
   line-height: 1.5;
33
   line-height: 1.5;
34
-  font-size: 0.11rem;
34
+  font-size: 0.106rem;
35
   margin-bottom: 0.08rem;
35
   margin-bottom: 0.08rem;
36
 }
36
 }
37
 .ediText {
37
 .ediText {
38
-  font-size: 0.11rem;
38
+  font-size: 0.106rem;
39
   color: #ff925c;
39
   color: #ff925c;
40
   line-height: 24px;
40
   line-height: 24px;
41
   position: absolute;
41
   position: absolute;

+ 3
- 3
src/pages/customer/report/style.wxss View File

16
   margin: 10px 0px;
16
   margin: 10px 0px;
17
 }
17
 }
18
 .cardText {
18
 .cardText {
19
-  font-size:  0.11rem;
19
+  font-size:  0.106rem;
20
   color: #333;
20
   color: #333;
21
   line-height: 24px;
21
   line-height: 24px;
22
   display: flex;
22
   display: flex;
24
   position: relative;
24
   position: relative;
25
 }
25
 }
26
 .cardItem {
26
 .cardItem {
27
-  font-size:  0.11rem;
27
+  font-size:  0.106rem;
28
   font-weight: 400;
28
   font-weight: 400;
29
   color: #666;
29
   color: #666;
30
   line-height: 24px;
30
   line-height: 24px;
32
   align-items: center;
32
   align-items: center;
33
 }
33
 }
34
 .ediText {
34
 .ediText {
35
-  font-size:  0.11rem;
35
+  font-size:  0.106rem;
36
   color: #ff925c;
36
   color: #ff925c;
37
   line-height: 24px;
37
   line-height: 24px;
38
   position: absolute;
38
   position: absolute;

+ 4
- 1
src/pages/indexEcharts/components/UserConversion.jsx View File

40
     }
40
     }
41
 
41
 
42
     if (pvNum < num) {
42
     if (pvNum < num) {
43
-      setTheCurrent([])
43
+      setTheCurrent([
44
+        { name: getStatisName(theStatis), value: '0' },
45
+        { name: '其余', value:  '0' },
46
+      ])
44
     } else {
47
     } else {
45
 
48
 
46
       setConversionRate(num / pvNum)
49
       setConversionRate(num / pvNum)

+ 1
- 0
src/pages/integralMall/editGoods.jsx View File

44
       name: 'imgUrl',
44
       name: 'imgUrl',
45
       type: FieldTypes.ImageUploader,
45
       type: FieldTypes.ImageUploader,
46
       value: goodsData.imgUrl,
46
       value: goodsData.imgUrl,
47
+      help: '建议图片尺寸:164px*164px',
47
     },
48
     },
48
     {
49
     {
49
       label: '商品名称',
50
       label: '商品名称',

+ 28
- 28
src/pages/news/list/NewsList.jsx View File

97
         okText: '确认',
97
         okText: '确认',
98
         cancelText: '取消',
98
         cancelText: '取消',
99
         onOk() {
99
         onOk() {
100
-          request({ ...apis.news.delete, urlData: { id: newsId },}).then((data) => {
100
+          request({ ...apis.news.delete, urlData: { id: newsId }, }).then((data) => {
101
             message.info('操作成功!')
101
             message.info('操作成功!')
102
             getList({ pageNum: 1, pageSize: 10 });
102
             getList({ pageNum: 1, pageSize: 10 });
103
           }).catch((err) => {
103
           }).catch((err) => {
126
           okText: '确认',
126
           okText: '确认',
127
           cancelText: '取消',
127
           cancelText: '取消',
128
           onOk() {
128
           onOk() {
129
-            request({ ...apis.news.cancel, data:{"newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId}, urlData: { id: newsId },}).then((data) => {
129
+            request({ ...apis.news.cancel, data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId }, urlData: { id: newsId }, }).then((data) => {
130
               message.info('操作成功!')
130
               message.info('操作成功!')
131
               getList({ pageNum: 1, pageSize: 10 });
131
               getList({ pageNum: 1, pageSize: 10 });
132
             }).catch((err) => {
132
             }).catch((err) => {
144
           okText: '确认',
144
           okText: '确认',
145
           cancelText: '取消',
145
           cancelText: '取消',
146
           onOk() {
146
           onOk() {
147
-            request({ ...apis.news.cancel, data:{"newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId}, urlData: { id: newsId },}).then((data) => {
147
+            request({ ...apis.news.cancel, data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId }, urlData: { id: newsId }, }).then((data) => {
148
               message.info('操作成功!')
148
               message.info('操作成功!')
149
               getList({ pageNum: 1, pageSize: 10 });
149
               getList({ pageNum: 1, pageSize: 10 });
150
             }).catch((err) => {
150
             }).catch((err) => {
162
     return (
162
     return (
163
       <Card
163
       <Card
164
         hoverable
164
         hoverable
165
-        style={{ height: '255px', minWidth: '640px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)', position: 'relative' }}
166
-        cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '260px', height: '253px' }}></img>}
165
+        style={{ height: '230px', minWidth: '570px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)', position: 'relative' }}
166
+        cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '230px', height: '228px' }}></img>}
167
         bodyStyle={{ padding: '10px 20px' }}
167
         bodyStyle={{ padding: '10px 20px' }}
168
       >
168
       >
169
         <AuthButton name="admin.taNews.id.put" noRight={null}>
169
         <AuthButton name="admin.taNews.id.put" noRight={null}>
170
-          <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.11rem', color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
170
+          <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
171
             编辑
171
             编辑
172
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
172
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
173
           </span>
173
           </span>
174
           {data.newsStatus === 0 ?
174
           {data.newsStatus === 0 ?
175
-            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
175
+            <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
176
               取消发布
176
               取消发布
177
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
177
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
178
             </span> :
178
             </span> :
179
-            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
179
+            <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
180
               发布
180
               发布
181
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
181
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
182
             </span>
182
             </span>
183
           }
183
           }
184
         </AuthButton>
184
         </AuthButton>
185
         <AuthButton name="admin.taNews.id.delete" noRight={null}>
185
         <AuthButton name="admin.taNews.id.delete" noRight={null}>
186
-            <span style={{ position: 'absolute', right: '20px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48', cursor: 'pointer' }} onClick={changeNewsListStatus(data.newsId)}>
187
-                  删除
186
+          <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer' }} onClick={changeNewsListStatus(data.newsId)}>
187
+            删除
188
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
188
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
189
-            </span>
189
+          </span>
190
         </AuthButton>
190
         </AuthButton>
191
-        <div style={{ position: 'absolute', left: '260px', top: '0px', padding: '20px' }}>
191
+        <div style={{ position: 'absolute', left: '240px', top: '0px', padding: '16px 10px', width: '64%' }}>
192
           <p style={{
192
           <p style={{
193
-            fontSize: ' 0.11rem', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
193
+            fontSize: ' 0.106rem', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
194
             textOverflow: 'ellipsis',
194
             textOverflow: 'ellipsis',
195
             whiteSpace: 'nowrap',
195
             whiteSpace: 'nowrap',
196
-            width: '300px',
196
+            width: '75%',
197
           }}>{data.newsName}</p>
197
           }}>{data.newsName}</p>
198
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px',display:'flex' }}>
199
-            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>资讯类型:{data.newsType.newsTypeName}</span>
198
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex' }}>
199
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>资讯类型:{data.newsType.newsTypeName}</span>
200
             <span>状态:{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
200
             <span>状态:{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
201
           </p>
201
           </p>
202
 
202
 
203
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px' }}>
204
-            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>阅读数量:{data.pvNum}</span>
203
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
204
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>阅读数量:{data.pvNum}</span>
205
             <span>转发数量:{data.shareNum}</span>
205
             <span>转发数量:{data.shareNum}</span>
206
           </p>
206
           </p>
207
 
207
 
208
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px' }}>
209
-            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>点赞数量:{data.favorNum}</span>
208
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
209
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量:{data.favorNum}</span>
210
             <span>收藏数量:{data.saveNum}</span>
210
             <span>收藏数量:{data.saveNum}</span>
211
           </p>
211
           </p>
212
 
212
 
213
-          <p style={{ fontSize: ' 0.11rem', color: '#999', marginBottom: '8px' }}>发布时间:{data.createDate}</p>
213
+          <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间:{data.createDate}</p>
214
         </div>
214
         </div>
215
       </Card>
215
       </Card>
216
     )
216
     )
229
     getList({ pageNum: pageNumber, pageSize: 6 })
229
     getList({ pageNum: pageNumber, pageSize: 6 })
230
   }
230
   }
231
 
231
 
232
-   //重置搜索
233
-   function handleReset() {
232
+  //重置搜索
233
+  function handleReset() {
234
     props.form.resetFields();
234
     props.form.resetFields();
235
   }
235
   }
236
-  
236
+
237
   function getDate(value, dateString) {
237
   function getDate(value, dateString) {
238
     // moment(value).format('YYYY-MM-DD HH:mm:ss')
238
     // moment(value).format('YYYY-MM-DD HH:mm:ss')
239
     console.log(value, dateString)
239
     console.log(value, dateString)
253
             <BuildSelect />,
253
             <BuildSelect />,
254
           )}
254
           )}
255
         </Form.Item>
255
         </Form.Item>
256
-        {/* <Form.Item>
256
+        <Form.Item>
257
           {getFieldDecorator('title')(
257
           {getFieldDecorator('title')(
258
             <Input
258
             <Input
259
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
259
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
260
               placeholder="请输入标题"
260
               placeholder="请输入标题"
261
             />,
261
             />,
262
           )}
262
           )}
263
-        </Form.Item> */}
263
+        </Form.Item>
264
         <Form.Item>
264
         <Form.Item>
265
           {getFieldDecorator('newsTypeId')(
265
           {getFieldDecorator('newsTypeId')(
266
             <NewsTypeSelect />,
266
             <NewsTypeSelect />,
279
             搜索
279
             搜索
280
           </Button>
280
           </Button>
281
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
281
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
282
-              重置
282
+            重置
283
             </Button>
283
             </Button>
284
         </Form.Item>
284
         </Form.Item>
285
       </Form>
285
       </Form>
290
       </AuthButton>
290
       </AuthButton>
291
 
291
 
292
       {/* 卡片内容,显示楼盘项目  */}
292
       {/* 卡片内容,显示楼盘项目  */}
293
-      <Row style={{ padding: ' 0 10px' }}>
293
+      <Row>
294
         {
294
         {
295
           dataSource.records.map((item, index) => (
295
           dataSource.records.map((item, index) => (
296
             <Col span={12}>
296
             <Col span={12}>

+ 3
- 2
src/pages/news/list/editNewsList.jsx View File

68
         name: 'newsImg',
68
         name: 'newsImg',
69
         type: FieldTypes.ImageUploader,
69
         type: FieldTypes.ImageUploader,
70
         value: dynamicData.newsImg,
70
         value: dynamicData.newsImg,
71
+        help: '建议图片尺寸:660px*416px',
71
       },
72
       },
72
       {
73
       {
73
         label: '资讯标题',
74
         label: '资讯标题',
285
         </div>
286
         </div>
286
       </div>
287
       </div>
287
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
288
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
288
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
289
-        <Input placeholder="请输入海报标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
289
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
290
+        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
290
       </div>
291
       </div>
291
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
292
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
292
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
293
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>

+ 3
- 3
src/pages/news/list/style.less View File

21
     align-items: center;
21
     align-items: center;
22
     position: relative;
22
     position: relative;
23
     line-height: 1.5;
23
     line-height: 1.5;
24
-    font-size: 0.11rem;
24
+    font-size: 0.106rem;
25
     margin-bottom: 0.08rem;
25
     margin-bottom: 0.08rem;
26
   
26
   
27
   }
27
   }
30
     display: flex;
30
     display: flex;
31
     align-items: center;  
31
     align-items: center;  
32
     line-height: 1.5;
32
     line-height: 1.5;
33
-    font-size: 0.11rem;
33
+    font-size: 0.106rem;
34
     margin-bottom: 0.08rem;
34
     margin-bottom: 0.08rem;
35
   }
35
   }
36
   .ediText {
36
   .ediText {
37
-    font-size: 0.11rem;
37
+    font-size: 0.106rem;
38
     color: #ff925c;
38
     color: #ff925c;
39
     line-height: 24px;
39
     line-height: 24px;
40
     position: absolute;
40
     position: absolute;

+ 1
- 0
src/pages/news/type/editNews.jsx View File

48
       name: 'newsTypeImg',
48
       name: 'newsTypeImg',
49
       type: FieldTypes.ImageUploader,
49
       type: FieldTypes.ImageUploader,
50
       value: newsData.newsTypeImg,
50
       value: newsData.newsTypeImg,
51
+      help: '建议图片尺寸:660px*416px',
51
     },
52
     },
52
     {
53
     {
53
       label: '名称',
54
       label: '名称',

+ 3
- 3
src/pages/staff/list/StaffList.jsx View File

66
     <Card className={Styles.card}>
66
     <Card className={Styles.card}>
67
       <div>
67
       <div>
68
         <Avatar src={data.avatar} style={{ width: '0.48rem', height: '0.48rem' }} />
68
         <Avatar src={data.avatar} style={{ width: '0.48rem', height: '0.48rem' }} />
69
-        <Button type="link" style={{color: '#FF925C', fontSize: '0.11rem',position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
69
+        <Button type="link" style={{color: '#FF925C', fontSize: '0.106rem',position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
70
           编辑
70
           编辑
71
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
71
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
72
         </Button>
72
         </Button>
73
-        <Button type="link" style={{ fontSize: ' 0.11rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
73
+        <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
74
           {data.status === 1 ? '停用' : '启用'}
74
           {data.status === 1 ? '停用' : '启用'}
75
                 <Icon type={data.status===1?'close-circle':'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
75
                 <Icon type={data.status===1?'close-circle':'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
76
         </Button>
76
         </Button>
77
-        {/* <Button type="link" style={{ fontSize: ' 0.11rem', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
77
+        {/* <Button type="link" style={{ fontSize: ' 0.106rem', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
78
           启用
78
           启用
79
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
79
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
80
         </Button> */}
80
         </Button> */}

+ 1
- 1
src/pages/staff/list/style.less View File

50
   display: flex;
50
   display: flex;
51
   align-items: center;
51
   align-items: center;
52
   line-height: 1.5;
52
   line-height: 1.5;
53
-  font-size: 0.11rem;
53
+  font-size: 0.106rem;
54
   margin-bottom: 0.08rem;
54
   margin-bottom: 0.08rem;
55
 }
55
 }
56
 
56
 

+ 1
- 0
src/pages/system/editPolicy.jsx View File

52
         name: 'policyImg',
52
         name: 'policyImg',
53
         type: FieldTypes.ImageUploader,
53
         type: FieldTypes.ImageUploader,
54
         value: policyData.policyImg,
54
         value: policyData.policyImg,
55
+        help: '建议图片尺寸:660px*416px',
55
       },
56
       },
56
       {
57
       {
57
         label: '政策标题',
58
         label: '政策标题',

+ 1
- 1
src/pages/user/login/components/Login/index.jsx View File

118
           <div className={styles.con}>
118
           <div className={styles.con}>
119
             <p className={styles.welcome}>Welcome</p>
119
             <p className={styles.welcome}>Welcome</p>
120
             <div className={styles.title}>
120
             <div className={styles.title}>
121
-              <span style={{fontSize:' 0.11rem',lineHeight:' 0.11rem'}}>ying xiao yun</span>
121
+              <span style={{fontSize:' 0.106rem',lineHeight:' 0.106rem'}}>ying xiao yun</span>
122
               <p className={styles.name}>营销云·系统</p>
122
               <p className={styles.name}>营销云·系统</p>
123
             </div>
123
             </div>
124
           </div>
124
           </div>

+ 4
- 2
src/pages/user/login/components/Login/index.less View File

19
       font-style: italic;
19
       font-style: italic;
20
       margin-bottom: 0;
20
       margin-bottom: 0;
21
       font-family: initial;
21
       font-family: initial;
22
+      position: relative;
22
     }
23
     }
23
     .title{
24
     .title{
24
-      width: 260px;
25
+      width: 262px;
25
       height: 102px;
26
       height: 102px;
26
       border:1px solid #fff;
27
       border:1px solid #fff;
27
       text-align: left;
28
       text-align: left;
31
       .name{
32
       .name{
32
         font-size: 41px;
33
         font-size: 41px;
33
         margin:0; 
34
         margin:0; 
35
+        position: absolute;
34
       }
36
       }
35
     }
37
     }
36
     }
38
     }
90
 
92
 
91
   .prefixIcon {
93
   .prefixIcon {
92
     color: #fff;
94
     color: #fff;
93
-    font-size:  0.11rem;
95
+    font-size:  0.106rem;
94
     background-color: #EF273A;
96
     background-color: #EF273A;
95
     padding: 3px 4px;
97
     padding: 3px 4px;
96
   }
98
   }