From d223d481252d9ec712b5caf802bd4aa4e3185ca1 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 26 Mar 2024 08:36:11 +0800
Subject: [PATCH] 11111111

---
 common/request.api.js         |  3 +++
 pages/home/myCellar.vue       | 30 ++++++++++++++++++++++++-
 pages/records/orderDetail.vue | 42 ++++++++++++++++++++++++++++++-----
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/common/request.api.js b/common/request.api.js
index 705a304..1e75e93 100644
--- a/common/request.api.js
+++ b/common/request.api.js
@@ -110,6 +110,9 @@ export default {
 	orderDetails: (params = {}) => request.get("/empsreservoorder/OrderDetails/" + params, params, {}, {}, true),
 	// 我的 订单详情 修改订单状态
 	changePayState: (params = {}) => request.get("/empsreservoorder/changePayState/" + params, params, {}, {}, true),
+	// 订单发票获取授权页链接
+	wxElectronicInvoice: (params = {}) => request.post("/empsreservoorder/wxElectronicInvoice", params, {}, {}),
+	
 	// 查询发票列表
 	getInvoiceList: (params = {}) => request.get("/customerinvoice/listInvoice/" + params, params),
 	// 新增发票
diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue
index 03170aa..6df223d 100644
--- a/pages/home/myCellar.vue
+++ b/pages/home/myCellar.vue
@@ -391,6 +391,29 @@
 		</view>
 
 
+		<!-- 结束储存弹框 -->
+		<view class="model" catchtouchmove='preventTouchMove' v-if='showModal5'></view>
+		<view class="modalDlg2" catchtouchmove='preventTouchMove' v-if='showModal5'>
+
+			<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;
+				 width: 80%; border-radius: 20px; background: linear-gradient(#FFF4E4, #fff);">
+
+				<image src="../../static/notices.png" style="width: 60px;height: 60px; margin-top: -30px;"
+					mode="scaleToFill"></image>
+
+				<text
+					style="margin-top: 16px;font-size: 18px;color: #101010;font-weight: 600;font-family: sans-serif;">重要提醒</text>
+				<text
+					style="margin-top: 12px;font-size: 14px;color: #333;padding-left: 30px;padding-right: 30px;">您好，云菜窖菜品提货截止日为2024年3月31日，过期后菜品将自动失效，请尽快进行预约提货</text>
+
+				<text style="margin-top: 25px;margin-bottom: 20px;border: 1px #FF9900 solid; color: #FF9900;font-size: 14px;
+					border-radius: 20px;height: 40px; line-height: 40px;padding-left: 30px;padding-right: 30px;"
+					@click="colseDialog5()">我知道了</text>
+
+			</view>
+
+
+		</view>
 
 
 	</view>
@@ -410,6 +433,7 @@
 				showModal2: false,
 				showModal3: false,
 				showModal4: false,
+				showModal5: false,
 				scrollHeight: "",
 				scrollLeftTop: "0",
 				scrollRightTop: "0",
@@ -480,7 +504,6 @@
 			if (getApp().globalData.mobile == '')
 				this.showModal1 = true
 
-
 			console.log("mobile>>>", getApp().globalData.mobile);
 
 			this.request()
@@ -488,6 +511,8 @@
 			this.page.count = 0
 		},
 		onLoad(options) {
+			
+				this.showModal5 = true
 
 			this.shareSid = options.shareSid
 			this.orderSid = options.orderSid
@@ -772,6 +797,9 @@
 			colseDialog4() {
 				this.showModal4 = false
 			},
+			colseDialog5() {
+				this.showModal5 = false
+			},
 			onShareAppMessage: function(res) {
 
 				_this.showModal3 = false
diff --git a/pages/records/orderDetail.vue b/pages/records/orderDetail.vue
index 09865c5..a390218 100644
--- a/pages/records/orderDetail.vue
+++ b/pages/records/orderDetail.vue
@@ -138,7 +138,7 @@
 			</view>
 		</loading-state>
 
-		<view v-if="data.payStatus=='4'&&data.invoiceStatus>'2'"
+		<view
 			style="position: absolute; bottom: 0px; display: flex;flex-direction: row;width: 100%;align-items: center; 
 		box-sizing: border-box; padding-left: 16px;padding-right: 16px;background: #fff; height: 8vh;border-top: 1px solid #EFEFEF;">
 
@@ -147,11 +147,11 @@
 				<text style="font-size: 16px;color: #666;  border: 1px #D3D3D3 solid; height: 5vh;line-height: 5vh;
 						padding: 0px 20px;border-radius: 20px;" @click="makeInvoice(data.sid)" v-if="data.invoiceStatus=='0'">开具发票</text>
 				<text style="font-size: 16px;color: #666;  border: 1px #D3D3D3 solid; height: 5vh;line-height: 5vh;
-								padding: 0px 20px;border-radius: 20px;" v-if="data.invoiceStatus=='1'">发票审核中</text>
+								padding: 0px 20px;border-radius: 20px;" v-if="data.invoiceStatus=='1'">发票开具中</text>
 			</view>
 		</view>
 
-		<view v-if="data.payStatus=='4'&&data.invoiceStatus=='3'"
+		<!-- 	<view v-if="data.payStatus=='4'&&data.invoiceStatus=='3'"
 			style="position: absolute; bottom: 0px; display: flex;flex-direction: row;width: 100%;align-items: center; 
 		box-sizing: border-box; padding-left: 16px;padding-right: 16px;background: #fff; height: 8vh;border-top: 1px solid #EFEFEF;">
 
@@ -160,7 +160,7 @@
 				<text style="font-size: 16px;color: #666;  border: 1px #D3D3D3 solid; height: 5vh;line-height: 5vh;
 						padding: 0px 20px;border-radius: 20px;" @click="makeInvoice(data.sid)">重新开票</text>
 			</view>
-		</view>
+		</view> -->
 
 		<view v-if="data.payStatus=='2'"
 			style="position: absolute; bottom: 0px; display: flex;flex-direction: row;width: 100%;align-items: center; 
@@ -279,7 +279,39 @@
 
 				})
 			},
-			makeInvoice(sid) {
+			makeInvoice() {
+				// let _this = this
+
+				// var params = {
+				// 	outTradeNo: _this.data.outTradeNo,
+				// 	totalTee: _this.data.totalTee,
+				// 	// phone: getApp().globalData.mobile,
+				// }
+
+				// console.log("makeInvoice", params);
+
+				// _this.$api.wxElectronicInvoice(params).then((resp) => {
+
+				// 	console.log("wxElectronicInvoice", resp);
+
+				// 	wx.navigateToMiniProgram({
+				// 		appId: resp.appid,
+				// 		path: resp.auth_url,
+				// 		success(res) {
+				// 			console.log('navigateToMiniProgram success:', res)
+				// 		},
+				// 		fail(error) {
+				// 			console.log('navigateToMiniProgram fail:', error)
+				// 		},
+				// 		complete(res) {
+				// 			console.log('navigateToMiniProgram complete:', res)
+				// 		}
+				// 	})
+
+				// }).catch(e => {
+
+				// })
+
 
 				uni.navigateTo({
 					url: "/pages/me/makeInvoice?sid=" + sid