Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/assets/scss/iframe.scss

@@ -1,4 +1,4 @@
-$themeColor: #075985;
+$themeColor: #0859d6;
 
 .text-size-small {
   font-size: 12px;

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/hooks/useTheme.js

@@ -1,6 +1,6 @@
 /*主题颜色*/
 const color = {
-    primary: '#075985' //主体色
+    primary: '#0859d6' //主体色
 };
 
 /*获取vant主题变量配置*/

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/guide.vue

@@ -0,0 +1,29 @@
+<template>
+  <div class="guide-container">
+    <img src="/src/assets/image/gsgj.jpg" alt="">
+    <div class="guide-container-text">请长按图片关注</div>
+  </div>
+</template>
+<script setup>
+import { onMounted } from "vue";
+onMounted(() => {
+  // window.location.href = 'https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzg3MjExMjA4NA==&scene=126#wechat_redirect'
+})
+</script>
+<style scoped lang="scss">
+.guide-container {
+  width: 100%;
+  display: flex;
+  padding-top: 10vh;
+  align-items: center;
+  flex-direction: column;
+  .guide-container-text {
+    font-size: 20px;
+    margin-top: 20px;
+    color: #999;
+  }
+  img {
+    width: 50%;
+  }
+}
+</style>

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/index.vue

@@ -27,7 +27,9 @@
               <div class="item-text">{{ item.name }}</div>
             </div>
             <div class="item" @click="showBottom = true">
-              <div class="item-img"></div>
+              <div class="item-img">
+                <img src="/src/assets/image/add.png"></img>
+              </div>
               <div class="item-text">配置</div>
             </div>
           </div>

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/router.js

@@ -67,6 +67,11 @@ const routes = [
         name: 'pdfPreview',
         meta: { title: 'PDF预览' },
         component: () => import("@pages/pdfPreview/index.vue"),
+    },{
+        path: '/guideAttentionToOfficialAccount',
+        name: 'guideAttentionToOfficialAccount',
+        meta: { title: '引导关注公众号' },
+        component: () => import("@pages/guide.vue"),
     }, {
         path: '/:pathMatch(.*)*',
         name: 'notFound',

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/utility/defaultData.js

@@ -33,7 +33,7 @@ export const fixedFieldTaskType = [
 //任务状态
 export const fixedFieldTaskStatus = [
   { label: "未开始", value: "0", type: "info", color: '#B9B9B9' },
-  { label: "进行中", value: "1", type: "primary", color: '#075985' },
+  { label: "进行中", value: "1", type: "primary", color: '#0859d6' },
   { label: "已完成", value: "2", type: "success", color: '#07C160' },
   { label: "已超时", value: "3", type: "danger", color: '#EE0A24' },
 ];

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/utility/generalVariables.js

@@ -192,5 +192,15 @@ export const getRouterImg = (routerName, file = 'moduleImageNew') => {
     return '';
   }
   const path = routerName.indexOf('/') !== -1 ? routerName.split('/')[1] : routerName;
+  // 访客计划单独放
+  if (path === 'visitor') {
+    const info = {
+      homeImage: new URL('/src/assets/image/module/min_order.png', import.meta.url).href,
+      moduleImageNew: new URL('/src/assets/image/module/visitorPlan.png', import.meta.url).href,
+      moduleImage: new URL('/src/assets/image/module/order.png', import.meta.url).href,
+    }
+    console.log(path, file)
+    return info[file] || '';
+  }
   return routingInfos[path]?.[file] || '';
 };

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5331,7 +5331,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             Object str = find.get().get("workingTime");
                             if (str instanceof Double) {
                                 //String newStr = (double)find.get().get("workingTime")+"(请假)";
-                                String newStr = (double)find.get().get("workingTime")+"("+MessageUtils.message("leave.leave")+leave.getTimeHours()+"h)";
+                                double leaveHours = 0.0;
+                                if (leave.getStartDate().isEqual(leave.getEndDate())) {
+                                    leaveHours = leave.getTimeHours();
+                                } else {
+                                    //跨天请假
+                                    leaveHours = leave.getTimeHours()/leave.getTimeDays();
+                                }
+                                String newStr = (double)find.get().get("workingTime")+"("+MessageUtils.message("leave.leave")+leaveHours+"h)";
                                 find.get().put("workingTime", newStr);
                             }
                         } else {