dgf 8 anni fa
parent
commit
ae6dbf323e

+ 8 - 0
talkview/src/js/controller/smsController.js

@@ -4,4 +4,12 @@ angular.module('appMessage').controller('SmsController', ['$scope', '$state', fu
 
     //lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
 
+    $scope.Bactive = function($event) {
+        var activeClick = $($event.target.firstElementChild);
+        var activeData = $event.target.innerText;
+        console.log(activeData);
+        angular.element(".active").addClass("hid");
+        activeClick.removeClass("hid");
+    };
+
 }]);

+ 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('/messages'); //
+        $urlRouterProvider.otherwise('/smsSend'); //
         $stateProvider.state('messages', {
                 url: '/messages',
                 templateUrl: 'templates/messages.html',

+ 44 - 10
talkview/src/less/app.main.less

@@ -584,6 +584,7 @@ body {
     background: #F5FAFE;
     border: 1px solid #ccc;
     font-size: 12px;
+    font-family: "微软雅黑","宋体";
     #sms-set {
         height: 35px;
         background: #F5F5F5;
@@ -608,7 +609,7 @@ body {
             height: 25px;
             width: 75px;
             padding: 0px;
-            margin: 5px;
+            margin: 5px 10px;
             font-size: 12px;
             background: #5A98DE;
             border: #5A98DE;
@@ -617,8 +618,10 @@ body {
             }
         }
         >span {
+            float: left;
+            margin-top: 9px;
             color: #007FE0;
-            font-size: 9pt;
+            font-size: 12px;
         }
     }
     #sms-mob {
@@ -633,7 +636,7 @@ body {
             >input {
                 height: 25px;
                 padding: 2px;
-                font-size: 10px;
+                font-size: 11px;
             }
         }
     }
@@ -645,7 +648,7 @@ body {
         background: #fff;
     }
     #sms-inbox {
-        height: 120px;
+        height: 125px;
         border: 1px solid #ccc;
         border-radius: 5px;
         margin: 10px;
@@ -660,13 +663,44 @@ body {
                 outline: none;
             }
         }
-        button {
+        #sms-button {
             float: right;
-            height: 30px;
-            width: 70px;
-            padding: auto;
-            margin-right: 10px;;
-            font-size: 12px;
+            padding:  0px 10px 10px 0px;
+            >button {
+                height: 35px;
+                width: 75px;
+                text-align: left;
+                border: none;
+                &:hover,&:active,&:focus {
+                    border: none;
+                    background: #5CB85C;
+                }
+            }
+            .dropdown-toggle {
+                margin-left: -33px;
+                height: 20px;
+                width: 10px;
+                border: none;
+                outline: none;
+                &:hover,&:active,&:focus {
+                    border: none;
+                    outline: none;
+                    background: #449D44;
+                }
+                >span.caret {
+                    float: right;
+                    margin-right: -4px;
+                }
+            }
+            .dropdown-menu{
+                span {
+                    float: left;
+                    margin: 2px 10px 0px -10px;
+                }
+                .hid {
+                    visibility:hidden;
+                }
+            }
         }
     }
 }

+ 11 - 1
talkview/src/templates/smsSend.html

@@ -5,7 +5,7 @@
     <div style="border-top:solid 1px #ccc;"></div>
     <div id="sms-manage">
         <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-log-out"></span>短信群发</button>
-        <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-wrench"></span>短信管理</button>
+        <!--<button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-wrench"></span>短信管理</button>-->
         <span>您处于个人模式下,本月您尚可发送20000条短信,您个人已发送20000条短信</span>
     </div>
     <div style="border-top:solid 1px #ccc;"></div>
@@ -22,6 +22,16 @@
         </div>
         <div id="sms-button">
             <button type="button" class="btn btn-success">发送</button>
+            <div class="btn-group">
+                <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <span class="caret"></span>
+                    <span class="sr-only">Toggle Dropdown</span>
+                </button>
+                <ul class="dropdown-menu">
+                    <li><a href="#" ng-click="Bactive($event)"><span class="glyphicon glyphicon-ok active"></span> 按Enter键发送消息</a></li>
+                    <li><a href="#" ng-click="Bactive($event)"><span class="glyphicon glyphicon-ok active hid"></span> 按Ctrl+Enter键发送消息</a></li>
+                </ul>
+            </div>
         </div>
     </div>
 </div>