init commit to new server

src/components/CardViewTwo.js

@@ -31,7 +31,7 @@ class MyBodyCard extends React.Component{
                   <div key={index}>
                     <Card full onClick={()=>this.pushRoute(item)}>
                       <Card.Header
-                        style={ {padding:"0",color:'#38c5b8',fontSize:"0.9rem"}}
+                        style={ {padding:"0",color:'#38c5b8'}}
                         title={
                           <div style={ {padding:"1.2rem 1.3rem",color:'#38c5b8',width:"100%"}}>
                             <Flex style={{justifyContent:"space-between",alignItems:"flex-start"}}>
@@ -55,7 +55,7 @@ class MyBodyCard extends React.Component{
                         <Flex style={{padding:"0.4rem 0"}}>
                           <Flex.Item><Badge className={styles.mybadgetwo}  style={{background:"none"}} text={
                             <div style={{color:"#333",fontSize:"0.8rem"}}>
-                              <span style={ {paddingRight:"15px"}}>已签约总数</span>
+                              <span style={ {paddingRight:"0.75rem"}}>已签约总数</span>
                               <span >{item.yiQianYueHuShu}</span>
                             </div>
                           }/></Flex.Item>

src/index.css

@@ -3,5 +3,5 @@ html, body, :global(#root) {
   height: 100%;
   padding: 0;
   margin: 0;
+  font-size: 20px
 }
-

src/index.js

@@ -7,8 +7,8 @@ console.log('index.js');
 const app = dva({
   history: createBrowserHistory({
     // eslint-disable-next-line no-undef
-    //basename: 'bm-wx',
-    basename: '/',
+    basename: 'bm-wx',
+    // basename: '/',
   }),
 });
 
@@ -16,10 +16,11 @@ const app = dva({
 // app.use({});
 
 // 3. Model
- app.model(require('./models/login').default);
+app.model(require('./models/login').default);
 app.model(require('./models/Home/home').default);
 app.model(require('./models/middleselect').default);
 app.model(require('./models/Home/search').default);
+app.model(require('./models/Home/base').default);
 // 4. Router
 app.router(require('./router').default);
 

src/models/Home/home.js

@@ -17,25 +17,37 @@ export default {
 
   effects: {
     *getSummaryData({ payload }, { take, put, call, select }) {
-      const payloads = { userName:'admin',password:'admin', type: 'userName', authType: 'password' };
-      try{
-        const result = yield call(login, payloads);
-        console.info(result);
-        const { tokenId } = result;
-        yield call(setToken, tokenId);// 这里的yield ,跟C#中的await一样
-      }
-      catch (erroer) {
-        console.info(erroer);
-      }
-
-
+      // const payloads = { userName:'admin',password:'admin', type: 'userName', authType: 'password' };
+      // try{
+      //   const result = yield call(login, payloads);
+      //   const { tokenId } = result;
+      //   yield call(setToken, tokenId);// 这里的yield ,跟C#中的await一样
+      // }
+      // catch (erroer) {
+      //   console.info(erroer);
+      // }
+      //
+      //
+      // const { pNumber } = payload;
+      // let coordinate;
+      //   coordinate= {
+      //     containerType: 'module',
+      //     containerName: 'QueryJiDiModule',
+      //     datasourceName: 'QueryDistrictName',
+      //   };
+      // try {
+      //   const resultss = yield call(getData, coordinate, { pst: 0, psz: 10 ,params:{pNumber:pNumber}});
+      //   yield put({ type: 'setSummaryData',payload:{resultss} });
+      // }catch (erroer){
+      //   console.info(erroer);
+      // }
+      // 这是以后放到服务器时候用的代码，因为现在要测试，所以要先注释
       const { pNumber } = payload;
-      let coordinate;
-        coordinate= {
-          containerType: 'module',
-          containerName: 'QueryJiDiModule',
-          datasourceName: 'QueryDistrictName',
-        };
+      const coordinate = {
+        containerType: 'module',
+        containerName: 'QueryJiDiModule',
+        datasourceName: 'QueryDistrictName',
+      };
       try {
         const resultss = yield call(getData, coordinate, { pst: 0, psz: 10 ,params:{pNumber:pNumber}});
         console.info('查询的结果');
@@ -44,21 +56,6 @@ export default {
       }catch (erroer){
         console.info(erroer);
       }
-      // 这是以后放到服务器时候用的代码，因为现在要测试，所以要先注释
-      // const { pNumber } = payload;
-      // const coordinate = {
-      //   containerType: 'module',
-      //   containerName: 'QueryJiDiModule',
-      //   datasourceName: 'QueryDistrictName',
-      // };
-      // try {
-      //   const resultss = yield call(getData, coordinate, { pst: 0, psz: 10 ,params:{pNumber:pNumber}});
-      //   console.info('查询的结果');
-      //   console.info(resultss);
-      //   yield put({ type: 'setSummaryData',payload:{resultss} });
-      // }catch (erroer){
-      //   console.info(erroer);
-      // }
 
     },
     *getSummary({ payload }, { take, put, call, select }) {

src/router.js

 import React from 'react';
-import { Router, IndexRoute, Route, Switch } from 'dva/router';
+import { Router, Route, Switch } from 'dva/router';
 import dynamic from 'dva/dynamic';
 import MiddleSelectPage from "./routes/MiddleSelectPage";
 //import SearchPage from "./routes/Home/SearchPage";

src/routes/Home/HomePage.js

@@ -88,8 +88,10 @@ class HomePage extends React.Component{
             }
           ]} onChange={this.onChange}/>
         </span>
-        <MyTopCard data={this.props.home.Summary}/>
-        <MyBodyCard data={this.props.home.SummaryData}/>
+        <div>
+          <MyTopCard data={this.props.home.Summary}/>
+          <MyBodyCard data={this.props.home.SummaryData}/>
+        </div>
       </Page>
     );
   };

src/routes/IndexPage.css

-
 .styleDiv {
   width: 100%;
   height: 70px;
   line-Height: 70px;
 }
 .styleImg  {
-  margin-Left: 10px;
-  margin-Right: 10px;
+  margin-Left: 0.5rem;
+  margin-Right: 0.5rem;
 }
 table.mytable {
   width: 100%;
@@ -31,7 +30,6 @@ span.myspan{
   background-color: #38c5b8;
   margin:0px;
   z-index:1;
-  font-size: 0.75rem;
 }
 select {
   /*Chrome和Firefox里面的边框是不一样的，所以复写了一下*/
@@ -43,9 +41,9 @@ select {
   /*在选择框的最右侧中间显示小箭头图片*/
   background: url(../assets/downselect.png) no-repeat scroll right center transparent;
   /*为下拉小箭头留出一点位置，避免被文字覆盖*/
-  padding-right: 20px;
+  padding-right: 1rem;
   direction: rtl;
-
+  font-size: 0.8rem !important;
 }
 select option {
   direction: ltr;
@@ -66,11 +64,11 @@ select::-ms-expand { display: none; }
 .header {
   border-bottom:1px solid #e4e4e4;
   padding: 0px;
-  font-size: 14px;
+  font-size: 0.7rem;
 }
 .body p {
   margin-left:
-    5px;
+    0.25rem;
 }
 .myBadge{
   background-color:#caf6f0 ;
@@ -120,21 +118,21 @@ select::-ms-expand { display: none; }
 }
 .accountIcon{
   display: inline-block;
-  width: 25px;
+  width: 1.25rem;
   height: 25px;
   vertical-align: middle;
-  margin-left: 8px;
-  margin-right: 13px;
+  margin-left: 0.4rem;
+  margin-right: 0.65rem;
   background: url(../assets/account.png) no-repeat 0 0;
   background-size: cover;
 }
 .passwordIcon{
   display: inline-block;
-  width: 25px;
+  width: 1.25rem;
   height: 25px;
   vertical-align: middle;
-  margin-left: 8px;
-  margin-right: 13px;
+  margin-left: 0.4rem;
+  margin-right: 0.65rem;
   background: url(../assets/password.png) no-repeat 0 0;
   background-size: cover;
 }

src/routes/IndexPage.js

-import React, { Component } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'dva';
 import {

src/routes/MiddleSelectPage.js

@@ -17,7 +17,7 @@ class MiddleSelectPage extends React.Component{
     return (
       <div style={{paddingTop:"100px",textAlign:"center"}}>
         {myImg(logo)}
-        <h3>欢迎进入上海征地房屋补偿公众号</h3>
+        <h4>欢迎进入上海征地房屋补偿公众号</h4>
       </div>
     );
   }

src/utils/error.js

-import React from 'react';
+// import React from 'react';
 import { push } from '../services/route';
 import { errors as errorCodes } from './config';
 
-const errStyle = {
-  overflow: 'auto',
-  wordWrap: 'break-word',
-  width: '360px',
-  height: '360px',
-  marginLeft: '-24px',
-  marginTop: '24px',
-};
+// const errStyle = {
+//   overflow: 'auto',
+//   wordWrap: 'break-word',
+//   width: '360px',
+//   height: '360px',
+//   marginLeft: '-24px',
+//   marginTop: '24px',
+// };
 
 export function processError(err) {
   if (err) {