合并分支 'juan' 到 'master'

修改



查看合并请求 !114

@@ -163,8 +163,8 @@ class ZjCartController extends HomeBaseController
                 }
             }
 
-            //require_once EXTEND_PATH . '/WeChatCommon.php';
-            //$wx = new \WeChatCommon();
+            require_once EXTEND_PATH . '/WeChatCommon.php';
+            $wx = new \WeChatCommon();
             return $this->fetch('order_confirm', [
                 'data' => $data,
                 'address' => $address,