wxd / MShopWeApp

Commit 96f811318e68d1cafeebdb8b1ed60f80d44b938b

Authored by yvan.ni
2 parents ae26e7d4 628a35bb

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 4 changed files with 80 additions and 50 deletions
app.wxss
  View file @96f8113
... ... @@ -706,9 +706,9 @@ background: #ffe3e2;
706 706 /* 图标字体(ty) */
707 707 @font-face {
708 708 font-family: 'iconfont'; /* Project id 2054717 */
709   - src: url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff2?t=1627893975776') format('woff2'),
710   - url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff?t=1627893975776') format('woff'),
711   - url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.ttf?t=1627893975776') format('truetype');
  709 + src: url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.woff2?t=1628845583213') format('woff2'),
  710 + url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.woff?t=1628845583213') format('woff'),
  711 + url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.ttf?t=1628845583213') format('truetype');
712 712 }
713 713  
714 714 .iconfont {
... ... @@ -719,6 +719,10 @@ background: #ffe3e2;
719 719 -moz-osx-font-smoothing: grayscale;
720 720 }
721 721  
  722 +.icon-nodata:before {
  723 + content: "\e636";
  724 +}
  725 +
722 726 .icon-zhuanfa1:before {
723 727 content: "\e614";
724 728 }
... ...
packageB/pages/coupons/query/index.js
  View file @96f8113
... ... @@ -23,7 +23,7 @@ Page({
23 23 isBind:true,//控制清空时间日期的按钮
24 24 isBinds: true,
25 25 select: false,//下拉框
26   - grade_name: '所有',
  26 + grade_name: '未使用',
27 27 // grades: [ //old
28 28 // '所有',
29 29 // '已使用',
... ... @@ -198,7 +198,7 @@ Page({
198 198 var store_id = os.stoid;
199 199  
200 200  
201   - this.getData(true, '/api/weshop/users/listExchangeCoupons?pageSize=10', {
  201 + this.getData(true, '/api/weshop/users/listExchangeCoupons', {
202 202 user_id: user_id, store_id: store_id,
203 203 }).then(()=>{
204 204 _this.setData({
... ... @@ -231,7 +231,7 @@ Page({
231 231 this.data.integr = item.Integral;
232 232 this.data.number = item.Number;
233 233  
234   - let content = `确定使用${th.data.integr}积分兑换面值${th.data.monye}元的代金券吗?`;
  234 + let content = `确定使用${th.data.integr}积分兑换代金券面值${th.data.monye}元吗?`;
235 235 wx.showModal({
236 236 title: '提示',
237 237 content: content,
... ... @@ -479,13 +479,24 @@ Page({
479 479 },
480 480  
481 481  
  482 + // 使用说明详情展开
  483 + clickDetails: function(e) {
  484 + let details = this.data.details;
  485 + let index = e.currentTarget.dataset.index;
  486 + details[index].isShowDetails = !details[index].isShowDetails;
  487 + this.setData({
  488 + details,
  489 + });
  490 + },
  491 +
  492 +
482 493  
483 494 //---加载更多是靠这个函数----
484 495 onReachBottom: function () {
485 496 if(this.data.currentIndex != 3) {
486 497 this.wjquery();
487 498 } else {
488   - this.scrollToLower('/api/weshop/users/listExchangeCoupons?pageSize=10', {
  499 + this.scrollToLower('/api/weshop/users/listExchangeCoupons', {
489 500 user_id: getApp().globalData.user_id,
490 501 store_id: os.stoid,
491 502 }, function() {
... ... @@ -499,35 +510,35 @@ Page({
499 510  
500 511  
501 512 //起始时间
502   - bindDateChenge: function(e) {
503   - console.log("是什么", e.detail.value);
504   - var isBind = false;
505   - this.setData({
506   - datet: e.detail.value, isBind: isBind
507   - });
508   - },
  513 + // bindDateChenge: function(e) {
  514 + // console.log("是什么", e.detail.value);
  515 + // var isBind = false;
  516 + // this.setData({
  517 + // datet: e.detail.value, isBind: isBind
  518 + // });
  519 + // },
509 520 // 结束时间
510   - bindDateChenges: function(e) {
511   - console.log("是什么", e.detail.value);
512   - var isBinds = false;
513   - this.setData({
514   - dates: e.detail.value, isBinds: isBinds
515   - });
516   - },
  521 + // bindDateChenges: function(e) {
  522 + // console.log("是什么", e.detail.value);
  523 + // var isBinds = false;
  524 + // this.setData({
  525 + // dates: e.detail.value, isBinds: isBinds
  526 + // });
  527 + // },
517 528 //catchtap阻止冒泡，点击清除开始时间的按钮
518   - eliminate:function(){
519   - console.log("试试");
520   - var isBind= true;
521   - var data="";
522   - this.setData({ datet: data, isBind: isBind})
523   - },
  529 + // eliminate:function(){
  530 + // console.log("试试");
  531 + // var isBind= true;
  532 + // var data="";
  533 + // this.setData({ datet: data, isBind: isBind})
  534 + // },
524 535 //catchtap阻止冒泡，点击清除结束时间的按钮
525   - eliminates: function () {
526   - console.log("试试");
527   - var isBinds = true;
528   - var dates = "";
529   - this.setData({ dates: dates, isBinds: isBinds })
530   - },
  536 + // eliminates: function () {
  537 + // console.log("试试");
  538 + // var isBinds = true;
  539 + // var dates = "";
  540 + // this.setData({ dates: dates, isBinds: isBinds })
  541 + // },
531 542  
532 543  
533 544  
... ...
packageB/pages/coupons/query/index.wxml
  View file @96f8113
... ... @@ -63,25 +63,24 @@
63 63 <block wx:if="{{detail.isby}}">
64 64 <view class="coupon">
65 65 <view class="flex">
66   - <view class="c-l"><text class="rmb fs40">20</text></view>
  66 + <view class="c-l"><text class="fs40">包邮券</text></view>
67 67 <view class="c-r dash">
68 68 <view class="flex jc_sb ai_c">
69 69 <view class="pdr20">
70 70 <view class="fs28 ellipsis-1x">包邮券</view>
71 71 <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view>
72 72 </view>
73   - <view class="shrink0"><text class="btn">立即使用</text></view>
  73 + <view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.no}}">{{filter.showBtnText(currentIndex)}}</text></view>
74 74 </view>
75 75 <view class="c-time">
76   - <text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}至{{ time.format_time(detail.use_end_time)}}</text>
  76 + <text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}} 至 {{time.format_time(detail.use_end_time)}}</text>
77 77 <text wx:else>有效期:不限</text>
78 78 </view>
79 79 </view>
80 80 </view>
81 81 </view>
82   - <!-- <view class="c-info arrow-down"> -->
83   - <view class="c-info">
84   - <text class="ellipsis-1x">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
  82 + <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
  83 + <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
85 84 </view>
86 85 </block>
87 86  
... ... @@ -100,15 +99,15 @@
100 99 </view>
101 100 </view>
102 101 <view class="c-time">
103   - <text wx:if="{{detail.ValidDate!=null}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
  102 + <text wx:if="{{detail.ValidDate}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
104 103 <text wx:else>有效期:不限</text>
105 104 </view>
106 105 </view>
107 106 </view>
108 107 </view>
109   - <view class="c-info">
110   - <text class="ellipsis-1x" wx:if="{{detail.Remark1}}">{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</text>
111   - <text wx:else>使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</text>
  108 + <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
  109 + <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1}}">{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</text>
  110 + <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else>使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</text>
112 111 </view>
113 112 </block>
114 113 </view>
... ... @@ -123,7 +122,7 @@
123 122 <view class="c-r dash">
124 123 <view class="flex jc_sb ai_c">
125 124 <view class="pdr20">
126   - <view class="fs28 ellipsis-1x">{{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券</view>
  125 + <view class="fs26 ellipsis-1x breakall">{{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券</view>
127 126 <!-- <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view> -->
128 127 </view>
129 128 <view class="shrink0"><text class="btn2" bindtap="clickExchange" data-index="{{index}}">立即兑换</text></view>
... ... @@ -154,15 +153,22 @@
154 153 <view class="popup-container" hidden="{{!showQr}}">
155 154 <view class="t-r pdb20"><text class="iconfont icon-close fs40" bindtap="closeQr"></text></view>
156 155 <view class="popup">
157   - <view class="popup-title">{{filter.getNum(details[useIndex].Sum)}}元微券</view>
158   - <view class="pdt20 c-fe0000"><text class="rmb fs80">{{filter.getNum(details[useIndex].Sum)}}</text></view>
  156 + <view class="popup-title">
  157 + <block wx:if="{{details[useIndex].isby == 1}}">包邮券</block>
  158 + <block wx:else>
  159 + {{filter.getNum(details[useIndex].Sum)}}元微券
  160 + </block>
  161 + </view>
  162 + <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view>
159 163 <!-- <img src="" alt="" class="img-qr"/> -->
160 164 <view class="qr-container">
161 165 <canvas class="qrcode" canvas-id="qrcode"/>
162 166 </view>
163   - <view class="pdt20 pdb10 fs26">{{details[useIndex].CashRepNo}}</view>
  167 + <view class="pdt20 pdb10 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
  168 + <view class="pdt20 pdb10 fs26" wx:else>{{details[useIndex].no}}</view>
164 169 <view class="pdv30 c-7b fs26 bdt">
165   - <text wx:if="{{details[useIndex].ValidDate!=null}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
  170 + <text wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
  171 + <text wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text>
166 172 <text wx:else>有效期:不限</text>
167 173 </view>
168 174 </view>
... ...
packageB/pages/coupons/query/index.wxss
  View file @96f8113
... ... @@ -530,8 +530,13 @@ page {
530 530 font-size: 32rpx;
531 531 position: absolute;
532 532 right: 10rpx;
533   - top: 50%;
534   - transform: translateY(-50%);
  533 + top: 10rpx;
  534 + /* transform: translateY(-50%); */
  535 + transition: all 0.3s;
  536 + }
  537 +
  538 + .arrow-down.active::after {
  539 + transform: rotateZ(180deg);
535 540 }
536 541  
537 542 .mask {
... ... @@ -614,6 +619,10 @@ page {
614 619 font-size: 22rpx;
615 620 }
616 621  
  622 + .breakall {
  623 + word-break: break-all;
  624 + }
  625 +
617 626  
618 627  
619 628  
... ...