From fbcee9026d48b06aa4bb53b22e18c993954e8421 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 24 Oct 2024 23:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/api.js | 7 ++-
components/list/bossList/bossItem.vue | 25 +++++++---
components/list/bossList/index.vue | 11 ++---
components/list/userList/index.vue | 8 ++-
components/list/userList/userListSwipe.vue | 57 ++++++++++++++++++++++
components/list/workList/index.vue | 4 +-
components/screen/screenWork.vue | 10 +++-
config.js | 2 +-
pages/index/index.vue | 5 +-
pages_order/components/user/userHead.vue | 18 ++++++-
pages_order/mine/IntegralRecord.vue | 23 +++------
pages_order/mine/MemberRecharge.vue | 78 ++++++++++++++++++++++--------
pages_order/mine/collect.vue | 20 ++++++--
pages_order/mine/contract.vue | 3 +-
pages_order/mine/releaseWork.vue | 15 ++++--
pages_order/mine/seeMy.vue | 14 ++++--
pages_order/work/userDetail.vue | 4 +-
pages_order/work/workDetail.vue | 7 ++-
store/store.js | 14 +++---
19 files changed, 243 insertions(+), 82 deletions(-)
create mode 100644 components/list/userList/userListSwipe.vue
diff --git a/api/api.js b/api/api.js
index ea83d72..df2fe70 100644
--- a/api/api.js
+++ b/api/api.js
@@ -121,7 +121,7 @@ const config = {
url: '/api/common/queryBill',
method: 'GET',
},
- //项目列表
+ //记工记账项目列表
commonQueryNotebookList: {
url: '/api/common/queryNotebookList',
method: 'GET',
@@ -136,6 +136,11 @@ const config = {
url: '/api/common/queryScoreRecord',
method: 'GET',
},
+ //我的服务-获取VIP配置信息
+ commonQueryVipType: {
+ url: '/api/common/queryVipType',
+ method: 'GET',
+ },
/**
* 求职者的接口
diff --git a/components/list/bossList/bossItem.vue b/components/list/bossList/bossItem.vue
index d07616f..19daf34 100644
--- a/components/list/bossList/bossItem.vue
+++ b/components/list/bossList/bossItem.vue
@@ -6,7 +6,7 @@
- 李老板
+ {{ item.hanHaiMember.nickName }}
企业HR
@@ -20,13 +20,26 @@
+ v-for="(t, index) in item.employJobList">
- 产品经理
+ {{ t.title }}
-
- 12-18K
+
+
+ {{ (t.salaryLow / 1000).toFixed(0) }}
+
+
+ -{{ (t.salaryUp / 1000).toFixed(0) }}
+
+ K
+
+
+ {{ t.salaryLow }}
+ -{{ t.salaryUp }}
@@ -46,6 +59,7 @@
+
+
diff --git a/components/list/workList/index.vue b/components/list/workList/index.vue
index f8b9311..bcee07c 100644
--- a/components/list/workList/index.vue
+++ b/components/list/workList/index.vue
@@ -46,8 +46,8 @@
this.$api(this.api, this.queryParams, res => {
if(res.code == 200){
- this.list = res.result.records
- this.total = res.result.total
+ this.list = res.result.records || res.result
+ this.total = res.result.total || res.result.length
}
})
},
diff --git a/components/screen/screenWork.vue b/components/screen/screenWork.vue
index fffac7e..02a8ee4 100644
--- a/components/screen/screenWork.vue
+++ b/components/screen/screenWork.vue
@@ -161,7 +161,7 @@
currentDropItem() {
return this[this.activeName];
},
- ...mapState(['jobTypeList', 'natureList']),
+ ...mapState(['jobTypeList', 'natureList', 'addressList']),
},
mounted() {
// 工种
@@ -181,6 +181,14 @@
})
})
this.list[1].tag = this.nature.child
+
+ // 地址
+ this.addressList.forEach(n => {
+ this.area.child.push({
+ label: n.adress,
+ value: n.id,
+ })
+ })
},
methods: {
clickTag(item, i){
diff --git a/config.js b/config.js
index b7c7734..a6f0195 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
Vue.use(uvUI);
// 当前环境
-const type = 'dev'
+const type = 'prod'
// 环境配置
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cc7ac96..0399e06 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -112,8 +112,9 @@
this.$refs.workList.loadMoreData()
},
methods: {
- clickItem(){
-
+ clickItem(result){
+ console.log(result);
+ this.$refs.workList.getData(result)
},
toAdd(){
if(this.role){
diff --git a/pages_order/components/user/userHead.vue b/pages_order/components/user/userHead.vue
index 9489ab2..8308db4 100644
--- a/pages_order/components/user/userHead.vue
+++ b/pages_order/components/user/userHead.vue
@@ -12,7 +12,8 @@
-
+
{{ phone }}
@@ -34,6 +35,9 @@
},
image : {
default : '/static/image/center/headImage.png'
+ },
+ phoneCall : {
+
}
},
data() {
@@ -42,7 +46,17 @@
}
},
methods: {
-
+ callPhone(){
+ uni.makePhoneCall({
+ phoneNumber: this.phoneCall,
+ success() {
+ console.log('安卓拨打成功');
+ },
+ fail() {
+ console.log('安卓拨打失败');
+ }
+ })
+ },
}
}
diff --git a/pages_order/mine/IntegralRecord.vue b/pages_order/mine/IntegralRecord.vue
index 9d58970..8d15eb2 100644
--- a/pages_order/mine/IntegralRecord.vue
+++ b/pages_order/mine/IntegralRecord.vue
@@ -7,15 +7,15 @@
当前积分
- {{ formal.score + temporarily.score }}
+ {{ formal.currentScore }}
- 正式积分：{{ formal.score }}
+ 正式积分：{{ formal.formalScore }}
- 临时积分：{{ temporarily.score }}
+ 临时积分：{{ formal.tempScore }}
@@ -65,14 +65,8 @@
],
type : 0,
mixinsListApi : 'commonQueryScoreRecord',
- // 正式积分
- formal : {
- score : 0
- },
- // 临时积分
- temporarily : {
- score : 0
- },
+ // 积分
+ formal : {},
}
},
onLoad(e) {
@@ -92,16 +86,11 @@
this.getData()
},
getCounst(){
- this.$api('commonQueryScore', {type : 0}, res => {
+ this.$api('commonQueryScore', res => {
if(res.code == 200){
this.formal = res.result
}
})
- this.$api('commonQueryScore', {type : 1}, res => {
- if(res.code == 200){
- this.temporarily = res.result
- }
- })
},
}
}
diff --git a/pages_order/mine/MemberRecharge.vue b/pages_order/mine/MemberRecharge.vue
index eb5e7df..7ebd77a 100644
--- a/pages_order/mine/MemberRecharge.vue
+++ b/pages_order/mine/MemberRecharge.vue
@@ -23,33 +23,37 @@
开通VIP
-
- 普通VIP会员
+
+ {{ item.name }}
￥
- 8
+ {{ item.price }}
- 包年
+ {{ item.remark }}
-
- 普通专属特权
+
+ {{ vip.name }}
-
+
- 特权一
- 该特权每天可免费查看2个号码。
+ {{ item[0] }}
+ 该{{ item[1] }}
-
+
@@ -65,7 +69,7 @@
- 总计金额：￥8
+ 总计金额：￥{{ vip.price }}
确认协议并支付
@@ -78,20 +82,50 @@
@@ -157,8 +191,7 @@
.options {
display: flex;
- justify-content: space-around;
-
+ flex-wrap: wrap;
.option {
display: flex;
justify-content: center;
@@ -168,12 +201,17 @@
width: 220rpx;
height: 240rpx;
border-radius: 16rpx;
-
+ box-sizing: border-box;
+ margin: 12rpx;
view {
margin-top: 15rpx;
font-size: 28rpx;
}
}
+ .act{
+ border: 4rpx solid $uni-color;
+ box-shadow: 0 0 10rpx 10rpx rgba($uni-color, 0.2);
+ }
}
.block {
@@ -188,13 +226,11 @@
.cells {
display: flex;
flex-direction: column;
- justify-content: space-between;
- height: 170rpx;
.cell {
display: flex;
align-items: center;
-
+ margin: 20rpx 0;
.text {
margin-left: 20rpx;
color: #707070;
diff --git a/pages_order/mine/collect.vue b/pages_order/mine/collect.vue
index 52adb52..e5919a0 100644
--- a/pages_order/mine/collect.vue
+++ b/pages_order/mine/collect.vue
@@ -7,8 +7,15 @@
color="#fff"
@leftClick="$utils.navigateBack"/>
+
+
@@ -16,12 +23,14 @@