瀏覽代碼

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/qhsxKx-mini-html into deploy

lilei 4 年之前
父節點
當前提交
a30d1de3fb
共有 2 個文件被更改,包括 15 次插入4 次删除
  1. 1 0
      pages/coupon/couponTpl.vue
  2. 14 4
      pages/coupon/getCoupon/getCoupon.vue

+ 1 - 0
pages/coupon/couponTpl.vue

@@ -104,6 +104,7 @@
 			}
 			.couponRuleDesc{
 				width: 100%;
+				padding-right: 30rpx;
 				word-wrap: break-word;
 			}
 			.icon{

+ 14 - 4
pages/coupon/getCoupon/getCoupon.vue

@@ -4,15 +4,18 @@
 			<view class="coupon-head">
 				<view class="coupon-sel"></view>
 				<view class="coupon-title">
-					<view class="coupon-title-1">{{couponInfo?couponInfo.title:''}}</view>
+					<view class="coupon-title-1">{{couponInfo.title}}</view>
 				</view>
 				<view class="coupon-price">
-					¥<text>{{couponInfo?couponInfo.subAmount:''}}</text>
+					¥<text>{{couponInfo.subAmount}}</text>
 				</view>
 			</view>
 			<view class="coupon-desc">
-				<view><u-icon class="icon" size="30" name="clock"></u-icon> 有效期:{{couponInfo?couponInfo.validDateStr:''}}</view>
-				<view><u-icon class="icon" size="30" name="info-circle"></u-icon> {{couponInfo && couponInfo.ruleDesc?couponInfo.ruleDesc:''}}</view>
+				<view><u-icon class="icon" size="30" name="clock"></u-icon> 有效期:{{couponInfo.validDateStr}}</view>
+				<view>
+					<u-icon class="icon" size="30" name="info-circle"></u-icon>
+					<text class="couponRuleDesc">{{couponInfo.ruleDesc}}</text>
+				</view>
 			</view>
 		</view>
 		<u-empty :text="noDataText" v-if="!couponInfo && status!='loading'" mode="coupon"></u-empty>
@@ -158,6 +161,13 @@
 			border-bottom-right-radius: 10rpx;
 			>view{
 				padding: 5rpx 0;
+				display: flex;
+				align-items: flex-start;
+			}
+			.couponRuleDesc{
+				width: 100%;
+				padding-right: 30rpx;
+				word-wrap: break-word;
 			}
 			.icon{
 				margin-right: 10rpx;