Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-08-28 a79f7d80e55319ae1a40954f6a4ce6e382cc1649

 minipro_standard/pages/index/index.vue

@@ -1,8 +1,8 @@
<template>

   <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}} -->
		
      <!-- {{$store.state.statusbarHeight}} -->



      <u-sticky>

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

            <view

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

            </view>

            <view class="cY mt30">

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

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

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

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

               <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">

@@ -43,6 +43,15 @@
            </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>
         </view>

      </u-popup>

      <myTabbar :index="0" />

   </view>

</template>

@@ -61,15 +70,67 @@
            code: '',

            windowHeight: '',

            show: false,

            types: [{

                  id: 0,

                  name: '车间领料-待发货'

               },

               {

                  id: 1,

                  name: '车间领料-待入库'

               },

               {

                  id: 2,

                  name: '机台备料-待发货'

               },

               {

                  id: 3,

                  name: '机台备料-待入库'

               },

               {

                  id: 4,

                  name: '完工入库-待接收'

               },

               {

                  id: 5,

                  name: '库存转库-待发货'

               },

               {

                  id: 6,

                  name: '库存转库-待入库'

               },

               {

                  id: 7,

                  name: '申请审批'

               },

               {

                  id: 8,

                  name: '客退/返品回厂检验'

               }

            ],

            searchForm: {

               name: '',

               type: 0

               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'},

            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'

               },

            ]

         }

      },

@@ -99,14 +160,17 @@
         },

         scrolltolower() {},

         scrolltoupper() {},

         selectType(type) {

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

            this.searchForm.type = type

         selectType(status) {

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

            this.searchForm.status = status

            this.scrolltoupper()

         },

         selectProject(item) {},
         filterAction() {
				
         selectProject(item) {},

         filterAction() {

            this.show = true

         },
         close() {
            this.show = false
         }

      }

   }

@@ -172,10 +236,10 @@
               align-items: center;

               justify-content: space-between;



               span {
               span {

                  &:first-child {

                     font-size: 30rpx;

                     font-weight: 500;
                     font-weight: 500;

                     max-width: 450rpx;

                     color: #222222;

                     overflow: hidden;

@@ -184,7 +248,7 @@
                     -o-text-overflow: ellipsis;

                  }



                  &:last-child {
                  &:last-child {

                     flex-shrink: 0;

                     font-size: 24rpx;

                     font-weight: 400;

@@ -207,5 +271,13 @@
            }

         }

      }

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

</style>