Merge remote-tracking branch 'origin/master'

components/register-saler/register/StepFirst.vue

@@ -521,7 +521,7 @@
         this.validUpload.isValidUpload = this.data.url !== ''
       },
       licenceCheck: function (num) {
-        if ((/^\S{1,255}$/).test(this.data.licenceId)) {
+        if ((/^[\S\-]{1,255}$/).test(this.data.licenceId)) {
           if (num > 0) {
             this.$http.post('/basic/enterprise/register/valid/businessCode?businessCode=' + this.data.licenceId)
               .then(response => {

components/store/BaseInfo.vue

@@ -34,7 +34,7 @@
             <div v-text="storeInfo.enterprise.enName">深圳市华商龙商务互联科技有限公司</div>
             <div v-if="storeInfo.enterprise.enAddress.length >0">地址：<span v-text="storeInfo.enterprise.enAddress">深圳市南山区科技园科技南五路英唐大厦一楼</span></div>
             <div v-if="storeInfo.enterprise.enTel.length >0">电话：<span v-text="storeInfo.enterprise.enTel">0755-26038000/26038047/26038008/86140880</span></div>
-            <div v-if="storeInfo.enterprise.enFax.length > 0">传真：<span v-text="storeInfo.enterprise.enFax">0755-26038111</span></div>
+            <div v-if="storeInfo.enterprise.enFax && storeInfo.enterprise.enFax.length > 0">传真：<span v-text="storeInfo.enterprise.enFax">0755-26038111</span></div>
           </div>
         </div>
       </div>