Authored by microTT

冲突解决

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