main
lijingyu007 11 months ago
parent d5723a738a
commit ff652a2fea
  1. 4
      .env.development
  2. BIN
      public/assets/home/plice.png
  3. BIN
      public/assets/personal/comicon1.png
  4. BIN
      public/assets/personal/comicon2.png
  5. 140
      src/page/common/pagecomponent/commonfooter.vue
  6. 158
      src/page/homepage/crowdsourcing/crowddetails.vue
  7. 99
      src/page/homepage/personability/abilityApply.vue
  8. 1
      src/store/modules/user.js

@ -6,11 +6,11 @@ VUE_APP_BASE_API = '/prod-api'
# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' # VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'
VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999' # VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999'
# VUE_APP_BASE_TARGET = 'http://172.16.36.180:9999' # VUE_APP_BASE_TARGET = 'http://172.16.36.180:9999'
# VUE_APP_BASE_TARGET = 'http://172.16.36.176:9998' # VUE_APP_BASE_TARGET = 'http://172.16.36.176:9998'
# VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api' VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

@ -1,9 +1,9 @@
<template> <template>
<!-- 尾部 --> <!-- 尾部 -->
<div> <div>
<div style="background:#0A1F33;color:#FFFFFF;height:270px;margin-top: -1px"> <div style="background: #0a1f33; color: #ffffff; height: 270px; margin-top: -1px">
<div style="display:flex;width:1200px;margin:0 auto;height:180px;justify-content:space-between"> <div style="display: flex; width: 1200px; margin: 0 auto; height: 180px; justify-content: space-between">
<div style="line-height:180px"> <div style="line-height: 180px">
<el-link :underline="false" @click="openurl('/')">首页</el-link> <el-link :underline="false" @click="openurl('/')">首页</el-link>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-link :underline="false" @click="openurl('/market')">工具服务</el-link> <el-link :underline="false" @click="openurl('/market')">工具服务</el-link>
@ -30,12 +30,24 @@
<div class="vider"> <div class="vider">
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
</div> </div>
<div style="display:flex;font-size:14px;cursor:pointer"> <div style="display: flex; font-size: 14px; cursor: pointer">
<img style="width:100px;height:100px;margin-top:40px;margin-right:35px ;" src="/assets/homepage/xcx.jpg" alt=""> <img
<img style="width:100px;height:100px;margin-top:40px;" src="/assets/home/erweima.jpg" alt=""> style="width: 100px; height: 100px; margin-top: 40px; margin-right: 35px"
<div style="margin-left:25px;color: #BFBFBF;display:flex;flex-direction: column; justify-content: center;"> src="/assets/homepage/xcx.jpg"
<p>联系我们 </p> alt=""
<div style="display:flex;align-items:center;margin:10px 0"> />
<img style="width: 100px; height: 100px; margin-top: 40px" src="/assets/home/erweima.jpg" alt="" />
<div
style="
margin-left: 25px;
color: #bfbfbf;
display: flex;
flex-direction: column;
justify-content: center;
"
>
<p>联系我们</p>
<div style="display: flex; align-items: center; margin: 10px 0">
<!-- <img style="margin-right:10px" src="/assets/loginreg/shouji.png" alt=""> --> <!-- <img style="margin-right:10px" src="/assets/loginreg/shouji.png" alt=""> -->
<p>咨询热线010-80750213</p> <p>咨询热线010-80750213</p>
</div> </div>
@ -43,7 +55,7 @@
<img style="margin-right:10px" src="/assets/loginreg/youxiang.png" alt=""> <img style="margin-right:10px" src="/assets/loginreg/youxiang.png" alt="">
<p>传真010-80746071</p> <p>传真010-80746071</p>
</div> --> </div> -->
<div style="display:flex;align-items:center"> <div style="display: flex; align-items: center">
<!-- <img style="margin-right:10px" src="/assets/loginreg/youxiang.png" alt=""> --> <!-- <img style="margin-right:10px" src="/assets/loginreg/youxiang.png" alt=""> -->
<p>邮箱keyware@keyware.com.cn</p> <p>邮箱keyware@keyware.com.cn</p>
</div> </div>
@ -51,89 +63,103 @@
</div> </div>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
<div style="text-align:center;color: #B3B3B3;opacity: 0.7;margin-top:30px"> <div class="bottoaxwa" style="text-align: center; color: #b3b3b3; opacity: 0.7; margin-top: 30px">
版权所有 京ICP备18018633号-3 <img src="/assets/home/plice.png" style="width: 20px; height: 20px" alt="" />
<a target="_blank" style="margin-right: 10px" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11011402054123"
>京公网安备11011402054123号</a
>
<a target="_blank" href="https://beian.miit.gov.cn">京ICP备18018633号-3</a>
</div> </div>
<img class="footer" id="gotoTop" src="/assets/home/gtop.png" alt=""> <img class="footer" id="gotoTop" src="/assets/home/gtop.png" alt="" />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import $ from 'jquery' import $ from 'jquery'
export default { export default {
data(){ data() {
return { return {}
}
}, },
mounted(){ mounted() {
this.gotoTop(600) this.gotoTop(600)
}, },
methods:{ methods: {
openurl(url){ openurl(url) {
// console.log(url) // console.log(url)
// window.open(url,'_blank') // window.open(url,'_blank')
this.$router.push(url) this.$router.push(url)
}, },
stepurl (url) { stepurl(url) {
window.open(url,'_blank') window.open(url, '_blank')
}, },
gotoTop(minHeight){ gotoTop(minHeight) {
// //
$("#gotoTop").click( $('#gotoTop').click(function () {
function(){$('html,body').animate({scrollTop:'0px'},'slow'); $('html,body').animate({ scrollTop: '0px' }, 'slow')
}) })
// 600 // 600
minHeight? minHeight = minHeight:minHeight = 600; minHeight ? (minHeight = minHeight) : (minHeight = 600)
// scroll // scroll
$(window).scroll(function(){ $(window).scroll(function () {
// //
var s = $(window).scrollTop(); var s = $(window).scrollTop()
// console.log('gaodu',s,minHeight) // console.log('gaodu',s,minHeight)
// //
if( s > minHeight){ if (s > minHeight) {
// $("#gotoTop").fadeIn(500);// // $("#gotoTop").fadeIn(500);//
$("#gotoTop").css('display','block') $('#gotoTop').css('display', 'block')
}else{ } else {
// $("#gotoTop").fadeOut(500); // $("#gotoTop").fadeOut(500);
$("#gotoTop").css('display','none') $('#gotoTop').css('display', 'none')
};
});
}
}
} }
})
},
},
}
</script> </script>
<style scoped> <style scoped>
*{margin:0;padding:0} * {
.el-link.el-link--default{ margin: 0;
padding: 0;
}
.el-link.el-link--default {
font-size: 14px; font-size: 14px;
color: #B3B3B3; color: #b3b3b3;
} }
.el-divider{ .el-divider {
background-color: #B3B3B3; background-color: #b3b3b3;
margin:0 20px; margin: 0 20px;
background: #FFFFFF; background: #ffffff;
opacity: 0.5; opacity: 0.5;
} }
.vider>>>.el-divider--vertical{ .vider >>> .el-divider--vertical {
height: 130px; height: 130px;
background: #FFFFFF; background: #ffffff;
opacity: 0.23; opacity: 0.23;
margin:25px 30px; margin: 25px 30px;
} }
.el-divider--horizontal{ .el-divider--horizontal {
margin: 0; margin: 0;
background: #FFFFFF; background: #ffffff;
opacity: 0.23; opacity: 0.23;
} }
.footer { .footer {
position: fixed; position: fixed;
right: 50px; right: 50px;
bottom: 50px; bottom: 50px;
/* width: 50px; /* width: 50px;
height: 50px; */ height: 50px; */
display:none; display: none;
} }
.bottoaxwa {
display: flex;
align-items: center;
justify-content: center;
}
.bottoaxwa a {
text-decoration: none;
color: #b3b3b3;
}
</style> </style>

@ -230,13 +230,24 @@
<template v-if="task.commentsStar && task.commentsStar != 0"> <template v-if="task.commentsStar && task.commentsStar != 0">
<p style="font-size: 16px; color: #808080"> <p style="font-size: 16px; color: #808080">
<span>评分</span> <span>评分</span>
<span style="color: #f38f0d; font-weight: 600">{{ task.commentsStar}} </span> <span style="color: #f38f0d; font-weight: 600">{{ task.commentsStar }} </span>
</p> </p>
<div class="ratebox" style="display: flex; justify-content: center"> <div class="ratebox" style="display: flex; justify-content: center">
<el-rate v-model="task.commentsStar" disabled></el-rate> <el-rate v-model="task.commentsStar" disabled></el-rate>
</div> </div>
</template> </template>
<div v-else style="font-weight: 500;font-size: 16px;color: #666666; text-align:center;margin-top: 20px">暂无评分</div> <div
v-else
style="
font-weight: 500;
font-size: 16px;
color: #666666;
text-align: center;
margin-top: 20px;
"
>
暂无评分
</div>
<!-- <div style="display:flex;justify-content: center;"> <!-- <div style="display:flex;justify-content: center;">
<img v-if="task.email" style="width:15px;height:15px;margin:0 5px;" src="/assets/crowd/email.png" alt="" /> <img v-if="task.email" style="width:15px;height:15px;margin:0 5px;" src="/assets/crowd/email.png" alt="" />
@ -344,7 +355,7 @@ import NonimageUpload from '@/page/common/NonimageUpload'
import mixin from '@/mixin/index.js' import mixin from '@/mixin/index.js'
import companyReviewVue from '@/page/common/companyReview.vue' import companyReviewVue from '@/page/common/companyReview.vue'
import { gettesterId } from '@/api/tester/CompanyApply'
export default { export default {
props: ['mydetails'], props: ['mydetails'],
mixins: [mixin], mixins: [mixin],
@ -468,73 +479,104 @@ export default {
// console.log('') // console.log('')
}) })
} else { } else {
// console.log('this.task',this.task,this.userId) gettesterId(this.userId).then((res) => {
if (parseInt(this.userId) == this.task.publisher_id) { if (res.code == 200 && res.data.applyId) {
this.$alert('您是发布者,无法竞标自己发布的任务。') if (res.data.applyId && res.data.status == 1) {
return this.paydiaopen = true
} } else {
this.user = this.userinform
// console.log('this.user',this.user)
if (this.user.testerStatus != 2) {
//
this.$confirm('未实名认证用户无法报名,请先去个人中心做实名认证', '提示', { this.$confirm('未实名认证用户无法报名,请先去个人中心做实名认证', '提示', {
type: 'warning', type: 'warning',
confirmButtonText: '去实名认证', confirmButtonText: '去实名认证',
}).then(() => { }).then(() => {
this.$router.push(`/console/profile`) this.$router.push(`/console/profile`)
}) })
} else {
if (this.task.applicant_type != 2) {
//2
if (this.task.applicant_type == 0) {
//
if (this.user.companyStatus != 0) {
this.$alert(
'您是认证测试公司或正在申请成为认证测试公司,无法认证该任务,该任务只允许个人测试者竞标。',
)
return
} }
} else { } else {
// return this.$message.warning('仅支持个人用户竞标报名')
if (this.user.companyStatus != 2) {
this.$alert('对不起,您是个人测试者,该任务只允许认证测试公司竞标。')
return
} }
} })
}
this.paydiaopen = true // console.log('this.task',this.task,this.userId)
// this.$confirm("").then(()=>{ // if (parseInt(this.userId) == this.task.publisher_id) {
// // return; // this.$alert('')
// claimTask(this.task.task_id).then(response => { // return
// if (response.data == 0) {
// this.$notify({
// title: '',
// message: '',
// align: 'center',
// type: 'success'
// });
// // this.$alert("")
// setTimeout(() => {
// this.$router.push("/console/myparticipate")
// },1000);
// } else if (response.data == 1){
// this.$alert("")
// } else if (response.data == 2){
// // this.$alert("")
// this.$notify({
// title: '',
// message: '',
// align: 'center',
// type: 'success'
// });
// // this.$alert("")
// setTimeout(() => {
// this.$router.push("/console/myparticipate")
// },1000);
// } // }
// this.user = this.userinform
// if (this.user.companyStatus == 2) {
// return this.$message.warning('')
// }
// if (this.user.testerStatus === 0 || this.user.testerStatus === 2) {
// this.paydiaopen = true
// }
// if (this.user.testerStatus === null) {
// this.$confirm('', '', {
// type: 'warning',
// confirmButtonText: '',
// }).then(() => {
// this.$router.push(`/console/profile`)
// }) // })
// }
// console.log('this.user',this.user)
// if (this.user.testerStatus === 0) {
// //
// this.$confirm('', '', {
// type: 'warning',
// confirmButtonText: '',
// }).then(() => {
// this.$router.push(`/console/profile`)
// }) // })
} // } else {
// if (this.task.applicant_type != 2) {
// //2
// if (this.task.applicant_type == 0) {
// //
// if (this.user.companyStatus != 0) {
// this.$alert(
// '',
// )
// return
// }
// } else {
// //
// if (this.user.companyStatus != 2) {
// this.$alert('')
// return
// }
// }
// }
// this.paydiaopen = true
// // this.$confirm("").then(()=>{
// // // return;
// // claimTask(this.task.task_id).then(response => {
// // if (response.data == 0) {
// // this.$notify({
// // title: '',
// // message: '',
// // align: 'center',
// // type: 'success'
// // });
// // // this.$alert("")
// // setTimeout(() => {
// // this.$router.push("/console/myparticipate")
// // },1000);
// // } else if (response.data == 1){
// // this.$alert("")
// // } else if (response.data == 2){
// // // this.$alert("")
// // this.$notify({
// // title: '',
// // message: '',
// // align: 'center',
// // type: 'success'
// // });
// // // this.$alert("")
// // setTimeout(() => {
// // this.$router.push("/console/myparticipate")
// // },1000);
// // }
// // })
// // })
// }
} }
}, },
resultFn() { resultFn() {

@ -469,6 +469,7 @@ export default {
components: { imageUpload }, components: { imageUpload },
data() { data() {
return { return {
iseditfirst: true,
active: 0, active: 0,
// //
certifform: {}, certifform: {},
@ -529,7 +530,7 @@ export default {
}, },
// //
materialServerAddr: '', materialServerAddr: '',
certificateList: [{}], certificateList: [],
certificateRules: { certificateRules: {
// credentialsName: [{ required: true, message: '', trigger: 'blur' }], // credentialsName: [{ required: true, message: '', trigger: 'blur' }],
url: [{ required: true, message: '请上传证书', trigger: 'blur' }], url: [{ required: true, message: '请上传证书', trigger: 'blur' }],
@ -611,7 +612,7 @@ export default {
this.active = 6 this.active = 6
} else if (res.personalInfo.status === 2) { } else if (res.personalInfo.status === 2) {
this.active = 6 this.active = 6
} else if (res.personalInfo.status === 3) { } else if (res.personalInfo.status === 3 && this.iseditfirst) {
this.active = 6 this.active = 6
} }
@ -635,6 +636,45 @@ export default {
} }
}) })
}, },
getCloudAllList1() {
getCloudAll(this.userId).then((res) => {
//
this.projectList = res.experience.filter((it) => it.type == 0)
if (!this.projectList.length) {
this.projectList = [{ type: 0 }]
}
this.workList = res.experience.filter((it) => it.type == 1)
if (!this.workList.length) {
this.workList = []
}
this.educationList = res.experience.filter((it) => it.type == 2)
if (!this.educationList.length) {
this.educationList = [{ type: 2 }]
}
//
if (res.personalInfo) {
this.userForm.testSkills = res.personalInfo.testSkills
this.userForm.personalAdvantage = res.personalInfo.personalAdvantage
if (res.personalInfo.city) {
this.province = this.userForm.city.split('-')[0]
this.city = this.userForm.city.split('-')[1]
} else {
this.province = '北京市'
this.city = '北京市'
this.userForm.city = '北京市-北京市'
}
}
//
this.certificateList = res.credentials.map((it) => {
return {
url: this.base + it.filePath,
credentialsName: it.fileName,
fileId: it.fileId,
}
})
})
},
// //
searchApply() { searchApply() {
gettesterId(this.userinform.userId).then((res) => { gettesterId(this.userinform.userId).then((res) => {
@ -715,13 +755,13 @@ export default {
if (this.workList[0].caseId) { if (this.workList[0].caseId) {
// //
updateLists(this.workList).then((res) => { updateLists(this.workList).then((res) => {
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
this.$message.success('保存成功') this.$message.success('保存成功')
}) })
} else { } else {
addLists(this.workList).then((res) => { addLists(this.workList).then((res) => {
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
this.$message.success('保存成功') this.$message.success('保存成功')
}) })
@ -752,13 +792,13 @@ export default {
if (this.projectList[0].caseId) { if (this.projectList[0].caseId) {
// //
updateLists(this.projectList).then((res) => { updateLists(this.projectList).then((res) => {
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
this.$message.success('保存成功') this.$message.success('保存成功')
}) })
} else { } else {
addLists(this.projectList).then((res) => { addLists(this.projectList).then((res) => {
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
this.$message.success('保存成功') this.$message.success('保存成功')
}) })
@ -775,7 +815,7 @@ export default {
} }
couldUserInfoAdd(this.userForm).then((res) => { couldUserInfoAdd(this.userForm).then((res) => {
this.$message.success('保存个人简介成功') this.$message.success('保存个人简介成功')
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
return return
}) })
@ -801,13 +841,13 @@ export default {
if (this.educationList[0].caseId) { if (this.educationList[0].caseId) {
// //
updateLists(this.educationList).then((res) => { updateLists(this.educationList).then((res) => {
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
this.$message.success('保存成功') this.$message.success('保存成功')
}) })
} else { } else {
addLists(this.educationList).then((res) => { addLists(this.educationList).then((res) => {
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
this.$message.success('保存成功') this.$message.success('保存成功')
}) })
@ -838,13 +878,13 @@ export default {
if (this.certificateList[0].fileId) { if (this.certificateList[0].fileId) {
// //
couldBookUpdate({ credentialsList: this.certificateList }).then((res) => { couldBookUpdate({ credentialsList: this.certificateList }).then((res) => {
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
this.$message.success('保存成功') this.$message.success('保存成功')
}) })
} else { } else {
couldBookAdd({ credentialsList: this.certificateList }).then((res) => { couldBookAdd({ credentialsList: this.certificateList }).then((res) => {
this.getCloudAllList() this.getCloudAllList1()
this.active++ this.active++
this.$message.success('保存成功') this.$message.success('保存成功')
}) })
@ -869,11 +909,21 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
if (this.workList[i].caseId) {
couldInfoDelete(this.workList[i].caseId).then(() => {
this.$message({
type: 'success',
message: '删除成功!',
})
this.getCloudAllList1()
})
} else {
this.workList.splice(i, 1) this.workList.splice(i, 1)
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!', message: '删除成功!',
}) })
}
}) })
}, },
// //
@ -888,12 +938,22 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
if (this.projectList[i].caseId) {
couldInfoDelete(this.projectList[i].caseId).then(() => {
this.$message({
type: 'success',
message: '删除成功!',
})
this.getCloudAllList1()
})
} else {
if (this.projectList.length == 1) return this.$message.warning('最少有一项') if (this.projectList.length == 1) return this.$message.warning('最少有一项')
this.projectList.splice(i, 1) this.projectList.splice(i, 1)
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!', message: '删除成功!',
}) })
}
}) })
}, },
// //
@ -908,11 +968,18 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
if (this.certificateList[i].fileId) {
delBook(this.certificateList[i].fileId).then((res) => {
this.$message.success('资格证书删除成功')
})
this.getCloudAllList1()
} else {
this.certificateList.splice(i, 1) this.certificateList.splice(i, 1)
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!', message: '删除成功!',
}) })
}
}) })
}, },
// //
@ -926,12 +993,22 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
if (this.educationList[i].caseId) {
couldInfoDelete(this.educationList[i].caseId).then(() => {
this.$message({
type: 'success',
message: '删除成功!',
})
this.getCloudAllList1()
})
} else {
if (this.educationList.length == 1) return this.$message.warning('最少有一项') if (this.educationList.length == 1) return this.$message.warning('最少有一项')
this.educationList.splice(i, 1) this.educationList.splice(i, 1)
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!', message: '删除成功!',
}) })
}
}) })
}, },
// //

@ -81,6 +81,7 @@ const user = {
const user = res.user const user = res.user
// const avatar = (user.avatar== null || user.avatar == "") ? require("../../../public/assets/home/picture.png") : 'https://www.keyitest.cn/'+user.avatar.substr(user.avatar && user.avatar.indexOf('g')); // const avatar = (user.avatar== null || user.avatar == "") ? require("../../../public/assets/home/picture.png") : 'https://www.keyitest.cn/'+user.avatar.substr(user.avatar && user.avatar.indexOf('g'));
const avatar = (user.avatar== null || user.avatar == "") ? require("../../../public/assets/home/defaultAva.jpg") : user.avatar; const avatar = (user.avatar== null || user.avatar == "") ? require("../../../public/assets/home/defaultAva.jpg") : user.avatar;
user.avatar = (user.avatar== null || user.avatar == "") ? require("../../../public/assets/home/defaultAva.jpg") : user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles) commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions) commit('SET_PERMISSIONS', res.permissions)

Loading…
Cancel
Save