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

components/PositionList/index.vue

@@ -65,10 +65,10 @@
           <view class="avatarBox">
             <image class="enterAvatar ss-m-l-20 default-border default-radius" :src="item.enterprise?.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'"></image>
           </view>
-          <view class="ss-m-l-35">
-            <view class="ss-m-r-20 MiSans-Normal default-text-color">{{ formatName(item.enterprise?.anotherName || item.enterprise.name) }}</view>
-            <span class="color-666 MiSans-Normal ss-m-r-10">{{ item.enterprise?.industryName || '' }}</span>
-            <span class="ss-m-r-20 color-666 MiSans-Normal">{{ item.enterprise?.scaleName || '' }}</span>
+          <view class="ss-m-l-35 MiSans-Normal" style="flex: 1; max-width: calc(100% - 40px);">
+            <view class="default-text-color ellipsis" style="width: 98%;">{{ formatName(item.enterprise?.anotherName || item.enterprise.name) }}</view>
+            <span class="color-666 ss-m-r-10 font-size-12">{{ item.enterprise?.industryName || '' }}</span>
+            <span class="color-666 font-size-12">{{ item.enterprise?.scaleName || '' }}</span>
           </view>
         </view>
       </view>
@@ -138,7 +138,7 @@ const handleClickEnt = (item) => {
   display: flex;
   align-items: center;
   font-size: 13px;
-  padding: 5px;
+  padding: 10rpx 30rpx 0 30rpx;
   border-radius: 0 0 12px 12px;
   margin-bottom: 20rpx;
   .avatarBox {

pagesA/chart/index.vue

@@ -301,10 +301,6 @@ const interview = ref([])
 const statusList = ref([])
 const inputValue = ref('')
 
-// const isAgree = ref(false)
-// const confirm = ref()
-// const chooseInvite = ref(null)
-
 const newsId = ref('') // newsId 需要和聊天列表里面的id对应 永远取最后列表中的最后一个就可以做到发送消息即时滚动到底部
 const scrollAnimation = ref(false)
 
@@ -583,37 +579,6 @@ async function handleSendResume () {
   }
 }
 
-// 拒绝邀请
-// function handleRefuse (val) {
-//   isAgree.value = false
-//   chooseInvite.value = val
-//   confirm.value.open()
-// }
-
-// 接受邀请
-// function handleAgree (val) {
-//   isAgree.value = true
-//   chooseInvite.value = val
-//   confirm.value.open()
-// }
-
-// 确认
-// async function handleConfirm () {
-//   // 拒绝
-//   if (!isAgree.value) {
-//     await userInterviewInviteReject(chooseInvite.value.id)
-//   } else {
-//     await userInterviewInviteReject(chooseInvite.value.id)
-//   }
-//   uni.showToast({ title: '操作成功', icon: 'none' })
-//   send(JSON.stringify({ id: chooseInvite.value.id }), channelItem.value, isAgree.value ? 104 : 103)
-// }
-
-// 关闭
-// function handleCloseConfirm () {
-//   confirm.value.close()
-// }
-
 // 查看更多
 async function handleMore () {
   try {
@@ -1093,10 +1058,4 @@ onLoad(async (options) => {
     }
   }
 }
-// .commonBackground {
-//   z-index: 1;
-//   &::before {
-// 	  height: 100px !important;
-//   }
-// }
 </style>

pagesB/preferredGroup/index.vue

@@ -29,7 +29,7 @@
 				:interval="3000"
 				:duration="500"
 				indicator-active-color="#fff"
-				:style="{'height': preferred?.introduce?.thumbnail.length > 1 ? '240px' : '160px'}"
+				:style="{'height': preferred?.introduce?.thumbnail.length > 1 ? '230px' : '160px'}"
 				class="ss-m-t-50"
 			>
 				<swiper-item v-for="(item, index) in preferred.introduce?.thumbnail" :key="index">

utils/request.js

@@ -69,6 +69,7 @@ const http = new Request({
 		Accept: 'text/json',
 		'Content-Type': 'application/json;charset=UTF-8',
 		platform: 'WechatMiniProgram',
+		'Login-User-Type': 1
 	},
 	// #ifdef APP-PLUS
 	sslVerify: false,