Merge remote-tracking branch 'origin/test' into test

# Conflicts: # resource/js/unit.js

Merge remote-tracking branch 'origin/test' into test
# Conflicts: # resource/js/unit.js
王富生
2 parents 4c87a8b7 2b0ce64b
Showing 4 changed files with 8 additions and 9 deletions
login/login.html
resource/js/unit.js
topages/login/login.js
topages/workfill/workfill.js
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="../resource/public/plugins.min.css?a=2">
     <link rel="stylesheet" href="../resource/public/commoncss.css?a=2">
     <link rel="stylesheet" href="../topages/login/login.css">
-    <script src="../resource/js/unit.js"></script>
+
 </head>
 <body>
@@ -27,7 +27,8 @@
 <script src="../resource/lib/jquery/jquery.min.js"></script>
+    <script src="../resource/js/unit.js"></script>
 <script src="../topages/login/login.js?a=1"></script>
-<script src="../resource/js/unit.js?a=1"></script>
+<!--<script src="../resource/js/unit.js?a=1"></script>-->
 </body>
 </html>
 \ No newline at end of file
@@ -9,15 +9,10 @@ sysComm = {
 }
 //阿里云测试环境，别删
-//
-// var baseUrl = 'http://192.168.1.196:8088/';// url公用地址
-//       var parkcloudbaseUrl = 'http://192.168.1.196:8093/';// url公用地址
-//       var authUrl = 'http://192.168.1.196:8088/';// 鉴权URL公用地址s
-
-var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
+//var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
-//var parkcloudbaseUrl = 'http://localhost:8101/';// url公用地址
+var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
@@ -38,6 +38,7 @@ var func ={
             dataType: 'json',
             success: function (res) {
                 if(res != null && res != '' && res !=undefined &&  res.code =='8888' ){
+
                     $('#login-errorifo').text('');
                     fn.setToken(res.data.accessToken);
                     fn.setUserName(res.data.userName);
@@ -180,6 +180,8 @@ var fun = {
                 dataType:'json',
                 success: function(res){
                     if(res.success == true){
+                        var asraId = res.data;
+                        $("#weekday"+id).attr("data-id",asraId);
                         _this.text('编辑');
                         _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false");
                         _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').toggleClass('display-none');