Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/view/usercenter/forstore/home_center.html

@@ -32,8 +32,8 @@
                 <dl>
                     <dt><img src="static/img/user/images/user_photo.png" /></dt>
                     <dd>
-                        <span ng-cloak ng-bind="userInfo.userName" class="user"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
-                        <span ng-cloak ng-bind="'|&nbsp;' + userInfo.enterprise.enName || '个人账户'" class="enName"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                        <span ng-cloak ng-bind="userInfo.userName" class="user" title="{{userInfo.userName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                        <span ng-cloak ng-bind="'|&nbsp;' + userInfo.enterprise.enName || '个人账户'" class="enName" title="{{userInfo.enterprise.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
                         <a ui-sref="account_manager" href="#/accountManager/">账户设置&nbsp;》</a>
                     </dd>
                 </dl>

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

@@ -36,8 +36,8 @@
             <dl>
                 <dt><img src="static/img/vendor/images/user_photo.png" /></dt>
                 <dd>
-                    <span ng-bind="userInfo.userName" class="user"><br/><!--<em>账户余额：￥68899.99</em>--></span>
-                    <span ng-bind="'|&nbsp;' + vendor.enName || '个人账户'" class="enName"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                    <span ng-bind="userInfo.userName" class="user" title="{{userInfo.userName}}"><br/><!--<em>账户余额：￥68899.99</em>--></span>
+                    <span ng-bind="'|&nbsp;' + vendor.enName || '个人账户'" class="enName" title="{{vendor.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
                     <a ui-sref="vendor_account_management" href="#/account/management/">账户设置&nbsp;》</a>
                     <!--<p><img src="static/img/vendor/images/sell_grade.png"/>专有服务：******</p>-->
                 </dd>

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

@@ -501,6 +501,10 @@
 	.pro-recommend .check-active span{
 		font-weight: normal;
 	}
+	.pro-recommend .check-active span:hover{
+		color: #5078cb;
+		cursor: pointer;
+	}
 	.pro-recommend .pro-recommend-list ul li .pro-list-edit{
 		display: none;
 		width: 100%;

src/main/webapp/resources/view/vendor/modal/recommend_product_modal.html

@@ -126,6 +126,7 @@
 .content-tab .table tbody tr div{
     width: 100%;
     line-height: 24px;
+    overflow: hidden ;
 }
 .content-tab .table tbody tr div span{
     float: left;
@@ -152,6 +153,9 @@
     vertical-align: top !important;
     padding-top: 15px !important;
 }
+.v-top div p.produceDate{
+    text-align: left !important ;
+}
 .record-line {
     font-size: 12px;
     min-height: 30px;
@@ -345,11 +349,11 @@ input[type="number"] {
                     </td>
                     <td class="v-top">
                         <div>
-                            <p style="text-align: left;" ng-bind="commodity.produceDate | date : 'yyyy.MM.dd'">2017.07.10</p>
+                            <span>封装：</span>
+                            <span ng-bind="commodity.packaging">GHGH</span>
                         </div>
                         <div>
-                            <span>封装：</span>
-                            <span>GHGH</span>
+                            <p ng-bind="commodity.produceDate | date : 'yyyy.MM.dd'" class="produceDate">2017.07.10</p>
                         </div>
                     </td>
                     <td>
@@ -416,11 +420,11 @@ input[type="number"] {
                     </td>
                     <td class="v-top">
                         <div>
-                            <p style="text-align: left;" ng-bind="goods.produceDate | date : 'yyyy.MM.dd'">2017.07.10</p>
+                            <span>封装：</span>
+                            <span ng-bind="goods.packaging">GHGH</span>
                         </div>
                         <div>
-                            <span>封装：</span>
-                            <span>GHGH</span>
+                            <p class="produceDate" ng-bind="goods.produceDate | date : 'yyyy.MM.dd'">2017.07.10</p>
                         </div>
                     </td>
                     <td>