diff --git a/App.vue b/App.vue index 0e6160e..03963a6 100644 --- a/App.vue +++ b/App.vue @@ -16,5 +16,8 @@ export default { diff --git a/apis/addUserApi.js b/apis/addUserApi.js index ca2d5e2..810e657 100644 --- a/apis/addUserApi.js +++ b/apis/addUserApi.js @@ -16,7 +16,7 @@ export function getCompanyInfoById(data) { }) } -// 根据id查询企业详细信息 +// 添加客户 export function addCustomer(data) { return http.post({ url: '/yyt-uec/supplier/create/customer', diff --git a/apis/commonApi.js b/apis/commonApi.js index 7a5aa00..dd1b692 100644 --- a/apis/commonApi.js +++ b/apis/commonApi.js @@ -1,4 +1,5 @@ import http from '../utils/http/index.js' +import store from '@/store/index' let areaCache = null /** * 获取省市区街道 @@ -22,6 +23,20 @@ export function getArea(data = {}) { } let baseInfo = null + +// 处理store同步问题 +function syncStore(res) { + if (res.enterpriseList && res.enterpriseList.length > 0) { + let supplierInfo = res.enterpriseList[0] + store.commit('setSupplierInfo', { + id: supplierInfo.id, + name: supplierInfo.name, + fddEnterpriseStatus: supplierInfo.fddEnterpriseStatus, + supplierId: supplierInfo.supplier.id + }) + store.commit('setUserInfo', { name: supplierInfo.employeeName, userId: res.userId, mobile: res.mobile, avatar: null }) + } +} /** * 获取当前账号的基础信息 * @param {object} data 参数,暂时不需要,可以传{} diff --git a/pages.json b/pages.json index 07d3cbe..5e370a8 100644 --- a/pages.json +++ b/pages.json @@ -215,7 +215,20 @@ "enablePullDownRefresh": false } - } + }, + { + "path": "pages/follow-up-records/index", + "style": { + "navigationBarTitleText": "跟进记录" + } + }, + { + "path": "pages/add-record/index", + "style": { + "navigationBarTitleText": "新增跟进记录", + "navigationStyle": "custom" + } + } ,{ "path" : "pages/paper-detail/index", "style" : diff --git a/pages/add-record/index.vue b/pages/add-record/index.vue new file mode 100644 index 0000000..e561d14 --- /dev/null +++ b/pages/add-record/index.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/pages/add-user/index.vue b/pages/add-user/index.vue index 3d25f14..284c727 100644 --- a/pages/add-user/index.vue +++ b/pages/add-user/index.vue @@ -393,9 +393,9 @@ export default { }, selectedImage(type) { uploadImage() - .then((url) => { - if (url) { - this.form[type] = url + .then((urls) => { + if (urls) { + this.form[type] = urls[0] } }) .catch((e) => { diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index cd24f9b..1fbe9a0 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -4,7 +4,7 @@ 基本信息 - 跟进记录 + 跟进记录 @@ -212,7 +212,8 @@ + + diff --git a/pages/follow-up-records/timeLine.vue b/pages/follow-up-records/timeLine.vue new file mode 100644 index 0000000..3383db7 --- /dev/null +++ b/pages/follow-up-records/timeLine.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/pages/follow-up-records/timelineItem.vue b/pages/follow-up-records/timelineItem.vue new file mode 100644 index 0000000..ac6b251 --- /dev/null +++ b/pages/follow-up-records/timelineItem.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/pages/login/index.vue b/pages/login/index.vue index 04faf55..d94bb7f 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -1,5 +1,5 @@