测试修改

api/mine/report.js

@@ -67,6 +67,7 @@ export function getBonusListFn(data) {
   return request({
     'url': '/zxBonus/bonus/list',
     'method': 'get',
+	'data':data
   })
 }
 // 履历加分-详情zxBonus:bonus:query

pages/index/index.vue

@@ -47,7 +47,29 @@
 					<block v-if="checkPermi(['zxNotice:notice:list'])">
 						<h-notice :noticelist="noticelist" :autoplay='autoplay' @getNoticeDet="getNoticeDet"></h-notice>
 					</block>
-					
+					<!-- 提案办理 -->
+					<view class="flexcw blbox">
+						<view class="htbox" @click="handleTotabl" v-if="checkPermi(['proposalInfo:info:unitList','sqmyInfo:info:unitList'])">
+							<image :src="kricob" class="hrbg"></image>
+							<view class="htboxa flexc">
+								<view class="flex1 mr10">
+									<view class="tit">提案/社情办理</view>
+									<view class="txt">提案、社情单位办理</view>
+								</view>
+								<!-- <image :src="hrimgc" class="flex0 imgc"></image> -->
+							</view>
+						</view>
+						<view class="htbox" @click="handleTocu" v-if="checkPermi(['zxUrge:urge:list'])">
+							<image :src="kricoa" class="hrbg"></image>
+							<view class="htboxa flexc">
+								<view class="flex1 mr10">
+									<view class="tit">催办信息</view>
+									<view class="txt">了解催办信息</view>
+								</view>
+								<!-- <image :src="hrimgd" class="flex0 imgd"></image> -->
+							</view>
+						</view>
+					</view>
 					<!-- 入口 -->
 					<view class="mt22">
 						<view class="htit">快捷入口</view>
@@ -93,7 +115,7 @@
 								</view>
 							</view>
 							
-							<view class="htbox" @click="handleTotabl" v-if="checkPermi(['proposalInfo:info:unitList','sqmyInfo:info:unitList'])">
+							<!-- <view class="htbox" @click="handleTotabl" v-if="checkPermi(['proposalInfo:info:unitList','sqmyInfo:info:unitList'])">
 								<image :src="hrbgc" class="hrbg"></image>
 								<view class="htboxa flexc">
 									<view class="flex1 mr10">
@@ -112,7 +134,7 @@
 									</view>
 									<image :src="hrimgd" class="flex0 imgd"></image>
 								</view>
-							</view>
+							</view> -->
 						</view>
 					</view>
 					
@@ -187,6 +209,8 @@
 			hrimgb:require("@/static/images/home/hrimgb.png"),
 			hrimgc:require("@/static/images/home/hrimgc.png"),
 			hrimgd:require("@/static/images/home/hrimgd.png"),
+			kricoa:require("@/static/images/home/kricoa.png"),
+			kricob:require("@/static/images/home/kricob.png"),
 			upimg:require("@/static/images/home/up.png"),
 			tabval:1,
 			tabList:[{tit:'公开提案',val:1,limit:'proposalInfo:info:list'},{tit:'社情民意',val:2,limit:'sqmyInfo:info:list'},],
@@ -525,6 +549,13 @@
 					.imgd{width: 70rpx;height: 56rpx;}
 				}
 			}
+			.blbox{margin-top: 38rpx;
+				.htbox{width: 340rpx;height: 150rpx;background: #FFFFFF;box-shadow: 0px 0px 30rpx 0px #DADADA;border-radius: 10rpx;margin-bottom: 0;
+					.htboxa{padding: 0 24rpx;
+						.txt{color: #959595;}
+					}
+				}
+			}
 			
 		}
 	}

pages/notice/index.vue

@@ -56,6 +56,13 @@
 			this.getDataFn()
 		})
 	},
+	// 上拉触底加载更多触发事件
+	onReachBottom() {
+		if (this.reachflag) {
+			this.pageNum++
+			this.getDataFn()
+		}
+	},
     methods: {
 		checkPermi, checkRole,
 		getClose(){

work/components/popup/popup.vue

@@ -798,26 +798,75 @@
 				
 			},
 			getcodeDown(){
+				var imgurl=baseUrl+this.codeQr;
 				// #ifdef H5
+				uni.downloadFile({
+					url: imgurl,//文件的下载路径
+					success(result) {
+							uni.hideLoading()
+						var filePath = result.tempFilePath;
+						   uni.openDocument({
+						     filePath: filePath,
+						     showMenu: true,
+						     success: function (res) {
+						       // console.log('打开文档成功');
+						     }
+						   });
+					},
+					fail(res) {uni.hideLoading()}
+				})
+				// let saveimg = document.getElementById('saveImgH5');
+				// if(saveimg){
+				// 	saveimg.removeChild(saveimg.childNodes[0]);
+				// }else{
+				// 	let alink = document.createElement("a");
+				// 	alink.id = 'saveImgH5';
+				// 	alink.href = imgurl;
+				// 	alink.download = "pic"; //图片名
+				// 	alink.click();
+				// }
 				// 将base64格式的图片转换成Blob对象
-				  var arr = this.yycode.split(","),
-				    mime = arr[0].match(/:(.*?);/)[1],
-				    bstr = atob(arr[1]),
-				    n = bstr.length,
-				    u8arr = new Uint8Array(n);
-				  while (n--) {
-				    u8arr[n] = bstr.charCodeAt(n);
-				  }
-				  // 将Blob对象转换成文件并下载到本地
-				  var blob = new Blob([u8arr], {
-				    type: mime
-				  });
-				  var a = document.createElement('a');
-				  a.download = 'qrcode';
-				  a.href = URL.createObjectURL(blob);
-				  a.click();
+				  // var arr = imgurl.split(","),
+				  //   mime = arr[0].match(/:(.*?);/)[1],
+				  //   bstr = atob(arr[1]),
+				  //   n = bstr.length,
+				  //   u8arr = new Uint8Array(n);
+				  // while (n--) {
+				  //   u8arr[n] = bstr.charCodeAt(n);
+				  // }
+				  // // 将Blob对象转换成文件并下载到本地
+				  // var blob = new Blob([u8arr], {
+				  //   type: mime
+				  // });
+				  // var a = document.createElement('a');
+				  // a.download = 'qrcode';
+				  // a.href = URL.createObjectURL(blob);
+				  // a.click();
 				// #endif
-				// #ifndef H5
+				// #ifdef APP-PLUS
+					uni.downloadFile({
+						url: imgurl, //仅为示例，并非真实的资源
+						success: (res) => {
+							var filePath=res.tempFilePath;
+							if (res.statusCode === 200) {
+								uni.saveImageToPhotosAlbum({
+								    filePath: filePath,
+								    success: function(res2) {
+								        uni.showToast({
+								            title: '已保存至相册',
+								            icon:"none",
+								            duration:2000
+								        } )
+								    },
+								    fail: function(err) {
+								        // console.log(err.errMsg);
+								    }
+								})
+							}
+						}
+					});
+				// #endif
+				// #ifdef MP-WEIXIN
 				uni.getSetting({//获取用户的当前设置
 				    success:(res)=> {
 				        if(res.authSetting['scope.writePhotosAlbum']){//验证用户是否授权可以访问相册
@@ -848,9 +897,10 @@
 				})
 				// #endif
 				
+				
 			},
 			saveImageToPhotosAlbum(){
-			    let base64=this.yycode.replace(/^data:image\/\w+;base64,/, "");//去掉data:image/png;base64,
+			    let base64=(baseUrl+this.codeQr).replace(/^data:image\/\w+;base64,/, "");//去掉data:image/png;base64,
 			    let filePath=wx.env.USER_DATA_PATH + '/qrcode.png';
 			    uni.getFileSystemManager().writeFile({
 			        filePath:filePath ,  //创建一个临时文件名

work/pages/case/details.vue

@@ -189,8 +189,8 @@
 				<view class="btn btn2" @click="getScfkFn('jbsh')" v-if="checkPermi(['proposalInfo:info:assignsh'])&&progress==5">交办审核</view>
 				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['proposal:unit:reply'])&&progress==3&&hflist[0].isReply!=0">单位答复</view>
 				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['proposalInfo:info:cbdwdfwy'])&&progress==7">单位答复委员</view>
-				<view class="btn btn2" @click="getScfkFn('wymyfk')" v-if="checkPermi(['proposalInfo:info:idea'])&&progress==8">办结审核</view>
-				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['proposalInfo:info:zxIdea'])&&progress==8">办结审核</view>
+				<view class="btn btn2" @click="getScfkFn('wymyfk')" v-if="checkPermi(['proposalInfo:info:idea'])&&progress==8">委员意见</view>
+				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['proposalInfo:info:zxIdea'])&&progress==8">政协意见</view>
 				<!-- 提案办理进来的 协办单位 不考虑进度 -->
 				<!-- 联名提案反对同意 从联名提案进来的才有按钮-->
 				<view class="btn btn3" @click="getlmtaFn('lmta',2)" v-if="checkPermi(['proposal:user:verify'])&&from=='lmta'">反对联名</view>

work/pages/case/mine.vue

@@ -98,7 +98,7 @@
 				tabtype:'',//进度查询
 				// {tit:'征集通知',val:0}, 提案催办 目前看所有
 				tabList:[
-					{tit:'全部',val:'qb',limit:'proposalInfo:info:list'},
+					{tit:'提案列表',val:'qb',limit:'proposalInfo:info:list'},
 					{tit:'提案审查',jd:1,val:'tasc',limit:'proposalInfo:info:isRecord'},
 					{tit:'提案交办',jd:2,val:'tajb',limit:"proposalInfo:info:assign"},
 					// {tit:'提案办理',val:'tabl',limit:'proposalInfo:info:unitList'},

work/pages/meeting/details.vue

@@ -49,7 +49,7 @@
 				<view class="btn btn3" @click="getDelFn" v-if="checkPermi(['zxConference:conference:remove'])">删除</view>
 				<block v-if="type=='hytz'&&checkPermi(['zxConference:conference:updateReply'])">
 					<view class="btn btn2" @click="getScfkFn('chdf')" v-if="!dfinfo.isJoin">会议答复</view>
-					<view class="btn btn2" @click="getqdFn" v-if="dfinfo.isJoin&&!dfinfo.signIn">签到</view>
+					<view class="btn btn2" @click="getqdFn" v-if="dfinfo.isJoin=='Y'&&!dfinfo.signIn">签到</view>
 				</block>
 				
 				<!-- <view class="btn btn2" @click="getScfkFn('chdf')" v-if="checkPermi(['zxConference:conference:updateReply'])&&type=='hyhd'">会议答复</view> -->

work/pages/meeting/list.vue

@@ -49,11 +49,11 @@
 		<view class="mbox">
 			<meet-list :datalist="list" :wtdt="wtdt" :hdlxlist="hdlxlist" :fylxlist='fylxlist' :qjlxlist="aqjlxlist"  :type='tabidx' @getDetail="getDetail" @getReadFn="getReadFn" @getTuiFn="getTuiFn"></meet-list>
 		</view>
-		<view v-if="checkPermi(['zxConference:conference:add'])&&tabidx=='hyhd'||checkPermi(['zx:speak:add'])&&tabidx=='wdfy'||checkPermi(['zxActivity:activity:add'])&&tabidx=='hdtz'">
+		<view v-if="checkPermi(['zxConference:conference:add'])&&tabidx=='hyhd'||checkPermi(['zx:speak:add'])&&tabidx=='wdfy'||checkPermi(['zxActivity:activity:add'])&&tabidx=='zxhd'">
 			<view style="height: 100rpx;"></view>
 			<view class="fwbtns" @click="getAddMeet" v-if="checkPermi(['zxConference:conference:add'])&&tabidx=='hyhd'">创建会议</view>
 			<view class="fwbtns" @click="getAddSpeak" v-if="checkPermi(['zx:speak:add'])&&tabidx=='wdfy'">录入发言</view>
-			<view class="fwbtns" @click="getAddActive" v-if="checkPermi(['zxActivity:activity:add'])&&tabidx=='hdtz'">创建活动</view>
+			<view class="fwbtns" @click="getAddActive" v-if="checkPermi(['zxActivity:activity:add'])&&tabidx=='zxhd'">创建活动</view>
 			<!--  -->
 		</view>
 		

work/pages/meeting/readdetail.vue

@@ -145,7 +145,7 @@
 					userName:this.title
 				}
 				var type=this.tabidx;
-				if(type=='hdtz'){
+				if(type=='zxhd'){
 					params.activityId=this.id
 					getzxActivityPeoFn(params).then(res=>{
 						if(res.code==200){

work/pages/report/info.vue

@@ -35,7 +35,7 @@
 						</picker>
 						<image :src="upimg" class="upimg"></image>
 					</view>
-					<view class="lbtabp">
+					<view class="lbtabp" v-if="tabidx!='jfju'">
 						<picker  range-key='label'  :range="dplist"  @change='bindDateChangeb'>
 							<view :class="dptxt?'':'f16 co80'">{{dptxt || '选择党派'}}</view>
 						</picker>

work/pages/sqmyInfo/details.vue

@@ -191,10 +191,10 @@
 				<view class="btn btn2" @click="getScfkFn('tajb')" v-if="checkPermi(['sqmyInfo:info:assign'])&&progress==2">提案交办</view>
 				<view class="btn btn2" @click="getScfkFn('dffk')" v-if="checkPermi(['sqmy:unit:reply'])&&(progress==4||progress==6)">答复反馈</view>
 				<view class="btn btn2" @click="getScfkFn('jbsh')" v-if="checkPermi(['sqmyInfo:info:assignsh'])&&progress==5">交办审核</view>
-				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['sqmy:unit:reply'])&&progress==3&&hflist[0].isReply!=0">答复反馈</view>
+				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['sqmy:unit:reply'])&&progress==3&&hflist[0].isReply!=0">单位答复</view>
 				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['sqmyInfo:info:cbdwdfwy'])&&progress==7">单位答复委员</view>
-				<view class="btn btn2" @click="getScfkFn('wymyfk')" v-if="checkPermi(['sqmyInfo:info:idea'])&&progress==8">办结审核</view>
-				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['sqmyInfo:info:zxIdea'])&&progress==8">办结审核</view>
+				<view class="btn btn2" @click="getScfkFn('wymyfk')" v-if="checkPermi(['sqmyInfo:info:idea'])&&progress==8">委员意见</view>
+				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['sqmyInfo:info:zxIdea'])&&progress==8">政协意见</view>
 				
 				<!--委员答复填内容，委员填满意度 -->
 				<!--协办单位，主办单位 填办理方式，办理程度，内容 附件 -->

work/pages/sqmyInfo/mine.vue

@@ -107,7 +107,7 @@
 				tabidx:'qb',
 				tabtype:'',//进度查询
 				// {tit:'征集通知',val:0}, 提案催办 目前看所有{tit:'上网社情民意',val:'swsqmy',},
-				tabList:[{tit:'全部',val:'qb',limit:'sqmyInfo:info:list'},
+				tabList:[{tit:'民意列表',val:'qb',limit:'sqmyInfo:info:list'},
 				{tit:'信息审核',jd:1,val:'xxsh',limit:'sqmyInfo:info:isRecord'},
 				{tit:'信息交办',jd:2,val:'xxjb',limit:'sqmyInfo:info:assign'},
 				// {tit:'信息办理',val:'xxbl',limit:'sqmyInfo:info:unitList'},