yangc 7 years ago
parent
commit
f67842b2b3

BIN
jpg


+ 1 - 3
src/main/webapp/resources/js/vendor/app.js

@@ -697,9 +697,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
                     });
                     $rootScope.userInfo = data;
 					if ($rootScope.applyStatus === 'NONE') {
-						if (!(!data.pwdEnable || !data.haveUserQuestion||!data.emailValidCode || data.emailValidCode != 2)) {
-							$state.go('vendor_store_apply');
-						}
+						$state.go('vendor_store_apply');
 					} else if ($rootScope.applyStatus === 'PASS') {
 						$state.go('vendor_store_maintain');
 					}

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -585,7 +585,7 @@ define(['app/app'], function (app) {
 
         // 填写物流信息
         $scope.toBeShiped = function (purchase) {
-            if(!($scope.userInfo.pwdEnable && $scope.userInfo.haveUserQuestion && ($scope.userInfo.userEmail==null?false:true))){
+            if(!($scope.userInfo.pwdEnable && $scope.userInfo.haveUserQuestion && $scope.userInfo.emailValidCode == 2)){
                 $scope.openHomeCenterModel();
             } else {
                 bankInfoService.getVenderBankDefault(null, function (data) {

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -702,7 +702,7 @@
 					<span>主营产品</span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<textarea class="form-control" style="border-radius: inherit;resize: none;height: 200px;" title="description" ng-model="sampleStore.description" maxlength="500" required></textarea>
+					<textarea class="form-control" style="border-radius: inherit;resize: none;height: 200px;" title="description" ng-model="sampleStore.description" maxlength="500"></textarea>
 				</div>
 			</div>
 			<!--<div class="row com_row" style="margin-top: 10px;">