Merge branch 'master' of http://119.23.72.7/shiyu/icsales

dist/js/chat/index.js

@@ -34,7 +34,7 @@ $(function () {
                 }, 
                 apiUrl: WebIM.config.apiURL
               }; 
-              conn.registerUser(options);
+              self.conn.registerUser(options);
         },
         testUser: function (user, password) { //检测用户是否登入
             var self = this;
@@ -61,7 +61,7 @@ $(function () {
                         },
                         error: function (err) {
                             if (err.status == '404') {//主动帮用户注册
-                                self.registerUser(user,password)
+                                self.registerUser(user,password);
                             } else {
                                 layer.msg('网络出现问题，请重试！');
                             }
@@ -429,12 +429,12 @@ $(function () {
                 }, //失败回调;
             });
         },
-        login: function () {
+        login: function (user,password) {
             // open，登录;
             var options = {
                 apiUrl: WebIM.config.apiURL,
-                user: "18271408717",
-                pwd: "123456",
+                user: user,
+                pwd: password,
                 appKey: WebIM.config.appkey
             };
             try {