From d6b2a82455b40f38c8f14ef5a3f1ab42f1ebbc19 Mon Sep 17 00:00:00 2001 From: wangzeyan <258785420@qq.com> Date: Sat, 14 Jun 2025 14:36:21 +0800 Subject: [PATCH] xiuggaibug --- App.vue | 1 + pages.json | 18 + pages/market/clue/add_clues.vue | 255 +- pages/market/clue/class_arrangement.vue | 196 ++ .../market/clue/class_arrangement_detail.vue | 148 + pages/market/clue/clue_info.vue | 83 +- pages/market/clue/edit_clues.vue | 3073 ++++++++--------- pages/market/clue/index.vue | 1568 +++++---- pages/market/index/index.vue | 22 +- pages/student/login/login.vue | 5 +- uni.scss | 11 +- .../components/uni-calendar/uni-calendar.vue | 8 - 12 files changed, 2760 insertions(+), 2628 deletions(-) create mode 100644 pages/market/clue/class_arrangement.vue create mode 100644 pages/market/clue/class_arrangement_detail.vue diff --git a/App.vue b/App.vue index f52eeba..4db626b 100644 --- a/App.vue +++ b/App.vue @@ -43,4 +43,5 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index b8379c2..342b3f6 100644 --- a/pages.json +++ b/pages.json @@ -573,6 +573,24 @@ "navigationBarBackgroundColor": "#fff", "navigationBarTextStyle": "black" } + }, + { + "path": "pages/market/clue/class_arrangement", + "style": { + "navigationBarTitleText": "课程安排", + "navigationStyle": "default", + "navigationBarBackgroundColor": "#232323", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/market/clue/class_arrangement_detail", + "style": { + "navigationBarTitleText": "课程安排详情", + "navigationStyle": "default", + "navigationBarBackgroundColor": "#232323", + "navigationBarTextStyle": "white" + } } diff --git a/pages/market/clue/add_clues.vue b/pages/market/clue/add_clues.vue index e318d85..0b69d93 100644 --- a/pages/market/clue/add_clues.vue +++ b/pages/market/clue/add_clues.vue @@ -26,11 +26,52 @@ 基础信息 - + + + + + + + + + + + + - - - - - - + - - - - - - + + + + + + {{ item.week }} + {{ item.day }} + + + + + + 查看更多 + + + + + + + + + + + + + 已结束 + + + 时间：{{ course.date }} + 教室：{{ course.classroom }} + 课程：{{ course.name }} + 人数：{{ course.count }} + + + 已签到学生 (0/{{ course.count }}) + + + + + + + + + + \ No newline at end of file diff --git a/pages/market/clue/class_arrangement_detail.vue b/pages/market/clue/class_arrangement_detail.vue new file mode 100644 index 0000000..5a65e69 --- /dev/null +++ b/pages/market/clue/class_arrangement_detail.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue index bec3426..a356f69 100644 --- a/pages/market/clue/clue_info.vue +++ b/pages/market/clue/clue_info.vue @@ -28,15 +28,19 @@ class="drop-image-x"> - 意向：{{ clientInfo.customerResource.initial_intent_name }} - - - - + + + + + + + + + @@ -166,7 +170,7 @@ 合同联系人：包念念妈妈 课程：课程名称1 - 2020-08-30 签单 + 2020-08-30 签单 @@ -187,7 +191,7 @@ 合同联系人：包念念妈妈 课程：课程名称1 - 2020-08-30 签单 + 2020-08-30 签单 @@ -208,7 +212,7 @@ 合同联系人：包念念妈妈 课程：课程名称1 - 2020-08-30 签单 + 2020-08-30 签单 @@ -229,7 +233,7 @@ 合同联系人：包念念妈妈 课程：课程名称1 - 2020-08-30 签单 + 2020-08-30 签单 @@ -250,7 +254,7 @@ 合同联系人：包念念妈妈 课程：课程名称1 - 2020-08-30 签单 + 2020-08-30 签单 @@ -259,7 +263,7 @@ 编辑详情 - 拨打电话 + 课程安排 修改记录 订单列表 @@ -407,6 +411,19 @@ }) }, + //跳转页面-课程安排 + openViewEditClassLog() { + let resource_id = this.clientInfo.resource_id//客户资源id + let resource_name = this.clientInfo.customerResource.name || ''//客户资源id姓名 + + let staff_id = this.userInfo.id//员工id + let staff_id_name = this.userInfo.name || ''//员工姓名 + + this.$navigateTo({ + url: `/pages/market/clue/class_arrangement?resource_id=${resource_id}&resource_name=${resource_name}&staff_id=${staff_id}&staff_id_name=${staff_id_name}` + }) + }, + //跳转页面-转接跟进任务 openViewNewTask() { this.$navigateTo({ @@ -453,7 +470,31 @@ }); }, + // 拨打电话 + handleMakeCall() { + if (!this.clientInfo.customerResource.phone_number) { + uni.showToast({ + title: '电话号码为空', + icon: 'none' + }); + return; + } + this.callTel(this.clientInfo.customerResource.phone_number); + }, + // 发送消息 + handleSendMessage() { + if (!this.clientInfo.customerResource.staff_id) { + uni.showToast({ + title: '未找到相关人员', + icon: 'none' + }); + return; + } + this.$navigateTo({ + url: `/pages/common/im_chat_info?hair_staff_id=${this.clientInfo.customerResource.staff_id}` + }); + }, //切换标签 switch_tags(type){ @@ -677,4 +718,24 @@ padding: 12rpx 8rpx; text-align: center; } + .action-buttons { + display: flex; + gap: 20rpx; + align-items: center; + + .btn-item { + display: flex; + align-items: center; + justify-content: center; + width: 60rpx; + height: 60rpx; + border-radius: 50%; + background: #f5f5f5; + + .btn-icon { + width: 40rpx; + height: 40rpx; + } + } + } \ No newline at end of file diff --git a/pages/market/clue/edit_clues.vue b/pages/market/clue/edit_clues.vue index 92c5cf6..78b99af 100644 --- a/pages/market/clue/edit_clues.vue +++ b/pages/market/clue/edit_clues.vue @@ -1,1508 +1,1308 @@ \ No newline at end of file diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue index 6732e86..44baab4 100644 --- a/pages/market/clue/index.vue +++ b/pages/market/clue/index.vue @@ -1,720 +1,721 @@ + + //领取按钮 + .ling { + display: flex; + justify-content: center; + align-items: center; + border-radius: 50%; + color: #fff; + width: 50rpx; + height: 50rpx; + background-color: #F59A23; + } + + //抽屉搜索栏 + .fui-scroll__view { + margin-top: 60rpx; + width: 520rpx; + flex: 1; + overflow: hidden; + + .fui-title { + padding: 40rpx 32rpx; + padding-bottom: 20rpx; + box-sizing: border-box; + font-weight: bold; + } + + .drawer_box { + .item { + display: flex; + flex-direction: column; + gap: 15rpx; + + .title {} + + .input_box { + border: 1px solid #292929; + width: 450rpx; + + ::v-deep .fui-input__wrap { + padding: 10rpx !important; + height: 100%; + } + } + } + } + + .fui-btn__box { + padding: 40rpx 0; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 30rpx; + } + + } + + .button { + display: flex; + justify-content: center; + align-items: center; + border-radius: 5rpx; + font-size: 24rpx; + color: #fff; + background-color: #29d3b4; + width: 20%; + height: 100%; + + + } + + .clientbtn { + width: 200px; + height: 40px; + font-size: 16px; + border-radius: 5px; + } + \ No newline at end of file diff --git a/pages/market/index/index.vue b/pages/market/index/index.vue index 4ec9e2a..5834d2a 100644 --- a/pages/market/index/index.vue +++ b/pages/market/index/index.vue @@ -118,7 +118,7 @@ - 上月业绩 + 个人业绩 @@ -130,9 +130,9 @@ - 资源总数 + 今日新增资源 - {{infoData.last_month.new_total}}人 + {{infoData.last_month.xzzy}}人 @@ -141,9 +141,9 @@ - 业绩收入 + 今日业绩收入 - {{infoData.last_month.assigned_sales}}人 + {{infoData.last_month.yjsr}}人 @@ -154,21 +154,21 @@ - 关单数量 + 历史关单数量 - {{infoData.last_month.yesterday_new}}人 + {{infoData.last_month.gdsl}}人 - + {{infoData.last_month.wfpsl}}人 + diff --git a/pages/student/login/login.vue b/pages/student/login/login.vue index d7bfb92..8a15451 100644 --- a/pages/student/login/login.vue +++ b/pages/student/login/login.vue @@ -309,7 +309,10 @@ export default { // 使用 redirectTo 替代 navigateTo，避免页面栈堆积 uni.redirectTo({ - url: openPath + url: openPath, + complete(e) { + console.log(e) + } }); return } diff --git a/uni.scss b/uni.scss index 423d10c..d3e583e 100644 --- a/uni.scss +++ b/uni.scss @@ -92,4 +92,13 @@ $font-size-paragraph: 30rpx; /* coolc-coupon 插件 */ $font-sm: 20rpx; $font-color-999: #999; -$bgcolor_white: #fff; \ No newline at end of file +$bgcolor_white: #fff; + + $uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4); + $uni-border-color: #EDEDED; + $uni-text-color: #333; + $uni-bg-color-hover:#f1f1f1; + $uni-font-size-base:14px; + $uni-text-color-placeholder: #808080; + $uni-color-subtitle: #555555; + $uni-text-color-grey:#999; \ No newline at end of file diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue index 0beebfb..5c0e578 100644 --- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue +++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue @@ -367,14 +367,6 @@