Merge branch 'wwt'

src/components/custom-input/custom-input.vue

@@ -12,6 +12,7 @@
       @input="inputSearchText"
       :showClear="true"
       @clear="clearInput"
+      placeholderStyle="color:#BABABA"
     ></tm-input>
   </div>
 </template>

src/pages/index/components/chatItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <wd-swipe-action>
+    <wd-swipe-action class="swipe_action">
       <div
         @click="cellClick"
         :class="['chatItem', props.data.is_top === 1 ? 'isTop' : '']"
@@ -31,23 +31,19 @@
         </div>
         <div class="chatInfo">
           <div class="chatInfo_1">
-            <div class="flex items-center">
+            <div >
-              <div class="text-[#000000] text-[32rpx] font-bold opacity-90">
+              <span  class="text-[#000000] text-[32rpx] font-bold opacity-90 mr-[20rpx]">{{ props.data.name }}</span>
-                {{ props.data.name }}
+              <span v-if="props.data.group_type === 2" class="depTag">
-              </div>
-              <div>
-                <div v-if="props.data.group_type === 2" class="depTag">
                 部门
-                </div>
+              </span>
-                <div v-if="props.data.group_type === 3" class="projectTag">
+              <span v-if="props.data.group_type === 3" class="projectTag">
                 项目
-                </div>
+              </span>
-                <div v-if="props.data.group_type === 4" class="companyTag">
+              <span v-if="props.data.group_type === 4" class="companyTag">
                 公司
+              </span>
             </div>
-              </div>
+            <div class="text-[#000000] text-[28rpx] font-medium opacity-26 ml-[24rpx]">
-            </div>
-            <div class="text-[#000000] text-[28rpx] font-medium opacity-26">
               {{ beautifyTime(props.data.updated_at) }}
             </div>
           </div>
@@ -60,6 +56,8 @@
       </div>
       <template #right>
         <div class="flex flex-row flex-row-center-end">
+          <!-- 样式占位 -->
+          <div style="width:1px"></div>
           <div
             @click="handleTop"
             class="w-[156rpx] h-[154rpx] text-[#ffffff] bg-[#F09F1F] flex items-center justify-center"
@@ -140,6 +138,10 @@ const handleDelete = () => {
 }
 </script>
 <style lang="scss" scoped>
+::v-deep .swipe_action {
+  // border: 1px solid #fff;
+  // transform: translate3d(1px, 0px, 0px) !important;
+}
 .chatItem {
   width: 100%;
   height: 154rpx;
@@ -172,8 +174,7 @@ const handleDelete = () => {
 
 .chatInfo_2_1 {
   font-size: 28rpx;
-  color: #000000;
+  color: rgba($color: #000000, $alpha: 0.4);
-  opacity: 40%;
 }
 
 .companyTag {
@@ -186,7 +187,8 @@ const handleDelete = () => {
   border-radius: 6rpx;
   color: #7a58de;
   font-weight: bold;
-  margin-left: 12rpx;
+
+  display: inline-block;
 }
 
 .depTag {
@@ -199,7 +201,8 @@ const handleDelete = () => {
   border-radius: 6rpx;
   color: #377ec6;
   font-weight: bold;
-  margin-left: 12rpx;
+
+  display: inline-block;
 }
 
 .projectTag {
@@ -212,7 +215,8 @@ const handleDelete = () => {
   border-radius: 6rpx;
   color: #c1681c;
   font-weight: bold;
-  margin-left: 12rpx;
+
+  display: inline-block;
 }
 
 .textEllipsis {

src/pages/index/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="outer-layer">
     <div>
-      <tm-navbar :hideBack="false" hideHome title="" :leftWidth="420">
+      <tm-navbar class="index_top_navbar" :hideBack="false" hideHome title="" :leftWidth="420">
         <template v-slot:left>
           <div class="flex items-center ml-[48rpx]">
-            <tm-image
+            <image
-              :width="72"
+              class="w-[72rpx] h-[72rpx]"
-              :height="72"
+              style="border-radius: 50%;"
-              :round="12"
               :src="userStore.avatar"
-            ></tm-image>
+              mode="scaleToFill"
+            />
             <div class="ml-[24rpx] text-[36rpx] font-bold">
               {{ userStore.nickname }}
             </div>
@@ -18,24 +18,24 @@
         <template v-slot:right>
           <div class="mr-[48rpx] popoverBox">
             <tm-popover position="br" color="#333333" :width="260">
-              <tm-image
+              <image
-                :width="41"
+                class="w-[48rpx] h-[48rpx]"
-                :height="41"
+                style="border-radius: 50%;"
-                :round="12"
                 :src="addCircle"
-              ></tm-image>
+                mode="scaleToFill"
+              />
               <template v-slot:label>
                 <div
-                  class="w-full h-[208rpx] pt-[22rpx] pb-[22rpx] pl-[34rpx] pr-[32rpx]"
+                  class="w-full h-[208rpx] pt-[22rpx] pb-[32rpx] pl-[14rpx] pr-[12rpx]"
                 >
                   <div
                     @click="creatGroupChat"
-                    class="flex items-center mb-[30rpx]"
+                    class="flex items-center pl-[22rpx] mb-[32rpx]"
                   >
                     <div class="mr-[26rpx] flex items-center">
                       <tm-image
                         :width="40"
-                        :height="40"
+                        :height="39"
                         :src="cahtPopover"
                       ></tm-image>
                     </div>
@@ -48,12 +48,12 @@
                   <div class="divider"></div>
                   <div
                     @click="toAddressBookPage"
-                    class="flex items-center mt-[28rpx]"
+                    class="flex items-center pl-[22rpx] mt-[32rpx]"
                   >
                     <div class="mr-[26rpx] flex items-center">
                       <tm-image
                         :width="40"
-                        :height="40"
+                        :height="43"
                         :src="zu3289"
                       ></tm-image>
                     </div>
@@ -78,6 +78,8 @@
           :round="1"
           prefix="tmicon-search"
           prefixColor="#46299D"
+          placeholderStyle="color:#BABABA"
+          class="input_search"
         ></tm-input>
       </div>
       <div class="contentRoot">
@@ -191,6 +193,17 @@ page {
   display: flex;
   flex-direction: column;
 }
+
+::v-deep .index_top_navbar > .statusHeight:first-child{
+  height: 70px !important;
+}
+::v-deep .index_top_navbar .statusHeightTop{
+  height: 70px !important;
+}
+::v-deep .index_top_navbar .statusHeightTop > .noNvueBorder:first-child{
+  height: 70px !important;
+}
+
 .root {
   flex: 1;
   padding: 20rpx 0;
@@ -198,6 +211,14 @@ page {
 .searchRoot {
   background-color: #fff;
   padding: 22rpx 18rpx;
+  /* ::v-deep .input_search{
+
+    background: #F9F9FD !important;
+  } */
+  ::v-deep .noNvueBorder > .noNvueBorder > .noNvueBorder{
+    // border: 1px solid red !important;
+    background: #F9F9FD !important;
+  }
 }
 .contentRoot {
   margin-top: 20rpx;
@@ -210,7 +231,7 @@ page {
 }
 .popoverBox {
   :deep(.popover-bcc) {
-    transform: translateX(20rpx) translateY(40rpx);
+    transform: translateX(16rpx) translateY(48rpx);
   }
 }
 </style>

src/store/auth/index.js

@@ -5,7 +5,7 @@ import { userInfoApi } from "@/api/user";
 import {ref} from 'vue'
 export const useAuth = createGlobalState(() => {
   // const token = useStorage('token', '', uniStorage)
-  const token = ref('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b892d39c9c0de979228015326a8fde48c55b8d48be643cb00da04330faa68977c689c6d523213435a2d92e3fab2976a1f5a6d4bfcb6c7aba3b4924873003b6492a2d0b81da4722162c68aeeec942eb2a85d')
+  const token = ref("79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caba0afc18e7cb819d125e8c04282beb5d4dd454307169f7eb51cd3dbbee20c1a17784f78ad30c3b3a102bd03c3218080beedae501a95c365d360a7a0d682cba2eca94a2915c13f0bdcb42f2eab9458cb4bd89ae6f3200fe4893d64caf1bce02894aab876f94f7825d23be507733468deba21734b6d666b75fd0bee74753fdd6ca5def7ec42cd7dbb47750e61cac6965f34fd71b52be66a472d3ee5b1e4661e59da7e6afd4318037c409b3045facceba2de00b33c8a3a6021cb08123b05176e907ca588faf86a3f1e7113f4a6c56227873d1e087c79aa53c4b4a2cf73722a967ee5ebb5963486f9b25179fb3d37da14482")
   const refreshToken = useStorage('refreshToken', '', uniStorage)
   const userInfo = useStorage('userInfo', {}, uniStorage)
   const leaderList = useStorage('leaderList', [], uniStorage)