默认提交
Showing
1 changed file
with
25 additions
and
14 deletions
... | @@ -109,24 +109,23 @@ Page({ | ... | @@ -109,24 +109,23 @@ Page({ |
109 | let { | 109 | let { |
110 | detailData | 110 | detailData |
111 | } = this.data; | 111 | } = this.data; |
112 | checkAuthUtils().then((result) => { | 112 | let isAuth = detailData.isAuth == 1; |
113 | console.log("checkAuth result:", result); | 113 | resolve(isAuth); |
114 | console.log("checkAuth detailData.isAuth:", detailData.isAuth); | 114 | // checkAuthUtils().then((result) => { |
115 | let isAuth = result && detailData.isAuth == 1; | 115 | // console.log("checkAuth result:", result); |
116 | this.setData({ | 116 | // console.log("checkAuth detailData.isAuth:", detailData.isAuth); |
117 | isAuth | 117 | // let isAuth = result && detailData.isAuth == 1; |
118 | }); | 118 | // this.setData({ |
119 | console.log("checkAuth isAuth:", isAuth); | 119 | // isAuth |
120 | resolve(isAuth); | 120 | // }); |
121 | }); | 121 | // console.log("checkAuth isAuth:", isAuth); |
122 | // resolve(isAuth); | ||
123 | // }); | ||
122 | }); | 124 | }); |
123 | }, | 125 | }, |
124 | checkAuthShowComp() { | 126 | checkAuthShowComp() { |
125 | return new Promise((resolve, reject) => { | 127 | return new Promise((resolve, reject) => { |
126 | this.checkAuth().then((result) => { | 128 | this.checkAuth().then((result) => { |
127 | // this.setData({ | ||
128 | // isAuth: result | ||
129 | // }) | ||
130 | if (result) { | 129 | if (result) { |
131 | resolve(true); | 130 | resolve(true); |
132 | } else { | 131 | } else { |
... | @@ -543,7 +542,7 @@ Page({ | ... | @@ -543,7 +542,7 @@ Page({ |
543 | }) | 542 | }) |
544 | }); | 543 | }); |
545 | 544 | ||
546 | if (detailData.count > 0) { | 545 | if (memberDrawList.length > 0) { |
547 | texts.push({ | 546 | texts.push({ |
548 | x: 686, | 547 | x: 686, |
549 | y: startY + 200, | 548 | y: startY + 200, |
... | @@ -553,6 +552,16 @@ Page({ | ... | @@ -553,6 +552,16 @@ Page({ |
553 | zIndex: 11, | 552 | zIndex: 11, |
554 | text: `长按查看祝福`, | 553 | text: `长按查看祝福`, |
555 | }) | 554 | }) |
555 | } else { | ||
556 | texts.push({ | ||
557 | x: 686, | ||
558 | y: startY + 200, | ||
559 | fontSize: 48, | ||
560 | color: "#fee085", | ||
561 | textAlign: "right", | ||
562 | zIndex: 11, | ||
563 | text: `长按查看全部${detailData.count}人`, | ||
564 | }) | ||
556 | } | 565 | } |
557 | } | 566 | } |
558 | 567 | ||
... | @@ -814,6 +823,7 @@ Page({ | ... | @@ -814,6 +823,7 @@ Page({ |
814 | ownerMember: result.ownerMember, | 823 | ownerMember: result.ownerMember, |
815 | memberList: memberList, | 824 | memberList: memberList, |
816 | blessContent: blessContent, | 825 | blessContent: blessContent, |
826 | isAuth: result.isAuth == 1 | ||
817 | }); | 827 | }); |
818 | console.log("detailData:", result); | 828 | console.log("detailData:", result); |
819 | console.log("blessContent:", this.data.blessContent); | 829 | console.log("blessContent:", this.data.blessContent); |
... | @@ -983,6 +993,7 @@ Page({ | ... | @@ -983,6 +993,7 @@ Page({ |
983 | case "_evt_auth_complete": | 993 | case "_evt_auth_complete": |
984 | // this.initData(); | 994 | // this.initData(); |
985 | this.hideMask(); | 995 | this.hideMask(); |
996 | this.queryBlessDetail(); | ||
986 | break; | 997 | break; |
987 | 998 | ||
988 | default: | 999 | default: | ... | ... |
-
Please register or sign in to post a comment