From b737bf73d6166073046ff0a1f11fb7cc6a392229 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Tue, 6 May 2025 17:55:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5,=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- app.wxss | 5 +- components/tabbar/custom-tabbar.wxml | 1 + main-app.js | 7 +- net/api/userApi.js | 16 ++ .../createProjectInfo/createProjectInfo.js | 2 +- pages/copyright/payment/payment.js | 4 + pages/copyright/payment/payment.wxml | 8 +- pages/copyright/payment/payment.wxss | 15 +- pages/index/index.js | 44 ++++- pages/index/index.wxml | 4 +- pages/index/index.wxss | 18 +- .../mineMsgNotice/mineMsgNotice.js | 186 ++++++++++++++++++ .../mineMsgNotice/mineMsgNotice.json | 8 + .../mineMsgNotice/mineMsgNotice.wxml | 45 +++++ .../mineMsgNotice/mineMsgNotice.wxss | 111 +++++++++++ .../minePayRecord/minePayRecord.js | 2 + .../minePayRecord/minePayRecord.wxml | 2 +- pages/mine/mineIndex/mine.js | 46 ++++- pages/mine/mineIndex/mine.wxml | 3 +- pages/mine/mineIndex/mine.wxss | 20 ++ static/style/common.wxss | 4 +- 22 files changed, 525 insertions(+), 29 deletions(-) create mode 100644 pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js create mode 100644 pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.json create mode 100644 pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxml create mode 100644 pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss diff --git a/app.json b/app.json index 74c0217..3b22031 100644 --- a/app.json +++ b/app.json @@ -20,7 +20,8 @@ "pages/mine/mineAccount/invoiceInfo/invoiceInfo", "pages/mine/mineAccount/makeInvoice/makeInvoice", "pages/mine/mineAccount/invoiceOrder/invoiceOrder", - "pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail" + "pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail", + "pages/mine/mineAccount/mineMsgNotice/mineMsgNotice" ], "window": { "navigationBarTextStyle": "black", diff --git a/app.wxss b/app.wxss index 25425de..2cc0bc3 100644 --- a/app.wxss +++ b/app.wxss @@ -193,9 +193,8 @@ } .divider-v { - margin-top: 5rpx; - width: 90%; - height: 3rpx; + width: 95%; + height: 1rpx; background-color: var(--divider-color); align-self: center; } diff --git a/components/tabbar/custom-tabbar.wxml b/components/tabbar/custom-tabbar.wxml index d71119a..9d49172 100644 --- a/components/tabbar/custom-tabbar.wxml +++ b/components/tabbar/custom-tabbar.wxml @@ -1,5 +1,6 @@ + {{item.text}} diff --git a/main-app.js b/main-app.js index 3cfacc1..de8491a 100644 --- a/main-app.js +++ b/main-app.js @@ -9,9 +9,14 @@ App({ localAssets: "/static/images", slideBtns: [], appTitle: 'AI喵著', - appUrl: appUrl + appUrl: appUrl, + onlyDelBtns: [] }, onLaunch() { + this.globalData.onlyDelBtns = [{ + text: '删除', + src: this.globalData.localAssets + "/ic_delete_red.png" // icon的路径 + }] this.globalData.slideBtns = [{ text: '编辑', src: this.globalData.localAssets + "/ic_edit_blue.png" // icon的路径 diff --git a/net/api/userApi.js b/net/api/userApi.js index 11a637b..bb735e1 100644 --- a/net/api/userApi.js +++ b/net/api/userApi.js @@ -20,6 +20,9 @@ const apiPath = { canClaimsCoupons: '/api/coupon/list-can-claim', //获取可以申领的优惠卷 saveCoupons: '/api/coupon/user/save', //领取优惠卷 minePayRecord: '/api/account/listpage-item/self', + mineMsgNotice: '/api/user-msg/listpage-simple/self', //获取消息通知 + readMsgNotice: '/api/user-msg/update-read/self', //标记读取消息 + deleteMsgNotice: '/api/user-msg/remove/self/{ids}', //删除消息通知 } class UserService { static doLogin(data) { @@ -85,6 +88,19 @@ class UserService { static doSaveCoupons(data) { return request(apiPath.saveCoupons, "POST", data) } + //获取消息通知 + static doGetMineMsgNotice(data) { + return request(apiPath.mineMsgNotice, "GET", data) + } + //标记读取状态 + static doReadMineMsgNotice(data) { + return request(apiPath.readMsgNotice, 'PUT', data) + } + //删除消息通知 + static doDeleteMineMsgNotice(id) { + const path = apiPath.deleteMsgNotice.replace('{ids}', id) + return request(path, 'DELETE') + } } export default UserService; \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.js b/pages/copyright/createProjectInfo/createProjectInfo.js index a29173d..b2afbcb 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.js +++ b/pages/copyright/createProjectInfo/createProjectInfo.js @@ -495,7 +495,7 @@ Page({ wx.hideLoading() _self.setData({ showError: true, - errorHint: '未查询到相关推荐的系统名称,请重新输入' + errorHint: err.msg ? err.msg : '未查询到相关推荐的系统名称,请重新输入' }) console.log(err) }) diff --git a/pages/copyright/payment/payment.js b/pages/copyright/payment/payment.js index 3a69009..31f42e1 100644 --- a/pages/copyright/payment/payment.js +++ b/pages/copyright/payment/payment.js @@ -112,6 +112,10 @@ Page({ currentBagTab: e.currentTarget.dataset.value }) this.doGetPackageList(this.data.currentBagTab) + wx.pageScrollTo({ + scrollTop: 0, + duration: 300 + }) }, //切换支付方式 doChangePayWay(e) { diff --git a/pages/copyright/payment/payment.wxml b/pages/copyright/payment/payment.wxml index 0100094..3218a50 100644 --- a/pages/copyright/payment/payment.wxml +++ b/pages/copyright/payment/payment.wxml @@ -57,10 +57,11 @@ {{item.packageName}} - {{item.packageMoney/100}} + {{item.packageDescription}} + - {{item.packageDescription}} + 选购 @@ -74,4 +75,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/pages/copyright/payment/payment.wxss b/pages/copyright/payment/payment.wxss index 3b68a6f..0fb4630 100644 --- a/pages/copyright/payment/payment.wxss +++ b/pages/copyright/payment/payment.wxss @@ -121,8 +121,8 @@ .tab-select { font-size: 20rpx; - color: black; - background-color: var(--bg-primary-shallow-color); + color: var(--text-color); + background-color: var(--bg-primary-deep-color); text-align: center; padding: 5rpx 30rpx; white-space: nowrap; @@ -193,9 +193,10 @@ .bag-item { display: flex; - flex-direction: column; + flex-direction: row; border: 1rpx solid var(--divider-color); padding: 20rpx; + justify-content: space-between; } .bag-item:nth-of-type(n+2) { @@ -207,9 +208,8 @@ .bag-item-title-box { display: flex; - flex-direction: row; + flex-direction: column; justify-content: space-between; - align-items: center; } .p-title { @@ -239,10 +239,9 @@ .bag-item-desc-box { display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; + flex-direction: column; margin-top: 2px; + align-items: center; } .bag-item-desc-box .desc { diff --git a/pages/index/index.js b/pages/index/index.js index 2bbc843..c75a289 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -22,6 +22,8 @@ Page({ localAssets: app.globalData.localAssets, appTitle: app.globalData.appTitle, statusBarHeight: statusBarHeight, + menuRight: 0, + hasMsg: false, navBarHeight: navBarHeight, totalHeight: navBarHeight, // 导航栏总高度 contentHeight: windowHeight, @@ -88,14 +90,16 @@ Page({ "text": "首页", "iconPath": app.globalData.localAssets + "/ic_home_normal.png", "selectedIconPath": app.globalData.localAssets + "/ic_home_select.png", - "selected": true + "selected": true, + "hasMsg": false, }, { "pagePath": "pages/mine/mineIndex/mine", "text": "我的", "iconPath": app.globalData.localAssets + "/ic_mine_normal.png", "selectedIconPath": app.globalData.localAssets + "/ic_mine_select.png", - "selected": false + "selected": false, + "hasMsg": false } ], }, @@ -119,6 +123,41 @@ Page({ } this.countViewHeight() this.getMineInfo() + //设置通知图标 + const rect = wx.getMenuButtonBoundingClientRect() + this.setData({ + menuRight: rect.width + 5 + }) + //获取消息通知 + this.getMsgNotice() + }, + //消息通知 + getMsgNotice() { + const data = { + page: 1, + rows: 1, + isRead: 0, + keywords: '' + } + const _self = this + UserApi.doGetMineMsgNotice(data) + .then(res => { + console.log(res) + if (res.rows && res.rows.length > 0) { + _self.setData({ + 'tabList[1].hasMsg': true + }) + } else { + _self.setData({ + 'tabList[1].hasMsg': false + }) + } + }) + .catch(err => { + _self.setData({ + 'tabList[1].hasMsg': false + }) + }) }, //获取我的个人信息 getMineInfo() { @@ -140,6 +179,7 @@ Page({ this.setData({ tabList }); + this.getMsgNotice() }, //计算剩余高度 countViewHeight() { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index dfb6643..afac3bc 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -2,8 +2,10 @@ - + {{appTitle}} + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 3251847..d0b009a 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -28,6 +28,18 @@ padding: 0rpx 30rpx; } +.msg-info-box { + width: 32rpx; + height: 32rpx; +} + +.notice-point { + width: 8rpx; + height: 8rpx; + border-radius: 2rpx; + background-color: var(--red-color); +} + .title-func { display: flex; flex-direction: row; @@ -248,12 +260,12 @@ } .status-gray { - background-color: var(--gray-color-light); + background-color: var(--bg-gray-deep-color); color: var(--text-color); } .status-green { - background-color: var(--green-color-light); + background-color: var(--bg-green-status-deep-color); color: var(--text-color); } @@ -263,7 +275,7 @@ } .status-red { - background-color: var(--red-color-light); + background-color: var(--bg-red-deep-color); color: var(--white-color); } diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js new file mode 100644 index 0000000..5334ccf --- /dev/null +++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js @@ -0,0 +1,186 @@ +// pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js +import UserApi from '../../../../net/api/userApi' +const app = getApp() +const deviceInfo = wx.getDeviceInfo() +const screenInfo = wx.getWindowInfo(); +const statusBarHeight = screenInfo.statusBarHeight; // 状态栏高度 +const navBarHeight = deviceInfo.platform == 'IOS' ? 48 : 50; // 导航栏高度（iOS 为 44px，Android 为 48px） +const windowHeight = screenInfo.windowHeight - navBarHeight - statusBarHeight; //可用内容高度 +Page({ + + /** + * 页面的初始数据 + */ + data: { + currentStatus: '', + height: windowHeight, + onlyDelBtns: app.globalData.onlyDelBtns, + msgList: [], //订单列表 + pageData: { + page: 1, + rows: 10, + isRead: '', //默认已读 + }, //检索参数 + loadingState: 'loading', //加载状态 + listRefreshTrig: false, //list刷新状态 + isLoadMore: false, //加载更多的状态 + hasMore: true, //是否有更多数据 + keywords: '', //搜索关键字 + msgType: 'info', + msgHint: '', + msgShow: false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + wx.setNavigationBarTitle({ + title: '消息通知', + }) + wx.setNavigationBarColor({ + frontColor: '#000000', // 必写项，字体颜色仅支持#ffffff和#000000 + backgroundColor: '#F0F0F0', // 传递的颜色值，仅支持十六进制颜色 + animation: { // 可选项 + duration: 500, + timingFunc: 'easeIn' + } + }) + this.doRefreshList() + }, + //tab切换 + doChangeStatus(e) { + const value = e.currentTarget.dataset.value + this.setData({ + currentStatus: value + }) + this.doRefreshList() + }, + //下拉刷新 + doRefreshList() { + const _self = this + _self.setData({ + listRefreshTrig: true, + loadingState: 'loading', + hasMore: true, + 'pageData.page': 1, + 'pageData.isRead': _self.data.currentStatus, + isLoadMore: false + }) + _self.doGetMineMsgNotice(true) + }, + + //加载更多 + doLoadMore() { + //判断是否正在加载中 与是否存在更多数据 + const _self = this + if (_self.data.isLoadMore || !_self.data.hasMore) { + return + } + _self.setData({ + isLoadMore: true, + 'pageData.page': ++_self.data.pageData.page, + 'pageData.isRead': _self.data.currentStatus + }) + _self.doGetMineMsgNotice(false) + }, + //获取我的优惠卷 + doGetMineMsgNotice(isRefresh) { + const _self = this + _self.setData({ + msgList: isRefresh ? [] : _self.data.msgList, + loadingState: isRefresh ? 'loading' : '' + }) + UserApi.doGetMineMsgNotice(_self.data.pageData) + .then(res => { + var status = 'success' + status = res.rows && res.rows.length > 0 ? 'success' : 'empty' + _self.setData({ + loadingState: isRefresh ? status : '', + msgList: _self.data.msgList.concat(res.rows), + listRefreshTrig: false, + isLoadMore: false + }) + _self.setData({ + hasMore: _self.data.msgList.length < res.total + }) + }, err => { + _self.setData({ + loadingState: 'error', + listRefreshTrig: false, + isLoadMore: false, + hasMore: true + }) + }) + }, + readItem(e) { + const item = e.currentTarget.dataset.value + const _self = this + if (item.isRead == 1) { + return + } + wx.showLoading({ + title: '加载中...', + }) + const ids = { + ids: [item.userMsgId] + } + UserApi.doReadMineMsgNotice(ids) + .then(res => { + wx.hideLoading() + _self.doRefreshList() + }) + .catch(err => { + wx.hideLoading() + _self.setData({ + msgHint: err.msg ? err.msg : '读取失败,请稍后重试', + msgType: 'error', + msgShow: true + }) + }) + }, + slideButtonTap(e) { + const item = e.currentTarget.dataset.value + const index = e.detail.index + if (index == 0) { + //显示删除 + this.showDel(item) + } + }, + showDel(item) { + const _self = this + wx.showModal({ + title: '警告', + content: '确定要删除该消息吗?', + complete: (res) => { + if (res.confirm) { + _self.doDelMsg(item) + } + } + }) + }, + doDelMsg(item) { + const _self = this + wx.showLoading({ + title: '删除中...', + }) + UserApi.doDeleteMineMsgNotice(item.userMsgId) + .then(res => { + wx.hideLoading() + _self.setData({ + msgHint: '删除成功', + msgType: 'success', + msgShow: true + }) + _self.doRefreshList() + }) + .catch(err => { + wx.hideLoading() + _self.setData({ + msgHint: err.msg ? err.msg : '删除失败,请稍后重试', + msgType: 'error', + msgShow: true + }) + }) + } +}) \ No newline at end of file diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.json b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.json new file mode 100644 index 0000000..2cc0355 --- /dev/null +++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "mp-loading": "weui-miniprogram/loading/loading", + "container-loading": "/components/container-loading/container-loading", + "mp-slideview": "weui-miniprogram/slideview/slideview", + "mp-toptips": "weui-miniprogram/toptips/toptips" + } +} \ No newline at end of file diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxml b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxml new file mode 100644 index 0000000..6fa82d2 --- /dev/null +++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxml @@ -0,0 +1,45 @@ + + + + 全部 + + + + + + 未读 + + + + + + 已读 + + + + + + + + + + + + + + {{item.title}} + {{item.gmtCreate}} + + + + {{item.content}} + + + + + + + + + + \ No newline at end of file diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss new file mode 100644 index 0000000..d74a732 --- /dev/null +++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss @@ -0,0 +1,111 @@ +.list-title-btns { + position: fixed; + top: 0; + left: 0; + display: flex; + flex-direction: row; + justify-content: space-between; + font-size: 16px; + text-align: center; + width: 100vw; +} + +.btn-select { + line-height: 20px; + color: var(--btn-primary-color); + font-size: 16px; + text-align: center; + flex: 1; + padding: 10px; + color: var(--btn-green-color); + font-weight: bold; +} + +.btn-normal { + line-height: 20px; + color: var(--text-color); + flex: 1; + font-size: 16px; + text-align: center; + padding: 10px; + font-weight: bold; +} + +.border-select { + width: 20px; + height: 4px; + background-color: var(--btn-green-color); + margin-top: 10px; + border-radius: 2px; +} + +.tab { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.border-normal { + width: 20px; + height: 4px; + margin-top: 10px; + border-radius: 2px; + background-color: var(--divider-color); +} + +.coupons-list-box { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.msg-item-box { + display: flex; + flex-direction: column; + margin: 0rpx 30rpx; + padding: 20rpx; + background-color: var(--white-color); + border-radius: 5rpx; +} + +.msg-title-box { + display: flex; + flex-direction: row; + justify-content: space-between; + position: relative; +} + +.title-type { + font-size: 28rpx; + font-weight: bold; + color: var(--text-color); +} + +.title-time { + font-size: 24rpx; + color: var(--text-gray-hint-color); +} + +.msg-content-box { + margin-top: 15rpx; +} + +.msg-content-notice-point { + width: 15rpx; + height: 15rpx; + border-radius: 15rpx; + background-color: var(--primary-color-active); + position: absolute; + right: -10rpx; + top: -10rpx; +} + +.msg-content-content { + font-size: 28rpx; +} + +#mp-slide:nth-of-type(n+2) { + margin-top: 20rpx; +} \ No newline at end of file diff --git a/pages/mine/mineAccount/minePayRecord/minePayRecord.js b/pages/mine/mineAccount/minePayRecord/minePayRecord.js index d5c5d85..d381779 100644 --- a/pages/mine/mineAccount/minePayRecord/minePayRecord.js +++ b/pages/mine/mineAccount/minePayRecord/minePayRecord.js @@ -1,6 +1,7 @@ // pages/mine/mineAccount/minePayRecord/minePayRecord.js // 资金流水 import UserApi from '../../../../net/api/userApi' +const app = getApp() Page({ /** @@ -8,6 +9,7 @@ Page({ */ data: { recordList: [], //订单列表 + appTitle: app.globalData.appTitle, pageData: { page: 1, rows: 10, diff --git a/pages/mine/mineAccount/minePayRecord/minePayRecord.wxml b/pages/mine/mineAccount/minePayRecord/minePayRecord.wxml index cf769d8..7d8aaa4 100644 --- a/pages/mine/mineAccount/minePayRecord/minePayRecord.wxml +++ b/pages/mine/mineAccount/minePayRecord/minePayRecord.wxml @@ -30,7 +30,7 @@ {{tools.payType(item.type)}} - AI喵著 + {{appTitle}} {{item.orderId}} diff --git a/pages/mine/mineIndex/mine.js b/pages/mine/mineIndex/mine.js index c523ee4..d206c81 100644 --- a/pages/mine/mineIndex/mine.js +++ b/pages/mine/mineIndex/mine.js @@ -21,7 +21,7 @@ Page({ */ data: { localAssets: app.globalData.localAssets, - imgAssets:app.globalData.imgAssetsUrl, + imgAssets: app.globalData.imgAssetsUrl, appTitle: app.globalData.appTitle, statusBarHeight: statusBarHeight, navBarHeight: navBarHeight, @@ -37,6 +37,10 @@ Page({ icon: "ic-user", title: "个人信息", path: "/pages/mine/mineAccount/mineInfo/mineInfo" + }, { + icon: 'ic-msg', + title: '消息通知', + path: '/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice' }, { icon: 'ic-invoice-info', title: '开票信息', @@ -76,14 +80,16 @@ Page({ "text": "首页", "iconPath": app.globalData.localAssets + "/ic_home_normal.png", "selectedIconPath": app.globalData.localAssets + "/ic_home_select.png", - "selected": true + "selected": false, + "hasMsg": false }, { "pagePath": "pages/mine/mineIndex/mine", "text": "我的", "iconPath": app.globalData.localAssets + "/ic_mine_normal.png", "selectedIconPath": app.globalData.localAssets + "/ic_mine_select.png", - "selected": false + "selected": true, + "hasMsg": false } ], allPrice: 0, //全托管价格 @@ -109,6 +115,38 @@ Page({ this.countViewHeight() this.doGetPrice() }, + //消息通知 + getMsgNotice() { + const data = { + page: 1, + rows: 1, + isRead: 0, + keywords: '' + } + const _self = this + UserApi.doGetMineMsgNotice(data) + .then(res => { + if (res.rows && res.rows.length > 0) { + _self.setData({ + 'tabList[1].hasMsg': true, + 'menuList[1].hasMsg': true + }) + } else { + _self.setData({ + 'tabList[1].hasMsg': false, + 'menuList[1].hasMsg': false + }) + console.log('是否有消息', _self.data.menuList[1].hasMsg) + console.log('是否有消息', _self.data.tabList[1].hasMsg) + } + }) + .catch(err => { + _self.setData({ + 'tabList[1].hasMsg': false, + 'menuList[1].hasMsg': false + }) + }) + }, //计算高度 countViewHeight() { // @@ -253,6 +291,7 @@ Page({ }, 1100); }, onShow(options) { + console.log('页面显示') const pages = getCurrentPages(); const currentPage = pages[pages.length - 1]; const tabList = this.data.tabList; @@ -264,6 +303,7 @@ Page({ }); this.getMineAccount() //获取账户信息 this.getMinePackageCount() //获取套餐包信息 + this.getMsgNotice() }, getMineAccount() { const _self = this diff --git a/pages/mine/mineIndex/mine.wxml b/pages/mine/mineIndex/mine.wxml index b7fbe83..15c8b90 100644 --- a/pages/mine/mineIndex/mine.wxml +++ b/pages/mine/mineIndex/mine.wxml @@ -42,8 +42,9 @@ {{item.title}} + - + diff --git a/pages/mine/mineIndex/mine.wxss b/pages/mine/mineIndex/mine.wxss index f70c4f1..8aa8af7 100644 --- a/pages/mine/mineIndex/mine.wxss +++ b/pages/mine/mineIndex/mine.wxss @@ -157,6 +157,17 @@ margin-left: 20rpx; margin-right: 20rpx; width: 75vw; + position: relative; +} + +.msg-notice-point { + background-color: var(--primary-color); + width: 15rpx; + height: 15rpx; + position: absolute; + right: 30rpx; + top: 50%; + border-radius: 15rpx; } .menu-container { @@ -286,6 +297,15 @@ height: 24px; } +.ic-msg { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ2NTE1Mjg3MDE2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2MzIiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTkzNC42Mjc1NTYgODI3LjczMzMzM2EyNzMuMDA5Nzc4IDI3My4wMDk3NzggMCAwIDAtMTA2LjMyNTMzNC0yMDQuNTcyNDQ0VjM5Ny40MjU3NzhjMC0xMzAuMzg5MzMzLTkyLjEwMzExMS0yNDAuMDcxMTExLTIxMy45MDIyMjItMjY2LjA2OTMzNHYtNS4xMkExMDcuOTc1MTExIDEwNy45NzUxMTEgMCAwIDAgNTA3LjE2NDQ0NCAxNy45NzY4ODljLTU4LjgyMzExMSAwLTEwNy4wMDggNDguNjk2ODg5LTEwNy4wMDggMTA4LjE0NTc3OHY1LjE3Njg4OWMtMTIxLjc0MjIyMiAyNS45OTgyMjItMjEzLjkwMjIyMiAxMzUuNjgtMjEzLjkwMjIyMiAyNjYuMDY5MzMzdjIyNS44NDg4ODlhMjczLjAwOTc3OCAyNzMuMDA5Nzc4IDAgMCAwLTEwNi4zODIyMjIgMjA0LjYyOTMzM2gxMDYuMzgyMjIydjAuNjgyNjY3SDgyOC4zMDIyMjJ2LTAuNjgyNjY3aDEwNi4zMjUzMzR2LTAuMTEzNzc4eiBtLTQ0OS45OTExMTIgMTgyLjk1NDY2N2gyNi41NjcxMTJjNjkuNzQ1Nzc4IDAgMTI3LjY1ODY2Ny01My4yNDggMTM2LjAyMTMzMy0xMjEuNDAwODg5SDM2Ny41MDIyMjJjOC40MTk1NTYgNjguMTUyODg5IDY2LjM4OTMzMyAxMjEuNDAwODg5IDEzNi4wNzgyMjIgMTIxLjQwMDg4OUg0ODQuNjkzMzMzeiIgZmlsbD0iI0ZGQjgwMCIgcC1pZD0iMjYzMyI+PC9wYXRoPjwvc3ZnPg=='); + background-repeat: no-repeat; + background-size: cover; + width: 24px; + height: 24px; + +} + .custom-tips { margin-top: 82px; } \ No newline at end of file diff --git a/static/style/common.wxss b/static/style/common.wxss index 411392c..281301a 100644 --- a/static/style/common.wxss +++ b/static/style/common.wxss @@ -26,9 +26,11 @@ page { --bg-primary-deep-color: #FFA900; --bg-primary-shallow-color: #ffaa0017; --bg-red-color: #F7312A6B; - --bg-green-color: rgba(122, 196, 131, 0.42); + --bg-green-color: #78e2846b; --bg-green-deep-color: #39C7C1; --bg-gray-deep-color: #CCCCCC; + --bg-green-status-deep-color: #4EAF79; + --bg-red-deep-color: #F7312A; /* 按钮颜色 */ --btn-cyan-color: #39C7C1; --btn-cyan-active: #39c7c08f;