diff --git a/app.json b/app.json index 2ac1cbf..49e3556 100644 --- a/app.json +++ b/app.json @@ -100,6 +100,8 @@ "todayData/index", "addressBook/index", "billShowInfo/index", + "systemMessage/index", + "todayBill/index", "addAddress/index" ] } diff --git a/app.wxss b/app.wxss index 1c678d2..e2e78db 100644 --- a/app.wxss +++ b/app.wxss @@ -298,6 +298,9 @@ page { .bt1 { border-top: 1px solid #eee; } +.bt61 { + border-top: 1px solid #333; +} .bl1 { border-left: 1px solid #eee; } @@ -455,9 +458,14 @@ page { } .f12 { - font-size: 12px; + font-size: 12px !important; +} +.f13 { + font-size: 13px; +} +.f15 { + font-size: 15px !important; } - .f16 { font-size: 16px !important; } @@ -785,9 +793,6 @@ button { /*margin-left: 30rpx;*/ } -.f13 { - font-size: 13px; -} .row-title.f14 { font-size: 14px; diff --git a/assets/iconfont/iconfont.wxss b/assets/iconfont/iconfont.wxss index c541331..12a510a 100644 --- a/assets/iconfont/iconfont.wxss +++ b/assets/iconfont/iconfont.wxss @@ -1,8 +1,8 @@ @font-face { - font-family: 'iconfont'; /* Project id 2708790 */ - src: url('//at.alicdn.com/t/c/font_2708790_ma287fiyats.woff2?t=1739762965828') format('woff2'), - url('//at.alicdn.com/t/c/font_2708790_ma287fiyats.woff?t=1739762965828') format('woff'), - url('//at.alicdn.com/t/c/font_2708790_ma287fiyats.ttf?t=1739762965828') format('truetype'); + font-family: "iconfont"; /* Project id 2708790 */ + src: url('//at.alicdn.com/t/c/font_2708790_0dvih56qdt3.woff2?t=1741316773850') format('woff2'), + url('//at.alicdn.com/t/c/font_2708790_0dvih56qdt3.woff?t=1741316773850') format('woff'), + url('//at.alicdn.com/t/c/font_2708790_0dvih56qdt3.ttf?t=1741316773850') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-file-copy:before { + content: "\e7f6"; +} + +.icon-share:before { + content: "\e7fb"; +} + .icon-fasong:before { content: "\e6a6"; } @@ -1484,4 +1492,3 @@ .icon-xiayiye1:before { content: "\e695"; } - diff --git a/assets/images/chatAvatar.jpg b/assets/images/chatAvatar.jpg new file mode 100644 index 0000000..055236d Binary files /dev/null and b/assets/images/chatAvatar.jpg differ diff --git a/assets/images/mrfd.svg b/assets/images/mrfd.svg new file mode 100644 index 0000000..c33fefa --- /dev/null +++ b/assets/images/mrfd.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/ptxx.svg b/assets/images/ptxx.svg new file mode 100644 index 0000000..319ebc9 --- /dev/null +++ b/assets/images/ptxx.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/components/job-sub/index.js b/components/job-sub/index.js index 71fac14..d5dee3b 100644 --- a/components/job-sub/index.js +++ b/components/job-sub/index.js @@ -1,4 +1,5 @@ -const app = getApp(); +const app = getApp() +// let app = null; Component({ data: { labelColor: ["#c41d7f", "#096dd9", "#531dab", "#d46b08", "#389e0d", "#08979c", "#cf1322"], @@ -30,13 +31,34 @@ Component({ selectJob: { type: Boolean, value: false + }, + loginUserInfo: { + type: Object, + value: {} } }, + lifetimes: { + attached: function () { + app.getLoginUserTokenInfo().then(() => { + this.setData({ + corpUserFlag: this.properties.loginUserInfo.corpUserFlag + }) + }); + + // 在组件实例进入页面节点树时执行 + }, + detached: function () { + // 在组件实例被从页面节点树移除时执行 + }, + }, ready () { - this.setData({ - corpUserFlag: app.globalData.loginUserInfo.corpUserFlag - }) + // console.log('app.globalData.loginUserInfo.corpUserFlag', app.globalData.loginUserInfo.corpUserFlag); + console.log('this.properties.loginUserInfo', this.properties.loginUserInfo); + // app.getLoginUserTokenInfo().then(() => { + + // }); + }, methods: { diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js index 4df9b70..e6bbb9b 100644 --- a/pages/firstBill/index.js +++ b/pages/firstBill/index.js @@ -1302,7 +1302,12 @@ Page({ // console.log("agencyUserId", agencyUserId); app.globalData.isCommission = 1; } - app.getLoginUserTokenInfo(); + app.getLoginUserTokenInfo().then((res)=>{ + console.log('res', app.globalData.loginUserInfo) + this.setData({ + userInfo: app.globalData.loginUserInfo, + }); + }); // this.getJobList(); if (wx.getStorageSync("FILTER_LIST")) { diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml index 4c71a92..3e1a7d6 100644 --- a/pages/firstBill/index.wxml +++ b/pages/firstBill/index.wxml @@ -589,7 +589,7 @@ --> - + @@ -1076,7 +1076,7 @@ - + - - - + + + {{item.title}} {{item.pubTime == '8月30日' ? '6月16日' : item.pubTime}} - {{item.remark || '[图片]'}} + {{item.remark || '[图片]'}} diff --git a/pages/message/index.wxss b/pages/message/index.wxss index 8fdff57..d2b81d4 100644 --- a/pages/message/index.wxss +++ b/pages/message/index.wxss @@ -1,56 +1,15 @@ /* pages/message/index.wxss */ .container{ - padding: 10px; -} -.container .servicebox { - /* display: flex; */ - /* justify-content: space-between; */ - /* flex-direction: column; */ - /* align-items: start; */ - /* padding: 20px; */ - padding: 16px 12px; - /* padding-bottom: 0; */ - /* padding-right: 10px; */ - background-color: #fff; -} -.container .servicebox .serviceinfo{ -} -.container .servicebox .serviceinfo image { - width: 52px; - height: 52px; -} -.servicebox .serviceBottom { - height: 48px; - line-height: 48px; - width: 100%; - justify-content: space-between; -} -.servicebox .serviceBottom > view { - flex: 1; - justify-content: space-between; - padding: 0 10px 0 16px; -} -.contact { - width: 80%; - height: 350px; -} -.contact .weui-dialog__hd{ - margin-top: 40px; - padding: 0; - position: relative; -} -.contact .contact_bottomBtn .v-center { - width: 80px !important; -} -.contact .contact_bottomBtn .rflex button { - padding: 0; - width: 100%; -} -.guanbi{ - position: absolute; - right: 16px; - top: -28px; -} -.mb32{ - margin-bottom: 32px; + padding-top: 10px; +} +.noticImg{ + width: 48px; + height: 48px; + border-radius: 8px; +} +.sub{ + padding: 12px; + font-size: 14px; + background-color: #fff; + /* border-radius: 8px; */ } \ No newline at end of file diff --git a/subPage/systemMessage/index.js b/subPage/systemMessage/index.js new file mode 100644 index 0000000..42f8df4 --- /dev/null +++ b/subPage/systemMessage/index.js @@ -0,0 +1,164 @@ +// pages/message/index.js +const app = getApp(); +import dateUtil from "../../utils/dateUtil"; +import { customRequest } from '../../utils/request.js'; +Page({ + /** + * 页面的初始数据 + */ + data: { + isLogin: app.globalData.isLogin, + serviceInfo: {}, + iosDialog: false, + isLoading: true, + messageClick: false, + infoList: [], + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad (options) { + this.setData({ + messageClick: wx.getStorageSync("messageClick" + app.globalData.loginUserInfo.id), + }); + console.log(this.data.messageClick); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady () { }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow () { + // let serviceInfo = wx.getStorageSync('ServiceInfo') + this.getInfoList(); + console.log('messageTab' + typeof this.getTabBar); + if (typeof this.getTabBar === "function" && this.getTabBar()) { + this.getTabBar().setData({ + isShow: true, + selected: 2, + }); + } + setTimeout(() => { + this.setData({ + serviceInfo: app.globalData.serviceInfo, + isLoading: true, + messageClick: wx.getStorageSync("messageClick" + app.globalData.loginUserInfo.id), + }); + }, 10); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide () { + this.setData({ + iosDialog: false, + }); + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload () { }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh () { }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom () { }, + + /** + * 用户点击右上角分享 + */ +onShareAppMessage() { + return app.sharePageImage() +}, + + makePhoneCall () { + console.log(1); + var that = this; + wx.makePhoneCall({ + // number: that.data.jobDetail.assistantUserTel + "" + phoneNumber: that.data.serviceInfo.workPhone || "0371-6611 3723", + }); + }, + + showdialog () { + this.setData({ + iosDialog: true, + loading: true, + }); + }, + closeDialog () { + this.setData({ + iosDialog: false, + }); + }, + imageLoad () { + this.setData({ + isLoading: false, + }); + }, + getInfoList () { + let that = this; + customRequest("/bocai/cms/list", { header: 'headers', method: 'post', data: { pageSize: 100, pageNum: 1, keys: "" } }).then((res) => { + if (res.data.status == 200) { + res.data.data.pageBean.recordList.forEach(item => { + item['pubTime'] = dateUtil.timeShow(item.publishTime); + console.log(item); + }); + that.setData({ + infoList: res.data.data.pageBean.recordList, + }); + } + }) + // wx.request({ + // url: app.globalData.ip + "/bocai/cms/list", + // data: { pageSize: 100, pageNum: 1, keys: "" }, + // header: app.globalData.headers, + // method: "post", + // success: function (res) { + // console.log(res); + // if (res.data.status == 200) { + // res.data.data.pageBean.recordList.forEach(item => { + // item['pubTime'] = dateUtil.timeShow(item.publishTime); + // console.log(item); + // }); + // that.setData({ + // infoList: res.data.data.pageBean.recordList, + // }); + // } + // }, + // }); + }, + /** + * 阻止滑动穿透 + * + * + */ + modalMove () { + return false; + }, + goDetail (e) { + console.log(e); + if (e.currentTarget.dataset.type == "wellcome") { + wx.setStorageSync("messageClick" + app.globalData.loginUserInfo.id, true); + wx.navigateTo({ + url: "/pages/messageDetail/index?type=1", + }); + } else { + wx.navigateTo({ + url: "/pages/messageDetail/index?id=" + e.currentTarget.dataset.id, + }); + } + }, +}); diff --git a/subPage/systemMessage/index.json b/subPage/systemMessage/index.json new file mode 100644 index 0000000..61f167f --- /dev/null +++ b/subPage/systemMessage/index.json @@ -0,0 +1,7 @@ +{ + "usingComponents": {}, + "navigationBarTitleText" : "消息", + "navigationBarBackgroundColor": "#fff", + "backgroundColor": "#f5f5f5", + "navigationBarTextStyle": "black" +} \ No newline at end of file diff --git a/subPage/systemMessage/index.wxml b/subPage/systemMessage/index.wxml new file mode 100644 index 0000000..09096cd --- /dev/null +++ b/subPage/systemMessage/index.wxml @@ -0,0 +1,107 @@ + + + + + + + + + + + 客户经理 + + {{serviceInfo.userName}} + +

{{serviceInfo.tel || '0371-6611 3723'}}

+ + + + + + + + + + + 伯才欢迎您 + + 伯才（以下简称“伯才”），让天下没有难做的劳务。 + + + + + + + {{item.title}} + + {{item.pubTime == '8月30日' ? '6月16日' : item.pubTime}} + + {{item.remark || '[图片]'}} + + + + 暂无消息 + + + + + + + + + + + + 加客户经理微信 + + + + + 加载中... + + + + + 长按识别二维码 + + + + diff --git a/subPage/systemMessage/index.wxss b/subPage/systemMessage/index.wxss new file mode 100644 index 0000000..8fdff57 --- /dev/null +++ b/subPage/systemMessage/index.wxss @@ -0,0 +1,56 @@ +/* pages/message/index.wxss */ +.container{ + padding: 10px; +} +.container .servicebox { + /* display: flex; */ + /* justify-content: space-between; */ + /* flex-direction: column; */ + /* align-items: start; */ + /* padding: 20px; */ + padding: 16px 12px; + /* padding-bottom: 0; */ + /* padding-right: 10px; */ + background-color: #fff; +} +.container .servicebox .serviceinfo{ +} +.container .servicebox .serviceinfo image { + width: 52px; + height: 52px; +} +.servicebox .serviceBottom { + height: 48px; + line-height: 48px; + width: 100%; + justify-content: space-between; +} +.servicebox .serviceBottom > view { + flex: 1; + justify-content: space-between; + padding: 0 10px 0 16px; +} +.contact { + width: 80%; + height: 350px; +} +.contact .weui-dialog__hd{ + margin-top: 40px; + padding: 0; + position: relative; +} +.contact .contact_bottomBtn .v-center { + width: 80px !important; +} +.contact .contact_bottomBtn .rflex button { + padding: 0; + width: 100%; +} +.guanbi{ + position: absolute; + right: 16px; + top: -28px; +} +.mb32{ + margin-bottom: 32px; +} \ No newline at end of file diff --git a/subPage/todayBill/index.js b/subPage/todayBill/index.js new file mode 100644 index 0000000..3b95c18 --- /dev/null +++ b/subPage/todayBill/index.js @@ -0,0 +1,77 @@ +// subPage/todayBill/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + text: `【泰州LG冰箱】 + 🚻 男 18-48；女 18-45，黑户、纹身不在明处都可以、案底卡的不严➕身份证有效期内临时、消磁均可 + 💰 底薪2490元+成果工资+夜班津贴15元/天+特殊岗位津贴0-200元+加班工资，加班费 平时1.5倍21.47元/时、周末2倍28.62元/时、法定假日3倍42.93元/时；综合工资5300~8000元。 + 发薪时间：28号发放上月20号到当月19号工资，工作不满七天无工资。 + 📣 1. 三餐免费、365天不上班也免费2. 免费提供住宿，住宿人员班车免费接送3. 主要生产：冰箱及冰箱用压缩机，工作简单易操作详情咨询：15936360682` + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom () { + + }, + selectionChangeHandler (e) { + console.log(e); + let item = e.currentTarget.dataset.item; + const query = wx.createSelectorQuery() + query.select('#copy' + item).context().exec((res) => { + console.log(res); + }); + }, + /** + * 用户点击右上角分享 + */ + onShareAppMessage () { + + } +}) \ No newline at end of file diff --git a/subPage/todayBill/index.json b/subPage/todayBill/index.json new file mode 100644 index 0000000..dee307f --- /dev/null +++ b/subPage/todayBill/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText" : "每日发单" + +} \ No newline at end of file diff --git a/subPage/todayBill/index.wxml b/subPage/todayBill/index.wxml new file mode 100644 index 0000000..adb03b3 --- /dev/null +++ b/subPage/todayBill/index.wxml @@ -0,0 +1,28 @@ + + + + + {{item == 0 ? '今天' :( item == 1 ? '昨天' : item == 2 ? '前天' : '2025-3-3')}} 15:3{{item + 1}} + + + + + + {{'客服刘丽'}} + + + + + + + + 复制 + + + + + + + + + diff --git a/subPage/todayBill/index.wxss b/subPage/todayBill/index.wxss new file mode 100644 index 0000000..943c6f8 --- /dev/null +++ b/subPage/todayBill/index.wxss @@ -0,0 +1,49 @@ +/* subPage/todayBill/index.wxss */ +.container { + padding: 0 0 120px 16px; +} +.timeTitle { + height: 32px; + line-height: 32px; + font-size: 14px; + padding: 32px 16px 12px 16px; + /* position: sticky; + position: -webkit-sticky; */ + top: 0px; + z-index: 999; + /* background: #f5f5f5; */ +} +.sub { + /* margin-right: 58px; */ +} +.avatarImg { + width: 40px; + height: 40px; + border-radius: 8px; +} +.chatContent { + position: relative; + background-color: #fff; + padding: 12px 16px 0 16px; + /* margin-left: 16px; */ + border-radius: 4px; +} +.userName { + line-height: 1; + margin-bottom: 8px; +} +.triangle { + position: absolute; + top: 4px; + left: -14px; + width: 0; + height: 0; + border: 8px solid transparent; + border-right: 12px solid #fff; +} +.copy { + padding: 1px 4px; + border-radius: 8px; + background-color: #1890ff26; + color: #1890ff; +}