优惠劵明细更新

api/pages/sharesign/couponUse.js

@@ -10,7 +10,8 @@
 module.exports = {
 	couponUseService: { 
 		// 前缀
-		prefix: 'oauth-server/oauth/couponUse/',
+    prefix: 'oauth-server/oauth/couponUse/',
+    countByCond: 'count_by',
 	},
 	routeUrl: {
 		couponUse: {

package-basic-data/pages/share/share.js

@@ -15,6 +15,7 @@ Page({
     versionName: '',
     gradeCode: null,
     integral: 0,
+    couponNumber: 0,
     cilckViewId: 'toShare',
     integralTacticItem: {}
   },
@@ -27,6 +28,8 @@ Page({
     this.getIntegralTactic()
     // 积分
     this.getIntegral()
+    // 优惠劵
+    this.getCouponNumber()
   },
 
   loadInit() {
@@ -99,6 +102,25 @@ Page({
       }
     });
   },
+  
+  /**
+  * @desc : 优惠劵数量获取
+  * @author : 刘尧
+  * @date : 2024/7/29 15:54
+  */
+  getCouponNumber(){
+    let params = {
+      couponStatus: Constants.couponStatus.unused,
+      flgValid: true
+    }
+    let service = app.globalData['couponUseService']
+    this.excute(service, service.countByCond, params).then(res => {
+      this.setData({
+        couponNumber: res.data
+      })
+    });
+  },
+
   /**
   * @desc : 优惠券
   * @author : 刘尧

package-basic-data/pages/share/share.wxml

@@ -21,7 +21,7 @@
           公司云币:<view class="number">{{ integral }}</view>枚
         </view>
         <view class="item" data-name="couponDetail" bind:tap="open">
-          优惠券:<view class="number">1</view>张
+          优惠券:<view class="number">{{ couponNumber }}</view>张
         </view>
       </view>
       <view class="rearmk-view">

package-basic-data/pages/sign-share-detail/coupon-detail.js

@@ -19,19 +19,20 @@ Page({
     companyName: '',
     versionName: '',
     active: 0,
-    tagList: [{ title: '使用', code: '使用' }, { title: '未使用', code: '未使用' }, { title: '失效', code: '失效' }],
-    saleStatus: '使用',
+    tagList: [{ title: '使用', code: Constants.couponStatus.use }, { title: '未使用', code: Constants.couponStatus.unused }, { title: '失效', code: Constants.couponStatus.expired }],
+    saleStatus: Constants.couponStatus.use,
     itemList: [{
       type: '签到',
-      date: '2024-07-05',
-      time: '2024-07-06',
-      user: '李小双',
-      value: '5折优惠劵'
+      receiveDate: '2024-07-05',
+      useDate: '2024-07-06',
+      receiveUser: '李小双',
+      couponName: '5折优惠劵'
     }],
     gradeCode: null,
     // 路由
     routeObjName: 'integralItem',
     integral: 0,
+    couponNumber: 0,
     avatarUrl: config.image_url + '/static/img/' + '/order_billing_detail_01.png',
   },
 
@@ -41,10 +42,18 @@ Page({
    * @author : 刘尧
    */
   onChangeTabs(e) {
-    let code = e.detail.detail.code
-    this.setData({
-      saleStatus: code,
-      active: e.detail.detail.index
+    let code = e.detail.detail.title
+    let params = {
+      couponStatus: e.detail.detail.code,
+      flgValid: true
+    }
+    let service = app.globalData['couponUseService']
+    this.excute(service, service.selectByCond,params).then(res => {
+      this.setData({
+        saleStatus: code,
+        active: e.detail.detail.index,
+        itemList: res.data.data.list
+      })
     })
   },
   /**
@@ -61,6 +70,8 @@ Page({
     this.getIntegral()
     // 头像
     this.getUser()
+    // 优惠劵
+    this.getCouponNumber()
 
   },
 
@@ -99,6 +110,23 @@ Page({
       }
     });
   },
+  /**
+  * @desc : 优惠劵数量获取
+  * @author : 刘尧
+  * @date : 2024/7/29 15:54
+  */
+ getCouponNumber(){
+  let params = {
+    couponStatus: Constants.couponStatus.unused,
+    flgValid: true
+  }
+  let service = app.globalData['couponUseService']
+  this.excute(service, service.countByCond, params).then(res => {
+    this.setData({
+      couponNumber: res.data
+    })
+  });
+},
 
   
 

package-basic-data/pages/sign-share-detail/coupon-detail.wxml

@@ -19,7 +19,7 @@
     <view class="integral-info">
       <view class="integral-item">
         <view class="item">
-          优惠券:<view class="number" >1</view>张
+          优惠券:<view class="number" >{{ couponNumber }}</view>张
         </view>
         <view class="item" style="color: #95A8CB;text-decoration-line:underline;" data-name="couponHistory" bind:tap="open">
           历史助力记录
@@ -37,20 +37,28 @@
     </view>
   </view>
   <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs"> </dk-tabs>
-  <view class="item-content" >
+  <view class="item-content" wx:if="{{ itemList.length > 0}}">
     <view class="item-card">
       <view class="list-item" wx:for="{{itemList}}" wx:for-index="index" wx:for-item="item">
         <view>
-          <view class="item-type">{{item.type}}</view>
-          <view class="item-info">{{item.date}}/{{item.user}}</view>
+          <view class="item-type">{{'助力'}}</view>
+          <view class="item-info">{{item.receiveDate}}/{{item.receiveUser}}</view>
         </view>
         <view class="integral-value">
-          {{item.value}}
-          <view class="date">
-            {{saleStatus}}时间:{{item.time}}
+          {{item.couponName}}
+          <view class="date" wx:if="{{ saleStatus === Constants.couponStatus.use}}">
+            使用时间:{{item.useDate}}
+          </view>
+          <view class="date" wx:if="{{ saleStatus === Constants.couponStatus.unused}}">
+            到期时间:{{item.time}}
+          </view>
+          <view class="date" wx:if="{{ saleStatus === Constants.couponStatus.expired}}">
+            失效时间:{{item.time}}
           </view>
         </view>
       </view>
     </view>
   </view>
+  <!-- 暂无数据 -->
+  <van-empty wx:else description="{{$t['nodata']}}" />
 </view>

utils/Constants.js

@@ -400,6 +400,17 @@ module.exports = {
     use: "积分类型-使用",
   },
 
+     /**
+   * @desc   : 优惠券状态
+   * @author : 姜永辉
+   * @date   : 2024/3/9 16:17
+   */
+  couponStatus: {
+    use: "优惠券状态-已使用",
+    unused: "优惠券状态-未使用",
+    expired: "优惠券状态-已失效"
+  },
+
   /**
    * @desc   : 表名
    * @author : 周兴