Forráskód Böngészése

Merge remote-tracking branch 'origin/release-201817-yc' into release-201817-yc

yangc 7 éve
szülő
commit
92f92af6ed

+ 6 - 6
assets/scss/mobileCenter.scss

@@ -63,15 +63,15 @@
         }
         span.text{
           position: absolute;
-          font-size: 0.18rem;
+          font-size: 0.24rem;
           color: #fff;
           background: #e60012;
-          width: 0.28rem;
-          height: 0.28rem;
+          width: 0.40rem;
+          height: 0.40rem;
           border-radius: 50%;
-          top: -0.04rem;
-          right: 0.2rem;
-          line-height: 0.28rem;
+          top: -0.2rem;
+          right: 0.21rem;
+          line-height: 0.40rem;
           text-align: center;
         }
       }

+ 4 - 4
components/mobile/store/StoreDetail.vue

@@ -100,14 +100,14 @@
               </div>
               <div class="fl">
                 <div class="name">交期(天):</div>
-                <div class="text" style="color: #ef5042" v-if="item.b2cMaxDelivery && (item.b2cMaxDelivery != item.b2cMinDelivery)" v-text="item.b2cMinDelivery + '-'+ item.b2cMaxDelivery"></div>
-                <div class="text" style="color: #ef5042" v-if="item.b2cMaxDelivery && (item.b2cMaxDelivery == item.b2cMinDelivery)" v-text="item.b2cMinDelivery"></div>
+                <div class="text" v-if="item.b2cMaxDelivery && (item.b2cMaxDelivery != item.b2cMinDelivery)" v-text="item.b2cMinDelivery + '-'+ item.b2cMaxDelivery"></div>
+                <div class="text" v-if="item.b2cMaxDelivery && (item.b2cMaxDelivery == item.b2cMinDelivery)" v-text="item.b2cMinDelivery"></div>
               </div>
             </div>
             <div class="list">
               <div class="fl">
                 <div class="name">物料名称(类目):</div>
-                <div class="text" style="color: #3f84f6">{{item.kindNameCn || '-'}}</div>
+                <div class="text">{{item.kindNameCn || '-'}}</div>
               </div>
               <div class="fl">
                 <div class="name">库存:</div>
@@ -658,7 +658,7 @@
           }
         }
         .name {
-          color: #333;
+          color: #666;
           font-size: 0.28rem;
           display: inline-block;
         }

+ 5 - 5
pages/mobile/center/user/index.vue

@@ -36,15 +36,15 @@
           </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/user/cart" class="content-line">
             <img src="/images/mobile/center/user/cart.jpg" alt="">
-            <p>购物车<span class="text">{{carCount && carCount >= 99 ? 99 : carCount || 0}}</span></p>
+            <p>购物车<span class="text" v-if="carCount > 0">{{carCount && carCount >= 99 ? 99 : carCount || 0}}</span></p>
           </nuxt-link>
-          <nuxt-link tag="li" to="/mobile/center/user/collect/component" class="content-line">
+          <nuxt-link tag="li" to="/mobile/center/user/collect/.textcomponent" class="content-line">
             <img src="/images/mobile/center/user/comp-collect2.png" alt="">
-            <p>器件收藏<span class="text">{{compCount.data && compCount.data >= 99 ? 99 : compCount.data || 0}}</span></p>
+            <p>器件收藏<span class="text" v-if="compCount.data > 0">{{compCount.data && compCount.data >= 99 ? 99 : compCount.data || 0}}</span></p>
           </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/user/collect/store" class="content-line">
             <img src="/images/mobile/center/user/store-focus.png" alt="">
-            <p>店铺关注<span class="text">{{storeCount.data && storeCount.data >= 99 ? 99 : storeCount.data || 0}}</span></p>
+            <p>店铺关注<span class="text" v-if="storeCount.data > 0">{{storeCount.data && storeCount.data >= 99 ? 99 : storeCount.data || 0}}</span></p>
           </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/user/payCenter" class="content-line">
             <img src="/images/mobile/center/user/payfor_icon.png" alt="">
@@ -52,7 +52,7 @@
           </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
             <img src="/images/mobile/center/user/message.png" alt="">
-            <p>消息中心<span class="text">{{messageCount.count && messageCount.count >= 99 ? 99 : messageCount.count || 0}}</span></p>
+            <p>消息中心<span class="text" v-if="messageCount.count > 0">{{messageCount.count && messageCount.count >= 99 ? 99 : messageCount.count || 0}}</span></p>
           </nuxt-link>
         </ul>
       </div>

+ 1 - 1
pages/mobile/center/vendor/index.vue

@@ -64,7 +64,7 @@
           <!--</nuxt-link>-->
           <nuxt-link tag="li" to="/mobile/center/vendor/message"  v-if="user.data.enterprise.uu">
             <img src="/images/mobile/center/user/message.png" alt="">
-            <p>消息中心<span class="text">{{messageCount.count && messageCount.count >= 99 ? 99 : messageCount.count || 0}}</span></p>
+            <p>消息中心<span class="text" v-if="messageCount.count > 0">{{messageCount.count && messageCount.count >= 99 ? 99 : messageCount.count || 0}}</span></p>
           </nuxt-link>
         </ul>
       </div>

+ 18 - 6
pages/mobile/center/vendor/productdetails.vue

@@ -81,9 +81,9 @@
         </div>
         <div class="pull-right">
           <span class="name">交期:</span>
-          <input type="tel" placeholder="天数" v-model="chooseItem.minDelivery" class="input startInput" maxlength="3" @blur="minDeliveryBlur()" />
+          <input type="tel" placeholder="天数" v-model="chooseItem.minDelivery" class="input startInput" maxlength="3" @blur="minDeliveryBlur(chooseItem.minDelivery)" />
           -
-          <input type="tel" placeholder="天数" v-model="chooseItem.maxDelivery" class="input endInput" maxlength="3" @blur="minDeliveryBlur()"/>
+          <input type="tel" placeholder="天数" v-model="chooseItem.maxDelivery" class="input endInput" maxlength="3" @blur="minDeliveryBlur(chooseItem.maxDelivery)"/>
         </div>
       </div>
       <div class="list" style="border-bottom: 0px">
@@ -374,7 +374,13 @@
         console.log(this.chooseItem.prices)
       },
       // 交期失去焦点
-      minDeliveryBlur() {
+      minDeliveryBlur(str) {
+        if (Math.abs(str) === 0) {
+          this.timeoutCount++
+          this.collectResult = `交期天数不能为0`
+          this.chooseItem.maxDelivery = ''
+          return false
+        }
         if (Math.abs(this.chooseItem.minDelivery) > Math.abs(this.chooseItem.maxDelivery)) {
           this.timeoutCount++
           this.collectResult = `最短交期应小于等于最长交期`
@@ -384,9 +390,15 @@
       // 单价失去焦点
       rMBPriceBlur(item) {
         if (item.rMBPrice === '' || !item.rMBPrice) { return false }
-        if (!/^[0-9]+([.]{1}[0-9]+)?$/.test(item.rMBPrice)) {
+        if (!/^[0-9]+([.]{1}[0-9]{1,6})?$/.test(item.rMBPrice)) {
+          this.timeoutCount++
+          this.collectResult = '单价只能输入数字带6位小数'
+        } else if (Math.abs(item.rMBPrice) === 0) {
+          return false
+        } else if (Math.abs(item.rMBPrice) > 10000) {
           this.timeoutCount++
-          this.collectResult = '单价只能输入数字'
+          item.rMBPrice = 10000
+          this.collectResult = '单价不能高于10000'
           return false
         }
         item.rMBPrice = item.rMBPrice.toString()
@@ -465,7 +477,7 @@
           return false
         } else if (!this.chooseItem.packaging || this.chooseItem.packaging === '' ) {
           this.timeoutCount++
-          this.collectResult = '请选择规格信息'
+          this.collectResult = '请选择包装方式'
           return false
         } else {
           let isHas = false

+ 1 - 1
pages/mobile/order/details.vue

@@ -68,7 +68,7 @@
             <div class="list-item clearfix">
               <div class="list-wrap-content-brand clearfix pull-left">
                 <div class="name pull-left">物料名称(类目):</div>
-                <div class="pull-left spec">{{details.kiName || '-'}}</div>
+                <div class="pull-left spec" style="width: 1.79rem">{{details.kiName || '-'}}</div>
               </div>
               <div class="pull-left list-wrap-content-brand clearfix">
                 <div class="name pull-left">单价:</div>

+ 1 - 1
pages/mobile/order/index.vue

@@ -70,7 +70,7 @@
           <div class="list-item clearfix">
             <div class="list-wrap-content-brand clearfix pull-left">
               <div class="name pull-left">物料名称(类目):</div>
-              <div class="pull-left spec">{{details.kiName || '-'}}</div>
+              <div class="pull-left spec" style="width: 1.79rem;">{{details.kiName || '-'}}</div>
             </div>
             <div class="pull-left list-wrap-content-brand clearfix">
               <div class="name pull-left">单价:</div>

+ 1 - 1
pages/mobile/product/_batchCode.vue

@@ -375,7 +375,7 @@
           }
           .name {
             color: #666;
-            font-size: 0.3rem;
+            font-size: 0.28rem;
             display: inline-block;
           }
           .text {