diff --git a/web-server/public/index.html b/web-server/public/index.html
index c26e7ac..f2333ba 100755
--- a/web-server/public/index.html
+++ b/web-server/public/index.html
@@ -18,9 +18,6 @@
         </script>
         <script src="js/client.js">
                 		
-        </script>
-        <script src="js/pop.js">
-                		
         </script>
     </head>
     
@@ -95,4 +92,4 @@ <h2>
         </div>
     </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/web-server/public/js/client.js b/web-server/public/js/client.js
index 1aaa460..313dfe4 100755
--- a/web-server/public/js/client.js
+++ b/web-server/public/js/client.js
@@ -92,7 +92,8 @@ function tip(type, name) {
 			title = 'Message Notify';
 			break;
 	}
-	var pop=new Pop(title, tip);
+        //合并Pop.js到该文件中，防止没找到该文件
+var pop=new Pop(title, tip);
 };
 
 // init user list
@@ -270,4 +271,119 @@ $(document).ready(function() {
 			});
 		}
 	});
-});
\ No newline at end of file
+});
+
+jQuery(function($j) {
+    $j.positionFixed = function(el) {
+        $j(el).each(function() {
+            new fixed(this)
+        })
+        return el;
+    }
+    $j.fn.positionFixed = function() {
+        return $j.positionFixed(this)
+    }
+    var fixed = $j.positionFixed.impl = function(el) {
+            var o = this;
+            o.sts = {
+                target: $j(el).css('position', 'fixed'),
+                container: $j(window)
+            }
+            o.sts.currentCss = {
+                top: o.sts.target.css('top'),
+                right: o.sts.target.css('right'),
+                bottom: o.sts.target.css('bottom'),
+                left: o.sts.target.css('left')
+            }
+            if (!o.ie6) return;
+            o.bindEvent();
+        }
+    $j.extend(fixed.prototype, {
+        ie6: $.browser.msie && $.browser.version < 7.0,
+        bindEvent: function() {
+            var o = this;
+            o.sts.target.css('position', 'absolute')
+            o.overRelative().initBasePos();
+            o.sts.target.css(o.sts.basePos)
+            o.sts.container.scroll(o.scrollEvent()).resize(o.resizeEvent());
+            o.setPos();
+        },
+        overRelative: function() {
+            var o = this;
+            var relative = o.sts.target.parents().filter(function() {
+                if ($j(this).css('position') == 'relative') return this;
+            })
+            if (relative.size() > 0) relative.after(o.sts.target)
+            return o;
+        },
+        initBasePos: function() {
+            var o = this;
+            o.sts.basePos = {
+                top: o.sts.target.offset().top - (o.sts.currentCss.top == 'auto' ? o.sts.container.scrollTop() : 0),
+                left: o.sts.target.offset().left - (o.sts.currentCss.left == 'auto' ? o.sts.container.scrollLeft() : 0)
+            }
+            return o;
+        },
+        setPos: function() {
+            var o = this;
+            o.sts.target.css({
+                top: o.sts.container.scrollTop() + o.sts.basePos.top,
+                left: o.sts.container.scrollLeft() + o.sts.basePos.left
+            })
+        },
+        scrollEvent: function() {
+            var o = this;
+            return function() {
+                o.setPos();
+            }
+        },
+        resizeEvent: function() {
+            var o = this;
+            return function() {
+                setTimeout(function() {
+                    o.sts.target.css(o.sts.currentCss)
+                    o.initBasePos();
+                    o.setPos()
+                }, 1)
+            }
+        }
+    })
+})
+
+jQuery(function($j) {
+    $j('#footer').positionFixed()
+})
+
+function Pop(title, intro) {
+    this.title = title;
+    this.intro = intro;
+    this.apearTime = 1000;
+    this.hideTime = 500;
+    this.delay = 8000;
+    this.addInfo();
+    this.showDiv();
+    this.closeDiv();
+}
+Pop.prototype = {
+    addInfo: function() {
+        $("#popIntro").html(this.intro);
+    },
+    showDiv: function(time) {
+        if (!($.browser.msie && ($.browser.version == "6.0") && !$.support.style)) {
+            $('#pop').slideDown(this.apearTime).delay(this.delay).fadeOut(400);
+        } else {
+            $('#pop').show();
+            jQuery(function($j) {
+                $j('#pop').positionFixed()
+            })
+        }
+    },
+    closeDiv: function() {
+        $("#popClose").click(function() {
+            $('#pop').hide();
+        });
+        $("#popMore").click(function() {
+            $('#pop').remove();
+        });
+    }
+}
diff --git a/web-server/public/js/pop.js b/web-server/public/js/pop.js
deleted file mode 100755
index 3a34cfe..0000000
--- a/web-server/public/js/pop.js
+++ /dev/null
@@ -1,114 +0,0 @@
- (function($j) {
-    $j.positionFixed = function(el) {
-        $j(el).each(function() {
-            new fixed(this)
-        })
-        return el;
-    }
-    $j.fn.positionFixed = function() {
-        return $j.positionFixed(this)
-    }
-    var fixed = $j.positionFixed.impl = function(el) {
-            var o = this;
-            o.sts = {
-                target: $j(el).css('position', 'fixed'),
-                container: $j(window)
-            }
-            o.sts.currentCss = {
-                top: o.sts.target.css('top'),
-                right: o.sts.target.css('right'),
-                bottom: o.sts.target.css('bottom'),
-                left: o.sts.target.css('left')
-            }
-            if (!o.ie6) return;
-            o.bindEvent();
-        }
-    $j.extend(fixed.prototype, {
-        ie6: $.browser.msie && $.browser.version < 7.0,
-        bindEvent: function() {
-            var o = this;
-            o.sts.target.css('position', 'absolute')
-            o.overRelative().initBasePos();
-            o.sts.target.css(o.sts.basePos)
-            o.sts.container.scroll(o.scrollEvent()).resize(o.resizeEvent());
-            o.setPos();
-        },
-        overRelative: function() {
-            var o = this;
-            var relative = o.sts.target.parents().filter(function() {
-                if ($j(this).css('position') == 'relative') return this;
-            })
-            if (relative.size() > 0) relative.after(o.sts.target)
-            return o;
-        },
-        initBasePos: function() {
-            var o = this;
-            o.sts.basePos = {
-                top: o.sts.target.offset().top - (o.sts.currentCss.top == 'auto' ? o.sts.container.scrollTop() : 0),
-                left: o.sts.target.offset().left - (o.sts.currentCss.left == 'auto' ? o.sts.container.scrollLeft() : 0)
-            }
-            return o;
-        },
-        setPos: function() {
-            var o = this;
-            o.sts.target.css({
-                top: o.sts.container.scrollTop() + o.sts.basePos.top,
-                left: o.sts.container.scrollLeft() + o.sts.basePos.left
-            })
-        },
-        scrollEvent: function() {
-            var o = this;
-            return function() {
-                o.setPos();
-            }
-        },
-        resizeEvent: function() {
-            var o = this;
-            return function() {
-                setTimeout(function() {
-                    o.sts.target.css(o.sts.currentCss)
-                    o.initBasePos();
-                    o.setPos()
-                }, 1)
-            }
-        }
-    })
-})(jQuery)
-
-jQuery(function($j) {
-    $j('#footer').positionFixed()
-})
-
-function Pop(title, intro) {
-    this.title = title;
-    this.intro = intro;
-    this.apearTime = 1000;
-    this.hideTime = 500;
-    this.delay = 8000;
-    this.addInfo();
-    this.showDiv();
-    this.closeDiv();
-}
-Pop.prototype = {
-    addInfo: function() {
-        $("#popIntro").html(this.intro);
-    },
-    showDiv: function(time) {
-        if (!($.browser.msie && ($.browser.version == "6.0") && !$.support.style)) {
-            $('#pop').slideDown(this.apearTime).delay(this.delay).fadeOut(400);
-        } else {
-            $('#pop').show();
-            jQuery(function($j) {
-                $j('#pop').positionFixed()
-            })
-        }
-    },
-    closeDiv: function() {
-        $("#popClose").click(function() {
-            $('#pop').hide();
-        });
-        $("#popMore").click(function() {
-            $('#pop').remove();
-        });
-    }
-}
\ No newline at end of file