Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

pages/msg/index.vue

@@ -79,18 +79,23 @@
 							<view class="text-grey">{{item.messageTime?getMonthOrDay(item.messageTime):''}}</view>
 						</view>
 						<view class="flex justify-between" style="margin-top: 10rpx;">
-							<view class="text-grey" v-if="item.messageType == 1">{{item.content}}</view>
+							<view class="text-grey" v-if="item.messageType == 1||item.messageType == 10">{{item.content}}</view>
 							<view class="text-grey" v-else-if="item.messageType == 18">位置</view>
 							<view class="text-grey" v-else-if="item.messageType == 9">简历请求</view>
 							<view class="text-grey" v-else-if="item.messageType == 6">微信请求</view>
 							<view class="text-grey" v-else-if="item.messageType == 5">手机号请求</view>
 							<view class="text-grey" v-else-if="item.messageType == 2">[图片]</view>
+							<view class="text-grey" v-else-if="item.messageType == 3">[语音]</view>
+							<view class="text-grey" v-else-if="item.messageType == 7">[交换手机]</view>
+							<view class="text-grey" v-else-if="item.messageType == 8">[交换微信]</view>
+							<view class="text-grey" v-else-if="item.messageType == 12">{{item.content}}已拒绝</view>
 							<view class="text-grey" v-else-if="item.messageType == 4"><image class="chat-listitem-text"
 							v-if="item.content && item.messageType === 4"
 							:src="ossUrl +item.content"
 							style="height: 40rpx;width: 40rpx;"></image></view>
 							<view class="text-grey" v-else-if="item.messageType == 20">[视频通话]</view>
 							<view class="text-grey" v-else-if="item.messageType == 21">[语音通话]</view>
+							<view class="text-grey" v-else>[其他消息类型]</view>
 							<view v-if="item.contentCount"
 								style="height: 32rpx;width: 32rpx;border-radius: 100rpx;background-color: red;color: #FFF;text-align: center;">
 								{{item.contentCount}}

pages/public/login.vue

@@ -45,7 +45,10 @@
         手机号登录
       </button> -->
 			<!-- #ifdef APP -->
-			<view v-if="isAndroid||true" class="login-btn wechat" :class="{ disabled: !checked }" :disabled="checked" @click="wxAppLogin">
+			<!-- <view v-if="!isAndroid" class="login-btn apple" :class="{ disabled: !checked }" :disabled="checked" @click="appleLogin">
+				<image src="@/static/images/ios.svg" mode="scaleToFill" />通过Apple登录
+			</view> -->
+			<view v-if="isAndroid" class="login-btn wechat" :class="{ disabled: !checked }" :disabled="checked" @click="wxAppLogin">
 				<image src="@/static/images/jobApplicant/wx.svg" mode="scaleToFill" />微信登录
 			</view>
 			<!-- #endif -->
@@ -464,6 +467,34 @@
 					},
 				});
 			},
+			appleLogin(){
+				if (!this.checked) {
+					uni.showToast({
+						title: "请阅读并同意《隐私协议》和《用户服务协议》",
+						icon: "none",
+					});
+					return;
+				}
+				uni.login({
+				    provider: 'apple',
+				    success: function (loginRes) {
+				        // 登录成功
+				        uni.getUserInfo({
+				            provider: 'apple',
+				            success: function(info) {
+				                // 获取用户信息成功, info.authResult中保存登录认证数据
+								uni.navigateTo({
+									url: `/pages/public/loginphone?type=1`,
+								});
+				            }
+				        })
+				    },
+				    fail: function (err) {
+				        // 登录授权失败
+				        // err.code错误码参考`授权失败错误码(code)说明`
+				    }
+				});
+			},
 			//小程序登录
 			login(nickName, avatarUrl, sex) {
 				if (!this.checked) {
@@ -814,6 +845,13 @@
 	.wechat {
 		background: linear-gradient(90.00deg, rgba(13, 39, 247, 1), rgba(19, 193, 234, 1) 100%);
 	}
+	.apple{
+		width:fit-content;
+		 border-radius: 12rpx;
+		 background:#000!important;
+		 margin-left:auto;
+		 margin-right:auto;
+	}
 
 	.password {
 		background: rgba(1, 107, 246, 1);

static/images/ios.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1765033368918" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9747" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M615.913 183.762c31.803-40.968 55.898-98.81 47.218-157.832-52.08 3.61-112.838 36.802-148.25 79.991-32.36 39.164-58.954 97.353-48.607 153.876 56.94 1.805 115.545-32.15 149.639-76.035zM896.859 739.2c-22.776 50.481-33.677 73.117-62.98 117.835-40.97 62.496-98.603 140.266-170.055 140.822-63.467 0.694-79.854-41.386-165.957-40.9s-104.156 41.733-167.693 41.107c-71.451-0.695-126.03-70.827-166.929-133.32-114.364-174.568-126.376-379.48-55.897-488.498 50.203-77.354 129.294-122.558 203.661-122.558 75.688 0 123.253 41.593 185.956 41.593 60.758 0 97.768-41.663 185.26-41.663 66.245 0 136.447 36.109 186.441 98.603-163.805 89.922-137.278 324.275 28.192 387.047v-0.068h0.001z" fill="#ffffff" p-id="9748"></path></svg>