bug修改

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) {
     // 文件下载的地址

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: '加载中...',

pages/committee/committee.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "项目",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

pages/committee/committee.wxml

@@ -1,4 +1,11 @@
 <!--pages/meeting/meeting.wxml-->
+<!-- 自定义头部start -->
+<view class="custom flex_center" style="padding-top:{{statusBarHeight}}px">
+	<image src="../../assets/images/back.png" bindtap="goBack"></image>
+	<text>项目</text>
+</view>
+<view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view><!-- 空view用来填充自定义头部的padding-top -->
+<!-- 自定义头部end -->
 <view>
 	<view class="item" wx:for="{{list}}" wx:key="item" bindtap="detail" data-committee="{{item}}">
 		<text>{{item.name}}</text>

pages/contractDetail/contractDetail.js

@@ -6,8 +6,12 @@ Page({
    * 页面的初始数据
    */
   data: {
+    statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'],
     form: {}
   },
+  goBack(){
+    wx.navigateBack()
+  },
   // 跳转项目详情
   projectDetail(e){
     wx.navigateTo({

pages/contractDetail/contractDetail.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "合同详情",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

pages/contractDetail/contractDetail.wxml

@@ -1,3 +1,10 @@
+<!-- 自定义头部start -->
+<view class="custom flex_center" style="padding-top:{{statusBarHeight}}px">
+	<image src="../../assets/images/back.png" bindtap="goBack"></image>
+	<text>合同详情</text>
+</view>
+<view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view><!-- 空view用来填充自定义头部的padding-top -->
+<!-- 自定义头部end -->
 <view>
 	<view class="basic-info">
 		<view class="title">

pages/home/home.js

@@ -46,7 +46,17 @@ Page({
             list: []
           })
         }
+        const reg = new RegExp("<p>","g")
+        const reg1 = new RegExp("</p>","g")
+        const reg2 = new RegExp("<span>","g")
+        const reg3 = new RegExp("</span>","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]
           })

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

pages/mineContract/mineContract.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "我的合同",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

pages/mineContract/mineContract.wxml

@@ -1,4 +1,11 @@
 <!--pages/meeting/meeting.wxml-->
+<!-- 自定义头部start -->
+<view class="custom flex_center" style="padding-top:{{statusBarHeight}}px">
+	<image src="../../assets/images/back.png" bindtap="goBack"></image>
+	<text>我的合同</text>
+</view>
+<view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view><!-- 空view用来填充自定义头部的padding-top -->
+<!-- 自定义头部end -->
 <view wx:if="{{list && list.length}}">
 	<view class="basic-info">
 		<view class="container" wx:for="{{list}}" wx:key="item" bindtap="contractDetail" data-meeting="{{item}}">

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: '加载中...',

pages/mineData/mineData.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "资料下载",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

pages/mineData/mineData.wxml

@@ -1,3 +1,10 @@
+<!-- 自定义头部start -->
+<view class="custom flex_center" style="padding-top:{{statusBarHeight}}px">
+	<image src="../../assets/images/back.png" bindtap="goBack"></image>
+	<text>资料下载</text>
+</view>
+<view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view><!-- 空view用来填充自定义头部的padding-top -->
+<!-- 自定义头部end -->
 <view class="list-box" wx:if="{{list && list.length}}">
 	<view class="list-item" wx:for="{{list}}" wx:key="item">
 		<text class="list-time">{{item.uploadTime}}</text>

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)

pages/project/project.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "项目",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

pages/project/project.wxml

@@ -1,3 +1,10 @@
+<!-- 自定义头部start -->
+<view class="custom flex_center" style="padding-top:{{statusBarHeight}}px">
+	<image src="../../assets/images/back.png" bindtap="goBack"></image>
+	<text>项目</text>
+</view>
+<view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view><!-- 空view用来填充自定义头部的padding-top -->
+<!-- 自定义头部end -->
 <!--pages/meeting/meeting.wxml首页会议活动-->
 <view class="select-list">
 	<!-- 发票 -->

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

pages/projectDetail/projectDetail.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "项目详情",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

pages/projectDetail/projectDetail.wxml

@@ -1,3 +1,10 @@
+<!-- 自定义头部start -->
+<view class="custom flex_center" style="padding-top:{{statusBarHeight}}px">
+	<image src="../../assets/images/back.png" bindtap="goBack"></image>
+	<text>项目详情</text>
+</view>
+<view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view><!-- 空view用来填充自定义头部的padding-top -->
+<!-- 自定义头部end -->
 <view>
 	<view class="basic-info">
 		<view class="meeting-name">
@@ -108,12 +115,14 @@
 				<image wx:if='{{item.sendMethod === 1}}' src="../../assets/images/ems.png"></image>
 				<text>{{item.sendMethod_dictText ? item.sendMethod_dictText : '未邮寄'}}</text>
 			</view>
-			<view class="way project-name">项目名称：{{item.projectName}}</view>
+			<view class="way project-name">
+				<text>项目名称：</text>
+				<text>{{item.projectName}}阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇</text></view>
 			<view class="way-info">
 				<view class="way-left">
 					<text class="way-left-text green">票</text>
 					<view class="way-center">
-						<text>开票人：{{item.createBy}}</text>
+						<text>开票人：{{item.realName}}</text>
 						<text>开票时间：{{item.billDate}}</text>
 					</view>
 				</view>

pages/projectDetail/projectDetail.wxss

@@ -135,14 +135,16 @@ page{
   height: auto !important;
 }
 .project-name{
-  display: block !important;
+  display: flex !important;
-    width: 100%;
+  justify-content: flex-start;
-    overflow: hidden !important;
+  align-items: center;
-    text-overflow: ellipsis !important;
+  width: 100%;
-    white-space: nowrap !important;
+  box-sizing: border-box;
-    box-sizing: border-box;
+  height: auto !important;
-    height: 40px !important;
+  padding: 10px 15px !important;
-    line-height: 40px;
+}
+.project-name text:nth-child(1){
+  flex-shrink: 0;
 }
 .info-file{
   padding: 0 !important;