diff --git a/App.vue b/App.vue index 2d4c367..7c487f2 100644 --- a/App.vue +++ b/App.vue @@ -1,105 +1,108 @@ \ No newline at end of file diff --git a/api/bussness.js b/api/bussness.js new file mode 100644 index 0000000..1a00163 --- /dev/null +++ b/api/bussness.js @@ -0,0 +1,14 @@ +import oahttp from "@/utils/aa.js"; + +/** + * 绑定scoket + */ +export const bindScoket = (data) => oahttp.post('/common/im/doBindUid', data) +// 发送消息 +export const sendMsgApi = (data) => oahttp.post('/common/im/sendTextMsg', data) +// 发送文件 +export const sendFileApi = (data) => oahttp.post('/common/im/sendFileMsg', data) +// 消息列表 +export const getMsgListApi = (data) => oahttp.post('/common/im/msgList', data) +// 片区经理id +export const getAreaManagerApi = (data) => oahttp.post('/common/im/getAreaManager', data) diff --git a/api/company.js b/api/company.js index e690c09..44681dc 100644 --- a/api/company.js +++ b/api/company.js @@ -66,3 +66,12 @@ export const postsms = (data) => oahttp.post('/company/postsms', data) */ export const sss = (data) => oahttp.post('/company/postsms', data) +/** + * 查询甲方公司信息 + */ +export const getPartyACompany = (data) => oahttp.get('/company/getPartyACompany', data) + +/** + * 查询押金凭证记录 + */ +export const getDepositRechargeTransferVoucherList = (data) => oahttp.get('/company/getDepositRechargeTransferVoucherList', data) diff --git a/api/file.js b/api/file.js index 486153d..fa09bf5 100644 --- a/api/file.js +++ b/api/file.js @@ -1,45 +1,50 @@ import { - HTTP_REQUEST_URL_THREE, - HEADER, - TOKENNAME, + HTTP_REQUEST_URL_THREE, + HEADER, + TOKENNAME, } from '@/config/app'; -import { Toast } from '../libs/uniApi'; +import { + Toast +} from '../libs/uniApi'; // import { checkLogin } from '../libs/login'; import store from '../store'; function toLogin() { - store.commit("LOGOUT"); - uni.showToast({ - title: '请登录', - icon: 'none', - duration: 1000 - }); + store.commit("LOGOUT"); + uni.showToast({ + title: '请登录', + icon: 'none', + duration: 1000 + }); } function upLoad(url, data) { - let Url = HTTP_REQUEST_URL_THREE, - header = {} - if (store.state.app.token) header[TOKENNAME] = store.state.app.token; - return new Promise((reslove, reject) => { - uni.uploadFile({ - url: Url + '/api' + url, - filePath: data.filePath, - name: data.name, - success: (uploadFileRes) => { - uploadFileRes.data = JSON.parse(uploadFileRes.data) - if(uploadFileRes.data.code==1) reslove(uploadFileRes.data) - else Toast('网络错误') - }, - fail: (err) => { - Toast('网络错误') - } - }) - }); + let Url = HTTP_REQUEST_URL_THREE, + header = {} + if (store.state.app.token) header[TOKENNAME] = store.state.app.token; + return new Promise((reslove, reject) => { + uni.uploadFile({ + url: Url + '/api' + url, + filePath: data.filePath, + name: data.name, + success: (uploadFileRes) => { + uploadFileRes.data = JSON.parse(uploadFileRes.data) + if (uploadFileRes.data.code == 1) reslove(uploadFileRes.data) + else Toast('网络错误') + }, + fail: (err) => { + Toast('网络错误') + } + }) + }); } -export const upLoadImage = (data)=>{ - return upLoad('/upload/image', data) +export const upLoadImage = (data) => { + return upLoad('/upload/image', data) } export const VIDEO_URL = HTTP_REQUEST_URL_THREE + '/api/upload/video' -export const FILE_URL = HTTP_REQUEST_URL_THREE + '/api/upload/file' \ No newline at end of file +export const FILE_URL = HTTP_REQUEST_URL_THREE + '/api/upload/file' +// im文件上传 +// export const VIDEO_URL_IM = HTTP_REQUEST_URL_THREE + '/api/upload/video' +export const FILE_URL_IM = HTTP_REQUEST_URL_THREE + '/common/im/sendFileMsg' \ No newline at end of file diff --git a/api/index.js b/api/index.js new file mode 100644 index 0000000..6c38943 --- /dev/null +++ b/api/index.js @@ -0,0 +1,28 @@ +// let Token = localStorage.getItem("token") +let Token = uni.getStorageSync("token") +let request = (METHOD, URL, DATA) => { + return new Promise((reslove, reject) => { + uni.request({ + url: 'https://ceshi-im.lihaink.cn/' + URL, + method: METHOD, + data: { + ...DATA + }, + header: { + 'content-type': 'application/json', + "Authorization": Token || "" + + }, + success: function(res) { + reslove(res) + }, + fail: function(err) { + reject(err) + }, + + }); + }) +} + + +export default request; \ No newline at end of file diff --git a/api/property.js b/api/property.js index 0d6cfbb..e016efe 100644 --- a/api/property.js +++ b/api/property.js @@ -1,5 +1,5 @@ import oahttp from "@/utils/oahttp.js"; -import oahttp2 from "@/utils/logistics.js"; + // http://logistics.lihaink.cn/api/getCarHistory /** * 车辆列表 @@ -14,6 +14,10 @@ export const upVehicleApi = (data) => oahttp.post('/vehicle/rentApply', data) export const applycarApi = (data) => oahttp.post('/vehicle/rentApply', data) // 显示轨迹 export const locusApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) +// 获取可购买车辆列表 +export const canBuyCarListApi = (data) => oahttp.get('/vehicle/getFreeCars', data) +// 购买车辆 +export const buyCarApi = (data) => oahttp.post('/vehicle/buyCars', data) // 当前车辆位置信息 // export const locusApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) // api / getCarLocal diff --git a/api/task.js b/api/task.js index d52461d..471ea33 100644 --- a/api/task.js +++ b/api/task.js @@ -44,9 +44,19 @@ export const taskOtherTaskCommit = (data) => oahttp.post('/task/commit_other_tas /** * 任务:服务任务详情 */ -export const serviceTaskDetails = (data) => oahttp.get('/task/service_task_detail', data) +export const townTaskDetails = (data) => oahttp.get('/task/service_task_detail', data) /** * 任务:提交督促小组服务团队学习任务 */ export const serviceTask4Commit = (data) => oahttp.post('/task/commit_town_task_type4', data) + +/** + * 任务:数字农贸宣传、加工业务建设和招商任务详情 + */ +export const marketTask10Detail = (data) => oahttp.post('/task/town_task_type_marketing_director_10_detail', data) + +/** + * 任务:数字农贸宣传、加工业务建设和招商任务提交 + */ +export const marketTask10Commit = (data) => oahttp.post('/task/commit_town_task_type_marketing_director_10', data) diff --git a/components/business/talk.vue b/components/business/talk.vue new file mode 100644 index 0000000..2380032 --- /dev/null +++ b/components/business/talk.vue @@ -0,0 +1,696 @@ + + + + + \ No newline at end of file diff --git a/components/company/company.vue b/components/company/company.vue index 33baf6e..8dd7781 100644 --- a/components/company/company.vue +++ b/components/company/company.vue @@ -318,7 +318,7 @@ - + + + \ No newline at end of file diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index 3231ea7..038559d 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -215,7 +215,10 @@ }, onPullDownRefresh() { if (this.current == 1) this.initLoad(); - else if (this.current == 2) this.$refs.financeRef.initLoad(); + else if (this.current == 2) { + this.$refs.financeRef.loadCompany(); + this.$refs.financeRef.initLoad(); + } else if (this.current == 3) this.$refs.taskRef.initLoadConfig(); this.$u.sleep(500).then(() => { uni.stopPullDownRefresh() diff --git a/subpkg/otherTask/otherTask.vue b/subpkg/otherTask/otherTask.vue index 0b980a5..448514c 100644 --- a/subpkg/otherTask/otherTask.vue +++ b/subpkg/otherTask/otherTask.vue @@ -161,7 +161,7 @@ // 提交 async submit() { if(!this.isReject())return; // 判断是否进行更改 - if (this.other.note.trim() == '') return Toast('详情描述不能为空'); + if (this.note.trim() == '') return Toast('详情描述不能为空'); await taskOtherTaskCommit({ id: this.task_id, note: this.note, diff --git a/subpkg/property/agencyList.vue b/subpkg/property/agencyList.vue index 0699270..a607ffa 100644 --- a/subpkg/property/agencyList.vue +++ b/subpkg/property/agencyList.vue @@ -13,9 +13,15 @@ {{item.create_time.slice(0, 10)}} - + {{item.company_b_name}}提出租赁车辆一辆 + + {{item.company_b_name}}上传自有车辆一辆 + + + {{item.company_b_name}}提出解除租赁 + @@ -64,6 +70,10 @@ background-color: #FF7C32; color: white; padding: 0 10rpx; + font-size: 24rpx; + // line-height: rpx; + display: flex; + align-items: center; width: 200rpx; height: 50rpx; margin-right: 10rpx; diff --git a/subpkg/property/buyCar.vue b/subpkg/property/buyCar.vue new file mode 100644 index 0000000..47dda30 --- /dev/null +++ b/subpkg/property/buyCar.vue @@ -0,0 +1,268 @@ + + + + + \ No newline at end of file diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue index 0212da2..5df8813 100644 --- a/subpkg/property/chosseCompany.vue +++ b/subpkg/property/chosseCompany.vue @@ -46,12 +46,12 @@ 自有车辆 - + - + - 车牌号：{{dataList.cars_info.license}} + 车牌号：{{item.license}} @@ -133,7 +133,7 @@ {{typeFn( dataList.type) }} - {{'2023-03-03'}} + {{dataList.update_time}} @@ -202,11 +202,11 @@ this.dataList = res.data.vehicleContract this.carList = res.data.vehicleRentCars this.checked = [this.carList[0]?.car_id] || '' - this.dataList.cars_info = JSON.parse(this.dataList.cars_info) || "" + // if (this.dataList.status == 3) { // uni.navigateBack() // } - console.log(this.dataList.cars_info.pic) + if (this.carList.length > 0 || this.dataList.cars_info) { this.flag1 = false } @@ -244,7 +244,7 @@ return "租赁合同" } if (status == 1) { - return "自有车两" + return "自有车辆" } if (status == 2) { "解除合同" diff --git a/subpkg/property/contractList.vue b/subpkg/property/contractList.vue index 67c5842..4d472f7 100644 --- a/subpkg/property/contractList.vue +++ b/subpkg/property/contractList.vue @@ -30,7 +30,7 @@ export default { data() { return { - datasList: [1, 2, 3], + datasList: [], } }, onLoad() { diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue index 4a3f178..d3b5f19 100644 --- a/subpkg/property/index.vue +++ b/subpkg/property/index.vue @@ -4,23 +4,23 @@ + - + + + + - - - - @@ -44,7 +44,7 @@ - 上传头像 + 上传车辆图片 @@ -60,13 +60,10 @@ - - - 你已提交解除申请,等待签约 ... @@ -79,6 +76,7 @@ ... + @@ -86,7 +84,13 @@ ... + + + 您的购车申请已经提交，我们正在加快审核中，请耐心等待，在此期间您可以继续使用车辆完成配送任务哦~ + ... + + @@ -101,16 +105,16 @@ + + - - - + @@ -134,7 +138,7 @@ - 上传头像 + 上传车辆图片 @@ -166,13 +170,13 @@ 申请用车 - 可监管车辆数量 {{datas.monitor_num}} + 购买车辆 {{datas.buy_num}} 租赁 {{datas.rent_num}}(待审核:{{datas.apply_num}}) @@ -184,6 +188,7 @@ 自有车辆 {{datas.self_num}} + @@ -208,7 +213,6 @@ - @@ -227,7 +231,8 @@ {{item.rent_user.user_name}} 自有车辆 - 租赁车辆 + 租赁车辆 + 购买车辆 @@ -272,7 +277,6 @@ - 数量超过上限 @@ -296,13 +300,16 @@ + + \ No newline at end of file diff --git a/subpkg/townTask/marketTask10.vue b/subpkg/townTask/marketTask10.vue new file mode 100644 index 0000000..dbb15b4 --- /dev/null +++ b/subpkg/townTask/marketTask10.vue @@ -0,0 +1,334 @@ + + + + + \ No newline at end of file diff --git a/subpkg/serviceTask/serviceTask4.vue b/subpkg/townTask/serviceTask4.vue similarity index 98% rename from subpkg/serviceTask/serviceTask4.vue rename to subpkg/townTask/serviceTask4.vue index af705a9..8cdbb38 100644 --- a/subpkg/serviceTask/serviceTask4.vue +++ b/subpkg/townTask/serviceTask4.vue @@ -57,7 +57,7 @@ upLoadImage, } from "@/api/file.js"; import { Toast } from "../../libs/uniApi"; - import { serviceTaskDetails, serviceTask4Commit } from "@/api/task.js" + import { townTaskDetails, serviceTask4Commit } from "@/api/task.js" export default { data() { return { @@ -95,7 +95,7 @@ methods: { async initTask() { this.skeleton = true; - let res = await serviceTaskDetails({ + let res = await townTaskDetails({ id: this.taskInfo.id }); this.taskInfo = res.data; diff --git a/subpkg/serviceTask/serviceTask.vue b/subpkg/townTask/townTask.vue similarity index 91% rename from subpkg/serviceTask/serviceTask.vue rename to subpkg/townTask/townTask.vue index 7498888..ab1aa6c 100644 --- a/subpkg/serviceTask/serviceTask.vue +++ b/subpkg/townTask/townTask.vue @@ -18,7 +18,7 @@