Merge branch 'dev-mysql' into feature_release-tomysql

src/main/resources/dev/account.properties

@@ -7,6 +7,7 @@ sso.app=mall
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
+sso.cookie.browser=false
 sso.login.url=http://113.105.74.135:8001/sso/login
 sso.logout.url=http://113.105.74.135:8001/sso/logout
 sso.register.url=http://113.105.74.135:8001/sso/register_p

src/main/resources/prod/account.properties

@@ -9,6 +9,7 @@ sso.cookie.domain=usoftmall.com
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=true
 sso.cookie.httponly=true
+sso.cookie.browser=false
 sso.login.url=https://account.ubtob.com/sso/login
 sso.logout.url=https://account.ubtob.com/sso/logout
 sso.register.url=https://account.ubtob.com/sso/register_p

src/main/resources/test/account.properties

@@ -7,6 +7,7 @@ sso.app=mall
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
+sso.cookie.browser=false
 sso.login.url=http://113.105.74.135:8001/sso/login
 sso.logout.url=http://113.105.74.135:8001/sso/logout
 sso.register.url=http://113.105.74.135:8001/sso/register_p

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

@@ -677,13 +677,16 @@
 		font-size: 14px;
 		color: #f15601;
 	}
-	.result a{
+	.result a.fr{
 		padding-right: 10px;
-		float: right;
 		font-size: 20px;
 		font-weight: bold;
 		color: #ef1d1d;
 	}
+    .result .operate-introduce {
+        font-size: 14px;
+        color: #5078cb;
+    }
 	.tab-head{
 		width: 100%;
 		height: 40px;
@@ -1550,6 +1553,10 @@
 					</tr>
 					</thead>
 					<tbody class="bg-show">
+                    <div class="result" 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>
 					<!--<tr style="height: 14px;" ng-show="!isBatch && standard_tab == 'standard'">-->
 					<tr style="height: 14px;">
 						<td colspan="6" class="hei18"></td>

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

@@ -476,13 +476,16 @@
         font-size: 14px;
         color: #f15601;
     }
-    .remind-line a{
+    .remind-line a.fr{
         padding-right: 10px;
-        float: right;
         font-size: 20px;
         font-weight: bold;
         color: #ef1d1d;
     }
+    .remind-line .operate-introduce {
+        font-size: 14px;
+        color: #5078cb;
+    }
     .device .wanted_list01 .pagination > li > a:hover {
         border-bottom: 1px solid #ddd !important;
         z-index: 0;
@@ -502,7 +505,7 @@
             </ul>
         </div>
         <div class="remind-line" ng-show="$$productOn.tab == 'bathOn' && showTip"><span class="fl">导入企业库的产品同时会进行上架销售并展示在店铺</span><a ng-click="closeTip()" class="fr">&times;</a></div>
-        <div class="remind-line" ng-show="$$productOn.tab == 'bathOnPerson' && showTip"><span class="fl">创建您的个人产品库，可为您精准推送客户需求</span><a ng-click="closeTip()" class="fr">&times;</a></div>
+        <div class="remind-line" ng-show="$$productOn.tab == 'bathOnPerson' && showTip"><span class="fl">创建您的个人产品库，可为您精准推送客户需求</span><a href="help/helpDetail/56" target="_blank" class="operate-introduce">操作说明</a><a ng-click="closeTip()" class="fr">&times;</a></div>
         <div class="wanted_list01">
             <div class="tab" ng-if="$$productOn.leadIn == 'bathOn'" ng-class="{'active': leadIn == 'bathOn'}" >
                 <div class="load_next" ng-class="{'border-none':open01}">