首页 发现 帮助
登录
lqq
/
LxtalkUIView
关注 2
点赞 1
派生 1
文件 工单管理 0 合并请求 0 Wiki
浏览代码

微信界面

dgf 8 年之前
父节点
84680bfdb8
当前提交
2a9a3980ba
共有 6 个文件被更改，包括 56 次插入 和 12 次删除
分列视图 显示文件统计
  1. 1 1
      dist/web12345-new/app-11bb216eba.css
  2. 9 4
      dist/web12345-new/app-afdc89afce.js
  3. 2 2
      dist/web12345-new/index.html
  4. 8 3
      web12345-new/src/js/directive/webChat.js
  5. 29 1
      web12345-new/src/less/app.main.less
  6. 7 1
      web12345-new/src/templates/webChat-5.html

文件差异内容过多而无法显示
+ 1 - 1
dist/web12345-new/app-11bb216eba.css


文件差异内容过多而无法显示
+ 9 - 4
dist/web12345-new/app-afdc89afce.js


+ 2 - 2
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-11bb216eba.css">
 
+    <link rel="stylesheet" href="app-2a5025f567.css">
 
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
 
     <!--<script src="js/jquery.min.js"></script>-->
 
@@ -23,7 +23,7 @@
 
     <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-afdc89afce.js"></script>
 
+    <script src="app-b44c783d28.js"></script>
 
 </head>
 
 
 <body ng-app="app">

+ 8 - 3
web12345-new/src/js/directive/webChat.js
查看文件 

@@ -53,7 +53,9 @@
 
                     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);
 
+                            $("#result")[0][0].innerHTML = result.regeocode.formattedAddress.substring(6);
 
+                            $("#result")[0][1].innerHTML = result.regeocode.pois[0].name;
 
+                            $("#result")[0][2].innerHTML = result.regeocode.pois[1].name;
 
                         }
 
                     });
 
                     var marker = new AMap.Marker({
 
@@ -64,9 +66,12 @@
 
                         marker.setPosition(e.lnglat);
 
                         geocoder.getAddress(e.lnglat, function(status, result) {
 
                             if (status == 'complete' && result.info === 'OK') {
 
-                                console.log(result);
 
+                                console.log($("#result"));
 
                                 //var sub = result.regeocode.formattedAddress.indexOf(result.regeocode.aois[0].name)
 
-                                document.getElementById('result').innerHTML = result.regeocode.formattedAddress.substring(6);
 
+                                $("#result")[0][0].innerHTML = result.regeocode.formattedAddress.substring(6);
 
+                                $("#result")[0][1].innerHTML = result.regeocode.pois[0].name;
 
+                                $("#result")[0][2].innerHTML = result.regeocode.pois[1].name;
 
+                                $("#result")[0].selectedIndex = 0;
 
                             }
 
                         })
 
                     });

+ 29 - 1
web12345-new/src/less/app.main.less
查看文件 

@@ -214,7 +214,7 @@ content {
 
             width: 100%;
 
             height: 185px;
 
             float: right;
 
-            margin-top: 5px;
 
+            margin-top: 2px;
 
             padding: 2px 5px;
 
             background-color: #FFF;
 
             color: #444;
 
@@ -225,6 +225,27 @@ content {
 
                 border: 1px solid #5bc0de;
 
             }
 
         }
 
+        #result {
 
+            float: left;
 
+            width: 102%;
 
+            padding: 2px 0px; 
+            border: none;
 
+            outline: none;
 
+            box-shadow: none;
 
+            border-radius: 0px;
 
+            color: #000;
 
+        }
 
+        .cover-white {
 
+            height:20px;
 
+            width:20px;
 
+            font-size: 14px;
 
+            background-color: #FFF;
 
+            color: #3FA1E6;
 
+            float: right;
 
+            padding: 3px 3px 0px 0px;
 
+            margin-top: -22px;
 
+            margin-right: -2%;
 
+        }
 
         .image {
 
             #imgpreview {
 
                 float: right;
 
@@ -326,7 +347,14 @@ content {
 
                     color: #999;
 
                 }
 
             }
 
+
 
             >.modal-info {
 
+                &.ng-hide {
 
+                    opacity: 0;
 
+                }
 
+                opacity: 1;
 
+                transition: all linear 0.1s;
 
+                -webkit-transition: all linear 0.1s;
 
                 position: absolute;
 
                 top: 180px;
 
                 width: 80%;

+ 7 - 1
web12345-new/src/templates/webChat-5.html
查看文件 

@@ -18,7 +18,13 @@
 
             <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><span id="result" style="white-space:normal;"></span>
 
+        <div><span>所在位置：</span>
 
+            <select id="result" class="form-control input-sm">
 
+                <option></option>
 
+                <option></option>
 
+                <option></option>
 
+            </select>
 
+            <div class="glyphicon glyphicon-map-marker cover-white"></div>
 
             <div class="text-map">
 
                 <gaode-map options="mapOptions" style="height:180px"></gaode-map>
 
             </div>