php
/
ZhiHuiJiaoWu_UniApp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://gitlab.frkj.cc/php/ZhiHuiJiaoWu_UniApp 

# Conflicts:
#	pages/market/data/statistics.vue
master
于宏哲PHP 9 months ago
parent
278723e0b3 f149bfebc5
commit
f18fe1dc0e
10 changed files with 487 additions and 294 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      components/uni-popup/uni-popup-dialog.vue
  2. 15
      config.js
  3. 13
      pages/market/clue/add_clues.vue
  4. 340
      pages/market/clue/clue_info.vue
  5. 28
      pages/market/clue/edit_clues.vue
  6. 10
      pages/market/clue/index.vue
  7. 164
      pages/market/clue/order_list.vue
  8. 9
      pages/market/data/index.vue
  9. 2
      pages/student/login/login.vue

8
components/uni-popup/uni-popup-dialog.vue
View File

@ -217,7 +217,7 @@
}
.uni-button-color {
color: $uni-color-primary;
color: $color-primary;
}
.uni-dialog-input {
@ -226,15 +226,15 @@
}
.uni-popup__success {
color: $uni-color-success;
color: $color-success;
}
.uni-popup__warn {
color: $uni-color-warning;
color: $color-warning;
}
.uni-popup__error {
color: $uni-color-error;
color: $color-error;
}
.uni-popup__info {

15
config.js
View File

@ -1,15 +0,0 @@
export default {
server: "http://medication.zeyan.wang",
appName: "要药提醒",
// #ifdef APP-PLUS
version: plus.runtime.version,
varsionCode: plus.runtime.versionCode,
// #endif
// #ifndef APP-PLUS
version: '1.0.0',
// #endif
}

13
pages/market/clue/add_clues.vue
View File

@ -74,7 +74,8 @@
<fui-form-item
label="校区"
labelSize='26'
prop=""
prop="campus"
asterisk asteriskPosition="right"
background='#434544'
labelColor='#fff'
:bottomBorder='false'
@ -1215,6 +1216,16 @@ export default {
this.nextStep('0')
return false
}
//校区必填
if(!data.campus){
uni.showToast({
title: '校区必填',
icon: 'none'
})
this.nextStep('0')
return false
}
return true
},
//提交

340
pages/market/clue/clue_info.vue
View File

@ -120,145 +120,29 @@
<!-- 通话记录-->
<view class="call-log" v-if="switch_tags_type == 3">
<!-- 添加备注按钮 -->
<view style="width: 92%; margin: 20rpx auto; display: flex; justify-content: center;">
<button type="primary" style="background-color: #29D3B4; color: white;" @click="openAddRemark">添加备注</button>
<view class="call-record-wrapper" v-for="(v,k) in listCallUp" :key="k">
<view class="call-record-item">
<view class="call-record-header">
<view class="call-name">{{v.name}}</view>
<view class="call-time">{{v.create_time}}</view>
</view>
<view style="margin-top: 20rpx" v-for="(v,k) in listCallUp" :key="k">
<!-- <view class="basic-message">08-23</view>-->
<view class="follow-records-list">
<view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
<view>{{v.name}}</view>
<view>{{v.create_time}}</view>
</view>
<view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
<view>呼叫时间：{{v.created_at}}</view>
<view>呼叫备注：{{v.remarks}}</view>
</view>
</view>
</view>
<view style="height: 200rpx;"></view>
</view>
<!-- 在籍客户-->
<view class="registered-clients" v-if="switch_tags_type == 4">
<view class="search">
<view :class="{'selected': select_type === 1, 'not-selected': select_type !== 1}" @click="getSelect(1)">
全部(320)
</view>
<view :class="{'selected': select_type === 2, 'not-selected': select_type !== 2}" @click="getSelect(2)">
同校(8)
</view>
<view :class="{'selected': select_type === 3, 'not-selected': select_type !== 3}" @click="getSelect(3)">
同班(15)
</view>
<view :class="{'selected': select_type === 4, 'not-selected': select_type !== 4}" @click="getSelect(4)">
同小区(12)
</view>
</view>
<view style="margin: 16rpx;">
<view class="follow-records-list">
<view class="same-community" v-if="true">
同小区
</view>
<view class="coeducation" v-if="false">
同校
</view>
<view class="coeducation" v-if="false">
同班
</view>
<view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
<view>包子皮</view>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
<view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
<view>课程：课程名称1</view>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
</view>
</view>
<view style="margin: 16rpx;">
<view class="follow-records-list">
<view class="same-community" v-if="false">
同小区
</view>
<view class="coeducation" v-if="true">
同校
</view>
<view class="coeducation" v-if="false">
同班
</view>
<view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
<view>包子皮</view>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
<view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
<view>课程：课程名称1</view>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
</view>
</view>
<view style="margin: 16rpx;">
<view class="follow-records-list">
<view class="same-community" v-if="false">
同小区
</view>
<view class="coeducation" v-if="false">
同校
</view>
<view class="coeducation" v-if="true">
同班
<view class="call-record-content">
<view class="call-detail">
<text class="call-label">呼叫时间：</text>
<text>{{v.created_at}}</text>
</view>
<view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
<view>包子皮</view>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
<view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
<view>课程：课程名称1</view>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
</view>
</view>
<view style="margin: 16rpx;">
<view class="follow-records-list">
<view class="same-community" v-if="true">
同小区
</view>
<view class="coeducation" v-if="false">
同校
</view>
<view class="coeducation" v-if="false">
同班
</view>
<view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
<view>包子皮</view>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
<view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
<view>课程：课程名称1</view>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
</view>
</view>
<view style="margin: 16rpx;">
<view class="follow-records-list">
<view class="same-community" v-if="true">
同小区
</view>
<view class="coeducation" v-if="false">
同校
</view>
<view class="coeducation" v-if="false">
同班
</view>
<view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
<view>包子皮</view>
<button
type="primary"
size="mini"
class="remark-btn"
@click="openAddRemark(v)">
添加备注
</button>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
<view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
<view>课程：课程名称1</view>
<view class="call-remark">
<text class="call-label">呼叫备注：</text>
<text class="call-remark-content">{{v.remarks || '无'}}</text>
</view>
<view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
</view>
</view>
<view style="height: 200rpx;"></view>
@ -275,15 +159,19 @@
<!-- 添加备注弹窗 -->
<uni-popup ref="remarkPopup" type="dialog">
<uni-popup-dialog
title="添加备注"
:title="currentRecord ? `添加备注 (${currentRecord.name || '未知'})` : '添加备注'"
:before-close="true"
@confirm="confirmRemark"
@close="closeRemark">
<uni-easyinput
type="textarea"
<view class="remark-textarea-container">
<textarea
class="remark-textarea"
v-model="remark_content"
placeholder="请输入备注内容">
</uni-easyinput>
placeholder="请输入备注内容"
maxlength="200"
></textarea>
<text class="remark-count">{{remark_content.length}}/200</text>
</view>
</uni-popup-dialog>
</uni-popup>
</view>
@ -294,8 +182,12 @@
import apiRoute from '@/api/apiRoute.js';
import marketApi from '@/api/market.js';
export default {
components: {
// 导入组件
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
uniPopupDialog: () => import('@/components/uni-popup/uni-popup-dialog.vue'),
},
data() {
return {
switch_tags_type: 1,
@ -319,6 +211,8 @@
// 备注相关
remark_content: '',
// 当前选中的通话记录
currentRecord: null,
}
},
onLoad(options) {
@ -607,8 +501,9 @@
},
// 打开添加备注弹窗
openAddRemark() {
openAddRemark(record) {
this.remark_content = '';
this.currentRecord = record;
this.$refs.remarkPopup.open();
},
@ -638,6 +533,12 @@
tag: null // 标签
};
// 如果是针对特定通话记录的备注，添加关联ID
if (this.currentRecord && this.currentRecord.id) {
params.related_record_id = this.currentRecord.id; // 关联的通话记录ID
console.log('添加备注到通话记录:', this.currentRecord);
}
const res = await apiRoute.xs_communicationRecordsAdd(params);
if (res.code !== 1) {
@ -890,11 +791,50 @@
background: #fff;
position: fixed;
bottom: 0;
left: 0;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 30rpx;
}
// 备注文本框样式
.remark-textarea-container {
width: 100%;
position: relative;
padding: 10rpx 0;
}
.remark-textarea {
width: 100%;
height: 200rpx;
border: 1px solid #ddd;
border-radius: 8rpx;
padding: 20rpx;
font-size: 28rpx;
background-color: #f8f8f8;
box-sizing: border-box;
}
.remark-count {
position: absolute;
bottom: 20rpx;
right: 20rpx;
font-size: 24rpx;
color: #999;
}
// 备注按钮样式
.remark-btn {
background-color: #29D3B4 !important;
color: white !important;
margin: 0 !important;
padding: 0 20rpx !important;
height: 60rpx !important;
line-height: 60rpx !important;
font-size: 24rpx !important;
border-radius: 30rpx !important;
}
.follow-records-list{
width: 92%;
background: #434544;
@ -959,4 +899,120 @@
padding: 12rpx 8rpx;
text-align: center;
}
.call-record-item {
width: 100%;
background: #434544;
border-radius: 16rpx;
margin: auto;
padding: 16rpx;
color: #fff;
position: relative;
}
.call-record-header {
display: flex;
justify-content: space-between;
align-items: center;
}
.call-name {
font-size: 28rpx;
font-weight: bold;
}
.call-time {
font-size: 24rpx;
color: #999;
}
.call-record-content {
display: flex;
justify-content: space-between;
align-items: center;
}
.call-detail {
display: flex;
align-items: center;
}
.call-label {
font-size: 24rpx;
color: #999;
margin-right: 10rpx;
}
.call-remark {
margin-top: 10rpx;
}
.call-remark-content {
font-size: 24rpx;
color: #fff;
}
// 通话记录样式
.call-log {
width: 100%;
padding: 0 20rpx;
box-sizing: border-box;
}
.call-record-wrapper {
margin-bottom: 20rpx;
}
.call-record-item {
width: 100%;
background: #3D3D3D;
border-radius: 16rpx;
padding: 20rpx;
color: #fff;
box-sizing: border-box;
}
.call-record-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 15rpx;
border-bottom: 1px solid #4A4A4A;
padding-bottom: 10rpx;
}
.call-name {
font-size: 28rpx;
font-weight: bold;
color: #fff;
}
.call-time {
font-size: 24rpx;
color: #999;
}
.call-record-content {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10rpx;
}
.call-detail {
display: flex;
align-items: center;
}
.call-label {
font-size: 24rpx;
color: #999;
margin-right: 10rpx;
}
.call-remark {
margin-top: 10rpx;
padding-top: 10rpx;
border-top: 1px solid #4A4A4A;
}
.call-remark-content {
font-size: 24rpx;
color: #fff;
word-break: break-all;
display: inline-block;
width: 90%;
vertical-align: top;
}
</style>

28
pages/market/clue/edit_clues.vue
View File

@ -1237,7 +1237,33 @@
},
//表单验证
async validatorForm(data) {
//姓名
if(!data.name){
uni.showToast({
title: '学生姓名必填',
icon: 'none'
})
this.nextStep('0')
return false
}
//电话
if(!data.phone_number){
uni.showToast({
title: '电话必填',
icon: 'none'
})
this.nextStep('0')
return false
}
//校区必填
if(!data.campus){
uni.showToast({
title: '校区必填',
icon: 'none'
})
this.nextStep('0')
return false
}
return true
},
//提交

10
pages/market/clue/index.vue
View File

@ -63,7 +63,7 @@
是否有效：{{ v.sixSpeed && v.sixSpeed.efficacious === 1 ? '有效' : '无效' }}
</view>
<view style="padding: 12rpx;">
<image v-if="v.sixSpeed.efficacious === 1"
<image v-if=" v.sixSpeed && v.sixSpeed.efficacious === 1"
:src="$util.img('/uniapp_src/static/images/index/intention2.png')"
class="drop-image-x"></image>
<image v-else :src="$util.img('/uniapp_src/static/images/index/intention3.png')"
@ -667,18 +667,18 @@
//检索数据
async searchData() {
if (this.segmented_type == 1) {
this.filteredData_1.shared_at_str = this.showDrawerForm
.shared_at_str //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
this.filteredData_1.shared_at_str = this.showDrawerForm.shared_at_str //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
this.filteredData_1.phone_number = this.showDrawerForm.phone_number //客户资源表-手机号
this.filteredData_1.name = this.showDrawerForm.name //客户资源表-用户姓名
this.filteredData_1.campus_name = this.showDrawerForm.campus_name //客户资源表-用户姓名
//我的客户
await this.resetFilteredData_1()
await this.getList_1()
} else {
this.filteredData_2.shared_at_str = this.showDrawerForm
.shared_at_str //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
this.filteredData_2.shared_at_str = this.showDrawerForm.shared_at_str //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
this.filteredData_2.phone_number = this.showDrawerForm.phone_number //客户资源表-手机号
this.filteredData_2.name = this.showDrawerForm.name //客户资源表-用户姓名
this.filteredData_2.campus_name = this.showDrawerForm.campus_name //客户资源表-用户姓名
//资源分配
await this.resetFilteredData_2()
await this.getList_2()

164
pages/market/clue/order_list.vue
View File

@ -291,14 +291,23 @@ export default {
}
},
onLoad(options) {
console.log('页面加载参数:', options)
// 确保options中有必要的参数
if (!options || !options.resource_id) {
uni.showToast({
title: '缺少必要参数',
icon: 'none'
})
return
}
this.filteredData.resource_id = options.resource_id // 客户资源表id
this.formData.resource_id = options.resource_id // 客户资源表id
this.formData.resource_id_name = options.resource_name//客户资源表id姓名
this.formData.resource_id_name = options.resource_name || '' // 客户资源表id姓名
this.formData.staff_id = options.staff_id//员工资源表id姓名
this.formData.staff_id_name = options.staff_id_name//员工资源表id姓名
this.formData.staff_id = options.staff_id || '' // 员工资源表id
this.formData.staff_id_name = options.staff_id_name || '' // 员工资源表id姓名
},
onShow(){
this.init()
@ -312,6 +321,7 @@ export default {
methods: {
//初始化
async init(){
try {
//获取付款类型
await this.getPaymentTypeList()
//获取课程列表
@ -321,6 +331,13 @@ export default {
//获取列表
await this.getList();
} catch (error) {
console.error('初始化失败:', error)
uni.showToast({
title: '初始化数据失败',
icon: 'none'
})
}
},
//加载更多(下一页)
@ -381,16 +398,17 @@ export default {
//获取付款类型
async getPaymentTypeList(){
try {
let res = await apiRoute.common_Dictionary({key:'payment_type'})
if(res.code != 1){
uni.showToast({
title: res.msg,
title: res.msg || '获取付款类型失败',
icon: 'none'
})
return
}
let dictionary = res.data.dictionary
let dictionary = res.data
let arr = []
dictionary.forEach((v,k) => {
arr.push({
@ -400,20 +418,28 @@ export default {
})
this.payment_type_options = arr
console.log('付款类型', this.payment_type_options)
} catch (error) {
console.error('获取付款类型失败:', error)
}
},
//获取课程列表
async getCourseList(){
try {
let params = {}
let res = await apiRoute.common_getCourseAll(params)
if(res.code != 1){
uni.showToast({
title: res.msg,
title: res.msg || '获取课程列表失败',
icon: 'none'
})
return
}
if (!res.data || !Array.isArray(res.data)) {
console.error('课程列表数据格式错误:', res.data)
return
}
let arr = []
res.data.forEach((v,k) => {
@ -425,23 +451,31 @@ export default {
})
this.course_id_options = arr
console.log('课程列表', this.course_id_options)
} catch (error) {
console.error('获取课程列表失败:', error)
}
},
//获取班级列表
async getClassList(){
try {
let params = {
status: 1, //班级状态(1开启 2关闭)
}
let res = await apiRoute.common_getClassAll(params)
if(res.code != 1){
uni.showToast({
title: res.msg,
title: res.msg || '获取班级列表失败',
icon: 'none'
})
return
}
console.log('班级列表',res.data)
if (!res.data || !Array.isArray(res.data)) {
console.error('班级列表数据格式错误:', res.data)
return
}
let arr = []
res.data.forEach((v,k) => {
arr.push({
@ -450,6 +484,10 @@ export default {
})
})
this.class_id_options = arr
console.log('班级列表', this.class_id_options)
} catch (error) {
console.error('获取班级列表失败:', error)
}
},
@ -488,9 +526,16 @@ export default {
},
//提交表单
async submitFormData() {
try {
let param = {...this.formData}
//表单验证
//...
if(!param.resource_id){
uni.showToast({
title: '客户信息缺失',
icon: 'none'
})
return
}
if(!param.class_id){
uni.showToast({
title: '请选择班级',
@ -512,23 +557,41 @@ export default {
})
return
}
if(!param.staff_id){
uni.showToast({
title: '员工信息缺失',
icon: 'none'
})
return
}
if(!param.money){
uni.showToast({
title: '订单金额为空',
icon: 'none'
})
return
}
console.log('提交xxx',param)
console.log('提交订单数据:', param)
this.closeOrderShow()
uni.showLoading({
title: '提交中...'
})
let res = await apiRoute.xs_orderTableAdd(param)
uni.hideLoading()
if (res.code != 1) {
uni.showToast({
title: res.msg,
title: res.msg || '创建订单失败',
icon: 'none'
})
return
}
uni.showToast({
title: '操作成功',
title: '创建订单成功',
icon: 'success'
})
@ -537,18 +600,42 @@ export default {
this.resetFilteredData()//重置表单
this.getList();//刷新列表
}, 1500)
} catch (error) {
uni.hideLoading()
console.error('提交订单失败:', error)
uni.showToast({
title: '创建订单失败，请重试',
icon: 'none'
})
}
},
//下拉选择器相关-付款类型
//监听-付款类型
changePaymentType(e){
console.log('选择的付款类型:', e)
if (!e || !e.value) {
uni.showToast({
title: '请选择有效的付款类型',
icon: 'none'
})
return
}
this.formData.payment_type = e.value
this.formData.payment_type_name = e.text
this.cancelPaymentType()
},
//打开选择器-付款类型
openPaymentType(){
if (!this.payment_type_options || this.payment_type_options.length === 0) {
uni.showToast({
title: '付款类型数据加载中，请稍后再试',
icon: 'none'
})
this.getPaymentTypeList() // 尝试重新加载
return
}
this.payment_type_show = true
},
//关闭选择器-付款类型
@ -559,17 +646,38 @@ export default {
//下拉选择器相关-课程
//监听-课程
changeCourseId(e){
console.log('课程',e)
console.log('选择的课程:', e)
if (!e || !e.value) {
uni.showToast({
title: '请选择有效的课程',
icon: 'none'
})
return
}
this.formData.course_id = e.value
this.formData.course_id_name = e.text
this.formData.money = this.course_id_options.find(v=>v.value == e.value).price
// 查找对应课程的价格
const selectedCourse = this.course_id_options.find(v => v.value == e.value)
if (selectedCourse && selectedCourse.price) {
this.formData.money = selectedCourse.price
} else {
this.formData.money = ''
console.warn('未找到所选课程的价格信息')
}
// console.log('课程formData',this.formData)
this.cancelCourseId()
},
//打开选择器-课程
openCourseId(){
if (!this.course_id_options || this.course_id_options.length === 0) {
uni.showToast({
title: '课程数据加载中，请稍后再试',
icon: 'none'
})
this.getCourseList() // 尝试重新加载
return
}
this.course_id_show = true
},
//关闭选择器-课程
@ -580,12 +688,28 @@ export default {
//下拉选择器相关-班级
//监听-班级
changeClassId(e){
console.log('选择的班级:', e)
if (!e || !e.value) {
uni.showToast({
title: '请选择有效的班级',
icon: 'none'
})
return
}
this.formData.class_id = e.value
this.formData.class_id_name = e.text
this.cancelClassId()
},
//打开选择器-班级
openClassId(){
if (!this.class_id_options || this.class_id_options.length === 0) {
uni.showToast({
title: '班级数据加载中，请稍后再试',
icon: 'none'
})
this.getClassList() // 尝试重新加载
return
}
this.class_id_show = true
},
//关闭选择器-班级

9
pages/market/data/index.vue
View File

@ -4,9 +4,6 @@
<!--自定义导航栏-->
<view class="navbar_section">
<view class="title">数据</view>
<view class="statistics-btn" @click="goToStatistics">
<text>统计表格</text>
</view>
</view>
<!-- 市场人员展示-->
@ -337,12 +334,6 @@ export default {
this.init()
},
methods: {
// 跳转到统计页面
goToStatistics() {
uni.navigateTo({
url: '/pages/market/data/statistics'
});
},
async init(){
await this.getUserInfo()

2
pages/student/login/login.vue
View File

@ -179,7 +179,7 @@
this.openViewHome();
} else {
uni.showToast({
title: res || '登录失败',
title: res.msg || '登录失败',
icon: 'none'
});
}

Write Preview
Loading…
Cancel
Save