Merge remote-tracking branch 'origin/release-201815-wangcz' into release-201815-wangcz

components/store/home/EnterpriseInfo.vue

@@ -150,9 +150,9 @@
       getIntro (text) {
         let len = text.replace(/[\u0391-\uFFE5]/g, 'aa').length
         if (len > 0) {
-          if (len > 500) {
+          if (len > 490) {
             this.showMore = true
-            text = text.slice(0, 500) + '...'
+            text = text.slice(0, 490) + '...'
           } else {
             this.showMore = false
           }

components/store/home/QualificationCertificate.vue

@@ -2,13 +2,13 @@
   <div>
     <div class="brand-content-list">
       <ul class="list-unstyled list-inline">
-        <li class="store-box"  v-if="storeInfo.qualifications || storeInfo.qualifications.length !== 0" v-for="(store, index) in storeInfo.qualifications.slice(0,6)">
+        <li class="store-box"  v-if="storeInfo.qualifications || storeInfo.qualifications.length !== 0" v-for="(store, index) in storeInfo.qualifications.slice(0,5)">
           <div><img :src="store.resourceUrl.indexOf('.pdf')>0?'/images/store/common/pdf.jpg':store.resourceUrl"/></div>
           <a @click="showImg(store.resourceUrl)"><div class="Open"><i class="fa fa-search"></i>&nbsp;&nbsp;查看</div></a>
         </li>
         <li class="active-empty" v-if="!storeInfo.qualifications || storeInfo.qualifications.length == 0">
           <div class="text-center">
-            <div>
+            <div class="show-img">
               <img src="/images/brandList/empty-cart.jpg">
             </div>
             <div class="txt-info">
@@ -49,7 +49,17 @@
     },
     computed: {
       storeInfo () {
-        return this.$store.state.shop.storeInfo.store.data
+        let storeInfo = this.baseUtils.deepCopy(this.$store.state.shop.storeInfo.store.data)
+        if (storeInfo.qualifications && storeInfo.qualifications.length) {
+          let tempQua = []
+          storeInfo.qualifications.map(item => {
+            if (item.type === 'APTITUDE') {
+              tempQua.push(item)
+            }
+          })
+          storeInfo.qualifications = tempQua
+        }
+        return storeInfo
       },
       user() {
         return this.$store.state.option.user
@@ -62,7 +72,7 @@
         if (this.user.logged && this.user.data.enterprise.uu) {
           if (this.storeStatus.uuid === this.storeInfo.uuid) {
             loggedStatus = true
-            this.storeInfo = this.storeStatus
+            // this.storeInfo = this.storeStatus
           } else {
             loggedStatus = false
           }
@@ -256,9 +266,21 @@
       }
       .active-empty{
         width: 100%;
-        .text-center{
-          text-align: center;
-          margin-top: 12px;
+          .text-center {
+            overflow: hidden;
+            text-align: center;
+            margin: 85px auto;
+          div{
+             float: left;
+           }
+          div.show-img{
+            margin-left: 350px;
+          }
+          div.txt-info {
+            position: absolute;
+            left: 470px;
+            top: 108px;
+          }
         }
         .text-center  .col-xs-2  img{
           margin: 65px 0 85px 205px;