卡密取消地址

src/packageGoods/order/settlement.vue

@@ -19,7 +19,8 @@
 		</view>
 		<!-- #endif -->
 		<view class="settlement">
-			<view class="settlement-address">
+			<!-- 卡密商品不需要地址 -->
+			<view class="settlement-address" v-if="goodsType!='2'">
 				<!-- 选择地址、获取微信地址 -->
 				<view class="flex settlement-address-top" v-if="info.addr !== null">
 					<view class="settlement-address-top__left">配送地址</view>
@@ -166,6 +167,7 @@
 				payment: '',
 				authShow: false,
 				pagesNum: '',
+				goodsType:'',
 			}
 		},
 		onLoad(opthios) {
@@ -182,6 +184,9 @@
 				}
 				this.getDetail()
 			}
+			if(opthios.goodsType){
+				this.goodsType = opthios.goodsType;
+			}
 		},
 		onShow() {
 			this.pagesNum = getCurrentPages().length
@@ -190,8 +195,8 @@
 			}
 		},
 		methods: {
-			save() {
-				if (this.info.addr == null) {
+			save() { 
+				if (this.info.addr == null&&this.goodsType!='2') {
 					uni.$u.toast('请先保存配送地址');
 					return
 				}

src/packagePrize/prize/index.vue

@@ -557,8 +557,12 @@
 				});
 				let ids = JSON.stringify(arr.map(item => item.storageId))
 				uni.hideLoading();
+				let goodsType = arr[0].goodsType;
+				// uni.navigateTo({
+				// 	url: `/packageGoods/order/settlement?ids=${ ids }`
+				// }) 
 				uni.navigateTo({
-					url: `/packageGoods/order/settlement?ids=${ ids }`
+					url: `/packageGoods/order/settlement?ids=${ ids }&goodsType=${ goodsType }`
 				})
 			},