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

src/main/resources/static/css/account/register.css

@@ -39,7 +39,7 @@ footer .footTop{display:none;}
 .formLine .form-upload-image{width: 128px;height: 90px;position: relative;}
 .formLine .form-upload-image .upload-img{width: 128px;height: 90px;display: block;}
 .formLine .form-upload-image .icon{width: 20px;height: 20px;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
-.formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -116px -140px;}
+.formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -114px -140px;}
 
 .signAccount{width:498px;margin:0 auto;min-height: 900px;}
 .signAccount .title{height:42px;line-height:42px;font-weight:bold;font-size:32px;color:#22272e;text-align:center;padding:30px}

src/main/resources/static/js/supplier-center/shop/release.js

@@ -44,7 +44,7 @@ var releaseContainer = new Vue({
             minBuyNumber:'',//起订量
             stock:'',//库存
             step:1,//购买数量
-            byFlag:0,//运费
+            // byFlag:0,//运费
             allAreaFlag:1,//销售区域
             provinceIDs:0,//指定区域
             detailInfo:'',//商品详情信息

src/main/resources/templates/account/supplier-information.html

@@ -58,7 +58,7 @@
                         </select>
                         <textarea placeholder="请输入您的详细联系地址"  v-model="supplierUser.address" @blur="blurHandle($event)" needverify></textarea>
                         <i class="checked icon mIcon"></i>
-                        <span class="errTips icon mIcon" tips="" :class="flagshow?'show':''">请输入正确的联系地址</span>
+                        <span class="errTips icon mIcon" tips="" :class="flagshow?'show':''">请输完善联系地址</span>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>营业执照编号：</p>