fix

virgo.wzfrontend/yui_wx/pages/index/index.vue

@@ -81,7 +81,7 @@
 				<view class="group-box">
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg9" @click="$navigateTo('/pages/invoice/invoice?type=2')">
+							<view class="group-veiw bg9" @click="$navigateTo('/pages/invoice/invoice?type=1')">
 								<text class="label">合同发票</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-app-hetongguanli-hetongfapiao"

virgo.wzfrontend/yui_wx/pages/message/message.vue

@@ -59,19 +59,9 @@
 			}
 		},
 		onLoad() {
-			uni.$on('changeChatList', (list) => {
-				this.chatList = list.filter(node => node.conversationId !== 'system');
-				// this.$store.getters.user.userId
-				getMessageTest(3).then(res => {
-					if (res.code == 200) {
-						this.systemCount = res.data.length;
-						this.unread();
-					}
-				});
-			})
+			uni.$on('changeChatList', this.countNumber)
 		},
 		onShow() {
-			console.log('on show');
 			if (!uni.getStorageSync('token')) {
 				this.chatList = [];
 				this.option = {
@@ -88,14 +78,21 @@
 		},
 		methods: {
 			init() {
-				this.$chat.getConversationList((data) => {
-					this.chatList = data.data.filter(node => node.conversationId !== 'system');
-					getMessageTest(3).then(res => {
-						if (res.code == 200) {
-							this.systemCount = res.data.length;
-							this.unread();
+				this.$chat.getConversationList(data => {
+					this.countNumber(data.data);
+				});
+			},
+			countNumber(data) {
+				this.chatList = data.filter(node => node.conversationId !== 'system');
+				getMessageTest(this.$store.getters.user.userId).then(res => {
+					if (res.code == 200) {
+						let num = 0;
+						for (var i = 0; i < res.data.length; i++) {
+							num += res.data[i].count
 						}
-					});
+						this.systemCount = num;
+						this.unread();
+					}
 				});
 			},
 			linkTo(item) {

virgo.wzfrontend/yui_wx/pages/messageList/messageList.vue

@@ -37,7 +37,7 @@
 		},
 		methods: {
 			init() {
-				getMessageList(3, this.type).then(res => {
+				getMessageList(this.$store.getters.user.userId, this.type).then(res => {
 					if (res.code === 200) {
 						this.list = res.data.map(node => {
 							node = Object.assign(node, JSON.parse(node.json))

virgo.wzfrontend/yui_wx/pages/messageSystem/messageSystem.vue

@@ -33,7 +33,7 @@
 		},
 		methods: {
 			init() {
-				getMessageTest(3).then(res => {
+				getMessageTest(this.$store.getters.user.userId).then(res => {
 					if (res.code == 200) {
 						let obj = {};
 						for (var i = 0; i < res.data.length; i++) {

virgo.wzfrontend/yui_wx/uitls/chat.js

@@ -187,7 +187,7 @@ const $chat = {
 		//清除指定会话未读数，并给对方发送已读回执
 		YeIMUniSDK.getInstance().clearConversationUnread(conversationId);
 	},
-	sendSystemMessage(success) {
+	sendSystemMessage() {
 		let timestamp = (new Date()).getTime() + 86400 * 1000; //1000天后过期
 		let sign = md5('system' + timestamp + "50abd47112ebe8c5a73f4694c96a49ce");
 		login({
@@ -216,7 +216,6 @@ const $chat = {
 				})
 			}
 		})
-
 	}
 }
 export default $chat;

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/app.json

@@ -28,7 +28,21 @@
     "pages/orderHandle/orderHandle",
     "pages/orderDetail/orderDetail",
     "pages/selectUser/selectUser",
-    "pages/contract/contract"
+    "pages/contract/contract",
+    "pages/pdf/pdf",
+    "pages/sign/sign",
+    "pages/webview/webview",
+    "pages/contractDetail/contractDetail",
+    "pages/requestSeal/requestSeal",
+    "pages/bill/bill",
+    "pages/billDetail/billDetail",
+    "pages/invoice/invoice",
+    "pages/invoiceDetail/invoiceDetail",
+    "pages/billRecord/billRecord",
+    "pages/billInvoice/billInvoice",
+    "pages/messageSystem/messageSystem",
+    "pages/messageList/messageList",
+    "pages/messageDetail/messageDetail"
   ],
   "subPackages": [],
   "window": {

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/city-select/city-select.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/bill.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "uni-collapse": "/uni_modules/uni-collapse/components/uni-collapse/uni-collapse",
+    "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item"
+  },
+  "component": true
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/upload.wxml

@@ -1 +1 @@
-<view class="upload-index"><uv-upload vue-id="00863568-1" fileList="{{fileList}}" name="1" multiple="{{true}}" maxCount="{{type==='insert'?5:$root.g0}}" deletable="{{type==='insert'}}" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" bind:__l="__l"></uv-upload></view>
+<view class="upload-index"><uv-upload vue-id="00863568-1" accept="{{accept}}" fileList="{{fileList}}" name="1" multiple="{{true}}" maxCount="{{type==='insert'?5:$root.g0}}" deletable="{{type==='insert'}}" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" bind:__l="__l"></uv-upload></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/contract/clauseDetail.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/house/houseItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/house/houseItems.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/login/imageCode.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/sin-signature/sin-signature.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/bill/bill.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "账单列表",
+  "usingComponents": {
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/billDetail/billDetail.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "账单详情",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "upload": "/components/common/upload"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/billInvoice/billInvoice.json

@@ -0,0 +1,12 @@
+{
+  "navigationBarTitleText": "账单发票",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uv-picker": "/uni_modules/uv-picker/components/uv-picker/uv-picker",
+    "upload": "/components/common/upload",
+    "lotus-calendar": "/components/Winglau14-lotusCalendar/Winglau14-lotusCalendar"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/billInvoice/billInvoice.wxss

@@ -0,0 +1 @@
+.bill-invoice{padding:30rpx;padding-bottom:130rpx}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/billRecord/billRecord.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "账单付款",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "upload": "/components/common/upload"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/billRecord/billRecord.wxss

@@ -0,0 +1 @@
+.bill-record{padding:30rpx}.bill-record .file-form-box{padding-bottom:0rpx}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contract/contract.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "合同列表",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contractDetail/contractDetail.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "合同详情",
+  "usingComponents": {
+    "uv-sticky": "/uni_modules/uv-sticky/components/uv-sticky/uv-sticky",
+    "uv-tabs": "/uni_modules/uv-tabs/components/uv-tabs/uv-tabs",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "clause-detail": "/components/contract/clauseDetail",
+    "upload": "/components/common/upload",
+    "bill": "/components/common/bill"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contractDetail/contractDetail.wxss

@@ -0,0 +1 @@
+.contract-detail .uv-sticky{border-top:2rpx solid #d9d9d9}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/invoice/invoice.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "发票列表",
+  "usingComponents": {
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/invoiceDetail/invoiceDetail.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "发票详情",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "upload": "/components/common/upload"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/message/message.json

@@ -1,8 +1,9 @@
 {
   "navigationBarTitleText": "消息",
   "usingComponents": {
-    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-dateformat": "/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat"
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/messageDetail/messageDetail.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "通知详情",
+  "usingComponents": {}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/messageList/messageList.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "通知列表",
+  "usingComponents": {
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/messageSystem/messageSystem.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "系统通知",
+  "usingComponents": {
+    "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/pdf/pdf.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/pdf/pdf.wxml

@@ -0,0 +1 @@
+<view><block wx:if="{{fileUrl}}"><web-view src="{{fileUrl}}"></web-view></block></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/requestSeal/requestSeal.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "申请印章",
+  "usingComponents": {}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/requestSeal/requestSeal.wxml

@@ -0,0 +1 @@
+<view class="seal-list"><block wx:for="{{sealData}}" wx:for-item="item" wx:for-index="index" wx:key="id"><view data-event-opts="{{[['tap',[['requestSeal',['$0'],[[['sealData','id',item.id]]]]]]]}}" class="seal-item" bindtap="__e"><image class="seal-image" src="{{item.fileNode.node.url}}" mode="aspectFit"></image><view class="content"><view class="title">{{''+item.name+''}}</view><view class="article">{{''+item.comment+''}}</view></view></view></block></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/requestSeal/requestSeal.wxss

@@ -0,0 +1 @@
+.seal-list{padding:30rpx}.seal-list .seal-item{height:140rpx;background-color:#fff;border-radius:16rpx;box-shadow:0 1px 12px rgba(3,3,3,.08);display:flex;align-items:center;padding:0 30rpx;margin-bottom:20rpx}.seal-list .seal-image{width:100rpx;height:100rpx}.seal-list .content{flex:1;width:0;margin-left:20rpx}.seal-list .title{font-weight:500;font-size:32rpx}.seal-list .article{color:#8c8c8c;margin-top:10rpx}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/sign/sign.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "签字",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "signature": "/components/sin-signature/sin-signature"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/webview/webview.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "文档",
+  "usingComponents": {}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/webview/webview.wxml

@@ -0,0 +1 @@
+<view><web-view src="{{url}}" data-event-opts="{{[['message',[['onMessage',['$event']]]]]}}" bindmessage="__e"></web-view></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/font/iconfont.css

@@ -12,6 +12,74 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.icon-wenjian:before {
+	content: "\e600";
+}
+
+.icon-bianjiwenjian:before {
+	content: "\e601";
+}
+
+.icon-dengdaiwenjian:before {
+	content: "\e602";
+}
+
+.icon-shanchuwenjian:before {
+	content: "\e603";
+}
+
+.icon-jianqiewenjian:before {
+	content: "\e604";
+}
+
+.icon-fuzhiwenjian:before {
+	content: "\e605";
+}
+
+.icon-sousuowenjian:before {
+	content: "\e606";
+}
+
+.icon-dingdan:before {
+	content: "\e607";
+}
+
+.icon-jian:before {
+	content: "\e643";
+}
+
+.icon-dui:before {
+	content: "\e63f";
+}
+
+.icon-jigoukehudaishenheshuliang:before {
+	content: "\e65f";
+}
+
+.icon-zulinguihuan_fu:before {
+	content: "\e63d";
+}
+
+.icon-baozhengjin:before {
+	content: "\e622";
+}
+
+.icon-hetongwendang:before {
+	content: "\e635";
+}
+
+.icon-zidingyi:before {
+	content: "\e69f";
+}
+
+.icon-zhinajin:before {
+	content: "\e70b";
+}
+
+.icon-a-fujian1:before {
+	content: "\e60d";
+}
+
 .icon-integralrecord:before {
 	content: "\e732";
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/scss/common.scss

@@ -9,7 +9,12 @@
 	text-overflow: ellipsis;
 }
 //修改uni-ui样式
-.form-box {
+.form-box {
+	&.file-form-box{
+		.uni-forms{
+			padding-bottom: 10rpx;
+		}
+	}
 	.uni-forms {
 		background: #fff;
 		border-radius: 16rpx;
@@ -64,7 +69,6 @@
 }
 //底部按钮
 .hui-button-box {
-	position: absolute;
 	height: 100rpx;
 	background-color: #ffffff;
 	box-shadow: 0px 2px 10px rgba(3, 3, 3, 0.1);
@@ -357,7 +361,23 @@ button[type=primary]{
 		.value {
 			margin-top: 10rpx;
 			font-weight: 400;
-		}
+		}
+		
+		.file-item{
+			background-color: #ededed;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+			border-radius: 12rpx;
+			padding: 0 14rpx;
+		}
+		
+		.file-name{
+			flex: 1;
+			width: 0;
+			margin-left: 10rpx;
+		}
+		
 	}
 
 	.state {

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}