diff --git a/pages/application/onlinexxks/video_study.vue b/pages/application/onlinexxks/video_study.vue
index 744fc53..01ca02d 100644
--- a/pages/application/onlinexxks/video_study.vue
+++ b/pages/application/onlinexxks/video_study.vue
@@ -514,16 +514,24 @@ export default {
USERNAME: loginUser.NAME,
USER_ID: loginUser.USER_ID,
});
- if (!resData.pd.PORTRAIT) {
- uni.showModal({
- title: "温馨提示",
- confirmText: "确定",
- content: "您当前还未进行人脸认证,请先进行认证",
- });
- } else {
+ if (resData.pd.PORTRAIT) {
uni.navigateTo({
url: '/pages/application/onlinexxks/face/index?params=' + params
})
+ } else {
+ uni.showModal({
+ title: "温馨提示",
+ content: "您当前还未进行人脸认证,请先进行认证",
+ confirmText: "前往人脸认证",
+ cancelText: "确定",
+ success: (res) => {
+ if(res.confirm) {
+ uni.navigateTo({
+ url: `/pages/my/set/set`,
+ });
+ }
+ }
+ });
}
},
fnNavigationExercises(VIDEOCOURSEWARE_ID) {
diff --git a/pages/news/home.vue b/pages/news/home.vue
index 0430798..5bdabd9 100644
--- a/pages/news/home.vue
+++ b/pages/news/home.vue
@@ -41,7 +41,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -75,15 +75,13 @@
- 通知标题:
- {{item.LEVEL}}
+
+ 通知标题:
+ {{item.LEVEL}}
{{item.TITLE}}
-
- 未读
- 已读
-
+
@@ -109,7 +107,7 @@
-
+
@@ -340,9 +338,7 @@
},
//跳转事件
goToDetail(e) {
- uni.navigateTo({
- url: '/pages/news/notice-list-detail?id='+e+'&type=0',
- });
+
},
goToTxDetail(e){
uni.navigateTo({
@@ -350,9 +346,16 @@
});
},
goToPcDetail(e){
- uni.navigateTo({
- url: '/pages/news/news-list-detail?id='+e+'&type=1',
- });
+ console.log(e)
+ if(this.TabCur == 0) {
+ uni.navigateTo({
+ url: '/pages/news/notice-list-detail?id='+e+'&type=0',
+ });
+ }else if(this.TabCur == 1){
+ uni.navigateTo({
+ url: '/pages/news/news-list-detail?id='+e+'&type=1',
+ });
+ }
},
deleteNoticeTx(ID){
var _this = this;
@@ -469,6 +472,15 @@
flex-direction: row;
}
+ .yuan{
+ width: 8px;
+ height: 8px;
+ background: #ff0000;
+ border-radius: 100%;
+ display: inline-block;
+ margin-right: 5px;
+ }
+
.news-media-logo {
width: 90px;
height: 70px;
@@ -519,4 +531,10 @@
font-size: 13px;
color: #8f8f94;
}
+ .red{
+ color: #df4343;
+ }
+ .blue{
+ color: #548de7;
+ }
diff --git a/pages/news/notice-list-detail.vue b/pages/news/notice-list-detail.vue
index 1e8246f..ea11057 100644
--- a/pages/news/notice-list-detail.vue
+++ b/pages/news/notice-list-detail.vue
@@ -16,7 +16,7 @@
-
+
@@ -61,7 +61,7 @@
if("1"==_this.type){
url = basePath + '/app/notice/goEditForPc'
}
- console.log(_this.id)
+ console.log("1111",_this.id)
uni.request({
url:url,
method: 'POST',