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

App.vue

@@ -16,7 +16,7 @@
 	/*每个页面公共css */
 	@import '@/uni_modules/uni-scss/index.scss';
 	/* #ifndef APP-NVUE */
-	@import '@/static/iconfont.css';
+	@import '@/static/iconfont.wxss';
 	@import '@/static/style/index.scss';
 	// 设置整个项目的背景色
 	page {

components/PositionList/index.vue

@@ -6,9 +6,8 @@
         <!-- 职位 -->
         <view class="titleBox my-5">
           <view style="display: flex;align-items: center;">
-            <uni-icons v-if="item.job?.hire" class="icon-a-1_zhaopin ss-m-r-10" custom-prefix="iconfont" color="#e03506" size="25"/>
-            <!-- <view v-if="item.job.name.indexOf('style')" v-html="item.job.name" class="job-name" style=""></view> -->
-            <rich-text v-if="item.job?.name?.indexOf('style')" class="job-name" :nodes="item.job.name"></rich-text>
+            <view v-if="item.job?.hire" class="iconfont icon-a-1_zhaopin ss-m-r-10" style="color: #e03506; font-size: 25px;"></view>
+            <view v-if="item.job.name.indexOf('style')" v-html="item.job.name" class="job-name" style=""></view>
             <view v-else class="job-name" style="">{{item.job?.name}}</view>
           </view>
           <span class="salary-text">{{ item.job?.payFrom }}-{{ item.job?.payTo }}{{ item.job?.payName ? '/' + item.job?.payName : '' }}</span>

pages.json

@@ -3,14 +3,14 @@
 		{
 			"path": "pages/index/position",
 			"style": {
-				"navigationBarTitleText": "职位",
+				"navigationBarTitleText": "门墩儿招聘",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/index/index",
+			"path": "pages/index/crowdsourcing",
 			"style": {
-				"navigationBarTitleText": "门墩儿招聘"
+				"navigationBarTitleText": "全员猎聘"
 			}
 		},
 		{
@@ -94,18 +94,18 @@
 		"height": "65px",
 		"fontSize": "24rpx",
 		"list": [
-			// {
-			// 	"pagePath": "pages/index/index",
-			// 	"text": "首页",
-			// 	"iconPath": "/static/img/home.png",
-			// 	"selectedIconPath": "/static/img/home-fill.png"
-			// },
 			{
 				"pagePath": "pages/index/position",
 				"text": "职位",
 				"iconPath": "/static/img/position.png",
 				"selectedIconPath": "/static/img/position-fill.png"
 			},
+			{
+				"pagePath": "pages/index/crowdsourcing",
+				"text": "猎聘",
+				"iconPath": "/static/img/pin.png",
+				"selectedIconPath": "/static/img/pin-fill.png"
+			},
 			{
 				"pagePath": "pages/index/communicate",
 				"text": "沟通",

pages/index/crowdsourcing.vue

@@ -0,0 +1,12 @@
+<template>
+  <view class="nodata-img-parent">
+    <image src="https://minio.citupro.com/dev/static/nodata.png" mode="widthFix" style="width: 100vw;height: 100vh;"></image>
+  </view>
+</template>
+
+<script setup>
+</script>
+
+<style scoped lang="scss">
+
+</style>

pages/index/index.vue

@@ -1,13 +0,0 @@
-<template>
-	<view>
-		index
-		<!-- <MyLayout>home</MyLayout> -->
-	</view>
-</template>
-
-<script setup>
-	// import MyLayout from '@/components/Layout'
-</script>
-
-<style lang="scss">
-</style>

pagesB/positionDetail/index.vue

@@ -40,7 +40,7 @@
           </view>
           <!-- 赏金 -->
           <view v-if="info.hire" class="topLine mt-5" style="display: flex; align-items: center;">
-            <uni-icons class="icon-a-1_zhaopin" custom-prefix="iconfont" color="#e03506"/>
+            <view class="iconfont icon-a-1_zhaopin" style="color: #e03506; font-size: 30px;"></view>
             <view class="hirePrice">{{ `赏金：${commissionCalculation(info.hirePrice, 1)}元` }}</view>
           </view>
           <!-- 岗位职责 -->

store/user.js

@@ -22,7 +22,6 @@ const defaultAccountInfo = {
 }
 
 const tabUrl = [
-  'pages/index/index',
   'pages/index/position',
   'pages/index/communicate',
   'pages/index/my'