Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

pages/index/my.vue

@@ -259,8 +259,8 @@ const handleLogoutConfirm = () => {
 	.vipIcon {
 		position: absolute;
 		width: 45px;
-		height: 45px;
-		bottom: 24px;
+		height: 24px;
+		bottom: 34px;
 		left: 50%;
 	}
 }

pagesA/chart/index.vue

@@ -38,7 +38,7 @@
       <uni-notice-bar v-if="hasWaitingProcessingInterview" show-get-more single text="您有待处理的面试邀请，点击查看详情" @click="handleToCenter"/>
     </view>
       <!-- newsId 需要和聊天列表里面的id对应 永远取最后列表中的最后一个就可以做到发送消息即时滚动到底部 -->
-      <scroll-view ref="chatRef" scroll-with-animation :scroll-into-view="newsId" class="box-main" scroll-y="true">
+      <scroll-view ref="chatRef" :scroll-with-animation="scrollAnimation" :scroll-into-view="newsId" class="box-main" scroll-y="true">
         <view class="box-main-more" v-if="hasMore">
           <text @click="handleMore">查看更多</text>
         </view>
@@ -201,7 +201,7 @@
 </template>
 
 <script setup>
-import { ref, watch } from 'vue'
+import { ref, watch, onMounted } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { useIMStore } from '@/store/im'
 import { userStore } from '@/store/user'
@@ -245,12 +245,18 @@ const inputValue = ref('')
 // const chooseInvite = ref(null)
 
 const newsId = ref('') // newsId 需要和聊天列表里面的id对应 永远取最后列表中的最后一个就可以做到发送消息即时滚动到底部
-const scrollInto = ref(0)
+const scrollAnimation = ref(false)
 
 const isSendResume = ref(false)
 const positionInfo = ref({})
 const isEmployment = ref('-1')
 
+onMounted(() => {
+  setTimeout(() => {
+    scrollAnimation.value = true
+  }, 1500)
+})
+
 const {
   conversationList,
   // updateConversation,

pagesA/resumeOnline/baseInfoEdit.vue

@@ -3,9 +3,9 @@
 		<uni-forms ref="form" :modelValue="formData" :rules="rules" validateTrigger="bind" label-width="105px" label-align="right">
 			<uni-forms-item label="头像" name="avatar" class="f-straight">
         <view style="display: flex;flex-wrap: wrap;">
-          <view class="upload-img" v-if="formData?.avatar" @click="handlePreviewImage">
-            <uni-icons size="30" type="clear" color="#fe574a" style="position: absolute;right: -11px; top: -11px; z-index: 9" @click="formData.avatar = ''"></uni-icons>
-            <image :src="formData?.avatar" mode="contain" style="width: 200rpx;height: 200rpx;"></image>
+          <view class="upload-img" v-if="formData?.avatar">
+            <uni-icons size="35" type="clear" color="#fe574a" style="position: absolute;right: -15px; top: -15px; z-index: 9" @click="formData.avatar = ''"></uni-icons>
+            <image :src="formData?.avatar" mode="contain" style="width: 200rpx;height: 200rpx;" @click="handlePreviewImage"></image>
           </view>
           <view v-else class="upload-file" @click="uploadPhotos">
             <uni-icons type="plusempty" size="50" color="#f1f1f1"></uni-icons>
@@ -113,6 +113,15 @@ const uploadPhotos = () => {
     sizeType: ['original', 'compressed'],
     sourceType: ['album', 'camera'],
     success: function(res){
+      const size = res.tempFiles[0]?.size || 0
+      if (size >= 10485760) {
+        uni.showToast({
+          icon: 'none',
+          title: '头像上传大小不得超过 10MB !',
+          duration: 2000
+        })
+        return
+      }
       const path = res.tempFilePaths[0]
       uploadFile(path).then(res => {
         formData.value.avatar = res.data
@@ -167,6 +176,7 @@ const submit = async () => {
 
 .wrapper{
 	padding: 15px;
+  padding-top: 30px;
 }
 .upload-img{
   position: relative;

pagesB/inviteRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<layout-page>
 		<scroll-view class="scrollBox" scroll-y="true" @scrolltolower="loadingMore" style="height: calc(100vh - 102rpx);">
-			<view v-if="total" class="totalShow">恭喜你，已经邀请了{{ total }}个新用户啦！</view>
+			<view v-if="total" class="totalShow">恭喜你，已经成功邀请{{ total }}个新用户啦！</view>
       <view v-if="items.length" class="listBox">
         <!-- <m-list :items="items"></m-list> -->
 				<uni-table ref="table" :loading="loading" border stripe emptyText="暂无更多数据" style="width: 100%;">
@@ -110,5 +110,6 @@ function loadingMore () {
 }
 .totalShow {
 	margin: 30rpx 0 0 30rpx;
+	color: #333;
 }
 </style>