From c10a0be121da678ad859fc0dc89b10e77d025cc6 Mon Sep 17 00:00:00 2001
From: wangzhuo <wangzhuo03@sevenstatr.com>
Date: Mon, 1 Sep 2025 13:29:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A1=E5=88=92=E6=9F=A5=E7=9C=8B-?=
 =?UTF-8?q?=E5=A4=B4=E9=83=A8=E7=A9=BA=E7=99=BD=E9=AB=98=E5=BA=A6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/plan/getPlan.js              |  9 +--
 src/pages/business/CRM/plan/index.vue    |  2 +-
 src/pages/business/CRM/plan/myPlan.vue   | 24 +++---
 src/pages/business/CRM/plan/planView.vue | 98 ++++++++++++------------
 4 files changed, 61 insertions(+), 72 deletions(-)

diff --git a/src/api/crm/plan/getPlan.js b/src/api/crm/plan/getPlan.js
index fcac988..17eb535 100644
--- a/src/api/crm/plan/getPlan.js
+++ b/src/api/crm/plan/getPlan.js
@@ -1,12 +1,5 @@
 import request from "@/utils/request"
-
-export function getPersonalPlanList(params) {
-    return request.post({
-        url: '/getPersonalPlanList',
-        params
-    })
-}
-
+// 获取用户信息
 export function getUserInfo(data) {
     return request.get({
         url: '/crm/app/user/getUserInfo',
diff --git a/src/pages/business/CRM/plan/index.vue b/src/pages/business/CRM/plan/index.vue
index 0b585c5..1117302 100644
--- a/src/pages/business/CRM/plan/index.vue
+++ b/src/pages/business/CRM/plan/index.vue
@@ -8,7 +8,7 @@
       <!-- #endif -->
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="top-height"></view>
 
       <view class="white-bg">
         <navigator url="/pages/business/CRM/plan/myPlan">
diff --git a/src/pages/business/CRM/plan/myPlan.vue b/src/pages/business/CRM/plan/myPlan.vue
index 9217f13..f9670ab 100644
--- a/src/pages/business/CRM/plan/myPlan.vue
+++ b/src/pages/business/CRM/plan/myPlan.vue
@@ -28,9 +28,9 @@
       </view>
 
       <view class="nav-list">
-          <view class="nav-item" :class="{active:index==activeTab}"
-                    v-for="(item,index) in allPlans" :key="index"
-                    @click="handleNav(index)"
+        <view class="nav-item" :class="{active:index==activeTab}"
+              v-for="(item,index) in allPlans" :key="index"
+              @click="handleNav(index)"
         >{{ getTapLabel(item) }}
         </view>
       </view>
@@ -54,7 +54,7 @@
             </view>
           </view>
         </view>
-		<view class='bottom-spliter bg-gray'></view>
+        <view class='bottom-spliter bg-gray'></view>
       </block>
 
       <!-- 底部加高度来避免tabbar遮挡 -->
@@ -269,13 +269,13 @@ function handleEdit(index) {
 }
 
 .white-bg.white-bg-2 {
-/*  margin-bottom: 20rpx; */
+  /*  margin-bottom: 20rpx; */
 }
 .bottom-spliter{
-	height: 20rpx;
+  height: 20rpx;
 }
 .bg-gray{
-	background-color: #f0f0f0;
+  background-color: #f0f0f0;
 }
 .report-list .w-b-title .btn-edit {
   background-color: #5C96F7;
@@ -286,14 +286,14 @@ function handleEdit(index) {
 }
 
 .nav-list {
-/*  display: flex;*/
-/*  width: 690rpx;*/
+  /*  display: flex;*/
+  /*  width: 690rpx;*/
   overflow-x: auto;   /* 允许横向滚动 */
   /*overflow-y: hidden;  隐藏垂直滚动 */
   /*-ms-overflow-style: none;   IE 隐藏滚动条 */
- /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
+  /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
   /* 添加高度以确保有足够的空间 */
-/*  height: 80rpx;*/
+  /*  height: 80rpx;*/
   white-space: nowrap; /* 保持子元素在同一行显示 */
   /* 添加这些属性确保滚动正常工作 */
   scroll-behavior: smooth;
@@ -310,7 +310,7 @@ function handleEdit(index) {
 }
 .nav-list .nav-item {
   /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
-/*  width: 200rpx;*/
+  /*  width: 200rpx;*/
   display: inline-block;
   background-color: #05A3F4;
   border-radius: 10rpx;
diff --git a/src/pages/business/CRM/plan/planView.vue b/src/pages/business/CRM/plan/planView.vue
index e6993e7..2f999c7 100644
--- a/src/pages/business/CRM/plan/planView.vue
+++ b/src/pages/business/CRM/plan/planView.vue
@@ -11,8 +11,7 @@
       </customHeader>
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
-
+      <view class="top-height"></view>
       <!-- 正文内容 -->
       <view>
 
@@ -37,61 +36,61 @@
         </view>
 
         <!-- 分页部分  -->
-<!--        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
-<!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
-<!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
-          <view class="white-bg" v-if="list.length">
-            <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
-            <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
-              {{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
-              <span class="line"></span>
-              {{searchValue.selectDate.substring(0, 4) }}年
-            </view>
+        <!--        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
+        <!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
+        <!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
+        <view class="white-bg" v-if="list.length">
+          <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
+          <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
+            {{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
+            <span class="line"></span>
+            {{searchValue.selectDate.substring(0, 4) }}年
+          </view>
+          <uni-row class="demo-uni-row">
+            <uni-col :span="1">
+              <view class="demo-uni-col right-radius">序号</view>
+            </uni-col>
+            <uni-col :span="2">
+              <view class="demo-uni-col left-radius">姓名</view>
+            </uni-col>
+            <block v-for="(field, i) in OrdinalDate">
+              <uni-col :span="3">
+                <view class="demo-uni-col mar-left">
+                  <text>{{ WeekShortCN[i] }}</text>
+                  <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
+                </view>
+              </uni-col>
+            </block>
+          </uni-row>
+          <block v-for="(item, index) in list" :key="index">
             <uni-row class="demo-uni-row">
               <uni-col :span="1">
-                <view class="demo-uni-col right-radius">序号</view>
+                <view class="demo-uni-col right-radius">
+                  <text>{{ index + 1 }}</text>
+                </view>
               </uni-col>
               <uni-col :span="2">
-                <view class="demo-uni-col left-radius">姓名</view>
+                <view class="demo-uni-col left-radius">
+                  <text>{{ item.nickName || item.userName }}</text>
+                </view>
               </uni-col>
-              <block v-for="(field, i) in OrdinalDate">
+              <block v-for="(field, i) in WorkType">
                 <uni-col :span="3">
-                  <view class="demo-uni-col mar-left">
-                    <text>{{ WeekShortCN[i] }}</text>
-                    <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
+                  <view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
+                        :style="{ backgroundColor: COLOR_MAP[item[field]] }"
+                  ><!--@click="handleView(index, i)"-->
+                    <text v-if="item[field]">{{ item[field] }}</text>
+                    <text v-else style="color: gray">暂无</text>
                   </view>
                 </uni-col>
               </block>
             </uni-row>
-            <block v-for="(item, index) in list" :key="index">
-              <uni-row class="demo-uni-row">
-                <uni-col :span="1">
-                  <view class="demo-uni-col right-radius">
-                    <text>{{ index + 1 }}</text>
-                  </view>
-                </uni-col>
-                <uni-col :span="2">
-                  <view class="demo-uni-col left-radius">
-                    <text>{{ item.nickName || item.userName }}</text>
-                  </view>
-                </uni-col>
-                <block v-for="(field, i) in WorkType">
-                  <uni-col :span="3">
-                    <view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
-                          :style="{ backgroundColor: COLOR_MAP[item[field]] }"
-                    ><!--@click="handleView(index, i)"-->
-                      <text v-if="item[field]">{{ item[field] }}</text>
-                      <text v-else style="color: gray">暂无</text>
-                    </view>
-                  </uni-col>
-                </block>
-              </uni-row>
-            </block>
-          </view>
-          <view v-else style="text-align: center; margin-top: 50%; color: white">
-            暂无数据
-          </view>
-<!--        </mescroll-uni>-->
+          </block>
+        </view>
+        <view v-else style="text-align: center; margin-top: 50%; color: white">
+          暂无数据
+        </view>
+        <!--        </mescroll-uni>-->
       </view>
     </view>
   </view>
@@ -144,10 +143,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../../../static/images/mescroll-empty.png"
-  },
+  empty: {tip: '~ 空空如也 ~'},
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });