From 23d35933e71e267a36fb8543237f6504f76ff0c5 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 27 Mar 2023 09:07:59 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20vip=E5=9B=BE=E6=A0=87=E5=8F=8A?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-app/pages/goods/goods_list/index.vue  |  6 +-
 .../pages/users/user_invoice_form/index.vue   | 69 ++++++++++---------
 2 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/template/uni-app/pages/goods/goods_list/index.vue b/template/uni-app/pages/goods/goods_list/index.vue
index 99ba59f93..f2dc91f60 100644
--- a/template/uni-app/pages/goods/goods_list/index.vue
+++ b/template/uni-app/pages/goods/goods_list/index.vue
@@ -409,11 +409,13 @@
 		font-size: 24rpx;
 		color: #282828;
 		font-weight: bold;
+		display: flex;
+		align-items: center;
 	}
 
 	.productList .list .item .text .vip .vip-money image {
-		width: 46rpx;
-		height: 21rpx;
+		width: 64rpx;
+		height: 26rpx;
 		margin-left: 4rpx;
 	}
 
diff --git a/template/uni-app/pages/users/user_invoice_form/index.vue b/template/uni-app/pages/users/user_invoice_form/index.vue
index b861ce550..301f182d0 100644
--- a/template/uni-app/pages/users/user_invoice_form/index.vue
+++ b/template/uni-app/pages/users/user_invoice_form/index.vue
@@ -147,6 +147,10 @@
 				}
 			}
 		},
+		onHide() {
+			console.log('hide')
+			this.from = ''
+		},
 		onLoad(options) {
 			if (options.id) uni.setNavigationBarTitle({
 				title: '编辑发票'
@@ -377,39 +381,40 @@
 					uni.showToast({
 						title: res.msg,
 						icon: 'success',
-						success() {
-							switch (that.from) {
-								case 'order_confirm':
-									if (that.id) {
-										uni.navigateTo({
-											url: `/pages/goods/order_confirm/index${that.urlQuery}&invoice_id=${that.id}&invoice_type=${formData.type}`
-										})
-									} else {
-										uni.navigateTo({
-											url: `/pages/goods/order_confirm/index${that.urlQuery}&invoice_id=${res.data.id}&invoice_type=${formData.type}`
-										})
-									}
-									break;
-								case 'order_details':
-									if (that.id) {
-										uni.navigateTo({
-											url: `/pages/goods/order_details/index?order_id=${that.order_id}&invoice_id=${that.id}`
-										})
-									} else {
-										uni.navigateTo({
-											url: `/pages/goods/order_details/index?order_id=${that.order_id}&invoice_id=${res.data.id}`
-										})
-									}
-									break;
-								default:
-									uni.navigateTo({
-										url: '/pages/users/user_invoice_list/index?from=invoice_form'
-									});
-									break;
-							}
-
-						}
 					});
+					setTimeout(e => {
+						switch (that.from) {
+							case 'order_confirm':
+								if (that.id) {
+									console.log(that.from, that.id, that.urlQuery, formData.type);
+									uni.navigateTo({
+										url: `/pages/goods/order_confirm/index${that.urlQuery}&invoice_id=${that.id}&invoice_type=${formData.type}`
+									})
+								} else {
+									console.log(that.from, that.id, '2');
+									uni.navigateTo({
+										url: `/pages/goods/order_confirm/index${that.urlQuery}&invoice_id=${res.data.id}&invoice_type=${formData.type}`
+									})
+								}
+								break;
+							case 'order_details':
+								if (that.id) {
+									uni.navigateTo({
+										url: `/pages/goods/order_details/index?order_id=${that.order_id}&invoice_id=${that.id}`
+									})
+								} else {
+									uni.navigateTo({
+										url: `/pages/goods/order_details/index?order_id=${that.order_id}&invoice_id=${res.data.id}`
+									})
+								}
+								break;
+							default:
+								uni.navigateTo({
+									url: '/pages/users/user_invoice_list/index?from=invoice_form'
+								});
+								break;
+						}
+					}, 1000)
 				}).catch(err => {
 					uni.showToast({
 						title: err,