sunChengjie 1 年之前
父節點
當前提交
f45168cf69

+ 3 - 4
src/pages/components/ScrollRefresh.vue

@@ -14,7 +14,6 @@
                 <div class="bottom_text" style="margin-top: 40px;">数据为空!</div>
             </template>
         </van-pull-refresh>
-
     </div>
 </template>
 
@@ -70,9 +69,9 @@ export default {
         },
         getScroll(event) {
             let scrollBottom =
-                event.target.scrollHeight -
-                event.target.scrollTop -
-                event.target.clientHeight;
+                event.target.scrollHeight -  //容器的内容高度
+                event.target.scrollTop -     //容器顶部被隐藏的内容的高度
+                event.target.clientHeight;   //可见区域的高度
             // 距离底部20px以内 && 还有数据 && 没有正在加载中
             if (scrollBottom <= 20 && !this.noData && !this.loading) {
                 this.pagination.page += 1;

+ 1 - 1
src/pages/components/Sented.vue

@@ -30,7 +30,7 @@
                 <div class="batch-middel-text">
                     <div class="batch-middel-text-style" style="width: 100%; margin-left: -4px;margin-top: 0px;">【{{
                         item.expressCompany
-                        }}】运单号:{{
+                    }}】运单号:{{
                             item.expressNo }}</div>
                     <div class="batch-middel-text-style">收件人:{{ item.recipient }}</div>
                     <div class="batch-middel-text-style">部门:{{ item.departmentId }}</div>

+ 1 - 1
src/pages/components/Waitsent.vue

@@ -79,7 +79,7 @@
                 </van-popup>
                 <van-field v-if="wer == '他人签收'" v-model="getOtherPhone" :rules="[{ required: true }]" label="代取手机号"
                     placeholder="请输入代取手机号" />
-                <van-field name="uploader" :rules="[{ required: true }]" label="签收照片">
+                <van-field name="uploader" :rules="[{ required: true, message: '请上传图片' }]" label="签收照片">
                     <template #input>
                         <van-uploader v-model="uploader" :after-read="afterRead" :before-read="beforeRead"
                             :max-count="1" />

+ 7 - 1
src/pages/new/storage.vue

@@ -71,7 +71,8 @@
         <!-- 输入手机号后弹出 -->
         <van-popup v-model="phoneShow" class="popupStyle">
             <div class="popupStyle-top">
-                <van-search style="width: 100%;" @search="searchCrux" v-model="searchKey" placeholder="请输入搜索关键词" />
+                <van-search style="width: 100%;" ref="isSearchFocus" @search="searchCrux" v-model="searchKey"
+                    placeholder="请输入搜索关键词" />
                 <van-icon class="popupStyle-top-icon" @click="searchCrux" name="search" color="#1989fa" size="20" />
             </div>
             <div style="height: calc(100vh - 105px); overflow-y: auto;">
@@ -195,6 +196,11 @@ export default {
         // 手机号点击聚焦
         onFocus() {
             this.phoneShow = true
+            this.$nextTick(() => {
+                if (this.$refs.isSearchFocus) {
+                    this.$refs.isSearchFocus.querySelector('input').focus()
+                }
+            })
         },
         // 搜索关键
         async searchCrux() {