短信界面

groupsSms/temp/manifest/app-js-manifest.json

@@ -1,3 +1,3 @@
 {
-  "app.js": "app-2f14ba2a0e.js"
+  "app.js": "app-79e82a0f31.js"
 }

talkview/src/js/controller/smsController.js

@@ -31,38 +31,94 @@ angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$
     $scope.enKeyup = function(e) {
         var sendmsg = $(e.target);
         var mediamsg = $(e.target.parentElement.previousElementSibling);
+        var msg = _.trim(sendmsg[0].textContent);
+        msg = msg.replace(/ /g, "&nbsp");
+        var myDate = new Date();
+        var nowDate = $filter("date")(myDate.getTime(), "yyyy/MM/dd HH:mm:ss");
+        var dateTime = $filter("date")(myDate.getTime(), "HH:mm:ss");
+        var ts1 = (new Date(nowDate)).getTime();
+        var ts2 = (new Date($scope.selectDate)).getTime();
         var keycode = window.event ? e.keyCode : e.which;
-        var len = _.trim(sendmsg[0].textContent).length;
         console.log(sendmsg);
-        var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>15906422850</span>16:28:50</span><span class="glyphicon glyphicon-ok"></span></p>' +
-            '<div class = "well m-l-xs m-t-xs fit-content" >' +
-            '<span class = "text-message">' + sendmsg[0].textContent + '</span> </div></div></div>';
-        if (len !== 0 && $scope.activeData == '按Enter键发送消息') {
-            if (!e.ctrlKey && keycode == 13) {
-                mediamsg.append(html);
-                sendmsg[0].textContent = "";
-            } else if (e.ctrlKey && e.which == 13)
-                sendmsg.append('\r\n');
-        } else if (len !== 0 && $scope.activeData == '按Ctrl+Enter键发送消息') {
-            if (e.ctrlKey && e.which == 13) {
-                mediamsg.append(html);
-                sendmsg[0].textContent = "";
-            }
+        console.log(keycode);
+        console.log($scope.inputMob);
+        if ($scope.inputMob) {
+            if (!$scope.checkId)
+                for (var i = 0; i < $scope.inputMob.length; i++) {
+                    var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-ok"></span></p>' +
+                        '<div class = "well m-l-xs m-t-xs fit-content" >' +
+                        '<span class = "text-message">' + msg + '</span> </div></div></div>';
+                    if (msg.length !== 0 && $scope.activeData == '按Enter键发送消息') {
+                        if (!e.ctrlKey && e.which == 13) {
+                            mediamsg.append(html);
+                            sendmsg[0].textContent = "";
+                        } else if (e.ctrlKey && e.which == 13) {
+                            sendmsg.append('<br>');
+                            e.keyCode = 13;
+                        }
+                    } else if (msg.length !== 0 && $scope.activeData == '按Ctrl+Enter键发送消息') {
+                        if (e.ctrlKey && e.which == 13) {
+                            mediamsg.append(html);
+                            sendmsg[0].textContent = "";
+                        }
+                    }
+                }
+            else if ($scope.checkId && ts2 > ts1)
+                for (var i = 0; i < $scope.inputMob.length; i++) {
+                    var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-time"><span>(定时于' + $scope.selectDate + '发送)</span></span></p>' +
+                        '<div class = "well m-l-xs m-t-xs fit-content" >' +
+                        '<span class = "text-message">' + msg + '</span> </div></div></div>';
+                    if (msg.length !== 0 && $scope.activeData == '按Enter键发送消息') {
+                        if (!e.ctrlKey && e.which == 13) {
+                            mediamsg.append(html);
+                            sendmsg[0].textContent = "";
+                        } else if (e.ctrlKey && e.which == 13) {
+                            sendmsg.append('<br>');
+                            e.keyCode = 13;
+                        }
+                    } else if (msg.length !== 0 && $scope.activeData == '按Ctrl+Enter键发送消息') {
+                        if (e.ctrlKey && e.which == 13) {
+                            mediamsg.append(html);
+                            sendmsg[0].textContent = "";
+                        }
+                    }
+                }
         }
     };
 
     $scope.sendMsg = function($event) {
         var sendmsg = $($event.target.parentElement.previousElementSibling);
         var mediamsg = $($event.target.parentElement.previousElementSibling.parentElement.previousElementSibling);
-        var len = _.trim(sendmsg[0].textContent).length;
-        console.log(sendmsg);
-        var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>15906422850</span>16:28:50</span><span class="glyphicon glyphicon-ok"></span></p>' +
-            '<div class = "well m-l-xs m-t-xs fit-content" >' +
-            '<span class = "text-message">' + sendmsg[0].textContent + '</span> </div></div></div>';
-        if (len !== 0) {
-            mediamsg.append(html);
-            sendmsg[0].textContent = "";
-        }
+        var msg = _.trim(sendmsg[0].textContent);
+        msg = msg.replace(/ /g, "&nbsp");
+        var myDate = new Date();
+        var nowDate = $filter("date")(myDate.getTime(), "yyyy/MM/dd HH:mm:ss");
+        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)
+            for (var i = 0; i < $scope.inputMob.length; i++) {
+                var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-ok"></span></p>' +
+                    '<div class = "well m-l-xs m-t-xs fit-content" >' +
+                    '<span class = "text-message">' + msg + '</span> </div></div></div>';
+                if (msg.length !== 0) {
+                    mediamsg.append(html);
+                    sendmsg[0].textContent = "";
+                }
+            }
+        else if ($scope.checkId && ts2 > ts1)
+            for (var i = 0; i < $scope.inputMob.length; i++) {
+                var html = '<div class="feed-element"><div class="media-body "><p><span class="glyphicon glyphicon-menu-right"><span>' + $scope.inputMob[i] + '</span>' + dateTime + '</span><span class="glyphicon glyphicon-time"><span>(定时于' + $scope.selectDate + '发送)</span></span></p>' +
+                    '<div class = "well m-l-xs m-t-xs fit-content" >' +
+                    '<span class = "text-message">' + msg + '</span> </div></div></div>';
+                if (msg.length !== 0) {
+                    mediamsg.append(html);
+                    sendmsg[0].textContent = "";
+                }
+            }
     };
     // $scope.mobAdd = function() {
     //     var mobLen = $scope.inputMob.length;

talkview/src/less/app.main.less

@@ -56,6 +56,16 @@
             margin-left: 10px;
             margin-top: 2px;
         }
+        .glyphicon-time {
+            color: #4EA9E9;
+            margin-left: 10px;
+            margin-top: 1px;
+            span {
+                color: #888;
+                font-size: 10px;
+                margin-left: 0px;
+            }
+        }
     }
     p>span {
         margin-top: 1px;
@@ -63,7 +73,6 @@
         margin-left: 5px;
         color: #007FE0;
         >span {
-            font-weight: 700px;
             margin: 0px 7px 0px 3px;
         }
     }

talkview/src/templates/smsSend.html

@@ -22,7 +22,7 @@
     <div id="sms-mob">
         <div class="input-group">
             <span class="input-group-addon" id="basic-addon3">手机号码</span>
-            <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3" placeholder="请输入接收短信的手机号码，多个号码之间以逗号隔开. . ." ng-model="inputMob">
+            <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3" placeholder="请输入接收短信的手机号码，多个号码之间以逗号隔开. . ." ng-blur="mobReset()" ng-model="inputMob">
             <span class="input-group-addon" ng-click="mobReset()" title="自动排序"><a class="glyphicon glyphicon-refresh"></a></span>
         </div>
     </div>