!180 Leung

Merge pull request !180 from Admin/sit-Carl

rc-busness/components/header.vue

@@ -76,7 +76,7 @@
 	        <a href="https://royalcanin.com.cn/dogs" class="rc-list__header" data-ref="nav-link" role="menuitem" title="犬">犬</a>
 	      </li>
 	      <li class="rc-list__item">
-	        <a href="/productdetails/productlist/" class="rc-list__header" data-ref="nav-link" role="menuitem" title="定制营养方案">定制营养方案</a>
+	        <a href="/productdetails/productlist/" class="rc-list__header" data-ref="nav-link" role="menuitem" title="官方商城">官方商城</a>
 	      </li>
 	      <li class="rc-list__item">
 	        <a href="https://royalcanin.com.cn/about" class="rc-list__header" data-ref="nav-link" role="menuitem" title="关于我们">关于我们</a>
@@ -131,7 +131,7 @@
 				  </li>
 				  <li class="rc-list__item rc-list__item--group">
 	          <img src="../assets/showimage/sub-nav-3.jpg" class="ts-head-img rc-margin-bottom--xs">
-	          <a href="/productdetails/productlist/" class="rc-list__header rc-margin--none" role="menuitem">定制营养方案</a>
+	          <a href="/productdetails/productlist/" class="rc-list__header rc-margin--none" role="menuitem">官方商城</a>
 				    <ul class="rc-list rc-list--blank rc-list--align test" role="menu">
 				      <li class="rc-list__item">
 				        <a href="/productdetails/productlist/?stype=0" class="rc-list__link" role="menuitem">猫系列</a>
@@ -252,13 +252,13 @@
 	              </li>
 	
 	              <li class="rc-list__item rc-list__item--group">
-	              	<a href="/productdetails/productlist/" class="rc-list__header" role="menuitem" id="mega-nav-header-3" data-toggle="nav-list-3">定制营养方案</a>
+	              	<a href="/productdetails/productlist/" class="rc-list__header" role="menuitem" id="mega-nav-header-3" data-toggle="nav-list-3">官方商城</a>
 	                <ul class="rc-list rc-list--blank rc-list--align" id="nav-list-3" aria-labelledby="mega-nav-menu-3" role="menu">
 	                  <li class="rc-list__item rc-md-down">
 	                    <button class="rc-list__link rc-icon rc-left--xs rc-iconography" data-toggle="nav-list-3" role="button">返回</button>
 	                  </li>
 	                  <li class="rc-list__item rc-md-down">
-	                    <a href="/productdetails/productlist/" class="rc-list__header" title="Nutrition" role="menuitem">定制营养方案</a>
+	                    <a href="/productdetails/productlist/" class="rc-list__header" title="Nutrition" role="menuitem">官方商城</a>
 					  </li>
 					  <li class="rc-list__item">
 					  	<a href="/productdetails/productlist/?stype=0" class="rc-list__link ca" role="menuitem">猫系列</a>

rc-busness/components/rc-footer.vue

@@ -49,7 +49,7 @@
             </li>
             <li class="rc-list__item rc-list__item--group" role="none">
               <a href="/productdetails/productlist/" class="rc-list__header" role="menuitem" id="nav-footer-top-3" data-toggle="nav-footer-3"
-               	>定制营养方案
+               	>官方商城
               </a>
               <ul class="rc-list rc-list--blank rc-list--align" id="nav-footer-3" aria-labelledby="nav-footer-top-3" role="menu">
               	<li class="rc-list__item">

smart-admin-service/pom.xml

@@ -325,7 +325,9 @@
             <properties>
                 <profiles.active>dev</profiles.active>
             </properties>
-           
+           <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <profile>
             <id>telework</id>
@@ -350,9 +352,7 @@
             <properties>
                 <profiles.active>prod</profiles.active>
             </properties>
-            <activation>
+            
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
     </profiles>