Browse Source

优化作息管理页面显示细节,修复滚动下拉时文字显示错误

凉纪 2 năm trước cách đây
mục cha
commit
0f67778f91

+ 22 - 0
src/components/HoursCell/index.vue

@@ -98,3 +98,25 @@ export default {
   margin: 0;
 }
 </style>
+<!--<style lang="scss" scoped>-->
+<!--.date-cell{-->
+<!--  position: relative;-->
+<!--  box-sizing: border-box;-->
+<!--  width: 100%;-->
+<!--  overflow: hidden;-->
+<!--  color: #323233;-->
+<!--  background-color: #fff;-->
+<!--}-->
+<!--.date-cell::after{-->
+<!--  position: absolute;-->
+<!--  box-sizing: border-box;-->
+<!--  content: ' ';-->
+<!--  pointer-events: none;-->
+<!--  right: 30px;-->
+<!--  bottom: 0;-->
+<!--  left: 30px;-->
+<!--  border-bottom: 1px solid #ebedf0;-->
+<!--  -webkit-transform: scaleY(.5);-->
+<!--  transform: scaleY(.5);-->
+<!--}-->
+<!--</style>-->

+ 5 - 2
src/components/scroll/scroll.vue

@@ -128,10 +128,13 @@ export default {
       console.log(this.pullupUp,'pullingUp2')
       if(this.pullupUp) {
         this.showLoadMoreText = true;
-        this.loadMoreText = '正在加载...';
+        //this.loadMoreText = '正在加载...';
         this.$emit('loadMore');
         await this.upFn();
         // 加载完成后,调用 this.loadMoreFinish() 结束加载更多
+        setTimeout(()=>{
+          this.loadMoreFinish();
+        },500)
       }else {
         setTimeout(() => {
           this.loadMoreFinish();
@@ -157,7 +160,7 @@ export default {
 
     // 结束上拉加载更多
     loadMoreFinish() {
-      this.loadMoreText = '加载更多';
+      //this.loadMoreText = '加载更多';
       this.showLoadMoreText = false;
     },
   },

+ 9 - 7
src/views/menu/workTime/index.vue

@@ -27,16 +27,18 @@
       </van-radio-group>
 
       <!--  选择时间    -->
-      <van-cell-group >
-        <hours-cell :disabled="formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业开始" v-model="formData.openTime"></hours-cell>
+      <van-cell-group>
+        <hours-cell  :disabled="formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业开始" v-model="formData.openTime"></hours-cell>
         <hours-cell :disabled="formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业结束" v-model="formData.closeTime"></hours-cell>
       <!--   操作     -->
       </van-cell-group>
-      <van-cell center title="是否复制到全月" v-if="!formData.isDisabled">
-        <template #right-icon>
-          <van-button size="mini" type="info" @click="copyMouth">点击复制</van-button>
-        </template>
-      </van-cell>
+      <van-cell-group>
+        <van-cell center title="是否复制到全月" v-if="!formData.isDisabled">
+          <template #right-icon>
+            <van-button size="mini" type="info" @click="copyMouth">点击复制</van-button>
+          </template>
+        </van-cell>
+      </van-cell-group>
 
       <div class="button-box">
         <van-button type="info" size="large" v-show="!formData.isDisabled" @click="onsubmit">提交</van-button>