diff --git a/app.json b/app.json
index 63c4a17..eb79c82 100644
--- a/app.json
+++ b/app.json
@@ -78,7 +78,8 @@
"waterf": "/components/waterf/index",
"l-calendar": "/miniprogram_npm/lin-ui/calendar/index",
- "l-mask": "/miniprogram_npm/lin-ui/mask/index"
+ "l-mask": "/miniprogram_npm/lin-ui/mask/index",
+ "l-badge": "/miniprogram_npm/lin-ui/badge/index"
},
"style": "v2",
"sitemapLocation": "sitemap.json"
diff --git a/pages/quest/quest.wxss b/pages/quest/quest.wxss
index 125fdfd..4c7c42b 100644
--- a/pages/quest/quest.wxss
+++ b/pages/quest/quest.wxss
@@ -179,7 +179,8 @@
.card_tip1,
.card_model {
- width: 108rpx;
+ /* width: 108rpx; */
+ padding: 0rpx 8rpx;
height: 44rpx;
font-size: 20rpx;
display: flex;
@@ -195,7 +196,7 @@
}
.card_model {
- width: 104rpx;
+ /* width: 104rpx; */
height: 40rpx;
border: 1px solid #FFB17C;
color: #FFB17C;
diff --git a/pages/quest/subpage/detail/components/link/link.js b/pages/quest/subpage/detail/components/link/link.js
index 3191a16..3d14773 100644
--- a/pages/quest/subpage/detail/components/link/link.js
+++ b/pages/quest/subpage/detail/components/link/link.js
@@ -90,6 +90,12 @@ Component({
icon: 'none',
duration: 2000
})
+ } else if (this.data.link.indexOf('http') === -1) {
+ wx.showToast({
+ title: '请输入正确的链接',
+ icon: 'none',
+ duration: 2000
+ })
} else {
http("/video/userAdd", "post", {
id: this.data.data.id,
diff --git a/pages/quest/subpage/detail/image/ic_dsfzh@2x.png b/pages/quest/subpage/detail/image/ic_dsfzh@2x.png
new file mode 100644
index 0000000..fe70b6a
Binary files /dev/null and b/pages/quest/subpage/detail/image/ic_dsfzh@2x.png differ
diff --git a/pages/user/subpage/newRel/newRel.wxml b/pages/user/subpage/newRel/newRel.wxml
index 07c3a95..c9eb33e 100644
--- a/pages/user/subpage/newRel/newRel.wxml
+++ b/pages/user/subpage/newRel/newRel.wxml
@@ -27,7 +27,7 @@
-
+
第三方账号*
diff --git a/pages/user/subpage/system/system.js b/pages/user/subpage/system/system.js
index 3650921..2a72122 100644
--- a/pages/user/subpage/system/system.js
+++ b/pages/user/subpage/system/system.js
@@ -1,5 +1,7 @@
// pages/user/subpage/system/system.js
-import {http} from '../../../../utils/util'
+import {
+ http
+} from '../../../../utils/util'
Page({
/**
@@ -18,7 +20,6 @@ Page({
wx.setNavigationBarTitle({
title: '系统消息',
})
- this.getdata()
},
getdata() {
http("/userMessage/list", "post", {
@@ -27,7 +28,7 @@ Page({
}).then(res => {
let array = res.data.records
for (let index = 0; index < array.length; index++) {
- array[index].createDate = array[index].createDate.replace('T',' ')
+ array[index].createDate = array[index].createDate.replace('T', ' ')
}
this.setData({
list: res.data.records,
@@ -35,9 +36,13 @@ Page({
})
})
},
- to (e) {
- wx.navigateTo({
- url: '/' + e.currentTarget.dataset.url,
+ to(e) {
+ http("/userMessage/read", "post", {
+ id: e.currentTarget.dataset.id
+ }).then(res => {
+ wx.navigateTo({
+ url: '/' + e.currentTarget.dataset.url,
+ })
})
},
/**
@@ -51,7 +56,12 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
-
+ this.setData({
+ list: [],
+ page: 1,
+ max: 0
+ })
+ this.getdata()
},
/**
diff --git a/pages/user/subpage/system/system.wxml b/pages/user/subpage/system/system.wxml
index db750d4..6272c3d 100644
--- a/pages/user/subpage/system/system.wxml
+++ b/pages/user/subpage/system/system.wxml
@@ -3,8 +3,10 @@
-
- {{item.title}}
+
+ {{item.title}}
+
+
{{item.description}}
{{item.createDate}}
diff --git a/pages/user/subpage/system/system.wxss b/pages/user/subpage/system/system.wxss
index 810f2cd..775345d 100644
--- a/pages/user/subpage/system/system.wxss
+++ b/pages/user/subpage/system/system.wxss
@@ -21,6 +21,9 @@
color: #333333;
line-height: 28rpx;
margin-bottom: 16rpx;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
}
.text {
@@ -38,4 +41,12 @@
font-weight: 400;
color: #999999;
line-height: 20rpx;
+}
+
+.dot{
+ background-color: red;
+ height: 14rpx;
+ width: 14rpx;
+ border-radius: 50%;
+ margin-left: 10rpx;
}
\ No newline at end of file