除个人主页

src/api/tester/CompanyApply.js

@@ -142,3 +142,14 @@ export function companyApplyUpdate(data) {
     data: data
   })
 }
+
+// 技能字典
+export function skilldis() {
+  return request({
+    url: '/system/dict/data/type/cloud_emp_skill',
+    method: 'get',
+    headers: {
+      isToken: false
+    }
+  })
+}

src/page/homepage/crowdsourcing/crowddetails.vue

@@ -441,7 +441,7 @@ export default {
         gouserhome(item) {
             this.$router.push({
                 path: '/crowdsourcing/userhome',
-                query: {id: item.user_id}
+                query: {id: item.user_id, id2: this.$route.query.id}
             })
         },
         // 打开公司评论信息
@@ -488,6 +488,9 @@ export default {
                     })
             } else {
                 gettesterId(this.userId).then((res) => {
+                    if (res.code == 200 && res.data.companyApplyId) {
+                        return this.$message.warning('仅支持个人用户竞标报名')
+                    }
                     if (res.code == 200 && res.data.applyId) {
                         if (res.data.applyId && res.data.status == 1) {
                             this.paydiaopen = true

src/page/homepage/crowdsourcing/userhome.vue

@@ -1,19 +1,167 @@
 <template>
-  <div class="userpage container">个人主页</div>
+    <div class="userpage container">
+        <div class="topava">
+            <div class="topavaL">
+                <img :src="testerdata.avatar" alt="" />
+            </div>
+            <div class="topavaR">
+                <div class="topavaRT">
+                    <div class="topavaRT1">昵称：{{ testerdata.name }}</div>
+                    <div class="topavaRT2"></div>
+                </div>
+                <div class="topavaRB">
+                    <img src="/assets/crowd/address.png" class="topavaRB1" alt="" />
+                    <div class="topavaRB2">{{ testerdata.city }}</div>
+                    <div class="topavaRB3">|</div>
+                    <div class="topavaRB2">评分：{{ testerdata.commentsStar }}分</div>
+                    <div class="topavaRB4"></div>
+                </div>
+            </div>
+        </div>
+        <div class="middlebar">
+            <div class="middlebarit" :class="active == 0 ? 'middlebaritac' : ''" @click="tabfn(0)">中标记录</div>
+            <div class="middlebarit" :class="active == 1 ? 'middlebaritac' : ''" @click="tabfn(1)">收到的评价</div>
+            <div class="middlebarit" :class="active == 2 ? 'middlebaritac' : ''" @click="tabfn(2)">在线简历</div>
+        </div>
+        <div class="content0" v-if="active == 0">
+            <div class="content0it">
+
+            </div>
+        </div>
+    </div>
 </template>
 
 <script>
+import { getdetesterId } from '@/api/tester/CompanyApply'
+import { myClaim } from '@/api/crowdsource/crowdsource'
+
 export default {
+    data() {
+        return {
+            base: process.env.VUE_APP_BASE_API,
+            testerdata: {}, //基本信息
+            workList: [],
+            proList: [],
+            eduList: [],
+            bookList: [],
+            active: 0,
+            allcrowdlist: [], //任务
+        }
+    },
+    created() {
+        this.getData()
+        this.getTask()
+    },
+    methods: {
+        tabfn(val) {
+            this.active = val
+            if (val == 0) {
+                this.getTask()
+            }
+        },
+        // 获取基本数据及简历
+        getData() {
+            getdetesterId(this.$route.query.id, this.$route.query.id2).then((res) => {
+                this.testerdata = res.data
+                if (this.testerdata.avatar) {
+                    if (this.testerdata.avatar.indexOf('/prod-api') == -1) {
+                        this.testerdata.avatar = this.base + this.testerdata.avatar
+                    }
+                }
+                this.projectlist = res.projectCase
+                if (res.projectCase && res.projectCase.length) {
+                    this.workList = res.projectCase.filter((it) => it.type == 1)
+                    this.proList = res.projectCase.filter((it) => it.type == 0)
+                    this.eduList = res.projectCase.filter((it) => it.type == 2)
+                }
+                if (res.credentials && res.credentials.length) {
+                    this.bookList = res.credentials
+                }
 
+                this.programme = res.plan
+            })
+        },
+        // 获取任务
+        getTask() {
+            myClaim({},this.$route.query.id).then((response) => {
+                this.allcrowdlist = response.rows
+            })
+        },
+        // 获取评价
+    },
 }
 </script>
 
 <style scoped>
 .userpage {
-    height: 800px;
+    padding: 40px 0;
 }
 .container {
     width: 1200px;
     margin: auto;
 }
+.topava {
+    display: flex;
+    align-items: center;
+}
+.topavaL {
+    width: 76px;
+    height: 76px;
+    margin-right: 20px;
+}
+.topavaL img {
+    width: 100%;
+    height: 100%;
+}
+.topavaRT {
+    margin-bottom: 20px;
+}
+.topavaRB,
+.topavaRT {
+    display: flex;
+    align-items: center;
+}
+.topavaRT1 {
+    font-weight: bold;
+    font-size: 18px;
+    color: #1a1a1a;
+}
+.topavaRB1 {
+    width: 13px;
+    height: 16px;
+    margin-right: 5px;
+}
+.topavaRB2 {
+    font-weight: 500;
+    font-size: 16px;
+    color: #333333;
+}
+.topavaRB3 {
+    font-size: 12px;
+    font-weight: 500;
+    color: #333333;
+    margin: 0 10px;
+}
+.middlebar {
+    height: 45px;
+    background: #f7f7f7;
+    display: flex;
+    margin-top: 40px;
+}
+.middlebarit {
+    height: 100%;
+    padding: 0 20px;
+    line-height: 45px;
+    font-weight: bold;
+    font-size: 15px;
+    color: #1a1a1a;
+    cursor: pointer;
+}
+.middlebaritac {
+    color: #ffffff;
+    background: #1578ed;
+}
+.content0 {
+  display: flex;
+}
 </style>

src/page/homepage/personability/abilityApply.vue

@@ -309,9 +309,13 @@
                                     :disabled="active == 6 ? true : false"
                                     @change="testSkillChange"
                                 >
-                                    <el-option label="java" value="java"> </el-option>
+                                    <el-option
-                                    <el-option label="python" value="python"> </el-option>
+                                        v-for="it in testskillList"
-                                    <el-option label="c++" value="c++"> </el-option>
+                                        :key="it.dictCode"
+                                        :label="it.dictLabel"
+                                        :value="it.dictLabel"
+                                    >
+                                    </el-option>
                                     <el-option label="其他" value="其他"> </el-option>
                                 </el-select>
                                 <br />
@@ -470,7 +474,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import imageUpload from '@/page/common/imageUpload'
-import { gettesterId, addtesterApply, updatetesterApply } from '@/api/tester/CompanyApply'
+import { gettesterId, addtesterApply, updatetesterApply, skilldis } from '@/api/tester/CompanyApply'
 import {
     getCloudAll,
     couldInfoAdd,
@@ -489,6 +493,7 @@ export default {
     components: { imageUpload },
     data() {
         return {
+            testskillList: [],
             testSkillValue: '',
             iseditfirst: true,
             active: 0,
@@ -583,6 +588,9 @@ export default {
     },
     created() {
         this.getCloudAllList()
+        skilldis().then(res => {
+            this.testskillList = res.data
+        })
     },
     methods: {
         // 技能方向变化

src/page/personalpage/home/resume.vue

@@ -45,9 +45,7 @@
                                         :disabled="active == 6 ? true : false"
                                         @change="testSkillChange"
                                     >
-                                        <el-option label="java" value="java"> </el-option>
+                                        <el-option v-for="it in testskillList" :key="it.dictCode" :label="it.dictLabel" :value="it.dictLabel"> </el-option>
-                                        <el-option label="python" value="python"> </el-option>
-                                        <el-option label="c++" value="c++"> </el-option>
                                         <el-option label="其他" value="其他"> </el-option>
                                     </el-select>
                                     <br />
@@ -304,7 +302,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import imageUpload from '@/page/common/imageUpload'
-import { gettesterId, addtesterApply, updatetesterApply } from '@/api/tester/CompanyApply'
+import { gettesterId, addtesterApply, updatetesterApply, skilldis } from '@/api/tester/CompanyApply'
 import {
     getCloudAll,
     couldInfoAdd,
@@ -321,6 +319,7 @@ export default {
     components: { imageUpload },
     data() {
         return {
+            testskillList: [],
             testSkillValue: '',
             active: 0,
             // 实名认证
@@ -413,6 +412,9 @@ export default {
     },
     created() {
         this.getCloudAllList()
+        skilldis().then(res => {
+            this.testskillList = res.data
+        })
     },
     methods: {
         testSkillChange(e) {