diff --git a/.env.development b/.env.development index 07acb8d..5e82ba5 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,4 @@ VUE_APP_MODE=development -VUE_APP_SERVER=http://114.215.78.198:8081 -url=https://wzx.2weisou.com //404 -url=https://erpx.2weisou.com/sjjy -url=http://114.215.78.198:8081/sjjy -url=https://erpx.2weisou.com //404 \ No newline at end of file +VUE_APP_SERVER=https://erpx.2weisou.com/sjjy +url=https://wzx.2weisou.com/sjjy +url=https://erpx.2weisou.com/sjjy \ No newline at end of file diff --git a/src/common/http.api.js b/src/common/http.api.js index 47a6574..4d27545 100644 --- a/src/common/http.api.js +++ b/src/common/http.api.js @@ -38,10 +38,102 @@ let appChangePricelisturl = '/appChangePrice/list.do' //改价申请详情（判 let appChangePricecheckurl = '/appChangePrice/check.do' //改价申请校验 let takeHouseApplyurl = '/appTakeHouse/takeHouseApply.do' //带房申请 let takeHouseReviewurl = '/appTakeHouse/takeHouseReview.do' //带房审核 +let oneCustomerInfourl= '/appHouseContract/oneCustomerInfo.do' //成交合同第一步客户信息 +let getDeptListurl= '/appDept/getDeptList.do' //部门列表 +let getPersonListurl= '/appPerson/getPersonList.do' //部门下的人员列表 +let twoContractInfourl= '/appHouseContract/twoContractInfo.do' //成交合同第二步合同信息 +let getContractListurl= '/appHouseContract/getContractList.do' //合同审核列表 +let appSaveurl= '/appHouseContract/appSave.do' //定金合同申请 +let depositExamineurl= '/appHouseContract/depositExamine.do' //定金合同审批 +let getDepositListurl= '/appHouseContract/getDepositList.do' //合同审核列表 +let signDepositCallbackurl= '/appHouseContract/signDepositCallback.do' //签约回调 +let djContracturl= '/appHouseContract/djContract.do' //定金合同详情 +let contractListurl= '/appHouseContract/contractList.do' //房间续租合同信息查询 +let sendCodeurl = '/appPhoneCode/sendCode.do' //手机号发短信 +let sendUserurl = '/appPhoneCode/sendUser.do' //用户名发短信 +let checkCodeurl = '/appPhoneCode/checkCode.do' //验证短信 +let takeHouseListurl = '/appTakeHouse/takeHouseList.do' //带房审核 +let cleanRepairHistory1url = '/appCleanRepair/cleanRepairHistory.do' //带房历史列表 +let storeUpurl = '/appMediacy/storeUp.do' //居间关注 +let cancelStoreUpurl = '/appMediacy/cancelStoreUp.do' //取消居间关注 +let storeUp1url = '/appHouse/storeUp.do' //出租关注 +let cancelStoreUp1url = '/appMediacy/cancelStoreUp.do' //取消出租关注 +let applisturl = '/appNews/list.do' //公告列表 +let appdetailurl = '/appNews/detail.do' //公告详情 +let appreplyurl= '/appNews/reply.do' //公告回复 +let replyListurl= '/appNews/replyList.do' //公告回复列表 +let assiturl= '/appNews/assit.do' //公告点赞 +let assitCounturl= '/appNews/assitCount.do' //公告点赞总数 +let viewListurl= '/appNews/viewList.do' //公告查看查询 +let updateStatusurl= '/appCustomer/updateStatus.do' //客户列表放弃客户 +let findDetailHistoryurl= '/appMediacy/findDetailHistory.do' //居间查看历史 +let personalIntermediaryViewurl= '/appMediacy/personalIntermediaryView.do' //居间查看历史录入 +let visiturl= '/appMediacy/visit.do' //居间拜访 +let checkVerificationCodeurl= '/appPerson/checkVerificationCode.do' //验证校验码 +let getVerificationCodeurl= '/appPerson/getVerificationCode.do' //获取校验码 +let forgetResetPasswordurl= '/appPerson/forgetResetPassword.do' //修改密码(忘记密码功能) +let uploadurl= '/file/upload.do' //文件上传 +let sendPasswordurl= '/appLock/sendPassword.do' //房源详情-密码锁 +let findPersonurl= '/appPerson/findPerson.do' //当前登录人信息查询 +let updateLevelurl= '/appCustomer/updateLevel.do' //客源关注功能 +let findRepairPersonTaskurl= '/appCleanRepair/findRepairPersonTask.do' //查询当前登录维修人的维修任务 +let confirmRepairTaskurl= '/appCleanRepair/confirmRepairTask.do' //维修人员确认当前已完成的维修 +let repairEquipmentDictionaryurl= '/appCleanRepair/repairEquipmentDictionary.do' //维修设备字典 +let dealurl= '/appContract/deal.do' //成交合同申请 +let examineurl= '/appContract/examine.do' //合同主管审核店长审批 +let processurl= '/appContractProcess/process.do' //合同申请进度 +let contracturl= '/appContractModel/contract.do' //改价申请详情 +let oneVerificationContractInfourl= '/appHouseContract/oneVerificationContractInfo.do' //成交合同第一步验证如果只添加部分数据，则根据房间id查询用户信息 const install = (Vue, vm) => { + let oneVerificationContractInfo = (params) => vm.$u.post(oneVerificationContractInfourl, params); + let cleanRepairHistory1 = (params) => vm.$u.post(cleanRepairHistory1url, params); + let storeUp = (params) => vm.$u.post(storeUpurl, params); + let cancelStoreUp = (params) => vm.$u.post(cancelStoreUpurl, params); + let storeUp1 = (params) => vm.$u.post(storeUp1url, params); + let replyList = (params) => vm.$u.post(replyListurl, params); + let appreply = (params) => vm.$u.post(appreplyurl, params); + let appdetail = (params) => vm.$u.post(appdetailurl, params); + let applist = (params) => vm.$u.post(applisturl, params); + let cancelStoreUp1 = (params) => vm.$u.post(cancelStoreUp1url, params); + let getVerificationCode = (params) => vm.$u.post(getVerificationCodeurl, params); + let forgetResetPassword = (params) => vm.$u.post(forgetResetPasswordurl, params); + let checkVerificationCode = (params) => vm.$u.post(checkVerificationCodeurl, params); + let visit = (params) => vm.$u.post(visiturl, params); + let personalIntermediaryView = (params) => vm.$u.post(personalIntermediaryViewurl, params); + let findDetailHistory = (params) => vm.$u.post(findDetailHistoryurl, params); + let updateStatus = (params) => vm.$u.post(updateStatusurl, params); + let viewList = (params) => vm.$u.post(viewListurl, params); + let assitCount = (params) => vm.$u.post(assitCounturl, params); + let assit = (params) => vm.$u.post(assiturl, params); + let contract = (params) => vm.$u.post(contracturl, params); + let process = (params) => vm.$u.post(processurl, params); + let examine = (params) => vm.$u.post(examineurl, params); + let deal = (params) => vm.$u.post(dealurl, params); + let repairEquipmentDictionary = (params) => vm.$u.post(repairEquipmentDictionaryurl, params); + let confirmRepairTask = (params) => vm.$u.post(confirmRepairTaskurl, params); + let findRepairPersonTask = (params) => vm.$u.post(findRepairPersonTaskurl, params); + let updateLevel = (params) => vm.$u.post(updateLevelurl, params); + let findPerson = (params) => vm.$u.post(findPersonurl, params); + let sendPassword = (params) => vm.$u.post(sendPasswordurl, params); + let upload = (params) => vm.$u.post(uploadurl, params); let login = (params) => vm.$u.post(loginurl, params); + let sendCode = (params) => vm.$u.post(sendCodeurl, params); + let sendUser = (params) => vm.$u.post(sendUserurl, params); + let checkCode = (params) => vm.$u.post(checkCodeurl, params); + let takeHouseList = (params) => vm.$u.post(takeHouseListurl, params); + let contractList = (params) => vm.$u.post(contractListurl, params); + let djContract = (params) => vm.$u.post(djContracturl, params); + let signDepositCallback = (params) => vm.$u.post(signDepositCallbackurl, params); + let getDepositList = (params) => vm.$u.post(getDepositListurl, params); + let depositExamine = (params) => vm.$u.post(depositExamineurl, params); + let appSave = (params) => vm.$u.post(appSaveurl, params); + let getContractList = (params) => vm.$u.post(getContractListurl, params); + let twoContractInfo = (params) => vm.$u.post(twoContractInfourl, params); + let getPersonList = (params) => vm.$u.post(getPersonListurl, params); + let getDeptList = (params) => vm.$u.post(getDeptListurl, params); + let oneCustomerInfo = (params) => vm.$u.post(oneCustomerInfourl, params); let appChangePriceapply = (params) => vm.$u.post(appChangePriceapplyurl, params); let appChangePriceaccept = (params) => vm.$u.post(appChangePriceaccepturl, params); let appChangePriceprocess = (params) => vm.$u.post(appChangePriceprocessurl, params); @@ -85,6 +177,53 @@ const install = (Vue, vm) => { vm.$u.api = { login, + sendCode, + sendUser, + checkCode, + oneVerificationContractInfo, + assit, + assitCount, + viewList, + updateStatus, + findDetailHistory, + personalIntermediaryView, + visit, + checkVerificationCode, + forgetResetPassword, + getVerificationCode, + findDetailHistory, + applist, + cancelStoreUp1, + appreply, + appdetail, + replyList, + storeUp1, + cleanRepairHistory1, + storeUp, + cancelStoreUp, + contract, + process, + examine, + deal, + repairEquipmentDictionary, + confirmRepairTask, + findRepairPersonTask, + updateLevel, + findPerson, + sendPassword, + upload, + takeHouseList, + contractList, + djContract, + signDepositCallback, + getDepositList, + depositExamine, + appSave, + getContractList, + twoContractInfo, + getPersonList, + getDeptList, + oneCustomerInfo, companyReport, agentRanking, departmentReport, diff --git a/src/common/http.interceptor.js b/src/common/http.interceptor.js index 74de4c2..7cb6388 100644 --- a/src/common/http.interceptor.js +++ b/src/common/http.interceptor.js @@ -6,48 +6,54 @@ const install = (Vue, vm) => { timeout: 10000, // loadingText: '努力加载中~', header: { - 'Authorization': 'Bearer '+vm.vuex_token, + // "user": { + // "token": vm.vuex_token, + // } + }, + data:{ + header: { + user: { + token: vm.vuex_token + }, + }, + body: {} } }); // 请求拦截 Vue.prototype.$u.http.interceptor.request = (config) => { - // console.log(vm.vuex_token) + console.log(config) if (vm.vuex_token) { - config.header.Authorization = 'Bearer ' + vm.vuex_token + config.header.token = vm.vuex_token + } + config.data.header = { + user: { + token: vm.vuex_token, + } } return config; } // 响应拦截 Vue.prototype.$u.http.interceptor.response = (res) => { - // console.log(res) - if (res.statusCode == 200) { + console.log(res) + if (res.data.ErrNo == '0000') { return res.data; - } else if (res.statusCode == 401) { + } else if (res.data.ErrNo == '0005') { uni.showToast({ - title: res.data.msg || '未登录', + title: res.data.ErrMsg || '未登录', icon: "none", duration: 3000 }) - // uni.navigateTo({ - // url: '/pages/login/type' - // }); + uni.navigateTo({ + url: '/pages/tabs/login' + }); return; - } else if (res.statusCode == 500) { - uni.showToast({ - title: res.data.msg || '加载失败', - icon: "none", - duration: 3000 - }) - return; - } else if (res.statusCode == 503) { + } else { uni.showToast({ - title: '网络服务有问题', + title: res.data.ErrMsg || '加载失败', icon: "none", duration: 3000 }) return; - } else { - return; } } } diff --git a/src/pages.json b/src/pages.json index 5d7f67f..9295f12 100644 --- a/src/pages.json +++ b/src/pages.json @@ -17,18 +17,23 @@ }, "pages": [ { - "path": "pages/tabs/login", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" - } - }, - { - "path": "pages/tabs/index", + // "path": "pages/tabs/index", + // "style": { + // "navigationBarTitleText": "8090公寓", + // "navigationBarTextStyle": "black" + // } + // },{ + "path": "pages/tabs/login", "style": { - "navigationBarTitleText": "8090公寓", - "navigationBarTextStyle": "black" + "navigationBarTitleText": "登录", + "navigationStyle": "custom" } + },{ + "path": "pages/tabs/index", + "style": { + "navigationBarTitleText": "8090公寓", + "navigationBarTextStyle": "black" + } }, { "path": "pages/tabs/customer", "style": { @@ -101,12 +106,60 @@ "navigationBarTitleText": "我的待办", "navigationBarTextStyle": "black" } + }, { + "path": "apply_baojie", + "style": { + "navigationBarTitleText": "首次保洁", + "navigationBarTextStyle": "black" + } + }, { + "path": "networkquery", + "style": { + "navigationBarTitleText": "网络查询", + "navigationBarTextStyle": "black" + } + }, { + "path": "applyHistory", + "style": { + "navigationBarTitleText": "申请历史", + "navigationBarTextStyle": "black" + } + }, { + "path": "repairlist", + "style": { + "navigationBarTitleText": "维修清单", + "navigationBarTextStyle": "black" + } + }, { + "path": "networkquery_detail", + "style": { + "navigationBarTitleText": "网络查询详情", + "navigationBarTextStyle": "black" + } + }, { + "path": "changePrice_check", + "style": { + "navigationBarTitleText": "改价审核", + "navigationBarTextStyle": "black" + } + }, { + "path": "contact_check", + "style": { + "navigationBarTitleText": "合同审核", + "navigationBarTextStyle": "black" + } }, { "path": "electContract", "style": { "navigationBarTitleText": "电子合同", "navigationBarTextStyle": "black" } + }, { + "path": "modifyPassword", + "style": { + "navigationBarTitleText": "修改密码", + "navigationBarTextStyle": "black" + } }] }, { "root": "pages/customer", diff --git a/src/pages/my/applyHistory.vue b/src/pages/my/applyHistory.vue new file mode 100644 index 0000000..4248915 --- /dev/null +++ b/src/pages/my/applyHistory.vue @@ -0,0 +1,137 @@ + + + + diff --git a/src/pages/my/apply_baojie.vue b/src/pages/my/apply_baojie.vue new file mode 100644 index 0000000..f1d8a29 --- /dev/null +++ b/src/pages/my/apply_baojie.vue @@ -0,0 +1,194 @@ + + + + diff --git a/src/pages/my/changePrice_check.vue b/src/pages/my/changePrice_check.vue new file mode 100644 index 0000000..7892c29 --- /dev/null +++ b/src/pages/my/changePrice_check.vue @@ -0,0 +1,147 @@ + + + + diff --git a/src/pages/my/contact_check.vue b/src/pages/my/contact_check.vue new file mode 100644 index 0000000..9b300be --- /dev/null +++ b/src/pages/my/contact_check.vue @@ -0,0 +1,210 @@ + + + + diff --git a/src/pages/my/electContract.vue b/src/pages/my/electContract.vue index e956d0b..6a171b5 100644 --- a/src/pages/my/electContract.vue +++ b/src/pages/my/electContract.vue @@ -100,7 +100,7 @@ - + diff --git a/src/pages/my/goonContract.vue b/src/pages/my/goonContract.vue index af8d181..d1f7b35 100644 --- a/src/pages/my/goonContract.vue +++ b/src/pages/my/goonContract.vue @@ -12,7 +12,7 @@ {{endDate}} 结束日期 - + @@ -36,7 +36,7 @@ starDate: '', endDate: '', mindate: '', - maxdate: '', + maxdate: '2099-12-31', type: 0,// 默认是开始时间 calendarShow: false, listData: [{},{},{},{}] @@ -56,7 +56,7 @@ }else{ this.type = 1 this.mindate = this.starDate - this.maxdate = '' + this.maxdate = '2099-12-31' } this.calendarShow = true; }, diff --git a/src/pages/my/modifyPassword.vue b/src/pages/my/modifyPassword.vue new file mode 100644 index 0000000..ae6a9f6 --- /dev/null +++ b/src/pages/my/modifyPassword.vue @@ -0,0 +1,108 @@ + + + + diff --git a/src/pages/my/myapply.vue b/src/pages/my/myapply.vue index d705732..b4c3475 100644 --- a/src/pages/my/myapply.vue +++ b/src/pages/my/myapply.vue @@ -1,23 +1,23 @@