diff --git a/api/system/config.js b/api/system/config.js
index fb5c06c..cb4553d 100644
--- a/api/system/config.js
+++ b/api/system/config.js
@@ -3,26 +3,35 @@ import request from '@/utils/request'
// 查询站点配置
export function getSiteConfig(params) {
- return request({
- url: '/base/config/getConfigByCode',
- method: 'get',
- params:params
- })
+ return request({
+ url: '/base/config/getConfigByCode',
+ method: 'get',
+ params: params
+ })
}
// 根据code查分类值列表
export function getCatgByCode(params) {
- return request({
- url: '/base/category/listByCode',
- method: 'get',
- params:params
- })
+ return request({
+ url: '/base/category/listByCode',
+ method: 'get',
+ params: params
+ })
}
// 根据code查分类值列表
export function uniListByParentCode(params) {
- return request({
- url: '/base/category/uniListByParentCode',
- method: 'get',
- params:params
- })
+ return request({
+ url: '/base/category/uniListByParentCode',
+ method: 'get',
+ params: params
+ })
}
+
+// 根据code查分类值列表
+export function getByCodeInfo(params) {
+ return request({
+ url: '/base/category/getByCodeInfo',
+ method: 'get',
+ params: params
+ })
+}
\ No newline at end of file
diff --git a/config.js b/config.js
index 1727f9b..7f026d3 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
// 应用全局配置
module.exports = {
- //baseUrl: 'https://notice.lighting-it.cn',
// baseUrl: 'https://www.ddtg.site/noticeApi',
- baseUrl: 'http://192.168.1.4:8099',
+ // baseUrl: 'https://www.ddtg.site/noticeApi',
+ baseUrl: 'http://192.168.1.17:8099',
// 应用信息
appInfo: {
// 应用名称
diff --git a/pages/components/my-notice-item-tg.vue b/pages/components/my-notice-item-tg.vue
index aded025..c0e2d20 100644
--- a/pages/components/my-notice-item-tg.vue
+++ b/pages/components/my-notice-item-tg.vue
@@ -16,7 +16,7 @@
重启
查看详情
发类似
- 评价(demo)
+ 评价(demo)
@@ -46,9 +46,9 @@
publish(item) {
this.$tab.navigateTo('/pages/notice/public-notice?sameId=' + item.id)
},
- evaluate(){
- this.$tab.navigateTo('/pages/mine/set/evaluate')
- },
+ evaluate() {
+ this.$tab.navigateTo('/pages/mine/set/evaluate')
+ },
updateStatus(status, id) {
let data = {
publishTakeDown: status,
@@ -85,7 +85,7 @@
.my-notice-item-box-tg {
width: 100%;
border-radius: 20rpx;
- padding: 30rpx 20rpx;
+ padding: 10rpx 20rpx 20rpx 20rpx;
background-color: white;
display: flex;
flex-direction: column;
@@ -154,4 +154,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pages/components/my-notice-item.vue b/pages/components/my-notice-item.vue
index a71fd0a..9fee8ff 100644
--- a/pages/components/my-notice-item.vue
+++ b/pages/components/my-notice-item.vue
@@ -105,7 +105,7 @@
.my-notice-item-box {
width: 100%;
border-radius: 20rpx;
- padding: 30rpx 20rpx;
+ padding: 10rpx 20rpx 20rpx 20rpx;
background-color: white;
display: flex;
flex-direction: column;
@@ -175,4 +175,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pages/components/notice-index.vue b/pages/components/notice-index.vue
index 42aa324..08490d2 100644
--- a/pages/components/notice-index.vue
+++ b/pages/components/notice-index.vue
@@ -2,19 +2,20 @@
-
-
-
-
-
-
-
+ 通告
+
+
+
+
+
+
+
-
- 通告
+
@@ -57,7 +58,7 @@
-
+
+
+
+
+
+
+
+ 随手转发上传通告赚零花
+ 每条轻松赚{{point || ''}}积分
+
+
+ 去转发
+
-
{
+ if (res.code == 200 && null != res.data) {
+ this.point = res.data.content
+ }
+ }).catch((e) => {
+ uni.showToast({
+ icon: 'error',
+ duration: 2000,
+ title: e
+ });
+ })
+
+ },
/**
* 初始化数据
* @param {Object} code
@@ -373,6 +411,17 @@
this.menuIndex = index
this.onRefresherrefresh()
},
+ /**
+ * 鉴权
+ */
+ async checkRights() {
+ let res = await hasRights(rightsCode.searchNotice)
+ if (!res) {
+ this.canSearch = false
+ } else {
+ this.canSearch = true
+ }
+ },
/**
* 搜索
*/
@@ -381,7 +430,6 @@
if (!await this.checkIfHasRights(rightsCode.searchNotice)) {
return
}
- this.showSearch = true
},
/**
* 鉴权通用方法
@@ -518,7 +566,7 @@
display: flex;
flex-direction: column;
align-items: center;
- justify-content: center;
+ justify-content: start;
position: relative;
.dl-title {
@@ -526,7 +574,7 @@
display: flex;
position: relative;
z-index: 10;
- padding: 25rpx 10rpx 0 15rpx;
+ padding: 25rpx 10rpx 10rpx 15rpx;
border-bottom: 1px solid #F4F4F4;
@@ -537,24 +585,45 @@
justify-content: left;
position: relative;
- .dl-image {
- width: 40rpx;
- height: 40rpx;
+ .left-search-box {
+ display: flex;
+ align-items: self-start;
+ justify-content: center;
+ position: relative;
+
+ .dl-image {
+ width: 40rpx;
+ height: 40rpx;
+ }
+
+ .dl-vip {
+ position: absolute;
+ height: 20rpx;
+ width: 50rpx;
+ top: 0rpx;
+ right: -10px;
+ }
}
- .dl-vip {
+ .dl-zhezhao {
+ background: transparent;
+ z-index: 99;
position: absolute;
- height: 20rpx;
- top: -10rpx;
- right: -20px;
+ width: 100%;
+ height: 100%;
}
+
}
.right-text {
- transition: 1s;
+ width: 140rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.dl-text {
- font-size: 32rpx;
+ color: #FC1F3E;
+ font-size: 40rpx;
line-height: 78rpx;
font-weight: bold;
}
@@ -576,7 +645,6 @@
.dl-menu {
font-size: 30rpx;
- margin: 0 20rpx;
padding-bottom: 10rpx;
text-align: center;
}
@@ -669,8 +737,69 @@
}
}
+ .dl-public-box {
+ display: flex;
+ align-items: center;
+ border-radius: 35rpx;
+ justify-content: center;
+ height: 130rpx;
+ width: 100%;
+ background: url('/static/index/bg.png');
+ background-size: 100% 100%;
+ background-position: center;
+ /* 图片居中显示 */
+ background-repeat: no-repeat;
+ /* 不重复背景图片 */
+
+ .dl-left {
+ width: 135rpx;
+ display: flex;
+ padding-left: 30rpx;
+ align-items: center;
+ font-size: 30rpx;
+ color: #623109;
+ justify-content: left;
+
+ .dl-icon {
+ width: 80rpx;
+ height: 80rpx;
+
+ }
+ }
+
+ .dl-center {
+ flex: 1;
+ flex-direction: column;
+ display: flex;
+ align-items: self-start;
+ justify-content: center;
+ font-size: 27rpx;
+ color: #363636;
+ font-weight: bold;
+
+ text {
+ color: #FC1F3E;
+ }
+ }
+
+ .dl-right {
+ width: 200rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .dl-opt-dom {
+ font-size: 27rpx;
+ background-color: #FC1F3E;
+ border-radius: 30rpx;
+ color: white;
+ padding: 10rpx 30rpx;
+ }
+ }
+ }
+
.dl-item-box {
- height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 505rpx);
+ height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 555rpx);
isplay: flex;
flex-direction: column;
}
diff --git a/pages/components/notice-item.vue b/pages/components/notice-item.vue
index 59b62e1..9a81648 100644
--- a/pages/components/notice-item.vue
+++ b/pages/components/notice-item.vue
@@ -1,8 +1,10 @@
+ 急招
-
+
+
{{item.title}}
@@ -23,14 +25,14 @@
-
+
{{item.userNickName}}
-
+
{{item.viewNum}}
@@ -138,15 +140,27 @@
.dl-notice-box {
font-size: 29rpx;
width: 100%;
- padding: 18rpx 18rpx 10rpx 18rpx;
+ padding: 30rpx 18rpx 10rpx 18rpx;
background-color: white;
- border-radius: 30rpx;
+ border-radius: 25rpx;
margin-bottom: 20rpx;
+ position: relative;
+
+ .dl-is-urgent {
+ position: absolute;
+ color: white;
+ background-color: #FC1F3E;
+ padding: 6rpx 25rpx;
+ font-size: 24rpx;
+ border-radius: 0 25rpx 0 25rpx;
+ top: 0;
+ right: 0;
+ }
.dl-notice-title {
display: flex;
width: 100%;
- padding-bottom: 10rpx;
+ padding-bottom: 3rpx;
align-items: center;
justify-content: center;
@@ -206,6 +220,7 @@
}
.item-box {
+ flex: 1;
display: flex;
align-items: center;
justify-content: center;
diff --git a/pages/mine/member/member-index.vue b/pages/mine/member/member-index.vue
index 5543a12..f06df35 100644
--- a/pages/mine/member/member-index.vue
+++ b/pages/mine/member/member-index.vue
@@ -5,7 +5,7 @@
-
+
@@ -394,4 +394,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue
index 02f2b21..16372e2 100644
--- a/pages/mine/mine-index.vue
+++ b/pages/mine/mine-index.vue
@@ -12,9 +12,10 @@
-
+
-
+
@@ -26,7 +27,6 @@
{{userInfo.tfansNum||'0'}}
- 会员2025-12-21日到期
@@ -73,17 +73,27 @@
+
+
+
+
+ 会员{{memberEndDate}}日到期
+
+
+ 查看会员
+
+
- 发布通告额度剩余{{userInfo.addNotice||0}}条
+ 发布通告额度剩余{{userInfo.addNotice||0}}条
-
-
-
-
+
+ 获取更多
+
+
@@ -201,7 +211,7 @@
localUserType: this.nowUserType,
globalConfig: getApp().globalData.config,
//是否已开通会员
- ifHasCard: false,
+ ifHasCard: true,
userInfo: {
coupon: 0
},
@@ -212,6 +222,8 @@
customer_service: constant.customer_service,
//弹窗照片
popupImgUrl: "",
+ //会员到期日期
+ memberEndDate: "",
}
},
onShow() {},
@@ -534,6 +546,49 @@
}
}
}
+
+ .dl-member-end-date-box {
+ display: flex;
+ align-items: center;
+ margin-top: 15rpx;
+ border-radius: 35rpx;
+ justify-content: center;
+ height: 90rpx;
+ width: 100%;
+ background-color: white;
+
+ .dl-left {
+ display: flex;
+ flex: 1;
+ padding-left: 30rpx;
+ align-items: center;
+ font-size: 30rpx;
+ color: #623109;
+ justify-content: left;
+
+ .dl-icon {
+ width: 60rpx;
+ height: 56rpx;
+
+ }
+ }
+
+ .dl-right {
+ padding-right: 20rpx;
+
+ .dl-go-view {
+ font-size: 28rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #F5D8A5;
+ color: #623109;
+ padding: 8rpx 25rpx;
+ float: right;
+ border-radius: 30rpx;
+ }
+ }
+ }
}
.has-member-card {
@@ -608,7 +663,7 @@
.public-notice-box {
width: 100%;
- padding: 30rpx;
+ padding: 20rpx 30rpx;
display: flex;
align-items: center;
margin-top: 20rpx;
diff --git a/pages/mine/set/black-list.vue b/pages/mine/set/black-list.vue
index 451edda..a9075bf 100644
--- a/pages/mine/set/black-list.vue
+++ b/pages/mine/set/black-list.vue
@@ -9,7 +9,7 @@
-
+
@@ -255,4 +255,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index 387b721..6ac6f0d 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -26,7 +26,7 @@
+ mode="scaleToFill">
{{userDetail.nickName||''}}
{{userDetail.identityType||''}}
@@ -162,10 +162,10 @@
+ :src="item" mode="scaleToFill">
+ src="@/static/images/profile.jpg" mode="scaleToFill">
@@ -971,4 +971,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/static/index/bg.png b/static/index/bg.png
new file mode 100644
index 0000000..25db338
Binary files /dev/null and b/static/index/bg.png differ
diff --git a/static/index/gift.png b/static/index/gift.png
new file mode 100644
index 0000000..8a9e0d4
Binary files /dev/null and b/static/index/gift.png differ
diff --git a/static/platform/bzhan.png b/static/platform/bzhan.png
index 0265853..e1c3bd5 100644
Binary files a/static/platform/bzhan.png and b/static/platform/bzhan.png differ
diff --git a/static/platform/douyin.png b/static/platform/douyin.png
index 59cb099..80ff3f4 100644
Binary files a/static/platform/douyin.png and b/static/platform/douyin.png differ
diff --git a/static/platform/guangguang.png b/static/platform/guangguang.png
index 48caaf9..1ab2d25 100644
Binary files a/static/platform/guangguang.png and b/static/platform/guangguang.png differ
diff --git a/static/platform/kuaishou.png b/static/platform/kuaishou.png
index 34bd56a..e979b91 100644
Binary files a/static/platform/kuaishou.png and b/static/platform/kuaishou.png differ
diff --git a/static/platform/quanbu.png b/static/platform/quanbu.png
index 5071383..48db246 100644
Binary files a/static/platform/quanbu.png and b/static/platform/quanbu.png differ
diff --git a/static/platform/shipinhao.png b/static/platform/shipinhao.png
index eccd489..02842a3 100644
Binary files a/static/platform/shipinhao.png and b/static/platform/shipinhao.png differ
diff --git a/static/platform/weibo.png b/static/platform/weibo.png
index 6301e27..7d61310 100644
Binary files a/static/platform/weibo.png and b/static/platform/weibo.png differ
diff --git a/static/platform/xiaohongshu.png b/static/platform/xiaohongshu.png
index fb262f8..a0e385a 100644
Binary files a/static/platform/xiaohongshu.png and b/static/platform/xiaohongshu.png differ
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
index c738618..07774b4 100644
--- a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -4,7 +4,7 @@
@click="searchClick">
-
+
-
+
@@ -226,7 +226,7 @@