Merge remote-tracking branch 'origin/developerB' into developerB

# Conflicts:
#	src/main/resources/static/css/base/base.pc.css

src/main/resources/static/css/supplier-center/order/logistics.css

@@ -25,7 +25,7 @@
     .logist-right>div{margin-top: 5px;}
     .company-number>div{width: 49%;display: inline-block;margin: 2px 0;flex: 2;}
     .company{width: 210px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;color: #627386;padding-left: 10px;cursor: pointer;}
-    input::placeholder,textarea::placeholder {color: #627386;font-size: 12px;}
+    input::placeholder{color: #9aa5b5;font-size: 12px;}
     textarea::placeholder {color: #9aa5b5;}
     .red{color: #f94b4b;}
     .companyBtn{width: 36px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;margin-left: 8px;cursor: pointer;font-size: 18px}
@@ -51,7 +51,6 @@
     .defineBtn button{width: 90px;height: 36px;line-height: 36px;text-align: center;color: #fff;background-color: #e15616;border-radius: 2px;border: solid 1px #e15616;cursor: pointer;margin-right: 15px}
     .defineBtn{overflow: hidden;padding: 20px;}
     .defineBtn>div{float: right;}
-
 }
 
 /*移动*/

src/main/resources/static/js/supplier-center/order/delivergoods.js

@@ -57,7 +57,7 @@ var delivergoods = new Vue({
              var orderlist= JSON.stringify(_this.submitIds);
              var user = JSON.stringify(_this.userInfo);
                CAIMEI.Storage.setItem('orderList',orderlist);
-               CAIMEI.Storage.setItem('userInfo',user);
+               CAIMEI.Storage.setItem('userInfo_deliver',user);
                 setTimeout(function(){
                     window.location.href = '/supplier/order/logistics.html';
                 },200)

src/main/resources/static/js/supplier-center/order/logistics.js

@@ -143,7 +143,7 @@ var logistics = new Vue({
               console.log(_self.kdlist.length);
              }
           });
-        _self.userInfo =JSON.parse(CAIMEI.Storage.getItem('userInfo'));
+        _self.userInfo =JSON.parse(CAIMEI.Storage.getItem('userInfo_deliver'));
         _self.orderList = JSON.parse(CAIMEI.Storage.getItem('orderList'));
 
     }