Merge remote-tracking branch 'origin/master'

components/btbBusiness/banner.vue

@@ -8,7 +8,7 @@
       </div>
       <p class="first">十年深耕，携您飞跃<br>
         优软B2B商务，为您提供更强大的功能服务</p>
-      <p>优软平台构造了面向制造业和流通业的垂直B2B，不仅仅提供平台服务，还包括企业内部管理、存货服务、人力资源等。优软平台建立了 生产商与供应商之间形成的供需关系，通过一系列工具辅助供需双方形成交易。这是一个企业集合的云端服务，企业</p>
+      <p>优软平台构造了面向制造业和流通业的垂直B2B，不仅仅提供平台服务，还包括企业内部管理、存货服务、人力资源等。优软平台建立了生产商与供应商之间形成的供需关系，通过一系列工具辅助供需双方形成交易。这是一个企业集合的云端服务，企业通过平台可以完成交易的全过程。</p>
     </div>
   </div>
 </template>

components/home/count/displayCard.vue

@@ -87,44 +87,48 @@
         this.cardShow = false
       },
       formatNumber (num, type) {
-        if (num.toString().indexOf('E') !== -1) {
-          let arr = num.toString().split('E')
-          num = arr[0] * Math.pow(10, arr[1])
-        }
-        if (num > 99999999) {
-          let str2 = num.toString()
-          num = Math.floor(num / 100000000)
-          if (parseInt(str2.charAt(str2.length - 8)) > 8) {
-            num = num + 1
-          }
-          num += '<span style="color: #333">亿</span>'
-        } else if (num > 9999) {
-          let str = num.toString()
-          num = Math.floor(num / 10000)
-          if (parseInt(str.charAt(str.length - 4)) > 4) {
-            num = num + 1
+        if (num) {
+          if (num.toString().indexOf('E') !== -1) {
+            let arr = num.toString().split('E')
+            num = arr[0] * Math.pow(10, arr[1])
           }
-          num += '<span style="color: #333">万</span>'
-        } else {
-          if (type === 1 || type === 2) {
-            num += '<span style="color: #333">元</span>'
+          if (num > 99999999) {
+            let str2 = num.toString()
+            num = Math.floor(num / 100000000)
+            if (parseInt(str2.charAt(str2.length - 8)) > 8) {
+              num = num + 1
+            }
+            num += '<span style="color: #333">亿</span>'
+          } else if (num > 9999) {
+            let str = num.toString()
+            num = Math.floor(num / 10000)
+            if (parseInt(str.charAt(str.length - 4)) > 4) {
+              num = num + 1
+            }
+            num += '<span style="color: #333">万</span>'
           } else {
-            num += ''
+            if (type === 1 || type === 2) {
+              num += '<span style="color: #333">元</span>'
+            } else {
+              num += ''
+            }
           }
         }
         return num
       },
       formatDouble (num) {
-        if (num.toString().indexOf('E') !== -1) {
-          let arr = num.toString().split('E')
-          num = arr[0] * Math.pow(10, arr[1])
-        }
-        if (num > 99999999) {
-          num = (num / 100000000).toFixed(2).slice(num.length - 1, 4) + '亿'
-        } else if (num > 9999) {
-          num = (num / 10000).toFixed(2).slice(num.length - 1, 4) + '万'
-        } else {
+        if (num) {
+          if (num.toString().indexOf('E') !== -1) {
+            let arr = num.toString().split('E')
+            num = arr[0] * Math.pow(10, arr[1])
+          }
+          if (num > 99999999) {
+            num = (num / 100000000).toFixed(2).slice(num.length - 1, 4) + '亿'
+          } else if (num > 9999) {
+            num = (num / 10000).toFixed(2).slice(num.length - 1, 4) + '万'
+          } else {
             num += ''
+          }
         }
         return num
       },
@@ -176,7 +180,7 @@
   .display-card{
     position: fixed;
     right: 100px;
-    top: 135px;
+    top: 100px;
     width: 180px;
     height: 540px;
     z-index: 100;
@@ -223,12 +227,12 @@
                   -moz-transition: top 1s; /* Firefox 4 */
                   -webkit-transition: top 1s; /* Safari and Chrome */
                   -o-transition: top 1s; /* Opera */
-                  &.top {
+                 /* &.top {
                     transition: top 0s;
-                    -moz-transition: top 0s; /* Firefox 4 */
-                    -webkit-transition: top 0s; /* Safari and Chrome */
-                    -o-transition: top 0s; /* Opera */
-                  }
+                    -moz-transition: top 0s; !* Firefox 4 *!
+                    -webkit-transition: top 0s; !* Safari and Chrome *!
+                    -o-transition: top 0s; !* Opera *!
+                  }*/
                 }
               }
             &:last-child{
@@ -250,12 +254,12 @@
                 -moz-transition: top 1s; /* Firefox 4 */
                 -webkit-transition: top 1s; /* Safari and Chrome */
                 -o-transition: top 1s; /* Opera */
-                &.top {
+                /*&.top {
                   transition: top 0s;
-                  -moz-transition: top 0s; /* Firefox 4 */
-                  -webkit-transition: top 0s; /* Safari and Chrome */
-                  -o-transition: top 0s; /* Opera */
-                }
+                  -moz-transition: top 0s; !* Firefox 4 *!
+                  -webkit-transition: top 0s; !* Safari and Chrome *!
+                  -o-transition: top 0s; !* Opera *!
+                }*/
               }
             }
           }

components/mobile/common/StatisticsMobile.vue

@@ -3,15 +3,11 @@
     <ul class="list-inline" :style="{top: widthTop + 'rem'}" :class="{no_tran: widthTop == 2.4}">
       <li v-for="(item, index) in itemData" :style="index % 2 == 0 ? 'text-align: right;padding-right: .3rem;' : 'text-align: left;padding-left: .3rem;'">
         <span class="number" v-if="item.type === 2">
-          <!--<span class="title"><i class="icon" :class="'icon' + index" ></i></span>-->
           <img :src="`/images/mobile/@2x/home/count${index + 1}.jpg`" alt="">
           <span v-html="formatDouble(item.count)" style="vertical-align: middle"></span>
           <span class="unit">条</span>
         </span>
         <span class="number" v-else>
-          <!--<span class="title">
-            <i class="icon" :class="'icon' + index" ></i>
-          </span>-->
           <img :src="`/images/mobile/@2x/home/count${index + 1}.jpg`" alt="">
           <span v-html="formatNumber(item.count, index)" style="vertical-align: middle"></span>
           <span class="unit" v-if="item.type === 3">家</span>
@@ -149,8 +145,6 @@
         width:50%;
         height:.6rem;
         line-height: .6rem;
-        /*padding: 0 .3rem;*/
-        /*text-align: center;*/
         font-size: .28rem;
         font-weight: bold;
         white-space: nowrap;
@@ -172,54 +166,6 @@
           img {
             height: .3rem;
           }
-          &.title{
-            display: inline-block;
-            width: 1.85rem;
-            height:.6rem;
-            line-height: .6rem;
-            vertical-align:middle;
-            margin-left: 0.15rem;
-
-            i{
-              &.icon{
-                display: inline-block;
-                width: 100%;
-                height: .6rem;
-              }
-              &.icon0{
-                background:url('/images/mobile/@2x/home/count1.jpg') right no-repeat;
-                background-size: auto 0.3rem;
-              }
-              &.icon1{
-                background:url('/images/mobile/@2x/home/count2.jpg') right no-repeat;
-                background-size: auto 0.3rem;
-              }
-              &.icon2{
-                background:url('/images/mobile/@2x/home/count3.jpg') right no-repeat;
-                background-size: auto 0.3rem;
-              }
-              &.icon3{
-                background:url('/images/mobile/@2x/home/count4.jpg') right no-repeat;
-                background-size: auto 0.3rem;
-              }
-              &.icon4{
-                background:url('/images/mobile/@2x/home/count5.jpg') right no-repeat;
-                background-size: auto 0.3rem;
-              }
-              &.icon5{
-                background:url('/images/mobile/@2x/home/count6.jpg') right no-repeat;
-                background-size: auto 0.3rem;
-              }
-              &.icon6{
-                background:url('/images/mobile/@2x/home/count7.jpg') right no-repeat;
-                background-size: auto 0.3rem;
-              }
-              &.icon7{
-                background:url('/images/mobile/@2x/home/count8.jpg') right no-repeat;
-                background-size: auto 0.3rem;
-              }
-            }
-          }
           &.number{
             display: inline-block;
             color:red;
@@ -233,28 +179,6 @@
             }
           }
         }
-        &:nth-child(2), &:nth-child(4){
-          span{
-            &.title{
-              width: 1.8rem;
-            }
-          }
-        }
-        &:nth-child(6){
-          span{
-            &.title{
-              width: 1.9rem;
-              margin-left: 0rem;
-            }
-          }
-        }
-        &:nth-child(8){
-          span{
-            &.title{
-              width: 1.3rem;
-            }
-          }
-        }
       }
     }
   }