From 8739cb4a34c25a9997bdebe2b498c1a2e8ad078b Mon Sep 17 00:00:00 2001
From: "PC-202311141343\\Administrator" <505354293@qq.com>
Date: Fri, 29 Aug 2025 14:43:12 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=95=B4=E4=BD=93=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/api_ys.js                         |   2 +-
 src/api/crm/customer/getCustomer.js           |   2 +-
 src/pages/business/CRM/chooseCus.vue          | 332 ++++++++++-------
 .../CRM/customer/customerUserBelong.vue       |   2 +-
 .../business/CRM/marketActivity/chooseCus.vue | 334 +++++++++++-------
 src/pages/business/CRM/plan/myPlan.vue        |  38 +-
 src/pages/business/CRM/plan/planEdit.vue      |   4 +-
 7 files changed, 446 insertions(+), 268 deletions(-)

diff --git a/src/api/crm/api_ys.js b/src/api/crm/api_ys.js
index a4964b6..a80171b 100644
--- a/src/api/crm/api_ys.js
+++ b/src/api/crm/api_ys.js
@@ -93,7 +93,7 @@ export function viewingMarketInfgetDetail(data) {
 //市场信审核列表接口
 export function approvalMarketInfget(data) {
 	return request.get({
-		url: 'app/informationMarketInformation/Approval',
+		url: '/crm/app/informationMarketInformation/Approval',
 		data
 	},{
 		isTransformResponse:false
diff --git a/src/api/crm/customer/getCustomer.js b/src/api/crm/customer/getCustomer.js
index 333e9fc..318db98 100644
--- a/src/api/crm/customer/getCustomer.js
+++ b/src/api/crm/customer/getCustomer.js
@@ -25,7 +25,7 @@ export function saveappCrmCusUserNew(params){
 // 查询业务员名下所有的客户
 export function SearchForAllCustomersSalesperson(params){
     return request.get({
-        url: 'app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
         data: params
     },{isTransformResponse: false})
 }
diff --git a/src/pages/business/CRM/chooseCus.vue b/src/pages/business/CRM/chooseCus.vue
index eac0e61..6372957 100644
--- a/src/pages/business/CRM/chooseCus.vue
+++ b/src/pages/business/CRM/chooseCus.vue
@@ -1,170 +1,256 @@
 <template>
-    <view class="con-body">
-        <view >
-            <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
-            </customHeader>
-            <!-- 高度来避免头部遮挡 -->
-            <view class="top-height"></view>
-            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
-                @iconClick="iconClick">
-            </uni-easyinput>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'客户名称列表'" :leftFlag="true" :rightFlag="false">
+        <template #right>
+          <view class="head-right" @click="handleAdd">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>
+            新增
+          </view>
+        </template>
+      </customHeader>
 
-		
-		<view class="inner-box">
-			<view class="list-cont">
-				<radio-group class="block" @change="radioChange">
-					<view class="item"   v-for="(item, index) in dataList">
-						<radio class='radio' :value="index" ></radio>
-						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
-					</view>
-				</radio-group>
-			</view>
-		</view>
+      <!-- 高度来避免头部遮挡 -->
+      <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" @clear="searchValue=''"
+          />
+<!--          <button type="default" @click="searchValue=''" 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"
+                      class="scroll-h"  :class="{'loading-scroll':cssFlag}"
+        ><!-- @down="downCallback"-->
+          <radio-group class="block" @change="radioChange">
+            <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+              <radio class='radio'
+                     :class="index === selectIndex ? 'checked' : ''"
+                     :checked="index === selectIndex"
+                     :value="index+''">
+              </radio>
+
+              <view class="report-list">
+                <view class="title">{{ item.cusName }}</view>
+                <!--              <view class="r-list">
+                                <view class="r-name">{{ item.shortName }}</view>
+                                <view class="r-right btn-orange" size="mini">{{ item.statusName }}</view>
+                              </view>-->
+                <view class="border-bottom"></view>
+                <!--              <view class="r-list">
+                                <view class="r-left">日期</view>
+                                <view class="r-right">{{ new Date(item.createTime).toLocaleDateString()}}</view>
+                              </view>-->
+              </view>
+            </view>
+          </radio-group>
+        </mescroll-uni>
+      </view>
     </view>
+  </view>
 </template>
 
 <script setup>
+
+import {ref, onMounted, getCurrentInstance, watch} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import { getYsCustomerList } from '../../../api/crm/api_ys.js'
-import { onMounted,  reactive, ref, watch } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import { useMessage } from '../../../utils/message.js'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import {getNavBarPaddingTop} from '@/utils/system.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {getCustomerList} from "@/api/crm/customer/getCustomer";
 
+let instance = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+let searchValue = ref('')
 
+let cssFlag=ref(false);//控制样式
 
-const message = useMessage();
+const upOption = ref({
+  page: { num: 0, size: 10 },
+  noMoreSize: 5,
+  empty: { 
+      tip: '~ 空空如也 ~',
+      icon: "../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
 
-//点击查询客户人员
-const queryParams = ref({
-    cusName: '',
-    nickName:'',
-    pageNum: 1,
-    pageSize: 10
-})
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
 
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
 
 onMounted(() => {
-    
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
-onLoad(options => {
-    queryParams.value.cusName = options.cusName
+
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('requestCusList', async (res) => {
+      let {cusName} = res.data;
+      // console.log(cusName, "客户选择页读取到参数");
+      searchValue.value = cusName;
+  })
 })
-const dataList = ref([])
 
+let timerId = null;
+// 搜索
+watch(searchValue, (newValue, oldValue) => {
+  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
+  if(timerId) clearTimeout(timerId);
+  timerId = setTimeout(async ()=>{
+     handleSearch();
+     clearTimeout(timerId);
+    timerId = null;
+  }, 500);
+});
 
-
-
-//查询某一客户人员
-let searchContent = ref('')
-
-function iconClick() {
-    message.toast('点击了查询，当前内容：' + searchContent.value)
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    const res = await getList(1, upOption.value.page.size);
+    list.value = res.list;
+    // 正确结束下拉刷新状态
+    mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束下拉刷新
+    mescroll.endErr();
+  }
 }
 
-//监视查询的内容的变化
-let queryCusForm = reactive({})
-watch(searchContent,(newValue,oldValue)=>{
-    console.log("输入内容：",searchContent.value)
-    queryCusForm.cusName = searchContent.value
-    getYsCustomerList(queryCusForm).then(res=>{
-        dataList.value = res.rows
-    })
-})
-
-function radioChange(event) {
-     const selectedIndex = event.detail.value
-    let test = dataList.value[selectedIndex]
-    // 发送全局事件
-    uni.$emit('onCustomerSelected', test)
-    let cusName = test.cusName;//客户名称
-    let cusId = test.cusId;//客户ID
-    uni.navigateBack()//返回上一页
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    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.list.length >= mescroll.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束上拉加载
+    mescroll.endErr();
+  }
 }
 
-
+// 查询搜索跳转
+let handleSearch = async () => {
+  // 触发下拉刷新以重新加载数据
+  if (mescrollRef.value) {
+    cssFlag.value = true;
+    uni.showLoading()
+    await downCallback(mescrollRef.value.mescroll);
+    uni.hideLoading()
+    cssFlag.value = false;
+  }
+}
+// 获取数据列表
+const getList = async (pageIndex, pageSize) => {
+    let param = {
+      pageNum: pageIndex,
+      pageSize,
+      cusName: searchValue.value
+    }
+  let { rows, total  } = await getCustomerList(param)
+  return {list: rows, total};
+}
+// 选中项的索引号
+const selectIndex = ref(null);
+const radioChange = (e) => {
+  let {value} = e.detail; // index
+  // console.log(value);
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.emit('onCustomerSelected', list.value[value]);
+  uni.navigateBack()
+}
 
 </script>
 
-<style scoped lang="scss">
-
-.con-body{
-    background: white;
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
 }
 
-
-/* Container for the checkbox group */
-.checkbox-group.block {
-    width: 100%;
+.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;
 }
 
-/* Each item row */
-.itemClass {
-    display: flex;
-    align-items: center;
-    padding: 10rpx 0;
-    margin-left: 15rpx;
-    border-bottom: 1px solid #eee;
-    /* optional divider */
+.search .btn-search::after {
+  display: none;
 }
 
-/* Checkbox styling */
-.checkBoxClass {
-    margin-right: 12rpx;
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
 }
 
-/* Content container */
-.clientClass {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    font-size: 36rpx;
-    color: #333;
-    /* default text color */
-}
-
-/* Blue username text */
-.blue-text {
-    /* or any blue you prefer */
-    margin-right: 5rpx;
-}
-.inner-box {
-  width: 100%;
-  padding: 10px;
-  box-sizing: border-box;
-}
-
-.list-cont {
-  width: 100%;
-}
-
-.block {
-  width: 100%;
-}
-
-.item {
+.white-bg {
+  //padding-bottom:10rpx;
+  margin-bottom: 0;
+  overflow: hidden;
   display: flex;
   align-items: center;
-  padding: 12px 0;
-  border-bottom: 1px solid #eee;
 }
 
 .radio {
-  margin-right: 12px;
-  transform: scale(0.9);
+  padding-right: 20rpx;
 }
 
-.name {
-  flex: 1;
-  font-size: 16px;
-  color: #333;
+.title {
+  font-size: 32rpx;
+  line-height: 48rpx;
 }
 
-.checked {
-  color: #007AFF; /* 选中状态的颜色 */
+.report-list {
+  width: calc(100% - 70rpx);
+  //background-color: pink;
+}
+
+.border-bottom {
+  margin-top: 6rpx;
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/customer/customerUserBelong.vue b/src/pages/business/CRM/customer/customerUserBelong.vue
index 50ef41f..1c9496b 100644
--- a/src/pages/business/CRM/customer/customerUserBelong.vue
+++ b/src/pages/business/CRM/customer/customerUserBelong.vue
@@ -17,7 +17,7 @@
       <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"
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"
                           cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
                           @clear="clearSearchValue"
                           v-model="searchValue"
diff --git a/src/pages/business/CRM/marketActivity/chooseCus.vue b/src/pages/business/CRM/marketActivity/chooseCus.vue
index d09cb6d..6372957 100644
--- a/src/pages/business/CRM/marketActivity/chooseCus.vue
+++ b/src/pages/business/CRM/marketActivity/chooseCus.vue
@@ -1,170 +1,256 @@
 <template>
-    <view class="con-body">
-        <view >
-            <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
-            </customHeader>
-            <!-- 高度来避免头部遮挡 -->
-            <view class="top-height"></view>
-            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
-                @iconClick="iconClick">
-            </uni-easyinput>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'客户名称列表'" :leftFlag="true" :rightFlag="false">
+        <template #right>
+          <view class="head-right" @click="handleAdd">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>
+            新增
+          </view>
+        </template>
+      </customHeader>
 
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
-		<view class="inner-box">
-			<view class="list-cont">
-				<radio-group class="block" @change="radioChange">
-					<view class="item"   v-for="(item, index) in dataList">
-						<radio class='radio' :value="index" ></radio>
-						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
-					</view>
-				</radio-group>
-			</view>
-		</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" @clear="searchValue=''"
+          />
+<!--          <button type="default" @click="searchValue=''" 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"
+                      class="scroll-h"  :class="{'loading-scroll':cssFlag}"
+        ><!-- @down="downCallback"-->
+          <radio-group class="block" @change="radioChange">
+            <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+              <radio class='radio'
+                     :class="index === selectIndex ? 'checked' : ''"
+                     :checked="index === selectIndex"
+                     :value="index+''">
+              </radio>
+
+              <view class="report-list">
+                <view class="title">{{ item.cusName }}</view>
+                <!--              <view class="r-list">
+                                <view class="r-name">{{ item.shortName }}</view>
+                                <view class="r-right btn-orange" size="mini">{{ item.statusName }}</view>
+                              </view>-->
+                <view class="border-bottom"></view>
+                <!--              <view class="r-list">
+                                <view class="r-left">日期</view>
+                                <view class="r-right">{{ new Date(item.createTime).toLocaleDateString()}}</view>
+                              </view>-->
+              </view>
+            </view>
+          </radio-group>
+        </mescroll-uni>
+      </view>
     </view>
+  </view>
 </template>
 
 <script setup>
+
+import {ref, onMounted, getCurrentInstance, watch} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import { getYsCustomerList } from '../../../../api/crm/activity/activity'
-import { onMounted,  reactive, ref, watch } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import { useMessage } from '../../../../utils/message'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import {getNavBarPaddingTop} from '@/utils/system.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {getCustomerList} from "@/api/crm/customer/getCustomer";
 
+let instance = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+let searchValue = ref('')
 
+let cssFlag=ref(false);//控制样式
 
-const message = useMessage();
+const upOption = ref({
+  page: { num: 0, size: 10 },
+  noMoreSize: 5,
+  empty: { 
+      tip: '~ 空空如也 ~',
+      icon: "../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
 
-//点击查询客户人员
-const queryParams = ref({
-    cusName: '',
-    nickName:'',
-    pageNum: 1,
-    pageSize: 10
-})
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
 
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
 
 onMounted(() => {
-
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
-onLoad(options => {
-    queryParams.value.cusName = options.cusName
+
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('requestCusList', async (res) => {
+      let {cusName} = res.data;
+      // console.log(cusName, "客户选择页读取到参数");
+      searchValue.value = cusName;
+  })
 })
-const dataList = ref([])
 
+let timerId = null;
+// 搜索
+watch(searchValue, (newValue, oldValue) => {
+  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
+  if(timerId) clearTimeout(timerId);
+  timerId = setTimeout(async ()=>{
+     handleSearch();
+     clearTimeout(timerId);
+    timerId = null;
+  }, 500);
+});
 
-
-
-//查询某一客户人员
-let searchContent = ref('')
-
-function iconClick() {
-    message.toast('点击了查询，当前内容：' + searchContent.value)
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    const res = await getList(1, upOption.value.page.size);
+    list.value = res.list;
+    // 正确结束下拉刷新状态
+    mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束下拉刷新
+    mescroll.endErr();
+  }
 }
 
-//监视查询的内容的变化
-let queryCusForm = reactive({})
-watch(searchContent,(newValue,oldValue)=>{
-    queryCusForm.cusName = searchContent.value
-    getYsCustomerList(queryCusForm).then(res=>{
-        dataList.value = res.rows
-    })
-})
-
-function radioChange(event) {
-     const selectedIndex = event.detail.value
-    let test = dataList.value[selectedIndex]
-    // 发送全局事件
-    uni.$emit('onCustomerSelected', test)
-    let cusName = test.cusName;//客户名称
-    let cusId = test.cusId;//客户ID
-    uni.navigateBack()//返回上一页
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    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.list.length >= mescroll.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束上拉加载
+    mescroll.endErr();
+  }
 }
 
-
-
+// 查询搜索跳转
+let handleSearch = async () => {
+  // 触发下拉刷新以重新加载数据
+  if (mescrollRef.value) {
+    cssFlag.value = true;
+    uni.showLoading()
+    await downCallback(mescrollRef.value.mescroll);
+    uni.hideLoading()
+    cssFlag.value = false;
+  }
+}
+// 获取数据列表
+const getList = async (pageIndex, pageSize) => {
+    let param = {
+      pageNum: pageIndex,
+      pageSize,
+      cusName: searchValue.value
+    }
+  let { rows, total  } = await getCustomerList(param)
+  return {list: rows, total};
+}
+// 选中项的索引号
+const selectIndex = ref(null);
+const radioChange = (e) => {
+  let {value} = e.detail; // index
+  // console.log(value);
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.emit('onCustomerSelected', list.value[value]);
+  uni.navigateBack()
+}
 
 </script>
 
-<style scoped lang="scss">
-
-.con-body{
-    background: white;
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
 }
 
-
-/* Container for the checkbox group */
-.checkbox-group.block {
-    width: 100%;
+.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;
 }
 
-/* Each item row */
-.itemClass {
-    display: flex;
-    align-items: center;
-    padding: 10rpx 0;
-    margin-left: 15rpx;
-    border-bottom: 1px solid #eee;
-    /* optional divider */
+.search .btn-search::after {
+  display: none;
 }
 
-/* Checkbox styling */
-.checkBoxClass {
-    margin-right: 12rpx;
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
 }
 
-/* Content container */
-.clientClass {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    font-size: 36rpx;
-    color: #333;
-    /* default text color */
-}
-
-/* Blue username text */
-.blue-text {
-    /* or any blue you prefer */
-    margin-right: 5rpx;
-}
-.inner-box {
-  width: 100%;
-  padding: 10px;
-  box-sizing: border-box;
-}
-
-.list-cont {
-  width: 100%;
-}
-
-.block {
-  width: 100%;
-}
-
-.item {
+.white-bg {
+  //padding-bottom:10rpx;
+  margin-bottom: 0;
+  overflow: hidden;
   display: flex;
   align-items: center;
-  padding: 12px 0;
-  border-bottom: 1px solid #eee;
 }
 
 .radio {
-  margin-right: 12px;
-  transform: scale(0.9);
+  padding-right: 20rpx;
 }
 
-.name {
-  flex: 1;
-  font-size: 16px;
-  color: #333;
+.title {
+  font-size: 32rpx;
+  line-height: 48rpx;
 }
 
-.checked {
-  color: #007AFF; /* 选中状态的颜色 */
+.report-list {
+  width: calc(100% - 70rpx);
+  //background-color: pink;
 }
-</style>
+
+.border-bottom {
+  margin-top: 6rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/plan/myPlan.vue b/src/pages/business/CRM/plan/myPlan.vue
index e7a49e6..9217f13 100644
--- 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>姓名：<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;">
@@ -54,10 +54,11 @@
             </view>
           </view>
         </view>
+		<view class='bottom-spliter bg-gray'></view>
       </block>
 
       <!-- 底部加高度来避免tabbar遮挡 -->
-      <view class="bottom-height"></view>
+      <!-- <view class="bottom-height bg-gray"></view> -->
     </view>
 
 
@@ -106,12 +107,12 @@ let getWorkEvent = (index) => {
 const refreshPlanList = () => {
   message.showLoading();
   // 获取用户信息
-  getUserInfo().then(res => {
-    userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
-    console.warn(err, "用户信息获取失败")
-  });
+  // getUserInfo().then(res => {
+  //   userInfo.value = res.user;
+  //   console.log(route.path, "：用户信息获取成功");
+  // }).catch(err => {
+  //   console.warn(err, "用户信息获取失败")
+  // });
   // 获取周计划列表
   getWeeklyPlanList(queryParams.value).then(res => {
     const {rows} = res;
@@ -180,11 +181,11 @@ function handleCreate() {
         handlePlanEdit({itemList, selectIndex: result.tapIndex}, true);
       }).catch((err) => {
         console.warn(err, "已存在周计划")
-        uni.showToast({
-          icon: 'error',
-          title: '已有本周或下周计划',
-          duration: 2000
-        })
+        // uni.showToast({
+        //   icon: 'error',
+        //   title: '已有本周或下周计划',
+        //   duration: 2000
+        // })
       })
       // }else{ // 创建下周计划
       // }
@@ -234,7 +235,7 @@ function handleEdit(index) {
   // console.log(JSON.stringify(formData))
   console.log(route.path, formData, "前往修改页面");
   const editFields = [OrdinalDate[index], WorkType[index], WorkEvent[index]];
-  let userName = userInfo.value.nickName || userInfo.value.userName;
+  let userName = null; // userInfo.value.userName || userInfo.value.nickName;
   handlePlanEdit({userName, formData, editFields}, false);
 }
 
@@ -268,9 +269,14 @@ function handleEdit(index) {
 }
 
 .white-bg.white-bg-2 {
-  margin-bottom: 20rpx;
+/*  margin-bottom: 20rpx; */
+}
+.bottom-spliter{
+	height: 20rpx;
+}
+.bg-gray{
+	background-color: #f0f0f0;
 }
-
 .report-list .w-b-title .btn-edit {
   background-color: #5C96F7;
 }
diff --git a/src/pages/business/CRM/plan/planEdit.vue b/src/pages/business/CRM/plan/planEdit.vue
index c36e3e2..cf37728 100644
--- a/src/pages/business/CRM/plan/planEdit.vue
+++ b/src/pages/business/CRM/plan/planEdit.vue
@@ -4,7 +4,7 @@
       <!-- 头部 -->
       <customHeader ref="customHeaderRef" :title="title" :leftFlag="true" :rightFlag="true">
         <template #right>
-          <view class="head-right" @click="submitForm" v-if="userInfo.nickName || userInfo.userName">
+          <view class="head-right" @click="submitForm">
             <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
                        color="#B7D2FF"></uni-icons>
             保存
@@ -16,7 +16,7 @@
 
       <!-- 正文内容 -->
       <view class="week-plan-title">
-        <view>姓名：<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">

From 850ed466cf432b5ec4ae2293bd4caca9972e3a3b Mon Sep 17 00:00:00 2001
From: "PC-202311141343\\Administrator" <505354293@qq.com>
Date: Fri, 29 Aug 2025 16:30:42 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        |   9 +++++
 .../android/Tm-TmSafeSaveFileModule.aar       | Bin 0 -> 31982 bytes
 .../Tm-TmSafeSaveFileModule/package.json      |  29 ++++++++++++++++
 src/components/multipleSelect.vue             |   2 +-
 src/manifest.json                             |  31 +++++++++++++++---
 src/utils/request/index.js                    |  13 ++++----
 6 files changed, 71 insertions(+), 13 deletions(-)
 create mode 100644 .hbuilderx/launch.json
 create mode 100644 nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar
 create mode 100644 nativeplugins/Tm-TmSafeSaveFileModule/package.json

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..1b8d0f6
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,9 @@
+{
+    "version" : "1.0",
+    "configurations" : [
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
+    ]
+}
diff --git a/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar b/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar
new file mode 100644
index 0000000000000000000000000000000000000000..b11db39b176fc24eb10815ba6b02942d0924fadd
GIT binary patch
literal 31982
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

literal 0
HcmV?d00001

diff --git a/nativeplugins/Tm-TmSafeSaveFileModule/package.json b/nativeplugins/Tm-TmSafeSaveFileModule/package.json
new file mode 100644
index 0000000..3fee52b
--- /dev/null
+++ b/nativeplugins/Tm-TmSafeSaveFileModule/package.json
@@ -0,0 +1,29 @@
+{
+	"name": "TmSafeSaveFileModule隐私数据保存",
+	"id": "Tm-TmSafeSaveFileModule",
+	"version": "1.0.0",
+	"description": "TmSafeSaveFileModule隐私数据保存",
+	"_dp_type": "nativeplugin",
+	"_dp_nativeplugin": {
+		"android": {
+			 "plugins": [
+			        {
+			          "type": "module",
+			          "name": "Tm-TmSafeSaveFileModule",
+			          "class": "io.dcloud.uniplugin.safesave.TmSafeSaveFileModule"
+			        }
+		  	],
+			"abis": [
+				"armeabi-v7a",
+				"x86"
+			],
+			"minSdkVersion": "26",
+			"integrateType": "aar",
+			"dependencies": [
+				"androidx.security:security-crypto:1.1.0-alpha06"
+			],
+			"permissions": [
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/components/multipleSelect.vue b/src/components/multipleSelect.vue
index 791b253..9692abb 100644
--- a/src/components/multipleSelect.vue
+++ b/src/components/multipleSelect.vue
@@ -111,7 +111,7 @@ const active = ref(false); // 组件是否激活，
 let changevalue = reactive([]);
 let realValue = reactive([]);
 onMounted(() => {
-    init();
+    // init();
 });
 
 // 初始化函数
diff --git a/src/manifest.json b/src/manifest.json
index dde2e76..d7b6ef8 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
     "id" : "H5E705637",
-    "name" : "app",
-    // "appid" : "H5E705637",
+    "name" : "718友晟",
+    "appid" : "__UNI__4C459F4",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -16,7 +16,7 @@
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
-            "waiting" : false,// 是否显示等待界面
+            "waiting" : false, // 是否显示等待界面
             "autoclose" : true,
             "delay" : 0
         },
@@ -43,6 +43,9 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "minSdkVersion" : 26,
+                "targetSdkVersion" : 35,
                 "icons" : {
                     "android" : {
                         "hdpi" : "static/icons/72x72.png",
@@ -53,9 +56,27 @@
                 }
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {}
+        },
+        "nativePlugins" : {
+            "Tm-TmSafeSaveFileModule" : {
+                "__plugin_info__" : {
+                    "name" : "TmSafeSaveFileModule隐私数据保存",
+                    "description" : "TmSafeSaveFileModule隐私数据保存",
+                    "platforms" : "Android",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */
@@ -84,8 +105,8 @@
     "h5" : {
         "router" : {
             "base" : ""
-            /*,"mode": "history"   仅对 H5 平台生效 */
         },
+        /*,"mode": "history"   仅对 H5 平台生效 */
         "template" : "index.html"
     }
 }
diff --git a/src/utils/request/index.js b/src/utils/request/index.js
index f34ee08..b4ce122 100644
--- a/src/utils/request/index.js
+++ b/src/utils/request/index.js
@@ -13,7 +13,7 @@ const requestHooks = {
     requestInterceptorsHook(options, config) {
         // console.log("request=>config=>",config)
         const { urlPrefix, baseUrl, withToken, isAuth } = config;
-        options.header = options.header ?? {};
+        options.header = options.header ? options.header:{};
         if (urlPrefix) {
             options.url = `${urlPrefix}${options.url}`;
         }
@@ -33,20 +33,19 @@ const requestHooks = {
         // console.log("response=>",response)
         // console.log("response=>config=>",config)
         const { isTransformResponse, isReturnDefaultResponse, isAuth } = config;
-        
         if (isReturnDefaultResponse) {
             return response;
         }
-        if (!isTransformResponse) {
-            return response.data;
-        }
         // const { logout, isLogin } = useUserStore();
         const { code, data, msg, show } = response.data;
-        // console.log(code,data,msg,show)
         switch (code) {
             case RequestCodeEnum.SUCCESS:
                 msg && show && message.toast(msg);
-                return data;
+                if (!isTransformResponse) {
+                    return response.data;
+                }else{
+                    return data;
+                }
             case RequestCodeEnum.FAILED:
                 message.toast(msg);
                 return Promise.reject(msg);

From 20dc7d5f756167a5646864a201496e4f7ff5c920 Mon Sep 17 00:00:00 2001
From: "PC-202311141343\\Administrator" <505354293@qq.com>
Date: Fri, 29 Aug 2025 17:31:05 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/business/CRM/chooseCus.vue | 285 +++++++++++----------------
 1 file changed, 120 insertions(+), 165 deletions(-)

diff --git a/src/pages/business/CRM/chooseCus.vue b/src/pages/business/CRM/chooseCus.vue
index 6372957..ddf213b 100644
--- a/src/pages/business/CRM/chooseCus.vue
+++ b/src/pages/business/CRM/chooseCus.vue
@@ -16,20 +16,16 @@
 
       <!-- 正文内容 -->
       <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" @clear="searchValue=''"
           />
-<!--          <button type="default" @click="searchValue=''" 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"
-                      class="scroll-h"  :class="{'loading-scroll':cssFlag}"
-        ><!-- @down="downCallback"-->
+        <!-- 列表区域 -->
+        <view class="scroll-h" :class="{'loading-scroll':cssFlag}">
           <radio-group class="block" @change="radioChange">
             <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
               <radio class='radio'
@@ -40,171 +36,115 @@
 
               <view class="report-list">
                 <view class="title">{{ item.cusName }}</view>
-                <!--              <view class="r-list">
-                                <view class="r-name">{{ item.shortName }}</view>
-                                <view class="r-right btn-orange" size="mini">{{ item.statusName }}</view>
-                              </view>-->
-                <view class="border-bottom"></view>
-                <!--              <view class="r-list">
-                                <view class="r-left">日期</view>
-                                <view class="r-right">{{ new Date(item.createTime).toLocaleDateString()}}</view>
-                              </view>-->
+                <view class="r-name">{{ item.shortName }}</view>
               </view>
             </view>
           </radio-group>
-        </mescroll-uni>
+        </view>
       </view>
     </view>
   </view>
 </template>
 
 <script setup>
-
-import {ref, onMounted, getCurrentInstance, watch} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
-import {getNavBarPaddingTop} from '@/utils/system.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {getCustomerList} from "@/api/crm/customer/getCustomer";
+import { getYsCustomerList } from '../../../api/crm/api_ys.js'
+import { onMounted, reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../utils/message.js'
+
+const message = useMessage();
 
-let instance = null;
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
-// 查询列表
-let list = ref([]);
-const mescrollRef = ref(null);
-let searchValue = ref('')
 
-let cssFlag=ref(false);//控制样式
-
-const upOption = ref({
-  page: { num: 0, size: 10 },
-  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
-  },
-  textLoading: '加载中...',
-  textNoMore: '已经到底了'
-});
-
-const downOption = ref({
-  auto: true,
-  textInOffset: '下拉刷新',
-  textOutOffset: '释放更新',
-  textLoading: '刷新中...'
-});
-
-const mescrollInit = (mescroll) => {
-  cssFlag.value = true;
-  mescrollRef.value = mescroll;
-};
-
-onMounted(() => {
-  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+// 点击查询客户单位
+const queryParams = ref({
+    cusName: '',
+    nickName:'',
+    pageNum: 1,
+    pageSize: 10
 })
 
-
-onLoad((options)=>{
-  instance = getCurrentInstance().proxy;
-  const eventChannel = instance.getOpenerEventChannel();
-  eventChannel.on('requestCusList', async (res) => {
-      let {cusName} = res.data;
-      // console.log(cusName, "客户选择页读取到参数");
-      searchValue.value = cusName;
-  })
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
 })
+const dataList = ref([])
 
-let timerId = null;
-// 搜索
-watch(searchValue, (newValue, oldValue) => {
-  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
-  if(timerId) clearTimeout(timerId);
-  timerId = setTimeout(async ()=>{
-     handleSearch();
-     clearTimeout(timerId);
-    timerId = null;
-  }, 500);
-});
+// 搜索内容
+let searchContent = ref('')
 
-// 下拉刷新
-const downCallback = async (mescroll) => {
-  try {
-    const res = await getList(1, upOption.value.page.size);
-    list.value = res.list;
-    // 正确结束下拉刷新状态
-    mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
-  } catch (error) {
-    console.log(error)
-    // 发生错误时结束下拉刷新
-    mescroll.endErr();
-  }
-}
-
-// 上拉加载更多
-const upCallback = async (mescroll) => {
-  try {
-    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.list.length >= mescroll.size);
-  } catch (error) {
-    console.log(error)
-    // 发生错误时结束上拉加载
-    mescroll.endErr();
-  }
-}
-
-// 查询搜索跳转
-let handleSearch = async () => {
-  // 触发下拉刷新以重新加载数据
-  if (mescrollRef.value) {
-    cssFlag.value = true;
-    uni.showLoading()
-    await downCallback(mescrollRef.value.mescroll);
-    uni.hideLoading()
-    cssFlag.value = false;
-  }
-}
-// 获取数据列表
-const getList = async (pageIndex, pageSize) => {
-    let param = {
-      pageNum: pageIndex,
-      pageSize,
-      cusName: searchValue.value
-    }
-  let { rows, total  } = await getCustomerList(param)
-  return {list: rows, total};
-}
 // 选中项的索引号
 const selectIndex = ref(null);
-const radioChange = (e) => {
-  let {value} = e.detail; // index
-  // console.log(value);
-  const eventChannel = instance.getOpenerEventChannel();
-  eventChannel.emit('onCustomerSelected', list.value[value]);
-  uni.navigateBack()
+
+let timerId = null;
+// 监视查询的内容的变化
+let queryCusForm = reactive({})
+watch(searchContent, (newValue, oldValue) => {
+    if(timerId) clearTimeout(timerId);
+    timerId = setTimeout(async ()=>{
+        queryCusForm.cusName = newValue;
+        const res = await getYsCustomerList(queryCusForm);
+        dataList.value = res.rows;
+        clearTimeout(timerId);
+        timerId = null;
+    }, 500);
+});
+
+function radioChange(event) {
+     const selectedIndex = event.detail.value
+    let test = dataList.value[selectedIndex]
+    // 发送全局事件
+    uni.$emit('onCustomerSelected', test)
+    let cusName = test.cusName;//客户名称
+    let cusId = test.cusId;//客户ID
+    uni.navigateBack()//返回上一页
 }
 
+onMounted(() => {
+    navBarPaddingTop.value = 80; // 简化处理，实际应根据getNavBarPaddingTop()计算
+})
+
 </script>
-
 <style lang="scss" scoped>
-.all-body {
-  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
-  /* #endif */
+.con-body {
+  background: white;
+  height: 100vh;
 }
 
-.search .btn-search {
+.con-bg {
+  background: #f5f5f5;
+  height: 100%;
+}
+
+.top-height {
+  height: 80rpx;
+}
+
+.head-right {
+  display: flex;
+  align-items: center;
+  color: #B7D2FF;
+  font-size: 14px;
+  padding-right: 20rpx;
+}
+
+.all-body {
+  padding: 0 20rpx;
+  box-sizing: border-box;
+}
+
+.search {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+
+.custom-search {
+  flex: 1;
+}
+
+.btn-search {
   border: none;
   background: none;
   line-height: normal;
@@ -215,42 +155,57 @@ const radioChange = (e) => {
   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: calc(100vh - 250rpx);
+  overflow-y: auto;
 }
 
 .white-bg {
-  //padding-bottom:10rpx;
-  margin-bottom: 0;
-  overflow: hidden;
+  background-color: #fff;
+  border-radius: 12rpx;
+  padding: 24rpx;
+  margin-bottom: 20rpx;
   display: flex;
   align-items: center;
+  box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.05);
 }
 
 .radio {
-  padding-right: 20rpx;
+  margin-right: 20rpx;
+}
+
+.report-list {
+  flex: 1;
 }
 
 .title {
   font-size: 32rpx;
-  line-height: 48rpx;
+  color: #333;
+  font-weight: bold;
+  margin-bottom: 8rpx;
 }
 
-.report-list {
-  width: calc(100% - 70rpx);
-  //background-color: pink;
+.r-name {
+  font-size: 26rpx;
+  color: #666;
 }
 
-.border-bottom {
-  margin-top: 6rpx;
+.checked {
+  color: #007AFF;
 }
+
+/* 适配不同平台 */
+/* #ifdef APP-PLUS */
+.all-body {
+  top: 150rpx;
+  height: calc(100vh - 75px);
+}
+/* #endif */
+
+/* #ifndef APP-PLUS */
+.all-body {
+  top: 120rpx;
+  height: calc(100vh);
+}
+/* #endif */
 </style>
\ No newline at end of file

From 2bda2bb389bcfd469d97005cd6e70b5d60ea482d Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Fri, 29 Aug 2025 18:13:15 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=A1=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/business/CRM/marketActivity/chooseCus.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/business/CRM/marketActivity/chooseCus.vue b/src/pages/business/CRM/marketActivity/chooseCus.vue
index 56bb92a..6302c31 100644
--- a/src/pages/business/CRM/marketActivity/chooseCus.vue
+++ b/src/pages/business/CRM/marketActivity/chooseCus.vue
@@ -82,7 +82,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'

From e94ce94c4274f0110b2be5127918ce0fcd6671d4 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Fri, 29 Aug 2025 18:23:57 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=20=E5=B0=86=20/pages/business/CRM/chooseCus?=
 =?UTF-8?q?=20=20=E4=BF=AE=E6=94=B9=E4=B8=BA=20/pages/business/CRM/marketA?=
 =?UTF-8?q?ctivity/chooseCus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |   7 -
 src/pages/business/CRM/chooseCus.vue          | 211 ------------------
 .../CRM/marketInformation/beCurrent.vue       |   2 +-
 .../CRM/marketInformation/beCurrentDetail.vue |   2 +-
 .../CRM/marketInformation/competitor.vue      |   2 +-
 .../marketInformation/competitorDetail.vue    |   2 +-
 .../CRM/marketInformation/keyModelTasks.vue   |   2 +-
 .../marketInformation/keyModelTasksDetail.vue |   2 +-
 .../CRM/marketInformation/majorMatter.vue     |   2 +-
 .../marketInformation/majorMatterDetail.vue   |   2 +-
 .../marketInformation/marketOpportunities.vue |   3 +-
 .../marketOpportunitiesDetail.vue             |   2 +-
 .../marketInformation/personnelChanges.vue    |   2 +-
 .../personnelChangesDetail.vue                |   2 +-
 .../addPaymentCollection.vue                  |   2 +-
 .../CRM/paymentCollection/paymentDetail.vue   |   2 +-
 16 files changed, 15 insertions(+), 232 deletions(-)
 delete mode 100644 src/pages/business/CRM/chooseCus.vue

diff --git a/src/pages.json b/src/pages.json
index 5266e2b..1ccf3ce 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -217,13 +217,6 @@
 				"navigationBarTitleText": "通用信息更新"
 			}
 		},
-		//选择客户（已更新）
-		{
-			"path": "pages/business/CRM/chooseCus",
-			"style": {
-				"navigationBarTitleText": "客户选择"
-			}
-		},
 		//选择客户人员（已更新）
 		{
 			"path": "pages/business/CRM/customerUserList",
diff --git a/src/pages/business/CRM/chooseCus.vue b/src/pages/business/CRM/chooseCus.vue
deleted file mode 100644
index ddf213b..0000000
--- a/src/pages/business/CRM/chooseCus.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-  <view class="con-body">
-    <view class="con-bg">
-      <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'客户名称列表'" :leftFlag="true" :rightFlag="false">
-        <template #right>
-          <view class="head-right" @click="handleAdd">
-            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>
-            新增
-          </view>
-        </template>
-      </customHeader>
-
-      <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
-
-      <!-- 正文内容 -->
-      <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" @clear="searchValue=''"
-          />
-        </view>
-
-        <!-- 列表区域 -->
-        <view class="scroll-h" :class="{'loading-scroll':cssFlag}">
-          <radio-group class="block" @change="radioChange">
-            <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
-              <radio class='radio'
-                     :class="index === selectIndex ? 'checked' : ''"
-                     :checked="index === selectIndex"
-                     :value="index+''">
-              </radio>
-
-              <view class="report-list">
-                <view class="title">{{ item.cusName }}</view>
-                <view class="r-name">{{ item.shortName }}</view>
-              </view>
-            </view>
-          </radio-group>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-import customHeader from '@/components/customHeader.vue'
-import { getYsCustomerList } from '../../../api/crm/api_ys.js'
-import { onMounted, reactive, ref, watch } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import { useMessage } from '../../../utils/message.js'
-
-const message = useMessage();
-
-// 获取导航栏高度用于内容区域padding
-const navBarPaddingTop = ref(0);
-
-// 点击查询客户单位
-const queryParams = ref({
-    cusName: '',
-    nickName:'',
-    pageNum: 1,
-    pageSize: 10
-})
-
-onLoad(options => {
-    queryParams.value.cusName = options.cusName
-})
-const dataList = ref([])
-
-// 搜索内容
-let searchContent = ref('')
-
-// 选中项的索引号
-const selectIndex = ref(null);
-
-let timerId = null;
-// 监视查询的内容的变化
-let queryCusForm = reactive({})
-watch(searchContent, (newValue, oldValue) => {
-    if(timerId) clearTimeout(timerId);
-    timerId = setTimeout(async ()=>{
-        queryCusForm.cusName = newValue;
-        const res = await getYsCustomerList(queryCusForm);
-        dataList.value = res.rows;
-        clearTimeout(timerId);
-        timerId = null;
-    }, 500);
-});
-
-function radioChange(event) {
-     const selectedIndex = event.detail.value
-    let test = dataList.value[selectedIndex]
-    // 发送全局事件
-    uni.$emit('onCustomerSelected', test)
-    let cusName = test.cusName;//客户名称
-    let cusId = test.cusId;//客户ID
-    uni.navigateBack()//返回上一页
-}
-
-onMounted(() => {
-    navBarPaddingTop.value = 80; // 简化处理，实际应根据getNavBarPaddingTop()计算
-})
-
-</script>
-<style lang="scss" scoped>
-.con-body {
-  background: white;
-  height: 100vh;
-}
-
-.con-bg {
-  background: #f5f5f5;
-  height: 100%;
-}
-
-.top-height {
-  height: 80rpx;
-}
-
-.head-right {
-  display: flex;
-  align-items: center;
-  color: #B7D2FF;
-  font-size: 14px;
-  padding-right: 20rpx;
-}
-
-.all-body {
-  padding: 0 20rpx;
-  box-sizing: border-box;
-}
-
-.search {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20rpx;
-}
-
-.custom-search {
-  flex: 1;
-}
-
-.btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.scroll-h {
-  height: calc(100vh - 250rpx);
-  overflow-y: auto;
-}
-
-.white-bg {
-  background-color: #fff;
-  border-radius: 12rpx;
-  padding: 24rpx;
-  margin-bottom: 20rpx;
-  display: flex;
-  align-items: center;
-  box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.05);
-}
-
-.radio {
-  margin-right: 20rpx;
-}
-
-.report-list {
-  flex: 1;
-}
-
-.title {
-  font-size: 32rpx;
-  color: #333;
-  font-weight: bold;
-  margin-bottom: 8rpx;
-}
-
-.r-name {
-  font-size: 26rpx;
-  color: #666;
-}
-
-.checked {
-  color: #007AFF;
-}
-
-/* 适配不同平台 */
-/* #ifdef APP-PLUS */
-.all-body {
-  top: 150rpx;
-  height: calc(100vh - 75px);
-}
-/* #endif */
-
-/* #ifndef APP-PLUS */
-.all-body {
-  top: 120rpx;
-  height: calc(100vh);
-}
-/* #endif */
-</style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/marketInformation/beCurrent.vue b/src/pages/business/CRM/marketInformation/beCurrent.vue
index 313a875..4ee6b5f 100644
--- a/src/pages/business/CRM/marketInformation/beCurrent.vue
+++ b/src/pages/business/CRM/marketInformation/beCurrent.vue
@@ -143,7 +143,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/beCurrentDetail.vue b/src/pages/business/CRM/marketInformation/beCurrentDetail.vue
index 31b78e6..5e78dce 100644
--- a/src/pages/business/CRM/marketInformation/beCurrentDetail.vue
+++ b/src/pages/business/CRM/marketInformation/beCurrentDetail.vue
@@ -148,7 +148,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/competitor.vue b/src/pages/business/CRM/marketInformation/competitor.vue
index e83c481..b32accc 100644
--- a/src/pages/business/CRM/marketInformation/competitor.vue
+++ b/src/pages/business/CRM/marketInformation/competitor.vue
@@ -340,7 +340,7 @@ const dynamicPlaceholder = computed(() => {
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/competitorDetail.vue b/src/pages/business/CRM/marketInformation/competitorDetail.vue
index 42bf8ce..43ddd76 100644
--- a/src/pages/business/CRM/marketInformation/competitorDetail.vue
+++ b/src/pages/business/CRM/marketInformation/competitorDetail.vue
@@ -348,7 +348,7 @@ const dynamicPlaceholder = computed(() => {
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/keyModelTasks.vue b/src/pages/business/CRM/marketInformation/keyModelTasks.vue
index 3756522..1f9712f 100644
--- a/src/pages/business/CRM/marketInformation/keyModelTasks.vue
+++ b/src/pages/business/CRM/marketInformation/keyModelTasks.vue
@@ -147,7 +147,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue b/src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue
index 221ac5d..db6f94c 100644
--- a/src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue
+++ b/src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue
@@ -152,7 +152,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/majorMatter.vue b/src/pages/business/CRM/marketInformation/majorMatter.vue
index 0d4e999..8b67af4 100644
--- a/src/pages/business/CRM/marketInformation/majorMatter.vue
+++ b/src/pages/business/CRM/marketInformation/majorMatter.vue
@@ -172,7 +172,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/majorMatterDetail.vue b/src/pages/business/CRM/marketInformation/majorMatterDetail.vue
index 3c99a93..8df76ee 100644
--- a/src/pages/business/CRM/marketInformation/majorMatterDetail.vue
+++ b/src/pages/business/CRM/marketInformation/majorMatterDetail.vue
@@ -179,7 +179,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/marketOpportunities.vue b/src/pages/business/CRM/marketInformation/marketOpportunities.vue
index 952afa8..d858f8b 100644
--- a/src/pages/business/CRM/marketInformation/marketOpportunities.vue
+++ b/src/pages/business/CRM/marketInformation/marketOpportunities.vue
@@ -232,7 +232,8 @@
 	// 选择客户页面跳转
 	function chooseCustomer(){
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
+			
 		})  
 	} 
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue b/src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue
index 4ca4e2e..027ba3b 100644
--- a/src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue
+++ b/src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue
@@ -244,7 +244,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer(){
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url:'/pages/business/CRM/marketActivity/chooseCus'
 		})  
 	} 
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/personnelChanges.vue b/src/pages/business/CRM/marketInformation/personnelChanges.vue
index 50c46be..985fea0 100644
--- a/src/pages/business/CRM/marketInformation/personnelChanges.vue
+++ b/src/pages/business/CRM/marketInformation/personnelChanges.vue
@@ -201,7 +201,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/marketInformation/personnelChangesDetail.vue b/src/pages/business/CRM/marketInformation/personnelChangesDetail.vue
index 3d084c4..64aad48 100644
--- a/src/pages/business/CRM/marketInformation/personnelChangesDetail.vue
+++ b/src/pages/business/CRM/marketInformation/personnelChangesDetail.vue
@@ -202,7 +202,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/paymentCollection/addPaymentCollection.vue b/src/pages/business/CRM/paymentCollection/addPaymentCollection.vue
index b4ce4df..df639ab 100644
--- a/src/pages/business/CRM/paymentCollection/addPaymentCollection.vue
+++ b/src/pages/business/CRM/paymentCollection/addPaymentCollection.vue
@@ -101,7 +101,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
diff --git a/src/pages/business/CRM/paymentCollection/paymentDetail.vue b/src/pages/business/CRM/paymentCollection/paymentDetail.vue
index 4b46007..b39b09a 100644
--- a/src/pages/business/CRM/paymentCollection/paymentDetail.vue
+++ b/src/pages/business/CRM/paymentCollection/paymentDetail.vue
@@ -105,7 +105,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

From 8e049c4a0cc3f8c5c564d41d1b7463a02d834d46 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Fri, 29 Aug 2025 18:42:15 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=20=E6=98=BE=E7=A4=BA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/business/CRM/customer/changeCustomerOwner.vue         | 2 +-
 src/pages/business/CRM/customer/customerUserBelong.vue          | 2 +-
 src/pages/business/CRM/marketActivity/auditReport.vue           | 2 +-
 src/pages/business/CRM/marketActivity/visitReport.vue           | 2 +-
 src/pages/business/CRM/marketActivity/visitReportView.vue       | 2 +-
 src/pages/business/CRM/marketInformation/infomationView.vue     | 2 +-
 src/pages/business/CRM/marketInformation/marketInformation.vue  | 2 +-
 .../business/CRM/marketInformation/marketInformationReview.vue  | 2 +-
 src/pages/business/CRM/paymentCollection/index.vue              | 2 +-
 src/pages/business/CRM/plan/planView.vue                        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/business/CRM/customer/changeCustomerOwner.vue b/src/pages/business/CRM/customer/changeCustomerOwner.vue
index af43b36..feb555b 100644
--- a/src/pages/business/CRM/customer/changeCustomerOwner.vue
+++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue
@@ -128,7 +128,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: { 
     tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
diff --git a/src/pages/business/CRM/customer/customerUserBelong.vue b/src/pages/business/CRM/customer/customerUserBelong.vue
index 1c9496b..f524fee 100644
--- 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: '已经到底了'
diff --git a/src/pages/business/CRM/marketActivity/auditReport.vue b/src/pages/business/CRM/marketActivity/auditReport.vue
index 8e87aa0..181f38e 100644
--- a/src/pages/business/CRM/marketActivity/auditReport.vue
+++ b/src/pages/business/CRM/marketActivity/auditReport.vue
@@ -82,7 +82,7 @@ const upOption = ref({
     noMoreSize: 5,
     empty: { 
         tip: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
+        icon: "../../../../static/images/mescroll-empty.png"
     },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
diff --git a/src/pages/business/CRM/marketActivity/visitReport.vue b/src/pages/business/CRM/marketActivity/visitReport.vue
index b523248..09ffdb9 100644
--- a/src/pages/business/CRM/marketActivity/visitReport.vue
+++ b/src/pages/business/CRM/marketActivity/visitReport.vue
@@ -142,7 +142,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
       tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+      icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
diff --git a/src/pages/business/CRM/marketActivity/visitReportView.vue b/src/pages/business/CRM/marketActivity/visitReportView.vue
index f2d9774..4291e72 100644
--- a/src/pages/business/CRM/marketActivity/visitReportView.vue
+++ b/src/pages/business/CRM/marketActivity/visitReportView.vue
@@ -142,7 +142,7 @@ const upOption = ref({
     noMoreSize: 5,
     empty: { 
         tip: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
+        icon: "../../../../static/images/mescroll-empty.png"
     },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
diff --git a/src/pages/business/CRM/marketInformation/infomationView.vue b/src/pages/business/CRM/marketInformation/infomationView.vue
index 775f7d7..7dad9f8 100644
--- a/src/pages/business/CRM/marketInformation/infomationView.vue
+++ b/src/pages/business/CRM/marketInformation/infomationView.vue
@@ -244,7 +244,7 @@ const inputval = ref(''); // 搜索内容
 		noMoreSize: 5,
 		empty: {
 			tip: '~ 空空如也 ~',
-			icon: "../../static/images/mescroll-empty.png"
+			icon: "../../../../static/images/mescroll-empty.png"
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'
diff --git a/src/pages/business/CRM/marketInformation/marketInformation.vue b/src/pages/business/CRM/marketInformation/marketInformation.vue
index 0913465..21f347e 100644
--- a/src/pages/business/CRM/marketInformation/marketInformation.vue
+++ b/src/pages/business/CRM/marketInformation/marketInformation.vue
@@ -237,7 +237,7 @@
 		noMoreSize: 5,
 		empty: {
 			tip: '~ 空空如也 ~',
-			icon: "../../static/images/mescroll-empty.png"			
+			icon: "../../../../static/images/mescroll-empty.png"			
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'
diff --git a/src/pages/business/CRM/marketInformation/marketInformationReview.vue b/src/pages/business/CRM/marketInformation/marketInformationReview.vue
index 03fa6b3..0f52342 100644
--- a/src/pages/business/CRM/marketInformation/marketInformationReview.vue
+++ b/src/pages/business/CRM/marketInformation/marketInformationReview.vue
@@ -105,7 +105,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: { 
       tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+      icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
diff --git a/src/pages/business/CRM/paymentCollection/index.vue b/src/pages/business/CRM/paymentCollection/index.vue
index 55ea079..1e1c576 100644
--- a/src/pages/business/CRM/paymentCollection/index.vue
+++ b/src/pages/business/CRM/paymentCollection/index.vue
@@ -110,7 +110,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: { 
       tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+      icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
diff --git a/src/pages/business/CRM/plan/planView.vue b/src/pages/business/CRM/plan/planView.vue
index d0d796e..e6993e7 100644
--- a/src/pages/business/CRM/plan/planView.vue
+++ b/src/pages/business/CRM/plan/planView.vue
@@ -146,7 +146,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: { 
       tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+      icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'

From ed26947cce7f7c034bb68a04ff6c2c8b76da1bf1 Mon Sep 17 00:00:00 2001
From: "PC-202311141343\\Administrator" <505354293@qq.com>
Date: Mon, 1 Sep 2025 09:07:49 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CRM/mainOwner/view/viewMainOwnerDetail.vue   |  2 +-
 .../CRM/marketInformation/keyModelTasks.vue      |  2 +-
 .../CRM/marketInformation/marketInformation.vue  | 16 ++++++++++------
 .../marketInformation/marketOpportunities.vue    |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
index 9574355..0d52803 100644
--- a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
+++ b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
@@ -135,7 +135,7 @@ function getCrmCusUserNewChangeOwnerList() {
 <style scoped>
 .con-bg{
   background: white;
-  min-height: 100vh;
+/*  min-height: 100vh; */
 }
 
 .white-bg {
diff --git a/src/pages/business/CRM/marketInformation/keyModelTasks.vue b/src/pages/business/CRM/marketInformation/keyModelTasks.vue
index 1f9712f..299ba18 100644
--- a/src/pages/business/CRM/marketInformation/keyModelTasks.vue
+++ b/src/pages/business/CRM/marketInformation/keyModelTasks.vue
@@ -203,7 +203,7 @@
 		height: calc(120vh - 100px)
 			/* #endif */
 			/* #ifndef APP-PLUS */
-			height:calc(120vh - 80px)
+			height:calc(140vh - 80px)
 			/* #endif */
 	}
 
diff --git a/src/pages/business/CRM/marketInformation/marketInformation.vue b/src/pages/business/CRM/marketInformation/marketInformation.vue
index 21f347e..481566a 100644
--- a/src/pages/business/CRM/marketInformation/marketInformation.vue
+++ b/src/pages/business/CRM/marketInformation/marketInformation.vue
@@ -31,7 +31,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -50,7 +50,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -69,7 +69,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.competitiveUnits }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -88,7 +88,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -109,7 +109,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -127,7 +127,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -493,4 +493,8 @@
 	.report-list .title {
 		display: flex;
 	}
+	.btn-blue {
+	  background-color: #3384DF; /* 蓝色背景 */
+	  color: #ffffff;
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/marketInformation/marketOpportunities.vue b/src/pages/business/CRM/marketInformation/marketOpportunities.vue
index d858f8b..be61582 100644
--- a/src/pages/business/CRM/marketInformation/marketOpportunities.vue
+++ b/src/pages/business/CRM/marketInformation/marketOpportunities.vue
@@ -312,7 +312,7 @@
 		height: calc(120vh - 100px)
 			/* #endif */
 			/* #ifndef APP-PLUS */
-			height:calc(120vh - 80px)
+			height:calc(140vh - 80px)
 			/* #endif */
 	}