Răsfoiți Sursa

修复了一些问题

zyh 2 luni în urmă
părinte
comite
8d8744bcbb

+ 5 - 4
components/customField/customField.wxss

@@ -5,7 +5,7 @@
 }
 
 .content {
-    margin: 24rpx;
+    margin: 24rpx 28rpx;
     /* padding-top: 26rpx; */
     border-radius: 30rpx;
     /* background-color: #fff;
@@ -167,7 +167,7 @@ input {
 
 .cu-form-group {
     background-color: var(--white);
-    padding: 1rpx 30rpx;
+    padding: 0rpx 32rpx;
     display: flex;
     align-items: center;
     min-height: 100rpx;
@@ -176,7 +176,7 @@ input {
 .cu-form-group .title {
     text-align: justify;
     padding-right: 30rpx;
-    font-size: 25rpx !important;
+    font-size: 26rpx !important;
     position: relative;
     height: 60rpx;
     line-height: 60rpx;
@@ -192,5 +192,6 @@ input {
     font-size: 25rpx;
     color: #808080;
     text-align: right;
-    width: 430rpx;
+		width: 430rpx;
+		
 }

+ 1 - 1
components/face_verify/face_verify.js

@@ -271,7 +271,7 @@ Component({
 			let taskId = app.data.faceTaskId;
 			// taskId = '00-2023041314125357889'; //本地
 			// taskId = '00-993306131355291200'; //线上
-			// taskId = '00-2024050112393311886' //zyh线上
+			taskId = '00-2024050112393311886' //zyh线上
 			if (!taskId) return;
 			let res = await face.getFace_wxrlxf('/api/next/doQueryFaceSuccess', 'get', {
 				taskId: taskId

+ 1 - 1
international/appointment_scence/index.js

@@ -705,7 +705,7 @@ export default {
     "en": "Building information"
   },
   "tipsQrcodeOne": {
-    "ch": "二维码用于在指定通道通行及拜访后到前台签离",
+    "ch": "二维码用于在指定通道通行及拜访后到前台签离",
     "en": "The QR code is used to pass through the designated channels and to sign out at the front desk after visiting"
   },
   "tipsQrcodeTwo": {

+ 5 - 9
pages/regular_invite/regular_invite.js

@@ -124,15 +124,11 @@ Page({
 				this.setData({
 					'form.invitationWay': e.detail
 				})
-				if (e.detail == 0) {
-					this.setData({
-						showAddBut: false
-					})
-				} else {
-					this.setData({
-						showAddBut: true
-					})
-				}
+				this.setData({
+					showAddBut: e.detail == 0?false:true,
+					'form.phoneList': [],
+					closeNum: true
+				})
 				break;
 			default:
 				form[e.currentTarget.dataset.type] = e.detail

+ 6 - 4
pages/regular_register/regular_register.wxml

@@ -34,12 +34,14 @@
 			<view wx:if="{{companyAdminId&&buildingAdminId}}" class="m-t">
 				<!-- 人员信息 -->
 				<zyh-face-verify language="{{language}}" companyName="{{companyName}}" bind:certificationState="getCertificationState" isDisabled="{{isDisabled}}" userInfo="{{userInfo}}" bind:updateState="getUpdateState" userType="常客" needLoginList="{{needLoginList}}" needPhoto="{{needPhoto}}" needRealname="{{needRealname}}" needPhone="{{needPhone}}"></zyh-face-verify>
-				<block wx:if="{{isDisabled&&!showMyFun}}">
-					<!-- 自定义字段 -->
-					<custom-field wx:if="{{isShowApplet}}" orgId="{{buildingAdminId}}" customField="{{customField}}" bind:isFillFields="isFillFields" />
-				</block>
+				
 			</view>
+			
 		</view>
+		<block wx:if="{{companyAdminId&&buildingAdminId&&isDisabled&&!showMyFun}}">
+			<!-- 自定义字段 -->
+			<custom-field wx:if="{{isShowApplet}}" orgId="{{buildingAdminId}}" customField="{{customField}}" bind:isFillFields="isFillFields" />
+		</block>
 	</block>
 	<!-- 功能区 -->
 	<view wx:if="{{isDisabled&&showMyFun}}">

+ 5 - 2
pages/visitor_make/visitor_make.js

@@ -228,7 +228,6 @@ Page({
 	getContextStatusByAdminId(orgId) {
 		getContextByAdminId(orgId).then(res => {
 			if (res.code == 200) {
-				console.log(res);
 				this.setData({
 					isShowApplet: res.data,
 					isFillFields: !res.data,
@@ -244,6 +243,8 @@ Page({
 	},
 	// 获取用户填写的自定义字段内容
 	getContextByAdminId() {
+		console.log(!this.data.buildingAdminId);
+		console.log(!this.data.userInfo);
 		if (!this.data.buildingAdminId || !this.data.userInfo) {
 			return;
 		}
@@ -490,6 +491,7 @@ Page({
 					title: '提示',
 					content: '你暂无权限接受此邀请哦,请检查手机号是否正确.',
 					showCancel: false,
+					complete: (res) => {}
 				})
 			}
 		}
@@ -593,6 +595,7 @@ Page({
 				}]
 				this.reasonEcho(res.data.reason)
 				this.setData({
+					userInfo: app.data.visitorUserInfo,
 					all_buildingList: buildingList,
 					buildingIndex: 0,
 					buildingAdminId: res.data.visiteeBuildingId,
@@ -605,7 +608,7 @@ Page({
 					isAudit: true,
 					form,
 				})
-				await this.matchCorrectPhone();
+				this.matchCorrectPhone();
 				if (this.data.userInfo) {
 					this.getContextStatusByAdminId(res.data.visiteeBuildingId)
 					this.getContextByAdminId()