From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
minipro_standard/pages/index/index.vue | 184 +++++++++++++++++++++++++++++++--------------
1 files changed, 126 insertions(+), 58 deletions(-)
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index f8df598..8930d13 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/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鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳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: {
@@ -157,21 +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({
@@ -181,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,
@@ -217,6 +264,7 @@
this.triggered = false
})
},
+<<<<<<< HEAD
refresh() {
if (this.triggered) return
this.triggered = true;
@@ -227,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()
@@ -237,7 +285,7 @@
case 0: case 2: case 5: {
if (item.status === 0) {
uni.navigateTo({
- url: `/pages_inspect/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
+ url: `/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
})
} else {
uni.navigateTo({
@@ -262,7 +310,7 @@
case 1: case 6: {
if (item.status === 0) {
uni.navigateTo({
- url: `/pages_inspect/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
+ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
})
} else {
uni.navigateTo({
@@ -274,7 +322,7 @@
case 9: {
if (item.status === 0) {
uni.navigateTo({
- url: `/pages_inspect/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
+ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
})
} else{
uni.navigateTo({
@@ -398,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
}
}
}
@@ -498,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 {
@@ -530,8 +601,5 @@
font-weight: 400;
height: 52rpx;
line-height: 52rpx;
- }
- .content_search_x {
- height: 24rpx;
}
</style>
--
Gitblit v1.9.3