样式修改

manifest.json

@@ -2,8 +2,8 @@
     "name" : "政协",
     "appid" : "__UNI__FF95F38",
     "description" : "",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/index/index.vue

@@ -159,7 +159,7 @@
 				<notice-list :datalist="list" :wtdt="wtdt" :tajdlist="tajdlist" :ztlxlist="ztlxlist" :type='tabval' @getDetail="getDetail"></notice-list>
 				<view class="upmore flexccc" @click="getMoreFn" v-if="reachflag">
 					<image :src="upimg"></image>
-					<view>下拉更多</view>
+					<view>加载更多</view>
 				</view>
 			</view>
 		</view>

work/pages/case/details.vue

@@ -518,20 +518,32 @@
 				if(sh==2){
 					str='反对'
 				}
-				var params={
-					proposalId:this.id,
-					isAgree:sh,
-				}
-				getUserverifyFn(params).then(res=>{
-					if(res.code==200){
-						this.$toast(str+"联名提案成功");
-						setTimeout(function(){
-							uni.$emit("refreshlist")
-							that.getDetail()
-						},1200)
-						
+				uni.showModal({
+					title: '确认'+str+'联名',
+					content: "是否确认"+str+"联名",
+					cancelText: '取消',
+					confirmText: '确认',
+					success: function(res) {
+						if (res.confirm) {
+							var params={
+								proposalId:that.id,
+								isAgree:sh,
+							}
+							getUserverifyFn(params).then(res=>{
+								if(res.code==200){
+									that.$toast(str+"联名提案成功");
+									setTimeout(function(){
+										uni.$emit("refreshlist")
+										that.getDetail()
+									},1200)
+									
+								}
+							})
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
 					}
-				})
+				});	
 			},
 			getScfkFn(type){
 				this.ptype=type

work/pages/meeting/add.vue

@@ -442,7 +442,7 @@ font-size: 30rpx;height: 100%;color: #222327;
 			image{width: 26rpx;height: 26rpx;}
 		}
 	}
-	.peoBox{font-size: 30rpx;color: #AAAAAA;min-height: 200rpx;display: flex;
+	.peoBox{font-size: 30rpx;color: #AAAAAA;min-height: 200rpx;display: flex;flex-wrap: wrap;
 		view{color: #222327;}
 	}
 	// 按钮

work/pages/meeting/addactive.vue

@@ -474,7 +474,7 @@ font-size: 30rpx;height: 100%;color: #222327;
 			image{width: 26rpx;height: 26rpx;}
 		}
 	}
-	.peoBox{font-size: 30rpx;color: #AAAAAA;min-height: 200rpx;display: flex;
+	.peoBox{font-size: 30rpx;color: #AAAAAA;min-height: 200rpx;display: flex;flex-wrap: wrap;
 		view{color: #222327;}
 	}
 	// 按钮

work/pages/meeting/details.vue

@@ -48,7 +48,7 @@
 				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['zxConference:conference:edit'])">修改</view>
 				<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="getScfkFn('chdf')" v-if="!dfinfo.isJoin">参会答复</view>
 					<view class="btn btn2" @click="getqdFn" v-if="dfinfo.isJoin=='Y'&&!dfinfo.signIn">签到</view>
 				</block>
 				

work/pages/meeting/people.vue

@@ -58,9 +58,9 @@
 			<no-data></no-data>
 		</block>
 		<!-- 弹窗 -->
-		<view class="lmtac">
+		<view class="lmtac" :class="upflag?'upbox':''">
 			<view class="flex1 table">
-				<view class="upimg">
+				<view class="upimg" @click="upflag=!upflag">
 					<image :src="upsimg"></image>
 				</view>
 				<view class="flex1" style="overflow-y: auto;">
@@ -127,6 +127,7 @@
 				jbtxt:'',
 				jbidx:'',
 				title:'',
+				upflag:false,
 			}
 		},
 		onLoad(e) {
@@ -333,7 +334,13 @@ font-size: 28rpx;color: #666666;
 // 弹窗
 .lmtac{padding: 0 22rpx 40rpx;box-sizing: border-box;display: flex;flex-direction: column;
 	position: fixed;left: 0;right: 0;bottom: 0;background: #FFFFFF;height:412rpx;
-box-shadow: 0px 12rpx 6rpx 0px #EDEDED;
+box-shadow: 0px 12rpx 6rpx 0px #EDEDED;transition: all 0.3s;
+	&.upbox{
+		height: 100vh;
+		.upimg{
+			image{transform: rotate(180deg);}
+		}
+	}
 	.table{display: flex;flex-direction: column;overflow: hidden;}
 	.upimg{padding: 20rpx;margin: 0 auto 6rpx;width: 64rpx;flex: 0 0 auto;
 		image{width: 24rpx;height: 26rpx;}
@@ -343,7 +350,7 @@ box-shadow: 0px 12rpx 6rpx 0px #EDEDED;
 		display: flex;align-items: flex-start;font-weight: bold;font-size: 30rpx;
 		.laber{color: #222327;flex: 0 0 auto;}
 		.lmame{display: flex;flex-wrap: wrap;flex: 1;
-			.tit{color: #1D64E2;display: flex;align-items: center;margin-right: 20rpx;}
+			.tit{color: #1D64E2;display: flex;align-items: center;margin-right: 32rpx;margin-bottom: 12rpx;}
 			.delimg{
 				width: 40rpx;height: 40rpx;display: flex;align-items: center;justify-content: center;
 				image{width: 26rpx;height: 26rpx;margin-left: 12rpx;}

work/pages/report/info.vue

@@ -41,7 +41,7 @@
 						</picker>
 						<image :src="upimg" class="upimg"></image>
 					</view>
-					<view class="lbtabp" @click="getReafFn" v-if="checkPermi(['member:info:assessmentScore'])">
+					<view class="lbtabp" @click="getReafFn" v-if="checkPermi(['member:info:assessmentScore'])&&tabidx!='jfju'">
 						<image :src="reashimg" class="reashimg"></image>
 						<view :class="dptxt?'':'f16 co80'">刷新排名</view>
 					</view>