审批提醒，加入组织弹窗

pages/index/index.vue

@@ -1163,7 +1163,7 @@
 				}
 				}
 
 
 				.more {
 				.more {
-					font-family: "MicrosoftYaHei ";
+					font-family: "PingFang SC";
 					font-weight: 400;
 					font-weight: 400;
 					font-size: 28rpx;
 					font-size: 28rpx;
 					text-align: left;
 					text-align: left;

pages/login/register/register.vue

@@ -4,36 +4,36 @@
 		<form @submit="formSubmit">
 		<form @submit="formSubmit">
 			<view class="form-item">
 			<view class="form-item">
 				<view class="star">*</view>
 				<view class="star">*</view>
-				<view class="text-black-normal" style="min-width: 100rpx;">账号</view>
+				<view class="text-black-normal" style="min-width: 140rpx;">账号</view>
 				<input class="text-black-normal" style="margin-left: 32rpx;flex: 1;" name="account"
 				<input class="text-black-normal" style="margin-left: 32rpx;flex: 1;" name="account"
 					placeholder="请输入账号(数字字母组合)" />
 					placeholder="请输入账号(数字字母组合)" />
 			</view>
 			</view>
 			<view class="form-item">
 			<view class="form-item">
 				<view class="star">*</view>
 				<view class="star">*</view>
-				<view class="text-black-normal" style="min-width: 100rpx;">姓名</view>
+				<view class="text-black-normal" style="min-width: 140rpx;">姓名</view>
 				<input class="text-black-normal" style="margin-left: 32rpx;" name="username" placeholder="请输入姓名" />
 				<input class="text-black-normal" style="margin-left: 32rpx;" name="username" placeholder="请输入姓名" />
 			</view>
 			</view>
 			<view class="form-item">
 			<view class="form-item">
 				<view class="star">*</view>
 				<view class="star">*</view>
-				<view class="text-black-normal" style="min-width: 100rpx;">密码</view>
+				<view class="text-black-normal" style="min-width: 140rpx;">密码</view>
 				<input class="text-black-normal" style="margin-left: 32rpx;" name="password" placeholder="请输入密码"
 				<input class="text-black-normal" style="margin-left: 32rpx;" name="password" placeholder="请输入密码"
 					type="password" />
 					type="password" />
 			</view>
 			</view>
 			<view class="form-item">
 			<view class="form-item">
 				<view class="star">*</view>
 				<view class="star">*</view>
-				<view class="text-black-normal" style="min-width: 100rpx;">确认密码</view>
+				<view class="text-black-normal" style="min-width: 140rpx;">确认密码</view>
 				<input class="text-black-normal" style="margin-left: 32rpx;" name="confirmpassword"
 				<input class="text-black-normal" style="margin-left: 32rpx;" name="confirmpassword"
 					placeholder="请再次输入密码" type="password" />
 					placeholder="请再次输入密码" type="password" />
 			</view>
 			</view>
 			<view class="form-item">
 			<view class="form-item">
 				<view class="star">*</view>
 				<view class="star">*</view>
-				<view class="text-black-normal" style="min-width: 100rpx;">手机号</view>
+				<view class="text-black-normal" style="min-width: 140rpx;">手机号</view>
 				<input class="text-black-normal" style="margin-left: 32rpx;" name="phone" placeholder="请输入手机号"
 				<input class="text-black-normal" style="margin-left: 32rpx;" name="phone" placeholder="请输入手机号"
 					v-model="phone" type="number" />
 					v-model="phone" type="number" />
 			</view>
 			</view>
 			<view class="form-item">
 			<view class="form-item">
 				<view class="star">*</view>
 				<view class="star">*</view>
-				<view class="text-black-normal" style="min-width: 100rpx;">验证码</view>
+				<view class="text-black-normal" style="min-width: 140rpx;">验证码</view>
 				<input class="text-black-normal" style="margin-left: 32rpx;flex: 1;" name="code" placeholder="请输入验证码"
 				<input class="text-black-normal" style="margin-left: 32rpx;flex: 1;" name="code" placeholder="请输入验证码"
 					type="number" />
 					type="number" />
 				<view class="text-blue" @click="getCode">{{codeText}}</view>
 				<view class="text-blue" @click="getCode">{{codeText}}</view>

pages/mine/mine.vue

@@ -170,13 +170,13 @@
 				}).then((result) => {
 				}).then((result) => {
 					console.log("公司申请列表", result);
 					console.log("公司申请列表", result);
 					if (result.code == 0) {
 					if (result.code == 0) {
-						if (result.data.list.length > 0) {
+						if (result.data.list) {
 							this.mDatas = result.data.list
 							this.mDatas = result.data.list
 						}
 						}
-						this.getProjectNoApproval()
 					} else {
 					} else {
 						this.$toast.showToast(result.msg)
 						this.$toast.showToast(result.msg)
 					}
 					}
+					this.getProjectNoApproval()
 				})
 				})
 			},
 			},
 			getProjectNoApproval() {
 			getProjectNoApproval() {
@@ -202,9 +202,10 @@
 				var noApprovalList = this.mDatas.filter(item => item.status == '2')
 				var noApprovalList = this.mDatas.filter(item => item.status == '2')
 				noApprovalList.forEach((item) => {
 				noApprovalList.forEach((item) => {
 					if (this.leaveTime(item.create_time) != '0秒') {
 					if (this.leaveTime(item.create_time) != '0秒') {
-						count++
+						this.count++
 					}
 					}
 				})
 				})
+				console.log("是否有审批", this.count);
 			},
 			},
 			leaveTime(time) {
 			leaveTime(time) {
 				return this.$date.timeDiff(this.$date.getEndTime(time), false)
 				return this.$date.timeDiff(this.$date.getEndTime(time), false)