Bläddra i källkod

开店申请跳转逻辑及提示横条样式修改

yangc 7 år sedan
förälder
incheckning
424804e7d7

+ 9 - 9
src/main/webapp/resources/css/vendor/sell.css

@@ -5317,35 +5317,35 @@ input:-webkit-autofill, input:-webkit-autofill:hover, input:-webkit-autofill:foc
 }
 
 /*提示横条*/
-.result{
+.com-result-line{
     width: 100%;
-    height: 35px;
-    line-height: 16px;
+    height: 30px;
+    line-height: 30px;
     text-align: center;
     background: #fef6f2;
     border: 1px solid #ec854d;
     overflow: hidden ;
 }
-.result span{
-    /*margin-left: 330px;*/
+.com-result-line span{
+    margin-left: 330px;
     height: 30px;
     font-size: 14px;
     color: #f15601;
 }
-.result span em{
+.com-result-line span em{
     font-size: 14px;
     color: #f15601;
 }
-.result span a {
+.com-result-line span a {
     color: #5078cb;
 }
-.result a.fr{
+.com-result-line a.fr{
     padding-right: 10px;
     font-size: 20px;
     font-weight: bold;
     color: #ef1d1d;
 }
-.result .operate-introduce {
+.com-result-line .operate-introduce {
     font-size: 14px;
     color: #5078cb;
 }

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

@@ -627,7 +627,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 		}
 	});
 
-	app.run(['$rootScope', '$state', '$q', 'BaseService', 'StoreInfo', function($rootScope, $state, $q, BaseService, StoreInfo) {
+	app.run(['$rootScope', '$state', '$q', 'BaseService', 'StoreInfo', '$location', function($rootScope, $state, $q, BaseService, StoreInfo, $location) {
 		$rootScope.rootPath = BaseService.getRootPath();
 		$rootScope.page = 'vendor';// 导航栏状态,'个人中心'状态激活
 
@@ -677,8 +677,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 				$rootScope.applyStatus = 'NONE';
 			}
 
-
-			if ($rootScope.applyStatus === 'NONE') {
+			if ($rootScope.applyStatus === 'NONE' && $location.$$path === '/index') {
 				$state.go('vendor_store_apply');
 			}
 

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

@@ -2313,7 +2313,7 @@
 			</div>
 			<div class="wanted_list01">
 				<div style="width: 96%; margin: 0 auto">
-					<div class="result" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
+					<div class="com-result-line" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
 					<div class="tab-head">匹配失败的产品</div>
 					<table class="fail-tab public-tab table public-tabs">
 						<thead>

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_person_erp.html

@@ -1830,7 +1830,7 @@
 						</tr>
 						</thead>
 						<tbody class="bg-show">
-						<div class="result" ng-if="resultTip"><span class="fl"><em>*</em>创建您的个人产品库,可为您精准推送客户需求</span>
+						<div class="com-result-line" ng-if="resultTip"><span class="fl"><em>*</em>创建您的个人产品库,可为您精准推送客户需求</span>
 							<a href="help/helpDetail/56" target="_blank" class="operate-introduce">操作说明</a>
 							<a ng-click="closeTip()" class="fr">&times;</a>
 						</div>
@@ -2339,7 +2339,7 @@
 			</div>
 			<div class="wanted_list01">
 				<div style="width: 96%; margin: 0 auto">
-					<div class="result" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
+					<div class="com-result-line" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
 					<div class="tab-head">匹配失败的产品</div>
 					<table class="fail-tab public-tab table public-tabs">
 						<thead>

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

@@ -2193,7 +2193,7 @@
 			</div>
 			<div class="wanted_list01">
 				<div style="width: 96%; margin: 0 auto">
-					<div class="result" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
+					<div class="com-result-line" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
 					<div class="tab-head">匹配失败的产品</div>
 					<table class="fail-tab public-tab table public-tabs">
 						<thead>

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -1822,7 +1822,7 @@
 					</tr>
 					</thead>
 					<tbody class="bg-show">
-                    <div class="result" ng-if="resultTip"><span class="fl"><em>*</em>创建您的个人产品库,可为您精准推送客户需求</span>
+                    <div class="com-result-line" ng-if="resultTip"><span class="fl"><em>*</em>创建您的个人产品库,可为您精准推送客户需求</span>
                         <a href="help/helpDetail/56" target="_blank" class="operate-introduce">操作说明</a>
                         <a ng-click="closeTip()" class="fr">&times;</a>
                     </div>
@@ -2330,7 +2330,7 @@
 			</div>
 			<div class="wanted_list01">
 				<div style="width: 96%; margin: 0 auto">
-					<div class="result" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
+					<div class="com-result-line" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
 					<div class="tab-head">匹配失败的产品</div>
 					<table class="fail-tab public-tab table public-tabs">
 						<thead>

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/vendor_store_apply.html

@@ -389,11 +389,11 @@
 		color: #fff;
 		text-decoration: none;
 	}
-	.result {
+	.com-result-line {
 		margin-bottom: 31px;
 		margin-top: -20px;
 	}
-	.result span {
+	.com-result-line span {
 		margin-left: 160px;
 	}
 </style>
@@ -486,7 +486,7 @@
 	</div>-->
 </div>
 <div class="container vendor_store_apply user_right" style="margin-top: 15px;padding: 0;min-height: 330px; padding-top: 20px; padding-bottom: 20px;">
-	<div class="result" ng-if="resultTip"><span class="fl"><em>*</em>店铺开通后,可<a href="vendor#/vendor_upload" target="_blank">&nbsp;上传产品&nbsp;</a>至自己的店铺展示销售;如不想开店,可<a href="vendor#/vendor_upload" target="_blank">&nbsp;上传产品&nbsp;</a>在优软商城中寄售由商城代为售卖。</span><a ng-click="closeTip()" class="fr">&times;</a></div>
+	<div class="com-result-line" ng-if="resultTip"><span class="fl"><em>*</em>店铺开通后,可<a href="vendor#/vendor_upload" target="_blank">&nbsp;上传产品&nbsp;</a>至自己的店铺展示销售;如不想开店,可<a href="vendor#/vendor_upload" target="_blank">&nbsp;上传产品&nbsp;</a>在优软商城中寄售由商城代为售卖。</span><a ng-click="closeTip()" class="fr">&times;</a></div>
 	<div>
 		<!-- Nav tabs -->
 		<ul class="nav nav-tabs" role="tablist" style="height: 41px; background: none;padding: 0 40px;">