Browse Source

产品溢出处理以及店铺添加字段

gaoxm 7 years ago
parent
commit
d14f6c298b
2 changed files with 26 additions and 19 deletions
  1. 19 16
      components/mobile/store/StoreDetail.vue
  2. 7 3
      components/store/CommodityInfo.vue

+ 19 - 16
components/mobile/store/StoreDetail.vue

@@ -16,7 +16,7 @@
       <ul class="list-unstyled clearfix">
         <li>
           <div>电&nbsp;&nbsp;话:</div>
-          <div v-if="store.enterprise.enTel"><a :href="'tel:' + store.enterprise.enTel">{{store.enterprise.enTel}}</a></div>
+          <div v-if="store.enterprise.enTel"><a :href="'tel:' + store.enterprise.enTel" @click="clickTel = true" :class="{'click-tel': clickTel}">{{store.enterprise.enTel}}</a></div>
           <div v-else><span>-</span></div>
         </li>
         <li>
@@ -26,7 +26,7 @@
         </li>
         <li>
           <div>手&nbsp;&nbsp;机:</div>
-          <div v-if="store.enterprise.enPhone"> <a :href="'tel:' + store.enterprise.enPhone">{{store.enterprise.enPhone}}</a></div>
+          <div v-if="store.enterprise.enPhone"> <a :href="'tel:' + store.enterprise.enPhone" @click="clickPhone = true" :class="{'click-phone': clickPhone}">{{store.enterprise.enPhone}}</a></div>
           <div v-else><span>-</span></div>
         </li>
         <li>
@@ -35,19 +35,19 @@
           <div v-else><span>-</span></div>
         </li>
         <li>
-          <div>Q&nbsp;&nbsp;&nbsp;Q:</div>
+          <div>Q&nbsp;&nbsp;&nbsp;&nbsp;Q:</div>
           <div v-if="store.enterprise.enQQ"> {{store.enterprise.enQQ}}</div>
           <div v-else><span>-</span></div>
         </li>
         <li>
-          <div>企业地址:</div>
-          <div v-if="store.enterprise.enAddress"> {{store.enterprise.enAddress}}</div>
+          <div>店铺地址:</div>
+          <div v-if="store.enterprise.enAddress">{{store.enterprise.enAddress}}</div>
           <div v-else><span>-</span></div>
         </li>
       </ul>
      </div>
       <div class="store-description">
-        <h4>商家简介</h4>
+        <h4>企业简介</h4>
         <p>
           {{store.description}}
         </p>
@@ -133,6 +133,8 @@
         activeType: 'product',
         collectResult: '收藏成功',
         timeoutCount: 0,
+        clickTel: false,
+        clickPhone: false,
         isSearchingMore: false,
         searchLists: [],
         page: 1,
@@ -179,6 +181,10 @@
         return num
       }
     },
+    created () {
+      this.clickTel = false
+      this.clickPhone = false
+    },
     computed: {
       store () {
         return this.$store.state.shop.storeInfo.store.data
@@ -372,26 +378,23 @@
               &:first-child{
                 width: 20%;
                 text-align: right;
+                padding-right: 0.04rem;
               }
-              a:link{
+              a{
                 color: #145dee;
               }
-              a:visited{
-                color: #f44336;
-              }
-              a:hover{
-                color: #f44336;
-              }
-              a:active{
+              .click-tel, .click-phone{
                 color: #f44336;
               }
             }
             &:last-child{
               div{
                 width: 74%;
+                padding-right:.34rem;
+                word-wrap: break-word;
                 &:first-child{
                   text-align: left;
-                  padding-left: .38rem;
+                  padding: 0rem 0rem 0rem .36rem;
                   width: 26%;
                 }
               }
@@ -410,7 +413,7 @@
           margin: .2rem auto 0;
           padding: .04rem .34rem;
           width: 100%;
-          font-size: .3rem;
+          font-size: .28rem;
           color: #666;
           text-align: left;
           height: 95%;

+ 7 - 3
components/store/CommodityInfo.vue

@@ -92,7 +92,7 @@
               <span class="money">
                  <span v-if="fragment.currency == 'RMB'">¥</span>
                  <span v-if="fragment.currency == 'USD'">$</span>
-                 <span>{{(calculate || 0) | currencyShort}}</span>
+                 <span>{{calculate | currencyShort}}</span>
               </span>
             </div>
             <div class="button" v-if="commodity.status !== 602 && commodity.status !== 612">
@@ -190,6 +190,7 @@
     filters: {
       currencyShort: function (num) {
         if (typeof num === 'number' && num > 0) {
+            console.log('111')
           if (num <= 0.01) {
             num = 0.01
           } else {
@@ -201,11 +202,14 @@
               let floatNum = arr[1]
               if (floatNum.length > 2) {
                 num = inputStr.substring(0, arr[0].length + 3)
-                if (Number(floatNum.charAt(2)) > 1) {
-                  num = (Number(num) * 100 + 1) / 100
+                if (Number(floatNum.charAt(2)) >= 1) {
+                  num = (Math.ceil(Number(num) * 100) + 1) / 100
                   let inputStr1 = num.toString()
                   let arr1 = inputStr1.split('.')
                   let floatNum1 = arr1[1]
+                  if (num.toString().indexOf('.') === -1) {
+                    num += '.00'
+                  }
                   if (floatNum1.length === 1) {
                     num = num + '0'
                   }