Merge remote-tracking branch 'origin/release-201813-yc' into release-201813-yc

src/main/java/com/uas/platform/b2c/common/weixin/model/resp/AuthUserInfo.java

@@ -21,7 +21,7 @@ public class AuthUserInfo {
 	/**
 	 * 性别(1是男性,2是女性,0是未知)
 	 */
-	private String sex;
+	private Integer sex;
 
 	/**
 	 * 国家
@@ -64,11 +64,11 @@ public class AuthUserInfo {
 		this.nickname = nickname;
 	}
 
-	public String getSex() {
+	public Integer getSex() {
 		return sex;
 	}
 
-	public void setSex(String sex) {
+	public void setSex(Integer sex) {
 		this.sex = sex;
 	}
 

src/main/webapp/resources/js/vendor/app.js

@@ -699,10 +699,9 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 				if ($location.$$path === '/index') {
 					if ($rootScope.applyStatus === 'NONE') {
 						$state.go('vendor_store_apply');
+					} else if ($rootScope.applyStatus === 'PASS') {
+						$state.go('vendor_store_maintain');
 					}
-					// else if ($rootScope.applyStatus === 'PASS') {
-					// 	$state.go('vendor_store_maintain');
-					// }
 				}
                 // 是否pcb
                 // StoreInfo.isPcb({enuu: $rootScope.userInfo.enterprise.uu}, function (res) {