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

config/config.js

@@ -479,7 +479,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://localhost:8080/',
+      target: 'http://192.168.0.11:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/app.js

@@ -4,10 +4,13 @@
     recalc = function () {
       var clientWidth = docEl.clientWidth;
       if (!clientWidth) return;
-      if (clientWidth < 1200) {
-        docEl.style.fontSize = '100px';
-      } else {
-        docEl.style.fontSize = 100 * (clientWidth / 1200) + 'px';
+      if (clientWidth < 1700) {
+        docEl.style.fontSize = '150px';
+      } else if ( 1700>=clientWidth>2000 ){
+        docEl.style.fontSize = '170px';
+      }else{
+        docEl.style.fontSize = '170px';
+        // docEl.style.fontSize = 100 * (clientWidth / 1400) + 'px';
       }
     };
 

src/pages/Welcome.jsx

@@ -23,7 +23,7 @@ export default () => (
     <div style={{ display: 'flex' }}>
       <div style={{
         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',
-        boxShadow: '0px 18px 14px -15px rgba(241,43,62,1)',
+        boxShadow: '0px  0.11rem 14px -15px rgba(241,43,62,1)',
         borderRadius: '12px', width: '32%', marginRight: '2%'
       }}>
         <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
@@ -31,7 +31,7 @@ export default () => (
       </div>
       <div style={{
         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',
-        boxShadow: '0px 18px 14px -15px rgba(255,126,74,1)',
+        boxShadow: '0px  0.11rem 14px -15px rgba(255,126,74,1)',
         borderRadius: '12px', width: '32%', marginRight: '2%'
       }}>
         <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
@@ -39,7 +39,7 @@ export default () => (
       </div>
       <div style={{
         textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
-        boxShadow: '0px 18px 14px -15px rgba(107,130,230,1)',
+        boxShadow: '0px  0.11rem 14px -15px rgba(107,130,230,1)',
         borderRadius: '12px', width: '32%',
       }}>
         <span style={{ fontSize: '24px', color: '#fff' }}>最近7天新增 </span>

src/pages/building/list/add/amap.css

@@ -0,0 +1,43 @@
+.infoBox {
+  padding: 10px;
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  background-color: white;
+  width: 280px;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, 0.5);
+  z-index: 100;
+}
+.infoBox .inputText {
+  margin-right: 10px;
+}
+.infoBox .input {
+  width: 150px;
+  height: 32px;
+  font-size: 16px;
+}
+/* types */
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px;
+}
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

src/pages/building/list/add/amap.less

@@ -1,409 +1,24 @@
-// html {
-//   font-size: 12px;
-// }
-// .amap-copyright{
-//   box-sizing: content-box
-// }
-// * {
-//   box-sizing: border-box
-// }
-// .input-textarea{
-//    color:grey;
-//    height:8em;
-//    overflow:auto;
-//    border-radius:0.4rem;
-//    border:1px solid #ced4da;
-//    margin-bottom:0.1rem;
-// }
-// body {
-//   margin: 0;
-//   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-//   line-height: 1.5;
-//   font-weight: 300;
-//   color: #111213;
-// }
-
-// hr {
-//   margin: 0.5rem 0;
-//   box-sizing: content-box;
-//   height: 0;
-//   overflow: visible;
-//   border: 0;
-//   border-top: 1px solid rgba(0, 0, 0, .1)
-// }
-
-// p {
-//   margin-top: 0;
-//   margin-bottom: 0;
-// }
-
-// label {
-//   display: inline-block;
-//   margin-bottom: 0.1rem;
-// }
-
-// label, .btn {
-//   margin-left: 0;
-//   font-size: 0.18rem;
-// }
-
-// button, input, select {
-//   margin: 0;
-//   font-family: inherit;
-//   font-size: inherit;
-//   line-height: inherit;
-//   overflow: visible;
-//   text-transform: none
-// }
-
-// [type=button]::-moz-focus-inner, [type=reset]::-moz-focus-inner, [type=submit]::-moz-focus-inner, button::-moz-focus-inner {
-//   padding: 0;
-//   border-style: none;
-// }
-
-// input[type=checkbox], input[type=radio] {
-//   box-sizing: border-box;
-//   padding: 0;
-//   -webkit-box-sizing: border-box;
-//   box-sizing: border-box;
-//   padding: 0;
-//   margin: 0 0.5rem 0 0;
-// }
-
-// h4 {
-//   font-family: inherit;
-//   line-height: 1.8;
-//   font-weight: 300;
-//   color: inherit;
-//   font-size: 0.2rem;
-//   margin-top: 0;
-//   margin-bottom: .5rem
-// }
-
-// .btn {
-//   display: inline-block;
-//   font-weight: 400;
-//   text-align: center;
-//   white-space: nowrap;
-//   vertical-align: middle;
-//   -webkit-user-select: none;
-//   -moz-user-select: none;
-//   -ms-user-select: none;
-//   user-select: none;
-//   border: 1px solid transparent;
-//   transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
-//   background-color: transparent;
-//   background-image: none;
-//   color: #25A5F7;
-//   border-color: #25A5F7;
-//   padding: .25rem .5rem;
-//   line-height: 1.5;
-//   border-radius: 1rem;
-//   -webkit-appearance: button;
-//   cursor:pointer;
-// }
-
-// .btn:hover {
-//   color: #fff;
-//   background-color: #25A5F7;
-//   border-color: #25A5F7
-// }
-
-// .btn:hover {
-//   text-decoration: none
-// }
-
-// .input-item {
-//   position: relative;
-//   display: -ms-flexbox;
-//   display: flex;
-//   -ms-flex-wrap: wrap;
-//   flex-wrap: wrap;
-//   -ms-flex-align: center;
-//   align-items: center;
-//   width: 100%;
-//   height: 3rem;
-// }
-
-// .input-item:last-child {
-//   margin-bottom: 0;
-// }
-
-// .input-item>select, .input-item>input[type=text], .input-item>input[type=date] {
-//   position: relative;
-//   -ms-flex: 1 1 auto;
-//   flex: 1 1 auto;
-//   width: 1%;
-//   margin-bottom: 0;
-// }
-
-// .input-item>select:not(:last-child), .input-item>input[type=text]:not(:last-child), .input-item>input[type=date]:not(:last-child) {
-//   border-top-right-radius: 0;
-//   border-bottom-right-radius: 0
-// }
-
-// .input-item>select:not(:first-child), .input-item>input[type=text]:not(:first-child), .input-item>input[type=date]:not(:first-child) {
-//   border-top-left-radius: 0;
-//   border-bottom-left-radius: 0
-// }
-
-// .input-item-prepend {
-//   margin-right: -1px;
-// }
-
-// .input-item-text, input[type=text],input[type=date], select {
-//   height: calc(2.2rem + 2px);
-// }
-
-// .input-item-text {
-//   width: 6rem;
-//   text-align: justify;
-//   padding: 0.4rem 0.7rem;
-//   display: inline-block;
-//   text-justify: distribute-all-lines;
-//   /*ie6-8*/
-//   text-align-last: justify;
-//   /* ie9*/
-//   -moz-text-align-last: justify;
-//   /*ff*/
-//   -webkit-text-align-last: justify;
-//   /*chrome 20+*/
-//   -ms-flex-align: center;
-//   align-items: center;
-//   margin-bottom: 0;
-//   font-size: 1rem;
-//   font-weight: 400;
-//   line-height: 1.5;
-//   color: #495057;
-//   text-align: center;
-//   white-space: nowrap;
-//   background-color: #e9ecef;
-//   border: 1px solid #ced4da;
-//   border-radius: .25rem;
-//   border-bottom-right-radius: 0;
-//   border-top-right-radius: 0;
-// }
-
-// .input-item-text input[type=checkbox], .input-item-text input[type=radio] {
-//   margin-top: 0
-// }
-
-// .input-card {
-//   display: flex;
-//   flex-direction: column;
-//   min-width: 0;
-//   word-wrap: break-word;
-//   background-color: #fff;
-//   background-clip: border-box;
-//   border-radius: .25rem;
-//   width: 22rem;
-//   border-width: 0;
-//   border-radius: 0.4rem;
-//   box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
-//   position: fixed;
-//   bottom: 1rem;
-//   right: 1rem;
-//   -ms-flex: 1 1 auto;
-//   flex: 1 1 auto;
-//   padding: 0.75rem 1.25rem;
-// }
-
-// .input-text {
-//   line-height: 2rem;
-//   margin-right: 2rem;
-// }
-
-// .info hr {
-//   margin-right: 0;
-//   margin-left: 0;
-//   border-top-color: grey;
-// }
 
 .infoBox {
-  padding: .2rem 0.2rem;
+  padding: 10px;
   position: absolute;
-  top: 0.3rem;
-  left: 0.3rem;
+  top: 20px;
+  left: 20px;
   background-color: white;
-  width: 3.2rem;
+  width: 290px;
   box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
   z-index: 100;
   .inputText{
     margin-right: 10px;
   }
   .input{
-    width: 1.6rem;
-    height: 0.34rem;
-    font-size: 0.16rem;
+    width: 150px;
+    height: 32px;
+    font-size: 16px;
   }
  
 }
 
-// .code {
-//   left: 1.5rem;
-//   right: 1.5rem;
-//   top: 1.5rem;
-//   bottom: 1.5rem;
-//   overflow: auto;
-//   margin-bottom: 0rem;
-// }
-
-// .code .btn {
-//   top: 1rem;
-//   position: absolute;
-//   right: 1rem;
-// }
-
-// .code .result {
-//   border: 1px solid rgba(0, 0, 0, 0.1);
-//   border-radius: 0.5rem;
-//   padding: 1rem;
-//   bottom: 1rem;
-//   position: absolute;
-//   top: 5.5rem;
-//   right: 1rem;
-//   left: 1rem;
-//   overflow: auto;
-// }
-
-// .code .status {
-//   color: #80adff;
-//   display: inline-block;
-//   font-size: 14px;
-// }
-
-// .code h4 {
-//   display: inline-block;
-//   max-width: 20rem;
-//   margin-right: 1rem;
-//   margin-bottom: 1rem;
-// }
-
-// select, input[type=text], input[type=date] {
-//   display: inline-block;
-//   // width: 100%;
-//   padding: .375rem 1.75rem .375rem .75rem;
-//   line-height: 1.5;
-//   color: #495057;
-//   vertical-align: middle;
-//   background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;
-//   background-size: 8px 10px;
-//   border: 1px solid #ced4da;
-//   border-radius: .25rem;
-//   -webkit-appearance: none;
-//   -moz-appearance: none;
-//   appearance: none
-// }
-
-// input[type=text],input[type=date] {
-//   background: #fff;
-//   padding: .375rem .75rem;
-// }
-
-// select:focus, input[type=text]:focus, input[type=date]:focus {
-//   border-color: #80bdff;
-//   outline: 0;
-//   box-shadow: 0 0 0 .1rem rgba(128, 189, 255, .1)
-// }
-
-// .btn:focus {
-//   outline: 0;
-//   box-shadow: none;
-// }
-
-// select:focus::-ms-value, input[type=text]:focus::-ms-value,input[type=date]:focus::-ms-value {
-//   color: #495057;
-//   background-color: #fff
-// }
-
-
-// /* native toastr */
-// .native-toast {
-//   position: fixed;
-//   background-color: rgba(50, 50, 50, .8);
-//   border-radius: 33px;
-//   color: white;
-//   left: 50%;
-//   text-align: center;
-//   padding: 6px 12px;
-//   opacity: 0;
-//   z-index: 99999;
-//   transition: transform .25s, opacity .25s, top .25s;
-//   box-sizing: border-box;
-// }
-
-// .native-toast-bottom {
-//   bottom: 50px;
-//   -ms-transform: translateX(-50%) translateY(50px);
-//       transform: translateX(-50%) translateY(50px)
-// }
-
-// .native-toast-bottom.native-toast-shown {
-//   opacity: 1;
-//   -ms-transform: translateX(-50%) translateY(0);
-//       transform: translateX(-50%) translateY(0);
-// }
-
-// .native-toast-bottom.native-toast-edge {
-//   bottom: 0;
-// }
-
-// .native-toast-top {
-//   top: 50px;
-//   -ms-transform: translateX(-50%) translateY(-50px);
-//       transform: translateX(-50%) translateY(-50px)
-// }
-
-// .native-toast-top.native-toast-shown {
-//   opacity: 1;
-//   -ms-transform: translateX(-50%) translateY(0);
-//       transform: translateX(-50%) translateY(0);
-// }
-
-// .native-toast-top.native-toast-edge {
-//   top: 0;
-// }
-
-// .native-toast-center {
-//   top: 0;
-//   -ms-transform: translateX(-50%) translateY(-50px);
-//       transform: translateX(-50%) translateY(-50px)
-// }
-
-// .native-toast-center.native-toast-shown {
-//   opacity: 1;
-//   top: 50%;
-//   -ms-transform: translateX(-50%) translateY(-50%);
-//       transform: translateX(-50%) translateY(-50%);
-// }
-
-// .native-toast-edge {
-//   border-radius: 0;
-//   width: 100%;
-//   text-align: left;
-// }
-
-// @media screen and (min-width: 40rem) {
-//   .native-toast:not(.native-toast-edge) {
-//     max-width: 18rem;
-//   }
-// }
-
-/*
-  max-width does not seem to work in small screen?
-*/
-
-/*@media screen and (max-width: 768px) {
-  .native-toast:not(.native-toast-edge) {
-    max-width: 400px;
-  }
-}
-
-@media screen and (max-width: 468px) {
-  .native-toast:not(.native-toast-edge) {
-    max-width: 300px;
-  }
-}*/
 
 /* types */
 

src/pages/building/list/add/amap.wxss

@@ -0,0 +1,43 @@
+.infoBox {
+  padding: 10px;
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  background-color: white;
+  width: 280px;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, 0.5);
+  z-index: 100;
+}
+.infoBox .inputText {
+  margin-right: 10px;
+}
+.infoBox .input {
+  width: 150px;
+  height: 32px;
+  font-size: 16px;
+}
+/* types */
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px;
+}
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

src/pages/building/list/index.jsx

@@ -104,7 +104,7 @@ function CartBody(props) {
   return (
     <Card
       hoverable
-      style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
+      style={{ minWidth: '330px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
       cover={<img alt="example" src={data.poster} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
       bodyStyle={{ padding: '10px 20px' }}
     >

src/pages/building/list/style.css

@@ -0,0 +1,56 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size: 0.11rem;
+  color: #333;
+  line-height: 1.5;
+  display: flex;
+  align-items: center;
+  position: relative;
+  margin-bottom: 0.08rem;
+}
+.cardItem {
+  font-size: 0.11rem;
+  font-weight: 400;
+  color: #666;
+  display: flex;
+  align-items: center;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
+
+}
+.ediText {
+  font-size: 0.11rem;
+  color: #ff925c;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width: 0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}
+.address {
+  width: 400px;
+  height: 24px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}

src/pages/building/list/style.less

@@ -15,36 +15,39 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 1.1rem;
+  font-size: 0.11rem;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
-
+  margin-bottom: 0.08rem;
+  
 }
 .cardItem{
-  font-size: 1.1rem;
+  font-size: 0.11rem;
   font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;  
+  margin-bottom: 0.08rem;
+  .title{
+    display: inline-block;
+    width: 0.54rem;
+    min-width: 0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
 }
 .ediText {
-  font-size: 1.1rem;
+  font-size: 0.11rem;
   color: #ff925c;
-  line-height: 24px;
   position: absolute;
   right: 0;
+
 }
-.title{
-  display: inline-block;
-  width: 84px;
-  justify-content: space-between;
-  text-align: justify;
-  text-align-last:justify
-}
+
 
 .address { 
   width: 400px;

src/pages/building/list/style.wxss

@@ -0,0 +1,53 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size: 0.11rem;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+  font-size: 0.11rem;
+  font-weight: 400;
+  color: #666;
+  display: flex;
+  align-items: center;
+  margin-bottom: 0.08rem;
+}
+.ediText {
+  font-size: 0.11rem;
+  color: #ff925c;
+  position: absolute;
+  right: 0;
+  margin-bottom: 0.08rem;
+}
+.title {
+  display: inline-block;
+   width: 0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}
+.address {
+  width: 400px;
+  height: 24px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}

src/pages/building/type/style.css

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,15 +24,16 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
-  font-weight: 400;
+
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +41,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width: 0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/building/type/style.less

@@ -16,24 +16,25 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;  
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width: 0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/building/type/style.wxss

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/customerlist/style.css

@@ -19,7 +19,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -27,7 +27,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -35,7 +35,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -43,7 +43,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/customerlist/style.less

@@ -19,24 +19,25 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
-  align-items: center;  
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem; 
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -44,7 +45,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/customerlist/style.wxss

@@ -19,7 +19,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -27,7 +27,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -35,7 +35,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -43,7 +43,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/drift/style.less

@@ -16,24 +16,25 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
-  align-items: center;  
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem; 
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/independentList/style.css

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/independentList/style.less

@@ -16,24 +16,25 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;  
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/independentList/style.wxss

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/recommendCustomer/style.css

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/recommendCustomer/style.less

@@ -16,16 +16,17 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
+  font-size: 0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -33,7 +34,7 @@
   align-items: center;  
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/recommendCustomer/style.wxss

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/report/style.css

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/report/style.less

@@ -16,24 +16,26 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
+
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;  
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +43,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/report/style.wxss

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/news/list/NewsList.jsx

@@ -167,48 +167,48 @@ function body(props) {
         cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '260px', height: '253px' }}></img>}
         bodyStyle={{ padding: '10px 20px' }}
       >
-        <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: '18px', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
+        <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
         </span>
         {data.newsStatus === 0 ?
-          <span style={{ position: 'absolute', left: '280px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+          <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
             取消发布
               <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span> :
-          <span style={{ position: 'absolute', left: '280px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+          <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
             发布
               <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>
         }
 
-        <span style={{ position: 'absolute', right: '20px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
+        <span style={{ position: 'absolute', right: '20px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
           删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
         </span>
         <div style={{ position: 'absolute', left: '260px', top: '0px', padding: '20px' }}>
           <p style={{
-            fontSize: '18px', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
+            fontSize: ' 0.11rem', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
             textOverflow: 'ellipsis',
             whiteSpace: 'nowrap',
             width: '300px',
           }}>{data.newsName}</p>
-          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
             <span style={{ display: 'inline-block', width: '190px' }}>咨询类型：{data.newsType.newsTypeName}</span>
             <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
           </p>
 
-          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
             <span style={{ display: 'inline-block', width: '190px' }}>阅读数量：{data.pvNum}</span>
             <span>转发数量：{data.shareNum}</span>
           </p>
 
-          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
             <span style={{ display: 'inline-block', width: '190px' }}>点赞数量：{data.favorNum}</span>
             <span>收藏数量：{data.saveNum}</span>
           </p>
 
-          <p style={{ fontSize: '18px', color: '#999', marginBottom: '10px' }}>发布时间：{data.createDate}</p>
+          <p style={{ fontSize: ' 0.11rem', color: '#999', marginBottom: '10px' }}>发布时间：{data.createDate}</p>
         </div>
       </Card>
     )

src/pages/news/list/style.less

@@ -16,24 +16,25 @@
     margin: 10px 0px;
   }
   .cardText {
-    font-size: 18px;
     color: #333;
-    line-height: 24px;
     display: flex;
     align-items: center;
     position: relative;
+    line-height: 1.5;
+    font-size: 0.11rem;
+    margin-bottom: 0.08rem;
   
   }
   .cardItem{
-    font-size: 18px;
-    font-weight: 400;
     color: #666;
-    line-height: 24px;
     display: flex;
     align-items: center;  
+    line-height: 1.5;
+    font-size: 0.11rem;
+    margin-bottom: 0.08rem;
   }
   .ediText {
-    font-size: 18px;
+    font-size: 0.11rem;
     color: #ff925c;
     line-height: 24px;
     position: absolute;
@@ -41,7 +42,7 @@
   }
   .title{
     display: inline-block;
-    width: 84px;
+    width:  0.54rem;
     justify-content: space-between;
     text-align: justify;
     text-align-last:justify

src/pages/staff/list/StaffList.jsx

@@ -66,16 +66,16 @@ const CartBody = (props) => {
     <Card className={Styles.card}>
       <div>
 
-        <Avatar src={data.avatar} style={{ width: 94, height: 94 }} />
-        <Button type="link" style={{ marginLeft: '10px', color: '#FF925C', fontSize: '18px' }} onClick={toEditStaff(data.userId)}>
+        <Avatar src={data.avatar} style={{ width: '0.48rem', height: '0.48rem' }} />
+        <Button type="link" style={{ marginLeft: '0.04rem', color: '#FF925C', fontSize: '0.11rem' }} onClick={toEditStaff(data.userId)}>
           编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
         </Button>
-        <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm(data)}>
+        <Button type="link" style={{ fontSize: ' 0.11rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
           {data.status === 1 ? '停用' : '启用'}
-                <Icon type={data.status===1?'close-circle':'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+                <Icon type={data.status===1?'close-circle':'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
         </Button>
-        {/* <Button type="link" style={{ fontSize: '18px', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
+        {/* <Button type="link" style={{ fontSize: ' 0.11rem', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
           启用
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
         </Button> */}

src/pages/staff/list/style.less

@@ -13,44 +13,44 @@
 
 
 .card {
-  min-width: 330px;
-  margin-right: 2vw;
-  height: 244px;
+  min-width: 240px;
+  margin-right: 0.1rem;
+  height: 240px;
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
   margin-bottom: 40px;
   position: relative;
+  
 }
 
-
 .cardText {
-  font-size: 20px;
+  font-size: 0.12rem;
   color: rgba(102, 102, 102, 1);
   position: absolute;
-  bottom:52px;
+  bottom:0.28rem;
 }
 .statusText {
-  font-size: 20px;
+  font-size: 0.12rem;
   color: rgba(102, 102, 102, 1);
   position: absolute;
-  bottom:52px;
+  bottom:0.28rem;
   right: 20px;
 }
 .phoneText{
-  font-size: 20px;
+  font-size: 0.12rem;
   color: rgba(102, 102, 102, 1);
   position: absolute;
-  bottom:16px;
+  bottom:0.05rem;
 }
 
 .cardItem {
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 
 
@@ -66,7 +66,7 @@
 
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/user/login/components/Login/index.jsx

@@ -118,7 +118,7 @@ class Login extends Component {
           <div className={styles.con}>
             <p className={styles.welcome}>Welcome</p>
             <div className={styles.title}>
-              <span style={{fontSize:'18px',lineHeight:'18px'}}>ying xiao yun</span>
+              <span style={{fontSize:' 0.11rem',lineHeight:' 0.11rem'}}>ying xiao yun</span>
               <p className={styles.name}>营销云·系统</p>
             </div>
           </div>

src/pages/user/login/components/Login/index.less

@@ -91,7 +91,7 @@ position: relative;
 
   .prefixIcon {
     color: #fff;
-    font-size: 18px;
+    font-size:  0.11rem;
     background-color: #EF273A;
     padding: 3px 4px;
   }

src/services/apis.js

@@ -101,6 +101,7 @@ export default {
     getList: {
       method: 'GET',
       url: `${prefix}/taNews`,
+      action: '/api/admin/taNews'
     },
   },
   customer: {