diff --git a/components/base/navbar - 副本.vue b/components/base/navbar - 副本.vue new file mode 100644 index 0000000..1650efd --- /dev/null +++ b/components/base/navbar - 副本.vue @@ -0,0 +1,128 @@ + + + + + + \ No newline at end of file diff --git a/components/base/navbar.vue b/components/base/navbar.vue index 1650efd..49636c4 100644 --- a/components/base/navbar.vue +++ b/components/base/navbar.vue @@ -4,25 +4,31 @@ + + + + :color="color" size="46rpx"> {{ title }} + :color="color" size="58rpx"> - - @@ -63,7 +69,7 @@ }, bgColor : { - default : '#F9FEFE' + default : '#fff' }, color : { default : '#333' @@ -75,9 +81,18 @@ }, data() { return { + length : getCurrentPages().length }; }, methods : { + toHome(){ + if(this.length != 1){ + return + } + uni.reLaunch({ + url: '/pages/index/index' + }) + } } } @@ -96,7 +111,7 @@ padding-top: calc(var(--status-bar-height) + 20rpx); width: 100%; height: 100rpx; - background-color: #F9FEFE; + background-color: #fff; display: flex; justify-content: center; font-size: 32rpx; diff --git a/components/list/bossList/bossItem.vue b/components/list/bossList/bossItem.vue index 13df5f4..059bcb3 100644 --- a/components/list/bossList/bossItem.vue +++ b/components/list/bossList/bossItem.vue @@ -20,6 +20,7 @@ diff --git a/main.js b/main.js index 84751ca..9f09e6f 100644 --- a/main.js +++ b/main.js @@ -14,6 +14,11 @@ import store from '@/store/store' import './config' import './utils/index.js' +import mixinConfigList from '@/mixins/configList.js' + +Vue.mixin(mixinConfigList) + + //组件注册 import configPopup from '@/components/config/configPopup.vue' import navbar from '@/components/base/navbar.vue' diff --git a/mixins/configList.js b/mixins/configList.js new file mode 100644 index 0000000..a243fc1 --- /dev/null +++ b/mixins/configList.js @@ -0,0 +1,43 @@ + + +import { mapState } from 'vuex' +export default { + data() { + return { + // 默认的全局分享内容 + Gshare: { + title: '特易招', + path: '/pages/index/index', // 全局分享的路径，比如 首页 + // imageUrl: '/static/image/login/logo.png', // 全局分享的图片(可本地可网络) + } + } + }, + computed: { + ...mapState(['configList', 'userInfo', 'role']), + }, + // 定义全局分享 + // 1.发送给朋友 + onShareAppMessage(res) { + let o = { + ...this.Gshare, + // title : this.configList.logo_name, + } + if(this.userInfo.id){ + o.path = this.Gshare.path + '?shareId=' + this.userInfo.id + } + return o + }, + //2.分享到朋友圈 + onShareTimeline(res) { + let o = { + ...this.Gshare, + // title : this.configList.logo_name, + } + if(this.userInfo.id){ + o.path = this.Gshare.path + '?shareId=' + this.userInfo.id + } + return o + }, + methods: { + } +} \ No newline at end of file diff --git a/pages/index/center.vue b/pages/index/center.vue index 82a8305..66512ca 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -94,6 +94,13 @@ 我的工作 + + + 在线简历 + + {{ role ? '我的招工' : '我的找活'}} diff --git a/pages/index/index.vue b/pages/index/index.vue index 0399e06..548505a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -48,7 +48,8 @@ + @click="toAdd" + v-if="role"> 发布 @@ -56,7 +57,7 @@ - {{ role ? '招工' : '找活' }} + 招工 diff --git a/pages_order/mine/setting.vue b/pages_order/mine/setting.vue index f516846..f0cfab9 100644 --- a/pages_order/mine/setting.vue +++ b/pages_order/mine/setting.vue @@ -7,7 +7,7 @@ 账号设置 - - + --> - + {{ t }} diff --git a/pages_order/work/workDetail.vue b/pages_order/work/workDetail.vue index 88a1b27..fcadfb3 100644 --- a/pages_order/work/workDetail.vue +++ b/pages_order/work/workDetail.vue @@ -74,7 +74,9 @@ - + {{ t }} diff --git a/uni_modules/uv-drop-down/components/uv-drop-down-popup/uv-drop-down-popup.vue b/uni_modules/uv-drop-down/components/uv-drop-down-popup/uv-drop-down-popup.vue index 6a1efc8..6246b7a 100644 --- a/uni_modules/uv-drop-down/components/uv-drop-down-popup/uv-drop-down-popup.vue +++ b/uni_modules/uv-drop-down/components/uv-drop-down-popup/uv-drop-down-popup.vue @@ -1,14 +1,19 @@