积分商城问题修复

scoreShop/detail/index.vue

@@ -7,8 +7,9 @@
 			</view>
 		</template>
 		<template v-else>
-			<image class="top-img" :src="item.goodsImageUrl" mode="aspectFit"></image>
-
+			<view @click="prveImg(item.goodsImageUrl)">
+				<image class="top-img" :src="item.goodsImageUrl" mode="aspectFill" ></image>
+			</view>
 		</template>
 		<view class="sku">
 			<view>
@@ -75,11 +76,16 @@
 			<view class="popup-content">
 				<view class="popup-content-top">
 					<text class="color-666">领取方式</text>
-					<text class="u-m-l-16">需前往店铺自行兑换领取</text>
+					<text class="u-m-l-16" v-if="item.goodsCategory=='优惠券'">系统发放</text>
+					<text class="u-m-l-16" v-else>店内自取</text>
 				</view>
 				<view class="goods-info">
 					<view class="u-flex">
-						<image class="cover" :src="item.goodsImageUrl"></image>
+						
+						<image class="cover" v-if="item.goodsCategory!='优惠券'" :src="item.goodsImageUrl"></image>
+						<view v-else class="cover bg-fff">
+							<couponIcon :item="item.couponInfo" typeKey="couponType" />
+						</view>
 						<view class="u-flex u-flex-1 u-row-between u-p-l-16 u-col-center">
 							<view>
 								<view class="u-font-32 font-bold">{{item.goodsName}}</view>
@@ -116,6 +122,7 @@
 	} from '@/utils/uniapp.js'
 	import modal from "@/scoreShop/components/modal.vue";
 	import * as pointGoodsApi from "@/common/api/order/pointGoods.js";
+	import couponIcon from "@/components/coupon-icon/index";
 	import {
 		pay
 	} from '@/utils/pay.js'
@@ -125,6 +132,12 @@
 	const modalData = reactive({
 		show: false,
 	});
+	
+	function prveImg(url){
+		uni.previewImage({
+			urls:[url]
+		})
+	}
 
 	const popupData = reactive({
 		show: false,
@@ -238,13 +251,13 @@
 		}
 		const type = item.couponInfo.couponType
 		if (type == 1) {
-			return item.couponInfo.discountAmount + '元代金券' + ' ' + `(满${item.fullAmount}可用)`
+			return item.couponInfo.discountAmount + '元代金券' + ' ' + `(满${item.couponInfo.fullAmount}可用)`
 		}
 		if (type == 2) {
-			return item.couponInfo.discountNum + '件商品兑换' + ' ' + `(满${item.fullAmount}可用)`
+			return item.couponInfo.discountNum + '件商品兑换' + ' ' + `(满${item.couponInfo.fullAmount}可用)`
 		}
 		if (type == 3) {
-			return item.couponInfo.discountRate / 10 + '折' + ' ' + `(满${item.fullAmount}可用)`
+			return item.couponInfo.discountRate / 10 + '折' + ' ' + `(满${item.couponInfo.fullAmount}可用)`
 		}
 		if (type == 4) {
 			return '第二件半价券'
@@ -447,7 +460,11 @@
 				height: 184rpx;
 				border-radius: 16rpx;
 				background: #d9d9d9;
+				&.bg-fff{
+					background-color: #fff;
+				}
 			}
+			
 		}
 
 		.bottom {
@@ -467,4 +484,7 @@
 			font-size: 700;
 		}
 	}
+	.w-full{
+		width: 100%;
+	}
 </style>