修改逻辑问题

pages/Invoicing/Invoicing.vue

@@ -52,7 +52,7 @@
 								</uni-forms-item>
 								<view class="form-title">接收方式：</view>
 								<uni-forms-item label="手机号码" required name="name" :label-width="90">
-									<uni-easyinput style="margin-left: 16rpx;" type="text" v-model="list1.phone" :styles="styles" :inputBorder="false" @blur="onInput" placeholder="请输入可用手机号码"></uni-easyinput>
+									<uni-easyinput style="margin-left: 16rpx;" type="text" v-model="list1.phone" :inputBorder="false" @blur="onInput" placeholder="请输入可用手机号码"></uni-easyinput>
 								</uni-forms-item>
 								<uni-forms-item label="邮箱" name="name" :label-width="82" style="margin-left: 40rpx;">
 									<uni-easyinput style="margin-left: 16rpx;" type="text" v-model="list1.email"  :inputBorder="false" placeholder="请输入邮箱" @blur="validateEmail"></uni-easyinput>
@@ -75,13 +75,20 @@
 									</label>
 								</radio-group>
 							</uni-forms-item>
-							<uni-forms-item label="名称" required name="name" :label-width="90">
+							<uni-forms-item label="名称" required name="name" :label-width="90" v-if="list2.type=='0'||!list2.type">
 								<!-- <uni-easyinput type="text" disabled v-model="list2.title" :inputBorder="false" placeholder="请输入抬头名称"></uni-easyinput> -->
 								<view class="list3_box" :style="{color: list2.title ? '#000' : '#999'}">{{list2.title?list2.title:'请输入抬头名称'}}</view>
 							</uni-forms-item>
 							<uni-forms-item label="税号" required name="name" :label-width="90" v-if="list2.type=='0'||!list2.type">
 								<!-- <uni-easyinput type="text" disabled v-model="list2.tax_number"  @blur="taxiD" :inputBorder="false" placeholder="请输入纳税人识别号"></uni-easyinput> -->
-								<view class="list3_box" :style="{color: list2.title ? '#000' : '#999'}">{{list2.tax_number?list2.tax_number:'请输入抬头名称'}}</view>
+								<view class="list3_box" :style="{color: list2.tax_number ? '#000' : '#999'}">{{list2.tax_number?list2.tax_number:'请输入请输入纳税人识别号'}}</view>
+							</uni-forms-item>
+							<uni-forms-item label="姓名" required name="name" :label-width="90" v-if="list2.type=='1'">
+								<!-- <uni-easyinput type="text" disabled v-model="list2.title" :inputBorder="false" placeholder="请输入抬头名称"></uni-easyinput> -->
+								<view class="list3_box" :style="{color: list2.title ? '#000' : '#999'}">{{list2.title?list2.title:'请输入姓名'}}</view>
+							</uni-forms-item>
+							<uni-forms-item label="身份证" name="name" :label-width="90" v-if="list2.type=='1'">
+								<view class="list3_box" :style="{color: list2.tax_number ? '#000' : '#999'}">{{list2.tax_number?list2.tax_number:'请输入纳税人身份证号'}}</view>
 							</uni-forms-item>
 						</uni-forms>
 					</view>
@@ -103,12 +110,18 @@
 									</label>
 								</radio-group>
 							</uni-forms-item>
-							<uni-forms-item label="名称" name="name" :label-width="90">
+							<uni-forms-item label="名称" name="name" :label-width="90" v-if="list2.type=='0'">
 								<view class="list3_box">{{list2.title}}</view>
 							</uni-forms-item>
 							<uni-forms-item label="税号" name="name" :label-width="90" v-if="list2.type=='0'">
 								<view class="list3_box">{{list2.tax_number}}</view>
 							</uni-forms-item>
+							<uni-forms-item label="姓名" name="name" :label-width="90" v-if="list2.type=='1'">
+								<view class="list3_box">{{list2.title}}</view>
+							</uni-forms-item>
+							<uni-forms-item label="身份证" name="name" :label-width="90" v-if="list2.type=='1'">
+								<view class="list3_box">{{list2.tax_number}}</view>
+							</uni-forms-item>
 							<view class="form-title">接收方式</view>
 							<uni-forms-item label="电子邮箱" name="name" :label-width="90">
 								<view class="list3_box" :style="{color: list1.email ? '#000' : '#999'}">{{list1.email?list1.email:'请选择电子邮箱'}}</view>
@@ -143,7 +156,7 @@
 			<view style="height: 280px;">
 				<view class="popup-header">
 					<view @click="cancel" style="color: #999;">取消</view>
-					<view style="color: #488fd2;">更多账期</view>
+					<view style="color: #488fd2;"><!-- 更多账期 --></view>
 					<view @click="confirm" style="color: #646a8e;">确认</view>
 				</view>
 				
@@ -172,7 +185,8 @@
 			const months = []
 			const month = date.getMonth() + 1
 			// 获取年份
-			for (let i = 1990; i <=  year + 1000; i++) {
+			// year + 1000
+			for (let i = 2006; i <=  year; i++) {
 			    years.push(i)
 			}
 			// 获取月份
@@ -194,7 +208,7 @@
 				list1:{
 					project_id: '',//开票项目 
 					pucode: '',//用户编号id
-					merge: '',//合并开票
+					merge: '0',//合并开票
 					expire_time: '',//到期时间
 					email: '',//邮箱
 					phone: ''//手机号
@@ -210,10 +224,6 @@
 					bank_account:''//账户
 				},
 				amount: "",//开票总金额
-				// 开票信息手机号输入颜色
-				styles: {
-					color:"#d5213c"
-				},
 				// 步骤条数据
 				stepsIndex: 0,
 				// 步骤条的名称
@@ -231,7 +241,8 @@
 				// 用户编号数据列表
 				candidates: [],
 				//合并开票
-				mergelist: [{text: '不合并',value: '0'},{text: '合并',value: '1'}],
+				mergelist: [{text: '不合并',value: '0'}],
+				// ,{text: '合并',value: '1'}
 				form1:{},
 				form2:{},
 				text:''
@@ -381,6 +392,19 @@
 			onPickerChange(e){
 				const val = e.detail.value;
 				this.selectedYear = this.years[val[0]];
+				
+				if(this.selectedYear===2006){
+					this.months = []
+					for (let i = 11; i <= 12; i++) {
+					    this.months.push(i)
+					}
+				}else{
+					this.months = []
+					for (let i = 1; i <= 12; i++) {
+					    this.months.push(i)
+					}
+				}
+				
 				this.selectedMonth = this.months[val[1]];
 			},
 			// 确认日期时进行赋值

pages/index/index.vue

@@ -3,8 +3,8 @@
 		<view>
 			<view class="index_title">
 				<view class="d-flex" style="justify-content: flex-end;" @click="toInvoicing">
-					<uni-icons type="plus" size="40rpx" color="#4b93d9"></uni-icons>
+					<uni-icons type="plus" size="40rpx" color="#4b93d9" style="font-weight: bold;"></uni-icons>
-					<view>申请发票</view>
+					<view style="margin-top: 2rpx;">申请发票</view>
 				</view>
 			</view>
 			<view class="index_picker">
@@ -16,10 +16,10 @@
 			:scroll-top="scrollTop" @scroll="scrolltop" refresher-enabled="true" :refresher-triggered="refreshing"
 			:refresher-threshold="50" @refresherrefresh="onRefresh">
 			<view class="index_list" v-for="(item, index) in universityList" :key="index" style="margin-bottom: 20rpx;" @click="toviewinvoice(item.id,item.status)"
-			:class="item.status==='已作废'?'back1':'back2'">
+			:class="item.status=== 4 ?'back1':'back2'">
 				<view class="d-flex jcontent-between">
-					<view class="index_list_size" :class="item.status==='已作废'?'grey1':'black'">{{item.serial_number}}</view>
+					<view class="index_list_size" :class="item.status=== 4 ?'grey1':'black'">{{item.serial_number}}</view>
-					<view class="index_list_color" :class="item.status==='已作废'?'grey2':'blue'">{{item.status=='已申报'?'已申报,点击获取':item.status}}</view>
+					<view class="index_list_color" :class="item.status=== 4 ?'grey2':'blue'">{{item.status==3?item.status_str+',点击获取':item.status_str}}</view>
 				</view>
 				<view class="d-flex jcontent-between">
 					<view>开票项目</view>
@@ -27,7 +27,7 @@
 				</view>
 				<view class="d-flex jcontent-between">
 					<view>开票总金额</view>
-					<view class="Price_color" :class="item.status==='已作废'?'grey3':'green'">￥{{item.amount}}</view>
+					<view class="Price_color" :class="item.status=== 4 ?'grey3':'green'">￥{{item.amount}}</view>
 				</view>
 				<view class="d-flex jcontent-between">
 					<view>抬头类型</view>
@@ -41,9 +41,9 @@
 					<view>申请时间</view>
 					<view>{{item.create_time}}</view>
 				</view>
-				<view :class="item.status==='已申报'?'index_list_box1': item.status==='已作废'?'index_list_box3':''">
+				<view :class="item.status=== 3 ? 'index_list_box1': item.status=== 4 ?'index_list_box3':''">
-					<view :class="item.status==='已申报'?'index_list_box2': item.status==='已作废'?'index_list_box4':''" class="">
+					<view :class="item.status=== 3 ? 'index_list_box2': item.status=== 4 ?'index_list_box4':''" class="">
-						{{item.status==='已申报'?'已申报': item.status==='已作废'?'已作废':''}}
+						{{item.status=== 3 ? item.status_str: item.status=== 4 ? item.status_str :''}}
 					</view>
 				</view>
 			</view>
@@ -322,7 +322,7 @@
 				// }
 			},
 			toviewinvoice(id,status){
-				if(uni.getStorageSync('AccessToken')&&status=='已申报'){
+				if(uni.getStorageSync('AccessToken')&&status==3){
 					uni.navigateTo({
 						url:`/pages/Invoiced/Invoiced?id=${id}`
 					})
@@ -355,7 +355,7 @@
 		.index_title{
 			color: #4b93d9;
 			padding: 40rpx;
-			font-weight: bold;
+			// font-weight: bold;
 		}
 		
 		.index_picker{

unpackage/dist/build/web/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Waterinvoice_uiapp</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0e233154.js></script><script src=./static/js/index.274d89bc.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0e233154.js></script><script src=./static/js/index.7114152c.js></script></body></html>