Merge branch 'dev-mysql' into feature_release-tomysql

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

@@ -15,8 +15,10 @@ define([ 'app/app' ], function(app) {
                 $state.reload();
             }
         };
-        if ($location.$$search.type == 'self') {
-            $scope.toggleActive('bathOnPerson');
+        if ($location.$$search.type && $location.$$search.type == 'self') {
+            $rootScope.$$productOn.tab = 'bathOnPerson';
+        } else if ($location.$$search.type && $location.$$search.type == 'company'){
+            $rootScope.$$productOn.tab = 'bathOn';
         }
         $scope.deletePop = false;
         $scope.personMedol =false;

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

@@ -1,4 +1,4 @@
-<!--右侧主体部分-->
+F<!--右侧主体部分-->
 <style>
 	.tab.active {
 		display: inline-block !important;
@@ -1818,7 +1818,7 @@
 													<div class="content width140">
 														<p class="title"><span>包装：</span><span ng-bind="goods.packaging">盘装</span></p>
 														<p class="title"><span>生产日期：</span><span ng-bind="goods.produceDate">20160123</span></p>
-														<p class="title" ng-class="{'noBreak' : !goods.breakUp}" ng-bind="goods.breakUp ? '可拆卖' : '不可拆卖'">不可拆卖</p>
+														<p class="title" ng-class="{'noBreak' : !goods.breakUp}" ng-if="goods.breakUp" ng-bind="goods.breakUp ? '可拆卖' : '不可拆卖'">不可拆卖</p>
 													</div>
 													<div class="content width130">
 														<p class="title"><span>库存：</span><span ng-bind="goods.reserve">9023492</span></p>
@@ -2032,7 +2032,7 @@
 					</p>
 					<div class="empty-info">
 						<p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
-						<a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
+						<a href="vendor#/vendor_upload?type=company"><i></i>马上去上传</a>
 					</div>
 				</div>
 				<div class="record-line text-right" ng-if="currenctMaterial.length != 0">
@@ -2227,7 +2227,7 @@
 							</div>
 							<div class="detail">
 								<div class="detail-title">销售方式：<span ng-bind="goods.selfSale">寄售</span></div>
-								<div class="detail-title" ng-bind="goods.breakUp ? '可拆卖':'不可拆卖'">不可拆卖</div>
+								<div class="detail-title" ng-bind="goods.breakUp ? '可拆卖':'不可拆卖'"></div>
 							</div>
 							<div class="detail width100">
 								<div class="title-price"><span>梯度/pcs</span><span>单价(<i ng-bind="goods.currencyName == 'RMB' ? '￥':'$'"></i>)</span></div>

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

@@ -866,7 +866,7 @@
                                 <span ng-bind="commodity.produceDate || '-'" title="{{commodity.produceDate}}" class="marginL5"></span>
                             </div>
                             <div class="margin0">
-                                <span ng-bind="commodity.breakUp ? '可拆卖' : '不可拆卖'" class="marginL5">可拆卖</span>
+                                <span ng-if="commodity.breakUp" class="marginL5">可拆卖</span>
                             </div>
                         </td>
                         <td>

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

@@ -461,7 +461,7 @@
         border-bottom: 1px solid #5078cb !important;
         color: #5078cb !important;
     }
-    .result{
+    .remind-line{
         width: 100%;
         height: 30px;
         line-height: 30px;
@@ -470,23 +470,25 @@
         border: 1px solid #ec854d;
         overflow: hidden ;
     }
-    .result span{
+    .remind-line span{
         margin-left: 330px;
         height: 30px;
         font-size: 14px;
         color: #f15601;
     }
-    .result span em{
-        font-size: 14px;
-        color: #f15601;
-    }
-    .result a{
+    .remind-line a{
         padding-right: 10px;
         float: right;
         font-size: 20px;
         font-weight: bold;
         color: #ef1d1d;
     }
+    .device .wanted_list01 .pagination > li > a:hover {
+        border-bottom: 1px solid #ddd !important;
+    }
+    .device .wanted_list01 .pagination > .active > a {
+        border: 1px solid #337ab7 !important;
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->
@@ -497,8 +499,8 @@
                 <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="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="wanted_list01">
             <div class="tab" ng-if="$$productOn.leadIn == 'bathOn'" ng-class="{'active': leadIn == 'bathOn'}" >
                 <div class="load_next" ng-class="{'border-none':open01}">