diff --git a/api/apiRoute.js b/api/apiRoute.js
index c2bb466..f483e37 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -52,6 +52,22 @@ export default {
return res;
})
},
+ //公共端-教师/销售端验证旧密码是否正确
+ common_personnelCheckOldPwd(data = {}) {
+ let url = '/personnel/checkOldPwd'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
+
+ //公共端-教师/销售端验证旧密码是否正确
+ common_personnelEdidPassword(data = {}) {
+ let url = '/personnel/edidPassword'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
+
@@ -153,6 +169,13 @@ export default {
return res;
})
},
+ //销售端-客户资源-获取修改日志列表
+ xs_customerResourcesGetEditLogList(data = {}) {
+ let url = '/customerResources/getEditLogList'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
//销售端-资源共享-列表
xs_resourceSharingIndex(data = {}) {
let url = '/resourceSharing/index'
@@ -175,6 +198,14 @@ export default {
})
},
+ //销售端-沟通记录-添加
+ xs_communicationRecordsAdd(data = {}) {
+ let url = '/communicationRecords/add'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
+
diff --git a/common/config.js b/common/config.js
index aeb0840..14b8dd8 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,14 +1,19 @@
// 线上测试地址
-// const Api_url='http://aaaaaaaa.hksywl.cn/api'
-// const img_domian = 'http://aaaaaaaa.hksywl.cn/'
+// const Api_url='http://146.56.228.75:20025/api'
+// const img_domian = 'http://146.56.228.75:20025/'
//本地测试地址
const Api_url='http://zhjwxt.test/api'
const img_domian = 'http://zhjwxt.test/'
+
// const Api_url='https://zh.hnhbty.cn/api'
// const img_domian = 'https://zh.hnhbty.cn/'
+// const Api_url='http://146.56.228.75:20024/api'
+// const img_domian = 'http://146.56.228.75:20024/'
+
+
const IsDemo = false
// const Api_url_B='http://hycrm.zeyan.wang/api/hygl'
diff --git a/pages/market/clue/edit_clues_log.vue b/pages/market/clue/edit_clues_log.vue
index 962fbab..0dc0d53 100644
--- a/pages/market/clue/edit_clues_log.vue
+++ b/pages/market/clue/edit_clues_log.vue
@@ -1,15 +1,31 @@
+
+
+
+
+
+
+
-
+
- 2025-04-01 23:05:05
+
+ {{v.modification_time}}
- 修改人:张三 修改了如下内容
-
-
-
-
- | 字段名称 |
- 原数据 |
- 新数据 |
-
-
-
-
-
-
- | {{ row.field }} |
- {{ row.oldValue }} |
- {{ row.newValue }} |
-
-
-
+ 修改人:{{v.staff_id_name}} 修改了如下内容
+
+
+
+
+
+ | 字段名称 |
+ 原数据 |
+ 新数据 |
+
+
+
+
+
+
+ | {{ row.field_name_zh }} |
+ {{ row.old_value }} |
+ {{ row.new_value }} |
+
+
+
+
@@ -60,6 +79,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{v.modification_time}}
+
+
+ 修改人:{{v.staff_id_name}} 修改了如下内容
+
+
+
+
+
+ | 字段名称 |
+ 原数据 |
+ 新数据 |
+
+
+
+
+
+
+ | {{ row.field_name_zh }} |
+ {{ row.old_value }} |
+ {{ row.new_value }} |
+
+
+
+
+
+
+
+
+
+
+
+
@@ -79,48 +164,33 @@ export default {
page:1,//当前页码
limit:10,//每页返回数据条数
total:10,//数据总条数
- resource_id: '',//客户资源表id
+ type:'resource',//查询类型|resource=客户资源,six_speed=六要素
+ customer_resource_id: '',//客户资源表id
},
//数据列表
- tableList:[{
- title: '入场',
- time: '07:00',
- activeColor: '#465CFF'
- }, {
- title: '主场演讲',
- time: '08:00',
- descr: '马云(阿里巴巴)',
- activeColor: '#465CFF'
- }, {
- title: '世界互联经济',
- time: '08:30',
- descr: '马云(阿里巴巴)',
- activeColor: '#465CFF'
- }, {
- title: '打造自己的互联帝国',
- time: '09:30',
- descr: '马化腾(腾讯)',
- activeColor: '#FFB703'
- }, {
- title: '散场',
- time: '11:00',
- descr: '请带走垃圾,有序散场。'
- }],//表格数据
-
- customTableData:[
+ tableList:[],//表格数据
+
+ //tab切换
+ optionTableId:0,//分段器初始选中项索引
+ optionTable:[
{
- field:'姓名',
- oldValue:'张三',
- newValue:'11李四李四李四李四李四李四李四李四李四李四李四123',
+ id: 0,
+ name: '客户资源修改记录',
+ type:'resource',
+ },
+ {
+ id: 1,
+ name: '六要素修改记录',
+ type:'six_speed',
}
]
}
},
onLoad(options) {
- this.filteredData.resource_id = options.resource_id//客户资源表id
+ this.filteredData.customer_resource_id = options.resource_id//客户资源表id
},
onShow() {
- // this.init()
+ this.init()
},
//下拉刷新
async onPullDownRefresh() {
@@ -150,7 +220,7 @@ export default {
this.filteredData.limit = 10//每页返回数据条数
this.filteredData.total = 10//数据总条数
},
- //获取列表-我的客户
+ //获取列表-客户信息修改记录
async getList(){
this.loading = true
@@ -170,7 +240,7 @@ export default {
this.tableList = []
}
- let res = await apiRoute.xs_resourceSharingIndex(data)
+ let res = await apiRoute.xs_customerResourcesGetEditLogList(data)
this.loading = false
this.isReachedBottom = false;
if (res.code != 1){
@@ -181,6 +251,8 @@ export default {
return
}
+ console.log(123123123,res)
+
this.tableList = this.tableList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
console.log('列表1',this.tableList)
@@ -189,6 +261,18 @@ export default {
},
+ //切换tag列表
+ async segmented(e) {
+ console.log('切换',e)
+ //e.id|0=基础信息 1=六要素
+ let status = e.id
+ this.optionTableId = String(status)
+ this.filteredData.type = e.type//查询类型|resource=客户资源,six_speed=六要素
+
+ await this.resetFilteredData()
+ await this.getList()
+ },
+
}
}
@@ -199,22 +283,27 @@ export default {
height: 100%;
//background-color: #292929;
overflow: auto;
+ .tab_section{
+ padding: 0 20rpx;
+ padding-top: 30rpx;
+ }
.table_list{
- border: 1px solid red;
-
.itme_box {
margin-top: 30rpx;
display: flex;
flex-direction: column;
- gap: 20rpx;
+ gap: 25rpx;
.title_name{
font-size: 28rpx;
}
- .table_box{
- width: 100%;
- border-collapse: collapse;
- table-layout: fixed;
+ .table_section{
+ .table_box{
+ width: 100%;
+ border-collapse: collapse;
+ table-layout: fixed;
+ }
}
+
}
::v-deep .fui-timeaxis__wrap{
diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue
index f29f3b4..83737f4 100644
--- a/pages/market/clue/index.vue
+++ b/pages/market/clue/index.vue
@@ -3,8 +3,6 @@
-
-
diff --git a/pages/market/my/index.vue b/pages/market/my/index.vue
index c281068..ce3bf73 100644
--- a/pages/market/my/index.vue
+++ b/pages/market/my/index.vue
@@ -20,12 +20,16 @@
-
- 部门
- {{userInfo.department_name_str}}
+
+
+ 校区:
+ {{v.campus_id_name}}
+
- 等级
- S5
+
+ 部门:
+ {{v.dept_name_str}}
+
@@ -84,10 +88,10 @@
-
- 意见反馈
-
-
+
+
+
+
设置
@@ -165,6 +169,16 @@ export default {
})
return
}
+
+ res.data.cameus_dept_arr.forEach((v,k)=>{
+ let d_arr = []
+ v.dept_arr.forEach((dv,dk)=>{
+ d_arr.push(dv.dept_name)
+ })
+ //数组转字符串
+ v.dept_name_str = d_arr.join(',')
+ })
+
this.userInfo = res.data
},
@@ -275,7 +289,7 @@ export default {
//用户信息
.user_section {
background-color: #29D3B4;
- padding-top: 58rpx;
+ padding-top: 10rpx;
padding-bottom: 42rpx;
color: #fff;
font-size: 28rpx;
@@ -314,15 +328,27 @@ export default {
padding: 0rpx 40rpx;
display: flex;
justify-content: space-between;
- align-items: center;
+ align-items: flex-start;
.title{
font-size: 28rpx;
}
+ //分割线段
.division{
width: 2px;
height: 35rpx;
background-color: #fff;
}
+ .left{
+ width: 48%;
+ display: flex;
+ }
+ .right{
+ width: 48%;
+ display: flex;
+ .dept{
+ width: 70%;
+ }
+ }
}
}
diff --git a/pages/market/my/info.vue b/pages/market/my/info.vue
index 9307f9a..fefbe9c 100644
--- a/pages/market/my/info.vue
+++ b/pages/market/my/info.vue
@@ -39,7 +39,8 @@
部门
-
+
+ {{formData.department_name_str || '暂无'}}
@@ -455,6 +456,7 @@ export default {
.btn{}
.title{
+ min-width: 100rpx;
display: flex;
align-items: center;
font-size: 26rpx;
@@ -465,9 +467,19 @@ export default {
}
}
.input{
+ display: flex;
+ justify-content: flex-end;
input{
text-align: right;
}
+ .dept{
+ width: 50%;
+ }
+ .disabled{
+ color: #808080;
+ //禁止图标
+ cursor: not-allowed;
+ }
}
}
}
diff --git a/pages/market/my/update_pass.vue b/pages/market/my/update_pass.vue
index 3544848..486fe37 100644
--- a/pages/market/my/update_pass.vue
+++ b/pages/market/my/update_pass.vue
@@ -2,7 +2,7 @@
- 1.验证手机号码
+ 1.验证旧密码
2.设置新密码
@@ -12,24 +12,36 @@
为保障您的账号安全,修改密码前请填写原密码
-
-
-
- 下一步
- 提交
+
+ 上一步
+
+
+ 下一步
+
+ 提交
+
+
+
忘记原密码
@@ -39,36 +51,139 @@
@@ -104,4 +219,10 @@
color: #999999;
padding-left: 30rpx;
}
+
+ .btn_box{
+ display: flex;
+ flex-direction: column;
+ gap: 40rpx;
+ }
\ No newline at end of file