Home Explore Help
Register Sign In
usoft
/
uas-office-integration
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev' of ssh://10.10.100.21/source/uas-office-integration into dev

 Conflicts:
	uas-office-web/uas-mobile/public/index.html
RaoMeng 5 years ago
parent
2a5d06b62f f74e9daca4
commit
7661a97b2a
7 changed files with 109 additions and 31 deletions
Unified View Show Diff Stats
  1. 11 6
      uas-office-web/uas-mobile/public/index.html
  2. 42 0
      uas-office-web/uas-mobile/src/components/common/map/Map.jsx
  3. 10 0
      uas-office-web/uas-mobile/src/components/common/map/map.less
  4. 3 3
      uas-office-web/uas-mobile/src/components/private/profile/ProfileList.jsx
  5. 1 1
      uas-office-web/uas-mobile/src/configs/router.config.js
  6. 19 9
      uas-office-web/uas-mobile/src/pages/private/mine/ContactInfo.jsx
  7. 23 12
      uas-office-web/uas-mobile/src/pages/private/mine/contact-info.less

+ 11 - 6
uas-office-web/uas-mobile/public/index.html
View File 

@@ -26,18 +26,23 @@
 
     -->
 
     -->
 
     <title>UAS系统</title>
 
     <title>UAS系统</title>
 
 </head>
 
 </head>
 
+
 
 <body>
 
 <body>
 
 <noscript>You need to enable JavaScript to run this app.</noscript>
 
 <noscript>You need to enable JavaScript to run this app.</noscript>
 
+<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=T1GtvYvfay3OYbSauKyRSYZCGE31mnXv"></script>
 
+
 
 <div id="root" style="width: 100%;height: 100%;"></div>
 
 <div id="root" style="width: 100%;height: 100%;"></div>
 
+
 
 <!--
 
 <!--
 
-  This HTML file is a template.
 
-  If you open it directly in the browser, you will see an empty page.
 
+This HTML file is a template.
 
+If you open it directly in the browser, you will see an empty page.
 
 
 
-  You can add webfonts, meta tags, or analytics to this file.
 
-  The build step will place the bundled scripts into the <body> tag.
 
+You can add webfonts, meta tags, or analytics to this file.
 
+The build step will place the bundled scripts into the <body> tag.
 
 
 
-  To begin the development, run `npm start` or `yarn start`.
 
-  To create a production bundle, use `npm run build` or `yarn build`.
 
+To begin the development, run `npm start` or `yarn start`.
 
+To create a production bundle, use `npm run build` or `yarn build`.
 
 -->
 
 -->
 
 </body>
 
 </body>
 
+
 
 </html>
 
 </html>

+ 42 - 0
uas-office-web/uas-mobile/src/components/common/map/Map.jsx
View File 

@@ -0,0 +1,42 @@
 
+/**
 
+ * Created by hujs on 2020/11/31
 
+ * Desc: 百度地图
 
+ */
 
+
 
+import React, { Component } from 'react'
 
+import './map.less'
 
+
 
+export default class Map extends Component {
 
+
 
+  constructor () {
 
+    super()
 
+
 
+    this.state = {}
 
+  }
 
+
 
+  componentDidMount () {
 
+    const { BMap } = window
 
+    var map = new BMap.Map('mymap') // 创建Map实例
 
+    var point = new BMap.Point(113.887564, 22.554923)
 
+    map.centerAndZoom(point, 18) // 初始化地图,设置中心点坐标和地图级别
 
+    map.setCurrentCity('深圳') // 设置地图显示的城市
 
+    map.enableScrollWheelZoom(true) //开启鼠标滚轮缩放
 
+    var marker = new BMap.Marker(point)        // 创建标注
 
+    map.addOverlay(marker)  //标点
 
+
 
+  }
 
+
 
+  componentWillUnmount () {
 
+
 
+  }
 
+
 
+  render () {
 
+
 
+    return (
 
+      <div className="map-box">
 
+        <div className="map-content" id="mymap"></div>
 
+      </div>
 
+    )
 
+  }
 
+
 
+}

+ 10 - 0
uas-office-web/uas-mobile/src/components/common/map/map.less
View File 

@@ -0,0 +1,10 @@
 
+.map-box {
 
+  padding: 10px 24px 24px 24px;
 
+  background: #fff;
 
+  margin-bottom: 10px;
 
+
 
+  .map-content {
 
+    width: 100%;
 
+    height: 30vh;
 
+  }
 
+}

+ 3 - 3
uas-office-web/uas-mobile/src/components/private/profile/ProfileList.jsx
View File 

@@ -31,9 +31,9 @@ class ProfileList extends Component {
 
     return (
 
     return (
 
       <div className="mine-setting">
 
       <div className="mine-setting">
 
         <Item arrow="horizontal" extra={accountName} onClick={this.changeAccount}>切换账套</Item>
 
         <Item arrow="horizontal" extra={accountName} onClick={this.changeAccount}>切换账套</Item>
 
-        <Item arrow="horizontal">清除缓存</Item>
 
+        {/* <Item arrow="horizontal">清除缓存</Item> */}
 
         <Item arrow="horizontal" onClick={this.userFeedback}>用户反馈</Item>
 
         <Item arrow="horizontal" onClick={this.userFeedback}>用户反馈</Item>
 
-        <Item arrow="horizontal" onClick={this.contactInfo}>联系我们</Item>
 
+        <Item arrow="horizontal" onClick={this.contactInfo}>关于我们</Item>
 
       </div>
 
       </div>
 
     )
 
     )
 
   }
 
   }
 
@@ -46,7 +46,7 @@ class ProfileList extends Component {
 
   userFeedback = () => {
 
   userFeedback = () => {
 
     this.props.history.push('/userFeedback')
 
     this.props.history.push('/userFeedback')
 
   }
 
   }
 
-  //联系我们
 
+  //关于我们
 
   contactInfo = () => {
 
   contactInfo = () => {
 
     this.props.history.push('/contactInfo')
 
     this.props.history.push('/contactInfo')
 
   }
 
   }

+ 1 - 1
uas-office-web/uas-mobile/src/configs/router.config.js
View File 

@@ -179,7 +179,7 @@ class Routes extends React.Component {
 
           {/*************************************我的信息*****************************************/}

           {/*************************************我的信息*****************************************/}

           {/*切换账套列表*/}

           {/*切换账套列表*/}

           <Route path='/changeAccount' component={ChangeAccount}/>

           <Route path='/changeAccount' component={ChangeAccount}/>

-          {/* 联系我们 */}

+          {/* 关于我们 */}

           <Route path='/contactInfo' component={ContactInfo}/>

           <Route path='/contactInfo' component={ContactInfo}/>

           {/* 用户反馈 */}

           {/* 用户反馈 */}

           <Route path='/userFeedback' component={UserFeedback}/>

           <Route path='/userFeedback' component={UserFeedback}/>

+ 19 - 9
uas-office-web/uas-mobile/src/pages/private/mine/ContactInfo.jsx
View File 

@@ -1,11 +1,12 @@
 
 /**
 
 /**
 
  * Created by Hujs on 2020/12/25
 
  * Created by Hujs on 2020/12/25
 
- * Desc: 联系我们
 
+ * Desc: 关于我们
 
  */
 
  */
 
 
 
 import React, { Component } from 'react'
 
 import React, { Component } from 'react'
 
 import { connect } from 'react-redux'
 
 import { connect } from 'react-redux'
 
 import { Toast, List, Modal } from 'antd-mobile'
 
 import { Toast, List, Modal } from 'antd-mobile'
 
+import Map from '../../../components/common/map/Map'
 
 import './contact-info.less'
 
 import './contact-info.less'
 
 
 
 class ContactInfo extends Component {
 
 class ContactInfo extends Component {
 
@@ -36,15 +37,24 @@ class ContactInfo extends Component {
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
         <div className="info-content-box">
 
         <div className="info-content-box">
 
-          <p className="title">电话</p>
 
-          <p className="detail">400-830-1818</p>
 
-          <p className="title">Email</p>
 
-          <p className="detail">info@usoftchina.com</p>
 
-          <p className="title">优软科技官网</p>
 
-          <p className="detail">https://uas.usoftchina.com/</p>
 
-          <p className="title">地址</p>
 
-          <p className="detail">深圳市宝安区新安街道海旺社区宝兴路6号海纳百川总部大厦B座6、7楼</p>
 
+          <div className="content-item">
 
+            <div className="title">电话</div>
 
+            <div className="detail">400-830-1818</div>
 
+          </div>
 
+          <div className="content-item">
 
+            <div className="title">Email</div>
 
+            <div className="detail">info@usoftchina.com</div>
 
+          </div>
 
+          <div className="content-item">
 
+            <div className="title">官网</div>
 
+            <div className="detail"><a target="_blank" href="http://www.ubtob.net">http://www.ubtob.net</a></div>
 
+          </div>
 
+          <div className="content-item">
 
+            <div className="title">地址</div>
 
+            <div className="detail">深圳市宝安区新安街道海旺社区宝兴路6号海纳百川总部大厦B座6、7楼</div>
 
+          </div>
 
         </div>
 
         </div>
 
+        <Map/>
 
       </div>
 
       </div>
 
     )
 
     )
 
   }
 
   }

+ 23 - 12
uas-office-web/uas-mobile/src/pages/private/mine/contact-info.less
View File 

@@ -18,9 +18,8 @@
 
 
 
     .header-logo {
 
     .header-logo {
 
       width: 100%;
 
       width: 100%;
 
-      padding: 55px;
 
-      padding-bottom: 8px;
 
-      margin-bottom: 20px;
 
+      padding:40px 55px 8px 55px;
 
+      margin-bottom: 30px;
 
 
 
       img {
 
       img {
 
         width: 100%;
 
         width: 100%;
 
@@ -29,6 +28,7 @@
 
 
 
     .header-content {
 
     .header-content {
 
       padding: 0px 14px;
 
       padding: 0px 14px;
 
+      line-height: 22px;
 
     }
 
     }
 
   }
 
   }
 
 
 
@@ -36,15 +36,26 @@
 
     background: #fff;
 
     background: #fff;
 
     padding: 10px 30px;
 
     padding: 10px 30px;
 
     color: #333333;
 
     color: #333333;
 
-
 
-    .title {
 
-      color: #81cdff;
 
-      font-size: 14px;
 
-      line-height: 36px;
 
-    }
 
-
 
-    .detail {
 
-      margin-bottom: 10px;
 
+    .content-item{
 
+      display:flex;
 
+      margin-bottom:10px;
 
+      .title{
 
+        color: black;
 
+        font-size: 14px;
 
+        width:50px;
 
+      }
 
+      .detail{
 
+        flex:1;
 
+      }
 
     }
 
     }
 
+    // .title {
 
+    //   color: #81cdff;
 
+    //   font-size: 14px;
 
+    //   line-height: 36px;
 
+    // }
 
+
 
+    // .detail {
 
+    //   margin-bottom: 10px;
 
+    // }
 
   }
 
   }
 
 }
 
 }