diff --git a/public/pages/scm/couponPropertyUserDetail/couponPropertyUserDetail.html b/public/pages/scm/couponPropertyUserDetail/couponPropertyUserDetail.html index f81d244d1..6350afb88 100644 --- a/public/pages/scm/couponPropertyUserDetail/couponPropertyUserDetail.html +++ b/public/pages/scm/couponPropertyUserDetail/couponPropertyUserDetail.html @@ -1,125 +1,180 @@
-
-
-
-
- -
-
- +
+
+
+
+ +
+
+
-
-
-
-
- +
+
+ 核销结果 + {{couponPropertyUserManageInfo.order.remark}} +
+
+ 核销时间 + {{couponPropertyUserManageInfo.order.createTime}} +
+
+ 优惠券 + {{couponPropertyUserManageInfo.order.couponName}} +
+
+ 面值 + {{couponPropertyUserManageInfo.order.value}} +
+
+ 用户名称 + {{couponPropertyUserManageInfo.order.userName}} +
+
+ 手机号 + {{couponPropertyUserManageInfo.order.tel}} +
+
+ 用途 + {{couponPropertyUserManageInfo.order.toTypeName}} +
+
+
+
+
+
+
+
+
+
+ +
+
+
-
-
- +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
-
-
- +
+
+
+
+
+
+
+
+ +
+
+
-
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
{{couponPropertyUser.uoId}}{{couponPropertyUser.couponName}}{{couponPropertyUser.value}}{{couponPropertyUser.userName}}{{couponPropertyUser.tel}}{{couponPropertyUser.remark}}{{couponPropertyUser.createTime}} +
+ +
+
+ +
+
+
    +
    + +
    -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    {{couponPropertyUser.uoId}}{{couponPropertyUser.couponName}}{{couponPropertyUser.value}}{{couponPropertyUser.userName}}{{couponPropertyUser.tel}}{{couponPropertyUser.remark}} -
    - -
    -
    - -
    -
    -
      -
      - - -
      -
      -
      -
      -
      \ No newline at end of file diff --git a/public/pages/scm/couponPropertyUserDetail/couponPropertyUserDetail.js b/public/pages/scm/couponPropertyUserDetail/couponPropertyUserDetail.js index b83f7f12b..0a3e52ce8 100644 --- a/public/pages/scm/couponPropertyUserDetail/couponPropertyUserDetail.js +++ b/public/pages/scm/couponPropertyUserDetail/couponPropertyUserDetail.js @@ -8,6 +8,15 @@ data: { couponPropertyUserManageInfo: { couponPropertyUsers: [], + order: { + remark: '', + userName: '', + createTime: '', + tel: '', + couponName: '', + value: '', + toTypeName: '', + }, total: 0, records: 1, moreCondition: false, @@ -81,7 +90,51 @@ } else { vc.component.couponPropertyUserManageInfo.moreCondition = true; } - } + }, + _confirmCouponPropertyUser: function(_page, _rows) { + + let _couponId = $that.couponPropertyUserManageInfo.couponId; + if (!_couponId) { + vc.toast('请扫码'); + return; + } + + let _data = { + couponQrcode: _couponId, + communityId: vc.getCurrentCommunity().communityId, + giftCount:1 + } + + vc.http.apiPost( + '/couponProperty.writeOffCouponPropertyUser', + JSON.stringify(_data), { + emulateJSON: true + }, + function(json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + $that.couponPropertyUserManageInfo.couponId = ''; + let _json = JSON.parse(json); + if (_json.code != 0) { + vc.toast(_json.msg); + return; + } + $that._listCouponPropertyUsers(1, 10); + vc.toast("核销成功"); + if (!_json.data || _json.data.length < 1) { + return; + } + vc.copyObject(_json.data[0], $that.couponPropertyUserManageInfo.order); + + if (!$that.couponPropertyUserManageInfo.order.remark) { + $that.couponPropertyUserManageInfo.order.remark = "核销成功"; + } + }, + function(errInfo, error) { + console.log('请求失败处理'); + $that.couponPropertyUserManageInfo.couponId = ''; + vc.toast(errInfo); + }); + }, } diff --git a/public/pages/scm/couponPropertyUserManage/couponPropertyUserManage.html b/public/pages/scm/couponPropertyUserManage/couponPropertyUserManage.html index 627a5a86a..dd2dc51a3 100644 --- a/public/pages/scm/couponPropertyUserManage/couponPropertyUserManage.html +++ b/public/pages/scm/couponPropertyUserManage/couponPropertyUserManage.html @@ -131,6 +131,9 @@ + + + @@ -147,6 +150,7 @@ {{couponPropertyUser.toTypeName}} {{couponPropertyUser.stock}}张 {{couponPropertyUser.state == '1001'?'未使用':'已使用'}} + {{couponPropertyUser.startTime}}