Merge branch 'develop' into feature/my-order

@@ -118,7 +118,7 @@ const local = {
                 countryName: areaName,
                 countryList: areaArr,
                 forgetPwd: helpers.urlFormat('/passport/back/index'),
-                fastReg: helpers.urlFormat('/passport/reg/index'),
+                fastReg: helpers.urlFormat('/passport/reg'),
                 weixinLogin: helpers.urlFormat('/passport/autosign/wechat'),
                 qqLogin: helpers.urlFormat('/passport/autosign/qq'),
                 weiboLogin: helpers.urlFormat('/passport/autosign/sina'),

@@ -63,7 +63,7 @@ router.post('/autouserinfo/relateMobile', bind.relateMobile);
 /**
  * 注册页面路由
  */
-router.get('/reg/index', reg.index);
+router.get('/reg', reg.index);
 router.post('/reg/checkmobile', reg.checkMobileMiddleware, reg.checkMobile);
 router.post('/reg/piccaptcha', reg.checkCode, reg.picCaptcha);
 router.post('/reg/msgcaptcha', reg.checkMobileMiddleware, reg.msgCaptcha);