From 658d045a956de8ee82416136a4fdcfd91925e876 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Tue, 11 Mar 2025 15:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/images/baoming.svg | 1 +
assets/images/fadan.svg | 1 +
assets/images/zhangdan.svg | 1 +
pages/message/index.js | 26 ++++++++++++++++++++++++--
pages/message/index.wxss | 2 +-
subPage/todayBill/index.js | 41 ++++++++++++++++++++++++++++++++---------
subPage/todayBill/index.wxml | 6 +++---
7 files changed, 63 insertions(+), 15 deletions(-)
create mode 100644 assets/images/baoming.svg
create mode 100644 assets/images/fadan.svg
create mode 100644 assets/images/zhangdan.svg
diff --git a/assets/images/baoming.svg b/assets/images/baoming.svg
new file mode 100644
index 0000000..6b076f2
--- /dev/null
+++ b/assets/images/baoming.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/images/fadan.svg b/assets/images/fadan.svg
new file mode 100644
index 0000000..83fe796
--- /dev/null
+++ b/assets/images/fadan.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/images/zhangdan.svg b/assets/images/zhangdan.svg
new file mode 100644
index 0000000..512c093
--- /dev/null
+++ b/assets/images/zhangdan.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages/message/index.js b/pages/message/index.js
index fb883c0..fc93aa9 100644
--- a/pages/message/index.js
+++ b/pages/message/index.js
@@ -20,13 +20,35 @@ Page({
img: '../../assets/images/ptxx.svg',
content: '新春祝福与品牌升级...',
time: '下午 2:30',
- }, {
- title: '每日发单',
+ },
+ {
+ title: '每日发单',
url: '/subPage/todayBill/index',
img: '../../assets/images/mrfd.svg',
content: '按偏好订阅每日接收推送',
time: '下午 1:30',
},
+ {
+ title: '发单助手',
+ url: '/subPage/todayBill/index',
+ img: '../../assets/images/fadan.svg',
+ content: '按偏好订阅每日接收推送',
+ time: '下午 1:30',
+ },
+ {
+ title: '报名助手',
+ url: '/subPage/todayBill/index',
+ img: '../../assets/images/baoming.svg',
+ content: '按偏好订阅每日接收推送',
+ time: '下午 1:30',
+ },
+ {
+ title: '账单助手',
+ url: '/subPage/todayBill/index',
+ img: '../../assets/images/zhangdan.svg',
+ content: '按偏好订阅每日接收推送',
+ time: '下午 1:30',
+ },
]
},
diff --git a/pages/message/index.wxss b/pages/message/index.wxss
index d2b81d4..8aee7ac 100644
--- a/pages/message/index.wxss
+++ b/pages/message/index.wxss
@@ -5,7 +5,7 @@
.noticImg{
width: 48px;
height: 48px;
- border-radius: 8px;
+ border-radius: 12px;
}
.sub{
padding: 12px;
diff --git a/subPage/todayBill/index.js b/subPage/todayBill/index.js
index 12329d2..ff998d2 100644
--- a/subPage/todayBill/index.js
+++ b/subPage/todayBill/index.js
@@ -1,5 +1,8 @@
// subPage/todayBill/index.js
const app = getApp()
+import {
+ customRequest
+} from '../../utils/request.js'
Page({
/**
@@ -93,7 +96,8 @@ Page({
点击：#小程序：伯才供应链
点击：#小程序：伯才供应链
点击：#小程序：伯才供应链`,
- textShow: ''
+ textShow: '',
+ noticList: []
},
/**
@@ -121,9 +125,32 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow () {
-
+ this.getNoticList()
+ },
+ getNoticList () {
+ customRequest("/yicai/bocai/cms/getNotice", {
+ header: 'headers',
+ method: 'GET',
+ }).then((res) => {
+ console.log(res);
+ let list = res.data.data
+ list = list.map(item => {
+ return {
+ text: item,
+ textShow: item.replace(/\*\*\*\*\*/g, "")
+ .replace(/\[红包\]/g, `
`)
+ .replace(/\[太阳\]/g, `
`)
+ .replace(/\[爱心\]/g, `
`)
+ .replace(/\[注意\]/g, `
`)
+ .replace(/⚠/g, ``)
+ }
+ });
+ console.log('list', list);
+ this.setData({
+ noticList: list
+ })
+ })
},
-
/**
* 生命周期函数--监听页面隐藏
*/
@@ -160,13 +187,9 @@ Page({
});
},
copyInfo (e) {
+ let val = e.currentTarget.dataset.info;
app.vibrateShort()
- // wx.setClipboardData({
- // data: this.data.text,
- // success (res) {
- // },
- // });
- app.copyFun(this.data.text, () => {
+ app.copyFun(val.text, () => {
console.log(123123);
})
diff --git a/subPage/todayBill/index.wxml b/subPage/todayBill/index.wxml
index 1b982f9..7d37030 100644
--- a/subPage/todayBill/index.wxml
+++ b/subPage/todayBill/index.wxml
@@ -1,8 +1,8 @@
-
- {{item == 0 ? '今天' :( item == 1 ? '昨天' : item == 2 ? '前天' : '2025-3-3')}} 15:3{{item + 1}}
+
+ {{'今天'}} 08:3{{index + 1}}
@@ -12,7 +12,7 @@
-
+