From 721bfaa6a1cf9bed6cf416cba077284643271fee Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 11 九月 2023 18:33:50 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages/index/index.vue | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 insertions(+), 0 deletions(-)
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 9cdf458..8930d13 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -2,6 +2,7 @@
<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="鎼滅储鍏抽敭瀛�">
@@ -23,6 +24,9 @@
<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">
<view
@@ -33,6 +37,7 @@
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)">
@@ -45,6 +50,20 @@
@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">
@@ -61,6 +80,7 @@
</view>
</view>
</view>
+<<<<<<< HEAD
</view>
</scroll-view>
<view v-else class="tc c6">鏆傛棤鏁版嵁...</view>
@@ -79,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" />
@@ -140,6 +171,7 @@
name: '瀹㈤��/杩斿搧鍥炲巶妫�楠�'
}
],
+<<<<<<< HEAD
tagList: [{
id: 0,
name: '寰呭姙',
@@ -165,6 +197,33 @@
triggered: false,
finished: false,
projectList: []
+=======
+ searchForm: {
+ name: '',
+ 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'
+ },
+ ]
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
}
},
computed: {
@@ -205,6 +264,7 @@
this.triggered = false
})
},
+<<<<<<< HEAD
refresh() {
if (this.triggered) return
this.triggered = true;
@@ -386,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
}
}
}
@@ -486,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 {
--
Gitblit v1.9.3