产品导入文案修改

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_upload_ctrl.js

@@ -1,6 +1,6 @@
 define([ 'app/app' ], function(app) {
 	'use strict';
-	app.register.controller('vendorUploadCtrl', ['$scope', '$rootScope', 'ngTableParams', '$upload', '$q', 'AuthenticationService', 'BaseService', 'StoreInfo', 'SessionService', '$modal', 'toaster', 'ReleaseProductByBatch', 'Loading', 'Enterprise', 'DistributionRule', '$state', function ($scope, $rootScope, ngTableParams, $upload, $q, AuthenticationService, BaseService, StoreInfo, SessionService, $modal, toaster, ReleaseProductByBatch, Loading, Enterprise, DistributionRule, $state) {
+	app.register.controller('vendorUploadCtrl', ['$scope', '$rootScope', 'ngTableParams', '$upload', '$q', 'AuthenticationService', 'BaseService', 'StoreInfo', 'SessionService', '$modal', 'toaster', 'ReleaseProductByBatch', 'Loading', 'Enterprise', 'DistributionRule', '$state', '$location', function ($scope, $rootScope, ngTableParams, $upload, $q, AuthenticationService, BaseService, StoreInfo, SessionService, $modal, toaster, ReleaseProductByBatch, Loading, Enterprise, DistributionRule, $state, $location) {
 	    if (!$rootScope.$$productOn) {
             $rootScope.$$productOn = {};
             $rootScope.$$productOn.leadIn = 'bathOn';
@@ -15,12 +15,21 @@ define([ 'app/app' ], function(app) {
                 $state.reload();
             }
         };
+        if ($location.$$search.type == 'self') {
+            $scope.toggleActive('bathOnPerson');
+        }
         $scope.deletePop = false;
         $scope.personMedol =false;
         $scope.setPersonMedol = function () {
             $scope.personMedol =false;
         };
 
+        $scope.showTip = true;
+
+        $scope.closeTip = function () {
+            $scope.showTip = false;
+        }
+
         //获取币别信息
         Enterprise.getCurrencyByRegisterAddress(null, function (data) {
             if(data.code == 1) {

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

@@ -1946,8 +1946,8 @@
 						<img src="static/img/all/empty-cart.png">
 					</p>
 					<div class="empty-info">
-						<p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
-						<a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
+						<p class="grey"> 创建您的个人产品库，可为您精准推送客户需求 </p>
+						<a href="vendor#/vendor_upload?type=self"><i></i>马上去上传</a>
 					</div>
 				</div>
 				<div class="record-line text-right" ng-if="currenctMaterial.length != 0">

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

@@ -461,16 +461,44 @@
         border-bottom: 1px solid #5078cb !important;
         color: #5078cb !important;
     }
+    .result{
+        width: 100%;
+        height: 30px;
+        line-height: 30px;
+        text-align: center;
+        background: #fef6f2;
+        border: 1px solid #ec854d;
+        overflow: hidden ;
+    }
+    .result span{
+        margin-left: 330px;
+        height: 30px;
+        font-size: 14px;
+        color: #f15601;
+    }
+    .result span em{
+        font-size: 14px;
+        color: #f15601;
+    }
+    .result a{
+        padding-right: 10px;
+        float: right;
+        font-size: 20px;
+        font-weight: bold;
+        color: #ef1d1d;
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': $$productOn.tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="">批量发布</a></li>
-                <li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入我的产品</a></li>
+                <li ng-class="{'active': $$productOn.tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="">导入企业库</a></li>
+                <li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入个人库</a></li>
             </ul>
         </div>
+        <div class="result" ng-show="$$productOn.tab == 'bathOn' && showTip"><span class="fl"><em>*</em>导入企业库的产品同时会进行上架销售并展示在店铺</span><a ng-click="closeTip()" class="fr">&times;</a></div>
+        <div class="result" ng-show="$$productOn.tab == 'bathOnPerson' && showTip"><span class="fl"><em>*</em>创建您的个人产品库，可为您精准推送客户需求</span><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}">