代码提交

components/classify-1/classify-1.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="classify-li" v-for="(item, index) in list" :key="index" @click="downLoad(item.link)">
 			<img class="classify-li__img" :src="url+item.imgPath" alt=""></img>
-			<view class="classify-li__text" >
+			<view class="classify-li__text">
 				{{item.text}}
 				<span v-if="item.count > 0 && item.count > 0" class="hs-hzl-app-count count">
 					{{item.count}}
@@ -87,8 +87,8 @@
 		display: flex;
 		justify-content: flex-start;
 		flex-flow: row wrap;
-		padding: 14upx 24upx 8rpx;
-	
+		padding: 14upx;
+
 		.classify-li {
 			flex: 0 0 20%;
 			position: relative;
@@ -101,11 +101,10 @@
 			}
 
 			&__text {
-				font-size: 24upx;
+				font-size: 22upx;
 				display: block;
 				color: #5a5a5a;
 				text-align: center;
-				margin: 8upx 8upx 14upx 0;
 			}
 		}
 	}
@@ -123,8 +122,8 @@
 	}
 
 	.count {
-		bottom: 110rpx;
+		bottom: 85rpx;
 		left: 70rpx;
 		padding: 0px 0 2rpx 2rpx;
 	}
-</style>
+</style>

pageA/club/index.vue

@@ -274,6 +274,7 @@
 				});
 				if (res.code === 200) {
 					this.clubsData = res.data;
+					this.twoTypeActive = 0
 					this.option.page = 1
 					this.option.size = 10
 					this.option.associationsInfoId = this.clubsData[0].id

pageA/login/login.vue

@@ -3,6 +3,7 @@
 		<!-- <view>
 			<web-view src="http://ts.willalp.com:3018/"></web-view>
 		</view> -->
+		<!-- <web-view src="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6a782d1b8d33e376&redirect_uri=https://192.168.0.236:3005/wx/mp&response_type=code&scope=snsapi_base&state=123#wechat_redirect"></web-view> -->
 		<view class="contxent">
 			<!-- 头部logo -->
 			<view class="header">

pageA/msg/userMsgList.vue

@@ -337,6 +337,11 @@
 							this.$goto('../../pageApp/ge/geContract')
 						} else if (res.data[0].examplesId === uni.getStorageSync('use_seal_approval_flow_run_key')) {
 							this.$goto('../../pageApp/ge/geUseSeal')
+						}else if (res.data[0].examplesId === uni.getStorageSync('phone_card_apply_flow_run_key')) {
+							this.$goto('../../pageApp/ge/gePhoneApply')
+						} else if (res.data[0].examplesId === uni.getStorageSync('letter_dispose_flow_run_key')) {
+							console.log("测试")
+							this.$goto('../../pageApp/ge/geLetterDispose')
 						}
 						uni.hideLoading({
 							mask: true

pageApp/components/dictSelect.vue

@@ -48,6 +48,13 @@
 		},
 		mounted() {
 			this.data = uni.getStorageSync(this.dictKey)
+			if (this.value) {
+				for (var i = 0; i < this.data.length; i++) {
+					if (this.data[i].dictValue === this.value) {
+						this.index = i
+					}
+				}
+			}
 		},
 		methods: {
 			bindPickerChange: function(e) {
@@ -76,4 +83,4 @@
 		font-size: 26rpx;
 		color: #b1b1b1;
 	}
-</style>
+</style>

pageApp/components/ge.vue

@@ -382,7 +382,8 @@
 						})
 					}
 					if (this.historyData[this.historyData.length - 1]) {
-						if (!(this.historyData[this.historyData.length - 1].comment === "自动结束") && this.isEnd === 0) {
+						if (!(this.historyData[this.historyData.length - 1].comment === "自动结束") &&
+							!(this.historyData[this.historyData.length - 1].comment === "流程结束") && this.isEnd === 0) {
 							this.list1.push({
 								title: "待审批"
 							})
@@ -423,6 +424,7 @@
 					this.$refs.popup.open(type)
 					return
 				}
+				this.getHouXuanZu()
 				this.nextTitle = '下一步审批人'
 				this.type = type
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性

pageApp/components/input.vue

@@ -32,7 +32,7 @@
 		</uni-row>
 		<view class="desc">
 			<uni-easyinput v-if="model === 'textarea'" type="textarea" primaryColor="#37babd" v-model="val"
-				@input="input" :disabled="disabled">
+				@input="input" :disabled="disabled" :placeholder="placeholder" maxlength="-1">
 			</uni-easyinput>
 		</view>
 		<uni-popup ref="searchPopup" background-color="#fff">
@@ -87,6 +87,10 @@
 				Type: String,
 				default: null
 			},
+			placeholder: {
+				Type: String,
+				default: null
+			},
 			disabled: false
 		},
 		data() {
@@ -104,7 +108,9 @@
 			}
 		},
 		mounted() {
-
+			if(this.value){
+				this.val = this.value
+			}
 		},
 		methods: {
 			input: function(e) {

pageApp/components/photo.vue

@@ -46,6 +46,11 @@
 							extname: res.extname,
 							name: res.fileName
 						})
+						uni.showToast({
+							title: "上传成功",
+							icon: "none",
+							
+						})
 						this.$emit("input", JSON.stringify(this.fileList))
 					}
 				})
@@ -105,4 +110,4 @@
 		font-size: 14px;
 		color: #333;
 	}
-</style>
+</style>

pageApp/ge/geApproval.vue

@@ -431,7 +431,8 @@
 					}
 					if (this.historyData[this.historyData.length - 1]) {
 						if (!(this.historyData[this.historyData.length - 1].comment === "同意并结束") &&
-							!(this.historyData[this.historyData.length - 1].comment === "自动结束")) {
+							!(this.historyData[this.historyData.length - 1].comment === "自动结束") &&
+							!(this.historyData[this.historyData.length - 1].comment === "流程结束")) {
 							this.list1.push({
 								title: "待审批"
 							})
@@ -451,11 +452,11 @@
 					formData: this.data.formData
 				}
 			},
-			passTrue(comment, pass, type) {
+			 passTrue(comment, pass, type) {
 				this.type = type
 				this.dataForm(comment, pass)
 				if (pass !== 'RESULT_CASE_OF' && 2.0 >= parseFloat(this.data.formData.total_time) && this.data.formData
-					.is_lh === '不离沪') {
+					.is_lh === '不离沪' && this.data.formData.is_middle_level_leader === '否') {
 					this.submitPass()
 					return
 				}
@@ -474,6 +475,7 @@
 					this.$refs.popup.open(type)
 					return
 				}
+				this.getNextHouXuanZu()
 				this.nextTitle = '下一步审批人'
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
 				this.$refs.popup.open('bottom')
@@ -617,4 +619,4 @@
 		padding: 15px;
 		flex-direction: row;
 	}
-</style>
+</style>

pageApp/ge/geContract.vue

@@ -43,8 +43,8 @@
 					图片
 				</view>
 				<view style="width: 100%;overflow-x: scroll;white-space: nowrap">
-					<u-upload v-if="data.pageType >= 1 && data.pageType <= 2" :fileList="imgList"
-						multiple width="120" height="120" useBeforeRead="true" disabled="true" uploadIcon="clock">
+					<u-upload v-if="data.pageType >= 1 && data.pageType <= 2" :fileList="imgList" multiple width="120"
+						height="120" useBeforeRead="true" disabled="true" uploadIcon="clock">
 					</u-upload>
 					<u-upload v-if="data.pageType >= 3" :fileList="data.formData.img_list" multiple width="120"
 						height="120" useBeforeRead="true" disabled="true" uploadIcon="clock">
@@ -206,8 +206,8 @@
 				type: 'center',
 				zindeButtion: 1,
 				rejectHistoryData: [],
-				fileList:[],
-				imgList:[]
+				fileList: [],
+				imgList: []
 			}
 		},
 		onLoad() {
@@ -341,7 +341,8 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/pL?taskId='+ this.data.id +'&groupId=' + this.data.baseGroupId + '&baseId=' + this.data.baseId,
+					url: '/app/pL?taskId=' + this.data.id + '&groupId=' + this.data.baseGroupId + '&baseId=' +
+						this.data.baseId,
 					method: 'get'
 				});
 				if (res.code === 200) {
@@ -364,7 +365,8 @@
 					this.list1
 					if (0 != this.historyData.length) {
 						for (var i = 0; i < this.historyData.length; i++) {
-							if (this.historyData[i].comment && this.historyData[i].comment === "自动结束") {
+							if (this.historyData[i].comment && this.historyData[i].comment === "自动结束" ||
+								this.historyData[i].comment === "流程结束") {
 								this.list1.push({
 									title: this.historyData[i].comment,
 									desc: this.historyData[i].createTime
@@ -383,7 +385,8 @@
 					}
 					if (this.historyData[this.historyData.length - 1]) {
 						if (!(this.historyData[this.historyData.length - 1].comment === "同意并结束") &&
-							!(this.historyData[this.historyData.length - 1].comment === "自动结束")) {
+							!(this.historyData[this.historyData.length - 1].comment === "自动结束") &&
+							!(this.historyData[this.historyData.length - 1].comment === "流程结束")) {
 							this.list1.push({
 								title: "待审批"
 							})
@@ -420,6 +423,7 @@
 					this.$refs.popup.open(type)
 					return
 				}
+				this.getHouXuanZu()
 				this.nextTitle = '下一步审批人'
 				this.type = type
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
@@ -456,7 +460,8 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/currentPL?taskId='+ this.data.id +'&groupId=' + this.data.baseGroupId + '&baseId=' + this.data.baseId,
+					url: '/app/currentPL?taskId=' + this.data.id + '&groupId=' + this.data.baseGroupId +
+						'&baseId=' + this.data.baseId,
 					method: 'get'
 				});
 				if (res.code === 200) {
@@ -596,4 +601,4 @@
 		justify-content: space-between;
 		margin-bottom: 10px;
 	}
-</style>
+</style>

pageApp/ge/geEntry.vue

@@ -494,7 +494,8 @@
 					}
 					if (this.historyData[this.historyData.length - 1]) {
 						if (!(this.historyData[this.historyData.length - 1].comment === "同意并结束") &&
-							!(this.historyData[this.historyData.length - 1].comment === "自动结束")) {
+							!(this.historyData[this.historyData.length - 1].comment === "自动结束") &&
+							!(this.historyData[this.historyData.length - 1].comment === "流程结束")) {
 							this.list1.push({
 								title: "待审批"
 							})
@@ -532,6 +533,7 @@
 					this.$refs.popup.open(type)
 					return
 				}
+				this.getHouXuanZu()
 				this.nextTitle = '下一步审批人'
 				this.type = type
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性

pageApp/ge/geNewsApproval.vue

@@ -43,8 +43,8 @@
 					图片
 				</view>
 				<view style="width: 100%;overflow-x: scroll;white-space: nowrap">
-					<u-upload v-if="data.pageType >= 1 && data.pageType <= 2" :fileList="imgList"
-						multiple width="120" height="120" useBeforeRead="true" disabled="true" uploadIcon="clock">
+					<u-upload v-if="data.pageType >= 1 && data.pageType <= 2" :fileList="imgList" multiple width="120"
+						height="120" useBeforeRead="true" disabled="true" uploadIcon="clock">
 					</u-upload>
 					<u-upload v-if="data.pageType >= 3" :fileList="data.formData.img_list" multiple width="120"
 						height="120" useBeforeRead="true" disabled="true" uploadIcon="clock">
@@ -206,8 +206,8 @@
 				type: 'center',
 				zindeButtion: 1,
 				rejectHistoryData: [],
-				fileList:[],
-				imgList:[]
+				fileList: [],
+				imgList: []
 			}
 		},
 		onLoad() {
@@ -341,7 +341,8 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/pL?taskId='+ this.data.id +'&groupId=' + this.data.baseGroupId + '&baseId=' + this.data.baseId,
+					url: '/app/pL?taskId=' + this.data.id + '&groupId=' + this.data.baseGroupId + '&baseId=' +
+						this.data.baseId,
 					method: 'get'
 				});
 				if (res.code === 200) {
@@ -364,7 +365,8 @@
 					this.list1
 					if (0 != this.historyData.length) {
 						for (var i = 0; i < this.historyData.length; i++) {
-							if (this.historyData[i].comment && this.historyData[i].comment === "自动结束") {
+							if (this.historyData[i].comment && this.historyData[i].comment === "自动结束" ||
+								this.historyData[i].comment === "流程结束") {
 								this.list1.push({
 									title: this.historyData[i].comment,
 									desc: this.historyData[i].createTime
@@ -383,7 +385,8 @@
 					}
 					if (this.historyData[this.historyData.length - 1]) {
 						if (!(this.historyData[this.historyData.length - 1].comment === "同意并结束") &&
-							!(this.historyData[this.historyData.length - 1].comment === "自动结束")) {
+							!(this.historyData[this.historyData.length - 1].comment === "自动结束") &&
+							!(this.historyData[this.historyData.length - 1].comment === "流程结束")) {
 							this.list1.push({
 								title: "待审批"
 							})
@@ -420,6 +423,7 @@
 					this.$refs.popup.open(type)
 					return
 				}
+				this.getHouXuanZu()
 				this.nextTitle = '下一步审批人'
 				this.type = type
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
@@ -456,7 +460,9 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/currentPL?taskId='+ this.data.id +'&groupId=' + this.data.baseGroupId + '&baseId=' + this.data.baseId,
+					url: '/app/currentPL?taskId=' + this.data.id + '&groupId=' + this.data
+						.baseGroupId +
+						'&baseId=' + this.data.baseId,
 					method: 'get'
 				});
 				if (res.code === 200) {
@@ -469,7 +475,8 @@
 					mask: true,
 					title: '正在提交'
 				})
-				if (this.form.result !== 'RESULT_FALSE' && this.data.isCandidate == "0" && 2.0 < parseFloat(this.data
+				if (this.form.result !== 'RESULT_FALSE' && this.data.isCandidate == "0" && 2.0 <
+					parseFloat(this.data
 						.formData.total_time)) {
 					if (!this.nextApproval) {
 						uni.showModal({
@@ -523,7 +530,8 @@
 				let date = new Date(time);
 				let year = date.getFullYear();
 				// 在日期格式中，月份是从0开始的，因此要加0，使用三元表达式在小于10的前面加0，以达到格式统一  如 09:11:05
-				let month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+				let month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date
+					.getMonth() + 1;
 				let day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
 				let hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
 				let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
@@ -596,4 +604,4 @@
 		justify-content: space-between;
 		margin-bottom: 10px;
 	}
-</style>
+</style>

pageApp/ge/geReserveApproval.vue

@@ -414,7 +414,8 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/pL?taskId='+ this.data.id +'&groupId=' + this.data.baseGroupId + '&baseId=' + this.data.baseId,
+					url: '/app/pL?taskId=' + this.data.id + '&groupId=' + this.data.baseGroupId + '&baseId=' +
+						this.data.baseId,
 					method: 'get'
 				});
 				if (res.code === 200) {
@@ -470,7 +471,8 @@
 					}
 					if (this.historyData[this.historyData.length - 1]) {
 						if (!(this.historyData[this.historyData.length - 1].comment === "同意并结束") &&
-							!(this.historyData[this.historyData.length - 1].comment === "自动结束")) {
+							!(this.historyData[this.historyData.length - 1].comment === "自动结束") &&
+							!(this.historyData[this.historyData.length - 1].comment === "流程结束")) {
 							this.list1.push({
 								title: "待审批"
 							})
@@ -508,6 +510,7 @@
 					this.$refs.popup.open(type)
 					return
 				}
+				this.getHouXuanZu()
 				this.nextTitle = '下一步审批人'
 				this.type = type
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
@@ -521,7 +524,8 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/currentPL?taskId='+ this.data.id +'&groupId=' + this.data.baseGroupId + '&baseId=' + this.data.baseId,
+					url: '/app/currentPL?taskId=' + this.data.id + '&groupId=' + this.data
+						.baseGroupId + '&baseId=' + this.data.baseId,
 					method: 'get'
 				});
 				if (res.code === 200) {
@@ -534,7 +538,8 @@
 					mask: true,
 					title: '正在提交'
 				})
-				if (this.form.result !== 'RESULT_FALSE' && this.data.isCandidate == "0" && 2.0 < parseFloat(this.data
+				if (this.form.result !== 'RESULT_FALSE' && this.data.isCandidate == "0" && 2.0 <
+					parseFloat(this.data
 						.formData.total_time)) {
 					if (!this.nextApproval) {
 						uni.showModal({
@@ -588,7 +593,8 @@
 				let date = new Date(time);
 				let year = date.getFullYear();
 				// 在日期格式中，月份是从0开始的，因此要加0，使用三元表达式在小于10的前面加0，以达到格式统一  如 09:11:05
-				let month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+				let month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() +
+					1;
 				let day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
 				let hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
 				let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
@@ -661,4 +667,4 @@
 		justify-content: space-between;
 		margin-bottom: 10px;
 	}
-</style>
+</style>

pageApp/hr/leave.vue

@@ -93,7 +93,7 @@
 							</uni-col>
 							<uni-col :span="19">
 								<view>
-									<uni-easyinput primaryColor="#37babd" v-model="calculateDayNum" placeholder="天数">
+									<uni-easyinput primaryColor="#37babd" v-model="form.totalTime" placeholder="天数">
 									</uni-easyinput>
 								</view>
 							</uni-col>
@@ -281,6 +281,7 @@
 					display: 'block'
 				},
 				form: {
+					totalTime: '',
 					isMiddleLevelLeader: '否',
 					isLh: '不离沪'
 				},
@@ -683,4 +684,4 @@
 		border-top-width: 0;
 		border-bottom-color: #EBEEF5;
 	}
-</style>
+</style>

pageApp/my/MyApproval.vue

@@ -135,10 +135,14 @@
 					this.$goto('../ge/geDeviceRepairs')
 				} else if (item.examplesId === uni.getStorageSync('device_scrap_approval_flow_run_key')) {
 					this.$goto('../ge/geDeviceScrap')
-				}else if (item.examplesId === uni.getStorageSync('purchase_approval_flow_run_key')) {
+				} else if (item.examplesId === uni.getStorageSync('purchase_approval_flow_run_key')) {
 					this.$goto('../ge/gePurchase')
-				}else if (item.examplesId === uni.getStorageSync('contract_approval_flow_run_key')) {
+				} else if (item.examplesId === uni.getStorageSync('contract_approval_flow_run_key')) {
 					this.$goto('../ge/geContract')
+				} else if (item.examplesId === uni.getStorageSync('phone_card_apply_flow_run_key')) {
+					this.$goto('../ge/gePhoneApply')
+				} else if (item.examplesId === uni.getStorageSync('letter_dispose_flow_run_key')) {
+					this.$goto('../ge/geLetterDispose')
 				}
 			},
 			async taskList(paging) {
@@ -190,4 +194,4 @@
 			}
 		}
 	}
-</script>
+</script>

pageApp/my/myAll.vue

@@ -129,6 +129,10 @@
 					this.$goto('../ge/gePurchase')
 				} else if (item.examplesId === uni.getStorageSync('contract_approval_flow_run_key')) {
 					this.$goto('../ge/geContract')
+				} else if (item.examplesId === uni.getStorageSync('phone_card_apply_flow_run_key')) {
+					this.$goto('../ge/gePhoneApply')
+				} else if (item.examplesId === uni.getStorageSync('letter_dispose_flow_run_key')) {
+					this.$goto('../ge/geLetterDispose')
 				}
 
 				this.list = []
@@ -176,4 +180,4 @@
 			}
 		}
 	}
-</script>
+</script>

pageApp/my/myCc.vue

@@ -129,6 +129,10 @@
 					this.$goto('../ge/gePurchase')
 				}else if (item.examplesId === uni.getStorageSync('contract_approval_flow_run_key')) {
 					this.$goto('../ge/geContract')
+				} else if (item.examplesId === uni.getStorageSync('phone_card_apply_flow_run_key')) {
+					this.$goto('../ge/gePhoneApply')
+				} else if (item.examplesId === uni.getStorageSync('letter_dispose_flow_run_key')) {
+					this.$goto('../ge/geLetterDispose')
 				}
 
 				this.list = []

pageApp/my/myLaunch.vue

@@ -158,6 +158,10 @@
 					this.$goto('../ge/gePurchase')
 				}else if (item.examplesId === uni.getStorageSync('contract_approval_flow_run_key')) {
 					this.$goto('../ge/geContract')
+				} else if (item.examplesId === uni.getStorageSync('phone_card_apply_flow_run_key')) {
+					this.$goto('../ge/gePhoneApply')
+				} else if (item.examplesId === uni.getStorageSync('letter_dispose_flow_run_key')) {
+					this.$goto('../ge/geLetterDispose')
 				}
 
 				this.list = []

pages.json

@@ -329,6 +329,15 @@
 					"backgroundColor": "#ffffff",
 					"enablePullDownRefresh": false
 				}
+			},{
+				"path": "login/getOpenId",
+				"style": {
+					"navigationBarTextStyle": "black",
+					"navigationBarTitleText": "授权",
+					"navigationBarBackgroundColor": "#eeeeee",
+					"backgroundColor": "#ffffff",
+					"enablePullDownRefresh": false
+				}
 			}, {
 				"path": "psq/form",
 				"style": {
@@ -813,6 +822,28 @@
 						"navigationBarBackgroundColor": "#eeeeee",
 						"enablePullDownRefresh": false
 					}
+				},{
+					"path": "ge/gePhoneApply",
+					"style": {
+						"backgroundColorBottom": "#f3f3f3",
+						"backgroundColorTop": "#f3f3f3",
+						"navigationBarTextStyle": "black",
+						"backgroundColor": "#f3f3f3",
+						"navigationBarTitleText": "审批",
+						"navigationBarBackgroundColor": "#eeeeee",
+						"enablePullDownRefresh": false
+					}
+				},{
+					"path": "ge/geLetterDispose",
+					"style": {
+						"backgroundColorBottom": "#f3f3f3",
+						"backgroundColorTop": "#f3f3f3",
+						"navigationBarTextStyle": "black",
+						"backgroundColor": "#f3f3f3",
+						"navigationBarTitleText": "审批",
+						"navigationBarBackgroundColor": "#eeeeee",
+						"enablePullDownRefresh": false
+					}
 				},
 				{
 					"path": "hr/leave",
@@ -927,6 +958,28 @@
 						"navigationBarBackgroundColor": "#eeeeee",
 						"enablePullDownRefresh": false
 					}
+				}, {
+					"path": "administration/phoneApply",
+					"style": {
+						"backgroundColorBottom": "#f3f3f3",
+						"backgroundColorTop": "#f3f3f3",
+						"navigationBarTextStyle": "black",
+						"backgroundColor": "#f3f3f3",
+						"navigationBarTitleText": "手机号申请",
+						"navigationBarBackgroundColor": "#eeeeee",
+						"enablePullDownRefresh": false
+					}
+				}, {
+					"path": "administration/xfj",
+					"style": {
+						"backgroundColorBottom": "#f3f3f3",
+						"backgroundColorTop": "#f3f3f3",
+						"navigationBarTextStyle": "black",
+						"backgroundColor": "#f3f3f3",
+						"navigationBarTitleText": "信访件",
+						"navigationBarBackgroundColor": "#eeeeee",
+						"enablePullDownRefresh": false
+					}
 				}, {
 					"path": "hr/performance",
 					"style": {

pages/app/index.vue

@@ -164,6 +164,16 @@
 						text: '用章申请',
 						imgPath: '../../static/img/app/yzsq.png',
 						link: "../../pageApp/administration/useSeal"
+					},
+					 {
+						text: '手机号申请',
+						imgPath: '../../static/img/app/htgl.png',
+						link: "../../pageApp/administration/phoneApply"
+					},
+					 {
+						text: '信访件',
+						imgPath: '../../static/img/app/xfj.png',
+						link: "../../pageApp/administration/xfj"
 					}
 					// , {
 					// 	text: '合同管理',

pages/orderFood/index.vue

@@ -7,7 +7,7 @@
 				<u-row>
 					<u-col span="6">
 						<view style="padding-left: 15px;" @click="isShowMenuName">
-							<u-picker id="button_div" keyName="value" :show="show" :columns="menuName"
+							<u-picker id="button_div" keyName="value" :show="show" :columns="menuName" :immediateChange="true"
 								@confirm="confirm" @cancel="cancel" confirmColor="rgb(55,186,189)">
 							</u-picker>
 							<u-text size="15" :bold="true" suffixIcon="arrow-down-fill" iconStyle="font-size: 18px"

pages/tabbar/wpTabbar.vue

@@ -280,7 +280,7 @@
 	.count {
 		bottom: 75rpx;
 		left: 40rpx;
-		font-size: 20rpx;
-		padding: 0px 0 4rpx 4rpx;
+		font-size: 22rpx;
+		padding: 0 0 3rpx 3rpx;
 	}
 </style>

pages/user/index.vue

@@ -109,6 +109,7 @@
 				<u-gap height="10" bgColor="#f5f5f5"></u-gap>
 				<!-- <u-cell icon="bell" title="消息提醒" @click="toNotificationPage" :isLink="true"></u-cell> -->
 				<u-cell icon="setting" title="系统设置" :isLink="true" @click="toSetting"></u-cell>
+				<u-cell icon="attach" title="公众号授权" :isLink="true" @click="toSouquan"></u-cell>
 				<u-cell icon="reload" title="退出登录" @click="isOutLoginShow" :isLink="true"></u-cell>
 				<view style="background-color: #f5f5f5;height: 30px;">
 					<view style="text-align: center;width: 100%;padding: 0;font-size: 12px;color: #dedede;">
@@ -504,6 +505,11 @@
 					url: "../../pages/user/settings/settings"
 				})
 			},
+			toSouquan() {
+				uni.navigateTo({
+					url: "../../pageA/login/getOpenId"
+				})
+			},
 			//退出登录
 			outLogin() {
 				//关闭WebSocket连接

uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue

@@ -2,7 +2,7 @@
 	<view class="uni-file-picker">
 		<view v-if="title" class="uni-file-picker__header">
 			<text class="file-title">{{ title }}</text>
-			<text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
+			<!-- <text class="file-count">{{ filesList.length }}/{{ limitLength }}</text> -->
 		</view>
 		<upload-image v-if="fileMediatype === 'image' && showType === 'grid'" :readonly="readonly"
 			:image-styles="imageStyles" :files-list="filesList" :limit="limitLength" :disablePreview="disablePreview"
@@ -336,7 +336,7 @@
 				if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType ===
 					'array') {
 					uni.showToast({
-						title: `您最多选择 ${this.limitLength} 个文件`,
+						title: `最多选择 ${this.limitLength} 个文件`,
 						icon: 'none'
 					})
 					return

uni_modules/uview-ui/components/u-picker/props.js

@@ -50,11 +50,6 @@ export default {
             type: String,
             default: uni.$u.props.picker.confirmColor
         },
-        // 选择器只有一列时，默认选中项的索引，从0开始
-        singleIndex: {
-            type: [String, Number],
-            default: uni.$u.props.picker.singleIndex
-        },
         // 每列中可见选项的数量
         visibleItemCount: {
             type: [String, Number],
@@ -74,6 +69,11 @@ export default {
         defaultIndex: {
             type: Array,
             default: uni.$u.props.picker.defaultIndex
-        }
+        },
+		// 是否在手指松开时立即触发 change 事件。若不开启则会在滚动动画结束后触发 change 事件，只在微信2.21.1及以上有效
+		immediateChange: {
+			type: Boolean,
+			default: uni.$u.props.picker.immediateChange
+		}
     }
 }

uni_modules/uview-ui/components/u-picker/u-picker.vue

@@ -8,16 +8,19 @@
 				v-if="showToolbar"
 				:cancelColor="cancelColor"
 				:confirmColor="confirmColor"
+				:cancelText="cancelText"
+				:confirmText="confirmText"
 				:title="title"
 				@cancel="cancel"
 				@confirm="confirm"
 			></u-toolbar>
 			<picker-view
 				class="u-picker__view"
-				:indicatorStyle="`height: ${itemHeight}px`"
+				:indicatorStyle="`height: ${$u.addUnit(itemHeight)}`"
 				:value="innerIndex"
+				:immediateChange="immediateChange"
 				:style="{
-					height: `${visibleItemCount * itemHeight}px`
+					height: `${$u.addUnit(visibleItemCount * itemHeight)}`
 				}"
 				@change="changeHandler"
 			>
@@ -28,7 +31,7 @@
 				>
 					<text
 						v-if="$u.test.array(item)"
-						class="u-picker__view__column__item"
+						class="u-picker__view__column__item u-line-1"
 						v-for="(item1, index1) in item"
 						:key="index1"
 						:style="{
@@ -63,11 +66,11 @@
  * @property {String}			confirmText			确认按钮的文字（默认 '确定' ）
  * @property {String}			cancelColor			取消按钮的颜色（默认 '#909193' ）
  * @property {String}			confirmColor		确认按钮的颜色（默认 '#3c9cff' ）
- * @property {String | Number}	singleIndex			选择器只有一列时，默认选中项的索引，从0开始（默认 0 ）
  * @property {String | Number}	visibleItemCount	每列中可见选项的数量（默认 5 ）
  * @property {String}			keyName				选项对象中，需要展示的属性键名（默认 'text' ）
  * @property {Boolean}			closeOnClickOverlay	是否允许点击遮罩关闭选择器（默认 false ）
  * @property {Array}			defaultIndex		各列的默认索引
+ * @property {Boolean}			immediateChange		是否在手指松开时立即触发change事件（默认 false ）
  * @event {Function} close		关闭选择器时触发
  * @event {Function} cancel		点击取消按钮触发
  * @event {Function} change		当选择值变化时触发
@@ -142,7 +145,7 @@ export default {
 			// 通过对比前后两次的列索引，得出当前变化的是哪一列
 			for (let i = 0; i < value.length; i++) {
 				let item = value[i]
-				if (item !== this.lastIndex[i]) {
+				if (item !== (this.lastIndex[i] || 0)) { // 把undefined转为合法假值0
 					// 设置columnIndex为当前变化列的索引
 					columnIndex = i
 					// index则为变化列中的变化项的索引
@@ -157,7 +160,7 @@ export default {
 			this.setIndexs(value)
 
 			this.$emit('change', {
-				// #ifndef MP-WEIXIN
+				// #ifndef MP-WEIXIN || MP-LARK
 				// 微信小程序不能传递this，会因为循环引用而报错
 				picker: this,
 				// #endif
@@ -230,7 +233,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	@import "../../libs/css/components.scss";
 
 	.u-picker {
@@ -239,9 +242,9 @@ export default {
 		&__view {
 
 			&__column {
+				@include flex;
 				flex: 1;
 				justify-content: center;
-				@include flex;
 
 				&__item {
 					@include flex;
@@ -249,6 +252,10 @@ export default {
 					align-items: center;
 					font-size: 16px;
 					text-align: center;
+					/* #ifndef APP-NVUE */
+					display: block;
+					/* #endif */
+					color: $u-main-color;
 
 					&--disabled {
 						/* #ifndef APP-NVUE */

util/request/api.js

@@ -36,7 +36,7 @@ switch (environment) {
 		BASE_URL = "https://master.willalp.com:3005"
 		BASE_SOCKET_URL = 'master.willalp.com'
 		BASE_URL_ML = 'https://master.willalp.com:3005'
-		BASE_URL_HSKJ = 'https://master.willalp.com:3012' 
+		BASE_URL_HSKJ = 'https://master.willalp.com:3012'
 		BASE_URL_MASTER = 'https://master.willalp.com:3010'
 		BASE_URL_BUSINESS = 'https://master.willalp.com:3011'
 		break;
@@ -171,7 +171,8 @@ export const getAllDicts = () => {
 		'access_stroage_type', 'sys_user_sex', 'degree_dict', 'interview_type', 'hire_result',
 		"hzl_seal_use_type", "seal_type", "hzl_seal_use_address", 'hzl_file_type', 'welfare_apply_addr',
 		'device_repairs_urgency_level', 'device_scrap_status', 'goods_storage_type',
-		'condole_renshenshanghai_type', 'device_repairs_submit_type', 'goods_property_type'
+		'condole_renshenshanghai_type', 'device_repairs_submit_type', 'goods_property_type',
+		'phonenumber_apply_type', 'hs_letter_dispose'
 	]
 	for (var i = 0; i < dictTypes.length; i++) {
 		getDicts(dictTypes[i]).then(res => {
@@ -192,7 +193,8 @@ export const getAllConfigData = (key) => {
 		'interview_record_approval_flow_run_key', 'instant_notice_approval_flow_run_key',
 		'shift_official_approval_flow_run_key', 'device_repairs_approval_flow_run_key',
 		'use_seal_approval_flow_run_key', 'purchase_approval_flow_run_key',
-		'device_scrap_approval_flow_run_key', 'contract_approval_flow_run_key'
+		'device_scrap_approval_flow_run_key', 'contract_approval_flow_run_key', 'phone_card_apply_flow_run_key',
+		'letter_dispose_flow_run_key'
 	]
 	for (var i = 0; i < configDatas.length; i++) {
 		getConfigData(configDatas[i]).then(res => {
@@ -334,4 +336,4 @@ export const dateResult = (time, mode) => {
 		default:
 			return ''
 	}
-}
+}