处理个人帐套只有一个时，不能与个人切换的bug

components/default/Header.vue

@@ -17,7 +17,7 @@
               <ul class="dropdown-menu">
                 <li class="menu-item-first">
                   <span><i class="fa fa-map-marker"></i>&nbsp;{{ enterprise.enName }}</span>
-                  <a class="pull-right" @click="toggleEnterprises()" v-if="user.data.enterprises && user.data.enterprises.length > 1">
+                  <a class="pull-right" @click="toggleEnterprises()" v-if="user.data.enterprises && user.data.enterprises.length > 0">
                     {{ showEnterprises ? '取消' : '切换' }}
                   </a>
                 </li>
@@ -26,7 +26,7 @@
                     v-if="showEnterprises && en.enName!=enterprise.enName">
                   <a @click="switchEnterprise(en)">{{ en.enName }}</a>
                 </li>
-                <li class="menu-item"  v-if="showEnterprises">
+                <li class="menu-item"  v-if="showEnterprises && enterprise.uu">
                   <a @click="switchEnterprise({uu: 0})">（<span v-text="user.data.userName"></span>）个人账户</a>
                 </li>
               </ul>

components/register-saler/register/StepFirst.vue

@@ -10,6 +10,9 @@
         <div class="col-sm-5">
           <input type="text" @change="nameCheck" :disabled="!loginData.isSelf" v-model="data.name" class="form-control" name="name" required="" placeholder="填写营业执照上的企业名称">
         </div>
+        <div class="x-text-help" v-show="validName.isValidTypeName && validName.isValidName && !validName.init">
+          <i class="glyphicon glyphicon-ok x-icon-left"></i>
+        </div>
         <div class="col-sm-5" v-show="!validName.isValidTypeName && !validName.init">
           <p>
             <i class="fa fa-info-circle"></i>请填写正确的企业名称，2~99个字符
@@ -26,6 +29,9 @@
         <div class="col-sm-5">
           <input type="text" :disabled="!loginData.isSelf" @change="simpleNameCheck" v-model="data.simpleName" class="form-control" name="name" required="" placeholder="请填写正确的企业名称，2~40个字符">
         </div>
+        <div class="x-text-help" v-show="validSimpleName.isValidSimpleName && !validSimpleName.init">
+          <i class="glyphicon glyphicon-ok x-icon-left"></i>
+        </div>
         <div class="col-sm-5" v-show="!validSimpleName.isValidSimpleName && !validSimpleName.init">
           <p>
             <i class="fa fa-info-circle"></i>请填写正确的企业名称，2~40个字符
@@ -35,13 +41,16 @@
       <div class="row">
         <label class="col-sm-2 x-required">营业执照：</label>
         <div class="col-sm-5">
-          <a class="x-btn-blank" v-if="loginData.isSelf">
+          <a class="x-btn-blank" v-if="loginData.isSelf" title="请上传营业执照扫描件（≤5M的图片或PDF）">
             <i class="fa fa-picture-o"></i>
             请上传营业执照扫描件（≤5M的图片或PDF）
             <input type="file" @change="upload" class="form-control file-input" name="name" required="" placeholder="请上传营业执照扫描件（≤5M的图片或PDF）" accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png,.pdf">
           </a>
           <img class="previewImg" v-if="data.url != ''" :src="isPdf?'/images/all/timg.png':data.url" alt="">
         </div>
+        <div class="x-text-help" v-show="validUpload.isValidUpload && !validUpload.init">
+          <i class="glyphicon glyphicon-ok x-icon-left"></i>
+        </div>
         <div class="col-sm-5" v-show="!validUpload.isValidUpload && !validUpload.init"><p><i class="fa fa-info-circle"></i>请上传营业执照扫描件（≤5M的图片或PDF）</p></div>
       </div>
       <div class="row">
@@ -49,6 +58,9 @@
         <div class="col-sm-5">
           <input type="text" :disabled="!loginData.isSelf" @change="licenceCheck" v-model="data.licenceId" class="form-control" name="name" required="" placeholder="请填写营业执照上的注册号">
         </div>
+        <div class="x-text-help" v-show="validLicence.isValidLicence && !validLicence.init">
+          <i class="glyphicon glyphicon-ok x-icon-left"></i>
+        </div>
         <div class="col-sm-5" v-show="!validLicence.isValidLicence && !validLicence.init"><p><i class="fa fa-info-circle"></i>请填写营业执照上的注册号</p></div>
       </div>
       <div class="row">
@@ -98,13 +110,16 @@
             </div>
           </div>
         </div>
+        <div class="x-text-help" v-show="validAddress.isValidAddress && !validAddress.init">
+          <i class="glyphicon glyphicon-ok x-icon-left"></i>
+        </div>
         <div class="col-sm-5" v-show="!validAddress.isValidAddress && !validAddress.init"><p><i class="fa fa-info-circle"></i>填写总部所在地详细地址</p></div>
       </div>
       <div class="row">
         <label class="col-sm-2">官网地址：</label>
         <div class="col-sm-5">
-          <input type="url" :disabled="!loginData.isSelf" @change="websiteCheck" v-model="data.website" class="form-control" name="name" required="" placeholder="www.example.com" style="padding-left:55px;">
-          <span class="web">http://</span>
+          <input type="url" :disabled="!loginData.isSelf" @change="websiteCheck" v-model="data.website" class="form-control" name="name" required="" placeholder="例如：http://www.example.com">
+         <!-- <span class="web">http://</span>-->
         </div>
         <div class="col-sm-5"></div>
       </div>
@@ -224,6 +239,7 @@
           }
           this.$emit('registerAction', data)
           this.$emit('sectionEvent', type)
+          this.$emit('businessImgUrlAction', this.data.url)
         }
       },
       upload: function (e) {
@@ -285,13 +301,19 @@
           this.validAddress.isValidAddress
       },
       nameCheck: function () {
-        this.validName.init = false
+        let tmpInit = this.validName.init
+        this.validName.init = true
         this.$http.post('/basic/enterprise/register/valid/name?name=' + this.data.name)
           .then(response => {
-            this.validName.isValidName = response.data.success
+            if (response.data.code !== 12) {
+              this.validName.init = false
+              this.validName.isValidName = response.data.success
+              this.validName.isValidTypeName = this.data.name !== '' && this.data.name.length >= 2 && this.data.name.length <= 99 && this.commonValid(this.data.name)
+              this.validCheck()
+            } else {
+              this.validName.init = tmpInit
+            }
           })
-        this.validName.isValidTypeName = this.data.name !== '' && this.data.name.length >= 2 && this.data.name.length <= 99 && this.commonValid(this.data.name)
-        this.validCheck()
       },
       simpleNameCheck: function () {
         this.validSimpleName.init = false
@@ -303,12 +325,18 @@
         this.validUpload.isValidUpload = this.data.url !== ''
       },
       licenceCheck: function () {
-        this.validLicence.init = false
+        let tmpInit = this.validLicence.init
+        this.validLicence.init = true
         this.$http.post('/basic/enterprise/register/valid/businessCode?businessCode=' + this.data.licenceId)
           .then(response => {
-            this.validLicence.isValidLicence = response.data.success && this.data.licenceId
+            if (response.data.code !== 12) {
+              this.validLicence.init = false
+              this.validLicence.isValidLicence = response.data.success && this.data.licenceId
+              this.validCheck()
+            } else {
+              this.validLicence.init = tmpInit
+            }
           })
-        this.validCheck()
       },
       addressCheck: function () {
         this.validAddress.init = false
@@ -347,6 +375,9 @@
       },
       getCity: function (province) {
         this.cityData.city = []
+        this.address.currentCity = ''
+        this.cityData.district = []
+        this.address.currentDistrict = ''
         this.address.currentProvince = province
         for (let item in this.temCityData[province]) {
           this.cityData.city.push(item)
@@ -354,18 +385,23 @@
       },
       getDistrict: function (city) {
         this.address.currentCity = city
+        this.address.currentDistrict = ''
         this.cityData.district = this.temCityData[this.address.currentProvince][city]
       },
       chooseDistrict: function (district) {
         this.address.currentDistrict = district
       },
       submitAddress: function () {
-        if (this.address.detail !== '') {
-          this.data.address = this.address.currentProvince + this.address.currentCity + this.address.currentDistrict + this.address.detail
-          this.showAddressBox = false
-          this.addressCheck()
+        if (this.address.currentDistrict !== '' && this.address.currentCity !== '' && this.address.currentProvince !== '') {
+          if (this.address.detail !== '') {
+            this.data.address = this.address.currentProvince + this.address.currentCity + this.address.currentDistrict + this.address.detail
+            this.showAddressBox = false
+            this.addressCheck()
+          } else {
+            this.$message.error('请输入详细地址')
+          }
         } else {
-          this.$message.error('请输入详细地址')
+          this.$message.error('请输入省、市、区')
         }
       }
     }
@@ -448,4 +484,7 @@
     background: #e6e6e6;
     color: #333;
   }
+  .x-text-help {
+    color: green;
+  }
 </style>

components/register-saler/register/StepThird.vue

@@ -294,7 +294,6 @@
         }
       },
       businessImgUrl: function (val, oldVal) {
-        console.log(1)
         this.businessLicenseUrl = val
       }
     },
@@ -321,10 +320,13 @@
         }]
       },
       onUpload: function (obj) {
+        console.log(obj)
         if (obj.type === 'BUSINESS_LICENSE') {
     //      this.businessLicenseUrl = obj.url
           this.businessLicenseUrl = obj.url
-          this.$emit('businessImgUrlAction', this.businessLicenseUrl)
+          if (obj.url !== '') {
+            this.$emit('businessImgUrlAction', this.businessLicenseUrl)
+          }
         } else if (obj.type === 'TAX_PAYER') {
           this.taxPayerUrl = obj.url
         } else if (obj.type === 'TAX_REGISTRATION') {
@@ -467,7 +469,7 @@
                   })
                 window.setTimeout(function () {
                   window.location.href = '/vendor#/store-apply/'
-                }, 1000)
+                }, 1500)
               } else {
                 this.$http.post('/basic/enterprise/openVendorSetRead/' + enuu)
                 this.$message.error('开通店铺失败')

pages/news/_id.vue

@@ -8,7 +8,6 @@
 <script>
   import Left from '~components/news/Left.vue'
   import Detail from '~components/news/Detail.vue'
-  import NuxtLink from '../../.nuxt/components/nuxt-link'
   export default {
     layout: 'main',
     fetch ({store, route}) {
@@ -18,7 +17,6 @@
       ])
     },
     components: {
-      NuxtLink,
       Left,
       Detail
     }