古老功能测试优化

pages/invoiceManagement/applyBilling.vue

@@ -10,7 +10,27 @@
 		</view>
 		<!-- 支付详情 -->
 		<view class="payment-infos">
-			<view class="item"  v-if="false" >
+			<view class="item">
+				<view class="item-title">
+					承租方
+				</view>
+				<view class="item-value">
+					{{detail.tenantName}}
+				</view>
+				
+			</view>
+			
+			<view class="item"  >
+				<view class="item-title">
+					抬头类型
+				</view>
+				<view class="item-value">
+					{{detail.headerType=='1'?'企业单位':''}}{{detail.headerType=='2'?'个人/非企业单位':''}}
+					
+				</view>
+				
+			</view>
+			<view class="item"  v-if="detail.headerType=='1'" >
 				<view class="item-title">
 					发票类型
 				</view>
@@ -20,12 +40,13 @@
 				</view>
 				
 			</view>
+			
 			<view class="item">
 				<view class="item-title">
 					发票抬头
 				</view>
 				<view class="item-value">
-					联通公司
+					{{detail.title}}
 				</view>
 				
 			</view>
@@ -34,15 +55,23 @@
 					发票金额
 				</view>
 				<view class="item-value">
-					1000.00元
+					{{detail.amount}}元
+				</view>
+				
+			</view>
+			<view class="item">
+				<view class="item-title">
+					申请时间
+				</view>
+				<view class="item-value">
+					{{detail.createTime}}
 				</view>
 				
 			</view>
-			
 			
 		</view>
 		<!-- 按钮 -->
-		<view class="btns">
+		<view class="btns" v-if="false">
 			<button class="btn1">完成</button>
 			<button class="btn2"  >查看发票详情</button>
 		</view>
@@ -80,7 +109,7 @@
 					id:this.id
 				}).then((response) => {
 					uni.hideLoading();
-					
+					this.detail=response.data.invoiceInfo
 				}).catch(error => {
 					
 					uni.hideLoading();

pages/invoiceManagement/invoiceDetails.vue

@@ -13,19 +13,7 @@
 					开票中
 				</view>
 				<view class="details">
-					<view class="item">
-						<view class="item-title">
-							发票类型
-							
-						</view>
-						<view class="item-value">
-							{{detail.type=='1'?'增值税专票':''}}{{detail.type=='2'?'增值税普票':''}}
-							
-							
-							
-
-						</view>
-					</view>
+					
 					<view class="item">
 						<view class="item-title">
 							抬头类型
@@ -37,6 +25,16 @@
 								
 								
 								
+						</view>
+					</view>
+					<view class="item" v-if="detail.headerType=='1'">
+						<view class="item-title">
+							发票类型
+							
+						</view>
+						<view class="item-value">
+							{{detail.type=='1'?'增值税专票':''}}{{detail.type=='2'?'增值税普票':''}}
+							
 						</view>
 					</view>
 					<view class="item">

pages/invoiceManagement/invoiceManagement.vue

@@ -48,7 +48,7 @@
 						<view class="text">
 							{{item.title}}
 						</view>
-						<view class="state state2" :class="{
+						<view  :class="{
 							state:!item.image,
 							state2:item.image,
 						}" >
@@ -67,6 +67,15 @@
 						</view>
 					</view>
 					<view class="item">
+						<view class="name">
+							抬头类型
+						</view>
+						<view class="value">
+							
+							{{item.headerType=='1'?'企业单位':''}}{{item.headerType=='2'?'个人/非企业单位':''}}
+						</view>
+					</view>
+					<view class="item" v-if="item.headerType=='1'" >
 						<view class="name">
 							发票类型
 						</view>
@@ -186,6 +195,18 @@
 		},
 		onLoad() {
 			this.getInvoiceList1()
+		},
+		onReachBottom() {
+			if(this.current==1){
+				var list=this.list2;
+				var recordsTotal=this.recordsTotal2;
+				
+				if (list.length < recordsTotal) {			
+					this.myLoadmore();
+				}
+			}
+			
+			
 		},
 		computed:{
 			sumCollectionMoney(){
@@ -218,6 +239,12 @@
 			}
 		},
 		methods: {
+			myLoadmore() {
+				this.pageIndex+=1;
+				
+				
+				this.getInvoiceList2()
+			},
 			submit(){
 				// var sz=[];
 				
@@ -336,7 +363,7 @@
 						list = res.data.data;
 					} else {
 						list = [
-							...list,
+							...this.list2,
 							...res.data.data
 						];
 					}
@@ -364,15 +391,31 @@
 	}
 	// 标签
 	.tabs{
+		    position: fixed;
 		background-color: #fff;
+		    width: 100%;
 		/deep/.u-tabs{
 			width: 400rpx;
 			margin: 0 auto;
 		}
 	}
+	.invoiced,.not-invioced{
+		margin-top: 100rpx;
+	}
+	.not-invioced{
+		
+		    padding-bottom: 160rpx;
+			
+	}
+	.not-invioced{
+		.invoice-item{
+			width: 100%;
+		}
+	}
+	
 	// 发票
 	.invoice-item{
-		width: 100%;
+		
 		margin: 24rpx;
 		padding: 32rpx;
 		background-color: #fff;

pages/invoiceManagement/issueInvoice.vue

@@ -27,7 +27,8 @@
 				</view>
 			</view>
 
-			<view class="item">
+		 
+			<view class="item" >
 				<view class="title">
 					抬头类型
 				</view>
@@ -81,7 +82,7 @@
 		</view>
 		<!-- 底部 -->
 		<view class="bottom">
-			<button class="btn" @click="show=true">提交申请</button>
+			<button class="btn" @click="showBtn">提交申请</button>
 		</view>
 		<!-- 弹窗 -->
 		<view class="modal">
@@ -94,16 +95,14 @@
 					<p>发票开具成功后不可撤销</p>
 					<p>请您仔细核对开票信息!</p>
 				</view>
-				<view class="infos">
-					<view class="item">
+				<view class="infos" >
+					<view class="item" v-if="false" >
 						<view class="title">
 							发票项目
 						</view>
 						<view class="value">
 							2024年1月扣费发票
 
-
-
 						</view>
 					</view>
 					<view class="item">
@@ -111,7 +110,7 @@
 							发票抬头
 						</view>
 						<view class="value">
-							联通公司
+							{{invoiceType.title}}
 
 
 						</view>
@@ -121,7 +120,7 @@
 							发票金额
 						</view>
 						<view class="value">
-							1000.00元
+							{{totalPrice}}元
 						</view>
 					</view>
 					<view class="hint">
@@ -162,6 +161,17 @@
 			}
 		},
 		methods: {
+			showBtn(){
+				if (!(this.invoiceType&&this.invoiceType.id)) {
+					uni.showToast({
+						icon: "none",
+						title: "请选择发票抬头",
+						
+					})
+					return;
+				}
+				this.show=true
+			},
 			submit(){
 				if (!(this.invoiceType&&this.invoiceType.id)) {
 					uni.showToast({
@@ -203,7 +213,12 @@
 				}).then((response) => {
 					uni.hideLoading();
 					//this.list=response.data.data;
-					this.invoiceType=response.data.invoiceType;
+					if(response.data.invoiceType){
+						this.invoiceType=response.data.invoiceType;
+					}else{
+						this.invoiceType={}
+					}
+					
 					this.totalPrice=response.data.totalPrice;
 				}).catch(error => {
 					uni.hideLoading();

pages/invoiceManagement/selectTitleManagement.vue

@@ -69,6 +69,9 @@
 			}
 		},
 		onLoad() {
+			
+		},
+		onShow(){
 			this.getInvoiceList()
 		},
 		methods: {