mz666
/
apply-assistant-v3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

Browse Source
cyl/master-0804
wangxia 4 months ago
parent 2d910b013e 79f368b12c
commit d008f32853
38 changed files with 59 additions and 127 deletions
Show Stats Download Patch File Download Diff File

4
components/panel/hr.vue
Unescape Escape View File

@ -32,14 +32,14 @@
.doc-left{ .doc-left{
width: 43px; width: 43px;
height: 2px; height: 2px;
border: 1px solid; border-top: 1px solid;
border-image: linear-gradient(270deg, rgba(255,255,255,0.20), #cccccc) 1 1; border-image: linear-gradient(270deg, rgba(255,255,255,0.20), #cccccc) 1 1;
transform: rotate(180deg); transform: rotate(180deg);
} }
.doc-right{ .doc-right{
width: 43px; width: 43px;
height: 2px; height: 2px;
border: 1px solid; border-top: 1px solid;
border-image: linear-gradient(270deg, rgba(255,255,255,0.20), #cccccc) 1 1; border-image: linear-gradient(270deg, rgba(255,255,255,0.20), #cccccc) 1 1;
} }
} }

2
components/panel/numCard.vue
Unescape Escape View File

@ -22,7 +22,7 @@
v-for="(item, index) in list" v-for="(item, index) in list"
:key="index" :key="index"
:style="{ :style="{
width: 'calc(100% / ' + num + ')', width: 'calc(100% / ' + num +' - 1rpx)',
}" }"
@click="handleClick(item, index)" @click="handleClick(item, index)"
class="" class=""

2
pages/NEUIKit/pages/Contact/contact-list/friend-list.vue
Unescape Escape View File

@ -78,7 +78,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
.friend-group-item { .friend-group-item {
padding-left: 20px; padding-left: 20px;

2
pages/NEUIKit/pages/Contact/contact-list/index.vue
Unescape Escape View File

@ -146,7 +146,7 @@ onHide(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../styles/common.scss";
page { page {
height: 100vh; height: 100vh;

1
pages/NEUIKit/pages/Contact/index.vue
Unescape Escape View File

@ -17,7 +17,6 @@ onShow(() => {
</script> </script>
<style> <style>
@import "../styles/common.scss";
page { page {
height: 100vh; height: 100vh;

11
pages/NEUIKit/pages/Conversation/conversation-list/index.vue
Unescape Escape View File

@ -1,15 +1,16 @@
<template> <template>
<div class="conversation-wrapper"> <div class="conversation-wrapper">
<!-- 页面初始化的过程中，sessionList编译到小程序和h5出现sessionList为undefined的情况，即使给了默认值为空数组，故在此处进行判断 --> <!-- 页面初始化的过程中，sessionList编译到小程序和h5出现sessionList为undefined的情况，即使给了默认值为空数组，故在此处进行判断 -->
<div class="conversation-list-wrapper"> <div class="conversation-list-wrapper" v-if="conversationList && conversationList.length > 0">
<!-- 此处的key如果用session.id，会在ios上渲染存在问题，会出现会话列表显示undefined --> <!-- 此处的key如果用session.id，会在ios上渲染存在问题，会出现会话列表显示undefined -->
<view class="g_bg_f5d g_h_48 g_fs_18 g_fw_600" v-if="conversationList.length > 0" style="padding: 12px 16px; border-bottom: 1rpx solid #d5d5d5; border-top: 1rpx solid #d5d5d5"> 最近的会话 </view>
<div v-for="(conversation, index) in conversationList" :key="conversation.renderKey"> <div v-for="(conversation, index) in conversationList" :key="conversation.renderKey">
<ConversationItem :key="conversation.renderKey" :loading="loading" :showMoreActions="currentMoveSessionId === conversation.conversationId" :conversation="conversation" @delete="handleSessionItemDeleteClick" :heihei="'mmp'+index" @stickyToTop="handleSessionItemStickTopChange" @click="handleSessionItemClick" @leftSlide="handleSessionItemLeftSlide" /> <ConversationItem :key="conversation.renderKey" :loading="loading" :showMoreActions="currentMoveSessionId === conversation.conversationId" :conversation="conversation" @delete="handleSessionItemDeleteClick" :heihei="'mmp'+index" @stickyToTop="handleSessionItemStickTopChange" @click="handleSessionItemClick" @leftSlide="handleSessionItemLeftSlide" />
</div> </div>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#ededed"></u-skeleton> -->
</div> </div>
<div style="height: 48px; background-color: #ededed"></div> <div style="height: 48px; background-color: #ededed" v-if="conversationList && conversationList.length > 0"></div>
<div v-if="conversationList.length == 0" style='padding-top: 130px;background-color: #ededed;'>
<g-empty text="暂无会话" style="margin-top: 0px" />
</div>
</div> </div>
</template> </template>
@ -214,7 +215,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../styles/common.scss";
.conversation-wrapper { .conversation-wrapper {
overflow: hidden; overflow: hidden;

55
pages/NEUIKit/pages/styles/common.scss
Unescape Escape View File

@ -1,55 +0,0 @@
.ok-btn {
color: #fff;
background-color: rgb(20, 146, 209);
padding: 10px;
font-size: 16px;
text-align: center;
position: fixed;
bottom: 0;
left: calc(50% - 25vw);
width: 50vw;
border-radius: 3px;
}
.ok-btn-mp {
color: #fff;
background-color: rgb(20, 146, 209);
padding: 10px;
font-size: 16px;
text-align: center;
position: fixed;
bottom: 20px;
left: calc(50% - 25vw);
width: 50vw;
border-radius: 3px;
}
.button-box,.button-box-mp {
display: flex;
align-items: center;
position: fixed;
z-index: 100;
bottom: 120px;
right: 30px;
}
.button-box {
display: flex;
align-items: center;
position: relative;
}
.button-box,
.button-box-mp .button-icon {
width: 40px;
height: 40px;
margin-left: 20px;
}
.button-box{
width: 40px;
height: 40px;
position: fixed;
z-index: 100;
bottom: 70px;
right: 30px;
}

1
pages/message/index.vue
Unescape Escape View File

@ -210,7 +210,6 @@ const updateType = (e) => {
</script> </script>
<style lang="scss"> <style lang="scss">
@import "../NEUIKit/pages/styles/common.scss";
.i-items { .i-items {
// border-bottom: 1px solid #eee; // border-bottom: 1px solid #eee;

2
pages/person/index.vue
Unescape Escape View File

@ -795,7 +795,7 @@ export default {
background-color: #ededed; background-color: #ededed;
.m-info { .m-info {
width: calc(100% - 40rpx); width: calc(100% - 52px);
margin: 0 auto; margin: 0 auto;
margin-bottom: 20rpx; margin-bottom: 20rpx;

1
root/NEUIKit/components/NavBar.vue
Unescape Escape View File

@ -55,7 +55,6 @@ const back = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../pages/styles/common.scss';
.nav-bar-wrapper { .nav-bar-wrapper {
position: fixed; position: fixed;

1
root/NEUIKit/components/PersonSelect.vue
Unescape Escape View File

@ -119,7 +119,6 @@ const onBtnClick = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../pages/styles/common.scss';
.friend-select-wrapper { .friend-select-wrapper {
display: flex; display: flex;

1
root/NEUIKit/components/PinCard.vue
Unescape Escape View File

@ -275,7 +275,6 @@ const timeFormat = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../pages/styles/common.scss';
.pincard-wrapper { .pincard-wrapper {
background-color: #fff; background-color: #fff;

1
root/NEUIKit/components/UserCard.vue
Unescape Escape View File

@ -68,7 +68,6 @@ const copyAccount = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../pages/styles/common.scss';
.user-wrapper { .user-wrapper {
background-color: #fff; background-color: #fff;

7
root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/en.json
Unescape Escape View File

@ -1,7 +0,0 @@
{
"uni-popup.cancel": "cancel",
"uni-popup.ok": "ok",
"uni-popup.placeholder": "pleace enter",
"uni-popup.title": "Hint",
"uni-popup.shareTitle": "Share to"
}

1
root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/index.js
Unescape Escape View File

@ -1,4 +1,3 @@
import en from './en.json'
import zhHans from './zh-Hans.json' import zhHans from './zh-Hans.json'
import zhHant from './zh-Hant.json' import zhHant from './zh-Hant.json'
export default { export default {

2
root/NEUIKit/pages/Chat/message/mention-member-list.vue
Unescape Escape View File

@ -211,7 +211,7 @@ onUnmounted(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import '../../styles/common.scss';
.mention-member-list-wrapper { .mention-member-list-wrapper {
z-index: 9999; z-index: 9999;

2
root/NEUIKit/pages/Chat/message/message-bubble.vue
Unescape Escape View File

@ -741,7 +741,7 @@ onUnmounted(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import '../../styles/common.scss';
.msg-bg { .msg-bg {
max-width: 360rpx; max-width: 360rpx;

2
root/NEUIKit/pages/Chat/message/message-input.vue
Unescape Escape View File

@ -969,7 +969,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "../../styles/common.scss";
.input-root { .input-root {
width: 100%; width: 100%;

3
root/NEUIKit/pages/Chat/message/message-item.vue
Unescape Escape View File

@ -463,8 +463,9 @@
}) })
const goDetail = ($url = "", $jid = 0) => { const goDetail = ($url = "", $jid = 0) => {
console.log("goDetailgoDetailgoDetail", $url, $jid)
uni.navigateTo({ uni.navigateTo({
url: $url + '?id=' + $jid url: '/root/detail/job?id=' + $jid
}) })
} }
</script> </script>

1
root/NEUIKit/pages/Chat/message/nav-bar.vue
Unescape Escape View File

@ -53,7 +53,6 @@ const back = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../../pages/styles/common.scss';
.nav-bar-wrapper { .nav-bar-wrapper {
display: flex; display: flex;

2
root/NEUIKit/pages/Chat/message/p2p-set.vue
Unescape Escape View File

@ -128,7 +128,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
page { page {
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);

2
root/NEUIKit/pages/Chat/message/pin-list.vue
Unescape Escape View File

@ -86,7 +86,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
page { page {
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);

2
root/NEUIKit/pages/Contact/contact-list/black-list.vue
Unescape Escape View File

@ -63,7 +63,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
page { page {
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);

2
root/NEUIKit/pages/Contact/contact-list/friend-list.vue
Unescape Escape View File

@ -78,7 +78,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
.friend-group-item { .friend-group-item {
padding-left: 20px; padding-left: 20px;

2
root/NEUIKit/pages/Contact/contact-list/index.vue
Unescape Escape View File

@ -149,7 +149,7 @@ onHide(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
page { page {
height: 100vh; height: 100vh;

2
root/NEUIKit/pages/Contact/contact-list/valid-list.vue
Unescape Escape View File

@ -160,7 +160,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../styles/common.scss";
page { page {
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);

1
root/NEUIKit/pages/Contact/index.vue
Unescape Escape View File

@ -17,7 +17,6 @@ onShow(() => {
</script> </script>
<style> <style>
@import "../styles/common.scss";
page { page {
height: 100vh; height: 100vh;

2
root/NEUIKit/pages/Friend/add-friend/index.vue
Unescape Escape View File

@ -162,7 +162,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
@import "../../../base.scss"; @import "../../../base.scss";
.search-input-wrapper { .search-input-wrapper {

1
root/NEUIKit/pages/Friend/friend-info-edit.vue
Unescape Escape View File

@ -84,7 +84,6 @@ onLoad((option) => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../styles/common.scss';
page { page {
// padding-top: var(--status-bar-height); // padding-top: var(--status-bar-height);

1
root/NEUIKit/pages/Login/index.vue
Unescape Escape View File

@ -28,7 +28,6 @@ onUnload(() => {
</script> </script>
<style> <style>
@import '../styles/common.scss';
page { page {
height: 100vh; height: 100vh;

2
root/NEUIKit/pages/user-card/detail-item/index.vue
Unescape Escape View File

@ -143,7 +143,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
page { page {
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);

2
root/NEUIKit/pages/user-card/friend/index.vue
Unescape Escape View File

@ -224,7 +224,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
page { page {
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);

2
root/NEUIKit/pages/user-card/my-detail/index.vue
Unescape Escape View File

@ -249,7 +249,7 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/common.scss';
page { page {
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);

4
root/bind/inviteList.vue
Unescape Escape View File

@ -494,14 +494,14 @@ export default {
.doc-left { .doc-left {
width: 43px; width: 43px;
height: 2px; height: 2px;
border: 1px solid; border-top: 1px solid;
border-image: linear-gradient(270deg, rgba(255, 255, 255, 0.2), #cccccc) 1 1; border-image: linear-gradient(270deg, rgba(255, 255, 255, 0.2), #cccccc) 1 1;
transform: rotate(180deg); transform: rotate(180deg);
} }
.doc-right { .doc-right {
width: 43px; width: 43px;
height: 2px; height: 2px;
border: 1px solid; border-top: 1px solid;
border-image: linear-gradient(270deg, rgba(255, 255, 255, 0.2), #cccccc) 1 1; border-image: linear-gradient(270deg, rgba(255, 255, 255, 0.2), #cccccc) 1 1;
} }
} }

8
root/detail/job.vue
Unescape Escape View File

@ -447,14 +447,18 @@
<div class="g_fs_12 g_c_6" style="margin-top: 8px">{{ isSc ? "已收藏" : "收藏" }}</div> <div class="g_fs_12 g_c_6" style="margin-top: 8px">{{ isSc ? "已收藏" : "收藏" }}</div>
</button> </button>
</div> </div>
<div class="g_flex_none g_flex_column_center"> <div class="g_flex_none g_flex_column_center" v-if="loginInfo && loginInfo.agencyId">
<button class="g_pl_0 g_pr_0 g_bg_f g_mr_12 g_w_36" hover-class="thover" style="line-height: 1; border-radius: 0" @click="goIm"> <button class="g_pl_0 g_pr_0 g_bg_f g_mr_12 g_w_36" hover-class="thover" style="line-height: 1; border-radius: 0" @click="goIm">
<icon class="iconfont icon-xiaoxi" style="color: #787878; line-height: 1; margin-top: -5px; font-size: 20px !important; position: relative; top: 3px"></icon> <icon class="iconfont icon-xiaoxi" style="color: #787878; line-height: 1; margin-top: -5px; font-size: 20px !important; position: relative; top: 3px"></icon>
<div class="g_fs_12 g_c_6" style="margin-top: 8px">IM</div> <div class="g_fs_12 g_c_6" style="margin-top: 8px">IM</div>
</button> </button>
</div> </div>
<div class="g_flex_1 g_flex_column_center"> <div class="g_flex_1 g_flex_column_center">
<g-button btnText="我要报名" class="g_flex_1 g_fw_600" size="small_auto" :type="jobDetail.recruitment == 2 || !attention ? 'infro' : 'primary'" @clickBtn="handleOpenApplyPopup"></g-button> <g-button btnText="我要报名" class="g_flex_1 g_fw_600" size="small_auto"
:type="jobDetail.recruitment == 2 || !attention ? 'infro' : 'primary'"
@clickBtn="handleOpenApplyPopup"
style="width: calc(100% - 36px);"
></g-button>
</div> </div>
</div> </div>
</slot> </slot>

14
root/detail/userShare.vue
Unescape Escape View File

@ -29,7 +29,9 @@
</view> </view>
<div class="con-obj" style="background-color: #caf1e0 !important" <div class="con-obj" style="background-color: #caf1e0 !important"
> >
<view class="m-info g_p_20 g_pt_12 g_pb_0 g_bg_f g_position_rela" hover-class="none" style="margin-top: 0; border-radius: 8px 8px 0 0"> <view class="m-info g_p_20 g_pt_12 g_pb_0 g_bg_f g_position_rela" hover-class="none"
style="margin-top: 0; border-radius: 8px 8px 0 0;width: calc(100% - 40px);"
>
<view class="g_flex_row_start"> <view class="g_flex_row_start">
<view class="g_w_71"> <view class="g_w_71">
<view class="g_position_abso g_p_4 g_radius_50 g_bg_f" style="top: -20px"> <view class="g_position_abso g_p_4 g_radius_50 g_bg_f" style="top: -20px">
@ -339,8 +341,8 @@ export default {
this.moveY = e.touches[0].pageY; this.moveY = e.touches[0].pageY;
const moveDistance = this.moveY - this.startY; const moveDistance = this.moveY - this.startY;
// 只有向下移动（moveDistance > 0）时才触发下拉效果 // 只有向下移动（moveDistance > 0）且移动距离合理时才触发下拉效果
if (moveDistance > 0) { if (moveDistance > 0 && moveDistance < 200) { // 限制最大下拉距离
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
query.select('.scroll-container').boundingClientRect(data => { query.select('.scroll-container').boundingClientRect(data => {
if (data) { if (data) {
@ -348,10 +350,8 @@ export default {
// 只有在滚动到顶部且向下拉动时才执行缩放 // 只有在滚动到顶部且向下拉动时才执行缩放
if (scrollTop <= 0) { if (scrollTop <= 0) {
// 根据移动距离计算缩放值，使效果更自然 // 根据移动距离计算缩放值，使效果更自然
// 可以调整 divisor（这里是80）来改变缩放的灵敏度 this.backgroundScale = Math.min(moveDistance * 0.2, 800); // 限制最大缩放值
const scaleValue = Math.min(moveDistance / 40, 1); // 限制最大缩放值 this.mtScroll = Math.min(moveDistance * 0.2, 800);
this.backgroundScale = scaleValue;
this.mtScroll = scaleValue;
} }
} }
}).exec(); }).exec();

1
uni_modules/vk-uview-ui/index.scss
Unescape Escape View File

@ -1,5 +1,4 @@
// 引入公共基础类 // 引入公共基础类
@import "./libs/css/common.scss";
@import "./libs/css/color.scss"; @import "./libs/css/color.scss";
// 非nvue的样式 // 非nvue的样式

4
utils/wyyx.js
Unescape Escape View File

@ -1,5 +1,5 @@
let ajaxUrl = "http://192.168.3.83:8001"; // let ajaxUrl = "http://192.168.3.83:8001";
// let ajaxUrl = "https://daotian.matripe.com.cn"; let ajaxUrl = "https://daotian.matripe.com.cn";
let data = { let data = {
wyyxajaxUrl: ajaxUrl, wyyxajaxUrl: ajaxUrl,
wyyxGet ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) { wyyxGet ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {

Write Preview
Loading…
Cancel
Save