xt / xcx-book · Commits

Go to a project

Commit a14f2a0abfe1c22890c2819f30475b885d8107af

Authored by “pengye”
1 parent f4ae71fe
build: skipped

邀请函剩余数量不足，发放剩余数量的券，为0 不在发放券

Inline Side-by-side
Showing 26 changed files with 287 additions and 66 deletions
@@ -246,10 +246,7 @@ Page({ @@ -246,10 +246,7 @@ Page({
246 discountPrice: '0.00', 246 discountPrice: '0.00',
247 actualPrice: '', 247 actualPrice: '',
248 }) 248 })
249 - // 需要延迟获取才能获取到最新的券列表  
250 - setTimeout(() => {  
251 - that.getCoupon()  
252 - }, 8000); 249 + that.getCoupon()
253 console.log('支付成功', ress); 250 console.log('支付成功', ress);
254 return wx.showToast({ 251 return wx.showToast({
255 title: '支付成功', 252 title: '支付成功',
@@ -153,7 +153,6 @@ @@ -153,7 +153,6 @@
153 153
154 .anameText { 154 .anameText {
155 display: flex; 155 display: flex;
156 - align-items: center;  
157 } 156 }
158 157
159 .anameText { 158 .anameText {
@@ -163,13 +162,18 @@ @@ -163,13 +162,18 @@
163 .anameText text { 162 .anameText text {
164 font-family: PingFang SC; 163 font-family: PingFang SC;
165 font-weight: 600; 164 font-weight: 600;
  165 + line-height: 48rpx;
  166 + display: flex;
  167 + flex-wrap: wrap;
  168 + justify-content: flex-end;
  169 + word-break: break-all;
166 } 170 }
167 171
168 .discountText1 { 172 .discountText1 {
169 color: #C36607; 173 color: #C36607;
170 font-family: PingFang SC; 174 font-family: PingFang SC;
171 font-weight: 500; 175 font-weight: 500;
172 - margin-left: 40rpx; 176 + margin: 0 20rpx;
173 } 177 }
174 178
175 .bottomTitle { 179 .bottomTitle {
@@ -209,6 +213,7 @@ @@ -209,6 +213,7 @@
209 .itemRight view { 213 .itemRight view {
210 display: flex; 214 display: flex;
211 line-height: 36rpx; 215 line-height: 36rpx;
  216 + flex-shrink:0;
212 } 217 }
213 218
214 .nodate { 219 .nodate {
@@ -61,9 +61,6 @@ @@ -61,9 +61,6 @@
61 <view class="info font24r"> 61 <view class="info font24r">
62 <view class="drop"></view>{{detail.arule.is_share_have == '1'? '分享给好友后继续拥有此券' : '分享给好友后不再拥有此券'}} 62 <view class="drop"></view>{{detail.arule.is_share_have == '1'? '分享给好友后继续拥有此券' : '分享给好友后不再拥有此券'}}
63 </view> 63 </view>
64 - <view class="info font24r" wx:if="{{detail.arule.commission != '0'}}">  
65 - <view class="drop"></view>分享给好友领券核销后，获得实际消费{{detail.arule.commission}}%佣金  
66 - </view>  
67 </view> 64 </view>
68 <view class="centerMain" wx:if="{{detail.explain}}"> 65 <view class="centerMain" wx:if="{{detail.explain}}">
69 <view class="title"> 66 <view class="title">
@@ -914,6 +914,19 @@ Page({ @@ -914,6 +914,19 @@ Page({
914 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 914 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
915 } 915 }
916 } 916 }
  917 + if(num == 0){
  918 + let str = detail.grant_num*1
  919 + detail.receiveNumText = ''
  920 + if (str >= 0 && str <= 100) {
  921 + detail.receiveNumText = str.toString();
  922 + } else if (str >= 101 && str <= 199) {
  923 + detail.receiveNumText = '100+';
  924 + } else if (str >= 200 && str <= 299) {
  925 + detail.receiveNumText = '200+';
  926 + } else {
  927 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  928 + }
  929 + }
917 if (detail.exp_date && detail.exp_date.week_data) { 930 if (detail.exp_date && detail.exp_date.week_data) {
918 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 931 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
919 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 932 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -962,6 +975,19 @@ Page({ @@ -962,6 +975,19 @@ Page({
962 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 975 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
963 } 976 }
964 } 977 }
  978 + if(num == 0){
  979 + let str = detail.grant_num*1
  980 + detail.receiveNumText = ''
  981 + if (str >= 0 && str <= 100) {
  982 + detail.receiveNumText = str.toString();
  983 + } else if (str >= 101 && str <= 199) {
  984 + detail.receiveNumText = '100+';
  985 + } else if (str >= 200 && str <= 299) {
  986 + detail.receiveNumText = '200+';
  987 + } else {
  988 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  989 + }
  990 + }
965 if (detail.exp_date && detail.exp_date.week_data) { 991 if (detail.exp_date && detail.exp_date.week_data) {
966 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 992 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
967 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 993 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -1041,10 +1067,10 @@ Page({ @@ -1041,10 +1067,10 @@ Page({
1041 if (match) { 1067 if (match) {
1042 item.number = match.number; 1068 item.number = match.number;
1043 } 1069 }
1044 - item.grant_num = item.grant_num*1  
1045 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1046 - if(item.number>item.grant_num){  
1047 - item.number = item.grant_num 1070 + item.grant_last = item.grant_last*1*1
  1071 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1072 + if(item.number>item.grant_last){
  1073 + item.number = item.grant_last
1048 } 1074 }
1049 }); 1075 });
1050 if(couponArr.length>0){ 1076 if(couponArr.length>0){
@@ -955,6 +955,19 @@ Page({ @@ -955,6 +955,19 @@ Page({
955 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 955 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
956 } 956 }
957 } 957 }
  958 + if(num == 0){
  959 + let str = detail.grant_num*1
  960 + detail.receiveNumText = ''
  961 + if (str >= 0 && str <= 100) {
  962 + detail.receiveNumText = str.toString();
  963 + } else if (str >= 101 && str <= 199) {
  964 + detail.receiveNumText = '100+';
  965 + } else if (str >= 200 && str <= 299) {
  966 + detail.receiveNumText = '200+';
  967 + } else {
  968 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  969 + }
  970 + }
958 if (detail.exp_date && detail.exp_date.week_data) { 971 if (detail.exp_date && detail.exp_date.week_data) {
959 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 972 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
960 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 973 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -1015,6 +1028,19 @@ Page({ @@ -1015,6 +1028,19 @@ Page({
1015 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 1028 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
1016 } 1029 }
1017 } 1030 }
  1031 + if(num == 0){
  1032 + let str = detail.grant_num*1
  1033 + detail.receiveNumText = ''
  1034 + if (str >= 0 && str <= 100) {
  1035 + detail.receiveNumText = str.toString();
  1036 + } else if (str >= 101 && str <= 199) {
  1037 + detail.receiveNumText = '100+';
  1038 + } else if (str >= 200 && str <= 299) {
  1039 + detail.receiveNumText = '200+';
  1040 + } else {
  1041 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  1042 + }
  1043 + }
1018 if (detail.exp_date && detail.exp_date.week_data) { 1044 if (detail.exp_date && detail.exp_date.week_data) {
1019 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 1045 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
1020 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 1046 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -1108,10 +1134,10 @@ Page({ @@ -1108,10 +1134,10 @@ Page({
1108 if (match) { 1134 if (match) {
1109 item.number = match.number; 1135 item.number = match.number;
1110 } 1136 }
1111 - item.grant_num = item.grant_num*1  
1112 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1113 - if(item.number>item.grant_num){  
1114 - item.number = item.grant_num 1137 + item.grant_last = item.grant_last*1*1
  1138 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1139 + if(item.number>item.grant_last){
  1140 + item.number = item.grant_last
1115 } 1141 }
1116 }); 1142 });
1117 if(couponArr.length>0){ 1143 if(couponArr.length>0){
@@ -970,6 +970,19 @@ Page({ @@ -970,6 +970,19 @@ Page({
970 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 970 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
971 } 971 }
972 } 972 }
  973 + if(num == 0){
  974 + let str = detail.grant_num*1
  975 + detail.receiveNumText = ''
  976 + if (str >= 0 && str <= 100) {
  977 + detail.receiveNumText = str.toString();
  978 + } else if (str >= 101 && str <= 199) {
  979 + detail.receiveNumText = '100+';
  980 + } else if (str >= 200 && str <= 299) {
  981 + detail.receiveNumText = '200+';
  982 + } else {
  983 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  984 + }
  985 + }
973 if (detail.exp_date && detail.exp_date.week_data) { 986 if (detail.exp_date && detail.exp_date.week_data) {
974 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 987 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
975 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 988 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -1030,6 +1043,19 @@ Page({ @@ -1030,6 +1043,19 @@ Page({
1030 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 1043 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
1031 } 1044 }
1032 } 1045 }
  1046 + if(num == 0){
  1047 + let str = detail.grant_num*1
  1048 + detail.receiveNumText = ''
  1049 + if (str >= 0 && str <= 100) {
  1050 + detail.receiveNumText = str.toString();
  1051 + } else if (str >= 101 && str <= 199) {
  1052 + detail.receiveNumText = '100+';
  1053 + } else if (str >= 200 && str <= 299) {
  1054 + detail.receiveNumText = '200+';
  1055 + } else {
  1056 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  1057 + }
  1058 + }
1033 if (detail.exp_date && detail.exp_date.week_data) { 1059 if (detail.exp_date && detail.exp_date.week_data) {
1034 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 1060 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
1035 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 1061 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -1123,10 +1149,10 @@ Page({ @@ -1123,10 +1149,10 @@ Page({
1123 if (match) { 1149 if (match) {
1124 item.number = match.number; 1150 item.number = match.number;
1125 } 1151 }
1126 - item.grant_num = item.grant_num*1  
1127 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1128 - if(item.number>item.grant_num){  
1129 - item.number = item.grant_num 1152 + item.grant_last = item.grant_last*1*1
  1153 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1154 + if(item.number>item.grant_last){
  1155 + item.number = item.grant_last
1130 } 1156 }
1131 }); 1157 });
1132 if(couponArr.length>0){ 1158 if(couponArr.length>0){
@@ -964,6 +964,19 @@ Page({ @@ -964,6 +964,19 @@ Page({
964 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 964 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
965 } 965 }
966 } 966 }
  967 + if(num == 0){
  968 + let str = detail.grant_num*1
  969 + detail.receiveNumText = ''
  970 + if (str >= 0 && str <= 100) {
  971 + detail.receiveNumText = str.toString();
  972 + } else if (str >= 101 && str <= 199) {
  973 + detail.receiveNumText = '100+';
  974 + } else if (str >= 200 && str <= 299) {
  975 + detail.receiveNumText = '200+';
  976 + } else {
  977 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  978 + }
  979 + }
967 if (detail.exp_date && detail.exp_date.week_data) { 980 if (detail.exp_date && detail.exp_date.week_data) {
968 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 981 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
969 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 982 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -1043,10 +1056,10 @@ Page({ @@ -1043,10 +1056,10 @@ Page({
1043 if (match) { 1056 if (match) {
1044 item.number = match.number; 1057 item.number = match.number;
1045 } 1058 }
1046 - item.grant_num = item.grant_num*1  
1047 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1048 - if(item.number>item.grant_num){  
1049 - item.number = item.grant_num 1059 + item.grant_last = item.grant_last*1*1
  1060 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1061 + if(item.number>item.grant_last){
  1062 + item.number = item.grant_last
1050 } 1063 }
1051 }); 1064 });
1052 if(couponArr.length>0){ 1065 if(couponArr.length>0){
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 </view> 110 </view>
111 </block> 111 </block>
112 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 112 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
113 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 113 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
114 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可使用：</view> 114 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可使用：</view>
115 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 115 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
116 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 116 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -919,6 +919,19 @@ Page({ @@ -919,6 +919,19 @@ Page({
919 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 919 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
920 } 920 }
921 } 921 }
  922 + if(num == 0){
  923 + let str = detail.grant_num*1
  924 + detail.receiveNumText = ''
  925 + if (str >= 0 && str <= 100) {
  926 + detail.receiveNumText = str.toString();
  927 + } else if (str >= 101 && str <= 199) {
  928 + detail.receiveNumText = '100+';
  929 + } else if (str >= 200 && str <= 299) {
  930 + detail.receiveNumText = '200+';
  931 + } else {
  932 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  933 + }
  934 + }
922 if (detail.exp_date && detail.exp_date.week_data) { 935 if (detail.exp_date && detail.exp_date.week_data) {
923 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 936 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
924 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 937 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -998,10 +1011,10 @@ Page({ @@ -998,10 +1011,10 @@ Page({
998 if (match) { 1011 if (match) {
999 item.number = match.number; 1012 item.number = match.number;
1000 } 1013 }
1001 - item.grant_num = item.grant_num*1  
1002 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1003 - if(item.number>item.grant_num){  
1004 - item.number = item.grant_num 1014 + item.grant_last = item.grant_last*1*1
  1015 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1016 + if(item.number>item.grant_last){
  1017 + item.number = item.grant_last
1005 } 1018 }
1006 }); 1019 });
1007 if(couponArr.length>0){ 1020 if(couponArr.length>0){
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 </view> 116 </view>
117 </block> 117 </block>
118 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 118 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
119 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 119 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
120 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 120 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
121 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 121 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
122 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 122 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -920,6 +920,19 @@ Page({ @@ -920,6 +920,19 @@ Page({
920 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 920 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
921 } 921 }
922 } 922 }
  923 + if(num == 0){
  924 + let str = detail.grant_num*1
  925 + detail.receiveNumText = ''
  926 + if (str >= 0 && str <= 100) {
  927 + detail.receiveNumText = str.toString();
  928 + } else if (str >= 101 && str <= 199) {
  929 + detail.receiveNumText = '100+';
  930 + } else if (str >= 200 && str <= 299) {
  931 + detail.receiveNumText = '200+';
  932 + } else {
  933 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  934 + }
  935 + }
923 if (detail.exp_date && detail.exp_date.week_data) { 936 if (detail.exp_date && detail.exp_date.week_data) {
924 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 937 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
925 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 938 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -999,10 +1012,10 @@ Page({ @@ -999,10 +1012,10 @@ Page({
999 if (match) { 1012 if (match) {
1000 item.number = match.number; 1013 item.number = match.number;
1001 } 1014 }
1002 - item.grant_num = item.grant_num*1  
1003 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1004 - if(item.number>item.grant_num){  
1005 - item.number = item.grant_num 1015 + item.grant_last = item.grant_last*1*1
  1016 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1017 + if(item.number>item.grant_last){
  1018 + item.number = item.grant_last
1006 } 1019 }
1007 }); 1020 });
1008 if(couponArr.length>0){ 1021 if(couponArr.length>0){
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 </view> 99 </view>
100 </block> 100 </block>
101 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 101 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
102 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 102 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
103 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 103 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
104 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 104 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
105 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 105 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -918,6 +918,19 @@ Page({ @@ -918,6 +918,19 @@ Page({
918 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 918 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
919 } 919 }
920 } 920 }
  921 + if(num == 0){
  922 + let str = detail.grant_num*1
  923 + detail.receiveNumText = ''
  924 + if (str >= 0 && str <= 100) {
  925 + detail.receiveNumText = str.toString();
  926 + } else if (str >= 101 && str <= 199) {
  927 + detail.receiveNumText = '100+';
  928 + } else if (str >= 200 && str <= 299) {
  929 + detail.receiveNumText = '200+';
  930 + } else {
  931 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  932 + }
  933 + }
921 if (detail.exp_date && detail.exp_date.week_data) { 934 if (detail.exp_date && detail.exp_date.week_data) {
922 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 935 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
923 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 936 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -997,10 +1010,10 @@ Page({ @@ -997,10 +1010,10 @@ Page({
997 if (match) { 1010 if (match) {
998 item.number = match.number; 1011 item.number = match.number;
999 } 1012 }
1000 - item.grant_num = item.grant_num*1  
1001 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1002 - if(item.number>item.grant_num){  
1003 - item.number = item.grant_num 1013 + item.grant_last = item.grant_last*1*1
  1014 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1015 + if(item.number>item.grant_last){
  1016 + item.number = item.grant_last
1004 } 1017 }
1005 }); 1018 });
1006 if(couponArr.length>0){ 1019 if(couponArr.length>0){
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 </view> 97 </view>
98 </block> 98 </block>
99 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 99 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
100 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 100 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
101 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 101 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
102 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 102 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
103 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 103 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -875,6 +875,19 @@ Page({ @@ -875,6 +875,19 @@ Page({
875 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 875 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
876 } 876 }
877 } 877 }
  878 + if(num == 0){
  879 + let str = detail.grant_num*1
  880 + detail.receiveNumText = ''
  881 + if (str >= 0 && str <= 100) {
  882 + detail.receiveNumText = str.toString();
  883 + } else if (str >= 101 && str <= 199) {
  884 + detail.receiveNumText = '100+';
  885 + } else if (str >= 200 && str <= 299) {
  886 + detail.receiveNumText = '200+';
  887 + } else {
  888 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  889 + }
  890 + }
878 if (detail.exp_date && detail.exp_date.week_data) { 891 if (detail.exp_date && detail.exp_date.week_data) {
879 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 892 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
880 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 893 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -954,10 +967,10 @@ Page({ @@ -954,10 +967,10 @@ Page({
954 if (match) { 967 if (match) {
955 item.number = match.number; 968 item.number = match.number;
956 } 969 }
957 - item.grant_num = item.grant_num*1  
958 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
959 - if(item.number>item.grant_num){  
960 - item.number = item.grant_num 970 + item.grant_last = item.grant_last*1*1
  971 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  972 + if(item.number>item.grant_last){
  973 + item.number = item.grant_last
961 } 974 }
962 }); 975 });
963 if(couponArr.length>0){ 976 if(couponArr.length>0){
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 </view> 119 </view>
120 </block> 120 </block>
121 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 121 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
122 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 122 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
123 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 123 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
124 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 124 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
125 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 125 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -919,6 +919,19 @@ Page({ @@ -919,6 +919,19 @@ Page({
919 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 919 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
920 } 920 }
921 } 921 }
  922 + if(num == 0){
  923 + let str = detail.grant_num*1
  924 + detail.receiveNumText = ''
  925 + if (str >= 0 && str <= 100) {
  926 + detail.receiveNumText = str.toString();
  927 + } else if (str >= 101 && str <= 199) {
  928 + detail.receiveNumText = '100+';
  929 + } else if (str >= 200 && str <= 299) {
  930 + detail.receiveNumText = '200+';
  931 + } else {
  932 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  933 + }
  934 + }
922 if (detail.exp_date && detail.exp_date.week_data) { 935 if (detail.exp_date && detail.exp_date.week_data) {
923 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 936 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
924 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 937 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -998,10 +1011,10 @@ Page({ @@ -998,10 +1011,10 @@ Page({
998 if (match) { 1011 if (match) {
999 item.number = match.number; 1012 item.number = match.number;
1000 } 1013 }
1001 - item.grant_num = item.grant_num*1  
1002 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1003 - if(item.number>item.grant_num){  
1004 - item.number = item.grant_num 1014 + item.grant_last = item.grant_last*1*1
  1015 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1016 + if(item.number>item.grant_last){
  1017 + item.number = item.grant_last
1005 } 1018 }
1006 }); 1019 });
1007 if(couponArr.length>0){ 1020 if(couponArr.length>0){
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 </view> 112 </view>
113 </block> 113 </block>
114 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 114 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
115 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 115 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
116 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 116 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
117 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 117 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
118 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 118 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -918,6 +918,19 @@ Page({ @@ -918,6 +918,19 @@ Page({
918 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 918 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
919 } 919 }
920 } 920 }
  921 + if(num == 0){
  922 + let str = detail.grant_num*1
  923 + detail.receiveNumText = ''
  924 + if (str >= 0 && str <= 100) {
  925 + detail.receiveNumText = str.toString();
  926 + } else if (str >= 101 && str <= 199) {
  927 + detail.receiveNumText = '100+';
  928 + } else if (str >= 200 && str <= 299) {
  929 + detail.receiveNumText = '200+';
  930 + } else {
  931 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  932 + }
  933 + }
921 if (detail.exp_date && detail.exp_date.week_data) { 934 if (detail.exp_date && detail.exp_date.week_data) {
922 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 935 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
923 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 936 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -997,10 +1010,10 @@ Page({ @@ -997,10 +1010,10 @@ Page({
997 if (match) { 1010 if (match) {
998 item.number = match.number; 1011 item.number = match.number;
999 } 1012 }
1000 - item.grant_num = item.grant_num*1  
1001 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1002 - if(item.number>item.grant_num){  
1003 - item.number = item.grant_num 1013 + item.grant_last = item.grant_last*1*1
  1014 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1015 + if(item.number>item.grant_last){
  1016 + item.number = item.grant_last
1004 } 1017 }
1005 }); 1018 });
1006 if(couponArr.length>0){ 1019 if(couponArr.length>0){
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 </view> 109 </view>
110 </block> 110 </block>
111 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 111 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
112 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 112 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
113 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 113 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
114 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 114 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
115 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 115 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -952,6 +952,19 @@ Page({ @@ -952,6 +952,19 @@ Page({
952 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 952 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
953 } 953 }
954 } 954 }
  955 + if(num == 0){
  956 + let str = detail.grant_num*1
  957 + detail.receiveNumText = ''
  958 + if (str >= 0 && str <= 100) {
  959 + detail.receiveNumText = str.toString();
  960 + } else if (str >= 101 && str <= 199) {
  961 + detail.receiveNumText = '100+';
  962 + } else if (str >= 200 && str <= 299) {
  963 + detail.receiveNumText = '200+';
  964 + } else {
  965 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  966 + }
  967 + }
955 if (detail.exp_date && detail.exp_date.week_data) { 968 if (detail.exp_date && detail.exp_date.week_data) {
956 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 969 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
957 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 970 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -1031,10 +1044,10 @@ Page({ @@ -1031,10 +1044,10 @@ Page({
1031 if (match) { 1044 if (match) {
1032 item.number = match.number; 1045 item.number = match.number;
1033 } 1046 }
1034 - item.grant_num = item.grant_num*1  
1035 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
1036 - if(item.number>item.grant_num){  
1037 - item.number = item.grant_num 1047 + item.grant_last = item.grant_last*1*1
  1048 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  1049 + if(item.number>item.grant_last){
  1050 + item.number = item.grant_last
1038 } 1051 }
1039 }); 1052 });
1040 if(couponArr.length>0){ 1053 if(couponArr.length>0){
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 </view> 114 </view>
115 </block> 115 </block>
116 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 116 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
117 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 117 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
118 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 118 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
119 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 119 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
120 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 120 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -237,6 +237,19 @@ Page({ @@ -237,6 +237,19 @@ Page({
237 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 237 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
238 } 238 }
239 } 239 }
  240 + if(num == 0){
  241 + let str = detail.grant_num*1
  242 + detail.receiveNumText = ''
  243 + if (str >= 0 && str <= 100) {
  244 + detail.receiveNumText = str.toString();
  245 + } else if (str >= 101 && str <= 199) {
  246 + detail.receiveNumText = '100+';
  247 + } else if (str >= 200 && str <= 299) {
  248 + detail.receiveNumText = '200+';
  249 + } else {
  250 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  251 + }
  252 + }
240 if (detail.exp_date && detail.exp_date.week_data) { 253 if (detail.exp_date && detail.exp_date.week_data) {
241 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 254 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
242 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 255 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 </view> 30 </view>
31 </block> 31 </block>
32 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 32 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
33 - <view wx:if="{{item.is_type == '3' && item.aexpiration}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 33 + <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
34 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 34 <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
35 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 35 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
36 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 36 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
@@ -281,6 +281,19 @@ Page({ @@ -281,6 +281,19 @@ Page({
281 detail.receiveNumText = Math.floor(num / 100) * 100 + '+'; 281 detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
282 } 282 }
283 } 283 }
  284 + if(num == 0){
  285 + let str = detail.grant_num*1
  286 + detail.receiveNumText = ''
  287 + if (str >= 0 && str <= 100) {
  288 + detail.receiveNumText = str.toString();
  289 + } else if (str >= 101 && str <= 199) {
  290 + detail.receiveNumText = '100+';
  291 + } else if (str >= 200 && str <= 299) {
  292 + detail.receiveNumText = '200+';
  293 + } else {
  294 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  295 + }
  296 + }
284 if (detail.exp_date && detail.exp_date.week_data) { 297 if (detail.exp_date && detail.exp_date.week_data) {
285 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、') 298 let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
286 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 299 let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
@@ -360,10 +373,10 @@ Page({ @@ -360,10 +373,10 @@ Page({
360 if (match) { 373 if (match) {
361 item.number = match.number; 374 item.number = match.number;
362 } 375 }
363 - item.grant_num = item.grant_num*1  
364 - if(item.grant_num < 0 || item.grant_num == 0) couponArr.splice(index,1)  
365 - if(item.number>item.grant_num){  
366 - item.number = item.grant_num 376 + item.grant_last = item.grant_last*1*1
  377 + if(item.grant_last < 0 || item.grant_last == 0) couponArr.splice(index,1)
  378 + if(item.number>item.grant_last){
  379 + item.number = item.grant_last
367 } 380 }
368 }); 381 });
369 if(couponArr.length>0){ 382 if(couponArr.length>0){
@@ -8,6 +8,20 @@ @@ -8,6 +8,20 @@
8 "miniprogram": { 8 "miniprogram": {
9 "list": [ 9 "list": [
10 { 10 {
  11 + "name": "pack-invitation/pages/detail_owner_invitation9",
  12 + "pathName": "pages/customer/detail_owner_invitation_new",
  13 + "query": "id=1288253",
  14 + "launchMode": "default",
  15 + "scene": null
  16 + },
  17 + {
  18 + "name": "pack-activity/pack/buyFreeCoupon",
  19 + "pathName": "pack-activity/pack/buyFreeCoupon",
  20 + "query": "sid=4352",
  21 + "launchMode": "default",
  22 + "scene": null
  23 + },
  24 + {
11 "name": "预订本-商家1", 25 "name": "预订本-商家1",
12 "pathName": "pack-book/pages/book/b_index", 26 "pathName": "pack-book/pages/book/b_index",
13 "query": "seller_id=1001&seller_openid=oGefL4uTmdsQn214CFZTVlHAfhnQ&manager_id=6986", 27 "query": "seller_id=1001&seller_openid=oGefL4uTmdsQn214CFZTVlHAfhnQ&manager_id=6986",