diff --git a/api/modules/common.js b/api/modules/common.js index 3faebb0..630cebd 100644 --- a/api/modules/common.js +++ b/api/modules/common.js @@ -178,4 +178,13 @@ export default { needLogin: true, }); }, + + getAliCard(data = {}) { + return request({ + url: "/common/getAliCard", + method: "POST", + data, + needLogin: true, + }); + }, }; \ No newline at end of file diff --git a/api/modules/user.js b/api/modules/user.js index 222b222..49ab90e 100644 --- a/api/modules/user.js +++ b/api/modules/user.js @@ -174,5 +174,21 @@ export default { data, needLogin: true, }); - } + }, + openAliCard(data = {}) { + return request({ + url: "/user/openAliCard", + method: "POST", + data, + needLogin: true, + }); + }, + creatCard(data = {}) { + return request({ + url: "/user/creatCard", + method: "POST", + data, + needLogin: true, + }); + }, }; \ No newline at end of file diff --git a/components/login/logins.vue b/components/login/logins.vue index 5d6d8fe..9871a50 100644 --- a/components/login/logins.vue +++ b/components/login/logins.vue @@ -187,7 +187,7 @@ backPage() { if (this.type == 0) { - + this.$emit('isLogin') } else if (this.type != 2) { setTimeout(() => { const backPage = uni.getStorageSync("backPage") diff --git a/pages.json b/pages.json index fde07bf..1d66cd4 100644 --- a/pages.json +++ b/pages.json @@ -24,6 +24,18 @@ } } }, + { + "path": "pages/card/loading", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "会员卡", + "enablePullDownRefresh": true, + "mp-alipay": { + "transparentTitle": "always", + "titlePenetrate": "YES" + } + } + }, { "path": "pages/my/my", "style": { diff --git a/pages/card/index.vue b/pages/card/index.vue index e63c3ad..e295f48 100644 --- a/pages/card/index.vue +++ b/pages/card/index.vue @@ -1,11 +1,13 @@