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

# Conflicts:
#	pages/key-project-management/positioning_management/videoView.vue
dev
guoyuepeng 2024-12-05 15:21:09 +08:00
commit 4dcbb45f02
2 changed files with 28 additions and 3 deletions

View File

@ -1,6 +1,19 @@
<template>
<view class="content">
<u-search placeholder="请输入搜索关键词" v-model="KEYWORDS" @custom="fnSearchList" @clear="fnSearchList" @search="fnSearchList"></u-search>
<view class="search card">
<u--input
prefixIcon="search"
placeholder="请输入关键字"
border="surround"
v-model="KEYWORDS"
clearable
shape="circle"
></u--input>
<view class="bth-mini ml-10">
<u-button type="success" text="确定" @click="fnSearchList"></u-button>
</view>
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
<view class="flex-between main-title" @click="fnKeyProjectApply(item.OUTSOURCED_ID)">

View File

@ -1,7 +1,19 @@
<template>
<view class="content">
<u-search placeholder="请输入搜索关键词" v-model="KEYWORDS" @custom="fnSearchList" @clear="fnSearchList"
@search="fnSearchList"></u-search>
<view class="search card">
<u--input
prefixIcon="search"
placeholder="请输入关键字"
border="surround"
v-model="KEYWORDS"
clearable
shape="circle"
></u--input>
<view class="bth-mini ml-10">
<u-button type="success" text="确定" @click="fnSearchList"></u-button>
</view>
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
<view class="flex-between main-title">