Merge remote-tracking branch 'origin/dev' into bug

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -101,6 +101,9 @@ public class UserController {
 	 */
 	@RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
 	public ResponseEntity<String> updatePassword(HttpSession session, String password, String newPassword) {
+		if (password.equals(newPassword)){
+			throw new IllegalOperatorException("新密码与旧密码相同");
+		}
 		User sysUser = SystemSession.getUser();
 		User user = userService.findUserPwdByUserUU(sysUser.getUserUU());
 		Enterprise enterprise = user.getEnterprise();

src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -439,6 +439,10 @@ define(['app/app'], function(app) {
 
 		//修改密码
 		$scope.ok = function () {
+			if($scope.user.newPassword == $scope.user.password){
+				toaster.pop('error', '错误', '新密码与原密码相同');
+				return;
+			}
 			if($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等
 				User.updatePassword({password: $scope.user.password, newPassword: $scope.user.newPassword}, {}, function(){
 					toaster.pop('success', '成功', '修改密码成功，请牢记您的新密码。');

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -365,6 +365,10 @@ define(['app/app'], function(app) {
 
 		//修改密码
 		$scope.ok = function () {
+			if($scope.user.newPassword == $scope.user.password){
+				toaster.pop('error', '错误', '新密码与原密码相同');
+				return;
+			}
 			if($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等
 				User.updatePassword({password: $scope.user.password, newPassword: $scope.user.newPassword}, {}, function(){
 					toaster.pop('success', '成功', '修改密码成功，请牢记您的新密码。');

src/main/webapp/resources/view/vendor/forstore/vendor_store_info.html

@@ -638,9 +638,10 @@
 				</div>
 			</div>
 			<!-- 简介不正确提示信息 -->
-			<div class="row com_row" ng-show="storeInfoForm.description.$dirty && storeInfoForm.description.$invalid && !storeInfoForm.description.$error.required">
+			<div class="row com_row" ng-show="storeInfoForm.description.$dirty && storeInfoForm.description.$invalid">
 				<div class="col-md-2 custom_col"></div>
 				<div class="col-md-10 custom_col">
+					<span style="color: #ff0000;" ng-show="storeInfoForm.description.$error.required">简介信息必填</span>
 					<span style="color: #ff0000;" ng-show="storeInfoForm.description.$error.maxlength">请勿超过500个字</span>
 				</div>
 			</div>
@@ -655,9 +656,10 @@
 				</div>
 			</div>
 			<!-- 官网地址不正确提示信息 -->
-			<div class="row com_row" ng-show="storeInfoForm.enUrl.$dirty && storeInfoForm.enUrl.$invalid && !storeInfoForm.enUrl.$error.required">
+			<div class="row com_row" ng-show="storeInfoForm.enUrl.$dirty && storeInfoForm.enUrl.$invalid">
 				<div class="col-md-2 custom_col"></div>
 				<div class="col-md-10 custom_col">
+					<span style="color: #ff0000;" ng-show="storeInfoForm.description.$error.required">官网地址必填</span>
 					<span style="color: #ff0000;" ng-show="storeInfoForm.enUrl.$error.maxlength">请勿超过30个字</span>
 				</div>
 			</div>
@@ -681,9 +683,10 @@
 				</div>
 			</div>
 			<!-- 地址不正确提示信息 -->
-			<div class="row com_row" ng-show="storeInfoForm.address.$dirty && storeInfoForm.address.$invalid && !storeInfoForm.address.$error.required">
+			<div class="row com_row" ng-show="storeInfoForm.address.$dirty && storeInfoForm.address.$invalid">
 				<div class="col-md-2 custom_col"></div>
 				<div class="col-md-10 custom_col">
+					<span style="color: #ff0000;" ng-show="storeInfoForm.description.$error.required">地址信息必填</span>
 					<span style="color: #ff0000;" ng-show="storeInfoForm.address.$error.maxlength">请勿超过30个字</span>
 				</div>
 			</div>