Signed-off-by: lqq <lqq@wswin.cn>

dist/settingview/index.html

@@ -32,7 +32,7 @@
 	<!--<script src="js/jquery.min.js"></script>-->
 	<script src="../bower_components/angular/angular.min.js"></script>
 	<script src="../bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
-	<script src="app-316c6daf9f.js"></script>
+	<script src="app-ec8eaf9e0f.js"></script>
 </body>
 
 </html>

settingview/src/js/controller/settingController.js

@@ -2,7 +2,7 @@
 
 angular.module('app').controller('SettingController', ['$scope', '$state', '$stateParams', function ($scope, $state, $stateParams) {
 
-  // lxtalkClient.Invoke('{B36B3985-B13D-45F3-A755-AFA6937B4F33}', '_Register', '', $scope);
+  lxtalkClient.Invoke('{B36B3985-B13D-45F3-A755-AFA6937B4F33}', '_Register', '', $scope);
   $scope.user = {
     name: '陆趣趣',
     l:'0578+0-lslqq',
@@ -64,9 +64,12 @@ angular.module('app').controller('SettingController', ['$scope', '$state', '$sta
     var group = reg.exec($scope.user.l);
     $scope.user.shortL = group == null? $scope.user.l : group[1];
     $scope.sys = settings.sys;
+    $scope.webPanels = settings.webPanels;
     console.log(JSON.stringify($scope.sys));
-    if ($scope.user.shortL.length >= 15)
-      $state.go('setting-enterprise');
+    alert(JSON.stringify($scope.webPanels));
+    //宁夏企税通企业版使用
+    // if ($scope.user.shortL.length >= 15)
+    //   $state.go('setting-enterprise');
   }
 
   $scope.save = function() {
@@ -79,7 +82,7 @@ angular.module('app').controller('SettingController', ['$scope', '$state', '$sta
       settings.hotkey = $scope.hotkey;
     if ($scope.netChanged)
       settings.net = $scope.net;
-    // lxtalkClient.Invoke('{B36B3985-B13D-45F3-A755-AFA6937B4F33}', 'Save', JSON.stringify(settings), null);
+    lxtalkClient.Invoke('{B36B3985-B13D-45F3-A755-AFA6937B4F33}', 'Save', JSON.stringify(settings), null);
     $scope.userChanged = false;
     $scope.sysChanged = false;
     $scope.hotkeyChanged = false;

settingview/src/templates/setting-sso.html

@@ -7,48 +7,18 @@
                 <thead>
                     <tr>
                         <th>名称</th>
-                        <th class="col-sm-w">账号</th>
                         <th class="col-sm-w">类型</th>
                         <th class="col-sm-w">状态</th>
                         <th class="col-sm-w">账号设置</th>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr>
-                        <th>名称</th>
-                        <th class="col-center col-sm-w">账号</th>
-                        <th class="col-center col-sm-w">类型</th>
-                        <th class="col-center col-sm-w">状态</th>
+                    <tr ng-repeat="webPanel in webPanels">
+                        <th>{{webPanel.name}}</th>
+                        <th class="col-center col-sm-w">{{webPanel.mustShow?'固定':'自选'}}</th>
+                        <th class="col-center col-sm-w">{{webPanel.mustShow||webPanel.show?'启用':'关闭'}}</th>
                         <th class="col-center col-sm-w"><a>设置</a></th>
                     </tr>
-                    <tr>
-                        <th>名称</th>
-                        <th class="col-center">账号</th>
-                        <th class="col-center">类型</th>
-                        <th class="col-center">状态</th>
-                        <th class="col-center"><a>设置</a></th>
-                    </tr>
-                    <tr>
-                        <th>名称</th>
-                        <th class="col-center">账号</th>
-                        <th class="col-center">类型</th>
-                        <th class="col-center">状态</th>
-                        <th class="col-center"><a>设置</a></th>
-                    </tr>
-                    <tr>
-                        <th>名称</th>
-                        <th class="col-center">账号</th>
-                        <th class="col-center">类型</th>
-                        <th class="col-center">状态</th>
-                        <th class="col-center"><a>设置</a></th>
-                    </tr>
-                    <tr>
-                        <th>名称</th>
-                        <th class="col-center">账号</th>
-                        <th class="col-center">类型</th>
-                        <th class="col-center">状态</th>
-                        <th class="col-center"><a>设置</a></th>
-                    </tr>
                 </tbody>
             </table>
         </div>

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

@@ -1,3 +1,3 @@
 {
-  "app.js": "app-316c6daf9f.js"
+  "app.js": "app-ec8eaf9e0f.js"
 }

userview/src/js/controller/userController.js

@@ -39,7 +39,7 @@ angular.module('app').controller('UserController', ['$scope', '$state', function
     var group = reg.exec($scope.user.l);
     $scope.user.shortL = group == null? $scope.user.l : group[1];
     
-    // $scope.user.shortL = $scope.user.l.substring(7);
+    //宁夏企税通企业版使用
     // if ($state.current.name == 'simple-enterprise' || $state.current.name == 'simple') {
     //   // alert($state.current.name);
     //   if ($scope.user.l.length >= 15 && $state.current.name !== 'simple-enterprise')