diff --git a/common/common.css b/common/common.css
index e45ac24..5f1f248 100644
--- a/common/common.css
+++ b/common/common.css
@@ -67,7 +67,7 @@ html {
}
.btn-feel {
- transition: transform 0.2s ease;
+ transition: transform 0.18s ease;
transform-style: preserve-3d;
}
diff --git a/common/globalFunction.js b/common/globalFunction.js
index 97dc8c3..dce89fa 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -51,6 +51,7 @@ const prePage = () => {
+
/**
* 页面跳转封装,支持 query 参数传递和返回回调
* @param {string} url - 跳转路径
@@ -59,17 +60,22 @@ const prePage = () => {
* @param {object} options.query - 携带参数
* @param {function} options.onBack - 页面返回时的回调(目标页调用 uni.navigateBack 时传递数据)
*/
+let isJumping = false
export const navTo = function(url, {
needLogin = false,
query = {},
onBack = null
} = {}) {
const userStore = useUserStore();
-
+ if(isJumping) return
+ isJumping=true
if (needLogin && !userStore.hasLogin) {
- uni.navigateTo({
- url: '/pages/login/login'
- });
+ setTimeout(() => {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ });
+ isJumping=false
+ }, 190);
return;
}
@@ -84,9 +90,12 @@ export const navTo = function(url, {
currentPage.__onBackCallback__ = onBack;
}
- uni.navigateTo({
- url: finalUrl
- });
+ setTimeout(() => {
+ uni.navigateTo({
+ url: finalUrl
+ });
+ isJumping=false
+ }, 190);
};
export const navBack = function({
diff --git a/components/DatePicker/DatePicker.vue b/components/DatePicker/DatePicker.vue
new file mode 100644
index 0000000..004231b
--- /dev/null
+++ b/components/DatePicker/DatePicker.vue
@@ -0,0 +1,327 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packageA/pages/jobExpect/jobExpect.vue b/packageA/pages/jobExpect/jobExpect.vue
index 4920a0c..bde30e5 100644
--- a/packageA/pages/jobExpect/jobExpect.vue
+++ b/packageA/pages/jobExpect/jobExpect.vue
@@ -206,6 +206,9 @@ function getFormCompletionPercent(form) {
height: 80rpx;
border-bottom: 2rpx solid #EBEBEB
position: relative;
+ .triangle {
+ pointer-events: none;
+ }
.triangle::before
position: absolute;
right: 20rpx;
diff --git a/packageA/pages/myResume/myResume.vue b/packageA/pages/myResume/myResume.vue
index 6377dbd..99689ea 100644
--- a/packageA/pages/myResume/myResume.vue
+++ b/packageA/pages/myResume/myResume.vue
@@ -39,12 +39,10 @@
-
+
- 求职期望
-
-
-
+ 求职期望
+
期望薪资:
@@ -64,15 +62,17 @@
-
+
工作经历
-
-
+
+
+ 添加
-
-
- {{ item.company }}
+
+
+ {{ item.company }}
+
{{ item.position }}
@@ -87,7 +87,7 @@
@@ -212,10 +212,25 @@ image{
display: flex;
justify-content: space-between
align-items: center
- .mys-edit-icon{
- display: inline-block
+ .icon{
width: 40rpx;
height: 40rpx
+ }
+ .mys-edit-icon{
+ display: flex;
+ align-items: center;
+ .txt{
+ font-size: 26rpx;
+ color: #444;
+ font-weight: 400;
+ }
+ .icon{
+ width: 28rpx;
+ height: 28rpx
+ margin-right: 5rpx;
+ margin-top: 2rpx
+ vertical-align: bottom;
+ }
}
}
.datetext{
@@ -247,7 +262,10 @@ image{
.exp-item{
padding-bottom: 28rpx;
border-bottom: 2rpx dashed #EEEEEE;
-
+ .icon{
+ width 40rpx;
+ height 40rpx
+ }
}
.exp-item:nth-last-child(1){
border-bottom: none;
diff --git a/packageA/pages/personalInfo/personalInfo.vue b/packageA/pages/personalInfo/personalInfo.vue
index 9582ce9..042233c 100644
--- a/packageA/pages/personalInfo/personalInfo.vue
+++ b/packageA/pages/personalInfo/personalInfo.vue
@@ -250,8 +250,15 @@ function selectAvatar() {
sourceType: ["album", "camera"],
count: 1,
success: ({ tempFilePaths, tempFiles }) => {
- console.log(`选择的图片:${tempFilePaths}`);
- console.warn("没有做后续上传逻辑!!!!!!!");
+ $api
+ .uploadFile(tempFilePaths[0], true)
+ .then((res) => {
+ res = JSON.parse(res);
+ if (res.msg) fromValue.avatar = res.msg;
+ })
+ .catch((err) => {
+ $api.msg("上传失败");
+ });
},
fail: (error) => {},
});
@@ -284,6 +291,7 @@ function selectAvatar() {
.avatar{
width:110rpx;
height: 110rpx;
+ border-radius: 50%;
}
}
.content-input
diff --git a/packageA/pages/workExp/workExp.vue b/packageA/pages/workExp/workExp.vue
new file mode 100644
index 0000000..08d3ce2
--- /dev/null
+++ b/packageA/pages/workExp/workExp.vue
@@ -0,0 +1,245 @@
+
+
+
+ 取消
+
+
+ 确认
+
+
+
+ 公司
+
+
+
+ 岗位
+
+
+
+ 时间
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ 工作内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index d4b608c..fab2998 100644
--- a/pages.json
+++ b/pages.json
@@ -175,6 +175,13 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "pages/workExp/workExp",
+ "style": {
+ "navigationBarTitleText": "工作经历",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/reservation/reservation",
"style": {
diff --git a/static/icon/arrow-down.png b/static/icon/arrow-down.png
new file mode 100644
index 0000000..8addf11
Binary files /dev/null and b/static/icon/arrow-down.png differ
diff --git a/static/icon/plus.png b/static/icon/plus.png
new file mode 100644
index 0000000..d2bfa2c
Binary files /dev/null and b/static/icon/plus.png differ