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

assets/scss/commonComponent.scss

@@ -457,6 +457,6 @@ div.tip{
   left: 0;
   right: 0;
   background: rgba(0, 0, 0, .3);
-  z-index: 1;
+  z-index: 99;
 }
 /*----------遮罩层 end-------------*/

assets/scss/mobileCommon.scss

@@ -513,7 +513,7 @@ table.com-price-list {
 }
 
 /* 报价方式切换 */
-.switch-say {
+.mobile-switch-say {
   text-align: center;
   font-size: 0;
   background: #fff;

components/applyPurchase/SayPrice.vue

@@ -347,7 +347,7 @@
     width: 476px;
     top: 50%;
     left: 50%;
-    margin-top: -183px;
+    margin-top: -325px;
     margin-left: -238px;
     overflow-y: auto;
     /*-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);*/

components/common/upload/upload.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="preview">
-      <img :src="qualifications.url==''?'/images/all/upload-apply.png': isPdf?'/images/all/timg.png':qualifications.url" class="previewImage"/>
+      <img :src="qualifications.url==''? uploadImgTemp : isPdf?'/images/all/timg.png':qualifications.url" class="previewImage" :class="{'mobile-previewImage': isMobile}"/>
       <input type="file" v-if="!qualifications.url" class="com-input" @change="update" accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png,.pdf" />
     </div>
     <div class="hover-show" v-if="qualifications.url">
@@ -39,6 +39,11 @@
         }
       }
     },
+    computed: {
+      uploadImgTemp () {
+        return this.isMobile ? '/images/mobile/openStore/upload.png' : '/images/all/upload-apply.png'
+      }
+    },
     methods: {
       update (e) {
         let file = e.target.files[0]
@@ -94,3 +99,11 @@
     }
   }
 </script>
+<style scoped>
+  .mobile-previewImage {
+    width: .5rem !important;
+    height: .5rem !important;
+    display: block;
+    margin: .3rem auto 0 !important;
+  }
+</style>

components/mobile/applyPurchase/SayPrice.vue

@@ -31,7 +31,7 @@
             </div>
           </div>
           <div class="form-list">
-            <ul class="switch-say">
+            <ul class="mobile-switch-say">
               <li class="inline-block" :class="{'active': sayType == 'current'}" @click="setSayType('current')">当前型号报价</li>
               <li class="inline-block" :class="{'active': sayType == 'replace'}" @click="setSayType('replace')">替代型号报价</li>
             </ul>

components/mobile/applyPurchase/SayPriceInfo.vue

@@ -47,7 +47,7 @@
                 联系电话：<span>{{purchaseDetail.userTel || '-'}}</span>
               </div>
             </div>-->
-            <ul class="switch-say">
+            <ul class="mobile-switch-say">
               <li class="inline-block" :class="{'active': sayType == 'current'}" @click="setSayType('current')">当前型号报价</li>
               <li class="inline-block" :class="{'active': sayType == 'replace'}" @click="setSayType('replace')">替代型号报价</li>
             </ul>

components/mobile/register-saler/register/StepSecond.vue

@@ -1,6 +1,6 @@
 <template>
   <!--阅读服务协议-->
-  <div class="section">
+  <div class="section mobile-step">
     <div class="mobile-agreement">
       <div class="mobile-join_xieyi">
         <div class="article-flag">
@@ -11,12 +11,10 @@
         <div class="text-area">
           <div class="ql-container ql-snow" v-html="article"></div>
         </div>
-        <div class="row" style="margin:10px 0 10px 0;padding:0 0.2rem;">
+        <div class="row" style="margin:10px 0 10px 0;">
           <div class="checkbox-inline">
             <input type="checkbox" id="agree" name="agree" value="1" :checked="checkData.checked" @click="onCheck()" style="-webkit-appearance:checkbox">
-            我已阅读并同意<a href="http://www.usoftmall.com/help#/issue/50" target="_blank">
-            《优软商城服务条款》</a>、<a href="http://www.usoftmall.com/help#/issue/16" target="_blank">
-            《优软商城买卖条例》</a>
+            我已阅读并同意<a href="http://www.usoftmall.com/help#/issue/50" target="_blank" style="margin-right: -.1rem">《优软商城服务条款》</a>、<a href="http://www.usoftmall.com/help#/issue/16" target="_blank" style="margin-left: -.26rem">《优软商城买卖条例》</a>
           </div>
         </div>
         <div class="row next-btn step-two-btn" style="padding-top: 0px;">
@@ -123,4 +121,27 @@
   .ql-container.ql-snow {
     border: none;
   }
+  .mobile-join_xieyi .ql-editor span, .mobile-join_xieyi .ql-editor a {
+    font-size: .24rem;
+  }
+  .mobile-join_xieyi .ql-editor .ql-size-20 {
+    display: block;
+    margin: .3rem auto;
+    width: fit-content;
+    font-size: .28rem;
+  }
+  .mobile-step .checkbox-inline, .radio-inline {
+    padding: 0;
+  }
+  .mobile-tab-list .checkbox-inline {
+    padding-left: .7rem;
+  }
+  .mobile-step .checkbox-inline input {
+    margin: 0;
+    position: absolute;
+    left: 0.3rem;
+    top: 0;
+    width: .3rem;
+    height: .3rem;
+  }
 </style>

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;

pages/mobile/store/index.vue

@@ -248,7 +248,7 @@
     text-align: center;
     cursor: pointer;
     color: #a0a0a0;
-    font-size: 0.24rem;
+    font-size: 0.28rem;
     width: 50%;
     display: inline-block;
   }