From 50fb92ff7b00d713caac335c761287534da59dbe Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 17 Apr 2024 09:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/invoice/editset.vue | 17 +++++++++--------
 pages/invoice/index.vue   |  2 +-
 pages/order/detail.vue    |  4 ++--
 pages/order/index.vue     | 31 ++++++++++++++++++-------------
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/pages/invoice/editset.vue b/pages/invoice/editset.vue
index 77703ae..f8928b4 100644
--- a/pages/invoice/editset.vue
+++ b/pages/invoice/editset.vue
@@ -13,7 +13,7 @@
 					<view class="l">发票类型：</view>
 					<view class="r">
 						<picker :value="index" :range="array" @change="bindPickerChange">
-							<view class="lx" style="color: #888;" v-if="index == null">请选择发票类型</view>
+							<view class="lx" style="color: #888;" v-if="index == -1">请选择发票类型</view>
 							<view class="lx" v-else>{{ array[index] }}</view>
 						</picker>
 					</view>
@@ -87,7 +87,7 @@
 				content: "确认您的发票信息无误后再提交",
 				show: true,
 				toggleIndex: true,
-				index: null,
+				index: -1,
 				array: ['普通增值税发票'],
 				tabIndex: 1,
 				sourcePage: 0,
@@ -109,7 +109,7 @@
 		onLoad(op) {
 			if (op.detailObj && op.detailObj != 'null') {
 				let end = JSON.parse(op.detailObj)
-				this.index = 0
+				this.index = -1
 				if (end.source == 1) {
 					this.tabIndex = 1
 				} else {
@@ -130,7 +130,8 @@
 			},
 			async addInvoice(canReset = false) {
 				const app = this
-				if (app.index == null || !app.obj.source) {
+				console.log(app.index,app.obj.source)
+				if (app.index == -1) {
 					uni.showToast({
 						title: '请选择发票类型',
 						icon: 'none',
@@ -164,7 +165,7 @@
 						icon: 'none',
 						duration: 2000
 					})
-					app.index = null
+					app.index = -1
 					app.tabIndex = 1
 					app.obj = app.$options.data().obj;
 					uni.redirectTo({
@@ -174,7 +175,7 @@
 			},
 			async editeInvoice() {
 				const app = this
-				if (app.index == null || !app.obj.source) {
+				if (app.index == -1) {
 					uni.showToast({
 						title: '请选择发票类型',
 						icon: 'none',
@@ -192,7 +193,7 @@
 				}
 				if (app.tabIndex == 2 && !app.obj.duty_no) {
 					uni.showToast({
-						title: '请输入抬头',
+						title: '请输入纳税人识别号',
 						icon: 'none',
 						duration: 2000
 					})
@@ -208,7 +209,7 @@
 						icon: 'none',
 						duration: 2000
 					})
-					app.index = null
+					app.index = -1
 					app.tabIndex = 1
 					app.obj = app.$options.data().obj;
 					uni.redirectTo({
diff --git a/pages/invoice/index.vue b/pages/invoice/index.vue
index bf863aa..633b71d 100644
--- a/pages/invoice/index.vue
+++ b/pages/invoice/index.vue
@@ -58,7 +58,7 @@
 					content: '确认删除了吗？',
 					success(o) {
 						if (o.confirm) {
-							InvoiceApi.invoicingDel(Id)
+							InvoiceApi.invoicingDelNew({id:Id})
 								.then(result => {
 									// 显示成功信息
 									app.$success(result.message)
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 253de46..8be0c1a 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -265,7 +265,7 @@
 		</view>
 		<view v-if="menushow" class="menuarea">
 			<view class="menulist">
-				<view class="" @click="onInvoicing(order.order_id)"
+				<view class="" @click="onInvoicing(order.order_id,order)"
 					v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
 					申请开票
 				</view>
@@ -581,7 +581,7 @@
 				})
 			},
 			// 点击去开票
-			onInvoicing(orderId) {
+			onInvoicing(orderId,order) {
 				uni.setStorageSync("orderInfor", order);
 				uni.navigateTo({
 					url: '/pages/invoice/edit?orderId=' + orderId
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 5bef5d9..198a1b0 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -16,7 +16,7 @@
 				</view>
 			</scroll-view>
 		</view>
-	<!-- 	<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="current"
+		<!-- 	<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="current"
 			bar-width="56" bar-height="6" active-color="#3B3B3B" :show-bar='true' :duration="0.2"
 			@change="onChangeTab" /> -->
 		<!-- 订单列表 -->
@@ -24,7 +24,8 @@
 			<view class="item" v-for="(item,index) in list" v-if="list.length>0">
 				<view class="hd">
 					<view class="a">
-						<image class="icon" v-if="item.storeInfo && item.storeInfo.image_url" :src="item.storeInfo.image_url"></image>
+						<image class="icon" v-if="item.storeInfo && item.storeInfo.image_url"
+							:src="item.storeInfo.image_url"></image>
 						{{item.storeInfo.store_name}}
 					</view>
 					<view class="b"
@@ -73,13 +74,15 @@
 						v-if="item.order_status == OrderStatusEnum.COMPLETED.value || (item.pay_status == PayStatusEnum.PENDING.value&&item.order_status == OrderStatusEnum.NORMAL.value)">
 						更多</view>
 					<view class="b">
-						<view class="n" v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value"
+						<view class="n"
+							v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value"
 							@click="onExtractQRCode(item.order_id)">核销码
 						</view>
 						<view class="n"
 							v-if="item.pay_status == PayStatusEnum.PENDING.value && item.order_status == OrderStatusEnum.NORMAL.value"
 							@click="onPay(item.order_id)">立即支付</view>
-						<view class="n" v-if="item.delivery_type == DeliveryTypeEnum.EXPRESS.value&&item.delivery_status == DeliveryStatusEnum.DELIVERED.value"
+						<view class="n"
+							v-if="item.delivery_type == DeliveryTypeEnum.EXPRESS.value&&item.delivery_status == DeliveryStatusEnum.DELIVERED.value"
 							@click="onLogistics(item.order_id)">查看物流
 						</view>
 						<view class="n n-1"
@@ -257,7 +260,7 @@
 			}
 		},
 		methods: {
-			meKone(){
+			meKone() {
 				this.cdDia = false
 			},
 			confirm() {
@@ -266,12 +269,13 @@
 				app.getOrderList()
 			},
 			changeMenu(index) {
-				let idList = []
-				this.list.forEach(item => {
-					item.menushow = false;
-					idList.push(item.response.data.fileInfo.file_id)
+				this.list.forEach((item, ind) => {
+					if (ind == index) {
+						item.menushow = item.menushow == false ? true : false
+					} else {
+						item.menushow = false;
+					}
 				});
-				this.list[index].menushow = !this.list[index].menushow
 			},
 			toggleImage() {
 				this.isToggle = !this.isToggle
@@ -282,7 +286,6 @@
 				if (options.dataType) {
 					const index = app.tabs.findIndex(item => item.value == options.dataType)
 					app.current = index > -1 ? index : 0
-					console.log(app.current, 'KKKKKKK')
 				}
 			},
 
@@ -315,7 +318,7 @@
 			},
 
 			// 切换标签项
-			onChangeTab(item,index) {
+			onChangeTab(item, index) {
 				const app = this
 				app.list = []
 				// 设置当前选中的标签
@@ -498,6 +501,7 @@
 		white-space: nowrap;
 		width: 100%;
 		height: 100rpx;
+
 		.list {
 			position: relative;
 			display: inline-block;
@@ -539,9 +543,10 @@
 	}
 
 	.order {
-		.order-list{
+		.order-list {
 			margin-top: 20rpx;
 		}
+
 		.receive {
 			width: 100%;
 			background: #F8F8F8;