Merge pull request #105 from helloxz/dev

0.9.26

controller/api.php

@@ -8,7 +8,7 @@
 
 //允许跨域访问
 header("Access-Control-Allow-Origin: *");
-header("Access-Control-Allow-Headers: Content-Type, AccessToken, X-CSRF-Token, Authorization, Token,X-Token,X-Cid");
+header("Access-Control-Allow-Headers: Access-Control-Allow-Private-Network,Content-Type, AccessToken, X-CSRF-Token, Authorization, Token,X-Token,X-Cid");
 require('./class/Api.php');
 
 $api = new Api($db);

templates/admin/setting/share.php

@@ -172,7 +172,7 @@
         }
       }}
       ,{field:'password', width:200, title: '密码'}
-      ,{field:'password', width:200, title: '备注'}
+      ,{field:'note', width:200, title: '备注'}
       ,{fixed: 'right', title:'操作', toolbar: '#tooloption'}
     ]]