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

# Conflicts:
#	pages/key-project-management/positioning_management/videoView.vue

pages/key-project-management/positioning_management/index.vue

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

pages/key-project-management/positioning_management/list.vue

@@ -1,7 +1,19 @@
 <template>
   <view class="content">
-    <u-search placeholder="请输入搜索关键词" v-model="KEYWORDS" @custom="fnSearchList" @clear="fnSearchList"
+    <view class="search card">
-              @search="fnSearchList"></u-search>
+      <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">