bug

jiangping

2023-12-06 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5

 minipro_standard/pages/index/index.vue

@@ -2,26 +2,68 @@
   <view class="index">

      <!-- <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view> -->

      <!-- {{$store.state.statusbarHeight}} -->

		
<<<<<<< HEAD

      <div class="content_search">
         <v-Search @searchInput="searchForm.mixParam" @submit="search" @reset="reset" :isShow="true"
            placeholder="搜索关键字">
            <template v-slot:content>
               <div class="Search_item">
                  <div class="Search_item_label">计划日期</div>
                  <div class="Search_item_content" @click="isOpenDate = true">
                     <div class="Search_item_content_a" :style="searchForm.startDate ? 'color: #000;' : ''">
                        {{ searchForm.startDate ? searchForm.startDate : '开始日期'}}
                     </div>
                     <span>-</span>
                     <div class="Search_item_content_a" :style="searchForm.endDate ? 'color: #000;' : ''">
                        {{ searchForm.endDate ? searchForm.endDate : '结束日期'}}
                     </div>
                  </div>
               </div>
            </template>
         </v-Search>
         <div class="content_search_x"></div>
         <v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection>
      </div>

=======



>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f

      <u-sticky>

         <view class="plr30 pb30 nav-style bg_w">

         <view class="plr30 pb30 nav-style">

            <view

               :style="{background: '#fff', zIndex: '999', paddingTop: `${statusbarHeight}px`, height: `${navHeight}px`, lineHeight:`${navHeight}px`, textAlign: 'center'}">

               待办</view>

            <div class="content_search">
               <v-Search @searchInput="searchInput" @submit="search" @reset="reset" :isShow="true"
                  placeholder="搜索关键字">
               </v-Search>
               <div class="content_search_x"></div>
               <LabelSelection :TagList="tagList" :isShow="true" @change="clickTag"></LabelSelection>
            </div>

            <view class="cY">

               <u-search placeholder="搜索关键字" bgColor="#f7f7f7" :showAction="false" @search="search"

                  shape="square" v-model="searchForm.mixParam"></u-search>

               <image src="../../static/filter@2x.png" class="img48 ml20" @click="filterAction" mode=""></image>

            </view>

<<<<<<< HEAD

            <view class="cY mt30 bg_w">

               <view v-for="item in tagList" :key="item.id" class="tag_item mr10"

                  :class="searchForm.status==item.id?'sbtn_green':'sbtn_black_rim'" @click="selectType(item.id)">

                  {{`${item.name}(${item.num})`}}

               </view>

            </view>

         </view>

      </u-sticky>
		
      <scroll-view :style="{height: height}" v-if="projectList.length" scroll-y refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="loadMore"

      </u-sticky>

      <scroll-view v-if="projectList.length" scroll-y refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="loadMore"

         @refresherrefresh="refresh"
      >

         <view v-for="(item, index) in projectList" :key="index">

=======

            <view class="cY mt30">

               <view class="sbtn rd8" :class="searchForm.status==0?'sbtn_green':'sbtn_black_rim'"

                  @click="selectType(0)">待办</view>

               <view class="sbtn rd8 ml20" :class="searchForm.status==1?'sbtn_green':'sbtn_black_rim'"

                  @click="selectType(1)">已办</view>

            </view>

         </view>

      </u-sticky>



      <u-list :showScrollbar="false" @scrolltolower="scrolltolower" @scrolltoupper="scrolltoupper"

         :height="windowHeight - (statusbarHeight + navHeight + 120) + 'px'">

         <u-list-item v-for="(item, index) in projectList" :key="index">

>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f

            <view class="box_list">

               <view class="box_list_item" @click="jump(item)">

                  <view class="box_list_item_icon">

@@ -38,6 +80,7 @@
                  </view>

               </view>

            </view>

<<<<<<< HEAD

         </view>

      </scroll-view>

      <view v-else class="tc c6">暂无数据...</view>

@@ -56,6 +99,17 @@
               <view class="fx1 ptb20 sbtn_gray c9" @click="resetType">重置</view>

               <view class="fx1 ml20 ptb20 sbtn_green" @click="confirm">确定</view>

            </view>

=======

         </u-list-item>

      </u-list>

      <u-popup :show="show" @close="close" :round="8" zIndex="20000">

         <view class="rp p40 contanir">

            <view class="c2 b">类型</view>
            <view class="flex ap tc bottom-view">
               <view class="fx1 ptb20 sbtn_gray c9">重置</view>
               <view class="fx1 ml20 ptb20 sbtn_green">确定</view>
            </view>
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f

         </view>

      </u-popup>

      <myTabbar :index="0" />

@@ -63,9 +117,7 @@
</template>



<script>

   import myTabbar from "@/components/myTabber.vue"
   import vSearch from '@/components/Search.vue'
   import LabelSelection from '@/components/LabelSelection.vue'

   import myTabbar from "@/components/myTabber.vue"

   import {

      getList,

      pageCount

@@ -75,14 +127,10 @@
   } from 'vuex'

   export default {

      components: {

         myTabbar,
         vSearch,
         LabelSelection

         myTabbar

      },

      data() {

         return {
            height: '',
            top: '',

         return {

            code: '',

            windowHeight: '',

            show: false,

@@ -123,6 +171,7 @@
                  name: '客退/返品回厂检验'

               }

            ],

<<<<<<< HEAD

            tagList: [{

                  id: 0,

                  name: '待办',

@@ -148,6 +197,33 @@
            triggered: false,
            finished: false,

            projectList: []

=======

            searchForm: {

               name: '',

               status: 0

            },

            projectList: [{

                  title: '212132',

                  createTime: '2023-08-28',

                  content: 'asdsadsax手打大萨达的啊实打as'

               },

               {

                  title: '212132',

                  createTime: '2023-08-28',

                  content: 'asdsadsax手打大萨达的啊实打as'

               },

               {

                  title: '212132',

                  createTime: '2023-08-28',

                  content: 'asdsadsax手打大萨达的啊实打as'

               },

               {

                  title: '212132',

                  createTime: '2023-08-28',

                  content: 'asdsadsax手打大萨达的啊实打as'

               },

            ]

>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f

         }

      },

      computed: {

@@ -157,20 +233,6 @@
         await this.$store.dispatch('getUpcomingNum')

         this.tagList[0].num = this.$store.state.upcomingNum.d

         this.tagList[1].num = this.$store.state.upcomingNum.y

      },
      onReady() {
         var that = this
         this.$nextTick(() => {
            uni.createSelectorQuery()
               .in(this)
               .select('.content_search')
               .boundingClientRect((rect) => {
                  console.log('-----',rect);
                  that.height = `calc(100vh - ${rect.height + 80}px)`
                  that.top = `${rect.height}px`
               })
               .exec()
         })
      },

      onLoad() {

         uni.getSystemInfo({

@@ -180,21 +242,7 @@
         })

         this.loadData()

      },

      methods: {
         // 搜索
         searchInput(val) {
            this.searchForm.mixParam = val;
            this.search();
            this.getPageCount()
         },
         getPageCount() {
            pageCount({mixParam: this.searchForm.mixParam})
               .then(res => {
                  this.tagList[0].num = res.data.startNum
                  this.tagList[1].num = res.data.endNum
               })
               .catch(err => {})
         },

      methods: {

         loadData() {

            getList({

                  model: this.searchForm,

@@ -216,6 +264,7 @@
                  this.triggered = false
               })

         },

<<<<<<< HEAD

         refresh() {

            if (this.triggered) return
            this.triggered = true;
@@ -226,7 +275,7 @@
            this.page.page += 1

            this.loadData()

         },

         clickTag(status) {

         selectType(status) {

            if (this.searchForm.status == status) return

            this.searchForm.status = status
            this.search()

@@ -397,6 +446,21 @@
         search() {
            this.page.page = 1
            this.loadData()
=======

         scrolltolower() {},

         scrolltoupper() {},

         selectType(status) {

            if (this.searchForm.status == status) return

            this.searchForm.status = status

            this.scrolltoupper()

         },

         selectProject(item) {},

         filterAction() {

            this.show = true

         },
         close() {
            this.show = false
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f

         }

      }

   }

@@ -497,6 +561,14 @@
            }

         }

      }

   }
   .contanir {
      min-height: calc(env(safe-area-inset-bottom) + 120rpx);
   }
   .bottom-view {
      left: 40rpx;
      right: 40rpx;
      bottom: env(safe-area-inset-bottom);
   }



   .contanir {

@@ -529,8 +601,5 @@
      font-weight: 400;
      height: 52rpx;
      line-height: 52rpx;
   }
   .content_search_x {
      height: 24rpx;
   }

</style>