diff --git a/assets/js/preview.js b/assets/js/preview.js index 16432ca..5d3cc7b 100644 --- a/assets/js/preview.js +++ b/assets/js/preview.js @@ -8,7 +8,7 @@ import { baseUrl } from '../js/project.config' // 文件下载的地址 后期上线需要修改地址 const downFileUrl = `${baseUrl}/jero-boot/sys/common/download/` - + // 预览 export function previewFile(fileId,fileName) { // 文件下载的地址 diff --git a/pages/committee/committee.js b/pages/committee/committee.js index 1b2cdbd..8c37ccb 100644 --- a/pages/committee/committee.js +++ b/pages/committee/committee.js @@ -5,11 +5,14 @@ Page({ * 页面的初始数据 */ data: { + statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], pageNo: 1, pageSize: 10, list: [] }, - + goBack(){ + wx.navigateBack() + }, loadData(){ wx.showToast({ title: '加载中...', diff --git a/pages/committee/committee.json b/pages/committee/committee.json index da8aab1..b16ef3e 100644 --- a/pages/committee/committee.json +++ b/pages/committee/committee.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "项目", + "navigationStyle": "custom", "usingComponents": {} } diff --git a/pages/committee/committee.wxml b/pages/committee/committee.wxml index f679d03..510c022 100644 --- a/pages/committee/committee.wxml +++ b/pages/committee/committee.wxml @@ -1,4 +1,11 @@ + + + + 项目 + + + {{item.name}} diff --git a/pages/contractDetail/contractDetail.js b/pages/contractDetail/contractDetail.js index 2b53cd1..f4f292c 100644 --- a/pages/contractDetail/contractDetail.js +++ b/pages/contractDetail/contractDetail.js @@ -6,8 +6,12 @@ Page({ * 页面的初始数据 */ data: { + statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], form: {} }, + goBack(){ + wx.navigateBack() + }, // 跳转项目详情 projectDetail(e){ wx.navigateTo({ diff --git a/pages/contractDetail/contractDetail.json b/pages/contractDetail/contractDetail.json index bc67bc0..b16ef3e 100644 --- a/pages/contractDetail/contractDetail.json +++ b/pages/contractDetail/contractDetail.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "合同详情", + "navigationStyle": "custom", "usingComponents": {} } diff --git a/pages/contractDetail/contractDetail.wxml b/pages/contractDetail/contractDetail.wxml index 48bbc40..9429d06 100644 --- a/pages/contractDetail/contractDetail.wxml +++ b/pages/contractDetail/contractDetail.wxml @@ -1,3 +1,10 @@ + + + + 合同详情 + + + diff --git a/pages/home/home.js b/pages/home/home.js index f09ab67..145d94e 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -46,7 +46,17 @@ Page({ list: [] }) } + const reg = new RegExp("

","g") + const reg1 = new RegExp("

","g") + const reg2 = new RegExp("","g") + const reg3 = new RegExp("","g") if(res.result.records && res.result.records.length){ + res.result.records.forEach(item=>{ + item.msgContent = item.msgContent.replace(reg, "") + item.msgContent = item.msgContent.replace(reg1, "") + item.msgContent = item.msgContent.replace(reg2, "") + item.msgContent = item.msgContent.replace(reg3, "") + }) this.setData({ list: [...this.data.list, ...res.result.records] }) diff --git a/pages/mineContract/mineContract.js b/pages/mineContract/mineContract.js index 139557c..d47e5b8 100644 --- a/pages/mineContract/mineContract.js +++ b/pages/mineContract/mineContract.js @@ -5,10 +5,14 @@ Page({ * 页面的初始数据 */ data: { + statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], list: [], pageNo: 1, pageSize: 10 }, + goBack(){ + wx.navigateBack() + }, // 合同详情 contractDetail(e){ let id = e.currentTarget.dataset.meeting.id diff --git a/pages/mineContract/mineContract.json b/pages/mineContract/mineContract.json index ea6ac39..ced5b27 100644 --- a/pages/mineContract/mineContract.json +++ b/pages/mineContract/mineContract.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "我的合同", + "navigationStyle": "custom", "usingComponents": {} } \ No newline at end of file diff --git a/pages/mineContract/mineContract.wxml b/pages/mineContract/mineContract.wxml index 5f04f5c..a6fac02 100644 --- a/pages/mineContract/mineContract.wxml +++ b/pages/mineContract/mineContract.wxml @@ -1,4 +1,11 @@ + + + + 我的合同 + + + diff --git a/pages/mineData/mineData.js b/pages/mineData/mineData.js index 2aae6d5..e80e838 100644 --- a/pages/mineData/mineData.js +++ b/pages/mineData/mineData.js @@ -6,12 +6,15 @@ Page({ * 页面的初始数据 */ data: { + statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], userId: '', list: [], pageNo: 1, pageSize: 10 }, - + goBack(){ + wx.navigateBack() + }, loadData(){ wx.showToast({ title: '加载中...', diff --git a/pages/mineData/mineData.json b/pages/mineData/mineData.json index bce8669..ced5b27 100644 --- a/pages/mineData/mineData.json +++ b/pages/mineData/mineData.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "资料下载", + "navigationStyle": "custom", "usingComponents": {} } \ No newline at end of file diff --git a/pages/mineData/mineData.wxml b/pages/mineData/mineData.wxml index fd6510f..1dbd4ac 100644 --- a/pages/mineData/mineData.wxml +++ b/pages/mineData/mineData.wxml @@ -1,3 +1,10 @@ + + + + 资料下载 + + + {{item.uploadTime}} diff --git a/pages/project/project.js b/pages/project/project.js index 472d121..e4c60de 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -5,6 +5,7 @@ Page({ * 页面的初始数据 */ data: { + statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], index: 0, type: '', // project 是来款项目 work 是工作组 ziliao是资料网员 list: [], // 项目列表 @@ -20,6 +21,9 @@ Page({ order:'desc' } }, + goBack(){ + wx.navigateBack() + }, // 发票改变 bindNeedInvoiceChange(e){ console.log(e.detail.value) diff --git a/pages/project/project.json b/pages/project/project.json index 0e892df..ced5b27 100644 --- a/pages/project/project.json +++ b/pages/project/project.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "项目", + "navigationStyle": "custom", "usingComponents": {} } \ No newline at end of file diff --git a/pages/project/project.wxml b/pages/project/project.wxml index dc33e91..8a6d161 100644 --- a/pages/project/project.wxml +++ b/pages/project/project.wxml @@ -1,3 +1,10 @@ + + + + 项目 + + + diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js index 109d626..5c912f1 100644 --- a/pages/projectDetail/projectDetail.js +++ b/pages/projectDetail/projectDetail.js @@ -8,6 +8,7 @@ Page({ * 页面的初始数据 */ data: { + statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], form: {}, id: '', // 在工作组id,项目id workingGroupId: '', //工作组id @@ -21,6 +22,9 @@ Page({ // 当前登录人的id currentId:'' }, + goBack(){ + wx.navigateBack() + }, // 预览 preview(e) { const fileObj = e.currentTarget.dataset.file diff --git a/pages/projectDetail/projectDetail.json b/pages/projectDetail/projectDetail.json index ee57502..b16ef3e 100644 --- a/pages/projectDetail/projectDetail.json +++ b/pages/projectDetail/projectDetail.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "项目详情", + "navigationStyle": "custom", "usingComponents": {} } diff --git a/pages/projectDetail/projectDetail.wxml b/pages/projectDetail/projectDetail.wxml index 0bc71f5..4d6546a 100644 --- a/pages/projectDetail/projectDetail.wxml +++ b/pages/projectDetail/projectDetail.wxml @@ -1,3 +1,10 @@ + + + + 项目详情 + + + @@ -108,12 +115,14 @@ {{item.sendMethod_dictText ? item.sendMethod_dictText : '未邮寄'}} - 项目名称：{{item.projectName}} + + 项目名称： + {{item.projectName}}阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇 票 - 开票人：{{item.createBy}} + 开票人：{{item.realName}} 开票时间：{{item.billDate}} diff --git a/pages/projectDetail/projectDetail.wxss b/pages/projectDetail/projectDetail.wxss index f2eda7d..ee34c74 100644 --- a/pages/projectDetail/projectDetail.wxss +++ b/pages/projectDetail/projectDetail.wxss @@ -135,14 +135,16 @@ page{ height: auto !important; } .project-name{ - display: block !important; - width: 100%; - overflow: hidden !important; - text-overflow: ellipsis !important; - white-space: nowrap !important; - box-sizing: border-box; - height: 40px !important; - line-height: 40px; + display: flex !important; + justify-content: flex-start; + align-items: center; + width: 100%; + box-sizing: border-box; + height: auto !important; + padding: 10px 15px !important; +} +.project-name text:nth-child(1){ + flex-shrink: 0; } .info-file{ padding: 0 !important;