From 4bb1478021c2a5e912906d38461a0f6fbb80029d Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Thu, 27 Feb 2025 22:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8B=9B=E7=94=9F=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E3=80=91=20=E4=BF=AE=E5=A4=8D#=20=E8=BD=AC=E5=8C=96=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=98=AF=E5=90=A6=E8=BD=AC?=
 =?UTF-8?q?=E5=8C=96=E6=88=90=E5=8A=9F=E5=AD=97=E6=AE=B5=E6=97=B6=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/clue.ts                                     |  1 +
 src/bundle/pages/complete_add/index.vue             | 11 ++++++-----
 src/bundle/pages/follow_edit/index.vue              |  2 +-
 src/components/design-switch-field.vue              | 11 -----------
 src/components/widgets/recruitsale/clue-card.vue    |  6 +++---
 src/components/widgets/telesale/clue-card.vue       |  3 ++-
 src/components/widgets/telesale/follow-record.vue   |  9 ++++-----
 src/pages/recruitsale/home/index.vue                | 11 ++++-------
 src/pages/telesale/summary/index.vue                | 13 +++++++------
 .../uview-plus/components/u-switch/u-switch.vue     |  1 +
 10 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/src/api/clue.ts b/src/api/clue.ts
index c84af00..edb3ea1 100644
--- a/src/api/clue.ts
+++ b/src/api/clue.ts
@@ -32,6 +32,7 @@ export function apiEditRemark(params: any) {
 export function apiEditClue(params: any) {
     return request.post({ url: '/clue/edit', data: params })
 }
+// 电销线索列表
 export function apiTeleClueList(params: any) {
     return request.get({ url: '/clue/telemarketingList', data: params })
 }
diff --git a/src/bundle/pages/complete_add/index.vue b/src/bundle/pages/complete_add/index.vue
index e1c7e7b..1600024 100644
--- a/src/bundle/pages/complete_add/index.vue
+++ b/src/bundle/pages/complete_add/index.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="bg-[#FAFAFE]">
         <view class="bg-white px-[32rpx]">
-            <TForm ref="tForm" :model="form" :rules="rules" errorType="toast">
+            <TForm ref="tForm" :model="form" errorType="toast">
                 <TFormItem prop="recruitTeacherName">
                     <TInputField
                         v-model="form.recruitTeacherName"
@@ -114,9 +114,6 @@ const form = ref({
     isConversion: 0,
     remark: ''
 })
-const rules = {
-    isConversion: [{ required: true, message: '请选择是否转化成功' }]
-}
 const parseStatusText = computed(
     () => optionsMap.stateOptions.find(item => item.value == form.value.state)?.label
 )
@@ -153,7 +150,11 @@ const handleSubmit = () => {
 }
 const setFormData = () => {
     for (const key in clueDetailInfo.value) {
-        if (Object.prototype.hasOwnProperty.call(form.value, key)) {
+        if (
+            Object.prototype.hasOwnProperty.call(form.value, key) &&
+            clueDetailInfo.value[key] != null &&
+            clueDetailInfo.value[key] != undefined
+        ) {
             form.value[key] = clueDetailInfo.value[key]
         }
     }
diff --git a/src/bundle/pages/follow_edit/index.vue b/src/bundle/pages/follow_edit/index.vue
index a192150..9e3c51b 100644
--- a/src/bundle/pages/follow_edit/index.vue
+++ b/src/bundle/pages/follow_edit/index.vue
@@ -74,7 +74,7 @@ const handleConfirm = () => {
                     await apiEditClue(form.value)
                     toast('修改成功')
                     uni.navigateBack()
-                    uni.$emit('refreshPage')
+                    uni.$emit('refreshPageList')
                 } catch (error) {}
                 loading.value = false
             }
diff --git a/src/components/design-switch-field.vue b/src/components/design-switch-field.vue
index 1017e17..ee8dc5c 100644
--- a/src/components/design-switch-field.vue
+++ b/src/components/design-switch-field.vue
@@ -59,17 +59,6 @@ const labelStyle = computed(() => {
 const handleSwitchChange = (value: number) => {
     emit('update:modelValue', value)
 }
-
-watch(
-    () => props.modelValue,
-    val => {
-        innerValue.value = val
-    },
-    {
-        deep: true,
-        immediate: true
-    }
-)
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/widgets/recruitsale/clue-card.vue b/src/components/widgets/recruitsale/clue-card.vue
index 6b7ee8b..eb828a6 100644
--- a/src/components/widgets/recruitsale/clue-card.vue
+++ b/src/components/widgets/recruitsale/clue-card.vue
@@ -6,7 +6,7 @@
                     <text>{{ item.studentName }}</text>
                     <view class="flex ml-[48rpx] gap-[4rpx] items-center">
                         <text class="text-primary">{{ item.phone }}</text>
-                        <u-copy content="uview-plus is great !">
+                        <u-copy :content="item.phone">
                             <TIcon name="icon-copy" color="#0E66FB" />
                         </u-copy>
                     </view>
@@ -24,11 +24,11 @@
                 </view>
                 <view class="flex gap-[20rpx]">
                     <text class="text-muted w-[128rpx]">基本情况</text>
-                    <view class="flex gap-[4rpx] flex-1 items-end">
+                    <view class="flex gap-[4rpx] flex-1 items-center">
                         <text>
                             {{ item.basicInformation }}
                         </text>
-                        <u-copy content="uview-plus is great !">
+                        <u-copy :content="item.basicInformation !">
                             <TIcon name="icon-copy" color="#0E66FB" />
                         </u-copy>
                     </view>
diff --git a/src/components/widgets/telesale/clue-card.vue b/src/components/widgets/telesale/clue-card.vue
index 793e0ba..c8384b3 100644
--- a/src/components/widgets/telesale/clue-card.vue
+++ b/src/components/widgets/telesale/clue-card.vue
@@ -6,7 +6,7 @@
                     <text>{{ item.studentName }}</text>
                     <view class="flex ml-[48rpx] gap-[4rpx] items-center">
                         <text class="text-primary">{{ item.phone }}</text>
-                        <u-copy content="uview-plus is great !">
+                        <u-copy :content="item.phone">
                             <TIcon name="icon-copy" color="#0E66FB" />
                         </u-copy>
                     </view>
@@ -52,6 +52,7 @@
 <script setup lang="ts">
 import { computed, PropType } from 'vue'
 import { converStatusEnum, stateEnum } from '@/enums'
+import { onLoad } from '@dcloudio/uni-app'
 
 export interface IClue {
     studentName: string
diff --git a/src/components/widgets/telesale/follow-record.vue b/src/components/widgets/telesale/follow-record.vue
index 1f11bbc..c653bb1 100644
--- a/src/components/widgets/telesale/follow-record.vue
+++ b/src/components/widgets/telesale/follow-record.vue
@@ -25,8 +25,7 @@
 </template>
 
 <script setup lang="ts">
-import { onLoad } from '@dcloudio/uni-app'
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import { debounce } from 'lodash-es'
 import clueCard from './clue-card.vue'
 import { useZPaging } from '@/hooks/useZPaging'
@@ -42,11 +41,11 @@ const { paging, queryList, refresh, changeApi, setParams } = useZPaging(
     () => {}
 )
 const searchChange = debounce(() => {
-    refresh()
+    refresh(queryParams.value)
 }, 300)
 
-onLoad(() => {
-    uni.$on('refreshPage', () => {
+onMounted(() => {
+    uni.$on('refreshPageList', () => {
         refresh(queryParams.value)
     })
 })
diff --git a/src/pages/recruitsale/home/index.vue b/src/pages/recruitsale/home/index.vue
index 208208b..64d4015 100644
--- a/src/pages/recruitsale/home/index.vue
+++ b/src/pages/recruitsale/home/index.vue
@@ -43,14 +43,11 @@
 
 <script setup lang="ts">
 import { useZPaging } from '@/hooks/useZPaging'
-import { ref } from 'vue'
+import { ref, onMounted, shallowRef, computed } from 'vue'
+import { debounce } from 'lodash-es'
 import clueCard from '@/components/widgets/recruitsale/clue-card.vue'
-import { shallowRef } from 'vue'
-import { computed } from 'vue'
 import { apiCluseList, apiEditRemark } from '@/api/clue'
 import { converStatusEnum } from '@/enums'
-import { onLoad } from '@dcloudio/uni-app'
-import { debounce } from 'lodash-es'
 import { toast } from '@/utils/util'
 
 const tabs = shallowRef([
@@ -97,13 +94,13 @@ const handleConfirm = async () => {
         refresh(queryParams.value)
     } catch (error) {}
 }
-onLoad(() => {
+onMounted(() => {
     uni.$on('refreshPage', () => {
         refresh(queryParams.value)
     })
 })
 const searchChange = debounce(() => {
-    refresh()
+    refresh(queryParams.value)
 }, 300)
 </script>
 <style scoped></style>
diff --git a/src/pages/telesale/summary/index.vue b/src/pages/telesale/summary/index.vue
index c8a7c87..44fec62 100644
--- a/src/pages/telesale/summary/index.vue
+++ b/src/pages/telesale/summary/index.vue
@@ -1,10 +1,11 @@
 <template>
-    <view class="pb-[24rpx]">
-        <w-date-more :curDate="curDate" type="telesale" />
-        <date-strip v-model="value" @change="handleDateChange" height="160rpx" />
-        <w-summary-form v-model="templateItems" @handle-confirm="handleConfirm" />
-        <tabbar />
-    </view>
+    <TContainer>
+        <view class="pb-[24rpx]">
+            <w-date-more :curDate="curDate" type="telesale" />
+            <date-strip v-model="value" @change="handleDateChange" height="160rpx" />
+            <w-summary-form v-model="templateItems" @handle-confirm="handleConfirm" />
+        </view>
+    </TContainer>
 </template>
 
 <script setup lang="ts">
diff --git a/src/uni_modules/uview-plus/components/u-switch/u-switch.vue b/src/uni_modules/uview-plus/components/u-switch/u-switch.vue
index e486041..027a7c3 100644
--- a/src/uni_modules/uview-plus/components/u-switch/u-switch.vue
+++ b/src/uni_modules/uview-plus/components/u-switch/u-switch.vue
@@ -70,6 +70,7 @@
 				immediate: true,
 				handler(n) {
 					if(n !== this.inactiveValue && n !== this.activeValue) {
+                        console.log(n, this.inactiveValue, this.activeValue);
 						error('v-model绑定的值必须为inactiveValue、activeValue二者之一')
 					}
 				}