Merge branch 'wwt'

src/pages/chatSettings/groupManage/editGroupName.vue

@@ -29,8 +29,11 @@
                 :placeholder="$t('edit.groupName.placeholder')"
                 placeholder-style="color:#B4B4B4;font-size:28rpx;font-weight:500;line-height:40rpx;"
                 v-model="state.groupName"
+                @input="handleGroupNameInput"
+                maxlength="20"
               />
               <img
+                v-if="state.groupName"
                 class="groupName-input-clearBtn"
                 src="/src/static/image/chatSettings/clear-btn.png"
                 @click="clearGroupNameInput"
@@ -82,7 +85,12 @@ onLoad((options) => {
 const clearGroupNameInput = () => {
   state.groupName = ''
 }
-
+const handleGroupNameInput = (e) => {
+  if (state.groupName.length > 20) {
+    // 截取前20个字符
+    state.groupName = state.groupName.slice(0, 20)
+  }
+}
 //点击确认修改
 const confirmEdit = () => {
   console.log(state.groupName)
@@ -146,7 +154,7 @@ const confirmEdit = () => {
         height: 110rpx;
         box-shadow: 0 6px 12px 2px rgba(188, 188, 188, 0.08);
         padding: 0 74rpx 0 32rpx;
-        color: #B747474;
+        color: #747474;
         font-size: 28rpx;
         font-weight: 500;
         line-height: 40rpx;

src/pages/chatSettings/index.vue

@@ -152,6 +152,7 @@
               class="clear-chat-record-btn-each"
               v-if="
                 groupParams?.groupInfo?.is_manager && dialogueParams.type === 2
+                && (groupParams?.groupInfo?.group_type === 1 || groupParams?.groupInfo?.group_type === 3)
               "
             >
               <span class="text-[32rpx] font-regular">
@@ -163,6 +164,7 @@
               class="clear-chat-record-btn-each"
               v-if="
                 groupParams?.groupInfo?.is_manager && dialogueParams.type === 2
+                && (groupParams?.groupInfo?.group_type === 1 || groupParams?.groupInfo?.group_type === 3)
               "
             >
               <span class="text-[32rpx] font-regular">

src/pages/chooseChat/components/chatItem.vue

@@ -30,7 +30,16 @@
               class="text-[#171717] text-[32rpx] font-medium leading-[44rpx]"
             >
               <span>{{ props.data.name }}</span>
-              <span>（{{ props.data.group_member_num }}）</span>
+              <span v-if="props.data.talk_type === 2">（{{ props.data.group_member_num }}）</span>
+              <span v-if="props.data.group_type === 2" class="depTag tag">
+                  部门
+                </span>
+                <span v-if="props.data.group_type === 3" class="projectTag tag">
+                  项目
+                </span>
+                <span v-if="props.data.group_type === 4" class="companyTag tag">
+                  公司
+                </span>
             </div>
           </div>
         </div>
@@ -118,16 +127,31 @@ const cellClick = () => {
   opacity: 40%;
 }
 
-.companyTag {
+.tag{
-  width: 76rpx;
+  display: inline-flex;
-  height: 38rpx;
+  align-items: center;
-  border: 1px solid #7a58de;
-  font-size: 24rpx;
   text-align: center;
+  // margin-left: 10rpx;
+  margin-top: 4rpx;
+  vertical-align: top;
+  height: 38rpx;
+  line-height: 38rpx;
+  padding: 0 10rpx;
+  font-size: 24rpx;
   border-radius: 6rpx;
-  color: #7a58de;
   font-weight: bold;
-  margin-left: 12rpx;
+}
+.companyTag {
+	border: 1px solid #7a58de;
+	color: #7a58de;
+}
+.depTag {
+	border: 1px solid #377ec6;
+	color: #377ec6;
+}
+.projectTag {
+	border: 1px solid #c1681c;
+	color: #c1681c;
 }
 
 .textEllipsis {

src/pages/chooseChat/index.vue

@@ -58,6 +58,7 @@
         okColor="#FFFFFF"
         @ok="handleOk"
         @cancel="handleCancel"
+        :okText="'发送'"
       >
         <template v-slot:title>
           <div
@@ -86,7 +87,7 @@
               <div
                 class="mt-[8rpx] text-[#666666] text-[24rpx] w-[94rpx] truncate"
               >
-                {{ item.name }}
+                <span>{{ item.name }}</span>
               </div>
             </div>
             <div v-else class="w-full flex items-center justify-start">
@@ -98,6 +99,16 @@
               ></avatarModule>
               <div class="ml-[16rpx] text-[#161616] text-[32rpx] font-bold">
                 {{ selectItemsModal[0].name }}
+                <span v-if="selectItemsModal[0].talk_type === 2">（{{ selectItemsModal[0].group_member_num }}）</span>
+                <span v-if="selectItemsModal[0].group_type === 2" class="depTag tag">
+                  部门
+                </span>
+                <span v-if="selectItemsModal[0].group_type === 3" class="projectTag tag">
+                  项目
+                </span>
+                <span v-if="selectItemsModal[0].group_type === 4" class="companyTag tag">
+                  公司
+                </span>
               </div>
             </div>
           </div>
@@ -241,7 +252,32 @@ onUnmounted(() => {
   margin-top: 20rpx;
   background-color: #fff;
 }
-
+.tag{
+  display: inline-flex;
+  align-items: center;
+  text-align: center;
+  // margin-left: 10rpx;
+  margin-top: 4rpx;
+  vertical-align: top;
+  height: 38rpx;
+  line-height: 38rpx;
+  padding: 0 10rpx;
+  font-size: 24rpx;
+  border-radius: 6rpx;
+  font-weight: bold;
+}
+.companyTag {
+	border: 1px solid #7a58de;
+	color: #7a58de;
+}
+.depTag {
+	border: 1px solid #377ec6;
+	color: #377ec6;
+}
+.projectTag {
+	border: 1px solid #c1681c;
+	color: #c1681c;
+}
 .btnBox {
   ::v-deep .custom-btn-class {
     padding: 6rpx 24rpx !important;

src/pages/index/components/chatItem.vue

@@ -35,7 +35,7 @@
 							<div class="text-[#000000] text-[32rpx]
               font-bold opacity-90 name_text">
                 {{ formatNameText(props.data.name) }}
-                <span v-if="props.data.group_member_num > 0">（{{props.data.group_member_num}}）</span>
+                <span v-if="props.data.talk_type === 2">（{{props.data.group_member_num}}）</span>
                 <span v-if="props.data.group_type === 2" class="depTag tag">
                   部门
                 </span>