shish преди 6 месеца
родител
ревизия
b342d8d226
променени са 3 файла, в които са добавени 6 реда и са изтрити 8 реда
  1. 3 1
      hdApp/src/admin/hb/list.vue
  2. 2 2
      mallApp/src/pages/hb/list.vue
  3. 1 5
      mallApp/src/pages/home/recent.vue

+ 3 - 1
hdApp/src/admin/hb/list.vue

@@ -33,7 +33,7 @@
           <view class="card-header">
           <view class="card-header">
             <view class="user-info">
             <view class="user-info">
               <text class="name">{{ item.customName }}</text>
               <text class="name">{{ item.customName }}</text>
-              <text class="amount">¥ {{ item.amount }}</text>
+              <text class="amount">¥ {{ item.amount?parseFloat(item.amount):0 }}</text>
             </view>
             </view>
             <view class="status" :class="item.statusClass">{{ item.statusText }}</view>
             <view class="status" :class="item.statusClass">{{ item.statusText }}</view>
           </view>
           </view>
@@ -41,6 +41,8 @@
             <view class="row">开始时间:{{ formatDateTime(item.beginTime) }}</view>
             <view class="row">开始时间:{{ formatDateTime(item.beginTime) }}</view>
             <view class="row">到期时间:<text v-if="item.endTime == 4102416000">永久有效</text><text v-else>{{ formatDateTime(item.endTime) }}</text></view>
             <view class="row">到期时间:<text v-if="item.endTime == 4102416000">永久有效</text><text v-else>{{ formatDateTime(item.endTime) }}</text></view>
             <view class="row">有效时长:<text v-if="item.duration == 0">永久</text><text v-else>{{ item.duration }}天</text></view>
             <view class="row">有效时长:<text v-if="item.duration == 0">永久</text><text v-else>{{ item.duration }}天</text></view>
+            <view class="row" v-if="Number(item.minConsume)==0">最低消费:无门槛</view>
+            <view class="row" v-else>最低消费:{{ item.minConsume?parseFloat(item.minConsume):0 }}元</view>
             <view class="row">获得方式:{{ formatGetType(item.getType) }}</view>
             <view class="row">获得方式:{{ formatGetType(item.getType) }}</view>
             <view class="row">获得时间:{{ item.createdAt.substr(0,16) }}</view>
             <view class="row">获得时间:{{ item.createdAt.substr(0,16) }}</view>
           </view>
           </view>

+ 2 - 2
mallApp/src/pages/hb/list.vue

@@ -18,10 +18,10 @@
 						<view class="list-det-left">
 						<view class="list-det-left">
 							<view class="price-wrap">
 							<view class="price-wrap">
 								<span>¥</span>
 								<span>¥</span>
-								<span class="price">{{ item.amount }}</span>
+								<span class="price">{{ item.amount?parseFloat(item.amount):0 }}</span>
 							</view>
 							</view>
 							<view v-if="item.minConsume == 0" class="full-reduc app-size-28">无门槛</view>
 							<view v-if="item.minConsume == 0" class="full-reduc app-size-28">无门槛</view>
-							<view v-else class="full-reduc app-size-28">满{{ item.minConsume }}可用</view>
+							<view v-else class="full-reduc app-size-28">满{{ item.minConsume?parseFloat(item.minConsume):0 }}可用</view>
 						</view>
 						</view>
 						<view class="list-det-right">
 						<view class="list-det-right">
 							<view class="coupon-message">
 							<view class="coupon-message">

+ 1 - 5
mallApp/src/pages/home/recent.vue

@@ -45,7 +45,7 @@
               <view v-if="unReadMsgNum > 0" class="message-badge">{{ unReadMsgNum > 9 ? '9+' : unReadMsgNum }}</view>
               <view v-if="unReadMsgNum > 0" class="message-badge">{{ unReadMsgNum > 9 ? '9+' : unReadMsgNum }}</view>
             </view>
             </view>
             <view class="function-item" @click="pageTo({ url: '/pages/hb/list' })">
             <view class="function-item" @click="pageTo({ url: '/pages/hb/list' })">
-              <text class="function-text">红包</text>
+              <text class="function-text">我的红包</text>
             </view>
             </view>
           </view>
           </view>
 
 
@@ -612,10 +612,6 @@ page {
       transition: all 0.2s ease;
       transition: all 0.2s ease;
       box-shadow: 0 2upx 8upx rgba(0, 0, 0, 0.1);
       box-shadow: 0 2upx 8upx rgba(0, 0, 0, 0.1);
 
 
-      /* &:active {
-        background: rgba(255, 255, 255, 0.25);
-      } */
-
       .function-text {
       .function-text {
         color: #ffffff;
         color: #ffffff;
         font-size: 28upx;
         font-size: 28upx;