冲突解决

@@ -115,7 +115,7 @@ define('channel', function(require, exports) {
                     e.preventDefault();
                     e.preventDefault();
                     swiper.swipeNext();
                     swiper.swipeNext();
                 });
                 });
-
+                
                 $(".dib a").on("click", function(event) {
                 $(".dib a").on("click", function(event) {
                     var index = $(this).index(".dib a");
                     var index = $(this).index(".dib a");
                     swiper.swipeTo(index + 1);
                     swiper.swipeTo(index + 1);

@@ -186,6 +186,7 @@ EOL;
     })
     })
 seajs.use(['jquery', 'channel'], function($, channel) {
 seajs.use(['jquery', 'channel'], function($, channel) {
     channel.index();
     channel.index();
+    channel.common();
 })
 })
 </script>
 </script>
 <?php $this->_endblock();?>
 <?php $this->_endblock();?>