安全设置 样式修改

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

@@ -735,10 +735,12 @@ define(['app/app'], function(app) {
         $scope.checkSuccess1 = false;
         $scope.checkFailed1 = false;
         $scope.emailEnable = function(newUserEmail) {
-        	if((newUserEmail==null || newUserEmail.length>30) && !/^(\w)+(\.\w+)*@(\w)+((\.\w{2,3}){1,3})$/.test(newUserEmail)){
+        	//邮箱不可用
+        	if((newUserEmail==null || newUserEmail.length>30) || !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(newUserEmail)){
             $scope.checkSuccess1 = false;
             $scope.checkFailed1 = true;
             $scope.sendSuccess = false;
+            return;
 					}
             User.emailEnable({email: newUserEmail}, function(data){
 								if(data.data == "true"){//邮箱可用

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

@@ -45,7 +45,7 @@
     <div class="modal-header">
         <img src="static/img/user/images/safeSetting.png" alt="">
         <p>安全设置</p>
-        <i class="glyphicon glyphicon-remove" ng-click="cancel()"></i>
+       <!-- <i class="glyphicon glyphicon-remove" ng-click="cancel()"></i>-->
     </div>
     <div class="modal-body">
         你的账户的安全等级过低，请 <a ng-hide="userInfo.pwdEnable" ng-click="goLink('pwd')">修改密码</a>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -21,6 +21,7 @@
 <div id="vendor_left_bar" class="user_left fl" ng-controller="VendorMenuCtrl">
 	<a href="javascript:void(0)" ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></a>
 	<ul>
+		<div ng-hide="!(userInfo.pwdEnable && (userInfo.haveUserQuestion || (userInfo.userEmail==null?false:true)))">
 		<li ng-class="{'active' : active == 'vendor_order'}"><a href="javascript:void(0)" ui-sref="vendor_order">订单中心</a></li>
 		<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ui-sref="vendor_deliveryRule">物流管理</a></li>
 		<li ng-class="{'active' : active == 'vendor_invoice'}"><a href="javascript:void(0)" ui-sref="vendorInvoice">发票管理</a></li>
@@ -49,6 +50,38 @@
 			<!-- 我的店铺申述 store -->
 			<a href="javascript:void(0)" ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
 		</li>
+		</div>
+		<div ng-hide="userInfo.pwdEnable && (userInfo.haveUserQuestion || (userInfo.userEmail==null?false:true))">
+			<li ng-class="{'active' : active == 'vendor_order'}"><a href="javascript:void(0)" ng-disabled="true">订单中心</a></li>
+			<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ng-disabled="true">物流管理</a></li>
+			<li ng-class="{'active' : active == 'vendor_invoice'}"><a href="javascript:void(0)" ng-disabled="true" >发票管理</a></li>
+			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ui-sref="vendor_logistics">物流管理</a></li>-->
+			<li ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)"  ng-disabled="true" >结算中心</a></li>
+			<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a href="javascript:void(0)"  ng-disabled="true" >品牌申请</a></li>
+			<li ng-class="{'active' : active == 'vendor_component_apply'}"><a href="javascript:void(0)"  ng-disabled="true" >器件申请</a></li>
+			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)" ui-sref="vendor_productOn">产品导入</a></li>-->
+			<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)"  ng-disabled="true" >产品导入</a></li>
+			<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a href="javascript:void(0)" ui-sref="vendor_repository">仓库管理</a></li>-->
+			<li ng-class="{'active' : active == 'vendor_material'}"><a href="javascript:void(0)"  ng-disabled="true" >产品管理</a></li>
+			<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
+			<!--&lt;!&ndash;<a href="javascript:void(0)" ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
+			<!--售后处理-->
+			<!--</li>-->
+			<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><a href="javascript:void(0)" ui-sref="vendor_manufacture">原厂认证</a></li>-->
+			<li ng-class="{'active' : active == 'vendor_store'}">
+				<!-- 我要开店 !store && applyStatus == 'NONE' -->
+				<a href="javascript:void(0)" ng-disabled="true"  ng-if="!store && applyStatus == 'NONE'">开店申请</a>
+				<!-- 店铺申请中 !store && applyStatus == 'PREPARE' -->
+				<a href="javascript:void(0)" ng-disabled="true"  ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
+				<!-- 我的店铺 !store && applyStatus == 'PASS' -->
+				<a href="javascript:void(0)" ng-disabled="true"  ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
+				<!-- 我的店铺 store -->
+				<a href="javascript:void(0)" ng-disabled="true"  ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
+				<!-- 我的店铺申述 store -->
+				<a href="javascript:void(0)" ng-disabled="true"  ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
+			</li>
+
+		</div>
 		<li ng-class="{'active' : active == 'vendor_account_management'}"><a href="javascript:void(0)" ui-sref="vendor_account_management">账户管理</a></li>
 	</ul>
 </div>

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

@@ -99,7 +99,7 @@
 		z-index: 10000;
 		top: 7px;
 		left: 0;
-		width: 620px;
+		width: 46em;
 		box-shadow: 1px 1px 11px;
 		padding: 10px 0;
 		border-radius: 5px;

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

@@ -72,7 +72,7 @@
         z-index: 10000;
         top: 7px;
         left: 0;
-        width: 620px;
+        width: 46em;
         box-shadow: 1px 1px 11px;
         padding: 10px 0;
         border-radius: 5px;

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

@@ -87,11 +87,11 @@
                     <option value="{{info.question}}" ng-repeat="info in secQuestions" ng-if="info.type==1">{{info.question}}</option>
                 </select>
             </div>
+            <!--
             <div class="col">
                 <img ng-show="checkSuccess" src="static/img/user/images/input-check-yes.png" alt="">
-                <!--<i ng-show="checkSuccess" class="fa fa-check" style="color:#339933"></i>-->
-                <!--<i ng-show="checkFailed" class="fa fa-close" style="color:#CC3333;"></i>-->
             </div>
+             -->
         </div>
         <div class="row">
             <label class="col-md-3 col-sm-3 col text-right">答案：</label>
@@ -100,7 +100,7 @@
                 <!-- <div>密码复杂度</div> -->
             </div>
             <div class="col">
-                <img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">-->
                 <!--<i ng-show="checkSuccess1" class="fa fa-check" style="color:#339933"></i>-->
                 <!--<i ng-show="checkFailed1" class="fa fa-close" style="color:#CC3333;"></i>-->
             </div>
@@ -121,7 +121,7 @@
                 </select>
             </div>
             <div class="col">
-                <img ng-show="checkSuccess2" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<img ng-show="checkSuccess2" src="static/img/user/images/input-check-yes.png" alt="">-->
                 <!--<i ng-show="checkSuccess2" class="fa fa-check" style="color:#339933"></i>-->
                 <!--<i ng-show="checkFailed2" class="fa fa-close" style="color:#CC3333;"></i>-->
             </div>
@@ -133,7 +133,7 @@
                 <!-- <div>密码复杂度</div> -->
             </div>
             <div class="col">
-                <img ng-show="checkSuccess3" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<img ng-show="checkSuccess3" src="static/img/user/images/input-check-yes.png" alt="">-->
                 <!--<i ng-show="checkSuccess3" class="fa fa-check" style="color:#339933"></i>-->
                 <!--<i ng-show="checkFailed3" class="fa fa-close" style="color:#CC3333;"></i>-->
             </div>