Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

components/FilterList/index.vue

@@ -1,9 +1,8 @@
 <template>
   <view class="labelColor itemBox">
     <view class="item" v-for="item in filterList" :key="item[props.idValue]" @click="handleClick(item)">
-      <view>{{ item[labelValue] }}</view>
-      <!-- <icon type="success" size="14"/> -->
-       <view class="iconBox"><uni-icons type="bottom" color="#999" size="18"/></view>
+      <view class="">{{ item[labelValue] }}</view>
+       <view class="iconBox"><uni-icons type="icon-arrow-sortdown-smal" custom-prefix="iconfont" color="#999"/></view>
     </view>
     <uni-popup ref="popupRef" type="bottom" border-radius="10px 10px 0 0">
       <view class="popup">

pages.json

@@ -94,12 +94,12 @@
 		"height": "65px",
 		"fontSize": "24rpx",
 		"list": [
-			{
-				"pagePath": "pages/index/index",
-				"text": "首页",
-				"iconPath": "/static/img/home.png",
-				"selectedIconPath": "/static/img/home-fill.png"
-			},
+			// {
+			// 	"pagePath": "pages/index/index",
+			// 	"text": "首页",
+			// 	"iconPath": "/static/img/home.png",
+			// 	"selectedIconPath": "/static/img/home-fill.png"
+			// },
 			{
 				"pagePath": "pages/index/position",
 				"text": "职位",

pagesA/resume/index.vue

@@ -17,7 +17,7 @@
 			<image src="https://minio.citupro.com/dev/static/nodata.png" mode="widthFix" style="width: 100vw;height: 100vh;"></image>
 		</view>
     <view class="bottom-sticky">
-      <button class="recomm-button" @click="handleUpload">从微信聊天中导入简历</button>
+      <button class="recomm-button" @click="handleUpload">微信聊天文件上传</button>
     </view>
 
     <uni-popup ref="popup" type="bottom">

static/iconfont.css

@@ -11,6 +11,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-arrow-sortdown-smal:before {
+  content: "\e877";
+}
+
+.icon-a-1_zhaopin:before {
+  content: "\e621";
+}
+
 .icon-wode:before {
   content: "\e60f";
 }

uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue

@@ -85,7 +85,7 @@
 			},
 			bgColor: {
 				type: String,
-				default: "#F8F8F8"
+				default: "#f5f5f5"
 			},
 			textColor: {
 				type: String,
@@ -240,7 +240,7 @@
 		flex-direction: row;
 		position: relative;
 		padding: 10px;
-		// background-color: #fff;
+		background-color: #fff;
 	}
 
 	.uni-searchbar__box {