Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

@@ -191,7 +191,6 @@ export default {
 }
 
 .change-bid-price-wrapper {
-  position: absolute;
   width: 600px;
   background-color: #fff;
   transform: scale(0.9);

@@ -48,7 +48,16 @@ export default {
       border-color: #f5f5f5;
     }
 
+    /deep/ input::-webkit-input-placeholder {
+      font-size: 0.9rem;
+      padding: 0.2rem;
+      bottom: 0.4rem;
+    }
+
     /deep/ .cube-input-field {
+      font-family: "DINAlternate-Bold", "ufofont", "PingFang-SC-Regular", sans-serif;
+      padding: 0.25rem;
+      font-size: 1rem;
       color: #000;
     }
   }

@@ -4,44 +4,42 @@
   </div>
   <div v-else>
     <LayoutApp title="选择地址" :show-back="true" :back-action="goBack">
-        <CubeScroll class="main-container" ref="scroll" :options="scrollOpts">
-          <div class="user-list">
-            <div
-              v-for="(item, index) in addressList"
-              :key="index"
-              class="item"
-              @click="toOrderPage(item)"
-            >
-              <slot name="item" :data="item">
-                <div class="user-item">
+      <div class="user-list">
+        <div
+          v-for="(item, index) in addressList"
+          :key="index"
+          class="item"
+          @click="toOrderPage(item)"
+        >
+          <slot name="item" :data="item">
+            <div class="user-item">
+              <div
+                :class="{
+                  'uncheck-item': item.address_id !== selectedAddressId,
+                  'check-item': item.address_id === selectedAddressId
+                }"
+              ></div>
+              <div class="user-info">
+                <div class="extra">
+                  <p class="name">{{ item.consignee }}</p>
+                  <p class="mobile">{{ item.mobile }}</p>
+                  <div v-if="item.is_default === 'Y'" class="tag-btn">默认</div>
+                  <div v-if="item.tag_code && item.tag" class="tag-btn">{{ item.tag }}</div>
                   <div
-                    :class="{
-                      'uncheck-item': item.address_id !== selectedAddressId,
-                      'check-item': item.address_id === selectedAddressId
-                    }"
-                  ></div>
-                  <div class="user-info">
-                    <div class="extra">
-                      <p class="name">{{ item.consignee }}</p>
-                      <p class="mobile">{{ item.mobile }}</p>
-                      <div v-if="item.is_default === 'Y'" class="tag-btn">默认</div>
-                      <div v-if="item.tag_code && item.tag" class="tag-btn">{{ item.tag }}</div>
-                      <div
-                        class="option-btn"
-                        :data-item="JSON.stringify(item)"
-                        :data-add="0"
-                        @click="toEditorPage"
-                      >编辑</div>
-                    </div>
-                    <p class="address">{{ item.area }}{{ item.address }}</p>
-                  </div>
+                    class="option-btn"
+                    :data-item="JSON.stringify(item)"
+                    :data-add="0"
+                    @click="toEditorPage"
+                  >编辑</div>
                 </div>
-              </slot>
-              <div class="border-line"></div>
+                <p class="address">{{ item.area }}{{ item.address }}</p>
+              </div>
             </div>
-          </div>
-          <div class="add-btn" :data-add="1" @click="toEditorPage">新增地址</div>
-        </CubeScroll>
+          </slot>
+          <div class="border-line"></div>
+        </div>
+      </div>
+      <div class="add-btn" :data-add="1" @click="toEditorPage">新增地址</div>
     </LayoutApp>
   </div>
 </template>
@@ -156,19 +154,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ {
-  .cube-scroll-content {
-    min-height: 100%;
-  }
-
-  .cube-scroll-list-wrapper {
-    overflow: auto;
-  }
-
-  .cube-loading-spinners {
-    margin: auto;
-  }
-}
 
 .father-img {
   position: absolute;
@@ -186,6 +171,7 @@ export default {
 }
 
 .user-list {
+  display: block;
   background-color: white;
 
   .border-line {
@@ -255,14 +241,14 @@ export default {
 
       .option-btn {
         display: block;
-        width: 65px;
-        line-height: 44px;
+        width: 80px;
+        line-height: 50px;
         letter-spacing: -0.29px;
         color: black;
         font-size: 24px;
         position: absolute;
-        right: 40px;
-        text-align: right;
+        right: 30px;
+        text-align: center;
       }
     }
 

 <template>
   <LayoutApp :title="title" :show-back="true">
-    <div class="pane-body">
+    <div class="pane-body" ref="paneBody">
       <FormItem>
         <CInput
           label="收货人"
@@ -71,6 +71,7 @@
           ></Radio>
         </div>
       </div>
+      <div class="white-space"></div>
     <div :class="submitClass" @touchend="onSubmit">确 认</div>
 
     <AddressAct
@@ -279,12 +280,15 @@ export default {
     chooseArea() {
       this.isShowProvince = true;
 
+      this.$refs.paneBody.style.overflow = 'hidden';
+
       this.$refs.addressAct.parentHandleclick({
         areaCode: this.area_code
       });
     },
     popHidden() {
       let that = this;
+      this.$refs.paneBody.style.overflow = 'auto';
       that.isShowProvince = false;
     },
     modifyAddressAct(info) {
@@ -402,6 +406,13 @@ export default {
   }
 }
 
+.white-space {
+  position: relative;
+  display: block;
+  overflow: hidden;
+  height: 120px;
+}
+
 .wrapper-tag {
   margin: 30px 0;
 
@@ -449,7 +460,7 @@ export default {
   background-color: #cccccc;
   color: white;
   border-radius: 40px;
-  position: absolute;
+  position: fixed;
   left: 32px;
   right: 32px;
   bottom: 24px;

@@ -509,7 +509,7 @@ export default {
         align-items: center;
 
         &.active {
-          font-size: 36px;
+          font-size: 30px;
           color: #000;
           font-weight: bold;
         }