Merge remote-tracking branch 'origin/feature-201819-wangcz' into feature-201819-wangcz

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -393,25 +393,19 @@ public class SecurityController {
 					// 从账户中心获取当前企业信息尽心保存
 					UserSpaceView userSpaceView = AccountUtils.findBySpaceUU(userAccount.getSpaceUU());
 					if (userSpaceView != null) {
-						if (!StringUtils.isEmpty(userSpaceView.getAccessSecret())) {
-							enterprise.setAccessSecret(userSpaceView.getAccessSecret());
-						}
+						enterprise = new Enterprise();
+						enterprise.setAccessSecret(userSpaceView.getAccessSecret());
 						enterprise.setEnAddress(userSpaceView.getRegAddress());
 						enterprise.setEnCorporation(userSpaceView.getCorporation());
 						enterprise.setEnBussinessCode(userSpaceView.getBusinessCode());
-						String enTel = enterprise.getEnTel();
-						if (enTel == null) {
-							enterprise.setEnTel(userSpaceView.getTelephone());
-							if (userSpaceView.getTelephone() == null) {
-								enterprise.setEnTel(userSpaceView.getAdmin().getMobile());
-							}
+						enterprise.setEnTel(userSpaceView.getTelephone());
+						if (userSpaceView.getTelephone() == null && userSpaceView.getAdmin() != null) {
+							enterprise.setEnTel(userSpaceView.getAdmin().getMobile());
 						}
 						enterprise.setEnName(userSpaceView.getSpaceName());
 						enterprise.setEnLogoUrl(userSpaceView.getBusinessCodeImage());
 						enterprise.setUu(Long.valueOf(userSpaceView.getSpaceUU()));
-						if (userSpaceView.getAdminUU() != null) {
-							enterprise.setEnAdminuu(userSpaceView.getAdminUU());
-						}
+						enterprise.setEnAdminuu(userSpaceView.getAdminUU());
 						enterprise.setEnValidCode(userSpaceView.getValidCode());
 						enterprise = enterpriseDao.save(enterprise);
 					}

src/main/webapp/resources/css/vendor/sell.css

@@ -3440,7 +3440,6 @@ body {
     background: #fff;
 }
 .com_tab ul li {
-    width: 100px;
     height:40px;
     text-align: center;
     float: left;
@@ -3448,8 +3447,8 @@ body {
 }
 .com_tab ul li a {
     font-size: 14px;
-    width: 100px;
     height:40px;
+    padding: 0 20px;
     display: inline-block;
 }
 .com_tab ul li.active a {
@@ -3521,10 +3520,7 @@ body {
 .com_tab:nth-of-type(2) ul li:first-child{
     margin-left: 0px
 }
-
-
-
-.:nth-of-type(1) ul li.active:after{
+.com_tab:nth-of-type(1) ul li.active:after{
     display: block
 }
 .log_company dl span.wd01 {

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

@@ -463,7 +463,6 @@
     }
     .remind-line{
         width: 100%;
-        height: 30px;
         line-height: 30px;
         text-align: center;
         background: #fef6f2;
@@ -471,8 +470,11 @@
         overflow: hidden ;
     }
     .remind-line span{
-        margin-left: 330px;
-        height: 30px;
+        width: 660px;
+        word-break: break-all;
+        display: inline-block;
+        margin-left: 190px;
+        text-align: left;
         font-size: 14px;
         color: #f15601;
     }
@@ -529,8 +531,8 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%" ng-if="!isPcbStore">
-                <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>
             <ul class="fl" style="width: 100%" ng-if="isPcbStore">
                 <li><a ui-sref="vendor_material">公司产品库</a></li>
@@ -541,7 +543,13 @@
             </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 href="help/helpDetail/56" target="_blank" class="operate-introduce">操作说明</a><a ng-click="closeTip()" class="fr">&times;</a></div>
+        <div class="remind-line" ng-show="$$productOn.tab == 'bathOnPerson' && showTip">
+            <span class="fl">
+                1、导入产品物料，可让您被搜索到且能获取相关产品的询价商机。<br/>
+                2、由于导入产品物料无须填写库存、交期、价格等信息，买家不能立即购买。<br/>
+                3、如希望立即购买请进行“导入产品并上架”操作，或“导入物料”后在“库存管理”里完成上架。
+            </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}">