dgf 8 gadi atpakaļ
vecāks
revīzija
99d3a670cc

+ 2 - 5
talkview/src/js/controller/smsController.js

@@ -3,7 +3,7 @@
 angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$filter', function($scope, $state, $filter) {
 
     //lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
-    $scope.now = new Date(); //控制器中使用 
+    $scope.now = new Date();
     $scope.nowDate = $filter("date")($scope.now, "yyyy/MM/dd HH:mm:ss");
     $scope.selectDate = $scope.nowDate;
     $scope.checkId = false;
@@ -23,12 +23,11 @@ angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$
     $scope.activeClick = function($event) {
         var activeClick = $($event.target.firstElementChild);
         $scope.activeData = $event.target.innerText;
-        console.log($scope.activeData);
         angular.element(".active").addClass("hid");
         activeClick.removeClass("hid");
     };
 
-    $scope.enKeyup = function(e) {
+    $scope.sendKeyup = function(e) {
         var sendmsg = $(e.target);
         var mediamsg = $(e.target.parentElement.previousElementSibling);
         var msg = _.trim(sendmsg[0].textContent);
@@ -96,7 +95,6 @@ angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$
         var dateTime = $filter("date")(myDate.getTime(), "HH:mm:ss");
         var ts1 = (new Date(nowDate)).getTime();
         var ts2 = (new Date($scope.selectDate)).getTime();
-        console.log(ts1, ts2);
         if ($scope.inputMob == undefined)
             alert("请输入手机号码");
         else if (!$scope.checkId)
@@ -136,7 +134,6 @@ angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$
         if ($scope.inputMob) {
             if ($scope.inputMob instanceof Array)
                 $scope.inputMob = $scope.inputMob.join(",");
-            console.log($scope.inputMob);
             $scope.inputMob = $scope.inputMob.match(/\d{11}/ig);
         }
     };

+ 1 - 1
talkview/src/js/router.js

@@ -7,7 +7,7 @@ angular.module('appMessage').run(['$rootScope', '$state', '$stateParams',
     function($stateProvider, $urlRouterProvider, $compileProvider) {
         $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|local):/);
         $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|local):/);
-        $urlRouterProvider.otherwise('/smsSend'); //
+        $urlRouterProvider.otherwise('/messages'); //
         $stateProvider.state('messages', {
                 url: '/messages',
                 templateUrl: 'templates/messages.html',

+ 4 - 15
talkview/src/less/app.main.less

@@ -61,6 +61,7 @@
             margin-left: 10px;
             margin-top: 1px;
             span {
+                font-weight: normal;
                 color: #888;
                 font-size: 10px;
                 margin-left: 0px;
@@ -69,17 +70,16 @@
     }
     p>span {
         margin-top: 1px;
-        /*float: left;*/
         margin-left: 5px;
         color: #007FE0;
         >span {
+            font-weight: 600;
             margin: 0px 7px 0px 3px;
         }
     }
 }
 
 .user-head {
-    position: relative;
     cursor:pointer;
     width: 40px;
     height: 40px;
@@ -263,18 +263,6 @@
         color: #4EA9E9;
     }
 }
-//
-[scroll-glue-top],
-[scroll-glue-bottom],
-[scroll-glue]{
-    overflow-y: scroll;
-    height: 200px;
-}
-
-[scroll-glue-left],
-[scroll-glue-right]{
-    overflow-x: scroll;
-}
 
 .f-transmitters{
     position: relative;
@@ -340,7 +328,6 @@ body {
     margin: auto;
     overflow: hidden;
     text-align: center;
-    position: relative;//
     #userHead {
         height: 75px;
         background: #96CEDF;/* Opera 11.1 - 12.0 */
@@ -742,6 +729,8 @@ body {
                 }
             }
             .dropdown-menu{
+                top: -35px;
+                left: -295px;
                 span {
                     float: left;
                     margin: 2px 10px 0px -10px;

+ 3 - 3
talkview/src/templates/smsSend.html

@@ -32,7 +32,7 @@
                 <p><span class="glyphicon glyphicon-menu-right"><span>短信群发</span>16:28:40</span><span class="glyphicon glyphicon-ok"></span>
                 </p>
                 <div class="well m-l-xs m-t-xs fit-content">
-                    <span class="text-message">手动建开发技术的发是打发是否阿萨德发按时大家阿萨德发 圣诞节法律考试及地方akjsdklfajs 按时大奖是离开的房间阿萨德发是对方可爱上了对方快递费阿斯顿发阿萨德发啊阿萨德f</span>
+                    <span class="text-message">文字消息</span>
                 </div>
             </div>
         </div>-->
@@ -41,13 +41,13 @@
                 <p><span class="glyphicon glyphicon-menu-right"><span>15906422850</span>16:28:50</span><span class="glyphicon glyphicon-remove"></span>
                 </p>
                 <div class="well m-l-xs m-t-xs fit-content">
-                    <span class="text-message">手动建开发技术的发是打发是否阿萨德发按时大家阿萨德发 圣诞节法律考试及地方akjsdklfajs 按时大奖是离开的房间阿萨德发是对方可爱上了对方快递费阿斯顿发阿萨德发啊阿萨德f</span>
+                    <span class="text-message">文字消息</span>
                 </div>
             </div>
         </div>-->
     </div>
     <div id="sms-inbox">
-        <div id="sms-input" contenteditable="plaintext-only" ng-keyup="enKeyup($event)"></div>
+        <div id="sms-input" contenteditable="plaintext-only" ng-keyup="sendKeyup($event)"></div>
         <div id="sms-button">
             <button type="button" class="btn btn-success" ng-click="sendMsg($event)">发送</button>
             <div class="btn-group">