收货地址

components/mobile/base/addressEdit.vue

@@ -1,54 +1,58 @@
 <template>
   <div>
     <div class="shipments_address_edit" :class="{'fix-sa-edit': inFix}">
-      <div class="form_line">
-        <ul class="list-unstyled" ref="addressContent">
-          <li class="clearfix">
-            <div class="com_left pull-left"><span>*</span>收货人姓名：</div>
-            <div class="form_input">
-              <input type="text" placeholder="请输入您的姓名" v-model="params.name" maxlength="10">
-            </div>
-          </li>
-          <li class="clearfix">
-            <div class="com_left pull-left"><span>*</span>联系电话：</div>
-            <div class="form_input">
-              <input type="tel" placeholder="请输入您的联系电话" v-model="params.tel" maxlength="11">
-            </div>
-          </li>
-          <li class="clearfix">
-            <div class="com_left pull-left">邮箱：</div>
-            <div class="form_input">
-              <input type="email" placeholder="请输入正确邮箱，用于接收订单提醒" v-model="params.email">
-            </div>
-          </li>
-          <li class="clearfix">
-            <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">
-            <div class="com_left pull-left"><span>*</span>详细地址：</div>
-            <div class="form_input">
-              <input type="text" placeholder="请您填写详细地址，街道名、门牌号等" v-model="params.detailAddress" maxlength="30">
-            </div>
-          </li>
-          <li class="clearfix">
-            <div class="com_left pull-left"><span>*</span>默认地址：</div>
-            <div class="form_input">
-              <el-switch
-                v-model="isActive"
-                on-text="ON"
-                off-text="OFF">
-              </el-switch>
-            </div>
-          </li>
-        </ul>
-      </div>
-      <div class="control clearfix">
-        <div class="cancel" @click="storeInfosave('cancel')">取消</div>
-        <div class="save" @click="storeInfosave()">保存</div>
+      <div ref="addressContent" class="wrap" :class="{'height100': height100}">
+        <div>
+          <div class="form_line">
+            <ul class="list-unstyled">
+              <li class="clearfix">
+                <div class="com_left pull-left"><span>*</span>收货人姓名：</div>
+                <div class="form_input">
+                  <input type="text" placeholder="请输入您的姓名" v-model="params.name" maxlength="10">
+                </div>
+              </li>
+              <li class="clearfix">
+                <div class="com_left pull-left"><span>*</span>联系电话：</div>
+                <div class="form_input">
+                  <input type="tel" placeholder="请输入您的联系电话" v-model="params.tel" maxlength="11">
+                </div>
+              </li>
+              <li class="clearfix">
+                <div class="com_left pull-left">邮箱：</div>
+                <div class="form_input">
+                  <input type="email" placeholder="请输入正确邮箱，用于接收订单提醒" v-model="params.email">
+                </div>
+              </li>
+              <li class="clearfix">
+                <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">
+                <div class="com_left pull-left"><span>*</span>详细地址：</div>
+                <div class="form_input">
+                  <input type="text" placeholder="请您填写详细地址，街道名、门牌号等" v-model="params.detailAddress" maxlength="30">
+                </div>
+              </li>
+              <li class="clearfix">
+                <div class="com_left pull-left"><span>*</span>默认地址：</div>
+                <div class="form_input">
+                  <el-switch
+                    v-model="isActive"
+                    on-text="ON"
+                    off-text="OFF">
+                  </el-switch>
+                </div>
+              </li>
+            </ul>
+          </div>
+          <div class="control clearfix">
+            <div class="cancel" @click="storeInfosave('cancel')">取消</div>
+            <div class="save" @click="storeInfosave()">保存</div>
+          </div>
+        </div>
       </div>
     </div>
     <select-address :className="className" :inFix="inFix" :isShow="addressShow" @closeAction="addressData"></select-address>
@@ -82,6 +86,10 @@
       className: {
         type: String,
         default: ''
+      },
+      height100: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -165,6 +173,15 @@
             this.timeoutCount++
             this.params = this.data
           })
+      },
+      refleshSc () {
+        if (this.BScroll) {
+          this.BScroll.refresh()
+        } else {
+          this.BScroll = new BScroll(this.$refs.addressContent, {
+            click: true
+          })
+        }
       }
     },
     components: {
@@ -173,13 +190,7 @@
     },
     mounted() {
       this.$nextTick(() => {
-        if (this.BScroll) {
-          this.BScroll.refresh()
-        } else {
-          this.BScroll = new BScroll(this.$refs.addressContent, {
-            click: true
-          })
-        }
+        this.refleshSc()
       })
     }
   }
@@ -265,6 +276,13 @@
         }
       }
     }
+    .wrap {
+      height: 8.3rem;
+      overflow-y: hidden;
+      &.height100 {
+        height: calc(100vh - 1.26rem - 0.98rem - 0.2rem);
+      }
+    }
   }
   .fix-sa-edit {
     .form_line {

pages/mobile/center/user/collect/component/_key.vue

@@ -88,6 +88,7 @@
       }
     },
     created () {
+      this.compList = []
       this.keyword = this.$route.params.key
       this.$store.dispatch('searchData/searchForListInMobile', { page: 1, count: 10, w: this.$route.params.key })
     },

pages/mobile/user/address.vue

@@ -2,7 +2,7 @@
   <div class="logistics-wrapper">
     <div class="logistics-content" id="logisticsContent">
       <address-view ref="addressView" v-show="!isEdit" :isSend="isSend" @isEditEvent="editClick"></address-view>
-      <address-edit v-show="isEdit" :data="setData" :isPersonal="isPersonal" :isSend="isSend" @isEditEvent="editClick"></address-edit>
+      <address-edit ref="addressEdit" v-show="isEdit" :data="setData" :height100="true" :isPersonal="isPersonal" :isSend="isSend" @isEditEvent="editClick"></address-edit>
     </div>
   </div>
 </template>
@@ -45,6 +45,9 @@
         if (type === false) {
           this.$refs.addressView.initList()
         }
+        this.$nextTick(() => {
+          this.$refs.addressEdit.refleshSc()
+        })
       }
     }
   }
@@ -64,7 +67,7 @@
     background: #f1f3f6;
     .logistics-content {
       overflow-y: scroll;
-      height: calc(93vh - 1.26rem)
+      height: calc(100vh - 1.26rem - 0.98rem);
     }
   }
 </style>