浏览代码

文件传输

dgf 8 年之前
父节点
当前提交
797f8dc1b3

+ 1 - 1
talkview/src/js/controller/transmitterController.js

@@ -62,7 +62,7 @@ angular.module('appMessage').controller('TransmitterController', ['$scope', '$in
             return '';
     };
 
-    $scope.accept = function(item) {
+    $scope.acception = function(item) {
         lxtalkClient.Invoke('{AFAF1B48-627D-48E0-B513-26A0CDF1EBD0}', 'Accept', JSON.stringify(item), $scope);
     };
 

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

@@ -167,12 +167,21 @@
     margin: 10px 0px 0px 5px;
     font-family: "微软雅黑","宋体";
     font-size: 12px;
-    >a{
-        margin: 5px;
-        text-decoration:none;
-        cursor:pointer;
-        &:hover {
-        color: #333;
+    margin-bottom: -30px;
+    .textion{
+        float: right;
+        margin-top: -5px;
+        margin-right: 7px;
+        >a{
+            margin: 5px;
+            text-decoration:none;
+            cursor:pointer;
+            &:hover {
+            color: #333;
+            }
+        }
+        #next{
+            margin-left: 10px;
         }
     }
 }

+ 2 - 2
talkview/src/templates/transmitter.html

@@ -6,6 +6,6 @@
     </div>
     <span id="progress">{{getProgress(item)}}</span>
     <span id="speed">{{getSpeed(item)}}&nbsp;&nbsp;{{getreTime(item)}}</span>
-    <a ng-show="item.direction==1" ng-click="accept(item)">接收</a><a ng-show="item.direction==1" ng-click="saveAs(item)">另存为</a><a ng-show="item.direction==1" ng-click="decline(item)">取消</a>
-    <a ng-show="item.direction==0" ng-click="turnToOffline(item)">转为离线</a><a ng-show="item.direction==0" ng-click="cancel(item)">取消</a>
+    <span class="textion"><a ng-show="!item.status&&item.direction==1" ng-click="acception(item)">接收</a><a ng-show="!item.status&&item.direction==1" ng-click="saveAs(item)">另存为</a><a ng-show="item.direction==1" ng-click="decline(item)">取消</a><a id="next" ng-click="decline(item)" ng-show="!item.status&&item.direction==1">下次接收</a></span>
+    <span class="textion"><a ng-show="!item.status&&item.direction==0" ng-click="turnToOffline(item)">转为离线</a><a ng-show="item.direction==0" ng-click="cancel(item)">取消</a></span>
 </div>