pages/application/onlinexxks/video_study.vue

@@ -514,24 +514,16 @@ export default {
         USERNAME: loginUser.NAME,
         USER_ID: loginUser.USER_ID,
       });
-      if (resData.pd.PORTRAIT) {
+      if (!resData.pd.PORTRAIT) {
+        uni.showModal({
+          title: "温馨提示",
+          confirmText: "确定",
+          content: "您当前还未进行人脸认证，请先进行认证",
+        });
+      } else {
         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) {

pages/login/register/apply.vue

@@ -20,19 +20,11 @@
         </view>
         <view class="cu-form-group margin-top-xs">
           <view class="title is-required">人员类型</view>
-          <zqs-select
+          <picker @change="pickerChangeData($event,'PERSONNEL_TYPE')" disabled :value="dictData.PERSONNEL_TYPE.index" :range="dictData.PERSONNEL_TYPE.list" range-key="NAME">
-              :multiple="true"
+            <view class="picker" style="color: #cccccc">
-              :list="dictData.PERSONNEL_TYPE.list"
+              {{formData.PERSONNEL_TYPE.join()}}
-              :show-search="false"
+            </view>
-              v-model="formData.PERSONNEL_TYPE"
+          </picker>
-              disabled
-              label-key="NAME"
-              value-key="DICTIONARIES_ID"
-              placeholder="请选择人员类型"
-              title="选择人员类型"
-              clearable
-              @change="changeSelect($event, 'PERSONNEL_TYPE')"
-          ></zqs-select>
         </view>
 
         <!-- 入职申请 -->

pages/login/register/certificate.vue

@@ -606,7 +606,7 @@ export default {
     },
     validateData() {
       // 身份证
-      if (!this.fileData.idCardFront) {
+      if (!this.formData.ID_CARD_FRONT) {
         uni.showToast({
           icon: 'none',
           title: '请上传身份证（正面）',
@@ -614,7 +614,7 @@ export default {
         });
         return false;
       }
-      if (!this.fileData.idCardBack) {
+      if (!this.formData.ID_CARD_BACK) {
         uni.showToast({
           icon: 'none',
           title: '请上传身份证（反面）',

pages/login/register/index.vue

@@ -337,6 +337,7 @@
           });
           return false;
         }
+
         // 身份证
         if (this.fileData.idCardFront.length < 1) {
           uni.showToast({

pages/news/home.vue

@@ -41,7 +41,7 @@
 			<scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
 				<view v-if="list.length>0" >
 					<view class="news-list">
-            <view class="news-item" v-for="item in list" :key="item.NOTICE_ID" @click="$noMultipleClicks(goToPcDetail, item.NOTICE_ID)">
+            <view class="news-item" v-for="item in list" :key="item.NOTIFICATION_ID" @click="$noMultipleClicks(goToPcDetail, item.NOTIFICATION_ID)">
 							<view class="news-media-list">
 								<view class="news-media-body">
 									<view class="news-media-title">
@@ -66,7 +66,7 @@
 				<view class="cu-tabbar-height"></view>
 			</scroll-view>
 		</block>
-		<block v-else-if="TabCur==1">
+		<block v-if="TabCur==1">
 			<scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
 				<view v-if="pclist.length>0" >
 					<view class="news-list">
@@ -75,13 +75,15 @@
 								<view class="news-media-body">
 									<view @click="$noMultipleClicks(goToPcDetail,item.NOTIFICATION_ID)">
                     <view class="dy-title-flex">
-
+                      <text>通知标题：</text>
-                      <text>  <view class="yuan" v-if="!item.TYPE == '1'"></view> 通知标题：</text>
+                      <text class="bg-red light cu-tag radius">{{item.LEVEL}}</text>
-                      <text class="light red  blue ">{{item.LEVEL}}</text>
                     </view>
                     <view>
                       <text>{{item.TITLE}}</text>
-
+                      <text class="bg-red light cu-tag bg-green radius" style="float:right; height:40upx;">
+                        <template v-if="item.TYPE=='0'">未读</template>
+                        <template v-else-if="item.TYPE=='1'">已读</template>
+                      </text>
                     </view>
 
 									</view>
@@ -107,7 +109,7 @@
 				<view class="cu-tabbar-height"></view>
 			</scroll-view>
 		</block>
-    <block v-else-if="TabCur==2">
+    <block v-if="TabCur==2">
       <scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
         <view v-if="txlist.length>0" >
           <view class="news-list">
@@ -338,7 +340,9 @@
       },
 			//跳转事件
 			goToDetail(e) {
-
+				uni.navigateTo({
+					url: '/pages/news/notice-list-detail?id='+e+'&type=0',
+				});
 			},
       goToTxDetail(e){
         uni.navigateTo({
@@ -346,16 +350,9 @@
         });
       },
 			goToPcDetail(e){
-        console.log(e)
+				uni.navigateTo({
-        if(this.TabCur == 0) {
+					url: '/pages/news/news-list-detail?id='+e+'&type=1',
-          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;
@@ -472,15 +469,6 @@
 		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;
@@ -531,10 +519,4 @@
 		font-size: 13px;
 		color: #8f8f94;
 	}
-  .red{
-    color: #df4343;
-  }
-  .blue{
-    color: #548de7;
-  }
 </style>

pages/news/notice-list-detail.vue

@@ -16,7 +16,7 @@
 				<view class="content">
 					<rich-text :nodes="content"></rich-text>
 				</view>
-				<view class="message-warp"  v-if="pd.FILEPATH">
+				<view class="message-warp" v-if="pd.FILEPATH">
 					<view class="cu-item" @click="$noMultipleClicks(goStuToOpen,pd.FILEPATH)">
 						<view class="content">
 							<text class="cuIcon-read text-blue"></text>
@@ -61,7 +61,7 @@
 				if("1"==_this.type){
 					url =  basePath + '/app/notice/goEditForPc'
 				}
-				console.log("1111",_this.id)
+				console.log(_this.id)
 				uni.request({
 					url:url,
 					method: 'POST',