瀏覽代碼

improve: vip图标及跳转

From-wh 2 年之前
父節點
當前提交
23d35933e7

+ 4 - 2
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;
 	}
 

+ 36 - 31
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:
+					});
+					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/users/user_invoice_list/index?from=invoice_form'
-									});
-									break;
-							}
-
+										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,