fix

virgo.wzfrontend/webview/document/editor.html

@@ -11,8 +11,11 @@
 		<script src="./axios.js" type="text/javascript" charset="utf-8"></script>
 		<script src="./axiosRequest.js" type="text/javascript" charset="utf-8"></script>
 		<link rel="stylesheet" href="./reset.css" />
-		<title id="title"></title>
-		<style>
+		<title id="title">文档</title>
+		<style>
+			#app{
+				border-top: 1px solid #d9d9d9;
+			}
 			.flow-document {
 				position: relative;
 				width: 100%;
@@ -130,7 +133,7 @@
 						localStorage.setItem('token', query.token);
 						this.documentId = query.id;
 						this.contractId = query.contractId;
-						this.userId = query.userId
+						this.userId = query.userId;
 						this.$nextTick(() => {
 							this.initDocument();
 						});

virgo.wzfrontend/yui_wx/components/common/bill.vue

@@ -1,14 +1,44 @@
 <template>
-	<view class="">
-		<uni-collapse>
-			<uni-collapse-item title="默认开启" :open="true">
-				<text>折叠内容</text>
-			</uni-collapse-item>
-			<uni-collapse-item title="折叠内容">
-				<text>折叠内容</text>
-			</uni-collapse-item>
-			<uni-collapse-item title="禁用状态" disabled>
-				<text>折叠内容</text>
+	<view class="bill-list">
+		<uni-collapse class="bill-box">
+			<uni-collapse-item class="bill-item" v-for="(item,index) in list" :key="item.id" title-border="none"
+				:border="false">
+				<template v-slot:title>
+					<view class="collapse-title">
+						<view class="label">{{'第' + item.phase + '期'}}</view>
+						<view>
+							<view class="hui-tag info" v-if="!item.status">待付款</view>
+							<view class="hui-tag warning" v-if="item.status === 1">付款中</view>
+							<view class="hui-tag success" v-if="item.status === 2">已付款</view>
+						</view>
+					</view>
+				</template>
+				<view class="contract-bill-box">
+					<view class="contract-bill-item">
+						<view class="name">账单期数</view>
+						<view class="label">{{'第' + item.phase + '期'}}</view>
+					</view>
+					<view class="contract-bill-item">
+						<view class="name">账单日期</view>
+						<view class="label">{{item.startDate}}至{{item.endDate}}</view>
+					</view>
+					<view class="contract-bill-item">
+						<view class="name">金额</view>
+						<view class="label">{{item.amount}}元</view>
+					</view>
+					<view class="contract-bill-item">
+						<view class="name">收款方</view>
+						<view class="label">{{item.organizationName}}</view>
+					</view>
+					<view class="contract-bill-item">
+						<view class="name">付款方</view>
+						<view class="label">{{item.payMerchantName || item.payClientName}}</view>
+					</view>
+					<view class="contract-bill-item">
+						<view class="name">账单组成</view>
+						<view class="label">{{returnLabel(item.data)}}</view>
+					</view>
+				</view>
 			</uni-collapse-item>
 		</uni-collapse>
 	</view>
@@ -41,6 +71,8 @@
 				})
 			},
 			returnLabel(data) {
+				if (!data) return ''
+				console.log(data);
 				let list = JSON.parse(data);
 				let str = [];
 				for (var i = 0; i < list.length; i++) {
@@ -57,5 +89,47 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.bill-list {
+
+		.bill-box,
+		.uni-collapse {
+			background: transparent;
+		}
+
+		.collapse-title {
+			display: flex;
+			align-items: center;
+			height: 84rpx;
+			padding-left: 30rpx;
+
+			.label {
+				margin-right: 20rpx;
+			}
+		}
+
+		.bill-item {
+			margin-bottom: 20rpx;
+			background: #fff;
+			border-radius: 8rpx;
+		}
+
+		.contract-bill-box {
+			padding: 30rpx;
+			border-top: 1px solid $uni-border-1;
+			.contract-bill-item {
+				margin-top: 16rpx;
+			}
+			
+			.name {
+				color: $uni-secondary-color;
+				font-size: 24rpx;
+			}
+			
+			.label {
+				margin-top: 10rpx;
+				font-weight: 400;
+			}
+		}
+	}
 </style>

virgo.wzfrontend/yui_wx/pages.json

@@ -1,10 +1,5 @@
 {
 	"pages": [{
-		"path": "pages/contractDetail/contractDetail",
-		"style": {
-			"navigationBarTitleText": "合同详情"
-		}
-	}, {
 		"path": "pages/highseas/highseas",
 		"style": {
 			"navigationStyle": "custom",
@@ -163,7 +158,12 @@
 	}, {
 		"path": "pages/webview/webview",
 		"style": {
-			"navigationBarTitleText": ""
+			"navigationBarTitleText": "文档"
+		}
+	}, {
+		"path": "pages/contractDetail/contractDetail",
+		"style": {
+			"navigationBarTitleText": "合同详情"
 		}
 	}, {
 		"path": "pages/requestSeal/requestSeal",

virgo.wzfrontend/yui_wx/pages/contractDetail/contractDetail.vue

@@ -220,7 +220,7 @@
 					iconfont: 'icon-bianjiwenjian'
 				}],
 				detail: {},
-				contractId: 15,
+				contractId: '',
 				documentFileList: {
 					document: [],
 					attachment: []

virgo.wzfrontend/yui_wx/request/api/contract.js

@@ -57,7 +57,7 @@ export function uploadImageBase64(base64) {
  */
 export function getPaymentListByPage(data) {
 	return request({
-		url: `/api/payment/ordinary/${data.currPage}/${data.pageSize}`,
+		url: `/api/payment/${data.currPage}/${data.pageSize}`,
 		method: 'post',
 		data: data
 	})

virgo.wzfrontend/yui_wx/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue

@@ -142,6 +142,5 @@
 		flex: 1;
 		/* #endif */
 		flex-direction: column;
-		background-color: #fff;
 	}
 </style>

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

@@ -1,6 +1,5 @@
 {
   "pages": [
-    "pages/contractDetail/contractDetail",
     "pages/highseas/highseas",
     "pages/index/index",
     "pages/my/my",
@@ -33,6 +32,7 @@
     "pages/pdf/pdf",
     "pages/sign/sign",
     "pages/webview/webview",
+    "pages/contractDetail/contractDetail",
     "pages/requestSeal/requestSeal"
   ],
   "subPackages": [],

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/bill.wxss

@@ -0,0 +1,42 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.bill-list .bill-box,
+.bill-list .uni-collapse {
+  background: transparent;
+}
+.bill-list .collapse-title {
+  display: flex;
+  align-items: center;
+  height: 84rpx;
+  padding-left: 30rpx;
+}
+.bill-list .collapse-title .label {
+  margin-right: 20rpx;
+}
+.bill-list .bill-item {
+  margin-bottom: 20rpx;
+  background: #fff;
+  border-radius: 8rpx;
+}
+.bill-list .contract-bill-box {
+  padding: 30rpx;
+  border-top: 1px solid #d9d9d9;
+}
+.bill-list .contract-bill-box .contract-bill-item {
+  margin-top: 16rpx;
+}
+.bill-list .contract-bill-box .name {
+  color: #8c8c8c;
+  font-size: 24rpx;
+}
+.bill-list .contract-bill-box .label {
+  margin-top: 10rpx;
+  font-weight: 400;
+}
+

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

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

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.wxss

@@ -10,6 +10,5 @@
   width: 100%;
   display: flex;
   flex-direction: column;
-  background-color: #fff;
 }