fix: 我的计划和计划编辑优化

fix: 计划查看模态弹窗替换为自定义的模态弹窗
feat: 自定义模态弹窗组件（支持蒙层触摸关闭、文本换行显示）
2025-09-18 22:20:13 +08:00 · 2025-09-18 19:44:17 +08:00 · 2025-09-18 19:41:25 +08:00 · 2025-09-17 21:59:03 +08:00 · 2025-09-17 21:52:58 +08:00 · 2025-09-17 21:49:53 +08:00
20 changed files with 680 additions and 498 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,12 +1,16 @@

 #调用后台地址
-# 公司
-VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
+# 贝英斯公司
+# VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
 # VITE_APP_BASE_URL = "http://192.168.236.71:31302"
 # VITE_APP_BASE_URL = "http://123.57.20.168:3000"

-# 友晟外网
+# 友晟test外网
 # VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
-# 友晟内网
+# 友晟test内网
 # VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'

+# 友晟线上内网
+# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
+# 友晟线上外网网
+VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'
--- a/.env.production
+++ b/.env.production
@@ -1,11 +1,16 @@

 #调用后台地址
-# 公司
+# 贝英斯公司
 # VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
 # VITE_APP_BASE_URL = "http://192.168.236.71:31302"
 # VITE_APP_BASE_URL = "http://123.57.20.168:3000"

-# 友晟外网
-VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
-# 友晟内网
-# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
+# 友晟test外网
+# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
+# 友晟test内网
+# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
+
+# 友晟线上内网
+# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
+# 友晟线上外网网
+VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'
--- a/src/components/closeableModal.vue
+++ b/src/components/closeableModal.vue
@@ -0,0 +1,169 @@
+<!--
+ * @author wangzhuo
+ * @date 2025/9/18 10:30
+ * @description 模态弹窗组件（支持点击蒙层关闭、支持换行显示内容）
+-->
+<template>
+  <view class="model" v-if="modelValue" @click="handleClose" @touchmove.prevent @mousewheel.prevent>
+    <view v-if="closeTip" style="color:rgba(255,255,255,0.15); letter-spacing: 5rpx; margin-top: 50%;text-align: center">{{closeTip}}</view>
+    <view class="model-con" @click.stop>
+      <view class="model-top" v-if="title">{{ title }}</view>
+      <view :class="{'model-middle': true,'m-height': !title}">
+        <view v-for="text in content.split('\n')">{{text}}</view>
+      </view>
+      <view class="model-bottom">
+        <button v-if="cancelBtn" type="primary" class="btn-cancel" @click="handleCancel">{{ cancelText }}</button>
+        <button v-if="confirmBtn" type="default" class="btn-green" @click="handleConfirm" :loading="loading"
+                :disabled="loading">{{ confirmText }}
+        </button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref} from 'vue'
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  closeTip: {
+    type: String,
+    default: "点按空白处取消",
+  },
+  title: {
+    type: String,
+  },
+  content: {
+    type: String
+  },
+  cancelBtn: {
+    type: Boolean,
+    default: true
+  },
+  confirmBtn: {
+    type: Boolean,
+    default: true
+  },
+  cancelText: {
+    type: String,
+    default: '取消'
+  },
+  confirmText: {
+    type: String,
+    default: '确认'
+  }
+})
+
+let loading = ref(false);
+
+// 调用父组件的方法
+const emit = defineEmits(['update:modelValue', 'cancel', 'confirm', 'success'])
+
+// 点击蒙层关闭模态窗
+const handleClose = () => {
+  emit('update:modelValue', false);
+}
+
+const handleCancel = () => {
+  emit('cancel');
+  emit('success', 'cancel')
+  handleClose();
+}
+
+const handleConfirm = () => {
+  emit('confirm');
+  emit('success', 'confirm')
+  handleClose();
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.model {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 9999;
+
+  .model-con {
+    background: #fff;
+    position: fixed;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    top: 50%;
+    left: 50%;
+    width: 500rpx;
+    min-height: 278rpx;
+    margin-left: -270rpx;
+    margin-top: -139rpx;
+    border-radius: 24rpx;
+    padding: 20rpx 30rpx;
+  }
+
+  .model-top {
+    text-align: center;
+    padding: 20rpx 0;
+    font-size: 36rpx;
+    font-weight: 700;
+  }
+
+  .model-middle {
+    // margin-top:290rpx;
+    text-align: start;
+    font-size: 30rpx;
+    //line-height: 42rpx;
+    color: #333333;
+
+    .font-green {
+      color: #05A3F4;
+      font-size: 42rpx;
+      font-weight: bold;
+      padding: 20rpx 0;
+    }
+  }
+
+  .m-height {
+    padding-top: 28rpx;
+  }
+
+  .model-bottom {
+    display: flex;
+    justify-content: center;
+    padding: 30rpx 0 20rpx;
+    // align-items: center;
+    .btn-green, .btn-cancel {
+      background-color: #fff;
+      color: #05A3F4;
+      border-radius: 48rpx;
+      width: 200rpx;
+      height: 65rpx;
+      line-height: 60rpx;
+      text-align: center;
+      font-size: 30rpx;
+      border: 1px solid #05A3F4;
+      margin-left: 0rpx !important;
+      margin-right: 0 !important;
+
+      &::after {
+        border: none;
+        border-radius: 37rpx;
+      }
+    }
+
+    .btn-green {
+      border: 1px solid #05A3F4;
+      background-color: #05A3F4;
+      color: #fff;
+      margin-left: 20rpx !important;
+    }
+  }
+}
+</style>
--- a/src/pages.json
+++ b/src/pages.json
@@ -331,7 +331,8 @@
 			"path": "pages/business/CRM/plan/planView",
 			//周计划查看
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
--- a/src/pages/business/CRM/customer/changeCustomerOwner.vue
+++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue
@@ -24,7 +24,7 @@
        </view>

        <!-- 分页部分  top="68rpx" -->
-        <mescroll-uni  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+        <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}"
        >
@@ -126,7 +126,7 @@ let list = ref([]);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
+  empty: {
    tip: '~ 空空如也 ~',
    icon: "../../../../static/images/mescroll-empty.png"
  },
@@ -149,44 +149,31 @@ const mescrollInit = (mescroll) => {

 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    uni.showLoading();
-    cssFlag.value = true;
-    setTimeout(async () => {
-      // 重置页码为第一页
-      const res = await getList(1, mescroll.size || upOption.page.size);
-      list.value = res.list;
-      cssFlag.value = false;
-      // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      uni.hideLoading();
-
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+  uni.showLoading();
+  cssFlag.value = true;
+  setTimeout(async () => {
+    // 重置页码为第一页
+    const res = await getList(1, mescroll.size || upOption.page.size);
+    cssFlag.value = false;
+    list.value = res.list;
+    // 正确传递 total 参数
+    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+  }, 500);
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
-    uni.showLoading();
-    setTimeout(async () => {
-      // 使用 mescroll 提供的页码和大小参数
-      const res = await getList(mescroll.num, mescroll.size);
-      if (mescroll.num === 1) {
-        list.value = res.list;
-      } else {
-        list.value.push(...res.list);
-      }
-      // 正确判断是否还有更多数据
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      uni.hideLoading();
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+  uni.showLoading();
+  setTimeout(async () => {
+    // 使用 mescroll 提供的页码和大小参数
+    const res = await getList(mescroll.num, mescroll.size);
+    if (mescroll.num === 1) {
+      list.value = res.list;
+    } else {
+      list.value.push(...res.list);
+    }
+    // 正确判断是否还有更多数据
+    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+  }, 500);
 }

 // 获取数据列表
@@ -197,12 +184,17 @@ const getList = (pageIndex, pageSize) => {
      pageSize,
      searchContent: searchValue.value
    }
-
-    let res = await SearchForAllPerson(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
+    try {
+      let res = await SearchForAllPerson(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, '数据获取失败');
+    } finally {
+      uni.hideLoading();
+    }
  });
 }

@@ -303,41 +295,20 @@ let handleCopyInfo = (item) => {
 }
 </script>

-<style lang="scss" scoped>
+<style scoped>
 .all-body {
  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
 .scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
+  height: 100%;
 }

 .white-bg {
@@ -348,10 +319,4 @@ let handleCopyInfo = (item) => {
  }
 }

-.white-bg:hover {
-  //background-color: #f1f1f1;
-  background-color: #f1f1f1; /* Chrome, Safari, Opera */
-  box-shadow: 0px 0px 5rpx white;
-  //filter: rgba(237, 242, 250, 0.5);
-}
 </style>
--- a/src/pages/business/CRM/customer/components/customerUserEdit.vue
+++ b/src/pages/business/CRM/customer/components/customerUserEdit.vue
@@ -612,12 +612,11 @@ let submitForm = async () => {
        uni.showToast({
          title: "更新成功"
        })
+        const eventChannel = instance.getOpenerEventChannel();
+        eventChannel.emit("refreshCusUserList");
        setTimeout(()=>{
          uni.navigateBack();
-          const eventChannel = instance.getOpenerEventChannel();
-          eventChannel.emit("refreshCusUserList");
        },1000);
-
      }else{
        uni.showToast({
          title: "操作失败",
--- a/src/pages/business/CRM/customer/customerAudit.vue
+++ b/src/pages/business/CRM/customer/customerAudit.vue
@@ -7,7 +7,13 @@
  <view class="con-body">
    <view class="con-bg">
      <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="false">
+      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="list.length > 0">
+        <template #right>
+          <view class="head-right" @click="handleReSort">
+            <uni-icons type="arrow-down" size="20" color="#B7D2FF"></uni-icons>
+            {{iconType==='arrow-up'?'最新':'最早'}}
+          </view>
+        </template>
      </customHeader>

      <!-- 高度来避免头部遮挡 -->
@@ -17,12 +23,12 @@
      <view class="all-body">
        <!-- 搜索-->
        <view class="search">
-<!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
-<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
-<!--                          v-model="searchValue"-->
-<!--          />-->
+          <!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
+          <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
+          <!--                          v-model="searchValue"-->
+          <!--          />-->
          <view class="custom-search"></view>
-          </view>
+        </view>

        <!-- 分页部分  -->
        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -101,18 +107,22 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
  handleSearch()
 })
-let clearSearchValue = () => {
-  searchValue.value = '';
+// 排序图标
+const iconType = ref('arrow-up');
+let handleReSort = () => {
+  iconType.value = iconType.value === 'arrow-down' ? 'arrow-up' : 'arrow-down';
+  list.value = list.value.reverse();
 }
+
 // 查询列表
 let list = ref([]);

 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
+  empty: {
    tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
  },
  textLoading: '加载中...',
  textNoMore: '已经到底了'
@@ -133,10 +143,11 @@ const mescrollInit = (mescroll) => {

 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    uni.showLoading();
-    cssFlag.value = true;
-    setTimeout(async () => {
+
+  uni.showLoading();
+  cssFlag.value = true;
+  setTimeout(async () => {
+    try {
      // 重置页码为第一页
      const res = await getList(1, mescroll.size || upOption.page.size);

@@ -144,17 +155,21 @@ const downCallback = async (mescroll) => {
      // 正确传递 total 参数
      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
      uni.hideLoading();
+
+    } catch (error) {
+      console.log(error)
+      mescroll.endErr();
+    } finally {
      cssFlag.value = false;
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    }
+  }, 500);
+
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
-    setTimeout(async () => {
+
+  setTimeout(async () => {
+    try {
      // 使用 mescroll 提供的页码和大小参数
      const res = await getList(mescroll.num, mescroll.size);
      if (mescroll.num === 1) {
@@ -165,11 +180,11 @@ const upCallback = async (mescroll) => {
      mescroll.endBySize(res.list.length, res.total);
      // 正确判断是否还有更多数据
      mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    } catch (error) {
+      mescroll.endErr();
+    }
+  }, 500);
+
 }

 // 获取数据列表
@@ -180,12 +195,17 @@ const getList = (pageIndex, pageSize) => {
      pageSize,
      searchContent: searchValue.value
    }
-
-    let res = await getCusUserApprovalList(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
+    try {
+      let res = await getCusUserApprovalList(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, "客户人员审核任务列表获取失败");
+    } finally {
+      uni.hideLoading();
+    }
  });
 }

@@ -210,22 +230,17 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

 .scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
+  height: 100%;
 }

 .white-bg {
--- a/src/pages/business/CRM/customer/customerUserBelong.vue
+++ b/src/pages/business/CRM/customer/customerUserBelong.vue
@@ -134,7 +134,7 @@ const upOption = ref({
  noMoreSize: 5,
  empty: {
    tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
  },
  textLoading: '加载中...',
  textNoMore: '已经到底了'
@@ -155,27 +155,27 @@ const mescrollInit = (mescroll) => {

 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    cssFlag.value = true;
-    uni.showLoading();
-    setTimeout(async () => {
+  cssFlag.value = true;
+  uni.showLoading();
+  setTimeout(async () => {
+    try {
      // 重置页码为第一页
      const res = await getList(1, mescroll.size || upOption.page.size);
-      cssFlag.value = false;
      list.value = res.list;
      // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-      uni.hideLoading();
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+    } catch (error) {
+      mescroll.endErr();
+    } finally {
+      cssFlag.value = false;
+    }
+  }, 500);
+
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
-    setTimeout(async () => {
+  setTimeout(async () => {
+    try {
      // 使用 mescroll 提供的页码和大小参数
      const res = await getList(mescroll.num, mescroll.size);
      if (mescroll.num === 1) {
@@ -184,13 +184,12 @@ const upCallback = async (mescroll) => {
        list.value.push(...res.list);
      }
      // 正确判断是否还有更多数据
-      mescroll.endBySize(res.list.length, res.total)
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
      // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    } catch (error) {
+      mescroll.endErr();
+    }
+  }, 500);
 }

 // 获取数据列表
@@ -201,12 +200,18 @@ const getList = (pageIndex, pageSize) => {
      pageSize,
      searchContent: searchValue.value
    }
+    try {
+      let res = await SearchForAllCustomersSalesperson(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, "获取所有客户人员所属失败");
+    } finally {
+      uni.hideLoading();
+    }

-    let res = await SearchForAllCustomersSalesperson(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
  });
 }

@@ -217,6 +222,7 @@ let handleDetail = (item) => {
      url: "/pages/business/CRM/customer/components/customerUserEdit",
      events: {
        refreshCusUserList() {
+          console.log('refreshCusUserList',"响应刷新")
          handleSearch();
        }
      },
@@ -224,7 +230,7 @@ let handleDetail = (item) => {
        res.eventChannel.emit('editCusData', {param: item, isAdd: false})
      }
    })
-  }else{
+  } else {
    uni.showToast({
      title: '已完成审核，不可修改',
      icon: 'none'
@@ -278,16 +284,15 @@ let handleDelete = async (item) => {
 <style lang="scss" scoped>
 .all-body {
  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

-
 .search .btn-search {
  border: none;
  background: none;
--- a/src/pages/business/CRM/customer/selectCustomer.vue
+++ b/src/pages/business/CRM/customer/selectCustomer.vue
@@ -80,9 +80,9 @@ let cssFlag=ref(false);//控制样式
 const upOption = ref({
  page: { num: 0, size: 10 },
  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
  },
  textLoading: '加载中...',
  textNoMore: '已经到底了'
@@ -195,15 +195,14 @@ const radioChange = (e) => {
 <style lang="scss" scoped>
 .all-body {
  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }
-
 .search .btn-search {
  border: none;
  background: none;
--- a/src/pages/business/CRM/mainOwner/audit/confirmForm.vue
+++ b/src/pages/business/CRM/mainOwner/audit/confirmForm.vue
@@ -602,11 +602,11 @@ let handleReject = () => {
    async success(res){
      if(res.confirm){
        if(res.content){
-          let res = await changeOfPrimaryOwnershipNoApproved({
+          let response = await changeOfPrimaryOwnershipNoApproved({
            opinionOwn: res.content,
            userId: formData.value.userId
          })
-          if(res.code==200){
+          if(response.code===200){
            uni.showToast({
              title: '操作成功',
              success(){
--- a/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
+++ b/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
@@ -16,13 +16,12 @@
      <!-- 正文内容 -->
      <view class="all-body">
        <!-- 搜索-->
-        <!--        <view class="search">-->
-        <!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
-        <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
-        <!--                          v-model="searchValue"-->
-        <!--          />-->
-        <!--          <button type="default" @click="clearSearchValue" size="mini" class="btn-search">清空</button>-->
-        <!--        </view>-->
+<!--        <view class="search">-->
+<!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
+<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
+<!--                          v-model="searchValue"-->
+<!--          />-->
+<!--        </view>-->

        <!-- 分页部分  -->
        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -31,9 +30,11 @@
        >
          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index">
            <view class="report-list" @click.stop="handleDetail(item)">
-              <view class="r-list title" >
+              <view class="r-list title">
                {{ item.cusName }}
-                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">{{item.auditStatus?'':'待您审批'}}</view>
+                <view class="r-right no-wrap" :class="item.auditStatus ? 'btn-blue' : 'btn-pink' ">
+                  {{ item.auditStatus ?  item.auditStatus : '待您审核' }}
+                </view>
              </view>
              <view class="r-list">
                <view class="r-left">客户人员名称</view>
@@ -98,7 +99,8 @@ const mescrollRef = ref(null);
 let timerId = null;
 // 查询搜索跳转
 let handleSearch = () => {
-  // 防抖搜索    console.log(searchValue.value)
+  // 防抖搜索
+  console.log(searchValue.value)
  if (timerId) clearTimeout(timerId);

  timerId = setTimeout(async () => {
@@ -113,7 +115,7 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
  handleSearch()
 })
-let clearSearchValue = ()=>{
+let clearSearchValue = () => {
  searchValue.value = '';
 }
 // 查询列表
@@ -122,7 +124,10 @@ let list = ref([]);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../../static/images/mescroll-empty.png"
+  },
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
@@ -142,28 +147,28 @@ const mescrollInit = (mescroll) => {

 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    cssFlag.value = true;
-    uni.showLoading();
-    setTimeout(async () => {
+  cssFlag.value = true;
+  uni.showLoading();
+  setTimeout(async () => {
+    try {
      // 重置页码为第一页
      const res = await getList(1, mescroll.size || upOption.page.size);
-
      list.value = res.list;
-      cssFlag.value = false;
      // 正确传递 total 参数
      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-      uni.hideLoading();
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    } catch (error) {
+      console.log(error)
+      mescroll.endErr();
+    } finally {
+      cssFlag.value = false;
+    }
+  }, 500);
+
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
-    setTimeout(async () => {
+  setTimeout(async () => {
+    try {
      // 使用 mescroll 提供的页码和大小参数
      const res = await getList(mescroll.num, mescroll.size);
      if (mescroll.num === 1) {
@@ -173,11 +178,11 @@ const upCallback = async (mescroll) => {
      }
      // 正确判断是否还有更多数据
      mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    } catch (error) {
+      console.log(error)
+      mescroll.endErr();
+    }
+  }, 500);
 }

 // 获取数据列表
@@ -188,12 +193,16 @@ const getList = (pageIndex, pageSize) => {
      pageSize,
      searchContent: searchValue.value
    }
-
-    let res = await personnelAwaitingReviewForChange(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
+    try {
+      let res = await personnelAwaitingReviewForChange(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+    } finally {
+      uni.hideLoading();
+    }
  });
 }

@@ -203,11 +212,11 @@ let handleDetail = (item) => {
  uni.navigateTo({
    url: "/pages/business/CRM/mainOwner/audit/confirmForm",
    events: {
-      refreshOwnerChangeList(){
+      refreshOwnerChangeList() {
        handleSearch();
      }
    },
-    success(res){
+    success(res) {
      res.eventChannel.emit('auditCusOwner', {data: {userId}, editable: false})
    }
  })
@@ -218,60 +227,39 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

-.search {
-  display: flex;
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.search .custom-search {
-  width: 80%;
-
-}
-
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
-.scroll-h {
+.scroll-h{
  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

 .white-bg {
  padding-bottom: 10rpx;
-  .title{
+
+  .title {
    align-items: flex-start;
  }
 }

-.btn-pink{
+.no-wrap {
  white-space: nowrap;
 }
+
+.btn-blue {
+  border-radius: 10rpx;
+}
 </style>
--- a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue
+++ b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue
@@ -1,19 +1,17 @@
+<!--
+ * @description 查看主归属人变更
+ * @update date 2025/9/17 21:45
+-->
 <template>
  <view class="con-body">
    <view class="con-bg">
      <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true" :rightFlag="false"></customHeader>
+      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true"
+                    :rightFlag="false"></customHeader>
      <!-- 高度来避免头部遮挡 -->
      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>

      <view class="all-body">
-        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
-        <view class="search">
-<!--          <uni-search-bar class="custom-search" radius="28" placeholder="检索功能待开发，感谢您的耐心等待" clearButton="auto"-->
-<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />-->
-<!--          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
-        </view>
-
        <!-- 分页部分  -->
        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
@@ -22,25 +20,17 @@
                @click="showDetail(item)">
            <view>
              <view class="report-list">
-                <view class="title">客户：{{ item.cusName }}</view>
-                <view class="r-list">
+                <view class="r-list title">{{ item.cusName }}
                  <view class="r-name">{{ item.visistCode }}</view>
-                  <view>
-
-                    <view
-                        class="r-right btn-blue"
-                        size="mini">
-                      查看
-                    </view>
-                  </view>
-
+                  <view class="r-right btn-blue no-wrap"> 查看 </view>
                </view>
+
                <view class="border-bottom"></view>
                <view class="r-list">
                  <view class="r-left">客户人员名称</view>
-                  <view class="r-right">{{ item.userName}}</view>
+                  <view class="r-right">{{ item.userName }}</view>
                </view>
-                <view class="r-list" >
+                <view class="r-list">
                  <view class="r-left">目前业务员</view>
                  <view class="r-right">{{ item.belonger }}</view>
                </view>
@@ -68,7 +58,7 @@

 <script setup>
 import customHeader from "../../../../../components/customHeader.vue";
-import { onMounted, ref } from 'vue';
+import {onMounted, ref} from 'vue';

 import {getNavBarPaddingTop} from "../../../../../utils/system";
 import MescrollUni from "mescroll-uni/mescroll-uni.vue";
@@ -88,16 +78,17 @@ let queryParams = ref({
 onMounted(() => {
  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
-onShow(()=>{
+onShow(() => {
  getList(queryParams)
 })


 let list = ref([])
+
 //获取列表信息
-function getList(queryParams){
+function getList(queryParams) {
  queryViewMainOwnerList(queryParams.value).then(res => {
-      list.value = res.rows
+    list.value = res.rows
  })
 }

@@ -153,11 +144,11 @@ const upCallback = async (mescroll) => {
 }

 const upOption = ref({
-  page: { num: 0, size: 10 },
+  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../../static/images/mescroll-empty.png"
  },
  textLoading: '加载中...',
  textNoMore: '已经到底了'
@@ -180,57 +171,43 @@ function showDetail(item) {

 </script>

-<style lang="scss" scoped>
+<style scoped>

 .all-body {
  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

-.search {
-  display: flex;
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.search .custom-search {
-  width: 80%;
-
-}
-
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
-.scroll-h {
+.scroll-h{
  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

 .white-bg {
  padding-bottom: 10rpx;
 }
+
+.title {
+  align-items: baseline
+}
+
+.no-wrap {
+  white-space: nowrap;
+}
+
+.btn-blue {
+  border-radius: 10rpx;
+}
 </style>
--- a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
+++ b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
@@ -138,6 +138,18 @@ function getCrmCusUserNewChangeOwnerList() {
 /*  min-height: 100vh; */
 }

+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
+  /* #endif */
+  overflow-y: auto;
+}
+
 .white-bg {
  padding-bottom: 10rpx;
 }
--- a/src/pages/business/CRM/marketActivity/visitReport.vue
+++ b/src/pages/business/CRM/marketActivity/visitReport.vue
@@ -27,14 +27,17 @@
                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
                      class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
-                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
+                @longpress="touchstart(item)"
+                longpress-time="1500"
+                @tap="touchend(item)"
+                >
            <view>
              <view class="report-list">
                <view class="title">客户：{{ item.cusName }}</view>
                <view class="r-list">
                  <view class="r-name">{{ item.visistCode }}</view>
-                  <view @touchstart.stop="handleStatusTouchStart"
-                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
+                  <view
+                        @click.stop="chooseStatus(item)">
                    <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
                      {{ item.status == '驳回' ? '再次提交' : item.status }}
                    </view>
@@ -211,8 +214,6 @@ const getVisitorReportList = (pageNum, pageSize) => {
 }


-let Loop = ref(0)
-let now
 const visistId = ref();
 const cusName = ref();
 const cusId = ref();
@@ -223,9 +224,6 @@ function touchstart(item) {
  cusName.value = item.cusName
  cusId.value = item.cusId
  status.value = item.status
-  now = new Date();
-  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
-  Loop.value = setTimeout(() => {
    uni.showModal({
      title: '删除',
      content: '请问要删除本条消息吗？',
@@ -257,21 +255,29 @@ function touchstart(item) {
        }
      }
    });
-  }, 750);

 }
-
-function touchend() {
-  let endDate = new Date();
-  console.log('结束时间', endDate)
-  let cha = endDate.getTime() - now.getTime();
-  console.log(cha, 'casd')
-  if (cha < 750) {
+let isLongPressed = ref(false);
+function touchend(item) {
+  visistId.value = item.visistId
+  cusName.value = item.cusName
+  cusId.value = item.cusId
+  status.value = item.status
+  // 如果未触发长按，则执行点击逻辑
+  if (!isLongPressed.value) {
    uni.navigateTo({
-      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value
+      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId="
+          + visistId.value
+          + '&cusName='
+          + cusName.value
+          + '&cusId='
+          + cusId.value
+          + '&status='
+          + status.value
    })
  }
-  clearInterval(Loop.value);
+  // 重置状态（避免影响下次事件）
+  isLongPressed.value = false;
 }

 //点击状态按钮
--- a/src/pages/business/CRM/plan/dataMap.js
+++ b/src/pages/business/CRM/plan/dataMap.js
@@ -40,7 +40,7 @@ export const COLOR_MAP = {
    "办事处": "#307af5",
    "请假": "#f2c55c",
    "法定假日": "#e88f89",/*#ED8A73*/
-    "null": "#e7e7e7"
+    "null": "#e7e7e782"
 };
 // 地区/部门
 export const AreaList = [
--- a/src/pages/business/CRM/plan/myPlan.vue
+++ b/src/pages/business/CRM/plan/myPlan.vue
@@ -17,7 +17,7 @@
      <view class="top-height"></view>

      <view class="week-plan-title">
-        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
        <view v-if="weekNum">
          {{ yearMonth }}
          <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,35 +28,42 @@
      </view>

      <view class="nav-list">
-        <view class="nav-item" :class="{active:index==activeTab}"
+        <view class="nav-item" :class="{'active': index == activeTab}"
              v-for="(item,index) in allPlans" :key="index"
              @click="handleNav(index)"
        >{{ getTapLabel(item) }}
        </view>
      </view>
-
-      <block v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="item">
-        <!-- 计划详情 -->
-        <view class="white-bg white-bg-2" :class="index == 0 ? 'white-bg-r' : ''">
-          <view class="report-list">
-            <view class="w-b-title">
-              <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
-              <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
-            </view>
-            <view class="r-list">
-              <view class="r-left">工作类型</view>
-              <view class="r-right">{{ getWorkType(index) || '' }}</view>
-            </view>
-            <view class="border-bottom b-width"></view>
-            <view class="r-list">
-              <view class="r-left">内容</view>
-              <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
+      <uni-transition :duration="300"
+                      :mode-class="['fade','slide-bottom']"
+                      :styles="{'width':'100%', 'background-color':'#f0f0f0','border-top-left-radius': '8px', 'border-top-right-radius': '8px'}"
+                      :show="showTrans">
+        <view v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="index">
+          <!-- 计划详情 -->
+          <view class="white-bg white-bg-2" :class="{'white-bg-r':index === 0}">
+            <view class="report-list">
+              <view class="w-b-title">
+                <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
+                <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
+              </view>
+              <view class="r-list">
+                <view class="r-left">工作类型</view>
+                <view class="r-right">{{ getWorkType(index) || '' }}</view>
+              </view>
+              <view class="border-bottom b-width"></view>
+              <view class="r-list">
+                <view class="r-left">内容</view>
+                <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
+              </view>
            </view>
          </view>
+          <view class='bottom-spliter'></view>
        </view>
-        <view class='bottom-spliter bg-gray'></view>
-      </block>

+        <view v-else style="text-align: center; margin-top: 50%; color: white">
+          暂无数据
+        </view>
+      </uni-transition>
      <!-- 底部加高度来避免tabbar遮挡 -->
      <!-- <view class="bottom-height bg-gray"></view> -->
    </view>
@@ -67,13 +74,12 @@

 <script setup>

-import {onMounted, ref, reactive, computed} from "vue";
+import {onMounted, ref, computed, watch} from "vue";
 import {useRoute} from "vue-router"
 import customHeader from '@/components/customHeader.vue'
 import {WeekCN, WorkType, WorkEvent, OrdinalDate} from "./dataMap";
 import {getCurrentWeekNum} from "./dateTimeUtils";
-import {getUserInfo, getWeeklyPlanList} from "@/api/crm/plan/getPlan";
-import {useMessage} from "@/utils/message";
+import {getWeeklyPlanList} from "@/api/crm/plan/getPlan";
 import {judgeThisWeek} from "@/api/crm/plan/updatePlan";

 const userInfo = ref(null)
@@ -92,8 +98,6 @@ const yearMonth = ref(null);
 const weekNum = ref(0);
 const allPlans = ref([]);
 const onShowPlan = ref(null);
-const message = useMessage();
-
 let getWorkDate = (index) => {
  return onShowPlan.value ? onShowPlan.value[OrdinalDate[index]] : '';
 };
@@ -105,7 +109,8 @@ let getWorkEvent = (index) => {
 };
 // 刷新计划列表
 const refreshPlanList = () => {
-  message.showLoading();
+  showTrans.value = false;
+  uni.showLoading();
  // 获取用户信息
  // getUserInfo().then(res => {
  //   userInfo.value = res.user;
@@ -122,12 +127,12 @@ const refreshPlanList = () => {
      weekNum.value = rows[0].date;
      yearMonth.value = rows[0].firstDayOfTheWeek.substring(0, 7);
    }
-    console.log(route.path, "：用户周计划列表获取成功");
+    console.log(route.path, "用户周计划列表获取成功");
  }).catch(err => {
-    console.warn(err, "用户周计划列表获取失败");
-    message.error("周计划获取失败");
+    console.log(err, "周计划列表获取失败")
  }).finally(() => {
-    message.hideLoading();
+    uni.hideLoading();
+    setTimeout(() => showTrans.value = true, 20);
  })
 }

@@ -137,7 +142,7 @@ onMounted(() => {

 // 判断计划是否为本周
 let isThisWeek = computed(() => {
-  let theYear = onShowPlan.value.year || onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
+  let theYear = onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
  weekNum.value = onShowPlan.value.date; // 当目前展示的计划列表变化时，更新weekNum.value
  yearMonth.value = onShowPlan.value.firstDayOfTheWeek.substring(0, 7); // 获取年月
  return date.getFullYear() === parseInt(theYear) &&
@@ -202,6 +207,19 @@ function getTapLabel(row) {
  return row.firstDayOfTheWeek.substring(0, 4) + '年' + row.month + '月 第' + row.date + '周';
 }

+// 展示动画
+const showTrans = ref(false);
+// 监听 activeTab 变化，触发动画
+watch(activeTab, (newVal, oldVal) => {
+  if (oldVal !== newVal) { // 确保不是初始化时的触发
+    showTrans.value = false; // 先隐藏
+    setTimeout(() => {
+      onShowPlan.value = allPlans.value[newVal]; // 更新计划列表视图
+      showTrans.value = true; // 再显示，触发动画
+    }, 20);
+  }
+});
+
 // 选中计划时间段
 function handleNav(index) {
  console.log(index, "tab更换时间段");
@@ -245,7 +263,7 @@ function handleEdit(index) {
 <style scoped>
 .week-plan-title {
  color: #fff;
-  padding: 0 30rpx 30rpx;
+  padding: 0 30rpx;
  display: flex;
  justify-content: space-between;
 }
@@ -271,27 +289,31 @@ function handleEdit(index) {
 .white-bg.white-bg-2 {
  /*  margin-bottom: 20rpx; */
 }
-.bottom-spliter{
+
+.bottom-spliter {
  height: 20rpx;
 }
-.bg-gray{
+
+.bg-gray {
  background-color: #f0f0f0;
 }
+
 .report-list .w-b-title .btn-edit {
  background-color: #5C96F7;
 }

 .con-bg {
-  height: 445rpx;
+  /*height: 100%;*/
+  /*  overflow-y: auto;*/
 }

 .nav-list {
  /*  display: flex;*/
  /*  width: 690rpx;*/
-  overflow-x: auto;   /* 允许横向滚动 */
+  overflow-x: auto; /* 允许横向滚动 */
  /*overflow-y: hidden;  隐藏垂直滚动 */
  /*-ms-overflow-style: none;   IE 隐藏滚动条 */
-  /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
+  /* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */
  /* 添加高度以确保有足够的空间 */
  /*  height: 80rpx;*/
  white-space: nowrap; /* 保持子元素在同一行显示 */
@@ -304,10 +326,12 @@ function handleEdit(index) {
  padding: 20rpx 30rpx 0;
  /* #endif */
 }
+
 /* 为 Webkit 浏览器隐藏滚动条 */
 .nav-list::-webkit-scrollbar {
  background-color: transparent;
 }
+
 .nav-list .nav-item {
  /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
  /*  width: 200rpx;*/
@@ -332,5 +356,4 @@ function handleEdit(index) {
  color: #3384DF;
  font-weight: bold;
 }
-
 </style>
--- a/src/pages/business/CRM/plan/planEdit.vue
+++ b/src/pages/business/CRM/plan/planEdit.vue
@@ -16,11 +16,11 @@

      <!-- 正文内容 -->
      <view class="week-plan-title">
-        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+<!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
        <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
      </view>
      <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">
-        <block v-for="(item, index) in OrdinalDate">
+        <view v-for="(item, index) in OrdinalDate">
          <view class="white-bg" :class="index==0?'white-bg-2':'white-bg-3'">
            <view class="w-b-title" @click="handleExpand(index)">
              {{ weekPlanFormData[item] }} {{ WeekCN[index] }}
@@ -29,7 +29,8 @@
              </text>
            </view>

-            <view v-show="expandFlag[index]" class="form-con">
+            <!--v-show="expandFlag[index]"-->
+            <view class="form-con" :class="{'show': expandFlag[index], 'hidden': !expandFlag[index]}">
              <uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays">
                <view class="form-picker">
                  <picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)">
@@ -41,13 +42,13 @@
                </view>
              </uni-forms-item>
              <uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays">
-                <uni-easyinput type="textarea" autoHeight v-model="weekPlanFormData[getEventField(index)]"
+                <uni-easyinput type="textarea" v-model="weekPlanFormData[getEventField(index)]"
                               placeholder="请输入" class="form-texarea"/>
              </uni-forms-item>
            </view>

          </view>
-        </block>
+        </view>
      </uni-forms>

    </view>
@@ -62,7 +63,6 @@ import {useRoute} from "vue-router"
 import {useMessage} from "@/utils/message";
 import {onLoad} from "@dcloudio/uni-app";
 import {updateWeekPlanList, addPlan} from "@/api/crm/plan/updatePlan";
-import {getUserInfo} from "@/api/crm/plan/getPlan";
 import {getDate} from "@/utils/datetime";
 import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils";

@@ -127,17 +127,10 @@ const workDays = 5;
 // const instance = getCurrentInstance().proxy;
 let instance = null;
 // 初始化创建任务
-let initCreate = (params)=>{
+let initCreate = (params) => {
  const {itemList, selectIndex} = params;
-  // 获取用户信息
-  getUserInfo().then(res => {
-    userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
-    console.warn(err, "用户信息获取失败")
-  });
-  console.log(route.path,`：创建${itemList[selectIndex]}计划`);
-  title.value="创建周计划";
+  console.log(route.path, `：创建${itemList[selectIndex]}计划`);
+  title.value = "创建周计划";
  currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月
  currentEditDate.value.weekNum = getCurrentWeekNum() + selectIndex; // 取巧做法，当期周则selectIndex为0，下周则selectIndex为1，用加法处理
  const week = getWeek2(itemList[selectIndex]); // 获取本周/下周一周日期
@@ -147,11 +140,11 @@ let initCreate = (params)=>{
  const {year, month} = week;
  weekPlanFormData.value.year = year;
  weekPlanFormData.value.month = month;
-  for(let index in OrdinalDate){
+  for (let index in OrdinalDate) {
    let dateField = getDateField(index);
    weekPlanFormData.value[dateField] = week[dateField];
    // console.log(week[dateField]);
-    if(index>=workDays){
+    if (index >= workDays) {
      let typeField = getTypeField(index);
      weekPlanFormData.value[typeField] = "法定假日"; // TODO: 换成更规范代码
      workTypeIndex.value[typeField] = WORK_TYPE.indexOf("法定假日");
@@ -180,7 +173,7 @@ onLoad((options) => {
        expandFlag.value[index] = editFields.includes(getTypeField(index)) || editFields.includes(getEventField(index));
        // console.log(index, expandFlag.value[index], "展开状态");
      }
-    }else{
+    } else {
      initCreate(data.param);
    }

@@ -203,7 +196,7 @@ function getEventField(index) {
 }

 // 初始化校验规则
-(function bindRules(){
+(function bindRules() {
  for (let i in WorkType) {
    if (i < workDays) {
      rules[getTypeField(i)] = {
@@ -253,25 +246,25 @@ const submitForm = async () => {
    // console.log('表单数据:', weekPlanFormData.value);

    // 这里可以添加提交到服务器的代码
-    if(!isAdd.value){ // 请求修改
-      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err=>{
+    if (!isAdd.value) { // 请求修改
+      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err => {
        message.error('操作失败!');
        console.warn(err, "更新周计划失败");
      })
      message.success('修改成功!');
-      setTimeout(()=>{
+      setTimeout(() => {
        const eventChannel = instance.getOpenerEventChannel();
        eventChannel.emit('refreshData');
        uni.navigateBack()
      }, 500);
-    }else{ // 请求新增
-      console.log(weekPlanFormData.value,"新增计划");
-      let res = await addPlan(weekPlanFormData.value).catch(err=>{
+    } else { // 请求新增
+      console.log(weekPlanFormData.value, "新增计划");
+      let res = await addPlan(weekPlanFormData.value).catch(err => {
        message.error('操作失败!');
        console.error(err, "周计划新增失败");
      })
      message.success('保存成功!');
-      setTimeout(()=>{
+      setTimeout(() => {
        const eventChannel = instance.getOpenerEventChannel();
        eventChannel.emit('refreshData');
        uni.navigateBack()
@@ -279,8 +272,8 @@ const submitForm = async () => {
    }
  } catch (err) {
    uni.showToast({
-      icon:'none',
-      title:"请完善内容",
+      icon: 'none',
+      title: "请完善内容",
      duration: 1500
    })
    console.log('表单验证失败:', err);
@@ -301,6 +294,7 @@ const submitForm = async () => {
 .white-bg {
  width: 690rpx;
  margin: 0;
+  padding-bottom: 0;
  border-radius: 8px 8px 0 0;
 }

@@ -309,7 +303,7 @@ const submitForm = async () => {
 }

 .white-bg.white-bg-3 {
-  border-top:  1rpx solid #E5E5E5;
+  border-top: 1rpx solid #E5E5E5;
  border-radius: 0
 }

@@ -320,10 +314,17 @@ const submitForm = async () => {

 .form-con {
  padding: 30rpx 0 0;
+  height: 500rpx;
+  overflow: hidden;
+  transition: height 0.3s;
 }

 :deep(.form-con .uni-forms-item) {
  margin-bottom: 22px !important;
 }

+.hidden{
+  height: 0;
+}
+
 </style>
--- a/src/pages/business/CRM/plan/planView.vue
+++ b/src/pages/business/CRM/plan/planView.vue
@@ -1,3 +1,8 @@
+<!--
+ * @author wangzhuo
+ * @update date 2025/9/18 19:38
+ * @description 所有人周计划查看
+-->
 <template>
  <view class="con-body">
    <view class="con-bg">
@@ -32,7 +37,7 @@
              <uni-icons type="down" size="18"></uni-icons>
            </view>
          </picker>
-          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+<!--          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
        </view>

        <!-- 分页部分  -->
@@ -42,22 +47,24 @@
        <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)) }}月
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(5, 7) }}月
            <span class="line"></span>
-            {{searchValue.selectDate.substring(0, 4) }}年
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(0, 4) }}年
          </view>
          <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"></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">
+                <view class="demo-uni-col mar-left" >
                  <text>{{ WeekShortCN[i] }}</text>
-                  <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
+                  <text v-if="list[0][field]" class="font-bold">{{ list[0][field].substring(8) }}</text>
+                  <text v-else class="font-bold">{{ getWeek(i) }}</text>
                </view>
              </uni-col>
            </block>
@@ -80,7 +87,7 @@
                        :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>
+                    <text v-else style="font-weight: 300; color: gray">暂无</text>
                  </view>
                </uni-col>
              </block>
@@ -94,32 +101,41 @@
      </view>
    </view>
  </view>
+
+  <closeable-modal closeTip=""
+                   v-model="modalVisible"
+                   :title="modalData.title"
+                   :content="modalData.content"
+                   :cancelBtn="modalData.showCancel"
+                   confirmText="关闭"
+                   @success="modalData.success"/>
+
 </template>

 <script setup>
 import {ref, onMounted} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import CloseableModal from "@/components/closeableModal.vue";
 import {getNavBarPaddingTop} from '@/utils/system.js'
 import {getAllWeekPlanList} from "@/api/crm/plan/getPlan";
 import {AreaList, COLOR_MAP, OrdinalDate, WeekShortCN, WorkEvent, WorkType} from "./dataMap";
-import {getCurrentWeekNum} from "./dateTimeUtils";
+import {getCurrentWeekNum, getWeek2} from "./dateTimeUtils";
 import {getDate} from "@/utils/datetime";
 import {getWeekPlanListByDate} from "@/api/crm/plan/getPlan";
-
-// const currentYear = new Date().getFullYear();
-const currentMonth = new Date().getMonth() + 1;
-const currentWeekNum = getCurrentWeekNum();
+import {onPullDownRefresh} from "@dcloudio/uni-app";

 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
 onMounted(() => {
  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
  uni.showLoading({})
-  getPlanList().then(res=>{
+  getPlanList().then(res => {
    let {total, rows} = res;
-    console.log(rows, "周计划数据获取成功")
+    console.log(total, rows, "周计划数据获取成功")
    list.value = rows;
+  }).catch((err) => {
+    console.warn(err, "周计划数据获取失败")
+  }).finally(() => {
    uni.hideLoading();
  })
 })
@@ -139,36 +155,38 @@ let searchValue = ref({

 // 查询列表
 let list = ref([]);
-const mescrollRef = ref(null);
-const upOption = ref({
-  page: {num: 0, size: 10},
-  noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
-  textLoading: '加载中...',
-  textNoMore: '已经到底了'
+// const mescrollRef = ref(null);
+onPullDownRefresh(() => {
+  uni.showLoading();
+  getPlanList().then(res => {
+    const {rows} = res;
+    list.value = rows;
+    console.log(rows,'刷新周计划成功');
+  }).finally(()=>{
+    uni.stopPullDownRefresh();
+    uni.hideLoading();
+  })
 });

-const downOption = ref({
-  auto: true,
-  textInOffset: '下拉刷新',
-  textOutOffset: '释放更新',
-  textLoading: '刷新中...'
+// 查询当前周一周日期
+// const currentYear = new Date().getFullYear();
+const currentWeekNum = getCurrentWeekNum();
+const aweek = getWeek2('本周');
+const currentMonth = aweek.month;
+console.log(currentWeekNum, '当前周数');
+const getWeek = (i) => {
+  return aweek[OrdinalDate[i]].substring(7)
+}
+const queryParams = ref({
+  month: currentMonth,
+  date: currentWeekNum,
+  pageNum: 1,
+  pageSize: 10
 });
-
-let cssFlag = ref(false);//控制样式
-
 // 获取数据列表
-const getPlanList = (month, date, pageIndex, pageSize) => {
+const getPlanList = () => {
  return new Promise(async (resolve) => {
-    // 查询参数
-    let queryParams = {
-      month: month ? month : currentMonth,
-      date: date ? date : currentWeekNum,
-      pageNum: pageIndex ? pageIndex : 1,
-      pageSize: pageSize ? pageSize : 10
-    }
-
-    let {rows, total} = await getAllWeekPlanList(queryParams);
+    let {rows, total} = await getAllWeekPlanList(queryParams.value);
    resolve({
      rows,
      total
@@ -187,20 +205,17 @@ let bindDateChange = (e) => {
 let handleSearch = () => {
  console.log(searchValue.value, '查询参数')
  uni.showLoading();
-  getWeekPlanListByDate(searchValue.value).then(res=>{
-    const {total, rows } = res;
+  getWeekPlanListByDate(searchValue.value).then(res => {
+    const {total, rows} = res;
    list.value = rows;
    console.log(rows, '查询成功');
-  }).catch(err=>{
-    console.warn(err,'数据获取失败');
-  }).finally(()=>{
+  }).catch(err => {
+    console.warn(err, '数据获取失败');
+  }).finally(() => {
    uni.hideLoading();
  })
 }
-const mescrollInit = (mescroll) => {
-  cssFlag.value = true;
-  mescrollRef.value = mescroll;
-};
+
 // 搜索区域变更
 const bindPickerChange = (e) => {
  // console.log('picker发送选择改变，携带值为', peopleIndex.value)
@@ -209,32 +224,43 @@ const bindPickerChange = (e) => {
  // 查询
  handleSearch();
 }
-
-// 跳转到详情
-let handleDetail = (rowIndex, colIndex) => {
+// 模态窗可见性
+const modalVisible = ref(false);
+// 模态框的配置内容
+const modalData = ref({
+  title: null,
+  content: null,
+  showCancel: false,
+  success: console.log
+});
+const showCloseableModal = (param)=>{
+  modalVisible.value = true;
+  Object.assign(modalData.value, param);
+  console.log(modalData.value);
+}
+// 查看计划详情
+const handleDetail = (rowIndex, colIndex) => {
  let detail = list.value[rowIndex];
  let workDate = detail[OrdinalDate[colIndex]];
  let workType = detail[WorkType[colIndex]];
  let workEvent = detail[WorkEvent[colIndex]];
-  if(workType && workEvent){
-    uni.showModal({
-      title: `${workDate}\n${workType}`,
-      content: `${workEvent}`,
-      confirmText: '关闭',
-      showCancel: false,
-      maskClosable: true, // 允许点击蒙层关闭弹窗
-      success: function (res) {
-        if (res.confirm) {
+  if (workType && workEvent) {
+    showCloseableModal({
+      title: `${workType}`,
+      content: `姓名：${detail.userName}\n时间：${workDate}\n内容：${workEvent}`
+    });
+    // uni.showModal({
+    //   title: `${workDate}\n${workType}`,
+    //   content: `${workEvent}`,
+    //   confirmText: '关闭',
+    //   showCancel: false,
+    //   maskClosable: true, // 允许点击蒙层关闭弹窗
+    //   success: console.log
+    // })

-        } else if (res.cancel) {
-
-        }
-      }
-    })
-  }
-  else{
+  } else {
    uni.showToast({
-      title: "暂无内容",
+      title: "无计划内容",
      icon: "none",
      duration: 1500
    })
@@ -328,8 +354,9 @@ let handleDetail = (rowIndex, colIndex) => {

 .demo-uni-col {
  height: 36px;
-  border-radius: 4px;
-  background-color: #E7E7E7;
+  border-radius: 4rpx;
+  /*background-color: #E7E7E7;*/
+  background-color: #e7e7e782;
  display: flex;
  flex-direction: column;
  align-items: center;
@@ -366,35 +393,17 @@ let handleDetail = (rowIndex, colIndex) => {
  margin: 20rpx 0 0 0;
  border-radius: 8px 8px 0 0;
  /* #ifdef APP-PLUS */
-  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  );
  /* #endif */
  /* #ifndef APP-PLUS */
-  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  );
  /* #endif */
-  //overflow-y: auto;
-}
-
-.white-bg.white-bg-2 {
-  margin-bottom: 20rpx;
-}
-
-.white-bg.white-bg-3 {
-  border-radius: 0
-}
-
-.white-bg .w-b-title {
-  color: #3384DF;
-  font-size: 38rpx;
-}
-
-.form-con {
-  padding: 30rpx 0 0;
 }

 :deep(.form-con .uni-forms-item) {
  margin-bottom: 22px !important;
 }
-/*.con-bg {
-  height: 420rpx;
-}*/
+
 </style>
--- a/src/pages/deviceAuth/deviceAuth.vue
+++ b/src/pages/deviceAuth/deviceAuth.vue
@@ -407,7 +407,9 @@ const handleSubmit=()=>{
 .container .bg-h{
    background:url('@/static/images/PicLogoTxt2@2x.png') center bottom 10rpx no-repeat;
    background-size:487rpx 214rpx;
+    /* #ifdef APP-PLUS */
    width: 100vw;
+    /* #endif */
    height: calc(100vh - 110px) ;
    margin:0 auto;
 }
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -264,9 +264,9 @@ const submitForm = () => {

            // #ifdef H5
            //h5测试用 内网-sn123456
-            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee'
+            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' 529a5543-6957-401e-b090-13df6dee5429
            //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' 
-            param.uniqCode = 'f3fca83f-bf56-47f4-a98b-a602ed8bddee';
+            param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';
            let res = await login(param);
            userStore.login(res);
            uni.switchTab({ url: '/pages/home/home' })
@@ -362,7 +362,9 @@ page{
 .login-con .bg-h{
    background:url('@/static/images/login-txt.png') center bottom 10rpx no-repeat;
    background-size:654rpx 121rpx;
+    /* #ifdef APP-PLUS */
    width: 100vw;
+    /* #endif */
    height: calc(100vh - 10px) ;
    margin:0 auto;
 }
Author	SHA1	Message	Date
wangzhuo	e8dddd8dca	fix: 我的计划和计划编辑优化	2025-09-18 22:20:13 +08:00
wangzhuo	1aa1507336	fix: 计划查看模态弹窗替换为自定义的模态弹窗	2025-09-18 19:44:17 +08:00
wangzhuo	53117fc9f5	feat: 自定义模态弹窗组件（支持蒙层触摸关闭、文本换行显示）	2025-09-18 19:41:25 +08:00
wangzhuo	3e5a70f147	fix: 优化客户人员所属	2025-09-17 21:59:03 +08:00
wangzhuo	f3e20ce31a	fix: 客户人员审核	2025-09-17 21:52:58 +08:00
wangzhuo	409597fa7f	fix: 调整滚动视图高度	2025-09-17 21:49:53 +08:00
wangzhuo	1a3c014c83	fix: 主归属人变更审核	2025-09-17 21:47:23 +08:00
wangzhuo	3a1339fc76	feat: 周计划查看支持下拉刷新	2025-09-17 21:44:01 +08:00
wangzhuo	933714be60	Merge remote-tracking branch 'origin/develop' into develop	2025-09-16 18:06:13 +08:00
wangzhuo	24d35be511	fix: 主归属人变更审核	2025-09-16 18:06:00 +08:00
xuli3099	5f39625d20	Merge branch 'develop' of http://123.57.20.168:4000/admin/ys-app into develop	2025-09-16 15:08:33 +08:00
xuli3099	b42a4456bd	修改样式	2025-09-16 15:08:25 +08:00
wangyang	57ed355def	Merge remote-tracking branch 'origin/develop' into develop	2025-09-16 14:20:50 +08:00
wangyang	2c2950003c	CRM-走访查看-优化新增走访报告报错问题	2025-09-16 14:20:38 +08:00
wangzhuo	b8e8a59da2	Merge remote-tracking branch 'origin/develop' into develop	2025-09-16 08:58:44 +08:00
wangzhuo	20f1c9b857	fix: 客户人员审核	2025-09-16 08:58:29 +08:00
wangyang	842781b8d5	CRM-走访查看-点击查看详情和长按删除事件的优化	2025-09-15 12:55:23 +08:00
wangzhuo	f90bcac11a	Merge remote-tracking branch 'origin/develop' into develop	2025-09-12 16:57:18 +08:00
wangzhuo	d36cadd06f	fix: 修复网络超时loading提示不隐藏的问题 fix: 修复页面高度适配问题	2025-09-12 16:57:00 +08:00
wangzhuo	19fa062229	fix: 周计划-创建-取消获取当前用户信息	2025-09-12 16:54:04 +08:00
xuli3099	ee228475a9	地址修改提交	2025-09-12 13:14:52 +08:00