Browse Source

优惠券价格样式大小调整,我的盲票列表兑奖跳转线下票流程,优惠券使用说明样式调整

DELL 3 years ago
parent
commit
6c5bf3daef

+ 1 - 1
src/packagePrize/address/index.vue

@@ -79,7 +79,7 @@
 					res => {
 						uni.hideLoading();
 						if (res.code == 0) {
-							this.list = res.rows
+							this.list = this.list.concat(res.rows)
 							this.list.forEach(item=>{
 								item.addressAll = `${item.province} ${item.city} ${item.area} ${item.address}`
 							})

+ 10 - 4
src/packagePrize/coupon/detail.vue

@@ -36,7 +36,7 @@
 							v-if="info.type && JSON.parse(info.type).value == 2 && info.useArea && JSON.parse(info.useArea).value == 1">
 							适用范围:点击查看</view>
 						<view class="desc"
-							v-else-if="info.type && JSON.parse(info.type).value == 2 && info.useArea && JSON.parse(info.useArea).value == 2">
+							v-else-if="info.type && JSON.parse(info.type).value == 2 && info.useArea && JSON.parse(info.useArea).value == 0">
 							适用范围:点击查看</view>
 						<view class="desc" v-else>适用范围:{{ info.useAreaDesc || '-' }}</view>
 						<view class="desc">使用期限:{{ $parseTime(info.validStart, '{y}.{m}.{d}') }} ~
@@ -62,10 +62,15 @@
 				<view class="txt detail">共{{info.channelTotal}}家门店可使用 <view class="detail-address" @click="toAddress">立即查看</view>
 				</view>
 			</view>
+			<view class="detail-explain" v-if="info && info.useArea && JSON.parse(info.useArea).value  == 0">
+				<view class="txt">使用范围:</view>
+				<view class="txt detail">共{{info.channelTotal}}家门店可使用 <view class="detail-address" @click="toAddress">立即查看</view>
+				</view>
+			</view>
 			<!-- 说明 -->
 			<view class="detail-explain">
 				<view class="txt">使用说明:</view>
-				<view class="txt detail">{{ info.description }}</view>
+				<view class="txt detail" v-html="info.description" style="white-space: pre-wrap;"></view>
 			</view>
 		</view>
 	</view>
@@ -96,6 +101,7 @@
 					uni.hideLoading();
 					if (res.code == 0) {
 						this.info = res.data
+						this.info.description = this.info.description.replaceAll('\n','<br/>')
 						setTimeout(() => {
 							uni.hideLoading();
 							this.couponQrCode()
@@ -127,6 +133,7 @@
 </script>
 
 <style lang="scss" scoped>
+	
 	.detail {
 		margin: 20rpx;
 		background-color: #FFFFFF;
@@ -158,8 +165,7 @@
 						color: #fff;
 
 						text:first-child {
-							font-size: 70rpx;
-							padding-right: 20rpx;
+							font-size: 45rpx;
 						}
 
 						text:last-child {

+ 2 - 3
src/packagePrize/prize/index.vue

@@ -106,7 +106,7 @@
 						<view class="content-right flex">
 							<view class="title ells-one">{{ item.title }}</view>
 							<view class="desc" v-if="item.type && JSON.parse(item.type).value == 2 && item.useArea && JSON.parse(item.useArea).value == 1">适用范围:点击查看</view>
-							<view class="desc" v-else-if="item.type && JSON.parse(item.type).value == 2 && item.useArea && JSON.parse(item.useArea).value == 2">适用范围:点击查看</view>
+							<view class="desc" v-else-if="item.type && JSON.parse(item.type).value == 2 && item.useArea && JSON.parse(item.useArea).value == 0">适用范围:点击查看</view>
 							<view class="desc" v-else>适用范围:{{ item.useAreaDesc || '-' }}</view>
 							<view class="desc">使用期限:{{ $parseTime(item.validStart, '{y}.{m}.{d}') }} ~ {{ $parseTime(item.validEnd, '{y}.{m}.{d}') }}</view>
 						</view>
@@ -740,8 +740,7 @@
 							color: #fff;
 							
 							text:first-child {
-								font-size: 70rpx;
-								padding-right: 20rpx;
+								font-size: 45rpx;
 							}
 							
 							text:last-child {

+ 15 - 13
src/packagePrize/ticket/index.vue

@@ -107,19 +107,21 @@
 			},
 
 			toChoice(item) {
-				let type = item.type && JSON.parse(item.type).value
-				
-				if(type == 'offline') {
-					uni.navigateTo({
-						url: `/packagePrize/choice/index?id=${ item.ticketId }&type=offline`
-					})
-				} else if (type == 'online') {
-					uni.navigateTo({
-						url: `/packagePrize/rolling/index?ticketId=${ item.ticketId }&isTry=0`
-					})
-				} else {
-					uni.$u.toast('请联系客服')
-				}
+				uni.navigateTo({
+					url: `/packagePrize/choice/index?id=${ item.ticketId }`
+				})
+				// let type = item.type && JSON.parse(item.type).value
+				// if(type == 'offline') {
+				// 	uni.navigateTo({
+				// 		url: `/packagePrize/choice/index?id=${ item.ticketId }&type=offline`
+				// 	})
+				// } else if (type == 'online') {
+				// 	uni.navigateTo({
+				// 		url: `/packagePrize/rolling/index?ticketId=${ item.ticketId }&isTry=0`
+				// 	})
+				// } else {
+				// 	uni.$u.toast('请联系客服')
+				// }
 			},
 
 			changeTab(e) {