diff --git a/pages.json b/pages.json
index c18c488..ec0529b 100644
--- a/pages.json
+++ b/pages.json
@@ -168,6 +168,13 @@
"navigationBarBackgroundColor": "#284CD1"
}
},
+ {
+ "path": "pages/index/testcrowdsourc/onlinejl",
+ "style": {
+ "navigationBarTitleText": "在线简历",
+ "navigationBarBackgroundColor": "#284CD1"
+ }
+ },
{
"path": "pages/index/customerservice",
"style": {
@@ -306,7 +313,14 @@
{
"path": "pages/index/testcrowdsourc/companyInfo",
"style": {
- "navigationBarTitleText": "发布者主页",
+ "navigationBarTitleText": "企业主页",
+ "navigationBarBackgroundColor": "#284CD1"
+ }
+ },
+ {
+ "path": "pages/index/testcrowdsourc/userInfo",
+ "style": {
+ "navigationBarTitleText": "个人主页",
"navigationBarBackgroundColor": "#284CD1"
}
},
diff --git a/pages/index/test.vue b/pages/index/test.vue
index 98811cb..62f37f0 100644
--- a/pages/index/test.vue
+++ b/pages/index/test.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/index/testcrowdsourc/companyInfo.vue b/pages/index/testcrowdsourc/companyInfo.vue
index 46cfcd6..165eae5 100644
--- a/pages/index/testcrowdsourc/companyInfo.vue
+++ b/pages/index/testcrowdsourc/companyInfo.vue
@@ -2,28 +2,42 @@
-
- {{task.company_name}}
-
- 评分:
- {{task.commentsStar}}
-
-
-
- 暂无评价
+
+
+
+
+
+ {{task.company_name}}
+
+
+ |
+
+
+ 评分:
+ {{task.commentsStar}}
+
+
+
+ 暂无评分
+
+
+
+ 企业
+
+
- 众包任务
+ 企业信息
- 评价
+ 收到的评价
-
+
+
+
+ {{task.company_desc}}
+
+
@@ -128,7 +146,7 @@
onLoad(options) {
const task = JSON.parse(decodeURIComponent(options.taskInfo))
this.task = task
- this.getTaskList()
+ // this.getTaskList()
},
methods: {
dateFormat,
@@ -137,11 +155,11 @@
goTaskDetail() {
},
// 查询任务列表
- getTaskList() {
- this.http.quickGet(`/crowdsource/listAnon?pageNum=${this.queryparams.pageNum}&pageSize=${this.queryparams.pageSize}`).then(res => {
- this.crowdlist = res.data.rows;
- })
- },
+ // getTaskList() {
+ // this.http.quickGet(`/crowdsource/listAnon?pageNum=${this.queryparams.pageNum}&pageSize=${this.queryparams.pageSize}`).then(res => {
+ // this.crowdlist = res.data.rows;
+ // })
+ // },
// 查询评价列表
getReviewList() {
this.http.quickGet(`/comment/comments/${this.task.publisher_id}?pageNum=${this.queryparams1.pageNum}&pageSize=${this.queryparams1.pageSize}`, false).then(res=>{
@@ -152,7 +170,7 @@
tabnavClick(val) {
this.activetab = val
if (val == 1) {
- this.getTaskList()
+ // this.getTaskList()
} else {
this.getReviewList()
}
@@ -168,14 +186,14 @@
onReachBottom() {
if (this.activetab == 1) {
// 任务第一次触底
- if (this.crowdlist.length % 10 != 0) {
- return
- } else {
- this.queryparams.pageNum++
- this.http.quickGet(`/crowdsource/listAnon?pageNum=${this.queryparams.pageNum}&pageSize=${this.queryparams.pageSize}`).then(res => {
- this.crowdlist.push(...res.data.rows);
- })
- }
+ // if (this.crowdlist.length % 10 != 0) {
+ // return
+ // } else {
+ // this.queryparams.pageNum++
+ // this.http.quickGet(`/crowdsource/listAnon?pageNum=${this.queryparams.pageNum}&pageSize=${this.queryparams.pageSize}`).then(res => {
+ // this.crowdlist.push(...res.data.rows);
+ // })
+ // }
} else {
// 评论
@@ -199,11 +217,59 @@
background: #f5f7fa;
padding: 25rpx 25rpx 25rpx 25rpx;
box-sizing: border-box;
-
+ .companyinfotext {
+ width: 100%;
+ background: #FFFFFF;
+ border-radius: 10rpx;
+ padding: 35rpx;
+ box-sizing: border-box;
+ font-weight: 500;
+ font-size: 26rpx;
+ color: #4D4D4D;
+ line-height: 54rpx;
+ }
+ .newinfo {
+ width: 100%;
+ height: 179rpx;
+ background: linear-gradient(90deg, #E2EDFD, #FEE4E4);
+ border-radius: 10rpx 10rpx 0rpx 0rpx;
+ padding: 40rpx 25rpx 0 25rpx;
+ display: flex;
+ .newinfoimg {
+ width: 102rpx;
+ height: 102rpx;
+ margin-right: 20rpx;
+ }
+ .newinfoMT {
+ display: flex;
+ align-items: center;
+ .newnaem {
+ font-weight: bold;
+ font-size: 32rpx;
+ color: #1A1A1A;
+ }
+ .newline {
+ color: #d1cfd0;
+ margin: 0 10rpx;
+ }
+ }
+ .newinfoMB {
+ width: 86rpx;
+ height: 32rpx;
+ background: linear-gradient(90deg, #F9BD55, #F49C45);
+ border-radius: 16rpx;
+ font-weight: 500;
+ font-size: 22rpx;
+ color: #FEFEFE;
+ line-height: 32rpx;
+ text-align: center;
+ margin-top: 10rpx;
+ }
+ }
// 公司信息
.companyinfo {
width: 100%;
- height: 350rpx;
+
background-color: #FFFFFF;
border-radius: 10rpx;
margin-bottom: 30rpx;
@@ -212,11 +278,7 @@
justify-content: space-between;
align-items: center;
- image {
- width: 95rpx;
- height: 95rpx;
- margin-top: 30rpx;
- }
+
.comname {
font-weight: bold;
diff --git a/pages/index/testcrowdsourc/crowdsourcingdetails.vue b/pages/index/testcrowdsourc/crowdsourcingdetails.vue
index b70765b..610bb1e 100644
--- a/pages/index/testcrowdsourc/crowdsourcingdetails.vue
+++ b/pages/index/testcrowdsourc/crowdsourcingdetails.vue
@@ -8,27 +8,22 @@
¥{{crowddata.task.price}}
-
+
竞标中
竞标成功
竞标失败
-
{{itema}}
-
-
+
+
+ {{it}}
+
+
@@ -44,13 +39,6 @@
技能要求:{{crowddata.task.tech_need}}
地域要求:{{crowddata.task.area}}
有效天数:{{crowddata.task.valid_days}}天
-
-
@@ -109,12 +97,11 @@
报名列表
-
+
-
{{item.nick_name.slice(0,1)}}**
@@ -462,6 +449,20 @@
}
},
methods: {
+ // 报名用户详情
+ goUserDetail(item) {
+ const data = {
+ commentsStar: 0,
+ publisher_id: item.user_id,
+ name: item.nick_name,
+ avatar: item.avatar,
+ userId: item.user_id,
+ taskId: this.crowddata.task.task_id
+ }
+ uni.navigateTo({
+ url: `/pages/index/testcrowdsourc/userInfo?taskInfo=${encodeURIComponent(JSON.stringify(data))}`
+ })
+ },
findLabelValueByPropnew,
// 公司主页
goCompanyInfo() {
@@ -807,7 +808,7 @@
}
.tabone {
- padding: 6rpx;
+ padding: 10rpx 15rpx;
color: #FFFFFF;
background: #2286FA;
border-radius: 5rpx;
@@ -815,6 +816,13 @@
text-align: center;
margin-bottom: 10rpx;
}
+ .tabone1 {
+ background: #FCF0E6;
+ font-weight: 500;
+ font-size: 20rpx;
+ color: #544841;
+ margin-right: 10rpx;
+ }
.vertical {
width: 6rpx;
diff --git a/pages/index/testcrowdsourc/onlinejl.vue b/pages/index/testcrowdsourc/onlinejl.vue
new file mode 100644
index 0000000..89c65a3
--- /dev/null
+++ b/pages/index/testcrowdsourc/onlinejl.vue
@@ -0,0 +1,368 @@
+
+
+
+
+
+
+
+ {{resumedata.name}}
+
+
+ 性别:{{resumedata.sex}}
+
+
+
+
+
+
+
+
+ 所在城市:{{resumedata.city}}
+
+
+ 技能方向:{{resumedata.test_skills}}
+
+
+ 个人优势:{{resumedata.personalAdvantage}}
+
+
+
+
+
+
+
+
+
+
{{item.name}}
+
{{item.startTime}}-{{item.endTime}}
+
+
+
+
+ {{item.title}}
+
+
+ 工作内容:{{item.intro}}
+
+
+
+
+
+
+
+
+
+
+
{{item.name}}
+
{{item.startTime}}-{{item.endTime}}
+
+
+
+
+ {{item.title}}
+
+
+ 应用技术:{{item.applyTech}}
+
+
+ 工作内容:{{item.intro}}
+
+
+
+
+
+
+
+
+
+
+
{{item.name}}
+
{{item.startTime}}-{{item.endTime}}
+
+
+
+
+ 学历:{{item.education}} 专业:{{item.major}}
+
+
+
+
+
+
+
+
+
+
+
+ 证书名称:{{item.fileName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/testcrowdsourc/testcrowdsourc.vue b/pages/index/testcrowdsourc/testcrowdsourc.vue
index 657f92c..ddf7773 100644
--- a/pages/index/testcrowdsourc/testcrowdsourc.vue
+++ b/pages/index/testcrowdsourc/testcrowdsourc.vue
@@ -112,25 +112,13 @@
类型:{{findLabelValueByPropnew(tasktypelist, item.testType, 'dictValue', 'dictLabel')}}
-
-
-
工期:{{item.period}}天 I
共招{{item.needPerson}}人 / 已报名
{{item.companyAppCount + item.personalAppCount}}人
+ 语言:{{item.language?item.language:'无' }}
@@ -189,7 +177,7 @@
crowdobj: {
crowdlist: [],
PageIndex: 1,
- PageSize: 10,
+ PageSize: 99,
feeType: '',
period: '',
onsiteType: '',
diff --git a/pages/index/testcrowdsourc/userInfo.vue b/pages/index/testcrowdsourc/userInfo.vue
new file mode 100644
index 0000000..b5ef750
--- /dev/null
+++ b/pages/index/testcrowdsourc/userInfo.vue
@@ -0,0 +1,614 @@
+
+
+
+
+
+
+
+
+
+ {{userInfo.name}}
+
+
+ |
+
+
+ 评分:
+ {{userInfo.commentsStar}}
+
+
+ 暂无评分
+
+
+
+ 云员工
+
+
+
+
+ 在线简历
+
+
+
+
+ 中标记录
+
+
+ 收到的评价
+
+
+
+
+
+
+
+
+ 竞标中
+
+ 实施中
+ 待验收
+ 待付款
+ 竞标失败
+ 已完成
+ 验收不通过
+
+ ¥{{item.price}}
+
+
+
+ 项目名称:{{item.project_name}}
+ 项目周期:{{item.period}}天
+
+
+
+
+
+
+
+
+
+
+
+
+ {{it.user_name}}
+
+
+ {{dateFormat(new Date(it.create_time)) }}
+
+
+
+
+
+
+
+
+ {{it.project_name}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/personal/mycrowdtest/mycrowdtest.vue b/pages/personal/mycrowdtest/mycrowdtest.vue
index 5ad7866..426182f 100644
--- a/pages/personal/mycrowdtest/mycrowdtest.vue
+++ b/pages/personal/mycrowdtest/mycrowdtest.vue
@@ -13,7 +13,7 @@
竞标中
赏金金额:面议
- 赏金金额:{{item.price}}
+ 金额:{{item.price}}
@@ -34,7 +34,7 @@
style="background: linear-gradient(90deg, #FCA141, #FD6940);"> 待验收
待付款
- 赏金金额:{{item.price}}
+ 金额:{{item.price}}
@@ -57,7 +57,7 @@
验收不通过
- 赏金金额:{{item.price}}
+ 金额:{{item.price}}
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
index 972bb07..d98957e 100644
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@@ -1,7 +1,8 @@
-
-
+
+ 编辑资料>
+
@@ -10,7 +11,6 @@
:src="avatar.indexOf('http')==0?avatar:base+avatar" alt="">
-
@@ -18,10 +18,6 @@
{{nickName}}
-
未认证
@@ -182,6 +178,13 @@
用人记录
+
+
+
+ 设置
+
+
@@ -525,8 +528,9 @@
position: fixed;
top: 93rpx;
right: 40rpx;
- width: 35rpx;
- height: 35rpx;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #4D4D4D;
}
.changyong {
diff --git a/pages/personal/personalresume/advantage.vue b/pages/personal/personalresume/advantage.vue
index 92f50f8..0f6aa89 100644
--- a/pages/personal/personalresume/advantage.vue
+++ b/pages/personal/personalresume/advantage.vue
@@ -16,8 +16,14 @@
-
-
+
+
+
+
+
@@ -43,12 +49,26 @@
wxUserInfo: null,
testerdata: null,
cityList: [],
-
+ skillList: [{
+ label: 'java',
+ value: 'java'
+ },
+ {
+ label: 'python',
+ value: 'python'
+ },
+ {
+ label: '其他',
+ value: '其他'
+ },
+ ],
+ skillshow: false,
+ testSkillValue: '',
certRules: {
city: [{
required: true,
message: '请选择城市',
- trigger: 'change'
+ trigger: 'blur'
}],
testSkills: [{
required: true,
@@ -86,12 +106,17 @@
},
methods: {
+ skillchange(e) {
+ this.basicobj.testSkills = e[0].label
+ this.testSkillValue = ''
+ },
citychange(e) {
this.basicobj.city = e[0].label + '-' + e[1].label
},
resource() {
this.$refs.basicobj.validate(valid => {
if (valid) {
+ this.basicobj.testSkills = this.testSkillValue ? this.testSkillValue : this.basicobj.testSkills
this.http.quickPost(`/tester/cert/profile`, this.basicobj, true).then(res => {
if (res.data.code == 200) {
this.$refs.uToast.show({
@@ -125,6 +150,9 @@
align-items: center;
/* height: 50px; */
}
+ .sinput1 {
+ display: block;
+ }
.u-form-left__content__label {
color: #808080 !important;
diff --git a/pages/personal/setup/Information.vue b/pages/personal/setup/Information.vue
index 14fecb8..ef18f50 100644
--- a/pages/personal/setup/Information.vue
+++ b/pages/personal/setup/Information.vue
@@ -102,7 +102,6 @@
let email=uni.getStorageSync('email');
let nickName=uni.getStorageSync('nickName');
let sex=uni.getStorageSync('sex');
- console.log('wxUserInfo',this.wxUserInfo,)
let {phonenumber}=this.wxUserInfo;
let setavatar='',sexdata='';
if(avatar){
@@ -178,12 +177,12 @@
})
return;
}
- let avatar='',avtimg=this.infornobj.avatar;
- if(avtimg&&avtimg.indexOf('h')==0){
- avatar=avtimg
- }else{
- avatar=this.http.baseUrl+avtimg
- }
+ // let avatar='',avtimg=this.infornobj.avatar;
+ // if(avtimg&&avtimg.indexOf('h')==0){
+ // avatar=avtimg
+ // }else{
+ // avatar=this.http.baseUrl+avtimg
+ // }
let sexindex=this.sexList.filter(item=>item.label==this.infornobj.sex)[0].value;
let data={
@@ -191,7 +190,7 @@
nickName:this.infornobj.nickName,
email:this.infornobj.email,
sex:sexindex,
- avatar,
+ avatar: this.infornobj.avatar,
}
console.log('data---',data)
// return;
diff --git a/utils/http.js b/utils/http.js
index acc76b7..3da8544 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -1,9 +1,9 @@
import comstemutil from "./comstemutil";
//es6
-// const baseUrl = 'http://192.168.0.229:9999';
+const baseUrl = 'http://192.168.0.229:9999';
// const baseUrl = 'http://172.16.36.180:9999';
-const baseUrl = 'https://www.bjkeyware.com/prod-api';
+// const baseUrl = 'https://www.bjkeyware.com/prod-api';
const devStatus = false;
const commonhttp = (params, header) => {
return new Promise((resolve, reject) => {