소스 검색

微信界面

dgf 8 년 전
부모
커밋
84680bfdb8

BIN
dist/img/webChatImg.rar


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
dist/web12345-new/app-7089874f44.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 30 - 37
dist/web12345-new/app-89e2222c58.js


+ 3 - 3
dist/web12345-new/index.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
     <link rel="stylesheet" href="../bower_components/swiper/dist/css/swiper.min.css">
-    <link rel="stylesheet" href="app-7089874f44.css">
+    <link rel="stylesheet" href="app-11bb216eba.css">
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
     <!--<script src="js/jquery.min.js"></script>-->
@@ -18,12 +18,12 @@
     <script src="../bower_components/jquery/dist/jquery.min.js"></script>
     <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="../bower_components/swiper/dist/js/swiper.jquery.min.js"></script>
-    <script src="../bower_components/angular/angular.js"></script>
+    <script src="../bower_components/angular/angular.min.js"></script>
     <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
     <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
     <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
 
-    <script src="app-89e2222c58.js"></script>
+    <script src="app-afdc89afce.js"></script>
 </head>
 
 <body ng-app="app">

BIN
web12345-new.rar


+ 1 - 1
web12345-new/src/html/index.html

@@ -18,7 +18,7 @@
     <script src="../bower_components/jquery/dist/jquery.min.js"></script>
     <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="../bower_components/swiper/dist/js/swiper.jquery.min.js"></script>
-    <script src="../bower_components/angular/angular.js"></script>
+    <script src="../bower_components/angular/angular.min.js"></script>
     <script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
     <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
     <script src="../bower_components/angular-animate/angular-animate.min.js"></script>

+ 0 - 4
web12345-new/src/js/controller/webController.js

@@ -60,10 +60,6 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
         };
     };
 
-    $scope.delImg = function() {
-        $scope.sure = true;
-    };
-
     $scope.actived = function($event) {
         var activeClick = $($event.target);
         if (activeClick[0].nodeName == "A") {

+ 29 - 32
web12345-new/src/js/directive/webChat.js

@@ -24,7 +24,6 @@
             map = new AMap.Map('container', {
                 resizeEnable: true,
                 zoom: 17
-
             });
             map.plugin('AMap.Geolocation', function() {
                 geolocation = new AMap.Geolocation({
@@ -43,42 +42,40 @@
                 });
                 map.addControl(geolocation);
                 geolocation.getCurrentPosition();
+                AMap.event.addListener(geolocation, 'complete', onComplete); //返回定位信息
+                AMap.event.addListener(geolocation, 'error', onError); //返回定位出错信息
 
-                // AMap.event.addListener(geolocation, 'complete', function(ret) {
-                //     console.log(ret.message);
-                // }); //返回定位信息
-                // AMap.event.addListener(geolocation, 'error', function(ret) {
-                //     console.log(ret.message);
-                // }); //返回定位出错信息
-
-                // marker = new AMap.Marker({
-                //     map: map,
-                //     bubble: true,
-                //     content: '<div class="marker-route marker-marker-bus-from"></div>' //自定义点标记覆盖物内容,
-                // });
+                function onComplete(data) {
+                    var geocoder = new AMap.Geocoder({
+                        radius: 1000,
+                        extensions: "all"
+                    });
+                    geocoder.getAddress(data.position, function(status, result) {
+                        if (status == 'complete' && result.info === 'OK') {
+                            console.log(result);
+                            document.getElementById('result').innerHTML = result.regeocode.formattedAddress.substring(6);
+                        }
+                    });
+                    var marker = new AMap.Marker({
+                        map: map,
+                        bubble: true,
+                    });
+                    map.on('click', function(e) {
+                        marker.setPosition(e.lnglat);
+                        geocoder.getAddress(e.lnglat, function(status, result) {
+                            if (status == 'complete' && result.info === 'OK') {
+                                console.log(result);
+                                //var sub = result.regeocode.formattedAddress.indexOf(result.regeocode.aois[0].name)
+                                document.getElementById('result').innerHTML = result.regeocode.formattedAddress.substring(6);
+                            }
+                        })
+                    });
+                }
 
-                // marker.setLabel({
-                //     offset: new AMap.Pixel(20, 0),
-                //     content: "我在这里"
-                // });
-                // //geocoder = new AMap.Geocoder({});
-                // map.on('click', function(e) {
-                //     marker.setPosition(e.lnglat);
-                //     geocoder.getAddress(e.lnglat, function(status, result) {
-                //         if (status == 'complete') {
-                //             document.getElementById('input').value = result.regeocode.formattedAddress
-                //         }
-                //     });
-                // });
+                function onError(data) {}
 
             });
 
-            // $scope.$watch("options", function(newValue, oldValue) {
-            //     if ($scope.options) {
-            //         map.setCenter([$scope.options.lng, $scope.options.lat]);
-            //         marker.setPosition([$scope.options.lng, $scope.options.lat]);
-            //     }
-            // }, true);
         }
     }
 })();

+ 5 - 5
web12345-new/src/less/app.main.less

@@ -39,7 +39,7 @@ content {
     font-size: 15px;
     color: #FFF;
     text-align: center;
-    background-color: #048FD2;
+    background-color: #3FA1E6;
     .glyphicon-arrow-left {
         float: left;
         margin-left: 10px;
@@ -212,9 +212,9 @@ content {
         .text-map {
             z-index: -99;
             width: 100%;
-            height: 155px;
+            height: 185px;
             float: right;
-            margin-top: 3px;
+            margin-top: 5px;
             padding: 2px 5px;
             background-color: #FFF;
             color: #444;
@@ -367,7 +367,7 @@ content {
                 font-size: 16px;
                 font-weight: 600;
                 border-radius: 20px;
-                background-color: #048FD2;
+                background-color: #3FA1E6;
                 border: 1px solid #ccc;
                 color: #FFF;
                 &:hover,&:focus {
@@ -421,7 +421,7 @@ content {
 }*/
 
 #container {
-    height: 150px;
+    height: 180px;
 }
 
 .amap-geolocation-con {

+ 3 - 4
web12345-new/src/templates/webChat-5.html

@@ -18,17 +18,16 @@
             <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-open"></span></button>
             <input id="file" type="file" name="file" multiple="multiple" onchange='angular.element(this).scope().imgPreview(this)' />
         </div>
-        <div><span>所在位置:</span>
-            <div style="height:25px"></div>
+        <div><span>所在位置:</span><span id="result" style="white-space:normal;"></span>
             <div class="text-map">
-                <gaode-map options="mapOptions" style="height:150px"></gaode-map>
+                <gaode-map options="mapOptions" style="height:180px"></gaode-map>
             </div>
         </div>
         <div class="button-bottom">
             <button type="button" class="btn btn-default" ng-click="pageChange()">提交</button>
         </div>
         <div class="modal fade viewModal" id="viewModal" tabindex="-2" data-backdrop="static" role="dialog" aria-labelledby="viewModalLabel" aria-hidden="true">
-            <button type="button" class="close" aria-hidden="true" ng-click="delImg()"><span class="glyphicon glyphicon-trash"></span></button>
+            <button type="button" class="close" aria-hidden="true" ng-click="sure=true"><span class="glyphicon glyphicon-trash"></span></button>
             <a class="thumbnail image-view"></a>
             <div class="modal-info" ng-show="sure">
                 <p>确定删除?</p>