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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=20=E5=B0=86=20/pages/business/CRM/chooseCus=20=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20/pages/business/CRM/marketActivit?=
 =?UTF-8?q?y/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'
 		})
 	}
 	//定义数据接收的值