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

components/mobile/base/addressEdit.vue

@@ -25,6 +25,7 @@
             <div class="com_left pull-left"><span>*</span>所在地区：</div>
             <div class="form_input" @click="addressShow = true">
               <span v-text="params.area || '选择地区'">选择地区</span>
+              <i class="iconfont icon-xiangyou"></i>
             </div>
           </li>
           <li class="clearfix">
@@ -232,8 +233,23 @@
             }
           }
           .form_input{
+            position:relative;
             margin-left:1.85rem;
             padding-right:.2rem;
+            span{
+              line-height: .3rem;
+              word-break: break-all;
+              display: inline-block;
+              margin-right: .2rem;
+              vertical-align: middle;
+            }
+            i{
+              position:absolute;
+              top:0;
+              right:0;
+              color: #c1c1c6;
+              font-size: .28rem;
+            }
             input{
               width:100%;
               line-height: .3rem;

components/mobile/base/addressView.vue

@@ -115,7 +115,7 @@
         this.$http.put(`/trade/address/delete/${this.saveId.id}`)
           .then(() => {
             this.showLogout = false
-            if (this.saveId.active === 0) {
+            if (this.saveId.active === 0 && this.addressList.length > 1) {
               this.setActiveClick(this.addressList[1].id)
             } else {
               this.initList()
@@ -268,12 +268,12 @@
           .name{
             display:inline-block;
             text-align: right;
-            width:1.4rem;
+            width:1.5rem;
             font-size: .28rem;
             color: #4c8cf7;
           }
           .name-text {
-            margin-left:1.4rem;
+            margin-left:1.5rem;
             word-break: break-all;
             word-wrap: break-word;
             font-size: 0.28rem;

pages/mobile/center/vendor/productdetails.vue

@@ -375,11 +375,16 @@
       },
       // 交期失去焦点
       minDeliveryBlur(str) {
-        if (Math.abs(str) === 0) {
+        if (Math.abs(this.chooseItem.maxDelivery) === 0) {
           this.timeoutCount++
           this.collectResult = `交期天数不能为0`
           this.chooseItem.maxDelivery = ''
           return false
+        } else if (Math.abs(this.chooseItem.minDelivery) === 0) {
+          this.timeoutCount++
+          this.collectResult = `交期天数不能为0`
+          this.chooseItem.minDelivery = ''
+          return false
         }
         if (Math.abs(this.chooseItem.minDelivery) > Math.abs(this.chooseItem.maxDelivery)) {
           this.timeoutCount++
@@ -395,9 +400,9 @@
           this.collectResult = '单价只能输入数字带6位小数'
         } else if (Math.abs(item.rMBPrice) === 0) {
           return false
-        } else if (Math.abs(item.rMBPrice) > 10000) {
+        } else if (Math.abs(item.rMBPrice) >= 10000) {
           this.timeoutCount++
-          item.rMBPrice = 10000
+          item.rMBPrice = 9999
           this.collectResult = '单价不能高于10000'
           return false
         }

pages/mobile/user/address.vue

@@ -53,7 +53,7 @@
 <style lang="scss" scoped>
   @mixin Fixed() {
     position: fixed;
-    bottom: 0;
+    bottom: 0.98rem;
     left: 0;
     right: 0;
     top: 1.26rem;
@@ -64,7 +64,7 @@
     background: #f1f3f6;
     .logistics-content {
       overflow-y: scroll;
-      height: calc(100vh - 1.26rem)
+      height: calc(93vh - 1.26rem)
     }
   }
 </style>