Parcourir la source

赠券调整3

junyuanz il y a 4 ans
Parent
commit
7ec277fd94

+ 7 - 4
packageUser/pages/user/promotion/promotion.wxml

@@ -2,13 +2,16 @@
   <view class="radish-main">
     <view class="radish-main__line" wx:key="{{index}}" data-val="{{item.id}}" wx:for="{{list}}">
       <view class="radish-main__left">
-        <view class="radish-main__text ellipsis">{{item.product_name}}</view>
+		<view class="radish-main__img"><image src="{{item.product_image}}"></image></view>
+        <view class="radish-main__text ellipsis">{{item.product_name}}商品赠券</view>
         <!-- <view class="radish-main__time"><format-time type="formatTime" value="{{item.ctime}}" ></format-time></view> -->
-		<view class="radish-main__time">数量:{{item.send_nums1}}</view>
+		<view class="radish-main__source">数量:{{item.send_nums1}}</view>
+		<view class="radish-main__source">来源:{{item.source_name}}</view>
+		<view class="radish-main__time">发放日期:{{item.created_at}}</view>
         <view class="clean"></view>
       </view>
-      <view class="radish-main__count">{{item.source_name}}</view>
+      <!-- <view class="radish-main__count">{{item.source_name}}</view> -->
     </view>
-	<view wx:if="{{list.length == 0}}" style="text-align: center;padding: 120rpx;">暂时没有赠券</view>
+	<view wx:if="{{list.length == 0}}" style="text-align: center;padding: 120rpx;">暂时没有赠券</view>
   </view>
 </view>

+ 21 - 4
packageUser/pages/user/promotion/promotion.wxss

@@ -65,25 +65,36 @@
 }
 .radish-main__line {
   margin: 0 20rpx;
-  height: 100rpx;
+  overflow: hidden;
   border-bottom: 1rpx solid #eeeeee;
 }
 .radish-main__left {
   float: left;
-  width: 450rpx;
+  /* width: 450rpx; */
+}
+.radish-main__img {
+  float: left;
+  padding-top: 16rpx;
+  width: 150rpx;
+  margin-right: 15rpx;
+}
+.radish-main__img image{
+  width: 100%;
+  height: 150rpx;
 }
 .radish-main__text {
   float: left;
   padding-top: 16rpx;
   font-size: 28rpx;
   color: #4c4c4c;
-  width: 450rpx;
+  width: calc(100% - 165rpx);
 }
 .radish-main__time {
   float: left;
   font-size: 21rpx;
   color: #bbbbbb;
-  padding-top: 5rpx;
+  padding-top: 20rpx;
+  width: calc(100% - 165rpx);
 }
 .radish-main__count {
   float: right;
@@ -92,4 +103,10 @@
   line-height: 100rpx;
   text-align: right;
   color: #eab86a;
+}
+.radish-main__source{
+	float: left;
+	font-size: 24rpx;
+	color: #666;
+	width: calc(100% - 165rpx);
 }