代办完成

manifest.json

@@ -2,8 +2,8 @@
     "name" : "皖源融资担保",
     "appid" : "__UNI__FA20DEF",
     "description" : "",
-    "versionName" : "1.2.7",
-    "versionCode" : 127,
+    "versionName" : "1.2.9",
+    "versionCode" : 129,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/index/index.vue

@@ -623,6 +623,7 @@
 				pageSize:this.pageSize,
 				pageNum: this.pageNum,
 				userId:this.userId,
+				isRead:'N'
 			}
 			if(!this.allflag){
 				params.remindType=this.tabval

pages/index/notice.vue

@@ -12,7 +12,7 @@
 				</picker> -->
 				<picker range-key='label' :value="ydidx" :range="ydztlist"  @change='bindDateChangeb'>
 					<view class="chekt">
-						<view>{{ydzt || "阅读状态"}}</view>
+						<view>{{ydzt || "完成状态"}}</view>
 						<image :src="upimg"></image>
 					</view>
 				</picker>
@@ -51,10 +51,10 @@
 				reachflag: true,
 				wtdt:'',
 				tzsj:'',//通知时间
-				ydidx:0,
-				ydzt:'',
+				ydidx:1,
+				ydzt:'否',
 				ydztlist:[],//阅读状态
-				isRead:'',
+				isRead:'N',
 				userId:this.$store.state.user.userId,
 			}
 		},
@@ -84,8 +84,8 @@
 		methods:{
 			checkPermi, checkRole,
 			init(){
-				// 阅读状态
-				getDictionaryFn('is_read').then(res=>{
+				// is_read阅读状态sys_yes_no
+				getDictionaryFn('sys_yes_no').then(res=>{
 					if(res.code==200){
 						this.ydztlist = res.data.map(v => {
 							return {
@@ -211,7 +211,7 @@
 </script>
 
 <style lang="scss" scoped>
-.notice /deep/	uni-picker{flex: 1;}
+.notice /deep/	uni-picker{flex: 0 0 auto;min-width: 300rpx;}
 
 .checkbox{
 	&.scbg{background-color: #FFFFFF;}
@@ -220,7 +220,7 @@
 		image{width: 16rpx;height: 12rpx;flex: 0 0 auto;margin-left: 4rpx;}
 	}
 }
-.reset{width:56rpx; height: 88rpx;display: flex;align-items: center;justify-content: center;flex: 1;
+.reset{width:56rpx; height: 88rpx;display: flex;align-items: center;justify-content: center;flex: 0 0 auto;margin-left: 40rpx;
 	image{width: 26rpx;height: 30rpx;}
 }
 </style>

pages/login.vue

@@ -154,7 +154,32 @@
 			this.tabidx=idx;
 			this.loginForm.type=idx;
 		},
-
+		// 极光推送
+		getJGtuifn(){ 
+				var jpushModule = uni.requireNativePlugin("JG-JPush");
+				jpushModule.setLoggerEnable(true);
+				// 初始化函数
+				jpushModule.initJPushService();
+				jpushModule.addConnectEventListener(result=>{
+					let connectEnable = result.connectEnable
+					// console.log("jpush连接", connectEnable)
+				})
+				jpushModule.getRegistrationID(result => {
+					// console.log("注册ID.....",result)
+					var registerID = result.registerID;
+					console.log(registerID)
+					if(getToken()){
+						var params={
+							jgId:registerID,
+						}
+						updateUserProfile(params).then(res=>{
+							if(res.code==200){
+								console.log(res,9)
+							}
+						})
+					}	
+				})
+		},
 		// 获取图形验证码
 		getCode() {
 		  getCodeImg().then(res => {
@@ -237,7 +262,6 @@
 					 },1500) 
 				  }
 				  
-		 		  
 		     
 		   }).catch((error) => {
 		    setTimeout(function(){
@@ -334,6 +358,7 @@
 		   // 设置用户信息
 		   var that=this;
 		   // #ifdef APP-PLUS
+		   this.getJGtuifn() 
 		   // this.getRegistrationID()
 		   // #endif
 		   this.$store.dispatch('GetInfo').then(res => {

utils/common.js

@@ -247,7 +247,7 @@ export function uploadmore(api, filePaths, successUp, failUp, i, length, files,
 			i++;
 			if (i == length) {
 				uni.showToast({
-					title: '总共' + successUp + '张上传成功,' + failUp + '张上传失败！',
+					title: '上传成功',
 					icon: 'none',
 					duration: 2000
 				});

work/pages/business/details.vue

@@ -148,8 +148,8 @@
 					<view class="fbtns bgd" @click="getMoreFn('cjbh')">出具</view>
 				</template>
 				<template v-else>
-					<!-- a角色，管理员和可以全程修改 -->
-					<view class="fbtns bge" v-if="checkPermi(['system:application:edit'])&&(userId==datainfo.aUserId&&stepval>2||checkPermi(['*:*:*']))" @click="getedit">修改</view>
+					<!-- a角色和可以全程修改checkPermi(['system:application:edit'])&& ||checkPermi(['*:*:*'])-->
+					<view class="fbtns bge" v-if="checkPermi(['system:application:qued'])&&(stepval<3||userId==datainfo.aUserId&&stepval>2)" @click="getedit">修改</view>
 					<view class="fbtns bgc" v-if="checkPermi(['system:application:remove'])&&stepval<3" @click="getDel">删除</view>
 					<!-- 申诉状态除了修改，都不给 -->
 					<block v-if="datainfo.auditType!=4&&checkPermi(['system:application:sh'])&&datainfo.loanApplicationType==2">