diff --git a/App.vue b/App.vue index db3caf7..5c70f9f 100644 --- a/App.vue +++ b/App.vue @@ -32,36 +32,19 @@ export default { }); // 小程序版本的判断(正式:release, 体验:trial, 开发:develop) uni.setStorageSync("ENV_VERSION", __wxConfig.envVersion); - if (that.globalData.appId == "wx581db3f39c49ed2b") { - that.globalData.title = "英华招工"; + if (that.globalData.appId == "wxb0dea4d11428c6a5") { + that.globalData.title = "伯才供应链"; that.globalData.themeColor = "#3578f6"; - that.globalData.logo = uni.getStorageSync("miniApp-info").logo || "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/yinghua.png"; - } - if (that.globalData.appId == "wxe431e0b3abd9ae0b") { + that.globalData.logo = uni.getStorageSync("miniApp-info").logo || "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/renhailaowu.png"; + } else if (that.globalData.appId == "wxe431e0b3abd9ae0b") { that.globalData.title = "伯才工作"; - that.globalData.themeColor = "#3578f6"; + that.globalData.themeColor = "#ff4400"; that.globalData.logo = uni.getStorageSync("miniApp-info").logo || "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/renhailaowu.png"; } else if (that.globalData.appId == "wxb0c590fd696b79be") { that.globalData.title = "稻田工作"; that.globalData.themeColor = "#0dcc91"; that.globalData.logo = uni.getStorageSync("miniApp-info").logo || "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/yicaiLogoBgf913.png"; - } else if (that.globalData.appId == "wxcd0e4a001e1d87bd") { - that.globalData.title = "会聘工作"; - that.globalData.themeColor = "#0dcc91"; - that.globalData.logo = uni.getStorageSync("miniApp-info").logo || "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/kuaipin.jpg"; - } else if (that.globalData.appId == "wx57e965905e6b4530") { - that.globalData.title = "人海劳务"; - that.globalData.themeColor = "#3578f6"; - that.globalData.logo = uni.getStorageSync("miniApp-info").logo || "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/renhailaowu.png"; - } else if (that.globalData.appId == "wxd522e45fa0d4be09") { - that.globalData.title = "鑫都直聘"; - that.globalData.themeColor = "#3578f6"; - that.globalData.logo = uni.getStorageSync("miniApp-info").logo || "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/xindu.png "; - } else if (that.globalData.appId == "wx15bc9c758f4eb129") { - that.globalData.title = "业小满直聘"; - that.globalData.themeColor = "#3578f6"; - that.globalData.logo = uni.getStorageSync("miniApp-info").logo || "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/yexiaoman.png"; - } + } if (options.query.id) { uni.setStorageSync("apply-jobdetail-id", options.query.id); diff --git a/components/list/apply.vue b/components/list/apply.vue index 878ec54..618f0e6 100644 --- a/components/list/apply.vue +++ b/components/list/apply.vue @@ -16,7 +16,7 @@ - 1123 + diff --git a/components/list/yiJob.vue b/components/list/yiJob.vue index f0c4577..d371747 100644 --- a/components/list/yiJob.vue +++ b/components/list/yiJob.vue @@ -34,9 +34,6 @@ - {{ item.district }}{{ item.district ? "丨" : "" }} {{ item.gender + "丨" + item.age }} diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 4d54bd4..777b1b7 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -5,9 +5,9 @@ Component({ toTop: false, selected: 0, color: "#888", - selectedColor: app.globalData.appId == 'wxb0c590fd696b79be' ? "#ff4400" : "#3578f6", + selectedColor: "#3578f6", appId: app.globalData.appId, - list: app.globalData.appId == 'wxb0c590fd696b79be' ? [ + list: [ { "iconPath": "icon-home", // "selectedIconPath": "/static/image/tabbar/home.svg", @@ -16,7 +16,7 @@ Component({ "index": 0 }, { - iconPath: "icon-home", + iconPath: "icon-gongdanguanli", text: '工单', "index": 3, pagePath: "/pages/home/child/apply", @@ -38,54 +38,23 @@ Component({ "index": 1 }, { - "iconPath": "icon-user", - // "iconPath": "/static/image/tabbar/user_active.svg", - // "selectedIconPath": "/static/image/tabbar/user.svg", - "pagePath": "/pages/person/index", - "text": "我的", - "index": 2 - } - ] : [ - { - "iconPath": "icon-home", - // "iconPath": "/static/image/tabbar/home_active.svg", - // "selectedIconPath": "/static/image/tabbar/home.svg", - "pagePath": "/pages/home/index", - "text": "首页", - "index": 0 - }, - { - "iconPath": "icon-shop", - // "iconPath": "/static/image/tabbar/shop_active.svg", - // "selectedIconPath": "/static/image/tabbar/shop.svg", - "pagePath": "/pages/company/index", - "text": "门店", - "index": 1 - }, - // { - // "iconPath": "/static/image/tabbar/chat.svg", - // "selectedIconPath": "/static/image/tabbar/chat.svg", - // "pagePath": "/pages/ai/index", - // "text": "AI", - // "index": 2 - // }, - { - "iconPath": "icon-message", + "iconPath": "icon-appstore", // "iconPath": "/static/image/tabbar/message_active.svg", // "selectedIconPath": "/static/image/tabbar/message.svg", - "pagePath": "/pages/message/index", - "text": "消息", - "index": 2 + "pagePath": "/pages/workBench/index", + "text": "工作台", + "index": 4 }, + { "iconPath": "icon-user", // "iconPath": "/static/image/tabbar/user_active.svg", // "selectedIconPath": "/static/image/tabbar/user.svg", "pagePath": "/pages/person/index", "text": "我的", - "index": 3 + "index": 2 } - ], + ] }, lifetimes: { show: function () { diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss index 9268783..871e163 100644 --- a/custom-tab-bar/index.wxss +++ b/custom-tab-bar/index.wxss @@ -1,6 +1,8 @@ @font-face { - font-family: "iconfont"; /* Project id 4374774 */ - src: url("//at.alicdn.com/t/c/font_4374774_pt88dt6fxcj.woff2?t=1741923897019") format("woff2"), url("//at.alicdn.com/t/c/font_4374774_pt88dt6fxcj.woff?t=1741923897019") format("woff"), url("//at.alicdn.com/t/c/font_4374774_pt88dt6fxcj.ttf?t=1741923897019") format("truetype"); + font-family: "iconfont"; /* Project id 4374774 */ + src: url('//at.alicdn.com/t/c/font_4374774_rftbvxqyqf.woff2?t=1742455310466') format('woff2'), + url('//at.alicdn.com/t/c/font_4374774_rftbvxqyqf.woff?t=1742455310466') format('woff'), + url('//at.alicdn.com/t/c/font_4374774_rftbvxqyqf.ttf?t=1742455310466') format('truetype'); } .iconfont { font-family: "iconfont" !important; @@ -9,6 +11,14 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-appstore:before { + content: "\e792"; +} + +.icon-gongdanguanli:before { + content: "\e909"; +} + .icon-home:before { content: "\e7e1"; } diff --git a/manifest.json b/manifest.json index f9f6786..da244df 100644 --- a/manifest.json +++ b/manifest.json @@ -94,7 +94,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxb0c590fd696b79be", + "appid" : "wxb0dea4d11428c6a5", "requiredPrivateInfos" : [ "getLocation", "chooseLocation", "chooseAddress" ], "setting" : { "urlCheck" : true, diff --git a/pages.json b/pages.json index 1e1a72f..8cfd2e2 100644 --- a/pages.json +++ b/pages.json @@ -13,10 +13,20 @@ "navigationBarTextStyle": "black" } }, + { + "path": "pages/workBench/index", + "style": { + "navigationBarTitleText": "工作台", + "backgroundColor": "#ffffff", + "backgroundColorTop": "#ffffff", + "backgroundColorBottom": "#ffffff", + "navigationBarTextStyle": "black" + } + }, { "path": "pages/home/child/apply", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "工单", "backgroundColor": "#ffffff", "backgroundColorTop": "#ffffff", "backgroundColorBottom": "#ffffff", @@ -490,6 +500,12 @@ "selectedIconPath": "static/image/nav_company_selected_lao.png", "pagePath": "pages/home/child/apply", "text": "工单" + }, + { + "iconPath": "static/image/nav_company_norma.png", + "selectedIconPath": "static/image/nav_company_selected_lao.png", + "pagePath": "pages/workBench/index", + "text": "工作台" }, // { // "iconPath": "static/image/chat.png", diff --git a/pages/home/child/apply.vue b/pages/home/child/apply.vue index 59666fa..048086b 100644 --- a/pages/home/child/apply.vue +++ b/pages/home/child/apply.vue @@ -144,6 +144,12 @@ export default { }, onShow() { let that = this; + if (typeof that.$mp.page.getTabBar === "function" && that.$mp.page.getTabBar()) { + that.$mp.page.getTabBar().setData({ + selected: 3, + isShow: true, + }); + } // 导航栏高度信息 that.navInfo = that.G.getNavInfo(); if (uni.getStorageSync("apply-tab-active") == 1) { @@ -163,12 +169,7 @@ export default { this.menuList = this.tabInfo[this.tabActive].childList; this.getList(); } - if (typeof that.$mp.page.getTabBar === "function" && that.$mp.page.getTabBar()) { - that.$mp.page.getTabBar().setData({ - selected: 3, - isShow: true, - }); - } + this.getGZHInfo(); }, onReachBottom() { diff --git a/pages/home/child/filter.vue b/pages/home/child/filter.vue index ca0ce2e..48aa7e0 100644 --- a/pages/home/child/filter.vue +++ b/pages/home/child/filter.vue @@ -356,7 +356,7 @@ export default { getClass() { var that = this; that.G.Get( - that.appid == "wxb0c590fd696b79be" ? that.api.yi_job_class_new : that.api.yi_job_class, + that.api.yi_job_class_new, { type: 90, industry: 2, hasJob: 1 }, (res) => { console.log(res); @@ -392,7 +392,7 @@ export default { getType() { var that = this; that.G.Get( - that.appid == "wxb0c590fd696b79be" ? that.api.yi_job_type_new : that.api.yi_job_type, + that.api.yi_job_type_new, {}, (res) => { that.filterData.classifyList = res.labels.map((label) => ({ diff --git a/pages/home/index.vue b/pages/home/index.vue index 1ae33a8..022c163 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -51,7 +51,7 @@ - + 筛选 @@ -62,23 +62,15 @@ - - + - - - - - - - - + - 批量分享 + 批量分享 @@ -193,22 +185,16 @@ export default { // #ifdef MP-WEIXIN this.searchAnimate(); // #endif - let appId = getApp().globalData.appId; - if (this.appInfo.noticeImg) { - this.noticeImg = this.appInfo.noticeImg; - } else { - this.noticeImg = "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/notice/noticeDefault.png"; - } }, data() { return { + globalData:getApp().globalData, isUseNewJob: getApp().globalData.isUseNewJob, appid: getApp().globalData.appId, selectedCity: "全国", envVersion: uni.getStorageSync("ENV_VERSION"), // 小程序环境判断 isMember: uni.getStorageSync("IS_MINIAPP_MEMBER"), // 登陆者是否当前小程序成员的判断 hasPermission: uni.getStorageSync("HAS_PERMISSION") == 1 ? true : false, // 登陆者是否有权限查看 - noticeImg: "", getFilterData: { sex: "-1", ageRangeStr: "", @@ -290,8 +276,6 @@ export default { isShow: false, }, // "在这里，使用世界前沿的人工智能技术，为用户甄选海量的高清美图，用更流畅，更快捷，更精准的搜索体验，带你去发现多彩的世界。" - noticList: [], - showNotic: "paused", userId: 0, currentInfo: {}, appInfo: uni.getStorageSync("miniApp-info"), @@ -312,40 +296,7 @@ export default { that.query.page = 1; this.isLogin = uni.getStorageSync("apply-userinfo") ? true : false; this.query.size = this.isLogin ? 50 : 20; - that.getList().then(() => { - that.showNotic = "paused"; - console.log("that.showNotic1", that.showNotic); - setTimeout(() => { - if (uni.getStorageSync("miniApp-info").notice) { - let notice = uni.getStorageSync("miniApp-info").notice; - var reg = /[\r\n]/g; - notice = notice.replace(reg, ""); - that.noticList[0] = notice; - that.showNotic = "play"; - that.$forceUpdate(); - } - }, 0); - }); - // that.tabInfo.list = [ - // { - // name: "全部", - // num: 0, - // tip: 0, - // classify: 2, - // }, - // // { - // // name: "收藏", - // // num: 0, - // // tip: 1, - // // classify: 3, - // // }, - // // { - // // name: "附近", - // // num: 0, - // // tip: 2, - // // classify: 2, - // // }, - // ]; + that.getList() that.isShowTab = true; }, @@ -519,26 +470,13 @@ export default { // params.sortTag = 2; } return new Promise((resolve, reject) => { - let _url = ""; - if (that.appid == "wxb0c590fd696b79be" && that.isUseNewJob) { - // 一才 - _url = that.api.new_job_list; - } else { - // 其他 - _url = that.api.yi_job_list; - } - + let _url = that.api.new_job_list; + console.log('_url',_url); that.G.Post(_url, params, (res) => { console.log("一才职位列表：", res); that.computeCode = 1; let resData = {}; - if (that.appid == "wxb0c590fd696b79be" && that.isUseNewJob) { - // 一才 - resData = res; - } else { - // 其他 - resData = res.pageBean; - } + resData = res; if (resData.recordCount == 0) { that.loading = false; diff --git a/pages/login/index.vue b/pages/login/index.vue index 2191c43..b393aa3 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -2,13 +2,13 @@