Merge branch 'pay' into develop

@@ -32,7 +32,7 @@ class AliwapConfig
      * Enter description here ...
      * @var String
      */
-    var $notify_url = 'http://testservice.yoho.cn:28077/payment/alipay_notify';//"http://m.yohobuy.com/shopping/pay/aliwapnotice";
+    var $notify_url = 'http://testservice.yoho.cn:28077/payment/alipaywap_notify';//"http://m.yohobuy.com/shopping/pay/aliwapnotice";
 
     /**
      * 浏览器的返回

@@ -4,7 +4,7 @@ application.directory = APPLICATION_PATH  "/application"
 ;;website library
 application.library = ROOT_PATH "/library"
 ;;模块配置
-application.modules = "Index,Category,Channel,Guang,Passport,Product,Cart,Shopping"
+application.modules = "Index,Category,Channel,Guang,Passport,Product,Cart"
 ;;加载
 application.bootstrap = APPLICATION_PATH "/application/Bootstrap.php"
 ;;view文件的扩展名