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

src/main/webapp/resources/css/vendor/sell.css

@@ -5319,15 +5319,15 @@ input:-webkit-autofill, input:-webkit-autofill:hover, input:-webkit-autofill:foc
 /*提示横条*/
 .result{
     width: 100%;
-    height: 30px;
-    line-height: 30px;
+    height: 35px;
+    line-height: 16px;
     text-align: center;
     background: #fef6f2;
     border: 1px solid #ec854d;
     overflow: hidden ;
 }
 .result span{
-    margin-left: 330px;
+    /*margin-left: 330px;*/
     height: 30px;
     font-size: 14px;
     color: #f15601;

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1768,9 +1768,12 @@ define([ 'app/app' ], function(app) {
 			});
 		};
 		$scope.promptUpdate = function() {
-			if (!$scope.userInfo.pwdEnable || !$scope.userInfo.userEmail || !$scope.userInfo.haveUserQuestion) {
+            if (!$scope.userInfo.pwdEnable || !$scope.userInfo.haveUserQuestion||!$scope.userInfo.emailValidCode || $scope.userInfo.emailValidCode != 2) {
+                $scope.openHomeCenterModel();
+            }
+			/*if (!$scope.userInfo.pwdEnable || !$scope.userInfo.userEmail || !$scope.userInfo.haveUserQuestion) {
 				$scope.openHomeCenterModel();
-			}
+			}*/
 		};
 	}]);
 

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

@@ -29,10 +29,14 @@ define(['app/app', 'calendar'], function(app) {
       }
 
         //安全级别
-        if(!($scope.userInfo.pwdEnable && $scope.userInfo.haveUserQuestion && $scope.userInfo.userEmail)){
-          $scope.openHomeCenterModel();
+        if (!$scope.userInfo.pwdEnable || !$scope.userInfo.haveUserQuestion||!$scope.userInfo.emailValidCode || $scope.userInfo.emailValidCode != 2) {
+            $scope.openHomeCenterModel();
         }
 
+      /*  if(!($scope.userInfo.pwdEnable && $scope.userInfo.haveUserQuestion && $scope.userInfo.userEmail)){
+          $scope.openHomeCenterModel();
+        }*/
+
         /**
          * 获取推荐新店信息
          */

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

@@ -3053,6 +3053,8 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 
                     });
                 }, function (response) {
+                    $scope.deleteModal = false;
+                    $modalInstance.dismiss();
                     toaster.pop('error',  '错误', response.data);
                 });
             }

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

@@ -4,7 +4,7 @@
  */
 define(['app/app'], function (app) {
     "use strict";
-    app.register.controller('vendorOrderCtrl', ['$scope', '$rootScope', 'Purchase', 'ngTableParams', 'BaseService', 'toaster', '$state', '$filter', 'Return', 'Change', '$modal', 'PuExProcess', 'Recommendation', 'DateUtil', 'Loading', 'bankInfoService', 'Logistics', 'Distributor', 'SessionService','Rate','StoreInfo', function ($scope, $rootScope, Purchase, ngTableParams, BaseService, toaster, $state, $filter, Return, Change, $modal, PuExProcess, Recommendation, DateUtil, Loading, bankInfoService, Logistics, Distributor, SessionService, Rate, StoreInfo) {
+    app.register.controller('vendorOrderCtrl', '$scope', '$rootScope', 'Purchase', 'ngTableParams', 'BaseService', 'toaster', '$state', '$filter', 'Return', 'Change', '$modal', 'PuExProcess', 'Recommendation', 'DateUtil', 'Loading', 'bankInfoService', 'Logistics', 'Distributor', 'SessionService','Rate','StoreInfo', function ($scope, $rootScope, Purchase, ngTableParams, BaseService, toaster, $state, $filter, Return, Change, $modal, PuExProcess, Recommendation, DateUtil, Loading, bankInfoService, Logistics, Distributor, SessionService, Rate, StoreInfo) {
         $rootScope.active = 'vendor_order';
         document.title = '已卖出的产品-优软商城';
         // 加密过滤器
@@ -1603,7 +1603,7 @@ define(['app/app'], function (app) {
 
         /***********卖家评论模块 *** end *****************************/
 
-    }]);
+    });
 
     app.register.filter('VendorStatusFilter', function () {
         return function (status) {

src/main/webapp/resources/view/usercenter/forstore/account_manager.html

@@ -241,10 +241,10 @@
 					<i ng-if="userInfo.secLevel==5 || userInfo.secLevel==6">强</i>
 					<!--完成<a href="javascript:void(0)"> 密保设置</a>，提升账户安全。-->
 				</span>
-        <span class="safe-remind" ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
+        <span class="safe-remind" ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.emailValidCode && userInfo.emailValidCode == 2">
           你的账户的安全等级过低，请 <a ng-hide="userInfo.pwdEnable" ng-click="updatePassword()"> 修改密码 </a>
           <a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()"> 设置密保问题 </a>
-          <a  ng-hide="userInfo.userEmail" ng-click="updateUserEmail()"> 绑定邮箱 </a>
+          <a  ng-hide="userInfo.emailValidCode && userInfo.emailValidCode == 2" ng-click="updateUserEmail()"> 绑定邮箱 </a>
           来保障您的账户安全！
         </span>
 			</li>

src/main/webapp/resources/view/usercenter/modal/homeCenter_modal.html

@@ -51,7 +51,7 @@
     <div class="modal-body">
         你的账户的安全等级过低，请 <span ng-hide="userInfo.pwdEnable" ng-click="goLink('pwd')"> 修改密码 </span>
         <span ng-hide="userInfo.haveUserQuestion" ng-click="goLink('question')"> 设置密保问题 </span>
-        <span  ng-hide="userInfo.userEmail" ng-click="goLink('email')"> 绑定邮箱 </span>
+        <span  ng-hide="userInfo.emailValidCode && userInfo.emailValidCode == 2" ng-click="goLink('email')"> 绑定邮箱 </span>
         来保障您的账户安全！
         <a class="mall-btn-default" ng-click="goLink('sec')" >立即前往</a>
     </div>

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

@@ -620,10 +620,10 @@
 					<i ng-if="userInfo.secLevel==5 || userInfo.secLevel==6">强</i>
           <!--完成<a href="javascript:void(0)"> 密保设置</a>，提升账户安全。-->
 				</span>
-          <span class="safe-remind" ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
+          <span class="safe-remind" ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.emailValidCode && userInfo.emailValidCode == 2">
           你的账户的安全等级过低，请 <a ng-hide="userInfo.pwdEnable" ng-click="updatePassword()"> 修改密码 </a>
           <a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()"> 设置密保问题 </a>
-          <a ng-hide="userInfo.userEmail" ng-click="updateUserEmail()"> 绑定邮箱 </a>
+          <a ng-hide="userInfo.emailValidCode && userInfo.emailValidCode == 2" ng-click="updateUserEmail()"> 绑定邮箱 </a>
           来保障您的账户安全！
         </span>
         </li>

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

@@ -382,7 +382,7 @@
     .com-del-box .result {
         width: 224px;
         margin: 0 auto;
-        font-size: 12px;
+        font-size: 13px;
     }
     .com-del-box .result span {
         color: #f40d0d;