红包优化

hdPad/src/pages/home/components/hb-select.vue

@@ -3,7 +3,7 @@
 		<!-- Trigger Row -->
         <view class="cell-content" @click="openPopup" v-if="hasAvailableHb">
             <view class="right-content">
-                <text v-if="selectedHb" class="selected-text">-¥{{ selectedHb.amount }}</text>
+                <text v-if="selectedHb" class="selected-text">-¥{{ selectedHb.amount?parseFloat(selectedHb.amount):0 }}</text>
                 <view v-else class="available-tag">
                     <text>有红包可用</text>
                 </view>
@@ -22,16 +22,15 @@
 					<view class="hb-list">
 						<view class="hb-card" v-for="item in availableHbList" :key="item.id" @click="selectHb(item)">
 							<view class="card-left">
-								<view class="amount"><text class="symbol">¥</text>{{ item.amount }}</view>
+								<view class="amount"><text class="symbol">¥</text>{{ item.amount?parseFloat(item.amount):0 }}</view>
 								<view class="type">{{ item.name }}</view>
 							</view>
 							<view class="card-middle">
 								<view class="name">{{ item.name }}</view>
-								<view class="condition">
-									{{ Number(item.minConsume) > 0 ? `满${item.minConsume}可用` : '无门槛' }}
-								</view>
-								<view class="date" v-if="item.endTime == 4102416000">永久可用</view>
-								<view class="date" v-else>{{ formatTime(item.beginTime) }}-{{ formatTime(item.endTime) }}到期</view>
+								<view class="condition" v-if="Number(item.minConsume) > 0"> 满{{ item.minConsume?parseFloat(item.minConsume):0 }}可用 </view>
+								<view class="condition" v-else> 无门槛 </view>
+								<view class="date" v-if="item.endTime == 4102416000">永久有效</view>
+								<view class="date" v-else>{{ formatTime(item.endTime) }} 到期</view>
 							</view>
 							<view class="card-right">
 								<view class="radio-circle" :class="{ checked: currentSelectedId == item.id }">
@@ -159,7 +158,7 @@ export default {
 	display: flex;
 	justify-content: flex-end;
 	align-items: center;
-	width: 100%;
+	width: 300upx;
 	height: 30upx;
 }
 .tui-title {
@@ -174,14 +173,14 @@ export default {
 .available-tag {
 	background-color: #F82547;
 	color: #fff;
-	font-size: 10upx;
+	font-size: 12upx;
 	padding: 2upx 10upx;
 	border-radius: 20upx;
 	line-height: 1.6;
 }
 .selected-text {
 	color: #ff2842;
-	font-size: 11upx;
+	font-size: 12upx;
 	font-weight: 600;
 }
 
@@ -192,9 +191,10 @@ export default {
 	display: flex;
 	flex-direction: column;
 	width: 78vw;
-	max-width: 440upx;
-	max-height: 70vh;
+	max-width: 340upx;
+	max-height: 90vh;
 	overflow: hidden;
+	z-index:9999;
 }
 .popup-header {
 	height: 70upx;

hdPad/src/pages/home/components/settlePop.vue

@@ -170,15 +170,6 @@
                 </view>
             </view>
 
-            <!--
-            <view class="select-item_box" v-if="$util.isEmpty(groupInfo)">
-                <view class="title">如需保存此组合，请输入名称：</view>
-                <view class="inpup_box">
-                    <view><input type="text" v-model="form.groupName" name="groupName" /></view>     
-                </view>
-            </view>
-            -->
-
         </view>
         <view class="line"></view>