个人资料

talkview/src/js/controller/userController.js

@@ -2,23 +2,23 @@
 
 angular.module('appMessage').controller('UserController', ['$scope', '$state', function($scope, $state) {
 
-    lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
+    //lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
 
-    // $scope.user = {
-    //     name: '陆趣趣',
-    //     l: '0578+0-lslqq',
-    //     shotL: 'lslqq',
-    //     comp: '浙江万赛软件科技有限公司',
-    //     branch: '运维部',
-    //     sex: '0',
-    //     mob: '15215756180',
-    //     sMob: '666666',
-    //     tel: '2189026',
-    //     duty: '运维部经理',
-    //     officeID: '运维室001',
-    //     email: 'lqq@wswin.cn',
-    //     shortL: 'lszhangzhangzhang'
-    // };
+    $scope.user = {
+        name: '陆趣趣',
+        l: '0578+0-lslqq',
+        shotL: 'lslqq',
+        comp: '浙江万赛软件科技有限公司',
+        branch: '运维部',
+        sex: '0',
+        mob: '15215756180',
+        sMob: '666666',
+        tel: '2189026',
+        duty: '运维部经理',
+        officeID: '运维室001',
+        email: 'lqq@wswin.cn',
+        shortL: 'lszhangzhangzhang'
+    };
 
     $scope.getSex = function(sex) {
         if ($scope.user === undefined)

talkview/src/js/directive/qrcode.js

@@ -34,8 +34,8 @@
             element.qrcode({
                 render: "canvas",
                 text: Utilities.toUtf8(codeText),
-                width: 160,
-                height: 160,
+                width: 140,
+                height: 140,
                 typeNumber: -1, //计算模式  
                 correctLevel: 0, //纠错等级 
                 background: "#ffffff",

talkview/src/less/app.main.less

@@ -279,9 +279,12 @@
     font-size: 11px;
 }
 
+body {
+    overflow-x: hidden;
+}
 #details{
-    width: 250px;
-    height: 450px;
+    min-width: 220px;
+    height: 420px;
     margin: auto;
     overflow: hidden;
     text-align: center;
@@ -294,15 +297,21 @@
             float: left;
             width: 55px;
             height: 55px;
-            margin: 10px 0px 10px 2px;
+            margin: 10px 0px 10px 1px;
             border-radius: 100%;
             border:2px solid #fff;
             background: #96CEDF;
-            >img {
-                border-radius: 100%;
-                width: 100%;
-                height: 100%;
-                }
+            >a{
+                 cursor:pointer;
+                >img {
+                    border-radius: 100%;
+                    width: 100%;
+                    height: 100%;
+                    }
+            }
+            &:hover{
+                 border:2px solid #5EB0D2;
+            }
         }
         .displayname {
             color: #fff;
@@ -311,7 +320,7 @@
             >input {
                 text-align: left;
                 width: 100%;
-                margin-left: -8px; 
+                margin-left: -10px; 
                 margin-bottom: 2px;
                 text-shadow:0px 0px 2px #999;
                 border: none;
@@ -330,11 +339,11 @@
             text-shadow:0px 0px 2px #aaa;
             white-space: nowrap; /* 自适应宽度,不换行*/
             >input {
-                margin-left:-8px;
+                margin-left:-10px;
                 border: none;
                 outline: none;
                 background: #96CEDF;
-                width: 100%;
+                width: 104%;
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
@@ -352,7 +361,7 @@
                 list-style: none;
                 margin-left: -33px;
                 >li {
-                    width: 235px;
+                    width: 210px;
                     font-family: "微软雅黑","宋体";
                     padding-top:5px;
                     padding-bottom: 1px;
@@ -365,7 +374,7 @@
                         border: none;
                         outline: none;
                         background: #fff;
-                        width: 84%;
+                        width: 80%;
                         white-space: nowrap;
                         overflow: hidden;
                         text-overflow: ellipsis;
@@ -377,8 +386,8 @@
     #userCode {
         #code {
             margin: 20px auto;
-            width: 180px;
-            height: 180px;
+            width: 160px;
+            height: 160px;
             border: 8px solid #fff;
             box-shadow:0px 0px 1px #ccc;
         }

talkview/src/templates/details.html

@@ -1,10 +1,10 @@
 <div id="details">
     <div id="userHead">
         <div id="icoImg">
-            <img src="../img/DefaultHeadImage_96.png">
+            <a><img src="../img/头像.png"></a>
         </div>
         <div id="watch">
-            <span class="displayname"> <input type="text" readonly="readonly" value="{{user.name}}&nbsp({{user.shortL}})"></span>
+            <span class="displayname"> <input type="text" readonly="readonly" value="{{user.name}}"></span>
             </br><input type="text" readonly="readonly" value="{{user.watchword !== null && user.watchword !== undefined && user.watchword !== ''?user.watchword:'他什么也没有留下'}}">
         </div>
     </div>

talkview/src/templates/transmitter.html

@@ -8,31 +8,4 @@
     <span class="f-speed">{{getSpeed(item)}}&nbsp;&nbsp;{{getreTime(item)}}</span>
     <span class="f-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.status&&item.direction==1" ng-click="decline(item)">拒绝</a><a ng-show="item.status&&item.direction==1" ng-click="cancel(item)">取消</a></span>
     <span class="f-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>
-<!--<div id="details">
-    <div id="userHead">
-        <div id="icoImg">
-            <img src="../img/DefaultHeadImage_96.png">
-        </div>
-        <div id="watch">
-            <span class="displayname"> <input type="text" readonly="readonly" value="{{user.name}}陆趣趣&nbsp({{user.shortL}}lslqq)"></span>
-            </br><input type="text" readonly="readonly" value="{{user.watchword !== null && user.watchword !== undefined && user.watchword !== ''?user.watchword:'脸上有肉才旺夫·~~做个快乐包子脸女孩，哈哈哈·``~~~'}}">
-        </div>
-    </div>
-    <div id="userInfo">
-        <div id="content">
-            <ul>
-                <li><span class="lf">单位：</span> <input class="lr" type="text" readonly="readonly" value="{{user.comp}}浙江万赛软件科技有限公司"></li>
-                <li><span class="lf">处室：</span> <input class="lr" type="text" readonly="readonly" value="{{user.branch}}运维部"></li>
-                <li><span class="lf">职务：</span> <input class="lr" type="text" readonly="readonly" value="{{user.duty}}副经理"></li>
-                <li><span class="lf">电话：</span> <input class="lr" type="text" readonly="readonly" value="{{user.tel}}0578-2189026"></li>
-                <li><span class="lf">手机：</span> <input class="lr" type="text" readonly="readonly" value="{{user.mob}}15157806180"></li>
-                <li><span class="lf">邮箱：</span> <input class="lr" type="text" readonly="readonly" value="{{user.email}}lqq@wswin.cn"></li>
-            </ul>
-        </div>
-    </div>
-    <div style="border-top:solid 1px #ddd;margin:0px 6px"></div>
-    <div id="userCode">
-        <div id="code" qrcode ng-user="user"> </div>
-    </div>
-</div>-->
+</div>