Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !99

src/subPackage/page/pages/orderBenefit/orderBenefit.js

@@ -43,7 +43,7 @@ wxService.page({
       mask: true
     })
     wxService.post(`/marketing/awardRecord/queryAward?pageNum=${pageNum}&pageSize=${pageSize}`, {
-      // userId: memberId
+      userId: memberId
     }).then(res => {
       if (res) {
         const { result, data } = res.data

src/subPackage/page/pages/orderBenefit/orderBenefit.wxml

 <!--subPackage/page/pages/orderBenefit/orderBenefit.wxml-->
 <view class="page-order-benefit">
-  <view class="order-benefit-wrap">
+    <view class="order-benefit-wrap" wx:if="{{orderBenefitList && orderBenefitList.length > 0}}">
       <view class="order-benefit-list" wx:for="{{orderBenefitList}}" wx:key="{{index}}">
         <view class="top-info">
-        <view class="order-num">订单号：{{item.id}}</view>
-        <view class="order-date">{{item.createTime}}</view>
+          <view class="benefit-type">
+            <image class="benefit-img" src="{{item.awardType  == 1 ? '/assets/imgs/7_1_0/integral-icon.png' : '/assets/imgs/7_1_0/rmb.png'}}" mode="widthFix"></image>
+            <text class="benefit-desc">{{item.awardDetails}}</text>
           </view>
-      <view class="bottom-info">
-        <view>
-          <image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image>
-          <text class="benefit-num">100</text>
-        </view>
-         <view>
-          <image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix"></image>
-          <text class="benefit-num">100</text>
+          <view class="benefit-way">
+            {{item.typeName}}
           </view>
-         <view>
-          <image src="/assets/imgs/7_1_0/experience.png" class="experience-icon" mode="widthFix"></image>
-          <text class="benefit-num">100</text>
-        </view>
-         <view>
-          <image src="/assets/imgs/7_1_0/share-value.png" class="share-value" mode="widthFix"></image>
-          <text class="benefit-num">100</text>
         </view>
+
+        <view class="bottom-info">
+          <view class="benefit-order">订单号：{{item.id}}</view>
+          <view class="benefit-time">{{item.createTime}}</view>
         </view>
       </view>
     </view>
+    <view class="empty" wx:if="{{!orderBenefitList || orderBenefitList.length < 1}}">暂无订单收益~</view>
   <view class="benefit-tips">
     <text>邀请好友只显示前50名</text>
   </view>

src/subPackage/page/pages/orderBenefit/orderBenefit.wxss

 /* subPackage/page/pages/orderBenefit/orderBenefit.wxss */
+page{
+  padding-bottom: 100rpx;
+}
 .order-benefit-wrap{
   margin-top: 8rpx;
-  padding: 0 20rpx;
+  padding: 0 30rpx;
 }
 .order-benefit-list{
-  border-radius: 10rpx;
-  background-color: rgba(255, 255, 255, 1);
-  box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
-  padding: 33rpx 20rpx 36rpx;
-  margin-top: 20rpx;
-}
-.top-info{
-  border-bottom: 1px solid rgba(151,151,151,0.3);
-  padding: 0 0 15rpx 29rpx;
-}
-.order-num{
-  color: #666666;
-  font-size: 22rpx;
-}
-.order-date{
-  color: #aaaaaa;
-  font-size: 20rpx;
-  margin-top: 5rpx;
+  padding: 21rpx 37rpx ;
+  border-bottom: 1px solid rgba(151,151,151,0.3)
 }
-.bottom-info{
-  padding: 16rpx 60rpx 0 29rpx;
+.top-info,.bottom-info{
   display: flex;
   justify-content: space-between;
 }
-.integral-icon{
-  width: 36rpx;
-  vertical-align: middle;
-}
-.coupon-icon{
-  width: 29rpx;
-  height: 29rpx;
-  vertical-align: middle;
+.bottom-info{
+  margin-top:10rpx; 
+  font-size: 18rpx;
+  color: #aaaaaa;
 }
-.experience-icon{
-  width: 51rpx;
+.benefit-img{
+  width: 36rpx;
   vertical-align: middle;
 }
-.share-value{
-  width: 40rpx;
+.benefit-desc{
+  font-size: 18rpx;
+  color: #333333;
+  margin-left: 15rpx;
   vertical-align: middle;
 }
-.benefit-num{
+.benefit-way{
+  font-size: 22rpx;
   color: #333333;
-  font-size: 18rpx;
-  vertical-align: middle;
-  margin-left: 15rpx;
 }
 .benefit-tips{
   width: 750rpx;
@@ -62,3 +44,9 @@
   font-size: 20rpx;
   text-align: center;
 }
+.empty{
+  color: #808080;
+  text-align: center;
+  width: 100%;
+  margin-top: 458rpx;
+}
\ No newline at end of file