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

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -926,7 +926,8 @@ public class ProductServiceImpl implements ProductService {
             return new ResultMap(CodeType.NO_INFO, "匹配结果信息丢失");
         }
         Product standardProduct = updateProductAfterMatch(beforeProduct, result);
-        restTemplate.postForEntity(productServiceIp + "/product/update", standardProduct, String.class);
+//        restTemplate.postForEntity(productServiceIp + "/product/update", standardProduct, String.class);
+        productDao.save(standardProduct);
 
         Product afterProduct = productDao.findOne(afterId);
         updateInfoAfterTurnStandard(beforeId, afterProduct);

src/main/webapp/resources/view/vendor/modal/updateUserEmail.html

@@ -111,7 +111,7 @@
             <label class="col-md-3 col-sm-3 col text-right" ng-show="userInfo.userEmail==null?true:false">邮箱地址：</label>
             <div class="col-md-8 col-sm-8 col">
                 <input ng-model="user.newUserEmail"
-                       class="form-control input-sm" type="newUserEmail" ng-change="emailEnable(user.newUserEmail)" placeholder="新邮箱地址">
+                       class="form-control input-sm" type="newUserEmail" ng-blur="emailEnable(user.newUserEmail)" placeholder="新邮箱地址">
                 <!-- <div>密码复杂度</div> -->
             </div>
             <div class="col">

src/main/webapp/resources/view/vendor/modal/updateUserTel.html

@@ -110,7 +110,7 @@
             <label class="col-md-3 col-sm-3 col text-right">新手机号：</label>
             <div class="col-md-8 col-sm-8 col">
                 <input ng-model="user.newUserTel"
-                       class="form-control input-sm" type="newUserTel" ng-change="telEnable(user.newUserTel)">
+                       class="form-control input-sm" type="newUserTel" ng-blur="telEnable(user.newUserTel)">
                 <!-- <div>密码复杂度</div> -->
             </div>
             <div class="col">