From 60bcb49ed3a40501c9060ceae459329c9e750243 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Fri, 30 May 2025 17:38:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=99=BE=E5=BA=A6=E6=94=AF?= =?UTF-8?q?=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/conver.js | 3 + common/js/net/mainUrl.js | 3 +- common/js/net/payApi.js | 7 +- common/style/icons.css | 8 +- components/ad-popup.vue | 316 +++++++++--- .../createProjectInfo/createProjectInfo.vue | 2 +- pages/index/home.vue | 44 +- pages/login/login.vue | 80 +++- pages/mine/mineAccount/mineInfo/mineInfo.vue | 2 +- .../mineAccount/minePayOrder/minePayOrder.vue | 6 + .../minePayRecord/minePayRecord.vue | 6 +- pages/pay/payment/payment.vue | 81 ++-- .../uni-load-more/uni-load-more.vue | 65 ++- .../components/uni-popup/uni-popup.vue | 1 - .../mp-baidu-devtools/pages/index/home.js.map | 1 + .../pages/pay/payment/payment.js.map | 1 + .../dev/.sourcemap/mp-baidu/ad-popup.js.map | 2 +- .../mp-baidu/common/js/conver.js.map | 2 +- .../mp-baidu/common/js/net/mainUrl.js.map | 2 +- .../mp-baidu/common/js/net/payApi.js.map | 2 +- .../createProjectInfo.js.map | 2 +- .../mp-baidu/pages/index/home.js.map | 2 +- .../mp-baidu/pages/login/login.js.map | 2 +- .../mine/mineAccount/mineInfo/mineInfo.js.map | 2 +- .../minePayOrder/minePayOrder.js.map | 2 +- .../minePayRecord/minePayRecord.js.map | 2 +- .../mp-baidu/pages/pay/payment/payment.js.map | 2 +- .../uni-load-more/uni-load-more.js.map | 2 +- .../components/uni-popup/uni-popup.js.map | 2 +- unpackage/dist/dev/mp-baidu/ad-popup.js | 51 +- unpackage/dist/dev/mp-baidu/app.css | 7 +- .../dist/dev/mp-baidu/common/js/conver.js | 3 + .../dev/mp-baidu/common/js/net/mainUrl.js | 2 +- .../dist/dev/mp-baidu/common/js/net/payApi.js | 7 +- unpackage/dist/dev/mp-baidu/common/vendor.js | 2 +- .../dist/dev/mp-baidu/components/ad-popup.css | 450 ++++++++++++------ .../dev/mp-baidu/components/ad-popup.swan | 2 +- .../createProjectInfo/createProjectInfo.swan | 2 +- .../dist/dev/mp-baidu/pages/index/home.css | 2 +- .../dist/dev/mp-baidu/pages/index/home.js | 88 ++-- .../dist/dev/mp-baidu/pages/login/login.css | 23 + .../dist/dev/mp-baidu/pages/login/login.js | 69 ++- .../dist/dev/mp-baidu/pages/login/login.swan | 2 +- .../mine/mineAccount/mineInfo/mineInfo.css | 2 +- .../mineAccount/minePayOrder/minePayOrder.css | 5 + .../minePayRecord/minePayRecord.swan | 2 +- .../mp-baidu/pages/pay/payment/payment.css | 5 +- .../dev/mp-baidu/pages/pay/payment/payment.js | 69 ++- .../mp-baidu/pages/pay/payment/payment.swan | 2 +- unpackage/dist/dev/mp-baidu/project.swan.json | 5 +- .../uni-load-more/uni-load-more.css | 21 + .../components/uni-load-more/uni-load-more.js | 15 +- .../uni-load-more/uni-load-more.swan | 2 +- .../components/uni-popup/uni-popup.js | 3 +- 54 files changed, 1033 insertions(+), 460 deletions(-) create mode 100644 unpackage/dist/dev/.sourcemap/mp-baidu-devtools/pages/index/home.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-baidu-devtools/pages/pay/payment/payment.js.map diff --git a/common/js/conver.js b/common/js/conver.js index 2d940c3..5a509a2 100644 --- a/common/js/conver.js +++ b/common/js/conver.js @@ -329,6 +329,9 @@ var payWay = function(way) { case '对公转账': wayClass = 'pay-public' break + case '百度': + wayClass = 'pay-bd' + break } return wayClass } diff --git a/common/js/net/mainUrl.js b/common/js/net/mainUrl.js index 8a1b190..a0c2de0 100644 --- a/common/js/net/mainUrl.js +++ b/common/js/net/mainUrl.js @@ -1,5 +1,6 @@ // 定义api服务地址 -const appUrl = 'https://www.aimzhu.com' +const appUrl = 'https://www.aimzhu.com' +// const appUrl = 'http://121.36.71.250:58038' const operatorUrl = appUrl + '/operator'; const operatorPlug = appUrl + '/operator-plugin' const copyrightUrl = appUrl + '/copyright'; diff --git a/common/js/net/payApi.js b/common/js/net/payApi.js index 1157aca..cff4e04 100644 --- a/common/js/net/payApi.js +++ b/common/js/net/payApi.js @@ -7,7 +7,8 @@ const apiPath = { getPayOrder: '/api/pay/get-pay', //获取支付订单 enterprisePay: '/api/pay/pay-account-recharge/${accountRechargeId}', //企业付款完成支付 enterpriseAccountInfo: '/api/pay/get-pay-system-bank', //获取公司账户信息 - wxPayParams: '/api/accountrecharge/save-wx-pay-prepay-id', //获取微信支付所需参数 rechargeMoney金额 packageInfoId套餐包ID + wxPayParams: '/api/accountrecharge/save-wx-pay-prepay-id', //获取微信支付所需参数 rechargeMoney金额 packageInfoId套餐包ID + bdPayParams:'/api/accountrecharge/save-bd-pay-order-info' } class PayApi { static doGetBuyPackageList(type, data) { @@ -30,6 +31,10 @@ class PayApi { //获取微信支付参数 static doGetWxPayParams(data) { return request(apiPath.wxPayParams, "POST", data, null, "operator") + } + //获取百度支付参数 + static doGetBdPayParams(data){ + return request(apiPath.bdPayParams,"POST",data,null,"operator") } } diff --git a/common/style/icons.css b/common/style/icons.css index 7d391ae..856e583 100644 --- a/common/style/icons.css +++ b/common/style/icons.css @@ -8,6 +8,12 @@ background-repeat: no-repeat; } +.icon-bd { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ4NTc1NDI0NzQ2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjUxMTQiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTE4NC42ODIgNTM4Ljc1OWMxMTEuMTc3LTIzLjg3NCA5Ni4wMy0xNTYuNzM3IDkyLjcwMi0xODUuNzc2LTUuNDQ1LTQ0Ljc2OC01OC4xMDItMTIzLjAyLTEyOS42MDYtMTE2LjgzMS04OS45OCA4LjA3NC0xMDMuMTI2IDEzOC4wNTItMTAzLjEyNiAxMzguMDUyLTEyLjE3IDYwLjA4IDI5LjEzMiAxODguNDUyIDE0MC4wMyAxNjQuNTU1ek0zMDIuNzQ2IDc2OS44NmMtMy4yNTcgOS4zMzEtMTAuNTE3IDMzLjIyOC00LjIzNCA1NC4wMyAxMi40MDIgNDYuNjc3IDUyLjkxMiA0OC43NyA1Mi45MTIgNDguNzdoNTguMjE4di0xNDIuMzFoLTYyLjMzNmMtMjguMDE2IDguMzU0LTQxLjUzNSAzMC4xNTctNDQuNTYgMzkuNTF6IG04OC4yODEtNDUzLjg5OGM2MS40MDYgMCAxMTEuMDM3LTcwLjY2NyAxMTEuMDM3LTE1OC4wNEM1MDIuMDY0IDcwLjY0MyA0NTIuNDMzIDAgMzkxLjAyNyAwYy02MS4zMTIgMC0xMTEuMDYgNzAuNjQzLTExMS4wNiAxNTcuOTIzIDAgODcuMzczIDQ5Ljc3IDE1OC4wNCAxMTEuMDYgMTU4LjA0eiBtMjY0LjQ3IDEwLjQ0N2M4Mi4wNjggMTAuNjU3IDEzNC44NC03Ni45MjUgMTQ1LjMzNS0xNDMuMzEgMTAuNzAzLTY2LjI5Mi00Mi4yNTYtMTQzLjI4OC0xMDAuMzU3LTE1Ni41MjctNTguMjE4LTEzLjM1Ni0xMzAuOTA5IDc5LjkwNC0xMzcuNTQgMTQwLjcwNC03LjkxMiA3NC4zMiAxMC42MzMgMTQ4LjU5MyA5Mi41NjIgMTU5LjEzM3ogbTIwMS4wODYgMzkwLjIxM3MtMTI2Ljk3Ni05OC4yNC0yMDEuMTEtMjA0LjQxNEM1NTUgMzU1LjY2IDQxMi4yNzIgNDE5LjM3IDM2NC41MjUgNDk4Ljk5MyAzMTYuOTg3IDU3OC41OTQgMjQyLjkgNjI4Ljk0NyAyMzIuMzgyIDY0Mi4yOGMtMTAuNjggMTMuMTI0LTE1My4zODUgOTAuMTY2LTEyMS42OTQgMjMwLjg3IDMxLjY2OSAxNDAuNjEyIDE0Mi45MzkgMTM3LjkzNiAxNDIuOTM5IDEzNy45MzZzODEuOTk4IDguMDc0IDE3Ny4xMi0xMy4yMTdjOTUuMTY4LTIxLjEwNCAxNzcuMDk2IDUuMjYgMTc3LjA5NiA1LjI2czIyMi4yODQgNzQuNDM1IDI4My4xMDgtNjguODUyYzYwLjc1NC0xNDMuMzM0LTM0LjM2OC0yMTcuNjU0LTM0LjM2OC0yMTcuNjU0ek00NzYuMjYgOTI5Ljg4SDMzMS43MzljLTYyLjQwNi0xMi40NDktODcuMjU3LTU1LjAzLTkwLjM5OC02Mi4yOS0zLjA3Mi03LjM3Ni0yMC44MDItNDEuNjA0LTExLjQyNS05OS44NDUgMjYuOTY4LTg3LjI1NyAxMDMuODctOTMuNTE2IDEwMy44Ny05My41MTZoNzYuOTI2di05NC41NjNsNjUuNTI0IDFWOTI5Ljg4eiBtMjY5LjE0Ni0xaC0xNjYuM2MtNjQuNDUzLTE2LjYxNC02Ny40NTUtNjIuNDA3LTY3LjQ1NS02Mi40MDd2LTE4My44OWw2Ny40NTUtMS4wOTR2MTY1LjI3NmM0LjExOSAxNy42MzcgMjYuMDE1IDIwLjgyNSAyNi4wMTUgMjAuODI1aDY4LjUyNVY2ODIuNTgxaDcxLjc2djI0Ni4yOTd6IG0yMzUuNDA4LTQ5MC45OWMwLTMxLjc2LTI2LjM4Ny0xMjcuMzk0LTEyNC4yMy0xMjcuMzk0LTk4LjAwOCAwLTExMS4xMDggOTAuMjU4LTExMS4xMDggMTU0LjA2IDAgNjAuODk0IDUuMTQyIDE0NS44OTQgMTI2Ljg4MyAxNDMuMTk1IDEyMS43ODgtMi43IDEwOC40NTUtMTM3LjkzNiAxMDguNDU1LTE2OS44NnogbTAgMCIgZmlsbD0iIzAxMmZmZiIgcC1pZD0iNTExNSI+PC9wYXRoPjwvc3ZnPg=='); + background-size: contain; + background-repeat: no-repeat; +} + .icon-card { background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQyOTYwMTg2Nzk5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9Ijc3MTEiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTc4MC4xNiAxMjhjMTA4LjU4NjY2NyAwIDE5Ny41NDY2NjcgODUuMDM0NjY3IDIwMS4wODggMTkyLjE3MDY2N2wwLjA4NTMzMyA2LjQ0MjY2NnYzNzAuNzczMzM0YzAgMTA3LjE3ODY2Ny04Ni4xNDQgMTk1LjAyOTMzMy0xOTQuNjQ1MzMzIDE5OC40ODUzMzNsLTYuNTI4IDAuMTI4SDI0My43NTQ2NjdDMTM1LjE2OCA4OTYgNDYuMjA4IDgxMC45NjUzMzMgNDIuNjY2NjY3IDcwMy44MjkzMzNsLTAuMDg1MzM0LTYuNDQyNjY2di0zNzAuNzczMzM0YzAtMTA3LjE3ODY2NyA4Ni4xNDQtMTk1LjAyOTMzMyAxOTQuNjQ1MzM0LTE5OC41MjhMMjQzLjc1NDY2NyAxMjhoNTM2LjQwNTMzM3ogbTEyMC43NDY2NjcgMzM0LjAzNzMzM0gxMjMuMDA4djIzNS4zNDkzMzRjMCA2My42MTYgNTAuNjAyNjY3IDExNi4wNTMzMzMgMTE0Ljk4NjY2NyAxMTkuMDRsNS43MTczMzMgMC4xMjhoNTM2LjQwNTMzM2M2NC40MjY2NjcgMCAxMTcuNTQ2NjY3LTUwLjAwNTMzMyAxMjAuNTc2LTExMy41Nzg2NjdsMC4xMjgtNS41ODkzMzN2LTIzNS4zNDkzMzR6IG0tMTIwLjc0NjY2NyAxODUuMzg2NjY3YzIxLjQ2MTMzMyAwIDM5LjEyNTMzMyAxNi42NCA0MC4xOTIgMzcuODAyNjY3YTM5Ljg5MzMzMyAzOS44OTMzMzMgMCAwIDEtMzYuMzA5MzMzIDQxLjQyOTMzM2wtMy44NCAwLjIxMzMzM2gtMTY4LjE0OTMzNGE0MC4wMjEzMzMgNDAuMDIxMzMzIDAgMCAxLTQwLjE5Mi0zNy44MDI2NjYgMzkuODkzMzMzIDM5Ljg5MzMzMyAwIDAgMSAzNi4yNjY2NjctNDEuNDcybDMuOTI1MzMzLTAuMTcwNjY3aDE2OC4xMDY2Njd6IG0wLTQzOS45Nzg2NjdIMjQzLjc1NDY2N2MtNjQuNDI2NjY3IDAtMTE3LjU0NjY2NyA1MC4wMDUzMzMtMTIwLjU3NiAxMTMuNTc4NjY3bC0wLjEyOCA1LjU4OTMzM3Y1NS45Nzg2NjdoNzc3LjgxMzMzM1YzMjYuNjEzMzMzYzAtNjMuNjE2LTUwLjY0NTMzMy0xMTYuMDUzMzMzLTExNC45ODY2NjctMTE5LjA0bC01LjcxNzMzMy0wLjEyOHoiIGZpbGw9IiNGRkE5MDAiIHAtaWQ9Ijc3MTIiPjwvcGF0aD48L3N2Zz4='); background-size: contain; @@ -169,7 +175,7 @@ background-repeat: no-repeat; } -.icon-table { +.icon-table { background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ4NDE0ODE1MDc2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjkwMDMiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTkyNi4wOCAxOTJMNDI1LjYgOTIuMTZsLTIzLjA0IDY0LTE1MS4wNCA0MTEuNTJhNDEuNiA0MS42IDAgMCAxLTMzLjkyIDMyIDM5LjA0IDM5LjA0IDAgMCAxLTM5LjY4LTU2LjMybDQ4LjY0LTEzMy4xMkwzNjEuNiA0MC45NmE0MC45NiA0MC45NiAwIDAgMSA1My43Ni0zMC4wOGw1NjIuNTYgMTExLjM2YTQwLjMyIDQwLjMyIDAgMCAxIDMzLjkyIDU2LjMyYy02NCAyMDYuNzItMTM1LjA0IDQxMy40NC0yMTUuMDQgNjE1LjA0YTY0MCA2NDAgMCAwIDEtNjQgMTI4IDIwNy4zNiAyMDcuMzYgMCAwIDEtMTY3LjA0IDkyLjhBMjM2LjE2IDIzNi4xNiAwIDAgMSA0NDggOTkwLjcyYy0xMDYuMjQtNDcuMzYtMjExLjItOTQuNzItMzE2LjgtMTQyLjA4YTIwOC42NCAyMDguNjQgMCAwIDEtNzkuMzYtNTUuMDQgMTkyIDE5MiAwIDAgMS00Mi4yNC0xNDEuNDRjMC0xNy4yOCA0LjQ4LTM1LjIgNy4wNC01NC40bDEwLjg4IDMuODRjMTQxLjQ0IDU2Ljk2IDI4Mi4yNCAxMTQuNTYgNDIzLjY4IDE3MC44OGExMy40NCAxMy40NCAwIDAgMSA5LjYgMTQuMDggMjAzLjUyIDIwMy41MiAwIDAgMCAxOC41NiA5OS4yIDkyLjggOTIuOCAwIDAgMCA5Ni42NCA0OS4yOCAxMzYuMzIgMTM2LjMyIDAgMCAwIDk4LjU2LTcyLjk2IDg1OC4yNCA4NTguMjQgMCAwIDAgNjQtMTQ1LjkyYzYwLjE2LTE1Ni44IDExMy45Mi0zMTYuMTYgMTY2LjQtNDc2LjE2IDUuNzYtMTYgMTAuODgtMzIgMTYtNDguNjR6IG0wIDAiIGZpbGw9IiMxNkEzNEEiIHAtaWQ9IjkwMDQiPjwvcGF0aD48cGF0aCBkPSJNNjQ1Ljc2IDY4OS45MmEzNy43NiAzNy43NiAwIDAgMS01MC41NiAzNS44NGwtMTYzLjg0LTU0LjRhMzkuNjggMzkuNjggMCAwIDEtMjYuMjQtNDAuMzIgMzcuNzYgMzcuNzYgMCAwIDEgMzMuMjgtMzMuMjggNTIuNDggNTIuNDggMCAwIDEgMTkuODQgMGwxNTguMDggNTIuNDhhMzcuNzYgMzcuNzYgMCAwIDEgMjkuNDQgMzcuNzZ6IG02NC0xNTUuNTJhMzUuODQgMzUuODQgMCAwIDEtMTAuMjQgMjYuODggMzYuNDggMzYuNDggMCAwIDEtMjYuODggMTAuODggNDQuMTYgNDQuMTYgMCAwIDEtMTYgMGwtMTU5LjM2LTU0LjRhMzguNCAzOC40IDAgMCAxLTI4LjE2LTQ3LjM2IDM2LjQ4IDM2LjQ4IDAgMCAxIDQyLjg4LTI3LjUyYzE5LjIgNS4xMiAzNy4xMiAxMi4xNiA1NS42OCAxNy45MmwxMDguOCAzNS44NGEzNy43NiAzNy43NiAwIDAgMSAzMC4wOCAzNy4xMnogbTY3Ljg0LTE2Ni40YTM2LjQ4IDM2LjQ4IDAgMCAxLTQwLjk2IDM3LjEyYy0yMy42OC00LjQ4LTQ2LjcyLTExLjUyLTY5Ljc2LTE3LjkybC0xMDIuNC0yNy41MmEzNy4xMiAzNy4xMiAwIDAgMS0zMC4wOC0zMy45MiAzNi40OCAzNi40OCAwIDAgMSAxOC41Ni0zNi40OCA0Mi4yNCA0Mi4yNCAwIDAgMSAzNS4yIDBMNzA0IDMyMGw0NC44IDEyLjE2YTM5LjA0IDM5LjA0IDAgMCAxIDI4LjggMzcuMTJ6IG0tMzgwLjE2IDM5LjA0YTQwLjk2IDQwLjk2IDAgMCAxIDQwLjk2IDQwLjk2IDM5LjY4IDM5LjY4IDAgMCAxLTM4LjQgMzguNCA0MC45NiA0MC45NiAwIDAgMS00Mi44OC0zOC40IDM4LjQgMzguNCAwIDAgMSAzOC40LTM4LjR6IG02NC04MS45MmE0MC4zMiA0MC4zMiAwIDAgMS00MS42LTM5LjA0IDM1Ljg0IDM1Ljg0IDAgMCAxIDExLjUyLTI2Ljg4IDM3Ljc2IDM3Ljc2IDAgMCAxIDI2Ljg4LTEwLjg4IDM5LjY4IDM5LjY4IDAgMCAxIDQyLjI0IDM5LjY4IDM1Ljg0IDM1Ljg0IDAgMCAxLTM5LjA0IDM2LjQ4ek0zMzYgNTU0Ljg4YTM5LjY4IDM5LjY4IDAgMCAxIDQxLjYgMzkuMDQgMzcuNzYgMzcuNzYgMCAwIDEtMTAuODggMjYuODggNDAuMzIgNDAuMzIgMCAwIDEtMjYuMjQgMTAuODggNDAuOTYgNDAuOTYgMCAwIDEtNDQuMTYtMzkuMDQgMzguNCAzOC40IDAgMCAxIDM5LjY4LTM3Ljc2eiBtMCAwIiBmaWxsPSIjMTZBMzRBIiBwLWlkPSI5MDA1Ij48L3BhdGg+PC9zdmc+'); background-size: cover; background-repeat: no-repeat; diff --git a/components/ad-popup.vue b/components/ad-popup.vue index 313c941..6a0c044 100644 --- a/components/ad-popup.vue +++ b/components/ad-popup.vue @@ -1,33 +1,47 @@ - \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.vue b/pages/copyright/createProjectInfo/createProjectInfo.vue index a48f80a..69bb675 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.vue +++ b/pages/copyright/createProjectInfo/createProjectInfo.vue @@ -178,7 +178,7 @@ @change="changeLang"> - {{item}} + {{item}} diff --git a/pages/index/home.vue b/pages/index/home.vue index 1d5cf3c..565f14c 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -221,7 +221,8 @@ - + + @@ -357,7 +358,7 @@ UserApi.doGetClaimsCouponsList() .then(res => { if (res && res.length > 0) { - this.tempCoupons = res[0] + this.tempCoupons = res this.showAd = true } }) @@ -677,30 +678,37 @@ console.log('收下优惠卷') const _self = this const isShow = e - // isShow=true 今日不再显示 + console.log(_self.tempCoupons) if (isShow) { const currentDate = new Date().toLocaleDateString(); set('noShowToday', currentDate) - _slef.isNoShowToday = true + _self.isNoShowToday = true } uni.showLoading({ title: '领取中...', }) - const coupons = { - couponId: _self.tempCoupons.couponId - } - UserApi.doSaveCoupons(coupons) + const requests = _self.tempCoupons.map(item => { + const coupons = { + couponId: item.couponId + } + return UserApi.doSaveCoupons(coupons) + }) + Promise.all(requests) .then(res => { - uni.hideLoading() - _self.msgType = 'success' - _self.msgTxt = '本次领取操作已成功，您可以在 “我的” 页面查看相关信息。' - _self.$refs.msg.open() + setTimeout(() => { + uni.hideLoading() + _self.msgType = 'success' + _self.msgTxt = '本次领取操作已成功，您可以在 “我的” 页面查看相关信息。' + _self.$refs.msg.open() + }, 1100) }) .catch(err => { - uni.hideLoading() - _self.msgType = 'error' - _self.msgTxt = err.msg ? err.msg : '本次领取操作未成功，请重新进入小程序后再次尝试。' - _self.$refs.msg.open() + setTimeout(() => { + uni.hideLoading() + _self.msgType = 'error' + _self.msgTxt = err.msg ? err.msg : '本次领取操作未成功，请重新进入小程序后再次尝试。' + _self.$refs.msg.open() + }, 1100) }) }, //去生成项目 @@ -1144,7 +1152,7 @@ font-size: 20rpx; background-color: $primary-color; color: $white-color; - padding: 5rpx 20rpx; + padding: 8rpx 30rpx; border-radius: 5rpx; text-align: center; white-space: nowrap; @@ -1324,7 +1332,7 @@ border-radius: 15rpx; } - + .bg-gray { background-color: $bg-gray-input-color; diff --git a/pages/login/login.vue b/pages/login/login.vue index 9cdbe0b..64b5ecf 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -2,7 +2,7 @@