Merge branch 'dev' of United_Software/k_online_ui into test

src/components/AIRobot/src/AIRobot.vue

@@ -230,7 +230,9 @@ defineExpose({
         </span>
       </div>
     </div>
-    <div class="dialogue_title">Hi! I'm your Freight Assistant, always on call</div>
+    <div class="dialogue_title" style="margin-bottom: 0">
+      Hi! I'm your Freight Assistant, always on call
+    </div>
   </div>
   <!-- 悬浮icon -->
   <div class="AIRobot flex_center" v-if="AIIconVisible">
@@ -273,8 +275,8 @@ defineExpose({
 .AIRobot-top {
   position: absolute;
   z-index: 2013;
-  right: 50px;
-  bottom: 230px;
+  right: 35px;
+  bottom: 188px;
 }
 .dialogue_content_title {
   display: flex;
@@ -308,15 +310,19 @@ defineExpose({
   cursor: pointer;
 }
 .AIRobot {
-  width: 64px;
-  height: 64px;
+  width: 50px;
+  height: 50px;
   border-radius: 12px;
   background: var(--color-dialogue-icon-bg);
   position: absolute;
   box-shadow: -2px 2px 12px rgba(0, 0, 0, 15%);
   z-index: 2013;
-  right: 20px;
-  bottom: 164px;
+  right: 10px;
+  bottom: 130px;
+  img {
+    width: 36px;
+    height: 36px;
+  }
 }
 .AIRobot_dialog {
   background: var(--color-dialogue-text-bg);

src/components/ScoringGrade/src/ScoringGrade.vue

@@ -405,19 +405,24 @@ onMounted(() => {
 </template>
 
 <style lang="scss">
-.scoring {
-  width: 64px;
-  height: 64px;
+div.scoring {
+  width: 50px;
+  height: 50px;
   border-radius: 12px;
   background-color: var(--management-bg-color);
   position: absolute;
   box-shadow: -2px 2px 12px rgba(0, 0, 0, 15%);
   z-index: 2013;
-  right: 20px;
-  bottom: 80px;
+  right: 10px;
+  bottom: 64px;
   display: flex;
   align-items: center;
   justify-content: center;
+  img {
+    width: 36px;
+    height: 36px;
+    margin: 3px 0 0 4px;
+  }
 }
 .el-avatar {
   background-color: var(--management-bg-color);

src/views/Tracking/src/components/PublicTracking/src/components/PublicTrackingDetail.vue

@@ -312,22 +312,23 @@ const openShareDialog = () => {
   }
   .share-link {
     position: fixed;
-    bottom: 152px;
-    right: 0px;
+    bottom: 130px;
+    right: 10px;
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 64px;
-    height: 64px;
+    width: 50px;
+    height: 50px;
     z-index: 1500;
     background-color: var(--management-bg-color);
     box-shadow: -2px 2px 12px rgba(0, 0, 0, 0.15);
-    border-radius: 12px 0 0 12px;
+    border-radius: 12px;
     &:hover {
       background-color: var(--border-hover-color);
     }
     .share-icon {
-      font-size: 24px;
+      margin-top: 3px;
+      font-size: 28px;
     }
   }
 }

src/views/Tracking/src/components/TrackingDetail/src/TrackingDetail.vue

@@ -497,13 +497,13 @@ const SubscribeShipments = () => {
   }
   .share-link {
     position: fixed;
-    bottom: 248px;
-    right: 20px;
+    bottom: 196px;
+    right: 10px;
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 64px;
-    height: 64px;
+    width: 50px;
+    height: 50px;
     z-index: 1500;
     background-color: var(--management-bg-color);
     box-shadow: -2px 2px 12px rgba(0, 0, 0, 0.15);
@@ -512,7 +512,8 @@ const SubscribeShipments = () => {
       background-color: var(--border-hover-color);
     }
     .share-icon {
-      font-size: 24px;
+      margin-top: 3px;
+      font-size: 28px;
     }
   }
 }

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -268,6 +268,13 @@ const trackingTable = ref<any>({
   headerRowStyle: {
     backgroundColor: 'var(--color-table-header-bg)'
   },
+  cellStyle: ({ column }) => {
+    if (column.title === 'Action' && themeStore.theme === 'dark') {
+      return {
+        backgroundColor: '#363940'
+      }
+    }
+  },
   menuConfig: {
     body: {
       options: [
@@ -617,18 +624,14 @@ defineExpose({
       </template>
       <!-- action操作的插槽 -->
       <template #action="{ row }">
-        <el-button
-          class="recent_button el-button--blue"
-          @click="SubscribeShipments(row)"
-          :class="row.is_subscribe ? 'IsSubscribe' : ''"
-        >
-          <span v-if="row.is_subscribe" class="iconfont_icon">
-            <svg class="iconfont" aria-hidden="true">
+        <el-button class="recent_button el-button--blue" @click="SubscribeShipments(row)">
+          <span v-if="row.is_subscribe" style="color: 'red'" class="iconfont_icon">
+            <svg class="iconfont" aria-hidden="true" style="fill: var(--color-theme)">
               <use xlink:href="#icon-icon_marked_b"></use>
             </svg>
           </span>
-          <span v-else class="iconfont_icon">
-            <svg class="iconfont" aria-hidden="true">
+          <span v-else class="iconfont_icon" style="color: 'red'">
+            <svg class="iconfont" aria-hidden="true" style="color: 'red'">
               <use xlink:href="#icon-icon_unmark_b"></use>
             </svg>
           </span>