From a79f7d80e55319ae1a40954f6a4ce6e382cc1649 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 28 八月 2023 15:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
minipro_standard/pages/index/index.vue | 112 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 20 deletions(-)
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index af9a076..e6335a7 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/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鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'},
- {title: '212132', createTime: '2023-08-28', content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'},
- {title: '212132', createTime: '2023-08-28', content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'},
- {title: '212132', createTime: '2023-08-28', content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'},
+ projectList: [{
+ title: '212132',
+ createTime: '2023-08-28',
+ content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
+ },
+ {
+ title: '212132',
+ createTime: '2023-08-28',
+ content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
+ },
+ {
+ title: '212132',
+ createTime: '2023-08-28',
+ content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
+ },
+ {
+ title: '212132',
+ createTime: '2023-08-28',
+ content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
+ },
]
}
},
@@ -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>
--
Gitblit v1.9.3