xt / xcx-book · Commits

Go to a project

Commit 0a21e33b87a856f9977dac25590986186f685e30

Authored by pengye
1 parent 9ff254d0
build: skipped

邀请函券有效期展示、订阅消息提示问题处理

Inline Side-by-side
Showing 14 changed files with 14 additions and 14 deletions
@@ -74,7 +74,7 @@ Component({ @@ -74,7 +74,7 @@ Component({
74 } 74 }
75 }) 75 })
76 console.log('accept-----------',accept); 76 console.log('accept-----------',accept);
77 - if(accept.length>0){ 77 + if(accept.length>0 && accept.length == this.subscribeIds.length){
78 // util.toast('订阅成功','none') 78 // util.toast('订阅成功','none')
79 setTimeout(()=>{ 79 setTimeout(()=>{
80 App.Wechat.Subscribe({ 80 App.Wechat.Subscribe({
@@ -1280,7 +1280,7 @@ Page({ @@ -1280,7 +1280,7 @@ Page({
1280 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1280 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1281 const detail = coupon_dataList[idx]; 1281 const detail = coupon_dataList[idx];
1282 detail.resultCoupon = '1'; // 显示已领取 1282 detail.resultCoupon = '1'; // 显示已领取
1283 - detail.cdate = detail.cdate * 1; 1283 + detail.cdate = item.cdate * 1;
1284 detail.useStime = ''; 1284 detail.useStime = '';
1285 detail.useEtime = ''; 1285 detail.useEtime = '';
1286 let condition = detail.aexpiration 1286 let condition = detail.aexpiration
@@ -1359,7 +1359,7 @@ Page({ @@ -1359,7 +1359,7 @@ Page({
1359 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1359 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1360 const detail = coupon_dataList[idx]; 1360 const detail = coupon_dataList[idx];
1361 detail.resultCoupon = '1'; // 显示已领取 1361 detail.resultCoupon = '1'; // 显示已领取
1362 - detail.cdate = detail.cdate * 1; 1362 + detail.cdate = item.cdate * 1;
1363 detail.useStime = ''; 1363 detail.useStime = '';
1364 detail.useEtime = ''; 1364 detail.useEtime = '';
1365 let condition = detail.aexpiration 1365 let condition = detail.aexpiration
@@ -1369,7 +1369,7 @@ Page({ @@ -1369,7 +1369,7 @@ Page({
1369 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1369 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1370 const detail = coupon_dataList[idx]; 1370 const detail = coupon_dataList[idx];
1371 detail.resultCoupon = '1'; // 显示已领取 1371 detail.resultCoupon = '1'; // 显示已领取
1372 - detail.cdate = detail.cdate * 1; 1372 + detail.cdate = item.cdate * 1;
1373 detail.useStime = ''; 1373 detail.useStime = '';
1374 detail.useEtime = ''; 1374 detail.useEtime = '';
1375 let condition = detail.aexpiration 1375 let condition = detail.aexpiration
@@ -1226,7 +1226,7 @@ Page({ @@ -1226,7 +1226,7 @@ Page({
1226 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1226 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1227 const detail = coupon_dataList[idx]; 1227 const detail = coupon_dataList[idx];
1228 detail.resultCoupon = '1'; // 显示已领取 1228 detail.resultCoupon = '1'; // 显示已领取
1229 - detail.cdate = detail.cdate * 1; 1229 + detail.cdate = item.cdate * 1;
1230 detail.useStime = ''; 1230 detail.useStime = '';
1231 detail.useEtime = ''; 1231 detail.useEtime = '';
1232 let condition = detail.aexpiration 1232 let condition = detail.aexpiration
@@ -1181,7 +1181,7 @@ Page({ @@ -1181,7 +1181,7 @@ Page({
1181 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1181 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1182 const detail = coupon_dataList[idx]; 1182 const detail = coupon_dataList[idx];
1183 detail.resultCoupon = '1'; // 显示已领取 1183 detail.resultCoupon = '1'; // 显示已领取
1184 - detail.cdate = detail.cdate * 1; 1184 + detail.cdate = item.cdate * 1;
1185 detail.useStime = ''; 1185 detail.useStime = '';
1186 detail.useEtime = ''; 1186 detail.useEtime = '';
1187 let condition = detail.aexpiration 1187 let condition = detail.aexpiration
@@ -1181,7 +1181,7 @@ Page({ @@ -1181,7 +1181,7 @@ Page({
1181 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1181 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1182 const detail = coupon_dataList[idx]; 1182 const detail = coupon_dataList[idx];
1183 detail.resultCoupon = '1'; // 显示已领取 1183 detail.resultCoupon = '1'; // 显示已领取
1184 - detail.cdate = detail.cdate * 1; 1184 + detail.cdate = item.cdate * 1;
1185 detail.useStime = ''; 1185 detail.useStime = '';
1186 detail.useEtime = ''; 1186 detail.useEtime = '';
1187 let condition = detail.aexpiration 1187 let condition = detail.aexpiration
@@ -1180,7 +1180,7 @@ Page({ @@ -1180,7 +1180,7 @@ Page({
1180 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1180 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1181 const detail = coupon_dataList[idx]; 1181 const detail = coupon_dataList[idx];
1182 detail.resultCoupon = '1'; // 显示已领取 1182 detail.resultCoupon = '1'; // 显示已领取
1183 - detail.cdate = detail.cdate * 1; 1183 + detail.cdate = item.cdate * 1;
1184 detail.useStime = ''; 1184 detail.useStime = '';
1185 detail.useEtime = ''; 1185 detail.useEtime = '';
1186 let condition = detail.aexpiration 1186 let condition = detail.aexpiration
@@ -1138,7 +1138,7 @@ Page({ @@ -1138,7 +1138,7 @@ Page({
1138 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1138 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1139 const detail = coupon_dataList[idx]; 1139 const detail = coupon_dataList[idx];
1140 detail.resultCoupon = '1'; // 显示已领取 1140 detail.resultCoupon = '1'; // 显示已领取
1141 - detail.cdate = detail.cdate * 1; 1141 + detail.cdate = item.cdate * 1;
1142 detail.useStime = ''; 1142 detail.useStime = '';
1143 detail.useEtime = ''; 1143 detail.useEtime = '';
1144 let condition = detail.aexpiration 1144 let condition = detail.aexpiration
@@ -1181,7 +1181,7 @@ Page({ @@ -1181,7 +1181,7 @@ Page({
1181 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1181 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1182 const detail = coupon_dataList[idx]; 1182 const detail = coupon_dataList[idx];
1183 detail.resultCoupon = '1'; // 显示已领取 1183 detail.resultCoupon = '1'; // 显示已领取
1184 - detail.cdate = detail.cdate * 1; 1184 + detail.cdate = item.cdate * 1;
1185 detail.useStime = ''; 1185 detail.useStime = '';
1186 detail.useEtime = ''; 1186 detail.useEtime = '';
1187 let condition = detail.aexpiration 1187 let condition = detail.aexpiration
@@ -1180,7 +1180,7 @@ Page({ @@ -1180,7 +1180,7 @@ Page({
1180 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1180 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1181 const detail = coupon_dataList[idx]; 1181 const detail = coupon_dataList[idx];
1182 detail.resultCoupon = '1'; // 显示已领取 1182 detail.resultCoupon = '1'; // 显示已领取
1183 - detail.cdate = detail.cdate * 1; 1183 + detail.cdate = item.cdate * 1;
1184 detail.useStime = ''; 1184 detail.useStime = '';
1185 detail.useEtime = ''; 1185 detail.useEtime = '';
1186 let condition = detail.aexpiration 1186 let condition = detail.aexpiration
@@ -1221,7 +1221,7 @@ Page({ @@ -1221,7 +1221,7 @@ Page({
1221 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 1221 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
1222 const detail = coupon_dataList[idx]; 1222 const detail = coupon_dataList[idx];
1223 detail.resultCoupon = '1'; // 显示已领取 1223 detail.resultCoupon = '1'; // 显示已领取
1224 - detail.cdate = detail.cdate * 1; 1224 + detail.cdate = item.cdate * 1;
1225 detail.useStime = ''; 1225 detail.useStime = '';
1226 detail.useEtime = ''; 1226 detail.useEtime = '';
1227 let condition = detail.aexpiration 1227 let condition = detail.aexpiration
@@ -395,7 +395,7 @@ Page({ @@ -395,7 +395,7 @@ Page({
395 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 395 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
396 const detail = coupon_dataList[idx]; 396 const detail = coupon_dataList[idx];
397 detail.resultCoupon = '1'; // 显示已领取 397 detail.resultCoupon = '1'; // 显示已领取
398 - detail.cdate = detail.cdate * 1; 398 + detail.cdate = item.cdate * 1;
399 detail.useStime = ''; 399 detail.useStime = '';
400 detail.useEtime = ''; 400 detail.useEtime = '';
401 let condition = detail.aexpiration 401 let condition = detail.aexpiration
@@ -426,7 +426,7 @@ Page({ @@ -426,7 +426,7 @@ Page({
426 if (idx !== null && idx !== undefined && coupon_dataList[idx]) { 426 if (idx !== null && idx !== undefined && coupon_dataList[idx]) {
427 const detail = coupon_dataList[idx]; 427 const detail = coupon_dataList[idx];
428 detail.resultCoupon = '1'; // 显示已领取 428 detail.resultCoupon = '1'; // 显示已领取
429 - detail.cdate = detail.cdate * 1; 429 + detail.cdate = item.cdate * 1;
430 detail.useStime = ''; 430 detail.useStime = '';
431 detail.useEtime = ''; 431 detail.useEtime = '';
432 let condition = detail.aexpiration 432 let condition = detail.aexpiration