diff --git a/api/api.js b/api/api.js
index cf4ea9a..56f6b44 100644
--- a/api/api.js
+++ b/api/api.js
@@ -11,6 +11,7 @@ const models = [
'examination',
'collect',
'contact',
+ 'workEntryInfo',
]
const config = {
@@ -32,14 +33,6 @@ const config = {
url: '/api/common/aboutUs',
method: 'GET',
},
- //新建账本
- commonAddBill: {
- url: '/api/common/addBill',
- method: 'POST',
- auth: true,
- limit : 500,
- showLoading : true,
- },
// 我的服务-兑换码
commonAddExchange: {
url: '/api/common/addExchange',
@@ -48,14 +41,6 @@ const config = {
limit : 500,
showLoading : true,
},
- // 技工问题
- commonAddQuestion: {
- url: '/api/common/addQuestion',
- method: 'POST',
- auth: true,
- limit : 500,
- showLoading : true,
- },
// 我的服务-会员充值(开通VIP)
commonAddRecharge: {
url: '/api/common/addRecharge',
@@ -92,16 +77,6 @@ const config = {
url: '/api/common/queryAddressList',
method: 'GET',
},
- //全年收支
- commonQueryBill: {
- url: '/api/common/queryBill',
- method: 'GET',
- },
- //记工记账项目列表
- commonQueryNotebookList: {
- url: '/api/common/queryNotebookList',
- method: 'GET',
- },
//会员中心-正式积分||临时积分
commonQueryScore: {
url: '/api/common/queryScore',
@@ -224,7 +199,8 @@ function addApiModel(model, key){
if(config[`${k}`]){
console.error(`重名api------model=${key},key=${k}`);
uni.showModal({
- title: `重名api------model=${key},key=${k}`
+ title: `重名api`,
+ content: `model=${key},key=${k}`
})
continue
}
diff --git a/api/model/index-lzx.js b/api/model/index-lzx.js
index e4213fe..e8bdc7b 100644
--- a/api/model/index-lzx.js
+++ b/api/model/index-lzx.js
@@ -75,36 +75,6 @@ const api = {
limit : 500,
showLoading : true,
},
- //新建账本
- addNoteBook: {
- url: '/employ/notebook/addNoteBook',
- method: 'POST',
- auth: true,
- limit : 500,
- showLoading : true,
- },
- //记工记账-项目记工
- addWorkInfo: {
- url: '/employ/notebook/addWorkInfo',
- method: 'POST',
- auth: true,
- limit : 500,
- showLoading : true,
- },
- //记工记账-项目记账
- addBillInfo: {
- url: '/employ/notebook/addBillInfo',
- method: 'POST',
- auth: true,
- limit : 500,
- showLoading : true,
- },
- //记工记账-全年收支
- queryBill: {
- url: '/employ/notebook/queryBill',
- method: 'GET',
- auth: true,
- },
}
export default api
\ No newline at end of file
diff --git a/api/model/workEntryInfo.js b/api/model/workEntryInfo.js
new file mode 100644
index 0000000..9777903
--- /dev/null
+++ b/api/model/workEntryInfo.js
@@ -0,0 +1,57 @@
+
+// 记工记账相关接口
+
+const api = {
+ //记工记账项目列表
+ commonQueryNotebookList: {
+ url: '/api/common/queryNotebookList',
+ method: 'GET',
+ },
+ // 技工问题
+ commonAddQuestion: {
+ url: '/employ/notebook/addQuestion',
+ method: 'POST',
+ auth: true,
+ limit : 500,
+ showLoading : true,
+ },
+
+ //新建账本
+ addNoteBook: {
+ url: '/employ/notebook/addNoteBook',
+ method: 'POST',
+ auth: true,
+ limit : 500,
+ showLoading : true,
+ },
+ //记工记账-项目记工
+ addWorkInfo: {
+ url: '/employ/notebook/addWorkInfo',
+ method: 'POST',
+ auth: true,
+ limit : 500,
+ showLoading : true,
+ },
+ //记工记账-项目记账
+ addBillInfo: {
+ url: '/employ/notebook/addBillInfo',
+ method: 'POST',
+ auth: true,
+ limit : 500,
+ showLoading : true,
+ },
+ //记工记账-全年收支
+ queryBill: {
+ url: '/employ/notebook/queryBill',
+ method: 'GET',
+ auth: true,
+ },
+ //记工记账-全年收支
+ notebookQueryWork: {
+ url: '/employ/notebook/queryWork',
+ method: 'GET',
+ auth: true,
+ },
+}
+
+export default api
\ No newline at end of file
diff --git a/components/list/userList/index.vue b/components/list/userList/index.vue
index bac09a3..a3ab4c3 100644
--- a/components/list/userList/index.vue
+++ b/components/list/userList/index.vue
@@ -48,12 +48,29 @@
}
},
methods: {
- getData(){
+ getData(params, query){
if(uni.getStorageSync('token')){
this.queryParams.token = uni.getStorageSync('token')
}
- this.$api(this.api, this.queryParams, res => {
+ let queryParams = {
+ pageNo: this.queryParams.pageNo,
+ pageSize: this.queryParams.pageSize,
+ }
+
+ if(params && params.length > 0){
+ params.forEach(n => {
+ queryParams[n.name] = n.value
+ })
+ }
+
+ if(query){
+ for(let key in query){
+ queryParams[key] = query[key]
+ }
+ }
+
+ this.$api(this.api, queryParams, res => {
uni.stopPullDownRefresh()
if(res.code == 200){
this.list = res.result.records || res.result
diff --git a/components/list/workList/index.vue b/components/list/workList/index.vue
index 32f3a3a..9b20c11 100644
--- a/components/list/workList/index.vue
+++ b/components/list/workList/index.vue
@@ -42,7 +42,7 @@
}
},
methods: {
- getData(params){
+ getData(params, query){
if(uni.getStorageSync('token')){
this.queryParams.token = uni.getStorageSync('token')
}
@@ -58,6 +58,12 @@
})
}
+ if(query){
+ for(let key in query){
+ queryParams[key] = query[key]
+ }
+ }
+
this.$api(this.api, queryParams, res => {
uni.stopPullDownRefresh()
if(res.code == 200){
diff --git a/components/screen/screenWork.vue b/components/screen/screenWork.vue
index 2033e73..5876056 100644
--- a/components/screen/screenWork.vue
+++ b/components/screen/screenWork.vue
@@ -1,7 +1,7 @@
{
- this.typeId.child.push({
- label: n.name,
- value: n.id,
+ setTimeout(this.initData, 300)
+ },
+ methods: {
+ initData(){
+ // 工种
+ this.jobTypeList.forEach(n => {
+ this.typeId.child.push({
+ label: n.name,
+ value: n.id,
+ })
})
- })
- this.list[0].tag = this.typeId.child
-
- // 工作性质
- this.natureList.forEach(n => {
- this.natureId.child.push({
- label: n.name,
- value: n.id,
+ this.list[0].tag = this.typeId.child
+
+ // 工作性质
+ this.natureList.forEach(n => {
+ this.natureId.child.push({
+ label: n.name,
+ value: n.id,
+ })
})
- })
- this.list[1].tag = this.natureId.child
-
- // if(this.addressList[0]){
- // this.areaId.value = this.addressList[0].id
- // this.areaId.label = this.addressList[0].name
+ this.list[1].tag = this.natureId.child
- // this.defaultValue[0] = this.addressList[0].id
- // this.$forceUpdate()
- // }
-
- // 地址
- this.addressList.forEach(n => {
- this.areaId.child.push({
- label: n.adress,
- value: n.id,
+ // if(this.addressList[0]){
+ // this.areaId.value = this.addressList[0].id
+ // this.areaId.label = this.addressList[0].name
+
+ // this.defaultValue[0] = this.addressList[0].id
+ // this.$forceUpdate()
+ // }
+
+ // 地址
+ this.addressList.forEach(n => {
+ this.areaId.child.push({
+ label: n.adress,
+ value: n.id,
+ })
})
- })
- },
- methods: {
+
+ },
clickTag(item, i){
console.log(i);
item.index = i
diff --git a/manifest.json b/manifest.json
index d653c7c..d48142a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "unapp模板",
- "appid" : "__UNI__FCE26BB",
+ "appid" : "__UNI__197A38F",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/pages.json b/pages.json
index 822dca1..5c06797 100644
--- a/pages.json
+++ b/pages.json
@@ -177,6 +177,12 @@
},
{
"path": "kepp/addWorkEntryRecords"
+ },
+ {
+ "path": "mine/enterpriseInfo"
+ },
+ {
+ "path": "auth/certificationEnterprise"
}
]
}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index f4f8141..67bf3c3 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -19,12 +19,10 @@
手机号：{{phone}}
- {{numInfo.vipType}}
+ {{UserExtensionInfo.vipType}}
-
+
@@ -34,7 +32,7 @@
-
+
- {{numInfo.integerNum}}
+ {{UserExtensionInfo.integerNum || 0}}
我的积分
@@ -84,7 +82,7 @@
- {{numInfo.scNum}}
+ {{UserExtensionInfo.scNum || 0}}
我的收藏
@@ -94,7 +92,7 @@
- {{numInfo.lxNum}}
+ {{UserExtensionInfo.lxNum || 0}}
联系记录
@@ -109,7 +107,7 @@
+ @click="toAddResume">
在线简历
@@ -146,19 +144,34 @@
积分记录
-
+
+
+ 企业认证
+
+
+
实名认证
-
-
- 兑换码
+
+
+
+ 企业信息
-
+
考证咨询
+
+
+
+ 兑换码
+
@@ -208,7 +221,7 @@
tabber,
},
computed: {
- ...mapState(['userInfo', 'role','banner',]),
+ ...mapState(['userInfo', 'role','banner', 'UserExtensionInfo']),
headImage(){
return this.userInfo.headImage
},
@@ -236,22 +249,19 @@
// url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
// },
// ],
- numInfo : {},
}
},
onShow() {
this.$store.commit('getUserInfo')
this.$store.commit('getBanner')
//判断如果是登录状态则获取信息
- this.getUserCenterData();
+ this.$store.commit('getUserExtensionInfo')
},
methods: {
- //获取个人中心基础信息的接口
- getUserCenterData(){
- this.$api('getUserCenterData',{}, res =>{
- if(res.code == 200){
- this.numInfo = res.result
- }
+ toAddResume(){
+ // 在完成实名认证的情况下执行
+ this.$store.commit('isAuthCertification', () => {
+ this.$utils.navigateTo('/pages_order/work/addResume')
})
},
}
diff --git a/pages/index/consult.vue b/pages/index/consult.vue
index 2238882..f14d528 100644
--- a/pages/index/consult.vue
+++ b/pages/index/consult.vue
@@ -72,7 +72,10 @@
.list{
.item{
display: flex;
- margin: 30rpx;
+ margin: 20rpx;
+ padding: 20rpx;
+ background-color: #fff;
+ border-radius: 20rpx;
.image{
width: 200rpx;
border-radius: 20rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3c1d5ff..0098d8e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,8 +27,8 @@
-
@@ -73,7 +73,7 @@
-
+
@@ -103,7 +103,8 @@
'userInfo',
'role',
'banner',
- 'jobTypeList'
+ 'jobTypeList',
+ 'UserExtensionInfo',
]),
bannerList(){
return this.banner.filter(n => n.type == 0)
@@ -113,38 +114,30 @@
return {
productList: [],
keyword : '',
- numInfo : {},
+ screenWorkList : [],
}
},
onPullDownRefresh(){
- this.$refs.workList.getData()
+ this.$refs.workList.getData(this.screenWorkList)
this.$store.commit('getBanner')
},
// 页面显示的时候触发
onShow() {
- this.$refs.workList.getData()
+ this.$refs.workList.getData(this.screenWorkList)
this.$store.commit('getBanner')
- this.getUserCenterData();
+ if(uni.getStorageSync('token')){
+ this.$store.commit('getUserExtensionInfo')
+ this.$store.commit('getBanner')
+ }
},
//滚动到屏幕底部
onReachBottom() {
this.$refs.workList.loadMoreData()
},
methods: {
- //获取个人中心基础信息的接口
- getUserCenterData(){
- if(!uni.getStorageSync('token')){
- return
- }
- this.$api('getUserCenterData',{}, res =>{
- if(res.code == 200){
- this.numInfo = res.result
- }
- })
- },
clickItem(result){
- console.log(result);
- this.$refs.workList.getData(result)
+ this.screenWorkList = result
+ this.$refs.workList.getData(this.screenWorkList)
},
toAdd(){
if(this.role){
@@ -154,21 +147,30 @@
}
},
search(){
-
+ this.$utils.navigateTo(`/pages_order/work/workList?keyword=${this.keyword}`)
},
// 切换身份
- switchIdentity(){
- uni.showModal({
- title: `确认切换到${
- this.role ? '师傅' : '雇主'
- }身份吗？`,
- success : e => {
- this.$store.commit('setRole', !this.role)
- this.$nextTick(() => {
- this.$refs.workList.getData()
+ async switchIdentity(){
+ this.$store.commit('getUserExtensionInfo')
+
+ // 在完成实名认证的情况下执行
+ this.$store.commit('isAuthCertification', () => {
+ // 在完成企业认证的情况下执行
+ this.$store.commit('isAuthCertificationEnterprise', state => {
+ uni.showModal({
+ title: `确认切换到${
+ this.role ? '师傅' : '雇主'
+ }身份吗？`,
+ success : e => {
+ this.$store.commit('setRole', !this.role)
+ this.$nextTick(() => {
+ this.$refs.workList.getData(this.screenWorkList)
+ })
+ }
})
- }
+ })
})
+
},
}
}
diff --git a/pages/index/keepAccounts.vue b/pages/index/keepAccounts.vue
index 89ea30c..6b69cce 100644
--- a/pages/index/keepAccounts.vue
+++ b/pages/index/keepAccounts.vue
@@ -14,7 +14,7 @@
-
+
新建账本
@@ -47,7 +47,7 @@
@@ -68,17 +68,19 @@
+ @click.stop="$utils.navigateTo('/pages_order/kepp/addWorkEntryRecords?id=' + item.id)">
记工
+ @click.stop="$utils.navigateTo('/pages_order/kepp/addPriceEntryRecords?id=' + item.id)">
记账
+
+
@@ -101,7 +103,8 @@
-
+
取消
确定
diff --git a/pages_order/auth/certification.vue b/pages_order/auth/certification.vue
index 14d2dea..f4a0f80 100644
--- a/pages_order/auth/certification.vue
+++ b/pages_order/auth/certification.vue
@@ -6,7 +6,10 @@
@leftClick="$utils.navigateBack"/>
- 完成实名认证，您将获得《个人实名认证平台特权》
+
+ 完成实名认证，您将获得《个人实名认证平台特权》
+
已驳回，原因：{{form.remark}}
@@ -106,7 +109,7 @@
activeColor="#3796F8"
:name="1"
>
- 阅读并同意我们的《个人实名认证服务协议》
+ 阅读并同意我们的《个人实名认证服务协议》
@@ -202,6 +205,7 @@
.page{
background-color: #fff;
min-height: 100vh;
+ padding-bottom: 100rpx;
.info-tips{
width: 100%;
padding: 30rpx 0;
diff --git a/pages_order/auth/certificationEnterprise.vue b/pages_order/auth/certificationEnterprise.vue
new file mode 100644
index 0000000..2744e3f
--- /dev/null
+++ b/pages_order/auth/certificationEnterprise.vue
@@ -0,0 +1,306 @@
+
+
+
+
+
+
+ 完成企业认证，
+ 您将获得《企业认证平台特权》
+
+
+
+ 已驳回，原因：{{form.remark}}
+
+
+
+
+
+ 企业名称
+
+
+
+
+
+
+ 企业地址
+
+
+
+
+
+
+ 法定代表人
+
+
+
+
+
+
+ 社会统一新信用代码
+
+
+
+
+
+
+ 联系人姓名
+
+
+
+
+
+
+ 联系电话
+
+
+
+
+
+
+ 请上传工商营业执照
+
+
+ （只能上传jpg、png,且不能超过1MB）
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+ (确保文字清晰、可辨、避免遮挡、不全、反光)
+
+
+
+
+
+
+
+ 认证
+
+
+
+ 已审核通过
+
+
+
+ 已驳回,请重新提交
+
+
+
+
+
+
+
+
+
+
+ 阅读并同意我们的
+ 《企业认证服务协议》
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index df48be2..d597c80 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -1,10 +1,10 @@
-
+
- 欢迎使用特易招
+ 欢迎使用{{ configList.config_app_name }}
@@ -18,6 +18,10 @@
+
+ 取消登录
+
@@ -59,7 +63,6 @@
}
},
methods: {
-
wxLogin(){
if(!this.checkboxValue.length){
return uni.showToast({
@@ -69,7 +72,11 @@
}
this.$store.commit('login')
},
-
+ qux(){
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ },
}
}
@@ -85,11 +92,11 @@
.logo{
height: 140rpx;
width: 140rpx;
- background-color: #ddd;
border-radius: 30rpx;
image{
- width: 80rpx;
- height: 80rpx;
+ height: 140rpx;
+ width: 140rpx;
+ border-radius: 30rpx;
}
margin-bottom: 20rpx;
}
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index b20ddc3..341b51f 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -1,10 +1,10 @@
- 特易招
+ {{ configList.config_app_name }}
申请获取你的头像、昵称
@@ -196,7 +196,7 @@
margin-top: 10vh;
}
.getPhoneNumber{
- all: unset;
+ // all: unset;
display: flex;
justify-content: center;
align-items: center;
diff --git a/pages_order/kepp/AnnualExpenditure.vue b/pages_order/kepp/AnnualExpenditure.vue
index 5a66c9c..3ff31b7 100644
--- a/pages_order/kepp/AnnualExpenditure.vue
+++ b/pages_order/kepp/AnnualExpenditure.vue
@@ -35,9 +35,10 @@
+ :value="`${typeNo[item.type]}${item.amount}`">
@@ -52,6 +53,7 @@
return {
mixinsListApi : 'queryBill',
apiType : '',
+ typeNo : ['+', '-'],
}
},
onLoad({apiType}) {
diff --git a/pages_order/kepp/addPriceEntryRecords.vue b/pages_order/kepp/addPriceEntryRecords.vue
index 7f60467..1465681 100644
--- a/pages_order/kepp/addPriceEntryRecords.vue
+++ b/pages_order/kepp/addPriceEntryRecords.vue
@@ -77,7 +77,7 @@
return {
form : {
billDate : '',
- amount : 0.5,
+ amount : '',
type : 0,
remarks:''
},
@@ -97,7 +97,7 @@
},
onLoad({id}) {
this.id = id
- this.form.notebookId=id;
+ this.form.notebookId = id;
},
onShow() {},
methods: {
@@ -106,10 +106,8 @@
},
submit(){
if(this.$utils.verificationAll(this.form, {
- remarks : '请输入项目备注',//
billDate : '请输入记工日期',//
amount:'请输入金额',
-
})){
return
}
diff --git a/pages_order/kepp/addWorkEntryRecords.vue b/pages_order/kepp/addWorkEntryRecords.vue
index b44dc48..d95adc9 100644
--- a/pages_order/kepp/addWorkEntryRecords.vue
+++ b/pages_order/kepp/addWorkEntryRecords.vue
@@ -21,12 +21,26 @@
type="number"
v-model="form.phone" /> -->
-
+
+
+ 加班时间
+
+
+
+
+
+
备注
@@ -61,8 +75,9 @@
return {
form : {
workDate : '',
- overtime : 0.5,
- remarks:''
+ worktime : 0.5,
+ remarks : '',
+ overtime : 0,
},
id : 0,
dateValue : new Date().getTime()
@@ -70,7 +85,7 @@
},
onLoad({id}) {
this.id = id
- this.form.notebookId=id;
+ this.form.notebookId = id;
},
onShow() {},
methods: {
@@ -78,17 +93,15 @@
this.form.workDate = this.$dayjs(e.value).format('YYYY-MM-DD')
},
submit(){
+ this.form.overtime = String(this.form.overtime)
if(this.$utils.verificationAll(this.form, {
- overtime : '请输入项目时长',//
- remarks : '请输入项目备注',//
- workDate : '请输入记工日期',//
-
+ workDate : '请选择记工日期',//
+ worktime : '请输入上班时长',//
+ overtime : '请输入加班时长',
})){
return
}
-
-
this.$api('addWorkInfo', this.form, res => {
if(res.code == 200){
uni.showToast({
diff --git a/pages_order/kepp/keepAccountsDetail.vue b/pages_order/kepp/keepAccountsDetail.vue
index d9f999a..00dec30 100644
--- a/pages_order/kepp/keepAccountsDetail.vue
+++ b/pages_order/kepp/keepAccountsDetail.vue
@@ -7,6 +7,7 @@
@@ -16,10 +17,11 @@
:key="index"
:label="item.billDate"
:title="item.notebookId_dictText"
- :value="item.amount">
+ :value="`${typeNo[item.type]}${item.amount}`">
-
+
+
@@ -29,27 +31,35 @@
mixins : [mixinList],
data() {
return {
- mixinsListApi : 'commonQueryBill',
+ mixinsListApi : 'queryBill',
apiType : '',
tabsSatus : [
{
name: '记账',
- index:0,
+ index: 0,
},
{
name: '记工',
- index:1,
+ index: 1,
},
],
+ id : 0,
+ typeNo : ['+', '-'],
}
},
- onLoad({apiType}) {
+ onLoad({apiType, id}) {
+ this.id = id
+ this.queryParams.employNoteBookId = id
this.apiType = apiType
- this.mixinsListApi += apiType || ''
+ // this.mixinsListApi += apiType || ''
},
onShow() {},
methods: {
-
+ clickTabsType({index}){
+ console.log(index);
+ this.mixinsListApi = ['queryBill', 'notebookQueryWork'][index]
+ this.getData()
+ },
}
}
@@ -57,7 +67,7 @@
diff --git a/pages_order/mine/enterpriseInfo.vue b/pages_order/mine/enterpriseInfo.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages_order/mine/enterpriseInfo.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages_order/work/addResume.vue b/pages_order/work/addResume.vue
index de87459..4c81a51 100644
--- a/pages_order/work/addResume.vue
+++ b/pages_order/work/addResume.vue
@@ -150,6 +150,16 @@
form : {
sex : '男',
qulification : '',
+ title: '',
+ typeId : '',
+ areaId : '',
+ natureId : '',
+ age : '',
+ nation : '',
+ salaryLow : '',
+ salaryUp : '',
+ qualification : '',
+ brief: '',
},
sexList : [
{
@@ -227,6 +237,7 @@
areaId : '请选择工作的地区',
natureId : '请选择工作的性质',
age : '请输入您的年龄',
+ sex : '请选择性别',
nation : '请输入您的民族',
salaryLow : '请输入期望薪资下限',
salaryUp : '请输入期望薪资上限',
@@ -236,13 +247,6 @@
return
}
- // 清理不需要给后端的字段
- delete this.form.createBy
- delete this.form.createTime
- delete this.form.updateBy
- delete this.form.updateTime
- delete this.form.userId
-
let data = {
title: this.form.title,
typeId : this.form.typeId,
@@ -253,24 +257,12 @@
salaryLow : this.form.salaryLow,
salaryUp : this.form.salaryUp,
qualification : this.form.qualification,
- brief: this.form.brief
+ brief: this.form.brief,
+ sex: this.form.sex,
}
-
- if(this.form.id !=null){
- data = {
- id:this.form.id,
- title: this.form.title,
- typeId : this.form.typeId,
- areaId : this.form.areaId,
- natureId : this.form.natureId,
- age : this.form.age,
- nation : this.form.nation,
- salaryLow : this.form.salaryLow,
- salaryUp : this.form.salaryUp,
- qualification : this.form.qualification,
- brief: this.form.brief
- }
+ if(this.form.id){
+ data.id = this.form.id
}
this.$api('addResume', data, res => {
diff --git a/pages_order/work/workDetail.vue b/pages_order/work/workDetail.vue
index b7856d3..70ae581 100644
--- a/pages_order/work/workDetail.vue
+++ b/pages_order/work/workDetail.vue
@@ -35,7 +35,8 @@
:phoneCall="personInfo.phone" />
-
+
工作地址
diff --git a/pages_order/work/workList.vue b/pages_order/work/workList.vue
index cda53a1..f7cbeda 100644
--- a/pages_order/work/workList.vue
+++ b/pages_order/work/workList.vue
@@ -1,6 +1,8 @@
-
+
+ v-model="queryParams.title">
-
+
@@ -42,17 +44,49 @@
data() {
return {
keyword : '',
+ title : '',
+ queryParams : {
+ },
+ screenWorkList : [],
+ }
+ },
+ onPullDownRefresh(){
+ this.$refs.workList.getData(this.screenWorkList, this.queryParams)
+ },
+ // 页面显示的时候触发
+ onShow() {
+ this.$refs.workList.getData(this.screenWorkList, this.queryParams)
+ },
+ onLoad({typeId, title, keyword}) {
+ if(title){
+ this.title = title
+ }
+ if(typeId){
+ this.queryParams.typeId = typeId
+ }
+ if(keyword){
+ this.queryParams.title = keyword
+ this.title = keyword
}
},
methods: {
-
+ clickItem(result){
+ console.log(result);
+ this.screenWorkList = result
+ this.$refs.workList.getData(this.screenWorkList, this.queryParams)
+ },
+ search(){
+ this.$refs.workList.getData(this.screenWorkList, this.queryParams)
+ },
}
}