Merge branch 'dev' into fix_#3_consignment

# Conflicts:
#	src/main/webapp/resources/js/vendor/controllers/forstore/vendor_standard_putOn_ctrl.js

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

@@ -113,7 +113,7 @@ define(['app/app'], function (app) {
             standard.editMinBuyQty = standard.minBuyQty;
             standard.editQtyPrices = angular.copy(standard.qtyPrices);
             standard.editIsSelfSale = !standard.selfSale ? false : true;
-            standard.editSelfSaleNum = standard.editIsSelfSale ? 1 : 0;
+            standard.editSelfSaleNum = standard.editIsSelfSale ? 0 : 1;
             standard.editLockQty = standard.lockQty;
             standard.editAvailableOnSale = standard.availableOnSale;
             standard.editOnSaleQty = standard.onSaleQty;
@@ -416,7 +416,7 @@ define(['app/app'], function (app) {
          * 改变销售方式
          */
         $scope.changeSale = function (standard) {
-            standard.editIsSelfSale = standard.editSelfSaleNum == 1;
+            standard.editIsSelfSale = standard.editSelfSaleNum == 0;
 
             if (!standard.editIsSelfSale) {
 				checkAndShowConsignmentAgreement(standard);
@@ -438,8 +438,8 @@ define(['app/app'], function (app) {
 					}).result.then(function(){
 						toaster.pop('success', '操作成功');
 					}, function(){
-						standard.editSelfSaleNum = 1;
-						standard.editIsSelfSale = standard.editSelfSaleNum === 1;
+						standard.editSelfSaleNum = 0;
+						standard.editIsSelfSale = standard.editSelfSaleNum === 0;
 					});
 				}
 			}, function (error) {

src/main/webapp/resources/view/common/site-nav.html

@@ -111,6 +111,7 @@
     #site-nav * {
         box-sizing: border-box;
         list-style: none;
+        white-space: nowrap;
     }
     .unstyled a:hover,.dropdown-menu a:hover{
         color: #d32526;
@@ -119,6 +120,13 @@
     .logout:hover{
         color: #f00;
     }
+    .member-text{
+        width: 80%;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: inline-block;
+    }
 </style>
 <nav id="site-nav">
     <ul class="ghost-center" ng-controller="AuthenticationCtrl">
@@ -136,13 +144,13 @@
                 <span ng-bind="userInfo.userName"></span>
                 <span href="javascript:void(0)" ng-click="logout()" class="logout">[退出]</span>
             </a>
-            <div class="dropdown-menu" style="top: 36px; left: 0; width: 220px;">
+            <div class="dropdown-menu" style="top: 36px; left: 0; min-width: 220px;">
                <!-- <p>欢迎您，<span ng-bind="userInfo.userName"></span>
                     <a href="javascript:void(0)" class="pull-right" ng-click="logout()">退出</a>
                 </p>-->
                 <p>
                     <!--<i class="fa fa-map-marker"></i> <span ng-if="userInfo.enterprises" ng-bind="userInfo.enterprise.enName"></span><span ng-if="!userInfo.enterprises" ng-bind="userInfo.userName"></span><span ng-if="!userInfo.enterprises">（个人账户）</span>-->
-                    <i class="fa fa-map-marker"></i> <span ng-if="userInfo.enterprise" ng-bind="userInfo.enterprise.enName"></span><span ng-if="!userInfo.enterprise" ng-bind="userInfo.userName"></span><span ng-if="!userInfo.enterprise">（个人账户）</span>
+                    <i class="fa fa-map-marker"></i> <span ng-if="userInfo.enterprise" ng-bind="userInfo.enterprise.enName" class="member-text"></span><span ng-if="!userInfo.enterprise" ng-bind="userInfo.userName" class="member-text"></span><span ng-if="!userInfo.enterprise">（个人账户）</span>
                     <a href="javascript:void(0)" class="pull-right" ng-if="userInfo.enterprises" ng-click="toggleSwitch()" ng-bind="switching?'取消':'切换'">切换</a>
                 </p>
                 <ul class="unstyled" ng-show="switching" style="-webkit-padding-start: 0;">

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

@@ -563,8 +563,8 @@
                             <div>
                                 <span>
                                     <select ng-disabled="!$$putOn.isSelfStore" ng-change="changeSale(standard)" ng-model="standard.editSelfSaleNum" class="select-adder form-control" style="width: 88px;">
-										<option value="1">自营</option>
-										<option value="0">寄售</option>
+										<option value="0">自营</option>
+										<option value="1">寄售</option>
 									</select>
                                 </span>
                             </div>